ChangeSet
  1.1974 05/09/22 18:57:07 joerg@mysql.com +3 -0
  Fixes needed to build 5.0.13 on Windows:
  - reflect two "Makefile.am" changes in the respective "VC project" files,
  - correct a typo in a (normally) unused macro parameter.

  sql/ha_federated.cc
    1.45 05/09/22 18:57:02 joerg@mysql.com +1 -1
    Correct a typo (matters only if "SAFEMALLOC" is set).

  VC++Files/sql/mysqld.vcproj
    1.3 05/09/22 18:57:02 joerg@mysql.com +1 -1
    Reflect a change done by Kostja in the Unix "sql/Makefile.am":
    New file "sql/sql_cursor.cpp" replaces "sql/protocol_cursor.cpp".

  VC++Files/libmysqld/libmysqld.vcproj
    1.5 05/09/22 18:57:02 joerg@mysql.com +1 -1
    Reflect a change done by Kostja in the Unix "libmysqld/Makefile.am":
    New file "sql/sql_cursor.cpp" replaces "sql/protocol_cursor.cpp".

ChangeSet
  1.1973 05/09/22 03:23:07 monty@mysql.com +16 -0
  Fixed problems found by valgrind
  Fixed problems in test suite where some test failed
  Fixed access to not initialized memory in federated
  Fixed access to not initialized memory when using BIT fields in internal temporary tables

  sql/sql_select.cc
    1.374 05/09/22 03:23:04 monty@mysql.com +32 -8
    Fixed various problems with bit fields when used in internal temporary tables.
    Calculate space needed for bit fields correctly (previously we allocated more space than needed for rows in heap/myisam tables)
    

  sql/sql_base.cc
    1.303 05/09/22 03:23:04 monty@mysql.com +2 -0
    Reset variables used by fulltext

  sql/item_func.h
    1.129 05/09/22 03:23:04 monty@mysql.com +0 -3
    Remove access to table object from cleanup() as the table object may have been dropped earlier (In case of temporary tables or of close_thread_tables() is run before cleanup())
    This fixed a bug with access to already freed memory

  sql/ha_federated.cc
    1.44 05/09/22 03:23:04 monty@mysql.com +7 -9
    Fixed errors discovered by valgrind:
    - Socket was not initialized
    - share->scheme was deleted while there was still pointer into it from the hash

  mysql-test/valgrind.supp
    1.3 05/09/22 03:23:04 monty@mysql.com +22 -2
    Removed some valgrind warnings that isn't errors

  mysql-test/t/type_bit.test
    1.13 05/09/22 03:23:04 monty@mysql.com +2 -0
    More tests

  mysql-test/t/temp_table.test
    1.12 05/09/22 03:23:04 monty@mysql.com +13 -12
    Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middle

  mysql-test/t/multi_statement.test
    1.6 05/09/22 03:23:04 monty@mysql.com +4 -0
    Remove used tables at start

  mysql-test/t/information_schema_inno.test
    1.4 05/09/22 03:23:04 monty@mysql.com +1 -1
    Remove used tables at start

  mysql-test/t/information_schema.test
    1.58 05/09/22 03:23:04 monty@mysql.com +6 -5
    Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middle

  mysql-test/r/type_bit.result
    1.14 05/09/22 03:23:04 monty@mysql.com +10 -0
    More tests

  mysql-test/r/temp_table.result
    1.19 05/09/22 03:23:04 monty@mysql.com +15 -14
    Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middle

  mysql-test/r/multi_statement.result
    1.4 05/09/22 03:23:04 monty@mysql.com +1 -0
    Remove used tables at start

  mysql-test/r/information_schema_inno.result
    1.7 05/09/22 03:23:04 monty@mysql.com +1 -1
    Remove used tables at start

  mysql-test/r/information_schema.result
    1.81 05/09/22 03:23:04 monty@mysql.com +12 -11
    Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middlecd 

  BitKeeper/etc/ignore
    1.209 05/09/22 03:20:02 monty@mysql.com +1 -0
    added libmysqld/sql_cursor.h

  BitKeeper/etc/ignore
    1.208 05/09/22 03:20:00 monty@mysql.com +1 -0
    added libmysqld/sql_cursor.cc

ChangeSet
  1.1972 05/09/22 02:11:21 konstantin@mysql.com +30 -0
  A fix and a test case for Bug#6513 "Test Suite: Values inserted by using 
  cursor is interpreted latin1 character and Bug#9819 "Cursors: Mysql Server
  Crash while fetching from table with 5 million records."
  A fix for a possible memory leak when fetching into an SP cursor
  in a long loop.
  The patch uses a common implementation of cursors in the binary protocol and 
  in stored procedures and implements materialized cursors.
  For implementation details, see comments in sql_cursor.cc

  sql/sql_cursor.h
    1.1 05/09/22 02:11:00 konstantin@mysql.com +65 -0
    New BitKeeper file ``sql/sql_cursor.h'' - declarations for
    server side cursors.

  sql/sql_cursor.h
    1.0 05/09/22 02:11:00 konstantin@mysql.com +0 -0
    BitKeeper file /home/kostja/mysql/mysql-5.0-release/sql/sql_cursor.h

  sql/sql_cursor.cc
    1.1 05/09/22 02:10:59 konstantin@mysql.com +660 -0
    New BitKeeper file ``sql/sql_cursor.cc'' -- implementation of server side
    cursors

  tests/mysql_client_test.c
    1.159 05/09/22 02:10:59 konstantin@mysql.com +5 -2
    - if cursors are materialized, a parallel update of the table used
      in the cursor may go through: update the test.

  sql/table.h
    1.115 05/09/22 02:10:59 konstantin@mysql.com +3 -0
    - add declarations for auxiliary methods of st_table used to work with 
     temporary tables

  sql/table.cc
    1.191 05/09/22 02:10:59 konstantin@mysql.com +57 -0
    - implement auxiliary st_table methods for use with temporary tables

  sql/sql_view.cc
    1.64 05/09/22 02:10:59 konstantin@mysql.com +1 -1
    - adjust to the changed signature of st_select_lex_unit::prepare

  sql/sql_union.cc
    1.129 05/09/22 02:10:59 konstantin@mysql.com +106 -70
    - move pieces of st_select_unit::prepare to select_union and st_table
      methods to be able to reuse code in the implementation of materialized
      cursors

  sql/sql_select.h
    1.99 05/09/22 02:10:59 konstantin@mysql.com +6 -53
    - move the declaration of sensitive (non-materializing) cursors to 
      sql_cursor.cc

  sql/sql_cursor.cc
    1.0 05/09/22 02:10:59 konstantin@mysql.com +0 -0
    BitKeeper file /home/kostja/mysql/mysql-5.0-release/sql/sql_cursor.cc

  sql/sql_select.cc
    1.373 05/09/22 02:10:58 konstantin@mysql.com +86 -304
    - move the implementation of sensitive (non-materializing) cursors to 
      sql_cursor.cc
    - make temporary tables self-contained: the table, its record and fields
      are allocated in TABLE::mem_root. This implementation is not clean
      and resets thd->mem_root several times because of the way create_tmp_table 
      works (many additional things are done inside it).
    - adjust to the changed declaration of st_select_lex_unit::prepare

  sql/sql_prepare.cc
    1.155 05/09/22 02:10:58 konstantin@mysql.com +134 -122
    - split the tight coupling of cursors and prepared statements to reuse 
      the same implementation in stored procedures
    - cleanups of error processing in Prepared_statement::{prepare,execute}

  sql/sql_list.h
    1.38 05/09/22 02:10:58 konstantin@mysql.com +2 -0
    - add an array operator new[] to class Sql_alloc

  sql/sql_lex.h
    1.198 05/09/22 02:10:58 konstantin@mysql.com +4 -6
    - declarations of auxiliary methods used by materialized cursors
    - a cleanup in st_select_lex_unit interface

  sql/sql_derived.cc
    1.77 05/09/22 02:10:58 konstantin@mysql.com +16 -27
    - reuse bits of tmp table code in UNION, derived tables, and materialized
      cursors
    - cleanup comments

  sql/sql_class.h
    1.265 05/09/22 02:10:58 konstantin@mysql.com +13 -13
    - adjust to the rename Cursor -> Server_side_cursor
    - additional declarations of select_union used in materialized cursors

  sql/sql_class.cc
    1.211 05/09/22 02:10:58 konstantin@mysql.com +15 -13
    - disable the functionality that closes transient cursors at commit/rollback;
      transient cursors are not used in 5.0, instead we use materialized ones.
      To be enabled in a later version.

  sql/sp_rcontext.h
    1.24 05/09/22 02:10:58 konstantin@mysql.com +29 -14
    - reimplement sp_cursor using the new implementation of server side cursors.

  sql/sp_rcontext.cc
    1.33 05/09/22 02:10:58 konstantin@mysql.com +76 -133
    - reimplement sp_cursor using the new implementation of server side cursors.
    - use sp_eval_func_item to assign values of SP variables from the
      row fetched from a cursor. This should fix a possible memory leak in 
      the old implementation of sp_cursor::fetch

  sql/sp_head.h
    1.71 05/09/22 02:10:57 konstantin@mysql.com +9 -0
    - declare a no-op implementation for cleanup_stmt in sp_instr_cpush.
      This method is needed for non-materializing cursors, which are yet not 
      used in stored procedures.
    - declaration for sp_eval_func_item

  sql/sp_head.cc
    1.185 05/09/22 02:10:57 konstantin@mysql.com +50 -62
    - move juggling with Query_arena::free_list and Item::next to
      sp_eval_func_item, as this is needed in 3 places already. 

  sql/protocol.h
    1.30 05/09/22 02:10:57 konstantin@mysql.com +0 -24
    - drop Protocol_cursor

  sql/item_subselect.cc
    1.119 05/09/22 02:10:57 konstantin@mysql.com +1 -1
    - adjust to the changed declaration of st_select_lex_unit::prepare

  sql/handler.cc
    1.188 05/09/22 02:10:57 konstantin@mysql.com +3 -5
    - now TABLE object has its mem_root always initialized.
      Adjust the implementation handler::ha_open

  sql/Makefile.am
    1.110 05/09/22 02:10:57 konstantin@mysql.com +2 -2
    - add sql_cursor.h, sql_cursor.cc (a new implementation of stored procedure
    cursors) and drop protocol_cursor.cc (the old one)

  mysys/my_alloc.c
    1.32 05/09/22 02:10:57 konstantin@mysql.com +51 -0
    - an implementation of multi_alloc_root; this is largely a copy-paste
      from mulalloc.c, but the function is small and there is no easy way
      to reuse the existing C function.

  mysql-test/t/sp-big.test
    1.2 05/09/22 02:10:57 konstantin@mysql.com +49 -0
    Add a restricted test case for Bug#9819 "Cursors: Mysql Server Crash
    while fetching from table with 5 million records."

  mysql-test/t/ctype_ujis.test
    1.14 05/09/22 02:10:57 konstantin@mysql.com +42 -0
    Add a test case for Bug#6513 "Test Suite: Values inserted by using cursor is
     interpreted latin1 character"

  mysql-test/r/sp-big.result
    1.2 05/09/22 02:10:57 konstantin@mysql.com +46 -0
    - test results fixed (a test case for Bug#9819)

  mysql-test/r/ctype_ujis.result
    1.14 05/09/22 02:10:57 konstantin@mysql.com +30 -0
    - test results fixed (a test case for Bug#6513)

  libmysqld/Makefile.am
    1.62 05/09/22 02:10:57 konstantin@mysql.com +1 -1
    - drop protocol_cursor.cc, add sql_cursor.cc (replaces the old
    implementation of cursors with a new one)

  include/my_sys.h
    1.169 05/09/22 02:10:57 konstantin@mysql.com +1 -0
    - declaration for multi_alloc_root

ChangeSet
  1.1969.1.1 05/09/20 19:26:00 kent@mysql.com +1 -0
  make_binary_distribution.sh:
    Include libz.a in distribution if built bundled

  scripts/make_binary_distribution.sh
    1.94 05/09/20 19:24:41 kent@mysql.com +2 -1
    Include libz.a in distribution if built bundled

ChangeSet
  1.1970 05/09/19 23:23:23 reggie@fedora.(none) +3 -0
  More fixes to the VC 7.1 solution and vcproj files

  VC++Files/tests/mysql_client_test.vcproj
    1.2 05/09/19 23:21:50 reggie@fedora.(none) +3 -3
    removed hard coded lib dependencies

  VC++Files/mysql.sln
    1.7 05/09/19 23:21:50 reggie@fedora.(none) +30 -25
    more solution fixups

  VC++Files/myisamchk/myisamchk.vcproj
    1.2 05/09/19 23:21:49 reggie@fedora.(none) +1 -1
    removed hard coded library dependencies

ChangeSet
  1.1969 05/09/16 22:51:34 reggie@fedora.(none) +1 -0
  hopefully final set of changes to the libmysqld targets

  VC++Files/mysql.sln
    1.6 05/09/16 22:51:28 reggie@fedora.(none) +8 -2
    fixed embedded targets

ChangeSet
  1.1968 05/09/16 20:07:39 reggie@fedora.(none) +2 -0
  more fixes to the vcproj build process

  VC++Files/mysql.sln
    1.5 05/09/16 20:07:32 reggie@fedora.(none) +21 -7
    fixed up more of the inter-project dependencies

  VC++Files/libmysqld/libmysqld.vcproj
    1.4 05/09/16 20:07:32 reggie@fedora.(none) +5 -5
    cleaned up the dependencies on the embedded server

ChangeSet
  1.1967 05/09/16 12:02:19 kent@mysql.com +1 -0
  log.cc:
    Cast my_munmap() argument to be able to compile on Solaris

  sql/log.cc
    1.171 05/09/16 12:01:24 kent@mysql.com +1 -1
    Cast my_munmap() argument to be able to compile on Solaris

ChangeSet
  1.1964.1.1 05/09/15 14:32:01 reggie@fedora.(none) +10 -0
  some last minute Windows compile fixes and makefile corrections

  VC++Files/mysqlserver/dummy.cpp
    1.1 05/09/15 14:30:40 reggie@fedora.(none) +0 -0
    added new file to make mysqlserver generate a lib

  VC++Files/mysqlserver/dummy.cpp
    1.0 05/09/15 14:30:40 reggie@fedora.(none) +0 -0
    BitKeeper file /home/reggie/bk/mysql-5.0-release/VC++Files/mysqlserver/dummy.cpp

  sql/unireg.cc
    1.69 05/09/15 14:30:39 reggie@fedora.(none) +2 -2
    fix windows compile problems

  sql/table.cc
    1.190 05/09/15 14:30:39 reggie@fedora.(none) +1 -1
    fix windows compile problems

  sql/sql_acl.cc
    1.171 05/09/15 14:30:39 reggie@fedora.(none) +1 -1
    fix windows compile problems

  sql/ha_federated.cc
    1.43 05/09/15 14:30:38 reggie@fedora.(none) +6 -4
    fix windows compile problems

  server-tools/instance-manager/mysqlmanager.vcproj
    1.5 05/09/15 14:30:38 reggie@fedora.(none) +2 -2
    redirect to proper folders

  VC++Files/mysqlserver/mysqlserver.vcproj
    1.2 05/09/15 14:30:38 reggie@fedora.(none) +7 -4
    redirect to lib_release and lib_debug folders

  VC++Files/mysql.sln
    1.4 05/09/15 14:30:38 reggie@fedora.(none) +0 -2
    remove bdb from embedded classic target

  VC++Files/libmysqltest/myTest.vcproj
    1.2 05/09/15 14:30:37 reggie@fedora.(none) +3 -3
    redirect to client_release and client_debug folders

  VC++Files/libmysqld/libmysqld.vcproj
    1.3 05/09/15 14:30:37 reggie@fedora.(none) +1 -1
    don't recall exactly what this change was.

ChangeSet
  1.1965 05/09/15 19:00:25 joerg@mysql.com +1 -0
  Compile problem about "madvise()" on Solaris (bug#7156). (Patch supplied by Kent)

  include/my_global.h
    1.108 05/09/15 19:00:20 joerg@mysql.com +8 -0
    Compile problem about "madvise()" on Solaris (bug#7156). (Patch supplied by Kent)

ChangeSet
  1.1964 05/09/15 14:53:38 lenz@mysql.com +1 -0
  - bumped up version number from 5.0.13-beta to 5.0.13-rc
  - tagged this ChangeSet as "clone-5.0.13-build"

  configure.in
    1.347 05/09/15 14:53:30 lenz@mysql.com +2 -2
    - bumped up version number from 5.0.13-beta to 5.0.13-rc
    - tagged this ChangeSet as "clone-5.0.13-build"

ChangeSet
  1.1958.4.1 05/09/15 09:46:10 msvensson@neptunus.(none) +1 -0
  Bug #13029  YaSSL not compatibile w/ JSSE (Java implementation of SSL)
  -Applied patch from Todd

  extra/yassl/src/ssl.cpp
    1.8 05/09/15 09:46:06 msvensson@neptunus.(none) +15 -3
    Call processReply until clientFinishedComplete or error

ChangeSet
  1.1961 05/09/15 09:02:26 ingo@mysql.com +1 -0
  Merge mysql.com:/home/mydev/mysql-5.0
  into  mysql.com:/home/mydev/mysql-5.0-5000

  sql/sql_base.cc
    1.302 05/09/15 09:02:14 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1943.10.4 05/09/15 08:59:29 msvensson@neptunus.(none) +2 -0
  Bug #12526 yassl: Crashes in "integer.cpp"
   - Disable inlining in integer.cp for sparc solaris Cun C++ 5.6

  extra/yassl/taocrypt/src/Makefile.am
    1.7 05/09/15 08:59:25 msvensson@neptunus.(none) +5 -2
    Compile integer.cpp into a separate lib in order to use special CXXFLAGS
    Add the integer.cpp lib to libtaocrypt.la

  config/ac-macros/yassl.m4
    1.5 05/09/15 08:59:25 msvensson@neptunus.(none) +11 -0
    Detect sparc Solaris + Sun C++ 5.6 and disable inlining for integer.cpp

ChangeSet
  1.1958.2.4 05/09/15 03:57:59 dlenev@mysql.com +8 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/dlenev/src/mysql-5.0-bg12704-2

  sql/sql_update.cc
    1.170 05/09/15 03:57:52 dlenev@mysql.com +0 -0
    Auto merged

  sql/sql_table.cc
    1.273 05/09/15 03:57:52 dlenev@mysql.com +0 -0
    Auto merged

  sql/sql_prepare.cc
    1.154 05/09/15 03:57:52 dlenev@mysql.com +0 -0
    Auto merged

  sql/sql_lex.h
    1.197 05/09/15 03:57:52 dlenev@mysql.com +0 -0
    Auto merged

  sql/sql_base.cc
    1.300.1.1 05/09/15 03:57:52 dlenev@mysql.com +0 -0
    Auto merged

  sql/sp_head.cc
    1.184 05/09/15 03:57:52 dlenev@mysql.com +0 -0
    Auto merged

  sql/sp.cc
    1.94 05/09/15 03:57:51 dlenev@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.351 05/09/15 03:57:51 dlenev@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.82.1 05/09/15 03:56:09 dlenev@mysql.com +16 -0
  Fix for bug #12704 "Server crashes during trigger execution".
  
  This bug occurs when some trigger for table used by DML statement is created
  or changed while statement was waiting in lock_tables(). In this situation
  prelocking set which we have calculated becames invalid which can easily lead
  to errors and even in some cases to crashes.
  
  With proposed patch we no longer silently reopen tables in lock_tables(),
  instead caller of lock_tables() becomes responsible for reopening tables and
  recalculation of prelocking set.

  sql/sql_update.cc
    1.168.1.1 05/09/15 03:56:04 dlenev@mysql.com +34 -31
    Now instead of silently reopening altered or dropped tables in
    lock_tables() we notify caller and rely on that the caller will
    reopen tables.

  sql/sql_trigger.h
    1.14 05/09/15 03:56:04 dlenev@mysql.com +2 -0
    Added Table_triggers_list::set_table() method to adjust Table_triggers_list
    to new pointer to TABLE instance.

  sql/sql_trigger.cc
    1.28 05/09/15 03:56:04 dlenev@mysql.com +19 -0
    Added Table_triggers_list::set_table() method to adjust Table_triggers_list
    to new pointer to TABLE instance.

  sql/sql_table.cc
    1.269.1.1 05/09/15 03:56:04 dlenev@mysql.com +9 -1
    Here we let mysql_lock_tables() to reopen dropped or altered tables by itself. 

  sql/sql_prepare.cc
    1.151.2.1 05/09/15 03:56:04 dlenev@mysql.com +21 -12
    Now instead of silently reopening altered or dropped tables in
    lock_tables() we notify caller and rely on that the caller will
    reopen tables.

  sql/sql_lex.h
    1.195.1.1 05/09/15 03:56:04 dlenev@mysql.com +16 -0
    LEX:
      Added 'sroutines_list_own_last' and 'sroutines_list_own_elements' members
      which are used for keeping state in which 'sroutines_list' was right after
      statement parsing (and for restoring of this list to this state).
      Added chop_off_not_own_tables() method to simplify throwing away list
      of implicitly used (prelocked) tables.

  sql/sql_lex.cc
    1.168 05/09/15 03:56:04 dlenev@mysql.com +6 -0
    LEX:
      Added 'sroutines_list_own_last' and 'sroutines_list_own_elements' members
      which are used for keeping state in which 'sroutines_list' was right after
      statement parsing (and for restoring of this list to this state).

  sql/sql_insert.cc
    1.174 05/09/15 03:56:03 dlenev@mysql.com +3 -1
    Here we let mysql_lock_tables() to reopen dropped or altered tables by itself. 

  sql/sql_handler.cc
    1.74 05/09/15 03:56:03 dlenev@mysql.com +2 -1
    Here we let mysql_lock_tables() to reopen dropped or altered tables by itself. 

  sql/sql_base.cc
    1.296.2.1 05/09/15 03:56:03 dlenev@mysql.com +104 -33
    reopen_table():
      When we re-open table and do shallow copy of TABLE object we should adjust
      pointers to it in associated Table_triggers_list object. Removed nil
      operation.
    open_tables():
      Now this function is able to rebuild prelocking set for statement if it is
      needed. It also correctly handles FLUSH TABLES which may occur during its
      execution.
    lock_tables():
      Instead of allowing mysql_lock_tables() to silently reopen altered or dropped
      tables let us notify caller and rely on that it will do reopen itself.
      This solves the problem when trigger suddenly appears or changed during
      mysq_lock_tables().
    close_tables_for_reopen():
      Added routine for properly preparing for reopening of tables and recalculation
      of set of prelocked tables.

  sql/sp_head.cc
    1.179.3.1 05/09/15 03:56:03 dlenev@mysql.com +0 -4
    Removed assert which is no longer always true.

  sql/sp.h
    1.29 05/09/15 03:56:03 dlenev@mysql.com +1 -0
    sp_remove_not_own_routines():
      Added procedure for restoring LEX::sroutines/sroutines_list to their state
      right after parsing (by throwing out non-directly used routines).

  sql/sp.cc
    1.92.1.1 05/09/15 03:56:03 dlenev@mysql.com +61 -6
    sp_add_used_routine():
      To be able to restore LEX::sroutines_list to its state right after parsing
      we now adjust  LEX::sroutines_list_own_last/sroutines_list_own_elements when
      we add directly used routine.
    sp_remove_not_own_routines():
      Added procedure for restoring LEX::sroutines/sroutines_list to their state
      right after parsing (by throwing out non-directly used routines).
    sp_cache_routines_and_add_tables_for_view()/sp_update_stmt_used_routines():
      We should use LEX::sroutines_list instead of LEX::sroutines as source of
      routines used by view, since LEX::sroutines is not availiable for view
      on second attempt to open it (see comment in open_tables() about it).

  sql/mysql_priv.h
    1.346.1.1 05/09/15 03:56:03 dlenev@mysql.com +5 -2
    Now mysql_lock_tables() can either reopen deleted or altered tables by itself
    or notify caller about such situation through 'need_reopen' argument and rely
    on it in this.
    Also lock_tables() has new 'need_reopen' out parameter through which it
    notifies caller that some tables were altered or dropped so he needs to reopen
    them (and rebuild prelocking set some triggers may change or simply appear).

  sql/lock.cc
    1.77 05/09/15 03:56:03 dlenev@mysql.com +18 -3
    mysql_lock_tables():
      Now instead of always reopening altered or dropped tables by itself
      mysql_lock_tables() can notify upper level and rely on caller doing this.

  mysql-test/t/trigger.test
    1.27 05/09/15 03:56:03 dlenev@mysql.com +113 -3
    Added tests for bug #12704 "Server crashes during trigger execution".
    Unfortunately these tests rely on the order in which tables are locked
    by statement so they are non-determenistic and therefore should be disabled.

ChangeSet
  1.1958.2.3 05/09/14 16:27:55 elliot@mysql.com +1 -0
  Updated test results for view test.

  mysql-test/r/view.result
    1.117 05/09/14 16:27:52 elliot@mysql.com +3 -3
    Updated test results

ChangeSet
  1.1958.3.1 05/09/14 23:12:01 bell@sanja.is.com.ua +2 -0
  fixed portability

  mysql-test/t/rpl_view.test
    1.3 05/09/14 23:11:56 bell@sanja.is.com.ua +1 -1
    fixed portability

  mysql-test/r/rpl_view.result
    1.3 05/09/14 23:11:56 bell@sanja.is.com.ua +1 -2
    fixed portability

ChangeSet
  1.1958.2.1 05/09/14 14:44:48 elliot@mysql.com +1 -0
  Merge mysql.com:/home/emurphy/src/work/mysql-5.0-bug-12870
  into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0

  sql/sql_parse.cc
    1.488 05/09/14 14:44:43 elliot@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1943.24.1 05/09/14 14:42:39 elliot@mysql.com +3 -0
  BUG#12870 (CREATE PROCEDURE followed by ROLLBACK is not replicated)
  Fixed by making CREATE/ALTER/DROP PROCEDURE cause implicit commit.

  sql/sql_parse.cc
    1.485.2.1 05/09/14 14:42:34 elliot@mysql.com +9 -0
    CREATE/ALTER/DROP PROCEDURE/SPFUNCTION now causes implicit commit.

  mysql-test/t/rpl_ddl.test
    1.6 05/09/14 14:42:34 elliot@mysql.com +52 -1
    BUG#12870 test implicit commit for create/alter/drop procedure.

  mysql-test/r/rpl_ddl.result
    1.7 05/09/14 14:42:34 elliot@mysql.com +182 -0
    Updated results to include testing of implicit commit for
    create/alter/drop procedure

ChangeSet
  1.1958.1.2 05/09/14 11:02:33 eric@mysql.com +1 -0
  Per LenZ, changed calculated buffer size to constant and removed some unused variables.

  sql/ha_federated.cc
    1.42 05/09/14 11:02:28 eric@mysql.com +8 -21
    converted calculated buffer size to static interger.
    removed unused variables.

ChangeSet
  1.1958.1.1 05/09/14 20:32:59 aivanov@mysql.com +2 -0
  Merge mysql.com:/home/alexi/mysql-5.0
  into  mysql.com:/home/alexi/dev/mysql-5.0-13000

  mysql-test/t/view.test
    1.108 05/09/14 20:32:47 aivanov@mysql.com +0 -0
    Auto merged

  mysql-test/r/view.result
    1.116 05/09/14 20:32:47 aivanov@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1953.8.1 05/09/14 20:25:00 aivanov@mysql.com +6 -0
  Fixed BUG#12963, BUG#13000: wrong VIEW creation with DAYNAME(),
   DAYOFWEEK(), and WEEKDAY().

  sql/item_timefunc.h
    1.59 05/09/14 20:24:30 aivanov@mysql.com +4 -1
    Fixed bugs #12963, 13000: wrong VIEW creation with DAYNAME(),
     DAYOFWEEK(), and WEEKDAY.
     Modified Item_func_weekday::func_name(). It returns now different
     names depending on the odbc_type attribute value.

  sql/item_timefunc.cc
    1.94 05/09/14 20:24:30 aivanov@mysql.com +7 -6
    Fixed bugs #12963, #13000: wrong VIEW creation with DAYNAME(),
     DAYOFWEEK(), and WEEKDAY().
     Modified Item_func_weekday::val_int(). The argument of weekday should
     not be considered now to be Item_func_to_days object.

  sql/item_create.cc
    1.58 05/09/14 20:24:30 aivanov@mysql.com +3 -3
    Fixed bugs #12963, #13000: wrong VIEW creation with DAYNAME(),
     DAYOFWEEK(), and WEEKDAY().
     Modified create_func_dayname(), create_func_dayofweek(), and
     create_func_weekday(). They don´t insert Item_func_to_days
     object now.

  mysql-test/t/view.test
    1.106.1.1 05/09/14 20:24:30 aivanov@mysql.com +31 -0
    Added testcases for for bugs #12963, #13000.

  mysql-test/r/view.result
    1.112.1.1 05/09/14 20:24:30 aivanov@mysql.com +43 -0
    Fixed some testcases results (bugs #12963, #13000).

  mysql-test/r/func_time.result
    1.46 05/09/14 20:24:30 aivanov@mysql.com +1 -1
    Fixed new results for testcases containing EXPLAIN EXTENDED SELECT ...
     WEEKDAY ... DAYNAME. The new results are correct and correspond to
     the changes in create_func_weekday() and create_func_dayname().

ChangeSet
  1.1959 05/09/14 18:22:43 ingo@mysql.com +1 -0
  Merge mysql.com:/home/mydev/mysql-5.0
  into  mysql.com:/home/mydev/mysql-5.0-5000

  sql/sql_show.cc
    1.281 05/09/14 18:22:25 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1955 05/09/14 17:27:33 bell@sanja.is.com.ua +1 -0
  postmerge fix

  mysql-test/r/view.result
    1.115 05/09/14 17:27:29 bell@sanja.is.com.ua +1 -1
    postmerge fix

ChangeSet
  1.1953.6.1 05/09/15 00:21:25 stewart@mysql.com +2 -0
  BUG#13136 NdbTCP.cpp compile failure on OSX 10.2
  
  use select if poll is unavailable.

  ndb/src/common/portlib/win32/NdbTCP.c
    1.4 05/09/15 00:21:21 stewart@mysql.com +1 -1
    fix typo (found while fixing this bug)

  ndb/src/common/portlib/NdbTCP.cpp
    1.13 05/09/15 00:21:21 stewart@mysql.com +32 -0
    Implement Ndb_check_socket_hup for systems without poll(2)

ChangeSet
  1.1953.5.1 05/09/14 15:46:31 tulin@dl145c.mysql.com +3 -0
  enabled mysqldump hex-blob option for bit fields

  mysql-test/t/ndb_bitfield.test
    1.4 05/09/14 15:46:28 tulin@dl145c.mysql.com +1 -1
    enabled mysqldump hex-blob option for bit fields

  mysql-test/r/ndb_bitfield.result
    1.4 05/09/14 15:46:28 tulin@dl145c.mysql.com +8 -8
    enabled mysqldump hex-blob option for bit fields

  client/mysqldump.c
    1.201 05/09/14 15:46:28 tulin@dl145c.mysql.com +2 -1
    enabled mysqldump hex-blob option for bit fields

ChangeSet
  1.1953.3.3 05/09/14 16:10:56 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
  Fix for Metrowerks compiler.

  strings/my_strtoll10.c
    1.11 05/09/14 16:10:49 jani@a193-229-222-105.elisa-laajakaista.fi +6 -0
    Fix for Metrowerks compiler.

ChangeSet
  1.1950.3.1 05/09/14 14:34:45 joerg@mysql.com +2 -0
  Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0

  mysql-test/lib/mtr_report.pl
    1.16 05/09/14 14:34:41 joerg@mysql.com +0 -0
    Auto merged

  mysql-test/lib/mtr_process.pl
    1.21 05/09/14 14:34:41 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2275.2 05/09/14 13:55:53 joerg@mysql.com +2 -0
  Improve error / process handling in the Perl script to run the test suite (patch supplied by Kent).

  mysql-test/lib/mtr_report.pl
    1.11.1.3 05/09/14 13:55:48 joerg@mysql.com +6 -0
    New function to handle errors in child processes separate from the parent process (patch supplied by Kent).
    Expected to avoid HUP signals.

  mysql-test/lib/mtr_process.pl
    1.15.1.4 05/09/14 13:55:48 joerg@mysql.com +5 -5
    Handle errors in child processes separate from the parent process (patch supplied by Kent).

ChangeSet
  1.1953.3.2 05/09/14 13:44:44 tulin@dl145c.mysql.com +1 -0
  indentation correction

  sql/table.cc
    1.189 05/09/14 13:44:40 tulin@dl145c.mysql.com +1 -1
    indentation correction

ChangeSet
  1.1953.1.3 05/09/14 13:37:16 ingo@mysql.com +6 -0
  Merge mysql.com:/home/mydev/mysql-4.1-4100
  into  mysql.com:/home/mydev/mysql-5.0-5000

  sql/structs.h
    1.49 05/09/14 13:37:11 ingo@mysql.com +1 -2
    Manual merge.

  sql/sql_show.cc
    1.279.1.1 05/09/14 13:37:11 ingo@mysql.com +4 -4
    Manual merge.

  sql/mysqld.cc
    1.496 05/09/14 13:37:11 ingo@mysql.com +4 -8
    Manual merge.

  sql/sql_test.cc
    1.43 05/09/14 13:30:10 ingo@mysql.com +0 -0
    Auto merged

  mysys/mf_keycache.c
    1.53 05/09/14 13:30:09 ingo@mysql.com +0 -0
    Auto merged

  include/my_sys.h
    1.168 05/09/14 13:30:09 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1943.23.2 05/09/14 13:24:41 tulin@dl145c.mysql.com +1 -0
  (corrected typo in prev patch) Bug #13152 bit fields and fileds that follow become corrupted when dumped from NDB

  sql/table.cc
    1.188 05/09/14 13:23:50 ndbdev@dl145c.mysql.com +1 -1
    (corrected typo in prev patch) Bug #13152 bit fields and fileds that follow become corrupted when dumped from NDB

ChangeSet
  1.1616.2143.84 05/09/14 13:18:16 ingo@mysql.com +8 -0
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.

  sql/structs.h
    1.36.1.4 05/09/14 13:18:11 ingo@mysql.com +1 -1
    Bug#12920 - key_read_requests counter appears to re-set
    After merge fix.
    Added a branch for long long keycache values.

  sql/sql_test.cc
    1.30.1.5 05/09/14 13:18:11 ingo@mysql.com +13 -6
    Bug#12920 - key_read_requests counter appears to re-set
    After merge fix.
    changed to print full values.

  sql/sql_show.cc
    1.122.1.81 05/09/14 13:18:11 ingo@mysql.com +4 -0
    Bug#12920 - key_read_requests counter appears to re-set
    After merge fix.
    Added a branch for long long values.

  sql/mysqld.cc
    1.356.98.9 05/09/14 13:18:11 ingo@mysql.com +4 -4
    Bug#12920 - key_read_requests counter appears to re-set
    After merge fix.
    Changed to print full value.

  mysys/mf_keycache.c
    1.46.1.6 05/09/14 13:18:11 ingo@mysql.com +7 -6
    Bug#12920 - key_read_requests counter appears to re-set
    After merge fix.
    Status variables moved into KEY_CACHE in 4.1.
    Changed their debug printout.

  myisam/mi_test2.c
    1.29 05/09/14 13:18:11 ingo@mysql.com +6 -4
    Bug#12920 - key_read_requests counter appears to re-set
    After merge fix.
    Status variables moved into KEY_CACHE in 4.1.
    Changed to print default key cache status.

  include/my_sys.h
    1.116.1.27 05/09/14 13:18:11 ingo@mysql.com +0 -3
    Bug#12920 - key_read_requests counter appears to re-set
    After merge fix.
    Status variables moved into KEY_CACHE in 4.1.
    Removed unused global variables.

  include/keycache.h
    1.6 05/09/14 13:18:11 ingo@mysql.com +4 -4
    Bug#12920 - key_read_requests counter appears to re-set
    After merge fix.
    Status variables moved into KEY_CACHE in 4.1.
    Enlarging them there.

ChangeSet
  1.1616.2275.1 05/09/14 13:12:30 joerg@mysql.com +1 -0
  Minor output format change of the Perl test suite script (align with the shell script).

  mysql-test/lib/mtr_report.pl
    1.11.1.2 05/09/14 13:12:26 joerg@mysql.com +3 -3
    Make the Perl test script output identical to that of the (old) shell script,
    so that reported differences compare as equal strings (for automatic analysis).

ChangeSet
  1.1953.2.1 05/09/14 13:07:25 ingo@mysql.com +1 -0
  Merge mysql.com:/home/mydev/mysql-5.0
  into  mysql.com:/home/mydev/mysql-5.0-5000

  include/my_global.h
    1.107 05/09/14 13:07:16 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1953.1.1 05/09/14 14:54:48 petr@mysql.com +2 -0
  Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin

  mysql-test/t/sp.test
    1.151 05/09/14 14:54:42 petr@mysql.com +0 -0
    Auto merged

  mysql-test/r/sp.result
    1.155 05/09/14 14:54:42 petr@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1954 05/09/14 13:37:40 bell@sanja.is.com.ua +2 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0

  sql/share/errmsg.txt
    1.44 05/09/14 13:37:36 bell@sanja.is.com.ua +2 -2
    merge

  sql/sql_yacc.yy
    1.425 05/09/14 13:34:43 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1943.23.1 05/09/14 11:41:36 tulin@dl145c.mysql.com +3 -0
  Bug #13152 bit fields and fileds that follow become corrupted when dumped from NDB tables

  sql/table.cc
    1.187 05/09/14 11:40:54 tulin@dl145c.mysql.com +2 -0
    Bug #13152 bit fields and fileds that follow become corrupted when dumped from NDB tables

  mysql-test/t/ndb_bitfield.test
    1.3 05/09/14 11:40:54 tulin@dl145c.mysql.com +52 -0
    Bug #13152 bit fields and fileds that follow become corrupted when dumped from NDB tables

  mysql-test/r/ndb_bitfield.result
    1.3 05/09/14 11:40:54 tulin@dl145c.mysql.com +58 -0
    Bug #13152 bit fields and fileds that follow become corrupted when dumped from NDB tables

ChangeSet
  1.1950.1.3 05/09/14 12:26:09 bell@sanja.is.com.ua +5 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0

  sql/sql_view.cc
    1.63 05/09/14 12:26:02 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_show.cc
    1.280 05/09/14 12:26:02 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.487 05/09/14 12:26:02 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_acl.cc
    1.170 05/09/14 12:26:01 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.350 05/09/14 12:26:01 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1950.1.2 05/09/14 12:24:14 bell@sanja.is.com.ua +6 -0
  postmerge fix

  mysql-test/r/view.result
    1.114 05/09/14 12:24:10 bell@sanja.is.com.ua +22 -22
    postmerge fix

  mysql-test/r/temp_table.result
    1.18 05/09/14 12:24:10 bell@sanja.is.com.ua +1 -1
    postmerge fix

  mysql-test/r/sql_mode.result
    1.28 05/09/14 12:24:10 bell@sanja.is.com.ua +2 -2
    postmerge fix

  mysql-test/r/mysqldump.result
    1.71 05/09/14 12:24:10 bell@sanja.is.com.ua +4 -4
    postmerge fix

  mysql-test/r/lowercase_view.result
    1.11 05/09/14 12:24:10 bell@sanja.is.com.ua +3 -3
    postmerge fix

  mysql-test/r/func_in.result
    1.21 05/09/14 12:24:10 bell@sanja.is.com.ua +1 -1
    postmerge fix

ChangeSet
  1.1952 05/09/14 10:54:02 pem@mysql.com +4 -0
  Post-review fix for BUG#12712: SET AUTOCOMMIT should fail within SP/functions/triggers

  sql/sql_yacc.yy
    1.424 05/09/14 10:53:55 pem@mysql.com +8 -9
    Post-review fix for autocommit check in SPs and triggers.

  sql/sp_head.h
    1.70 05/09/14 10:53:55 pem@mysql.com +2 -1
    Post-review fix for autocommit check in SPs and triggers.

  mysql-test/t/sp.test
    1.149.1.1 05/09/14 10:53:55 pem@mysql.com +1 -0
    Added missing drop table.

  mysql-test/r/sp.result
    1.153.1.1 05/09/14 10:53:55 pem@mysql.com +1 -0
    Added missing drop table.

ChangeSet
  1.1943.10.3 05/09/14 10:34:45 msvensson@neptunus.(none) +1 -0
  Cset exclude: msvensson@neptunus.(none)|ChangeSet|20050913150614|63378

ChangeSet
  1.1616.2143.83 05/09/14 10:34:41 ingo@mysql.com +5 -0
  Merge mysql.com:/home/mydev/mysql-4.0-4000
  into  mysql.com:/home/mydev/mysql-4.1-4100

  sql/sql_test.cc
    1.30.1.4 05/09/14 10:34:37 ingo@mysql.com +0 -8
    Bug#12920 - key_read_requests counter appears to re-set
    Manual merge requiring after merge fix.

  sql/mysqld.cc
    1.356.98.8 05/09/14 10:34:37 ingo@mysql.com +0 -4
    Bug#12920 - key_read_requests counter appears to re-set
    Manual merge requiring after merge fix.

  mysys/mf_keycache.c
    1.46.1.5 05/09/14 10:34:37 ingo@mysql.com +0 -7
    Bug#12920 - key_read_requests counter appears to re-set
    Manual merge requiring after merge fix.

  myisam/mi_test2.c
    1.28 05/09/14 10:34:37 ingo@mysql.com +3 -7
    Bug#12920 - key_read_requests counter appears to re-set
    Manual merge requiring after merge fix.

  include/my_sys.h
    1.116.1.26 05/09/14 10:34:37 ingo@mysql.com +2 -4
    Bug#12920 - key_read_requests counter appears to re-set
    Manual merge requiring after merge fix.

  extra/yassl/taocrypt/src/integer.cpp
    1.17 05/09/14 10:34:32 msvensson@neptunus.(none) +0 -0
    Exclude

ChangeSet
  1.1950.1.1 05/09/14 11:07:04 bell@sanja.is.com.ua +12 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0

  mysql-test/t/view.test
    1.107 05/09/14 11:07:00 bell@sanja.is.com.ua +0 -0
    merge

  mysql-test/r/view.result
    1.113 05/09/14 11:07:00 bell@sanja.is.com.ua +0 -21
    merge

  mysql-test/r/temp_table.result
    1.17 05/09/14 11:07:00 bell@sanja.is.com.ua +0 -1
    merge

  mysql-test/r/sql_mode.result
    1.27 05/09/14 11:07:00 bell@sanja.is.com.ua +0 -2
    merge

  mysql-test/r/mysqldump.result
    1.70 05/09/14 11:07:00 bell@sanja.is.com.ua +0 -3
    merge

  mysql-test/r/lowercase_view.result
    1.10 05/09/14 11:07:00 bell@sanja.is.com.ua +0 -3
    merge

  mysql-test/r/func_in.result
    1.20 05/09/14 11:07:00 bell@sanja.is.com.ua +0 -1
    merge

  sql/table.h
    1.114 05/09/14 11:00:31 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.422.1.1 05/09/14 11:00:30 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_show.cc
    1.278.1.1 05/09/14 11:00:30 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.485.1.1 05/09/14 11:00:29 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_acl.cc
    1.167.1.2 05/09/14 11:00:29 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.1.805 05/09/14 09:56:49 ingo@mysql.com +5 -0
  Bug#12920 - key_read_requests counter appears to re-set
  Enlarged the counter variables to ulonglong.

  sql/sql_test.cc
    1.9.1.7 05/09/14 09:56:45 ingo@mysql.com +8 -7
    Bug#12920 - key_read_requests counter appears to re-set
    Enlarged the counter variables to ulonglong.

  sql/mysqld.cc
    1.297.54.1 05/09/14 09:56:45 ingo@mysql.com +4 -4
    Bug#12920 - key_read_requests counter appears to re-set
    Enlarged the counter variables to ulonglong.

  mysys/mf_keycache.c
    1.21.1.3 05/09/14 09:56:45 ingo@mysql.com +7 -5
    Bug#12920 - key_read_requests counter appears to re-set
    Enlarged the counter variables to ulonglong.

  myisam/mi_test2.c
    1.12.1.6 05/09/14 09:56:45 ingo@mysql.com +4 -2
    Bug#12920 - key_read_requests counter appears to re-set
    Enlarged the counter variables to ulonglong.

  include/my_sys.h
    1.75.6.2 05/09/14 09:56:44 ingo@mysql.com +2 -2
    Bug#12920 - key_read_requests counter appears to re-set
    Enlarged the counter variables to ulonglong.

ChangeSet
  1.1935.81.1 05/09/14 10:53:09 bell@sanja.is.com.ua +23 -0
  part 1 (ver 2, postreview fix) of WL#2787
  view definer information syntax/storage/replication
  fixed SOURCE field of .frm

  sql/table.h
    1.111.2.1 05/09/14 10:53:03 bell@sanja.is.com.ua +4 -0
    definer information storage

  sql/sql_yacc.yy
    1.419.1.1 05/09/14 10:53:03 bell@sanja.is.com.ua +67 -7
    definer information sintax support
    getting SOURCE field information for .frm 

  sql/sql_view.cc
    1.61.1.1 05/09/14 10:53:03 bell@sanja.is.com.ua +88 -15
    check of definer clause
    changes in .frm file
    definer information storage support
    now we store only original SELECT in SOURCE field of .frm

  sql/sql_show.cc
    1.275.3.1 05/09/14 10:53:03 bell@sanja.is.com.ua +30 -16
    new CREATE VIEW options printed

  sql/sql_parse.cc
    1.483.1.1 05/09/14 10:53:03 bell@sanja.is.com.ua +55 -1
    send CREATE/ALTER VIEW for replication with full list of options
    set current user as definer procedure

  sql/sql_lex.h
    1.196 05/09/14 10:53:03 bell@sanja.is.com.ua +6 -0
    storing definer information

  sql/sql_acl.h
    1.46 05/09/14 10:53:03 bell@sanja.is.com.ua +1 -1
    make find_acl_user public to allow to check user

  sql/sql_acl.cc
    1.167.2.1 05/09/14 10:53:02 bell@sanja.is.com.ua +23 -0
    make find_acl_user public to allow to check user

  sql/share/errmsg.txt
    1.42.1.1 05/09/14 10:53:02 bell@sanja.is.com.ua +8 -0
    new errors/warnings

  sql/mysql_priv.h
    1.348.1.1 05/09/14 10:53:02 bell@sanja.is.com.ua +6 -0
    CREATE/ALTER VIEW print support
    set current user as definer procedure

  mysql-test/t/view_grant.test
    1.4 05/09/14 10:53:02 bell@sanja.is.com.ua +5 -0
    test of grant check of definer information

  mysql-test/t/view.test
    1.104.2.1 05/09/14 10:53:02 bell@sanja.is.com.ua +9 -0
    test of storing/restoring definer information

  mysql-test/t/skip_grants.test
    1.4 05/09/14 10:53:02 bell@sanja.is.com.ua +1 -2
    --skip-grants do not allow use user information

  mysql-test/t/rpl_view.test
    1.2 05/09/14 10:53:02 bell@sanja.is.com.ua +3 -0
    check log of queries

  mysql-test/r/view_grant.result
    1.4 05/09/14 10:53:02 bell@sanja.is.com.ua +9 -4
    test of grant check of definer information
    definer information added to CREATE VIEW

  mysql-test/r/view.result
    1.109.3.1 05/09/14 10:53:02 bell@sanja.is.com.ua +30 -21
    definer information added to CREATE VIEW
    test of storing/restoring definer information

  mysql-test/r/temp_table.result
    1.14.1.1 05/09/14 10:53:02 bell@sanja.is.com.ua +1 -1
    definer information added to CREATE VIEW

  mysql-test/r/sql_mode.result
    1.25.1.1 05/09/14 10:53:02 bell@sanja.is.com.ua +2 -2
    definer information added to CREATE VIEW

  mysql-test/r/skip_grants.result
    1.4 05/09/14 10:53:02 bell@sanja.is.com.ua +1 -1
    --skip-grants do not allow use user information

  mysql-test/r/rpl_view.result
    1.2 05/09/14 10:53:02 bell@sanja.is.com.ua +13 -0
    check log of queries

  mysql-test/r/mysqldump.result
    1.65.1.1 05/09/14 10:53:02 bell@sanja.is.com.ua +3 -3
    definer information added to CREATE VIEW

  mysql-test/r/lowercase_view.result
    1.8.1.1 05/09/14 10:53:02 bell@sanja.is.com.ua +3 -3
    definer information added to CREATE VIEW

  mysql-test/r/func_in.result
    1.18.1.1 05/09/14 10:53:02 bell@sanja.is.com.ua +1 -1
    definer information added to CREATE VIEW

ChangeSet
  1.1949.1.1 05/09/14 12:46:03 gluh@mysql.com +1 -0
  Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/gluh/MySQL/Bugs/5.0.cml

  sql/sql_show.cc
    1.279 05/09/14 12:45:56 gluh@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1951 05/09/14 09:43:02 pem@mysql.com +1 -0
  Merge mysql.com:/usr/local/bk/mysql-5.0
  into  mysql.com:/usr/home/pem/mysql-5.0

  sql/sql_yacc.yy
    1.423 05/09/14 09:42:53 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1943.1.17 05/09/14 12:11:19 gluh@mysql.com +4 -0
  Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/gluh/MySQL/Bugs/5.0.cml

  sql/sql_show.cc
    1.275.1.2 05/09/14 12:11:11 gluh@mysql.com +0 -0
    Auto merged

  sql/sql_prepare.cc
    1.153 05/09/14 12:11:11 gluh@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.486 05/09/14 12:11:11 gluh@mysql.com +0 -0
    Auto merged

  sql/sql_acl.cc
    1.169 05/09/14 12:11:10 gluh@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1943.3.2 05/09/14 12:10:07 gluh@eagle.intranet.mysql.r18.ru +1 -0
  formatting typo fix

  sql/sql_parse.cc
    1.484.1.2 05/09/14 12:10:02 gluh@mysql.com +4 -4
    formatting typo fix

ChangeSet
  1.1943.22.1 05/09/14 08:33:00 msvensson@neptunus.(none) +1 -0
  Fix QNX warning

  include/my_global.h
    1.105.1.1 05/09/14 08:32:54 msvensson@neptunus.(none) +3 -1
    Avoid warnings on QNX, only define HAVE_RINT if not found by configure

ChangeSet
  1.1943.21.1 05/09/14 08:32:32 ingo@mysql.com +1 -0
  Merge mysql.com:/home/mydev/mysql-5.0
  into  mysql.com:/home/mydev/mysql-5.0-5000

  sql/sql_base.cc
    1.301 05/09/14 08:32:10 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1943.1.16 05/09/13 23:31:17 eric@mysql.com +4 -0
  Improvement to federated for BUG#12659
  Now many direct references to my_error() have been removed.

  sql/ha_federated.h
    1.20 05/09/13 23:31:13 eric@mysql.com +12 -0
    added error number, and places to stash error message and number
    added private method to stash error

  sql/ha_federated.cc
    1.41 05/09/13 23:31:13 eric@mysql.com +45 -48
    some minor 80 column formatting
    corrected some error handling to be more handler print_error friendly
    moved duplicate code into new "stash_remote_error" function

  mysql-test/t/federated_archive.test
    1.3 05/09/13 23:31:13 eric@mysql.com +3 -3
    corrected error number

  mysql-test/r/federated_archive.result
    1.3 05/09/13 23:31:13 eric@mysql.com +2 -2
    new results with new error message

ChangeSet
  1.1948 05/09/14 08:10:18 msvensson@neptunus.(none) +6 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new

  sql/table.h
    1.113 05/09/14 08:10:13 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/sql_show.cc
    1.278 05/09/14 08:10:13 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/item.cc
    1.178 05/09/14 08:10:12 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/mysqldump.test
    1.63 05/09/14 08:10:12 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/view.result
    1.112 05/09/14 08:10:12 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/mysqldump.result
    1.69 05/09/14 08:10:12 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1943.20.1 05/09/14 07:25:32 petr@mysql.com +5 -0
  fix for Bug #12979 Stored procedures: crash if inout decimal parameter

  sql/item_func.cc
    1.251 05/09/14 07:25:21 petr@mysql.com +1 -1
    call correct method of the item

  mysql-test/t/type_newdecimal.test
    1.29 05/09/14 07:25:21 petr@mysql.com +7 -0
    add a test for the bug

  mysql-test/t/sp.test
    1.150 05/09/14 07:25:21 petr@mysql.com +29 -0
    add a test for the bug

  mysql-test/r/type_newdecimal.result
    1.29 05/09/14 07:25:21 petr@mysql.com +3 -0
    fix result

  mysql-test/r/sp.result
    1.154 05/09/14 07:25:20 petr@mysql.com +16 -0
    fix result

ChangeSet
  1.1943.16.3 05/09/14 04:40:18 monty@mishka.mysql.fi +1 -0
  Removed compiler warnings

  client/mysqldump.c
    1.200 05/09/14 04:40:14 monty@mishka.mysql.fi +2 -1
    Removed compiler warnings

ChangeSet
  1.1943.16.2 05/09/14 04:18:38 monty@mishka.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mishka.mysql.fi:/home/my/mysql-5.0

  mysql-test/t/mysqldump.test
    1.59.1.3 05/09/14 04:18:32 monty@mishka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1943.19.1 05/09/14 03:18:05 monty@mishka.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mishka.mysql.fi:/home/my/mysql-5.0

  sql/unireg.cc
    1.68 05/09/14 03:17:59 monty@mishka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1943.18.2 05/09/14 03:16:25 monty@mishka.mysql.fi +1 -0
  Fixed wrong merge

  mysql-test/t/mysqldump.test
    1.59.4.2 05/09/14 03:16:20 monty@mishka.mysql.fi +2 -2
    Fixed wrong merge

ChangeSet
  1.1943.18.1 05/09/14 01:47:38 monty@mishka.mysql.fi +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mishka.mysql.fi:/home/my/mysql-5.0

  mysql-test/t/mysqldump.test
    1.59.4.1 05/09/14 01:47:33 monty@mishka.mysql.fi +1 -2
    Merge

  sql/sql_table.cc
    1.272 05/09/14 01:44:02 monty@mishka.mysql.fi +0 -0
    Auto merged

  sql/item.cc
    1.176.1.2 05/09/14 01:44:02 monty@mishka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1943.17.1 05/09/14 01:41:44 monty@mishka.mysql.fi +26 -0
  Added option --valgrind-mysqltest to mysql-test-run
  Added flag to Field::store(longlong) to specify if value is unsigned.
  This fixes bug #12750: Incorrect storage of 9999999999999999999 in DECIMAL(19, 0)
  Fixed warning from valgrind in CREATE ... SELECT
  Fixed double free of mysql.options if reconnect failed

  sql/unireg.cc
    1.66.1.1 05/09/14 01:41:38 monty@mishka.mysql.fi +1 -1
    Fixed calls to Field::store(longlong,flag)

  sql/tztime.cc
    1.26 05/09/14 01:41:38 monty@mishka.mysql.fi +3 -3
    Fixed calls to Field::store(longlong,flag)

  sql/sql_udf.cc
    1.53 05/09/14 01:41:38 monty@mishka.mysql.fi +2 -2
    Fixed calls to Field::store(longlong,flag)

  sql/sql_table.cc
    1.270.1.1 05/09/14 01:41:38 monty@mishka.mysql.fi +1 -0
    Fixed varning from valgrind

  sql/sql_show.cc
    1.275.2.1 05/09/14 01:41:38 monty@mishka.mysql.fi +17 -17
    Fixed calls to Field::store(longlong,flag)

  sql/sql_help.cc
    1.50 05/09/14 01:41:38 monty@mishka.mysql.fi +2 -2
    Fixed calls to Field::store(longlong,flag)

  sql/sql_acl.cc
    1.167.1.1 05/09/14 01:41:38 monty@mishka.mysql.fi +10 -9
    Fixed calls to Field::store(longlong,flag)

  sql/sp.cc
    1.93 05/09/14 01:41:38 monty@mishka.mysql.fi +1 -1
    Fixed calls to Field::store(longlong,flag)

  sql/item_sum.cc
    1.164 05/09/14 01:41:38 monty@mishka.mysql.fi +2 -2
    Fixed calls to Field::store(longlong,flag)

  sql/item.cc
    1.176.2.1 05/09/14 01:41:38 monty@mishka.mysql.fi +6 -8
    Fixed calls to Field::store(longlong,flag)

  sql/handler.cc
    1.187 05/09/14 01:41:38 monty@mishka.mysql.fi +1 -1
    Fixed calls to Field::store(longlong,flag)

  sql/ha_ndbcluster.cc
    1.205 05/09/14 01:41:38 monty@mishka.mysql.fi +4 -2
    Fixed calls to Field::store(longlong,flag)

  sql/field_conv.cc
    1.51 05/09/14 01:41:37 monty@mishka.mysql.fi +4 -3
    Fixed calls to Field::store(longlong,flag)

  sql/field.h
    1.166 05/09/14 01:41:37 monty@mishka.mysql.fi +28 -27
    Added flag to Field::store(longlong) to specify if value is unsigned

  sql/field.cc
    1.282 05/09/14 01:41:37 monty@mishka.mysql.fi +131 -80
    Added flag to Field::store(longlong) to specify if value is unsigned

  sql-common/client.c
    1.78 05/09/14 01:41:37 monty@mishka.mysql.fi +9 -2
    Fixed double free of mysql.options if reconnect failed

  mysql-test/t/strict.test
    1.19 05/09/14 01:41:37 monty@mishka.mysql.fi +3 -1
    Added errors for things that previously (wrongly) succeeded

  mysql-test/t/range.test
    1.33 05/09/14 01:41:37 monty@mishka.mysql.fi +2 -2
    0xff numbers are now unsigned

  mysql-test/t/mysqldump.test
    1.59.3.1 05/09/14 01:41:37 monty@mishka.mysql.fi +1 -1
    Fixed result to not depend on existing config files

  mysql-test/t/innodb.test
    1.108 05/09/14 01:41:37 monty@mishka.mysql.fi +0 -3
    Removed comments affected by this bug fix

  mysql-test/t/bigint.test
    1.26 05/09/14 01:41:37 monty@mishka.mysql.fi +152 -1
    Added testing for #12750: Incorrect storage of 9999999999999999999 in DECIMAL(19, 0)

  mysql-test/r/type_ranges.result
    1.37 05/09/14 01:41:37 monty@mishka.mysql.fi +4 -2
    Update results after fix for Field::store(longlong)

  mysql-test/r/strict.result
    1.25 05/09/14 01:41:37 monty@mishka.mysql.fi +6 -4
    Update results after fix for Field::store(longlong)
    (This fixes some wrong results when storing things into bigint columns)

  mysql-test/r/range.result
    1.40 05/09/14 01:41:37 monty@mishka.mysql.fi +2 -2
    Update results after fix for Field::store(longlong)

  mysql-test/r/bigint.result
    1.30 05/09/14 01:41:37 monty@mishka.mysql.fi +185 -7
    Update results after fix for Field::store(longlong)

  mysql-test/mysql-test-run.sh
    1.274 05/09/14 01:41:36 monty@mishka.mysql.fi +9 -1
    Added option --valgrind-mysqltest to allow one to run mysqltest with valgrind

ChangeSet
  1.1943.1.14 05/09/13 14:53:19 reggie@ubuntu.(none) +10 -0
  fixed the service bits of the IM

  server-tools/instance-manager/options.h
    1.11 05/09/13 14:48:44 reggie@ubuntu.(none) +2 -1
    Added stand alone command line arg

  server-tools/instance-manager/options.cc
    1.27 05/09/13 14:48:44 reggie@ubuntu.(none) +5 -0
    Added stand alone command line arg

  server-tools/instance-manager/mysqlmanager.cc
    1.15 05/09/13 14:48:44 reggie@ubuntu.(none) +6 -4
    if we are given the stand alone option, then run the manager as 
    standalone

  server-tools/instance-manager/listener.cc
    1.19 05/09/13 14:48:43 reggie@ubuntu.(none) +8 -5
    use a timeval for select so that our select will only run
    for 100 msec before we check to see if we are shutting down

  server-tools/instance-manager/instance_options.cc
    1.23 05/09/13 14:48:43 reggie@ubuntu.(none) +8 -0
    quoting the binary to handle paths with quotes

  server-tools/instance-manager/instance.cc
    1.25 05/09/13 14:48:42 reggie@ubuntu.(none) +12 -16
    * remove the inclusion of process.h
    * concat all args into a single buffer to pass to CreateProcess

  server-tools/instance-manager/WindowsService.h
    1.5 05/09/13 14:48:42 reggie@ubuntu.(none) +1 -1
    change the sig of run()

  server-tools/instance-manager/WindowsService.cpp
    1.5 05/09/13 14:48:42 reggie@ubuntu.(none) +3 -2
    default debugging to false
    changed the sig of RuN()

  server-tools/instance-manager/IMService.h
    1.3 05/09/13 14:48:41 reggie@ubuntu.(none) +1 -1
    changed the sig for Run()

  server-tools/instance-manager/IMService.cpp
    1.7 05/09/13 14:48:41 reggie@ubuntu.(none) +12 -1
    * setting username and password to NULL so that the 
    IM runs at LocalSystem (this should be changed soon)
    * implemented stop service by raising a sigterm
    * implemented start service by loading options and calling manager()

ChangeSet
  1.1943.13.1 05/09/13 21:04:17 ingo@mysql.com +3 -0
  Merge mysql.com:/home/mydev/mysql-4.1-4100
  into  mysql.com:/home/mydev/mysql-5.0-5000

  sql/sql_base.cc
    1.298.1.3 05/09/13 21:04:12 ingo@mysql.com +0 -7
    Bug#12845 - Stress test: Server crashes on  CREATE .. SELECT statement
    Manual merge. Used local file.
    A different patch was required for 5.0.

ChangeSet
  1.1943.1.12 05/09/13 11:59:19 eric@mysql.com +2 -0
  Fixed minor error message bug from work for WL#2414

  sql/ha_federated.cc
    1.40 05/09/13 11:59:15 eric@mysql.com +93 -95
    Minor refactoring to fix error message, resulting in big whitespace change

  mysql-test/r/federated.result
    1.16 05/09/13 11:59:15 eric@mysql.com +1 -1
    fixed error message

  include/my_global.h
    1.106 05/09/13 20:49:25 ingo@mysql.com +0 -0
    Auto merged

  configure.in
    1.346 05/09/13 20:49:25 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2143.82 05/09/13 20:47:00 ingo@mysql.com +3 -0
  Merge mysql.com:/home/mydev/mysql-4.0-4000
  into  mysql.com:/home/mydev/mysql-4.1-4100

  sql/sql_base.cc
    1.145.1.114 05/09/13 20:46:53 ingo@mysql.com +0 -0
    Auto merged

  include/my_global.h
    1.47.1.56 05/09/13 20:46:53 ingo@mysql.com +0 -0
    Auto merged

  configure.in
    1.201.1.194 05/09/13 20:46:53 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1943.1.10 05/09/13 22:22:51 evgen@moonbone.local +3 -0
  Merge

  mysql-test/t/view.test
    1.106 05/09/13 22:22:50 evgen@moonbone.local +0 -0
    SCCS merged

  mysql-test/r/view.result
    1.111 05/09/13 22:22:50 evgen@moonbone.local +0 -0
    SCCS merged

  sql/sql_base.cc
    1.300 05/09/13 22:21:36 evgen@moonbone.local +0 -0
    Auto merged

ChangeSet
  1.1346.1.804 05/09/13 20:19:59 ingo@mysql.com +1 -0
  Bug#12845 - Stress test: Server crashes on  CREATE .. SELECT statement
  Solution for 4.0 and 4.1.
  If the caller cannot re-open table(s), it gives a NULL
  'refresh' argument to open_table(). We used to ignore
  flushes then. Now we ignore drops too.

  sql/sql_base.cc
    1.117.1.75 05/09/13 20:19:57 ingo@mysql.com +7 -0
    Bug#12845 - Stress test: Server crashes on  CREATE .. SELECT statement
    Solution for 4.0 and 4.1.
    If the caller cannot re-open table(s), it gives a NULL
    'refresh' argument to open_table(). We used to ignore
    flushes then. Now we ignore drops too.

ChangeSet
  1.1943.12.1 05/09/13 19:51:13 serg@serg.mylan +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into serg.mylan:/usr/home/serg/Abk/mysql-5.0

  mysql-test/t/mysqldump.test
    1.59.1.2 05/09/13 19:50:58 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1943.11.1 05/09/13 19:32:37 serg@serg.mylan +3 -0
  after pull review - many bugs in mysqldump --routines

  mysql-test/t/mysqldump.test
    1.59.2.1 05/09/13 19:32:10 serg@serg.mylan +23 -22
    cleanup, new test

  mysql-test/r/mysqldump.result
    1.66.1.1 05/09/13 19:32:10 serg@serg.mylan +27 -21
    updated

  client/mysqldump.c
    1.199 05/09/13 19:32:09 serg@serg.mylan +24 -39
    after pull review - many bugs in mysqldump --routines

ChangeSet
  1.1943.7.6 05/09/13 10:17:40 eric@mysql.com +1 -0
  Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/eric/mysql-5.0

  sql/sql_yacc.yy
    1.422 05/09/13 10:17:35 eric@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1943.7.4 05/09/13 19:59:26 petr@mysql.com +1 -0
  after-merge fix

  mysql-test/t/sp.test
    1.149 05/09/13 19:59:13 petr@mysql.com +15 -15
    after-merge fix

ChangeSet
  1.1943.10.1 05/09/13 18:23:37 jani@ua141d10.elisa.omakaista.fi +1 -0
  Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
  into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp

  sql/sql_analyse.cc
    1.63 05/09/13 18:23:31 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

ChangeSet
  1.1943.9.2 05/09/13 17:16:12 pem@mysql.com +7 -0
  Fixed BUG#12712: SET AUTOCOMMIT should fail within SP/functions/triggers
    Second version after review. Allow 'set autocommit' in procedures, but not
    functions or triggers. Can return error in run-time (when a function calls
    a procedure).

  sql/sql_yacc.yy
    1.420.1.2 05/09/13 17:16:05 pem@mysql.com +9 -0
    Disallow setting AUTOCOMMIT in stored function and triggers.

  sql/sp_head.h
    1.69 05/09/13 17:16:05 pem@mysql.com +4 -1
    New flag: has 'set autocommit', and testing for this in is_not_allowed_in_function().

  sql/share/errmsg.txt
    1.43 05/09/13 17:16:05 pem@mysql.com +2 -0
    New error message for disallowing the setting of autocommit in stored functions and triggers.

  sql/set_var.h
    1.71 05/09/13 17:16:05 pem@mysql.com +1 -0
    Made sys_autocommit external, to allow testing in sql_yacc.yy.

  sql/set_var.cc
    1.140 05/09/13 17:16:05 pem@mysql.com +4 -4
    Made sys_autocommit external, to allow testing in sql_yacc.yy.

  mysql-test/t/sp-error.test
    1.87 05/09/13 17:16:05 pem@mysql.com +58 -0
    New test case for BUG#12712.

  mysql-test/r/sp-error.result
    1.83 05/09/13 17:16:04 pem@mysql.com +47 -0
    New test case for BUG#12712.

ChangeSet
  1.1616.2143.81 05/09/13 18:11:51 jani@ua141d10.elisa.omakaista.fi +1 -0
  Merged code. Removed unneccessary repeating.
  

  sql/sql_analyse.cc
    1.45.1.9 05/09/13 18:11:47 jani@ua141d10.elisa.omakaista.fi +8 -10
    Merged code. Removed unneccessary repeating.
    

ChangeSet
  1.1935.80.1 05/09/13 17:06:14 msvensson@neptunus.(none) +1 -0
  BUG#12526 yassl: Crashes in "integer.cpp"
  - Avoid problem with  "Sun C++ 5.6 2004/07/15"

  extra/yassl/taocrypt/src/integer.cpp
    1.16 05/09/13 17:06:10 msvensson@neptunus.(none) +4 -4
    - Remove "inline" from the more advanced functions of class portable

ChangeSet
  1.1943.7.2 05/09/13 18:54:47 petr@mysql.com +2 -0
  Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin

  mysql-test/r/sp.result
    1.153 05/09/13 18:54:39 petr@mysql.com +0 -0
    SCCS merged

  mysql-test/t/sp.test
    1.148 05/09/13 18:50:44 petr@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1943.8.1 05/09/13 15:32:42 pem@mysql.com +4 -0
  Fixed BUG#12379: PROCEDURE with HANDLER calling FUNCTION with error
                   get strange result
    according to Monty's suggestions, fixing the SELECT behaviour on errors
    with SP handlers. Note that some warnings from SELECT still shows up when
    the handler has caught - this is an effect of another known bug (BUG#7049).

  sql/sql_class.h
    1.264 05/09/13 15:32:35 pem@mysql.com +3 -1
    Abort selects on errors more graceful with SP handlers.

  sql/sql_class.cc
    1.210 05/09/13 15:32:34 pem@mysql.com +27 -1
    Abort selects on errors more graceful with SP handlers.

  mysql-test/t/sp.test
    1.146.1.1 05/09/13 15:32:34 pem@mysql.com +55 -0
    New test cases for BUG#12379.

  mysql-test/r/sp.result
    1.151.1.1 05/09/13 15:32:34 pem@mysql.com +59 -0
    New test cases for BUG#12379.

ChangeSet
  1.1943.7.1 05/09/13 17:05:17 petr@mysql.com +2 -0
  Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/cps/mysql/trees/mysql-5.0

  mysql-test/t/sp.test
    1.147 05/09/13 17:05:08 petr@mysql.com +14 -15
    manual merge

  mysql-test/r/sp.result
    1.152 05/09/13 17:05:08 petr@mysql.com +8 -8
    manual merge

ChangeSet
  1.1946 05/09/13 14:46:42 msvensson@neptunus.(none) +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new

  mysql-test/t/mysqldump.test
    1.62 05/09/13 14:46:36 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/view.result
    1.109.1.2 05/09/13 14:46:36 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1943.6.1 05/09/13 14:36:43 ingo@mysql.com +2 -0
  Bug#12845 - Stress test: Server crashes on  CREATE .. SELECT statement
  Solution for 5.0.
  Changed calls to open_table(). Requested to ignore
  flush at places where the command did already lock tables.
  This could happen in CREATE ... SELECT and ALTER TABLE.
  
  No test case. The bug can only be triggered by true concurrency.
  The stress test suite provides a test case for this.

  sql/sql_table.cc
    1.271 05/09/13 14:36:37 ingo@mysql.com +4 -2
    Bug#12845 - Stress test: Server crashes on  CREATE .. SELECT statement
    Solution for 5.0.
    Changed calls to open_table(). Requested to ignore
    flush at places where the command did already lock tables.
    This could happen in CREATE ... SELECT and ALTER TABLE.

  sql/sql_base.cc
    1.298.1.2 05/09/13 14:36:37 ingo@mysql.com +15 -13
    Bug#12845 - Stress test: Server crashes on  CREATE .. SELECT statement
    Solution for 5.0.
    Changed open_table() so that ignoring flush requests
    is dependend on the 'flags' parameter as ignoring drop
    request was already. This aims for consistent behaviour.

ChangeSet
  1.1943.5.2 05/09/13 16:41:39 ramil@mysql.com +1 -0
  Print a dummy section in order not to interference 
  with /etc/my.cnf and ~/.my.cnf [client] section.

  mysql-test/t/mysqldump.test
    1.59.1.1 05/09/13 16:41:32 ramil@mysql.com +3 -3
    Print a dummy section in order not to interference 
    with /etc/my.cnf and ~/.my.cnf [client] section.

ChangeSet
  1.1943.5.1 05/09/13 13:18:14 ndbdev@dl145c.mysql.com +1 -0
  merge

  ndb/src/ndbapi/SignalSender.cpp
    1.5 05/09/13 13:18:11 ndbdev@dl145c.mysql.com +1 -0
    merge

ChangeSet
  1.1941.1.2 05/09/13 15:15:38 petr@mysql.com +3 -0
  Fix for Bug #13124 Stored Procedure using SELECT INTO crashes server

  sql/item.cc
    1.176.1.1 05/09/13 15:15:27 petr@mysql.com +6 -1
    check for NULL value before copying string

  mysql-test/t/sp.test
    1.145.1.1 05/09/13 15:15:27 petr@mysql.com +15 -0
    corrected result file

  mysql-test/r/sp.result
    1.150.1.1 05/09/13 15:15:27 petr@mysql.com +8 -0
    added a test

ChangeSet
  1.1943.3.1 05/09/13 16:07:38 gluh@eagle.intranet.mysql.r18.ru +11 -0
  Bug#9683 INFORMATION_SCH: Creation of temporary table allowed in
           Information_schema DB 
  Bug#9846 Inappropriate error displayed while
           dropping table from 'INFORMATION_SCHEMA'
  Bug#10734 Grant of privileges other than 'select' and 
           'create view' should fail on schema 
  Bug#10708 SP's can use INFORMATION_SCHEMA as ROUTINE_SCHEMA
  
   cumulative fix for bugs above(after review, 2nd version)
   added privilege check for information schema db & tables

  sql/sql_view.cc
    1.62 05/09/13 16:06:27 gluh@mysql.com +3 -3
    Bug#9683 INFORMATION_SCH: Creation of temporary table allowed in
             Information_schema DB 
    Bug#9846 Inappropriate error displayed while
             dropping table from 'INFORMATION_SCHEMA'
    Bug#10734 Grant of privileges other than 'select' and 
             'create view' should fail on schema 
    Bug#10708 SP's can use INFORMATION_SCHEMA as ROUTINE_SCHEMA
    
     cumulative fix for bugs above(after review, 2nd version)
     added privilege check for information schema db & tables

  sql/sql_update.cc
    1.169 05/09/13 16:06:27 gluh@mysql.com +2 -1
    Bug#9683 INFORMATION_SCH: Creation of temporary table allowed in
             Information_schema DB 
    Bug#9846 Inappropriate error displayed while
             dropping table from 'INFORMATION_SCHEMA'
    Bug#10734 Grant of privileges other than 'select' and 
             'create view' should fail on schema 
    Bug#10708 SP's can use INFORMATION_SCHEMA as ROUTINE_SCHEMA
    
     cumulative fix for bugs above(after review, 2nd version)
     added privilege check for information schema db & tables

  sql/sql_show.cc
    1.275.1.1 05/09/13 16:06:27 gluh@mysql.com +4 -9
    Bug#9683 INFORMATION_SCH: Creation of temporary table allowed in
             Information_schema DB 
    Bug#9846 Inappropriate error displayed while
             dropping table from 'INFORMATION_SCHEMA'
    Bug#10734 Grant of privileges other than 'select' and 
             'create view' should fail on schema 
    Bug#10708 SP's can use INFORMATION_SCHEMA as ROUTINE_SCHEMA
    
     cumulative fix for bugs above(after review, 2nd version)
     added privilege check for information schema db & tables

  sql/sql_repl.cc
    1.142 05/09/13 16:06:27 gluh@mysql.com +2 -2
    Bug#9683 INFORMATION_SCH: Creation of temporary table allowed in
             Information_schema DB 
    Bug#9846 Inappropriate error displayed while
             dropping table from 'INFORMATION_SCHEMA'
    Bug#10734 Grant of privileges other than 'select' and 
             'create view' should fail on schema 
    Bug#10708 SP's can use INFORMATION_SCHEMA as ROUTINE_SCHEMA
    
     cumulative fix for bugs above(after review, 2nd version)
     added privilege check for information schema db & tables

  sql/sql_prepare.cc
    1.151.1.1 05/09/13 16:06:27 gluh@mysql.com +1 -1
    Bug#9683 INFORMATION_SCH: Creation of temporary table allowed in
             Information_schema DB 
    Bug#9846 Inappropriate error displayed while
             dropping table from 'INFORMATION_SCHEMA'
    Bug#10734 Grant of privileges other than 'select' and 
             'create view' should fail on schema 
    Bug#10708 SP's can use INFORMATION_SCHEMA as ROUTINE_SCHEMA
    
     cumulative fix for bugs above(after review, 2nd version)
     added privilege check for information schema db & tables

  sql/sql_parse.cc
    1.484.1.1 05/09/13 16:06:27 gluh@mysql.com +91 -41
    Bug#9683 INFORMATION_SCH: Creation of temporary table allowed in
             Information_schema DB 
    Bug#9846 Inappropriate error displayed while
             dropping table from 'INFORMATION_SCHEMA'
    Bug#10734 Grant of privileges other than 'select' and 
             'create view' should fail on schema 
    Bug#10708 SP's can use INFORMATION_SCHEMA as ROUTINE_SCHEMA
    
     cumulative fix for bugs above(after review, 2nd version)
     added privilege check for information schema db & tables

  sql/sql_acl.cc
    1.168 05/09/13 16:06:27 gluh@mysql.com +5 -5
    Bug#9683 INFORMATION_SCH: Creation of temporary table allowed in
             Information_schema DB 
    Bug#9846 Inappropriate error displayed while
             dropping table from 'INFORMATION_SCHEMA'
    Bug#10734 Grant of privileges other than 'select' and 
             'create view' should fail on schema 
    Bug#10708 SP's can use INFORMATION_SCHEMA as ROUTINE_SCHEMA
    
     cumulative fix for bugs above(after review, 2nd version)
     added privilege check for information schema db & tables

  sql/repl_failsafe.cc
    1.55 05/09/13 16:06:27 gluh@mysql.com +1 -1
    Bug#9683 INFORMATION_SCH: Creation of temporary table allowed in
             Information_schema DB 
    Bug#9846 Inappropriate error displayed while
             dropping table from 'INFORMATION_SCHEMA'
    Bug#10734 Grant of privileges other than 'select' and 
             'create view' should fail on schema 
    Bug#10708 SP's can use INFORMATION_SCHEMA as ROUTINE_SCHEMA
    
     cumulative fix for bugs above(after review, 2nd version)
     added privilege check for information schema db & tables

  sql/mysql_priv.h
    1.349 05/09/13 16:06:27 gluh@mysql.com +3 -1
    Bug#9683 INFORMATION_SCH: Creation of temporary table allowed in
             Information_schema DB 
    Bug#9846 Inappropriate error displayed while
             dropping table from 'INFORMATION_SCHEMA'
    Bug#10734 Grant of privileges other than 'select' and 
             'create view' should fail on schema 
    Bug#10708 SP's can use INFORMATION_SCHEMA as ROUTINE_SCHEMA
    
     cumulative fix for bugs above(after review, 2nd version)
     added privilege check for information schema db & tables

  mysql-test/t/information_schema.test
    1.57 05/09/13 16:06:27 gluh@mysql.com +37 -1
    Bug#9683 INFORMATION_SCH: Creation of temporary table allowed in
             Information_schema DB 
    Bug#9846 Inappropriate error displayed while
             dropping table from 'INFORMATION_SCHEMA'
    Bug#10734 Grant of privileges other than 'select' and 
             'create view' should fail on schema 
    Bug#10708 SP's can use INFORMATION_SCHEMA as ROUTINE_SCHEMA
    
     cumulative fix for bugs above(after review, 2nd version)
     added privilege check for information schema db & tables

  mysql-test/r/information_schema.result
    1.80 05/09/13 16:06:27 gluh@mysql.com +23 -1
    Bug#9683 INFORMATION_SCH: Creation of temporary table allowed in
             Information_schema DB 
    Bug#9846 Inappropriate error displayed while
             dropping table from 'INFORMATION_SCHEMA'
    Bug#10734 Grant of privileges other than 'select' and 
             'create view' should fail on schema 
    Bug#10708 SP's can use INFORMATION_SCHEMA as ROUTINE_SCHEMA
    
     cumulative fix for bugs above(after review, 2nd version)
     added privilege check for information schema db & tables

ChangeSet
  1.1943.1.2 05/09/13 13:51:25 timour@mysql.com +1 -0
  Merge mysql.com:/home/timka/mysql/src/5.0-virgin
  into  mysql.com:/home/timka/mysql/src/5.0-2486

  sql/sql_parse.cc
    1.485 05/09/13 13:51:21 timour@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1943.2.1 05/09/13 12:50:21 pem@mysql.com +6 -0
  Fixed BUG#13133: Local variables in stored procedures are not initialized correctly.
    Have to init. all local variables in their frames, not just once at the beginning
    of invocation.

  sql/sql_yacc.yy
    1.420.1.1 05/09/13 12:50:11 pem@mysql.com +32 -37
    Initialize local variables in the block to null, or the default value, given.
    (Untabifed block too.)

  sql/sp_pcontext.h
    1.21 05/09/13 12:50:11 pem@mysql.com +0 -10
    Removed isset flag, since it's not used.

  sql/sp_pcontext.cc
    1.24 05/09/13 12:50:11 pem@mysql.com +0 -1
    Removed isset flag, since it's not used.

  sql/sp_head.cc
    1.183 05/09/13 12:50:11 pem@mysql.com +9 -26
    Just init. local variable slots in the fram to NULL. (Real init. will be done
    in each block.)

  mysql-test/t/sp.test
    1.146 05/09/13 12:50:11 pem@mysql.com +45 -0
    New test case for BUG#13133.

  mysql-test/r/sp.result
    1.151 05/09/13 12:50:11 pem@mysql.com +39 -0
    New test case for BUG#13133.

ChangeSet
  1.1945 05/09/13 12:43:43 msvensson@neptunus.(none) +8 -0
  BUG#10713 mysqldump includes database in create view and referenced tables
   - Update test results
   - Updates after review

  sql/sql_show.cc
    1.277 05/09/13 12:43:39 msvensson@neptunus.(none) +2 -2
    Updated after review

  mysql-test/t/mysqldump.test
    1.61 05/09/13 12:43:39 msvensson@neptunus.(none) +3 -5
    Update test results

  mysql-test/r/view.result
    1.109.2.1 05/09/13 12:43:39 msvensson@neptunus.(none) +22 -22
    Update test results

  mysql-test/r/temp_table.result
    1.16 05/09/13 12:43:39 msvensson@neptunus.(none) +1 -1
    Update test results

  mysql-test/r/sql_mode.result
    1.26 05/09/13 12:43:39 msvensson@neptunus.(none) +2 -2
    Update test results

  mysql-test/r/mysqldump.result
    1.68 05/09/13 12:43:39 msvensson@neptunus.(none) +38 -5
    Update test results

  mysql-test/r/lowercase_view.result
    1.9 05/09/13 12:43:38 msvensson@neptunus.(none) +3 -3
    Update test results

  mysql-test/r/func_in.result
    1.19 05/09/13 12:43:38 msvensson@neptunus.(none) +1 -1
    Update test results

ChangeSet
  1.1943.1.1 05/09/13 10:15:48 kent@mysql.com +1 -0
  sql_prepare.cc:
    VC6 can't handle initializing const in declaration

  sql/sql_prepare.cc
    1.152 05/09/13 10:15:33 kent@mysql.com +9 -0
    VC6 can't handle initializing const in declaration

ChangeSet
  1.1616.2143.80 05/09/13 10:03:50 tulin@dl145c.mysql.com +1 -0
  minor compile error fix

  ndb/src/ndbapi/SignalSender.cpp
    1.2.1.2 05/09/13 10:03:00 ndbdev@dl145c.mysql.com +2 -0
    minor compile error fix

ChangeSet
  1.1944 05/09/13 09:41:01 msvensson@neptunus.(none) +6 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug10713
  into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new

  sql/table.h
    1.111.1.1 05/09/13 09:40:56 msvensson@neptunus.(none) +0 -0
    Manual merge

  sql/sql_show.cc
    1.276 05/09/13 09:40:56 msvensson@neptunus.(none) +0 -1
    Manual merge

  sql/item.cc
    1.177 05/09/13 09:40:56 msvensson@neptunus.(none) +3 -3
    Manual merge

  mysql-test/t/mysqldump.test
    1.60 05/09/13 09:40:55 msvensson@neptunus.(none) +0 -2
    Manual merge

  mysql-test/r/mysqldump.result
    1.67 05/09/13 09:40:55 msvensson@neptunus.(none) +0 -1
    Manual merge

  sql/sql_select.cc
    1.372 05/09/13 09:38:47 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1935.79.1 05/09/12 18:02:17 eric@mysql.com +10 -0
  Made changes to add federated CONNECTION information to the .frm file
  (per Monty's patch).
  Remove references to the "COMMENT" field.
  WL#2414

  sql/unireg.cc
    1.67 05/09/12 18:02:12 eric@mysql.com +9 -0
    Storing information on connection_string (code came from Monty).

  sql/table.h
    1.112 05/09/12 18:02:12 eric@mysql.com +1 -0
    added connect_string 

  sql/table.cc
    1.186 05/09/12 18:02:12 eric@mysql.com +26 -6
    Modifying frm file to store connecting information (code change came from Monty).

  sql/sql_yacc.yy
    1.421 05/09/12 18:02:12 eric@mysql.com +1 -0
    added setting of "connect_string" string and length

  sql/handler.h
    1.151 05/09/12 18:02:12 eric@mysql.com +2 -0
    added LEX_STRING "connection_string"
    (per Monty's patch)

  sql/ha_federated.cc
    1.39 05/09/12 18:02:12 eric@mysql.com +21 -15
    Change parsing of char* table->s->comment to LEX_STRING table->s->connect_string
    (per Monty's patch)

  mysql-test/t/federated_archive.test
    1.2 05/09/12 18:02:12 eric@mysql.com +1 -1
    change from "COMMENT=" to "CONNECTION="

  mysql-test/t/federated.test
    1.13 05/09/12 18:02:12 eric@mysql.com +24 -24
    change from "COMMENT=" to "CONNECTION="

  mysql-test/r/federated_archive.result
    1.2 05/09/12 18:02:12 eric@mysql.com +1 -1
    change "COMMENT=" to "CONNECTION="

  mysql-test/r/federated.result
    1.15 05/09/12 18:02:12 eric@mysql.com +24 -24
    alter from "COMMENT=" to "CONNECTION=" 

ChangeSet
  1.1941.1.1 05/09/13 02:31:47 kent@mysql.com +1 -0
  innochecksum.c:
    Changed from C++ comments to C comments
    Did some adaption to MySQL Coding Style

  extra/innochecksum.c
    1.3 05/09/13 02:30:53 kent@mysql.com +197 -175
    Changed from C++ comments to C comments
    Did some adaption to MySQL Coding Style

ChangeSet
  1.1942 05/09/12 17:00:50 jimw@mysql.com +13 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-clean
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  configure.in
    1.345 05/09/12 17:00:46 jimw@mysql.com +5 -9
    Resolve conflicts

  vio/viossl.c
    1.29 05/09/12 16:55:43 jimw@mysql.com +0 -0
    Auto merged

  vio/viosocket.c
    1.34 05/09/12 16:55:43 jimw@mysql.com +0 -0
    Auto merged

  vio/vio.c
    1.23 05/09/12 16:55:43 jimw@mysql.com +0 -0
    Auto merged

  sql/net_serv.cc
    1.84 05/09/12 16:55:43 jimw@mysql.com +0 -0
    Auto merged

  sql/examples/ha_archive.cc
    1.53 05/09/12 16:55:43 jimw@mysql.com +0 -0
    Auto merged

  sql-common/client.c
    1.77 05/09/12 16:55:43 jimw@mysql.com +0 -0
    Auto merged

  ndb/src/ndbapi/SignalSender.cpp
    1.4 05/09/12 16:55:43 jimw@mysql.com +0 -0
    Auto merged

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.87 05/09/12 16:55:43 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/ndb_autodiscover.result
    1.26 05/09/12 16:55:43 jimw@mysql.com +0 -0
    Auto merged

  include/violite.h
    1.44 05/09/12 16:55:43 jimw@mysql.com +0 -0
    Auto merged

  include/my_pthread.h
    1.84 05/09/12 16:55:43 jimw@mysql.com +0 -0
    Auto merged

  include/my_global.h
    1.105 05/09/12 16:55:43 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2143.79 05/09/12 16:48:00 jimw@mysql.com +1 -0
  Merge bk-internal:/home/bk/mysql-4.1
  into  mysql.com:/home/jimw/my/mysql-4.1-clean

  configure.in
    1.201.1.193 05/09/12 16:47:58 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1941 05/09/13 01:41:15 kent@mysql.com +1 -0
  mysql-test-run.pl:
    Corrected typo

  mysql-test/mysql-test-run.pl
    1.42 05/09/13 01:40:59 kent@mysql.com +1 -1
    Corrected typo

ChangeSet
  1.1940 05/09/13 01:22:11 kent@mysql.com +1 -0
  Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/Users/kent/mysql/bk/mysql-5.0

  mysql-test/mysql-test-run.pl
    1.41 05/09/13 01:22:07 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2274.4 05/09/13 01:12:17 kent@mysql.com +1 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
  into mysql.com:/Users/kent/mysql/bk/mysql-4.1

  configure.in
    1.201.59.1 05/09/13 01:12:14 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.1.37 05/09/13 01:44:50 jani@a193-229-222-105.elisa-laajakaista.fi +3 -0
  Merged from 4.1 to 5.0.

  sql/item_cmpfunc.cc
    1.179 05/09/13 01:44:44 jani@a193-229-222-105.elisa-laajakaista.fi +1 -2
    Merged from 4.1 to 5.0.

  mysql-test/r/innodb.result
    1.133 05/09/13 01:44:44 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Merged from 4.1 to 5.0.

  mysql-test/r/create.result
    1.101 05/09/13 01:44:44 jani@a193-229-222-105.elisa-laajakaista.fi +9 -8
    Merged from 4.1 to 5.0.

ChangeSet
  1.1935.1.35 05/09/12 22:47:15 jmiller@mysql.com +7 -0
  Adding comment for force manual merge 5.0 -> wl1012

  mysql-test/t/rpl_reset_slave.test
    1.9 05/09/12 22:46:33 jmiller@mysql.com +1 -0
    Adding comment for force manual merge 5.0 -> wl1012

  mysql-test/t/rpl_multi_query.test
    1.7 05/09/12 22:46:08 jmiller@mysql.com +1 -0
    Adding comment for force manual merge 5.0 -> wl1012

  mysql-test/t/rpl_max_relay_size.test
    1.14 05/09/12 22:45:37 jmiller@mysql.com +1 -0
    Adding comment for force manual merge 5.0 -> wl1012

  mysql-test/t/rpl_log.test
    1.27 05/09/12 22:44:43 jmiller@mysql.com +1 -0
    Adding comment for force manual merge 5.0 -> wl1012

  mysql-test/t/rpl_loaddata_rule_m.test
    1.10 05/09/12 22:43:56 jmiller@mysql.com +1 -0
    Adding comment for force manual merge 5.0 -> wl1012

  mysql-test/t/rpl_flush_tables.test
    1.10 05/09/12 22:42:49 jmiller@mysql.com +1 -0
    Adding comment for force manual merge 5.0 -> wl1012

  mysql-test/t/rpl_error_ignored_table.test
    1.17 05/09/12 22:42:02 jmiller@mysql.com +1 -0
    Adding comment for force manual merge 5.0 -> wl1012

ChangeSet
  1.1616.2143.77 05/09/12 12:45:03 jimw@mysql.com +1 -0
  Update test result

  mysql-test/r/ndb_autodiscover.result
    1.4.1.10 05/09/12 12:45:01 jimw@mysql.com +2 -0
    Update results

ChangeSet
  1.1616.2274.2 05/09/12 22:19:04 SergeyV@selena. +1 -0
  Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  selena.:H:/MYSQL/src/#05588-mysql-4.1

  include/my_global.h
    1.47.1.55 05/09/12 22:18:54 SergeyV@selena. +0 -0
    Auto merged

ChangeSet
  1.1616.2272.2 05/09/12 12:44:52 paul@kite-hub.kitebird.com +1 -0
  Merge kite-hub.kitebird.com:/tmp/merge-4.0
  into  kite-hub.kitebird.com:/tmp/merge-4.1

  README
    1.7 05/09/12 12:44:47 paul@kite-hub.kitebird.com +0 -0
    Auto merged

ChangeSet
  1.1346.853.1 05/09/12 12:44:13 paul@kite-hub.kitebird.com +1 -0
  README:
    Update README (2nd try)

  README
    1.4.1.3 05/09/12 12:43:58 paul@kite-hub.kitebird.com +29 -46
    Update README (2nd try)

ChangeSet
  1.1616.2143.76 05/09/12 10:19:56 jimw@mysql.com +3 -0
  Merge mysqldev@production.mysql.com:jimw/mysql-4.1-sco
  into  mysql.com:/home/jimw/my/mysql-4.1-clean

  sql/examples/ha_archive.cc
    1.13.1.16 05/09/12 10:19:53 jimw@mysql.com +0 -0
    Auto merged

  include/my_pthread.h
    1.65.1.15 05/09/12 10:19:53 jimw@mysql.com +0 -0
    Auto merged

  configure.in
    1.201.1.192 05/09/12 10:19:53 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.78.1 05/09/12 20:18:49 jani@a193-229-222-105.elisa-laajakaista.fi +12 -0
  Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
  into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0

  sql/sql_table.cc
    1.270 05/09/12 20:18:43 jani@a193-229-222-105.elisa-laajakaista.fi +2 -5
    Merged from 4.1 to 5.0

  sql/item_cmpfunc.cc
    1.178 05/09/12 20:18:43 jani@a193-229-222-105.elisa-laajakaista.fi +0 -3
    Merged from 4.1 to 5.0

  mysql-test/t/create.test
    1.63 05/09/12 20:18:43 jani@a193-229-222-105.elisa-laajakaista.fi +9 -10
    Merged from 4.1 to 5.0

  mysql-test/r/innodb.result
    1.132 05/09/12 20:18:43 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Merged from 4.1 to 5.0

  mysql-test/r/create.result
    1.100 05/09/12 20:18:43 jani@a193-229-222-105.elisa-laajakaista.fi +2 -5
    Merged from 4.1 to 5.0

ChangeSet
  1.1935.1.34 05/09/12 19:18:17 timour@mysql.com +2 -0
  BUG#12943 - post-merge fix

  mysql-test/t/select.test
    1.77 05/09/12 19:18:14 timour@mysql.com +3 -0
    post-merge fix

  mysql-test/r/select.result
    1.92 05/09/12 19:18:14 timour@mysql.com +1 -0
    post-merge fix

ChangeSet
  1.1935.1.33 05/09/12 19:05:55 timour@mysql.com +3 -0
  Merge mysql.com:/home/timka/mysql/src/5.0-virgin
  into  mysql.com:/home/timka/mysql/src/5.0-bug-12943

  mysql-test/t/select.test
    1.76 05/09/12 19:05:53 timour@mysql.com +21 -23
    merge BUG#12943

  mysql-test/r/select.result
    1.91 05/09/12 19:05:53 timour@mysql.com +20 -20
    merge BUG#12943

  sql/sql_parse.cc
    1.484 05/09/12 18:56:50 timour@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2273.2 05/09/12 17:01:13 tulin@dl145b.mysql.com +2 -0
  Corrected construct of faked Node fail signals in ndb SignalSender

ChangeSet
  1.1616.2272.1 05/09/12 18:48:17 monty@mishka.mysql.com +6 -0
  Review fixes since last pull
  Fix for bug #13025; Server crash in filesort because wrong call to handler::position()

  sql/sql_select.cc
    1.371 05/09/12 16:58:29 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  sql/filesort.cc
    1.104 05/09/12 16:58:29 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  mysql-test/t/innodb.test
    1.107 05/09/12 16:58:29 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  client/mysqltest.c
    1.159 05/09/12 16:58:28 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.1.219 05/09/12 18:48:12 monty@mishka.mysql.com +6 -6
    Moved variable to outer level

  sql/item_cmpfunc.cc
    1.111.1.86 05/09/12 18:48:12 monty@mishka.mysql.com +9 -7
    Indentation changes

  sql/filesort.cc
    1.70.1.24 05/09/12 18:48:12 monty@mishka.mysql.com +1 -1
    Don't call handler::position() if row was not found

  mysql-test/t/innodb.test
    1.62.1.12 05/09/12 18:48:12 monty@mishka.mysql.com +10 -0
    Added test case for bug #13025; Server crash in filesort because wrong call to handler::position()

  mysql-test/r/innodb.result
    1.75.4.10 05/09/12 18:48:12 monty@mishka.mysql.com +11 -0
    Added test case for bug #13025; Server crash in filesort because wrong call to handler::position()

  client/mysqltest.c
    1.92.1.89 05/09/12 18:48:12 monty@mishka.mysql.com +2 -1
    Code cleanup during review

  ndb/src/ndbapi/SignalSender.cpp
    1.2.1.1 05/09/12 17:00:46 tulin@dl145b.mysql.com +9 -1
    Corrected construct of faked Node fail signals in ndb SignalSender

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.51.1.15 05/09/12 17:00:46 tulin@dl145b.mysql.com +1 -4
    Corrected construct of faked Node fail signals in ndb SignalSender

ChangeSet
  1.1935.77.1 05/09/12 19:35:50 bar@mysql.com +5 -0
  Many files:
    Adding esperanto collation

  config/ac-macros/character_sets.m4
    1.8 05/09/12 19:35:24 bar@mysql.com +2 -2
    Adding esperanto collation

  mysql-test/r/ctype_uca.result
    1.15 05/09/12 19:35:23 bar@mysql.com +110 -0
    Adding esperanto collation

  mysql-test/t/ctype_uca.test
    1.13 05/09/12 19:35:21 bar@mysql.com +1 -0
    Adding esperanto collation

  mysys/charset-def.c
    1.14 05/09/12 19:35:16 bar@mysql.com +4 -0
    Adding esperanto collation

  strings/ctype-uca.c
    1.38 05/09/12 19:35:08 bar@mysql.com +75 -0
    Adding esperanto collation

ChangeSet
  1.1935.76.1 05/09/12 17:01:17 timour@mysql.com +3 -0
  Fix for BUG#6808.
  
  The problem was in that add_table_to_list was testing for duplicate tables
  in a list of tables that included the created view.

  sql/sql_parse.cc
    1.482.1.1 05/09/12 17:01:14 timour@mysql.com +4 -1
    When testing for table name uniquness, skip the first table the current
    statement is CREATE VIEW. Notice that the first table is skipped differently
    for CREATE TABLE ... SELECT ... statements, so we don't have to handle that
    case here (see production 'create_select', the call 'to save_and_clear').

  mysql-test/t/view.test
    1.104.1.1 05/09/12 17:01:14 timour@mysql.com +11 -2
    Test for BUG#6808

  mysql-test/r/view.result
    1.109.1.1 05/09/12 17:01:14 timour@mysql.com +6 -2
    Test for BUG#6808

  sql/sql_db.cc
    1.116 05/09/12 16:58:29 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  mysql-test/r/warnings.result
    1.34 05/09/12 16:58:28 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  mysql-test/r/temp_table.result
    1.15 05/09/12 16:58:28 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

ChangeSet
  1.1935.1.31 05/09/12 14:11:28 tulin@dl145c.mysql.com +2 -0
  Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
  into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0

  ndb/src/mgmapi/mgmapi.cpp
    1.53 05/09/12 14:11:27 tulin@dl145c.mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_slave_status.test
    1.6 05/09/12 14:11:27 tulin@dl145c.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2270.2 05/09/12 17:09:19 gluh@eagle.intranet.mysql.r18.ru +6 -0
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    produce warning for 'create database if not exists' if database exists
    do not update database options in this case  
    produce warning for 'create table if not exists' if table exists
  

  sql/sql_table.cc
    1.157.2.145 05/09/12 17:08:36 gluh@mysql.com +16 -12
    Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
      produce warning for 'create table if not exists' if table exists 

  sql/sql_db.cc
    1.68.1.63 05/09/12 17:08:36 gluh@mysql.com +5 -1
    Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
      produce warning for 'create database if not exists' if database exists
      do not update database options in this case

  mysql-test/t/create.test
    1.48.1.11 05/09/12 17:08:36 gluh@mysql.com +13 -0
    Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
      test case

  mysql-test/r/warnings.result
    1.27.1.4 05/09/12 17:08:36 gluh@mysql.com +3 -1
    Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
      updated test case result

  mysql-test/r/temp_table.result
    1.9.1.2 05/09/12 17:08:36 gluh@mysql.com +2 -0
    Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
      updated test case result

  mysql-test/r/create.result
    1.75.1.10 05/09/12 17:08:36 gluh@mysql.com +28 -0
    Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
      updated test case result

ChangeSet
  1.1616.2143.72 05/09/12 14:03:23 tulin@dl145c.mysql.com +2 -0
  removed a few aborts from mgmapi
  corrected typo in ndb Parser

  ndb/src/mgmapi/mgmapi.cpp
    1.23.1.7 05/09/12 14:03:21 tulin@dl145c.mysql.com +0 -3
    removed a few aborts from mgmapi
    corrected typo in ndb Parser

  ndb/include/util/Parser.hpp
    1.4 05/09/12 14:03:21 tulin@dl145c.mysql.com +1 -1
    removed a few aborts from mgmapi
    corrected typo in ndb Parser

ChangeSet
  1.1935.74.1 05/09/12 15:02:57 gluh@mysql.com +2 -0
  manual merge

  mysql-test/r/ps_7ndb.result
    1.39 05/09/12 15:02:53 gluh@mysql.com +0 -3
    manual merge

  mysql-test/r/ps_6bdb.result
    1.39 05/09/12 15:02:53 gluh@mysql.com +0 -3
    manual merge

ChangeSet
  1.1616.2270.1 05/09/12 14:21:38 gluh@eagle.intranet.mysql.r18.ru +2 -0
  ps_6bdb, ps_7ndb tests failure fix

  mysql-test/r/ps_7ndb.result
    1.10.1.11 05/09/12 14:20:55 gluh@mysql.com +3 -3
    ps_6bdb, ps_7ndb tests failure fix

  mysql-test/r/ps_6bdb.result
    1.2.1.25 05/09/12 14:20:55 gluh@mysql.com +3 -3
    ps_6bdb, ps_7ndb tests failure fix

ChangeSet
  1.1935.72.3 05/09/12 14:09:44 bar@mysql.com +2 -0
  Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/usr/home/bar/mysql-5.0.b12891

  mysql-test/t/ctype_utf8.test
    1.68 05/09/12 14:09:29 bar@mysql.com +0 -0
    Auto merged

  mysql-test/r/ctype_utf8.result
    1.72 05/09/12 14:09:29 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2143.70 05/09/12 10:50:42 lars@mysql.com +2 -0
  Reverted old fix with sync_slave_with_master and added a replace commands
  to eliminate nondeterminism in slave start

  mysql-test/t/rpl_slave_status.test
    1.3.1.3 05/09/12 10:50:35 lars@mysql.com +3 -2
    Reverted old fix with sync_slave_with_master and added a replace commands
    to eliminate nondeterminism in slave start

  mysql-test/r/rpl_slave_status.result
    1.4 05/09/12 10:50:34 lars@mysql.com +1 -1
    Reverted old fix with sync_slave_with_master and added a replace commands
    to eliminate nondeterminism in slave start

ChangeSet
  1.1935.71.1 05/09/12 09:36:07 mskold@mysql.com +1 -0
  Repair of condition pushdown after Item_func_between/in objects now directly represent NOT BETWEEN/IN expressions (ChangeSet@1.2402.1.1)

  sql/ha_ndbcluster.cc
    1.204 05/09/12 09:35:40 mskold@mysql.com +24 -2
    Repair of condition pushdown after Item_func_between/in objects now directly represent NOT BETWEEN/IN expressions (ChangeSet@1.2402.1.1)

ChangeSet
  1.1935.64.10 05/09/12 12:09:44 ramil@mysql.com +2 -0
  merging

  mysql-test/t/mysqldump.test
    1.59 05/09/12 12:09:39 ramil@mysql.com +3 -0
    merging

  mysql-test/r/mysqldump.result
    1.66 05/09/12 12:09:39 ramil@mysql.com +0 -0
    merging

ChangeSet
  1.1935.70.1 05/09/12 08:28:53 timour@mysql.com +3 -0
  Fix for BUG#13067 "JOIN ... USING is case sensitive".

  sql/sql_base.cc
    1.298.1.1 05/09/12 08:28:50 timour@mysql.com +1 -1
    Correctly compare field names with respect to case sensitivity.

  mysql-test/t/select.test
    1.75 05/09/12 08:28:50 timour@mysql.com +12 -0
    Test for BUG#13067

  mysql-test/r/select.result
    1.90 05/09/12 08:28:50 timour@mysql.com +10 -0
    Test for BUG#13067

ChangeSet
  1.1935.69.1 05/09/12 02:46:35 evgen@moonbone.local +3 -0
  Fix bug #12993 View column rename broken in subselect
  
  When view column aliased in subselect alias is set on ref which represents
  field. When tmp table is created for subselect, it takes name of original field
  not ref. Because of this alias on view column in subselect is lost. Which
  results in reported error.
  
  Now when alias is set on ref, it's set on ref real item too.

  sql/sql_base.cc
    1.299 05/09/12 02:46:28 evgen@moonbone.local +5 -0
    Fix bug #12993 View column rename broken in subselect
    Now when alias is set on ref, it's set on ref real item too.

  mysql-test/t/view.test
    1.105 05/09/12 02:46:21 evgen@moonbone.local +9 -0
    Test case for bug #12993  View column rename broken in subselect

  mysql-test/r/view.result
    1.110 05/09/12 02:46:14 evgen@moonbone.local +6 -0
    Test case for bug #12993  View column rename broken in subselect

ChangeSet
  1.1935.64.8 05/09/11 22:10:04 jani@a193-229-222-105.elisa-laajakaista.fi +2 -0
  Merged from 4.1

  mysql-test/t/analyse.test
    1.16 05/09/11 22:09:59 jani@a193-229-222-105.elisa-laajakaista.fi +8 -7
    Merged from 4.1

  mysql-test/r/analyse.result
    1.22 05/09/11 22:09:58 jani@a193-229-222-105.elisa-laajakaista.fi +6 -0
    Merged from 4.1

ChangeSet
  1.1935.64.7 05/09/11 11:07:56 jani@a193-229-222-105.elisa-laajakaista.fi +3 -0
  Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
  into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0

  mysql-test/r/analyse.result
    1.21 05/09/11 11:07:52 jani@a193-229-222-105.elisa-laajakaista.fi +0 -6
    Merge from 4.1

  sql/sql_analyse.cc
    1.62 05/09/11 11:02:18 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  mysql-test/t/analyse.test
    1.15 05/09/11 11:02:18 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

ChangeSet
  1.1935.68.1 05/09/11 01:23:08 lars@mysql.com +3 -0
  Merge mysql.com:/users/lthalmann/bk/mysql-4.1-one_shot
  into  mysql.com:/users/lthalmann/bk/mysql-5.0

  sql/sql_parse.cc
    1.483 05/09/11 01:23:01 lars@mysql.com +0 -3
    Manual marge

  mysql-test/t/insert_select.test
    1.25 05/09/11 01:19:52 lars@mysql.com +0 -0
    Auto merged

  mysql-test/r/insert_select.result
    1.32 05/09/11 01:19:52 lars@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2268.2 05/09/11 00:57:31 lars@mysql.com +1 -0
  Removed redundant reset_one_shot_variables calls

  sql/sql_parse.cc
    1.271.1.195 05/09/11 00:57:22 lars@mysql.com +0 -3
    Optimization, this reset is executed below anyway

ChangeSet
  1.1935.64.5 05/09/10 16:01:26 paul@frost.snake.net +1 -0
  options.cc:
    Fix typo.

  server-tools/instance-manager/options.cc
    1.26 05/09/10 16:00:57 paul@frost.snake.net +1 -1
    Fix typo.

ChangeSet
  1.1935.67.1 05/09/10 12:31:57 paul@snake-hub.snake.net +1 -0
  comp_err.c:
    Fix some comments.

  extra/comp_err.c
    1.20 05/09/10 12:31:26 paul@snake-hub.snake.net +8 -8
    Fix some comments.

ChangeSet
  1.1935.66.1 05/09/10 15:01:54 timour@mysql.com +4 -0
  Fix for BUG#12943.
  
  The problem was that in the first production in rule 'join_table', that
  processes simple cross joins, the parser was processing the second join operand
  before the first one due to unspecified priorities of JOINs. As a result in the
  case of cross joins the parser constructed a tree with incorrect nesting:
  the expression "t1 join t2 join t3 on some_cond" was interpreted as
  "t1 join (t2 join t3 on some_cond)" instead of
  "(t1 join t2) join t3 on some_cond".
  Because of this incorrect nesting the method make_join_on_context picked an
  incorrect table as the first table of the name resolution context.
  
  The solution assignes correct priorities to the related production.

  sql/sql_yacc.yy
    1.420 05/09/10 15:01:51 timour@mysql.com +10 -1
    Provide explicit priorities of the JOIN operator and the 'table_ref' rule,
    to enforce left-associativity of [INNER | CROSS] JOIN.

  sql/sql_parse.cc
    1.480.1.1 05/09/10 15:01:51 timour@mysql.com +1 -1
    Fixed typo.

  mysql-test/t/select.test
    1.73.1.1 05/09/10 15:01:50 timour@mysql.com +23 -0
    Added test for BUG#12943.

  mysql-test/r/select.result
    1.88.1.1 05/09/10 15:01:50 timour@mysql.com +20 -0
    Added test for BUG#12943.

ChangeSet
  1.1935.65.1 05/09/10 15:32:07 sergefp@mysql.com +1 -0
  Fix a valgrind warning.

  sql/sql_select.cc
    1.370 05/09/10 15:32:03 sergefp@mysql.com +1 -2
    Fix a valgrind warning.

ChangeSet
  1.1935.64.2 05/09/10 00:48:24 patg@radha.local +1 -0
  BUG #12597 after merge, needed to produce results

ChangeSet
  1.1935.64.1 05/09/10 00:30:06 patg@radha.local +3 -0
  Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597

  mysql-test/r/mysqldump.result
    1.65 05/09/10 00:47:58 patg@radha.local +0 -2
    BUG #12597 - new results file because of merge of test and results file

ChangeSet
  1.1616.2267.1 05/09/10 02:30:26 evgen@moonbone.local +2 -0
  insert_select.result, insert_select.test:
    Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did 
    not update const_item_cache.

  mysql-test/t/mysqldump.test
    1.58 05/09/10 00:29:45 patg@radha.local +0 -0
    resolving conflicts for pushing to bug #12597

  mysql-test/r/mysqldump.result
    1.64 05/09/10 00:29:45 patg@radha.local +2 -0
    resolving conflicts in order to push for bug #12597

  mysql-test/r/insert_select.result
    1.16.1.12 05/09/10 02:29:28 evgen@moonbone.local +10 -0
    Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did 
    not update const_item_cache.

  mysql-test/t/insert_select.test
    1.14.1.8 05/09/10 02:27:33 evgen@moonbone.local +10 -0
    Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did 
    not update const_item_cache.

  client/mysqldump.c
    1.198 05/09/10 00:25:14 patg@radha.local +0 -0
    Auto merged

ChangeSet
  1.1935.62.1 05/09/09 17:17:44 pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.73 05/09/09 17:17:39 pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se +0 -0
    Auto merged

  ndb/src/kernel/blocks/dblqh/Dblqh.hpp
    1.35 05/09/09 17:17:39 pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se +0 -0
    Auto merged

ChangeSet
  1.1616.2264.1 05/09/09 17:29:57 jani@a193-229-222-105.elisa-laajakaista.fi +3 -0
  Fixed Bug#10716, Procedure Analyse results in wrong values for optimal field type
  Added test case.

ChangeSet
  1.1935.60.1 05/09/09 20:17:08 aivanov@mysql.com +2 -0
  Merge mysql.com:/home/alexi/mysql-5.0
  into  mysql.com:/home/alexi/dev/mysql-5.0-12101

  sql/item_cmpfunc.h
    1.114 05/09/09 20:16:56 aivanov@mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.177 05/09/09 20:16:56 aivanov@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.53.4 05/09/09 20:09:37 sergefp@mysql.com +1 -0
  Fix for valgrind warning/crashes: When executing SP statement, If we set 
  thd->user_var_events_alloc (and so get binlog events to be allocated on its pool), 
  clean the binlog events after the execution of this SP statement is finished.

  sql/sp_head.cc
    1.182 05/09/09 20:09:33 sergefp@mysql.com +16 -5
    Fix for valgrind warning/crashes: When executing SP statement, If we set 
    thd->user_var_events_alloc (and so get binlog events to be allocated on its pool), 
    clean the binlog events after the execution of this SP statement is finished.

ChangeSet
  1.1935.59.1 05/09/09 19:08:12 aivanov@mysql.com +2 -0
  Merge mysql.com:/home/alexi/dev/mysql-4.1-12101
  into  mysql.com:/home/alexi/dev/mysql-5.0-12101

  sql/item_cmpfunc.h
    1.110.2.1 05/09/09 19:08:01 aivanov@mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.174.2.1 05/09/09 19:08:00 aivanov@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2263.1 05/09/09 19:06:15 aivanov@mysql.com +1 -0
  BUG #12101: Additional fix.

  sql/item_cmpfunc.cc
    1.111.1.85 05/09/09 19:06:09 aivanov@mysql.com +4 -0
    Modified Item_func_between::print(), Item_func_in::print().
    Item_func_between/in objects represent now [NOT]BETWEEN/IN expressions.

  sql/sql_analyse.cc
    1.45.1.8 05/09/09 17:29:52 jani@a193-229-222-105.elisa-laajakaista.fi +10 -5
    Fixed Bug#10716, Procedure Analyse results in wrong values for optimal field type
    Added test case.

  mysql-test/t/analyse.test
    1.12.1.2 05/09/09 17:29:52 jani@a193-229-222-105.elisa-laajakaista.fi +9 -0
    Fixed Bug#10716, Procedure Analyse results in wrong values for optimal field type
    Added test case.

  mysql-test/r/analyse.result
    1.14.1.3 05/09/09 17:29:51 jani@a193-229-222-105.elisa-laajakaista.fi +6 -0
    Fixed Bug#10716, Procedure Analyse results in wrong values for optimal field type
    Added test case.

ChangeSet
  1.1935.42.17 05/09/09 17:51:13 gluh@eagle.intranet.mysql.r18.ru +6 -0
  after merge fix

  sql/item.cc
    1.176 05/09/09 17:50:02 gluh@mysql.com +6 -1
    after merge fix

  mysql-test/r/ps_5merge.result
    1.37 05/09/09 17:50:02 gluh@mysql.com +2 -2
    after merge fix

  mysql-test/r/ps_4heap.result
    1.36 05/09/09 17:50:02 gluh@mysql.com +1 -1
    after merge fix

  mysql-test/r/ps_3innodb.result
    1.40 05/09/09 17:50:02 gluh@mysql.com +1 -1
    after merge fix

  mysql-test/r/ps_2myisam.result
    1.37 05/09/09 17:50:02 gluh@mysql.com +1 -1
    after merge fix

  mysql-test/r/ps_1general.result
    1.48 05/09/09 17:50:02 gluh@mysql.com +1 -2
    after merge fix

ChangeSet
  1.1935.58.1 05/09/09 16:23:12 konstantin@mysql.com +1 -0
  Comment why lex->result is ignored if EXPLAIN

  sql/sql_parse.cc
    1.482 05/09/09 16:23:07 konstantin@mysql.com +6 -0
    Comment why lex->result is ignored if EXPLAIN

ChangeSet
  1.1935.42.16 05/09/09 16:52:44 gluh@mysql.com +8 -0
  manual merge

  sql/sql_show.cc
    1.275 05/09/09 16:52:39 gluh@mysql.com +0 -1
    manual merge

  sql/item.cc
    1.175 05/09/09 16:52:39 gluh@mysql.com +0 -0
    manual merge

  mysql-test/r/ps_5merge.result
    1.36 05/09/09 16:52:39 gluh@mysql.com +2 -8
    manual merge

  mysql-test/r/ps_4heap.result
    1.35 05/09/09 16:52:39 gluh@mysql.com +1 -4
    manual merge

  mysql-test/r/ps_3innodb.result
    1.39 05/09/09 16:52:39 gluh@mysql.com +1 -4
    manual merge

  mysql-test/r/ps_2myisam.result
    1.36 05/09/09 16:52:39 gluh@mysql.com +1 -4
    manual merge

  mysql-test/r/ps_1general.result
    1.47 05/09/09 16:52:39 gluh@mysql.com +2 -7
    manual merge

  tests/mysql_client_test.c
    1.158 05/09/09 16:29:20 gluh@mysql.com +0 -3
    Auto merged

ChangeSet
  1.1935.27.3 05/09/09 13:14:35 jonas@eel.(none) +1 -0
  merge fixes

  ndb/test/ndbapi/testSRBank.cpp
    1.2 05/09/09 13:14:31 jonas@eel.(none) +7 -7
    merge fixes

ChangeSet
  1.1935.27.2 05/09/09 12:54:03 jonas@eel.(none) +7 -0
  Merge eel.(none):/home/jonas/src/mysql-4.1
  into  eel.(none):/home/jonas/src/mysql-5.0

  ndb/test/src/UtilTransactions.cpp
    1.19 05/09/09 12:53:59 jonas@eel.(none) +3 -19
    merge

  ndb/test/ndbapi/bank/Bank.hpp
    1.7 05/09/09 12:53:59 jonas@eel.(none) +1 -2
    merge

  ndb/test/ndbapi/bank/Bank.cpp
    1.10 05/09/09 12:53:59 jonas@eel.(none) +1 -2
    merge

  ndb/test/ndbapi/Makefile.am
    1.23 05/09/09 12:53:59 jonas@eel.(none) +3 -4
    merge

ChangeSet
  1.1935.42.15 05/09/09 12:47:57 serg@serg.mylan +1 -0
  aftermerge

  mysql-test/r/group_by.result
    1.68 05/09/09 12:47:45 serg@serg.mylan +9 -9
    aftermerge

ChangeSet
  1.1935.42.14 05/09/09 12:43:25 serg@serg.mylan +2 -0
  merged

  mysql-test/t/group_by.test
    1.55 05/09/09 12:43:14 serg@serg.mylan +0 -2
    merged

  mysql-test/r/group_by.result
    1.67 05/09/09 12:43:14 serg@serg.mylan +8 -8
    merged

  ndb/test/src/NDBT_Test.cpp
    1.24 05/09/09 12:41:10 jonas@eel.(none) +0 -0
    Auto merged

  ndb/test/include/NDBT_Test.hpp
    1.12 05/09/09 12:41:10 jonas@eel.(none) +0 -0
    Auto merged

  BitKeeper/etc/ignore
    1.207 05/09/09 12:40:58 jonas@eel.(none) +1 -1
    auto-union

ChangeSet
  1.1616.2245.5 05/09/09 12:39:06 jonas@eel.(none) +8 -0
  ndb 
    new testprogram testSRBank

  ndb/test/ndbapi/testSRBank.cpp
    1.1 05/09/09 12:39:02 jonas@eel.(none) +246 -0
    New BitKeeper file ``ndb/test/ndbapi/testSRBank.cpp''

  ndb/test/src/UtilTransactions.cpp
    1.13.2.1 05/09/09 12:39:02 jonas@eel.(none) +19 -3
    close transaction if failed

  ndb/test/src/NDBT_Test.cpp
    1.17.1.3 05/09/09 12:39:02 jonas@eel.(none) +9 -0
    incProperty

  ndb/test/ndbapi/testSRBank.cpp
    1.0 05/09/09 12:39:02 jonas@eel.(none) +0 -0
    BitKeeper file /home/jonas/src/mysql-4.1/ndb/test/ndbapi/testSRBank.cpp

  ndb/test/ndbapi/bank/Bank.hpp
    1.5.1.1 05/09/09 12:39:02 jonas@eel.(none) +1 -1
    remove endless wait until ready loop
    fix lots of retry loops to better handle error

  ndb/test/ndbapi/bank/Bank.cpp
    1.7.1.1 05/09/09 12:39:02 jonas@eel.(none) +86 -82
    remove endless wait until ready loop
    fix lots of retry loops to better handle error

  ndb/test/ndbapi/Makefile.am
    1.14.2.3 05/09/09 12:39:02 jonas@eel.(none) +4 -1
    new test program

  ndb/test/include/NDBT_Test.hpp
    1.8.1.2 05/09/09 12:39:02 jonas@eel.(none) +2 -1
    incProperty

  BitKeeper/etc/ignore
    1.153.1.79 05/09/09 12:39:02 jonas@eel.(none) +1 -0
    Added ndb/test/ndbapi/testSRBank to the ignore list

ChangeSet
  1.1935.56.1 05/09/09 12:15:25 serg@serg.mylan +2 -0
  aftermerge

  mysql-test/t/group_by.test
    1.53.1.1 05/09/09 12:14:50 serg@serg.mylan +0 -10
    aftermerge

  mysql-test/r/group_by.result
    1.65.1.1 05/09/09 12:14:48 serg@serg.mylan +8 -8
    aftermerge

ChangeSet
  1.1935.53.3 05/09/09 12:57:41 sergefp@mysql.com +2 -0
  Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/psergey/mysql-5.0-merge

  mysql-test/t/group_by.test
    1.54 05/09/09 12:57:40 sergefp@mysql.com +0 -0
    Auto merged

  mysql-test/r/group_by.result
    1.66 05/09/09 12:57:40 sergefp@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.55.1 05/09/09 12:57:00 sergefp@mysql.com +3 -0
  Post-merge fixes

  mysql-test/t/group_by.test
    1.52.1.1 05/09/09 12:56:56 sergefp@mysql.com +6 -6
    Post-merge fixes

  mysql-test/r/olap.result
    1.31 05/09/09 12:56:56 sergefp@mysql.com +1 -0
    Post-merge fixes

  mysql-test/r/group_by.result
    1.64.1.1 05/09/09 12:56:56 sergefp@mysql.com +7 -7
    Post-merge fixes

ChangeSet
  1.1935.53.2 05/09/09 10:49:09 serg@serg.mylan +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into serg.mylan:/usr/home/serg/Abk/mysql-5.0

  sql/item_cmpfunc.h
    1.113 05/09/09 10:48:53 serg@serg.mylan +0 -0
    Auto merged

  mysql-test/t/group_by.test
    1.53 05/09/09 10:48:53 serg@serg.mylan +0 -0
    Auto merged

  mysql-test/r/group_by.result
    1.65 05/09/09 10:48:52 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1616.2259.4 05/09/09 13:22:16 gluh@eagle.intranet.mysql.r18.ru +8 -0
  Bug#12817 SHOW STATUS now blob fields
     This fix is cancellation of ChangeSet
     1.2329 05/07/12 08:35:30 reggie@linux.site +8 -0
     Bug 7142  Show Fields from fails using Borland's dbExpress interface
     The reason is we can't fix bug#7142 without
     breaking of existing applications/APIs that worked fine with earlier 4.1
     bug 7142 is fixed in 5.0
  
  

  tests/mysql_client_test.c
    1.51.1.107 05/09/09 13:22:12 gluh@mysql.com +3 -3
    Bug #12817 SHOW STATUS now blob fields

  sql/sql_show.cc
    1.122.1.80 05/09/09 13:22:12 gluh@mysql.com +1 -33
    Bug #12817 SHOW STATUS now blob fields

  sql/item.cc
    1.58.1.163 05/09/09 13:22:12 gluh@mysql.com +1 -8
    Bug #12817 SHOW STATUS now blob fields

  mysql-test/r/ps_5merge.result
    1.2.1.24 05/09/09 13:22:12 gluh@mysql.com +6 -6
    Bug #12817 SHOW STATUS now blob fields

  mysql-test/r/ps_4heap.result
    1.1.1.25 05/09/09 13:22:12 gluh@mysql.com +3 -3
    Bug #12817 SHOW STATUS now blob fields

  mysql-test/r/ps_3innodb.result
    1.2.1.26 05/09/09 13:22:12 gluh@mysql.com +3 -3
    Bug #12817 SHOW STATUS now blob fields

  mysql-test/r/ps_2myisam.result
    1.2.1.25 05/09/09 13:22:12 gluh@mysql.com +3 -3
    Bug #12817 SHOW STATUS now blob fields

  mysql-test/r/ps_1general.result
    1.1.1.22 05/09/09 13:22:12 gluh@mysql.com +6 -6
    Bug #12817 SHOW STATUS now blob fields

ChangeSet
  1.1935.54.1 05/09/09 12:51:43 ramil@mysql.com +5 -0
  A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client binaries).
  

  mysys/default.c
    1.78 05/09/09 12:51:36 ramil@mysql.com +3 -0
    A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client binaries).
    Set defaults_extra_file as we use it widely.

  mysql-test/t/mysqldump.test
    1.55.2.1 05/09/09 12:51:36 ramil@mysql.com +10 -0
    A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client binaries).
    

  mysql-test/r/mysqldump.result
    1.61.2.1 05/09/09 12:51:36 ramil@mysql.com +2 -0
    A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client binaries).
    

  mysql-test/mysql-test-run.sh
    1.273 05/09/09 12:51:36 ramil@mysql.com +3 -1
    A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client binaries).
    MYSQL_MY_PRINT_DEFAULTS added

  mysql-test/mysql-test-run.pl
    1.38.1.4 05/09/09 12:51:36 ramil@mysql.com +6 -0
    A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client binaries).
    MYSQL_MY_PRINT_DEFAULTS added

ChangeSet
  1.1935.53.1 05/09/09 11:50:38 sergefp@mysql.com +23 -0
  Post-merge fixes

  sql/item_sum.cc
    1.163 05/09/09 11:50:33 sergefp@mysql.com +1 -1
    Post-merge fixes

  mysql-test/t/olap.test
    1.24 05/09/09 11:50:33 sergefp@mysql.com +3 -4
    Post-merge fixes

ChangeSet
  1.1935.50.2 05/09/09 09:44:58 serg@serg.mylan +3 -0
  merged

  mysql-test/t/group_by.test
    1.51.1.1 05/09/09 09:44:47 serg@serg.mylan +10 -10
    merged

  mysql-test/r/group_by.result
    1.63.1.1 05/09/09 09:44:46 serg@serg.mylan +0 -0
    merged

  sql/sql_select.cc
    1.369 05/09/09 11:44:07 sergefp@mysql.com +0 -0
    Auto merged

  sql/sql_class.cc
    1.209 05/09/09 11:44:07 sergefp@mysql.com +0 -0
    Auto merged

  sql/item_sum.h
    1.94 05/09/09 11:44:07 sergefp@mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.111.1.1 05/09/09 11:44:07 sergefp@mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.176 05/09/09 11:44:07 sergefp@mysql.com +0 -0
    Auto merged

  ndb/test/src/NdbBackup.cpp
    1.24 05/09/09 11:44:07 sergefp@mysql.com +0 -0
    Auto merged

  ndb/src/ndbapi/NdbTransaction.cpp
    1.46 05/09/09 11:44:07 sergefp@mysql.com +0 -0
    Auto merged

  ndb/src/ndbapi/Makefile.am
    1.14 05/09/09 11:44:07 sergefp@mysql.com +0 -0
    Auto merged

  ndb/src/mgmsrv/MgmtSrvr.hpp
    1.36 05/09/09 11:44:07 sergefp@mysql.com +0 -0
    Auto merged

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.86 05/09/09 11:44:07 sergefp@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/backup/Backup.hpp
    1.11 05/09/09 11:44:07 sergefp@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/main.cpp
    1.55 05/09/09 11:44:06 sergefp@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.23 05/09/09 11:44:06 sergefp@mysql.com +0 -0
    Auto merged

  mysql-test/t/func_gconcat.test
    1.37 05/09/09 11:44:06 sergefp@mysql.com +0 -0
    Auto merged

  mysql-test/t/connect.test
    1.16 05/09/09 11:44:06 sergefp@mysql.com +0 -0
    Auto merged

  mysql-test/r/olap.result
    1.30 05/09/09 11:44:06 sergefp@mysql.com +0 -1
    Auto merged

  mysql-test/r/func_gconcat.result
    1.47 05/09/09 11:44:06 sergefp@mysql.com +0 -0
    Auto merged

  mysql-test/r/connect.result
    1.17 05/09/09 11:44:06 sergefp@mysql.com +0 -0
    Auto merged

  include/my_global.h
    1.104 05/09/09 11:44:06 sergefp@mysql.com +0 -0
    Auto merged

  configure.in
    1.344 05/09/09 11:44:06 sergefp@mysql.com +0 -1
    Auto merged

  client/mysqlimport.c
    1.53 05/09/09 11:44:06 sergefp@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.51.2 05/09/09 11:43:26 sergefp@mysql.com +1 -0
  Post-merge fixes. Call sp_cache_clear in THD::cleanup.

  sql/sql_class.cc
    1.206.2.2 05/09/09 11:43:21 sergefp@mysql.com +3 -4
    Post-merge fixes. Call sp_cache_clear in THD::cleanup.

  sql/item_cmpfunc.h
    1.112 05/09/09 09:26:41 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1935.52.1 05/09/09 09:10:56 andrey@lmy004. +1 -0
  Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
  into lmy004.:/work/mysql-5.0-bug12651

  sql/sql_base.cc
    1.298 05/09/09 09:10:53 andrey@lmy004. +0 -0
    Auto merged

ChangeSet
  1.1935.51.1 05/09/09 10:54:59 sergefp@mysql.com +25 -0
  Merge 4.1->5.0

  sql/sql_class.cc
    1.206.2.1 05/09/09 10:54:55 sergefp@mysql.com +1 -1
    Merge 4.1->5.0

  sql/item_sum.h
    1.91.1.1 05/09/09 10:54:54 sergefp@mysql.com +0 -0
    Merge 4.1->5.0

  sql/item_sum.cc
    1.160.1.1 05/09/09 10:54:54 sergefp@mysql.com +0 -2
    Merge 4.1->5.0

  ndb/src/ndbapi/NdbTransaction.cpp
    1.44.1.1 05/09/09 10:54:54 sergefp@mysql.com +0 -0
    Merge 4.1->5.0

  mysql-test/t/olap.test
    1.21.1.1 05/09/09 10:54:54 sergefp@mysql.com +3 -3
    Merge 4.1->5.0

  mysql-test/t/group_by.test
    1.52 05/09/09 10:54:54 sergefp@mysql.com +10 -10
    Merge 4.1->5.0

  mysql-test/r/olap.result
    1.27.1.1 05/09/09 10:54:54 sergefp@mysql.com +1 -1
    Merge 4.1->5.0

  mysql-test/r/group_by.result
    1.64 05/09/09 10:54:54 sergefp@mysql.com +0 -0
    Merge 4.1->5.0

  sql/sql_select.cc
    1.367.1.1 05/09/09 10:45:01 sergefp@mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.110.1.1 05/09/09 10:45:01 sergefp@mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.174.1.1 05/09/09 10:45:01 sergefp@mysql.com +0 -0
    Auto merged

  ndb/test/src/NdbBackup.cpp
    1.22.1.1 05/09/09 10:45:00 sergefp@mysql.com +0 -0
    Auto merged

  ndb/src/ndbapi/NdbTransaction.cpp
    1.30.5.1 05/09/09 10:45:00 sergefp@mysql.com +0 -0
    Merge rename: ndb/src/ndbapi/NdbConnection.cpp -> ndb/src/ndbapi/NdbTransaction.cpp

  ndb/src/ndbapi/Makefile.am
    1.12.1.1 05/09/09 10:45:00 sergefp@mysql.com +0 -0
    Auto merged

  ndb/src/mgmsrv/MgmtSrvr.hpp
    1.34.1.1 05/09/09 10:45:00 sergefp@mysql.com +0 -0
    Auto merged

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.81.1.1 05/09/09 10:45:00 sergefp@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/main.cpp
    1.53.1.1 05/09/09 10:45:00 sergefp@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/backup/Backup.hpp
    1.9.1.1 05/09/09 10:45:00 sergefp@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.21.1.1 05/09/09 10:45:00 sergefp@mysql.com +0 -0
    Auto merged

  mysql-test/t/func_gconcat.test
    1.35.1.1 05/09/09 10:45:00 sergefp@mysql.com +0 -0
    Auto merged

  mysql-test/t/connect.test
    1.13.2.1 05/09/09 10:45:00 sergefp@mysql.com +0 -0
    Auto merged

  mysql-test/r/func_gconcat.result
    1.45.1.1 05/09/09 10:45:00 sergefp@mysql.com +0 -0
    Auto merged

  mysql-test/r/connect.result
    1.14.2.1 05/09/09 10:45:00 sergefp@mysql.com +0 -0
    Auto merged

  include/my_global.h
    1.102.1.1 05/09/09 10:45:00 sergefp@mysql.com +0 -0
    Auto merged

  configure.in
    1.342.1.1 05/09/09 10:45:00 sergefp@mysql.com +1 -7
    Auto merged

  client/mysqlimport.c
    1.51.1.1 05/09/09 10:45:00 sergefp@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.42.10 05/09/09 10:08:46 sergefp@mysql.com +5 -0
  Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/psergey/mysql-5.0-bug12943

  sql/sql_parse.cc
    1.481 05/09/09 10:08:44 sergefp@mysql.com +0 -0
    Auto merged

  sql/sp_head.cc
    1.181 05/09/09 10:08:44 sergefp@mysql.com +0 -0
    Auto merged

  sql/item_func.cc
    1.250 05/09/09 10:08:44 sergefp@mysql.com +0 -0
    Auto merged

  mysql-test/t/sp.test
    1.145 05/09/09 10:08:44 sergefp@mysql.com +0 -0
    Auto merged

  mysql-test/r/sp.result
    1.150 05/09/09 10:08:44 sergefp@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.42.9 05/09/08 20:33:32 igor@rurik.mysql.com +4 -0
  Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
  into rurik.mysql.com:/home/igor/mysql-5.0

ChangeSet
  1.1935.42.8 05/09/09 00:22:36 pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0

  ndb/src/ndbapi/SignalSender.cpp
    1.3 05/09/09 00:22:32 pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se +0 -1
    Merge

  sql/sql_class.cc
    1.208 05/09/08 20:33:24 igor@rurik.mysql.com +0 -2
    Auto merged

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.85 05/09/08 20:33:24 igor@rurik.mysql.com +0 -0
    Auto merged

  mysql-test/t/connect.test
    1.15 05/09/08 20:33:24 igor@rurik.mysql.com +0 -0
    Auto merged

  mysql-test/r/connect.result
    1.16 05/09/08 20:33:24 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.49.1 05/09/08 22:47:41 pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -0
  Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0

  sql/sql_class.cc
    1.206.1.1 05/09/08 22:47:37 pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se +0 -0
    SCCS merged

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.83.1.1 05/09/08 21:56:32 pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se +0 -1
    Auto merged

  mysql-test/t/connect.test
    1.13.1.1 05/09/08 21:56:32 pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se +0 -0
    Auto merged

  mysql-test/r/connect.result
    1.14.1.1 05/09/08 21:56:32 pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se +0 -0
    Auto merged

ChangeSet
  1.1935.46.3 05/09/08 15:45:31 igor@rurik.mysql.com +2 -0
  olap.result, olap.test:
    Added a test case with VIEW for bug #12885.

  mysql-test/r/olap.result
    1.29 05/09/08 15:44:51 igor@rurik.mysql.com +16 -0
    Added a test case with VIEW for bug #12885.

  mysql-test/t/olap.test
    1.23 05/09/08 15:44:12 igor@rurik.mysql.com +17 -2
    Added a test case with VIEW for bug #12885.

ChangeSet
  1.1935.48.1 05/09/09 00:03:07 patg@radha.local +3 -0
  BUG #12597 This is a complete patch (2nd) containing fixes per Serg's review

  mysql-test/t/mysqldump.test
    1.55.1.1 05/09/09 00:02:52 patg@radha.local +35 -0
    BUG #12597
    - New tests to test bug #12597

  mysql-test/r/mysqldump.result
    1.61.1.1 05/09/09 00:02:51 patg@radha.local +54 -23
    Tests to test BUG #12597

  client/mysqldump.c
    1.195.1.1 05/09/09 00:02:51 patg@radha.local +68 -35
    BUG #12597
    - Dump triggers after data dump of each table
    - created dump_triggers_for_table function
    - added space between "MODE" and "*/"

ChangeSet
  1.1935.47.1 05/09/09 02:01:04 konstantin@mysql.com +1 -0
  Fix -ansi -pedantic compilation failure.

  ndb/src/ndbapi/SignalSender.cpp
    1.1.1.1 05/09/09 02:00:54 konstantin@mysql.com +2 -2
    Fix -ansi -pedantic compilation failure.

ChangeSet
  1.1616.2262.1 05/09/08 23:11:15 serg@serg.mylan +1 -0
  Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  sql/item_cmpfunc.h
    1.73.1.38 05/09/08 23:11:03 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1616.2261.1 05/09/08 22:57:27 serg@serg.mylan +3 -0
  BUG#12695: Item_func_isnull::update_used_tables did not update const_item_cache

  sql/item_cmpfunc.h
    1.73.10.1 05/09/08 22:57:19 serg@serg.mylan +1 -1
    BUG#12695: Item_func_isnull::update_used_tables did not update const_item_cache

  mysql-test/t/group_by.test
    1.36.1.7 05/09/08 22:57:18 serg@serg.mylan +10 -0
    BUG#12695: Item_func_isnull::update_used_tables did not update const_item_cache

  mysql-test/r/group_by.result
    1.38.1.14 05/09/08 22:57:18 serg@serg.mylan +9 -0
    BUG#12695: Item_func_isnull::update_used_tables did not update const_item_cache

ChangeSet
  1.1935.46.2 05/09/08 13:45:49 igor@rurik.mysql.com +1 -0
  Manual merge

  mysql-test/t/olap.test
    1.22 05/09/08 13:45:44 igor@rurik.mysql.com +14 -10
    Manual merge

ChangeSet
  1.1935.46.1 05/09/08 13:44:36 igor@rurik.mysql.com +6 -0
  Manual merge

  sql/sql_class.cc
    1.207 05/09/08 13:44:31 igor@rurik.mysql.com +2 -0
    Manual merge

  mysql-test/r/olap.result
    1.28 05/09/08 13:44:31 igor@rurik.mysql.com +12 -12
    Manual merge

  sql/sql_select.cc
    1.368 05/09/08 13:22:40 igor@rurik.mysql.com +0 -0
    Auto merged

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.84 05/09/08 13:22:39 igor@rurik.mysql.com +0 -1
    Auto merged

  mysql-test/t/connect.test
    1.14 05/09/08 13:22:39 igor@rurik.mysql.com +0 -0
    Auto merged

  mysql-test/r/connect.result
    1.15 05/09/08 13:22:39 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.1660.11 05/09/08 21:40:59 jimw@mysql.com +1 -0
  When first creating the ARZ file for an archive table, use "wb" as the mode for
  gzdopen() because the file itself was only opened for writing (and truncated),
  and some libc implementations (like SCO) don't like to do a fdopen(..., "a") on
  a fd that was not opened using O_APPEND.

  sql/examples/ha_archive.cc
    1.13.6.1 05/09/08 21:37:34 jimw@mysql.com +1 -1
    Use "wb" instead of "ab" since we just opened this file for writing

ChangeSet
  1.1616.2260.1 05/09/08 12:37:16 igor@rurik.mysql.com +3 -0
  sql_select.cc:
    Fixed bug #12885.
    Forced inheritence of the maybe_null flag for the expressions
    containing GROUP BY attributes in selects with ROLLUP.
  olap.test, olap.result:
    Added test case for bug #12885.

  sql/sql_select.cc
    1.216.1.218 05/09/08 12:33:07 igor@rurik.mysql.com +14 -3
    Fixed bug #12885.
    Forced inheritence of the maybe_null flag for the expressions
    containing GROUP BY attributes in selects with ROLLUP.

  mysql-test/t/olap.test
    1.12.1.6 05/09/08 12:32:12 igor@rurik.mysql.com +13 -0
    Added test case for bug #12885.

  mysql-test/r/olap.result
    1.11.1.10 05/09/08 12:31:31 igor@rurik.mysql.com +13 -0
    Added test case for bug #12885.

ChangeSet
  1.1935.45.1 05/09/08 21:30:05 andrey@lmy004. +3 -0
  fix for bug #12651 (item of a prepared query allocated on non-permanent
  are thus dangling later)

  sql/sql_base.cc
    1.296.1.1 05/09/08 21:29:52 andrey@lmy004. +17 -0
    if there is tree transformation then backup the current arena
    and use permanent one (for PS) otherwise the data will be deallocated
    after the prepare process is finished.
    this bug was introduced with the recent natural join patch

  mysql-test/t/ps.test
    1.54 05/09/08 21:29:52 andrey@lmy004. +15 -0
    test for bug #12651
    (data allocated on thd's arena but not on permanent arena)

  mysql-test/r/ps.result
    1.53 05/09/08 21:29:51 andrey@lmy004. +8 -0
    test for bug #12651
    (data allocated on thd's arena but not on permanent arena)

ChangeSet
  1.1935.1.18 05/09/08 19:45:25 patg@radha.local +3 -0
  BUG #9056 Changes to patch #2 per Serg's review

  mysql-test/t/mysqldump.test
    1.57 05/09/08 19:45:01 patg@radha.local +2 -36
    BUG #9056 Removed redirect, simplified, dump in results, per Serg

  mysql-test/r/mysqldump.result
    1.63 05/09/08 19:45:00 patg@radha.local +56 -28
    BUG #9056 New results

  client/mysqldump.c
    1.197 05/09/08 19:44:59 patg@radha.local +21 -24
    BUG #9056 Fixes per serg
    * if opt_lock for locking mysql.proc
    * calling mysql_query_with_error_report where needed
    * print functions same way as procs, file bug about commented functions

ChangeSet
  1.1616.2259.1 05/09/08 19:27:37 tulin@dl145c.mysql.com +1 -0
  SignalSender.cpp:
    fixed compile error

  ndb/src/ndbapi/SignalSender.cpp
    1.2 05/09/08 19:26:47 ndbdev@dl145c.mysql.com +1 -1
    fixed compile error

ChangeSet
  1.1935.42.4 05/09/08 18:27:05 petr@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/usersnfs/pchardin/mysql-5.0

  sql/sp_head.cc
    1.179.1.2 05/09/08 18:27:03 petr@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.43.1 05/09/08 18:25:42 petr@mysql.com +5 -0
  fix for Bug #12849 Stored Procedure: Crash on procedure call with CHAR type 'INOUT' parameter
  (recommit with the right Bug#)

  sql/sp_head.cc
    1.179.2.1 05/09/08 18:25:37 petr@mysql.com +13 -2
    don't employ reuse mechanism to save var into itself

  sql/item.h
    1.168 05/09/08 18:25:37 petr@mysql.com +8 -0
    added a buffer to save Item_splocal string pointer

  sql/item.cc
    1.174 05/09/08 18:25:37 petr@mysql.com +18 -1
    protect Item_splocal value from modification by CONCAT() et al

  mysql-test/t/sp.test
    1.143.1.1 05/09/08 18:25:37 petr@mysql.com +26 -0
    added test for the bug

  mysql-test/r/sp.result
    1.148.1.1 05/09/08 18:25:37 petr@mysql.com +19 -0
    result file modified to reflect new test

ChangeSet
  1.1616.2258.2 05/09/08 18:24:42 mronstrom@mysql.com +3 -0
  Bug #12594: A few fixes

  ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp
    1.5 05/09/08 18:24:34 mronstrom@mysql.com +10 -1
    Added printouts of new debug info in log page header

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.39.1.17 05/09/08 18:24:34 mronstrom@mysql.com +28 -62
    Fixed a bug and an issue with the added debug code for finding
    redo log write mistakes
    Removed a number of unnecessary break's

  ndb/src/kernel/blocks/dblqh/Dblqh.hpp
    1.21.1.8 05/09/08 18:24:34 mronstrom@mysql.com +2 -2
    Fixed a bug and an issue with the added debug code for finding
    redo log write mistakes

ChangeSet
  1.1935.42.3 05/09/08 17:53:14 konstantin@mysql.com +2 -0
  Remove an obsolete comment and an unused variable.

ChangeSet
  1.1935.42.2 05/09/08 16:51:35 tomas@poseidon.ndb.mysql.com +1 -0
  corrected type

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.83 05/09/08 16:51:30 tomas@poseidon.ndb.mysql.com +1 -0
    corrected type

ChangeSet
  1.1616.2143.61 05/09/08 16:47:27 tomas@poseidon.ndb.mysql.com +1 -0
  corrected typo

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.51.1.14 05/09/08 16:47:21 tomas@poseidon.ndb.mysql.com +1 -0
    corrected typo

ChangeSet
  1.1935.42.1 05/09/08 15:59:06 tomas@poseidon.ndb.mysql.com +7 -0
  Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
  into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

  ndb/test/src/NdbBackup.cpp
    1.23 05/09/08 15:59:04 tomas@poseidon.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/ndbapi/Makefile.am
    1.13 05/09/08 15:59:04 tomas@poseidon.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/mgmsrv/MgmtSrvr.hpp
    1.35 05/09/08 15:59:04 tomas@poseidon.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.82 05/09/08 15:59:04 tomas@poseidon.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/backup/Backup.hpp
    1.10 05/09/08 15:59:04 tomas@poseidon.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.22 05/09/08 15:59:04 tomas@poseidon.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/kernel/main.cpp
    1.54 05/09/08 15:59:03 tomas@poseidon.ndb.mysql.com +0 -0
    Auto merged

  sql/sql_select.h
    1.98 05/09/08 17:53:09 konstantin@mysql.com +1 -3
    Remove an unused variable.

  sql/sp_head.cc
    1.179.1.1 05/09/08 17:53:09 konstantin@mysql.com +0 -11
    Remove an obsolete comment (recursion in SP is disabled)

ChangeSet
  1.1616.2255.4 05/09/08 15:43:46 tomas@poseidon.ndb.mysql.com +2 -0
     corrected printouts in backup test

  ndb/test/src/NdbBackup.cpp
    1.19.1.3 05/09/08 15:43:42 tomas@poseidon.ndb.mysql.com +6 -3
    corrected printouts in backup test

  ndb/src/kernel/blocks/backup/Backup.hpp
    1.6.1.3 05/09/08 15:43:41 tomas@poseidon.ndb.mysql.com +1 -1
    missed this file in prev commit

ChangeSet
  1.1616.2255.3 05/09/08 15:24:21 tomas@poseidon.ndb.mysql.com +1 -0
  corrected prev fix for bug #13054
  so that _only_ backup master replies to API
   

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.11.1.9 05/09/08 15:24:16 tomas@poseidon.ndb.mysql.com +39 -33
    corrected prev fix for bug #13054
    so that _only_ backup master replies to API
     

ChangeSet
  1.1935.12.7 05/09/08 15:47:21 jan@hundin.mysql.fi +2 -0
  Fix compiler errors on InnoDB offline checksum tool innochecksum.

  extra/innochecksum.c
    1.2 05/09/08 15:46:32 jan@hundin.mysql.fi +8 -4
    Fix compiler errors on InnoDB offline checksum tool innochecksum.

  extra/Makefile.am
    1.28 05/09/08 15:46:32 jan@hundin.mysql.fi +1 -1
    Add innochecksum back to compiled programs.

ChangeSet
  1.1346.1.802 05/09/08 12:57:33 joerg@mysql.com +1 -0
  Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
  into mysql.com:/M40/mysql-4.0

  configure.in
    1.191.1.141 05/09/08 12:57:32 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2258.1 05/09/08 11:53:17 mronstrom@mysql.com +3 -0
  Bug #12594:
  Added debug info to all log page headers

  ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
    1.5 05/09/08 11:53:03 mronstrom@mysql.com +11 -0
    Bug #12594:
    Added debug info to all log page headers

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.39.1.16 05/09/08 11:53:02 mronstrom@mysql.com +60 -24
    Bug #12594:
    Added debug info to all log page headers

  ndb/src/kernel/blocks/dblqh/Dblqh.hpp
    1.21.1.7 05/09/08 11:53:02 mronstrom@mysql.com +17 -3
    Bug #12594:
    Added debug info to all log page headers

ChangeSet
  1.1935.39.1 05/09/08 11:36:22 joerg@mysql.com +2 -0
  Merge mysql.com:/M41/merge-4.1 into mysql.com:/M50/merge-5.0

  include/my_global.h
    1.103 05/09/08 11:36:18 joerg@mysql.com +0 -0
    Auto merged

  configure.in
    1.343 05/09/08 11:36:18 joerg@mysql.com +1 -7
    Auto merged

ChangeSet
  1.1935.38.1 05/09/08 11:36:12 msvensson@neptunus.(none) +2 -0
  yassl fix for ia64 + icc

  extra/yassl/taocrypt/include/types.hpp
    1.7 05/09/08 11:36:07 msvensson@neptunus.(none) +2 -1
    Check for both __ICC and __INTEL_COMPILER

  extra/yassl/taocrypt/include/runtime.hpp
    1.9 05/09/08 11:36:07 msvensson@neptunus.(none) +3 -1
    Check for both __ICC and __INTEL_COMPILER

ChangeSet
  1.1616.2255.2 05/09/08 11:34:55 tomas@poseidon.ndb.mysql.com +11 -0
  Bug #13054  	start backup command return may be interrpted

  ndb/src/ndbapi/SignalSender.hpp
    1.1 05/09/08 11:34:51 tomas@poseidon.ndb.mysql.com +83 -0

  ndb/src/ndbapi/SignalSender.cpp
    1.1 05/09/08 11:34:51 tomas@poseidon.ndb.mysql.com +270 -0

  ndb/src/ndbapi/SignalSender.hpp
    1.0 05/09/08 11:34:51 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-4.1/ndb/src/ndbapi/SignalSender.hpp

  ndb/src/ndbapi/SignalSender.cpp
    1.0 05/09/08 11:34:51 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-4.1/ndb/src/ndbapi/SignalSender.cpp

  ndb/src/ndbapi/Makefile.am
    1.10.1.1 05/09/08 11:34:51 tomas@poseidon.ndb.mysql.com +2 -1
    Bug #13054  	start backup command return may be interrpted

  ndb/src/mgmsrv/MgmtSrvr.hpp
    1.22.1.6 05/09/08 11:34:51 tomas@poseidon.ndb.mysql.com +0 -3
    Bug #13054  	start backup command return may be interrpted

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.51.1.13 05/09/08 11:34:51 tomas@poseidon.ndb.mysql.com +126 -139
    Bug #13054  	start backup command return may be interrpted

  ndb/src/kernel/blocks/backup/Backup.hpp
    1.6.1.2 05/09/08 11:34:51 tomas@poseidon.ndb.mysql.com +1 -0
    Bug #13054  	start backup command return may be interrpted

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.11.1.8 05/09/08 11:34:51 tomas@poseidon.ndb.mysql.com +31 -11
    Bug #13054  	start backup command return may be interrpted

  ndb/include/kernel/signaldata/NodeFailRep.hpp
    1.2 05/09/08 11:34:51 tomas@poseidon.ndb.mysql.com +1 -27
    Bug #13054  	start backup command return may be interrpted

  ndb/include/kernel/signaldata/NFCompleteRep.hpp
    1.2 05/09/08 11:34:51 tomas@poseidon.ndb.mysql.com +1 -17
    Bug #13054  	start backup command return may be interrpted

  ndb/include/kernel/signaldata/BackupSignalData.hpp
    1.4 05/09/08 11:34:51 tomas@poseidon.ndb.mysql.com +4 -1
    Bug #13054  	start backup command return may be interrpted

  ndb/include/kernel/signaldata/BackupImpl.hpp
    1.4 05/09/08 11:34:51 tomas@poseidon.ndb.mysql.com +8 -1
    Bug #13054  	start backup command return may be interrpted

ChangeSet
  1.1616.2257.1 05/09/08 11:12:05 joerg@mysql.com +2 -0
  Merge mysql.com:/M40/clone-4.0 into mysql.com:/M41/merge-4.1

  include/my_global.h
    1.47.13.1 05/09/08 11:12:00 joerg@mysql.com +0 -5
    Auto merged

  configure.in
    1.201.1.191 05/09/08 11:12:00 joerg@mysql.com +0 -10
    Auto merged

ChangeSet
  1.1346.852.3 05/09/08 11:04:43 joerg@mysql.com +2 -0
  Merge mysql.com:/M40/clone-4.0 into mysql.com:/M40/upward-4.0

  include/my_global.h
    1.34.1.40 05/09/08 11:04:42 joerg@mysql.com +0 -0
    Auto merged

  configure.in
    1.191.22.1 05/09/08 11:04:41 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.37.1 05/09/08 11:29:52 timour@mysql.com +3 -0
  Fix for BUG#12977.

  sql/sql_base.cc
    1.297 05/09/08 11:29:49 timour@mysql.com +21 -7
    - Compare table qualifier of qualified fields only with tables that
      are not natural joins or their operands.
    - For qualified fields perform recursive search in all operands of
      natural joins that are nested joins.
    - Symmetrically detect ambiguous columns for both operands of
      NATURAL/USING joins.

  mysql-test/t/select.test
    1.74 05/09/08 11:29:49 timour@mysql.com +22 -0
    Test for BUG#12977.

  mysql-test/r/select.result
    1.89 05/09/08 11:29:49 timour@mysql.com +15 -0
    Test for BUG#12977.

ChangeSet
  1.1616.2223.2 05/09/08 12:09:30 SergeyV@selena. +2 -0
  Modified test case for bug #12517

  mysql-test/t/connect.test
    1.9.1.4 05/09/08 12:09:24 SergeyV@selena. +10 -10
    Modified test case for bug #12517

  mysql-test/r/connect.result
    1.1.1.11 05/09/08 12:09:23 SergeyV@selena. +2 -12
    Modified test case for bug #12517

ChangeSet
  1.1935.36.5 05/09/08 15:11:56 stewart@mysql.com +1 -0
  Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug11607
  into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug11607

  ndb/src/ndbapi/NdbTransaction.cpp
    1.45 05/09/08 15:11:53 stewart@mysql.com +0 -0
    SCCS merged

  ndb/src/ndbapi/NdbTransaction.cpp
    1.30.4.2 05/09/08 15:11:06 stewart@mysql.com +0 -0
    Merge rename: ndb/src/ndbapi/NdbConnection.cpp -> ndb/src/ndbapi/NdbTransaction.cpp

ChangeSet
  1.1935.36.4 05/09/07 21:38:27 igor@rurik.mysql.com +2 -0
  item_sum.cc, item_sum.h:
    Post-merge fix.

  sql/item_sum.cc
    1.162 05/09/07 21:36:19 igor@rurik.mysql.com +0 -6
    Post-merge fix.

  sql/item_sum.h
    1.93 05/09/07 21:35:51 igor@rurik.mysql.com +3 -25
    Post-merge fix.

ChangeSet
  1.1935.36.3 05/09/07 18:07:51 igor@rurik.mysql.com +1 -0
  Manual merge

  sql/item_sum.h
    1.92 05/09/07 18:07:46 igor@rurik.mysql.com +22 -0
    Manual merge

ChangeSet
  1.1346.1.801 05/09/08 03:06:49 kent@mysql.com +1 -0
  configure.in:
    Flag -DHAVE_DARWIN_THREADS not needed for darwin9

ChangeSet
  1.1935.36.2 05/09/07 18:06:14 igor@rurik.mysql.com +3 -0
  Manual merge

  sql/item_sum.cc
    1.161 05/09/07 18:06:09 igor@rurik.mysql.com +6 -2
    Manual merge

  configure.in
    1.191.1.140 05/09/08 03:06:00 kent@mysql.com +9 -0
    Flag -DHAVE_DARWIN_THREADS not needed for darwin9

  mysql-test/t/func_gconcat.test
    1.36 05/09/07 17:58:07 igor@rurik.mysql.com +0 -0
    Auto merged

  mysql-test/r/func_gconcat.result
    1.46 05/09/07 17:58:07 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2143.56 05/09/07 16:33:12 igor@rurik.mysql.com +3 -0
  Merge rurik.mysql.com:/home/igor/mysql-4.1
  into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  sql/item_sum.cc
    1.89.1.56 05/09/07 16:33:06 igor@rurik.mysql.com +0 -0
    Auto merged

  mysql-test/t/func_gconcat.test
    1.23.1.10 05/09/07 16:33:06 igor@rurik.mysql.com +0 -0
    Auto merged

  mysql-test/r/func_gconcat.result
    1.27.1.14 05/09/07 16:33:06 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.36.1 05/09/08 00:57:02 hartmut@mysql.com +3 -0
  Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1
  into  mysql.com:/home/hartmut/projects/mysql/dev/5.0

  sql/item_cmpfunc.h
    1.111 05/09/08 00:56:52 hartmut@mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.175 05/09/08 00:56:52 hartmut@mysql.com +0 -0
    Auto merged

  client/mysqlimport.c
    1.52 05/09/08 00:56:52 hartmut@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2254.4 05/09/08 00:50:03 hartmut@mysql.com +1 -0
  Merge mysql.com:/home/hartmut/projects/mysql/dev/4.0
  into  mysql.com:/home/hartmut/projects/mysql/dev/4.1

  client/mysqlimport.c
    1.49.1.2 05/09/08 00:49:57 hartmut@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.28.2 05/09/07 23:44:23 aivanov@mysql.com +1 -0
  Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/alexi/mysql-5.0

  sql/sql_yacc.yy
    1.419 05/09/07 23:44:12 aivanov@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.33.3 05/09/07 23:32:39 evgen@moonbone.local +1 -0
  item.cc:
    Fix for fix bug#12922.

  sql/item.cc
    1.173 05/09/07 23:29:48 evgen@moonbone.local +3 -3
    Fix for fix bug#12922.

ChangeSet
  1.1935.35.1 05/09/07 23:03:56 anozdrin@mysql.com +3 -0
  Fix for Bug#12995: Inside function "Table 't4' was not locked with LOCK TABLES"
  Any form of HANDLER statement is forbidden from usage in stored procedures/functions.

  sql/sql_yacc.yy
    1.417.1.1 05/09/07 23:03:51 anozdrin@mysql.com +15 -0
    Forbid any form of "HANDLER" statement from use in stored procedures/functions.

  mysql-test/t/sp-error.test
    1.86 05/09/07 23:03:50 anozdrin@mysql.com +30 -0
    Test case for Bug#12995 added.

  mysql-test/r/sp-error.result
    1.82 05/09/07 23:03:50 anozdrin@mysql.com +21 -0
    Results for the test case for Bug#12995 added.

ChangeSet
  1.1935.33.2 05/09/07 22:55:49 evgen@moonbone.local +2 -0
  Manual merge

  mysql-test/t/view.test
    1.104 05/09/07 22:55:47 evgen@moonbone.local +0 -2
    Manual merge

  mysql-test/r/view.result
    1.109 05/09/07 22:55:47 evgen@moonbone.local +0 -0
    Manual merge

ChangeSet
  1.1935.34.1 05/09/07 22:38:36 evgen@moonbone.local +4 -0
  Fix bug #12922 if(sum(),...) with group from view returns wrong results
  
  Fields of view represented by Item_direct_view_ref. When complex expression
  such as if(sum()>...,...) is splited in simpler parts by refs was ignored.
  Beside this direct ref doesn't use it's result_field and thus can't store
  it's result in tmp table which is needed for sum() ... group.
  All this results in reported bug.
  
  Item::split_sum_func2() now converts Item_direct_view_ref to Item_ref to
  make fields from view being storable in tmp table.

  mysql-test/r/view.result
    1.107.1.1 05/09/07 22:38:15 evgen@moonbone.local +9 -0
    Test case for bug#12922 if(sum(),...) with group from view returns wrong results

  mysql-test/t/view.test
    1.102.1.1 05/09/07 22:38:07 evgen@moonbone.local +10 -0
    Test case for bug#12922 if(sum(),...) with group from view returns wrong results

  sql/item.cc
    1.172 05/09/07 22:37:46 evgen@moonbone.local +9 -7
    Fix bug #12922 if(sum(),...) with group from view returns wrong results
     Item::split_sum_func2() now converts Item_direct_view_ref to Item_ref to make fields from view being storable in tmp table.

  sql/item.h
    1.167 05/09/07 22:37:36 evgen@moonbone.local +4 -0
    Fix bug #12922 if(sum(),...) with group from view returns wrong results
    Added function ref_type() to distinguish Item_ref subclasses

ChangeSet
  1.1616.1660.10 05/09/07 20:23:07 jimw@mysql.com +2 -0
  Port to SCO OpenServer 6. May require running ./configure with
  --build=i686-unknown-sysv5SCO_SV6.0.0

  configure.in
    1.201.48.4 05/09/07 20:17:11 jimw@mysql.com +21 -69
    Update checks for SCO threading libraries to handle OpenServer 6
    Remove redundant OpenUNIX 8 checks
    Pass --build option through to bdb's configure

  include/my_pthread.h
    1.65.3.1 05/09/07 20:16:52 jimw@mysql.com +0 -5
    Remove unnecessary define -- configure should define HAVE_NONPOSIX_SIGWAIT

ChangeSet
  1.1935.33.1 05/09/07 10:43:22 brian@zim.(none) +1 -0
  Merge zim.(none):/home/brian/mysql/mysql-4.1
  into  zim.(none):/home/brian/mysql/mysql-5.0

  sql/examples/ha_tina.cc
    1.15 05/09/07 10:43:16 brian@zim.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.2256.1 05/09/07 10:30:06 brian@zim.(none) +1 -0
  Small tweak for random read performance (we shouldn't always tell the OS that we will be doing a linear scan). 

  sql/examples/ha_tina.cc
    1.3.1.5 05/09/07 10:30:02 brian@zim.(none) +2 -1
    Small tweak for random read performance. 

ChangeSet
  1.1935.31.1 05/09/07 18:03:07 serg@serg.mylan +1 -0
  don't crash when in XA PREPARE not all storage engines are 2pc-capable

  sql/handler.cc
    1.186 05/09/07 18:02:52 serg@serg.mylan +13 -5
    don't crash when in XA PREPARE not all storage engines are 2pc-capable

ChangeSet
  1.1935.30.1 05/09/07 19:39:47 sergefp@mysql.com +10 -0
  Fix for BUG#12637: Make SPs+user variables replication work:
  * Allocate thd->user_var_events elements on appropriate mem_root
  * If several SP statements are binlogged as a single statement, collect all user var
    accesses they make (grep for StoredRoutinesBinlogging for details)

  sql/sql_parse.cc
    1.479.1.1 05/09/07 19:39:41 sergefp@mysql.com +3 -0
    Fix for BUG#12637: Make SPs+user variables replication work.

  sql/sql_class.h
    1.263 05/09/07 19:39:41 sergefp@mysql.com +10 -2
    Fix for BUG#12637: Make SPs+user variables replication work.

  sql/sp_head.h
    1.68 05/09/07 19:39:41 sergefp@mysql.com +3 -2
    Remove compiler warning.

  sql/sp_head.cc
    1.180 05/09/07 19:39:41 sergefp@mysql.com +38 -10
    Fix for BUG#12637: Make SPs+user variables replication work:
    * Allocate thd->user_var_events elements on appropriate mem_root
    * If several SP statements are binlogged as a single statement, collect all user var
      accesses they make.

  sql/log.cc
    1.170 05/09/07 19:39:41 sergefp@mysql.com +7 -0
    Fix for BUG#12637: Make SPs+user variables replication work:
    * Allocate thd->user_var_events elements on appropriate mem_root
    * If several SP statements are binlogged as a single statement, collect all user var
      accesses they make.

  sql/item_func.cc
    1.248.1.1 05/09/07 19:39:41 sergefp@mysql.com +11 -4
    Fix for BUG#12637: Make SPs+user variables replication work:
    * Allocate thd->user_var_events elements on appropriate mem_root
    * If several SP statements are binlogged as a single statement, collect all user var
      accesses they make.

  mysql-test/t/sp.test
    1.144 05/09/07 19:39:41 sergefp@mysql.com +13 -19
    re-enabled test case for BUG#12297

  mysql-test/t/rpl_sp_effects.test
    1.3 05/09/07 19:39:41 sergefp@mysql.com +48 -0
    Testcase for BUG#12637

  mysql-test/r/sp.result
    1.149 05/09/07 19:39:41 sergefp@mysql.com +13 -0
    re-enabled test case for BUG#12297

  mysql-test/r/rpl_sp_effects.result
    1.3 05/09/07 19:39:41 sergefp@mysql.com +57 -0
    Testcase for BUG#12637

ChangeSet
  1.1935.29.1 05/09/07 17:04:22 msvensson@neptunus.(none) +1 -0
  Bug #12987  	yassl: Compilation of integer.cpp fails on OS X Tiger

  extra/yassl/taocrypt/include/misc.hpp
    1.8 05/09/07 17:04:17 msvensson@neptunus.(none) +1 -1
    Disable X86ASM on OsX

ChangeSet
  1.1935.28.1 05/09/07 18:58:58 aivanov@mysql.com +4 -0
  Merge mysql.com:/home/alexi/mysql-5.0
  into  mysql.com:/home/alexi/dev/mysql-5.0-0

  sql/sql_yacc.yy
    1.418 05/09/07 18:58:44 aivanov@mysql.com +0 -0
    Auto merged

  sql/sql_select.cc
    1.367 05/09/07 18:58:43 aivanov@mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.110 05/09/07 18:58:43 aivanov@mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.174 05/09/07 18:58:42 aivanov@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2254.2 05/09/07 18:55:33 aivanov@mysql.com +2 -0
  Merge mysql.com:/home/alexi/mysql-4.1
  into  mysql.com:/home/alexi/dev/mysql-4.1-0

  sql/item_cmpfunc.h
    1.73.1.37 05/09/07 18:55:24 aivanov@mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.111.1.84 05/09/07 18:55:23 aivanov@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.21.2 05/09/07 17:42:47 aivanov@mysql.com +5 -0
  join_outer.result, opt_range.cc, item_cmpfunc.cc:
    Post merge changes
  sql_yacc.yy:
    Post merge changes
  sql_select.cc:
    Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
     for some expressions (post merge changes).
     The function add_key_fields() is modified. There cannot be NOT before
     BETWEEN/IN anymore. Rather Item_func_between/in objects can represent
     now [NOT]BETWEEN/IN expressions.

  mysql-test/r/join_outer.result
    1.44 05/09/07 17:35:38 aivanov@mysql.com +5 -5
    Post merge changes

  sql/sql_yacc.yy
    1.416.1.2 05/09/07 17:34:27 aivanov@mysql.com +8 -8
    Post merge changes.

  sql/sql_select.cc
    1.365.1.1 05/09/07 17:29:36 aivanov@mysql.com +0 -13
    Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
     for some expressions (post merge changes).
     The function add_key_fields() is modified. There cannot be NOT before
     BETWEEN/IN anymore. Rather Item_func_between/in objects can represent
     now [NOT]BETWEEN/IN expressions.

  sql/opt_range.cc
    1.187 05/09/07 17:29:04 aivanov@mysql.com +4 -12
    Post merge changes

  sql/item_cmpfunc.cc
    1.173 05/09/07 17:26:12 aivanov@mysql.com +8 -8
    Post merge changes

ChangeSet
  1.1935.27.1 05/09/07 14:51:57 jonas@eel.(none) +1 -0
  Merge eel.(none):/home/jonas/src/mysql-4.1
  into  eel.(none):/home/jonas/src/mysql-5.0

  ndb/src/common/portlib/NdbThread.c
    1.24 05/09/07 14:51:52 jonas@eel.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.2245.4 05/09/07 14:04:36 jonas@eel.(none) +1 -0
  ndb - bug#11623 - "ndb become inresponsive but did not really die"
    block signals in threads making main process get all signals...

  ndb/src/common/portlib/NdbThread.c
    1.21.1.2 05/09/07 14:04:33 jonas@eel.(none) +10 -0
    ndb - bug#11623 - "ndb become inresponsive but did not really die"
      block signals in threads making main process get all signals...

ChangeSet
  1.1616.2251.4 05/09/07 15:57:14 SergeyV@selena. +5 -0
  Fixes bug #5588. Additions after merge from 4.0.

  vio/viossl.c
    1.22.1.5 05/09/07 15:57:07 SergeyV@selena. +9 -0
    Added vio_ssl_was_interrupted() function that detects timed out
    operation properly on win32.

  vio/viosocket.c
    1.25.1.9 05/09/07 15:57:06 SergeyV@selena. +2 -2
    Minor changes to follow up the coding standard.

  vio/vio_priv.h
    1.4 05/09/07 15:57:06 SergeyV@selena. +2 -0
    Added vio_ssl_was_interrupted() function that detects timed out
    operation properly on win32.

  vio/vio.c
    1.19.1.3 05/09/07 15:57:05 SergeyV@selena. +3 -1
    Added vio_was_interrupted() function references to detect timed out
    operation properly on win32.

  sql-common/client.c
    1.46.1.41 05/09/07 15:57:04 SergeyV@selena. +1 -1
    Fixes bug #5588. checks if operation was timed out.

ChangeSet
  1.1935.13.24 05/09/07 16:32:15 bar@mysql.com +5 -0
  Merge mysql.com:/usr/home/bar/mysql-4.1.b12611
  into  mysql.com:/usr/home/bar/mysql-5.0

  sql/item_cmpfunc.h
    1.108.1.1 05/09/07 16:32:07 bar@mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.171.1.1 05/09/07 16:32:07 bar@mysql.com +0 -0
    Auto merged

  mysql-test/t/ctype_utf8.test
    1.66.1.1 05/09/07 16:32:07 bar@mysql.com +0 -0
    Auto merged

  mysql-test/r/func_like.result
    1.17 05/09/07 16:32:07 bar@mysql.com +0 -0
    Auto merged

  mysql-test/r/ctype_utf8.result
    1.70.1.1 05/09/07 16:32:07 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.26.2 05/09/07 16:11:53 gluh@eagle.intranet.mysql.r18.ru +3 -0
  Fix for bug#12905 show fields from view behaving erratically with current database
    use saved view db name in case of view

  sql/sql_show.cc
    1.274 05/09/07 16:11:48 gluh@mysql.com +19 -2
    Fix for bug#12905 show fields from view behaving erratically with current database
      use saved view db name in case of view

  mysql-test/t/information_schema.test
    1.56 05/09/07 16:11:48 gluh@mysql.com +13 -1
    Fix for bug#12905 show fields from view behaving erratically with current database
      use saved view db name in case of view

  mysql-test/r/information_schema.result
    1.79 05/09/07 16:11:48 gluh@mysql.com +11 -0
    Fix for bug#12905 show fields from view behaving erratically with current database
      use saved view db name in case of view

ChangeSet
  1.1616.2251.3 05/09/07 14:59:41 SergeyV@selena. +7 -0
  Merge selena.:H:/MYSQL/src/#05588-mysql-4.0
  into  selena.:H:/MYSQL/src/#05588-mysql-4.1

  include/my_global.h
    1.47.1.54 05/09/07 14:59:36 SergeyV@selena. +0 -0
    SCCS merged

  vio/viosocket.c
    1.25.1.8 05/09/07 14:59:02 SergeyV@selena. +0 -0
    Auto merged

  vio/vio.c
    1.19.1.2 05/09/07 14:59:02 SergeyV@selena. +0 -0
    Auto merged

  sql/net_serv.cc
    1.63.1.12 05/09/07 14:59:02 SergeyV@selena. +0 -0
    Auto merged

  include/violite.h
    1.38.1.3 05/09/07 14:59:02 SergeyV@selena. +0 -0
    Auto merged

  BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183
    1.72 05/09/07 14:59:01 SergeyV@selena. +1 -2
    Auto merged

  BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220
    1.21 05/09/07 14:59:01 SergeyV@selena. +0 -0
    Auto merged

  BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183
    1.48.8.2 05/09/07 14:59:01 SergeyV@selena. +0 -0
    Merge rename: sql/mini_client.cc -> BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183

  BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220
    1.11.2.2 05/09/07 14:59:01 SergeyV@selena. +0 -0
    Merge rename: libmysqld/lib_vio.c -> BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220

ChangeSet
  1.1616.2252.1 05/09/07 12:49:11 tomas@poseidon.ndb.mysql.com +1 -0
  Modified ndb log message on startup failure

  ndb/src/kernel/main.cpp
    1.37.1.7 05/09/07 12:49:07 tomas@poseidon.ndb.mysql.com +1 -1
    Modified ndb log message on startup failure

ChangeSet
  1.1935.26.1 05/09/07 15:38:09 gluh@eagle.intranet.mysql.r18.ru +4 -0
  Fix for bug#11775 Variable character_set_system does not exist (sometimes).
    Variable character_set_system is selectable now
    More accurate error message results during 
    update of character_set_system and some other read only variables

  sql/set_var.h
    1.70 05/09/07 15:36:58 gluh@mysql.com +2 -1
    Fix for bug#11775 Variable character_set_system does not exist (sometimes).
      Variable character_set_system is selectable now
      More accurate error message results during 
      update of character_set_system and some other read only variables

  sql/set_var.cc
    1.139 05/09/07 15:36:58 gluh@mysql.com +3 -26
    Fix for bug#11775 Variable character_set_system does not exist (sometimes).
      Variable character_set_system is selectable now
      More accurate error message results during 
      update of character_set_system and some other read only variables

  mysql-test/t/variables.test
    1.49 05/09/07 15:36:58 gluh@mysql.com +9 -0
    Fix for bug#11775 Variable character_set_system does not exist (sometimes).
      test case

  mysql-test/r/variables.result
    1.73 05/09/07 15:36:58 gluh@mysql.com +7 -0
    Fix for bug#11775 Variable character_set_system does not exist (sometimes).
      test case

ChangeSet
  1.1935.13.22 05/09/07 14:57:27 bar@mysql.com +3 -0
  Merge mysql.com:/usr/home/bar/mysql-4.1.b12829
  into  mysql.com:/usr/home/bar/mysql-5.0

  sql/item_sum.cc
    1.160 05/09/07 14:57:19 bar@mysql.com +0 -0
    Auto merged

  mysql-test/t/func_gconcat.test
    1.35 05/09/07 14:57:19 bar@mysql.com +0 -0
    Auto merged

  mysql-test/r/func_gconcat.result
    1.45 05/09/07 14:57:19 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2251.2 05/09/07 13:12:29 bar@mysql.com +3 -0
  Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/usr/home/bar/mysql-4.1.b12829

  sql/item_sum.cc
    1.89.1.55 05/09/07 13:12:18 bar@mysql.com +0 -0
    Auto merged

  mysql-test/t/func_gconcat.test
    1.23.1.9 05/09/07 13:12:17 bar@mysql.com +0 -0
    Auto merged

  mysql-test/r/func_gconcat.result
    1.27.1.13 05/09/07 13:12:17 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.24.1 05/09/07 11:50:41 sergefp@mysql.com +3 -0
  Fix for BUG#12941: in create_tmp_field(), if the passed item is an Item_ref, put newly
  created item into item->result_field, not *(item->ref)->result_field.

  sql/sql_select.cc
    1.366 05/09/07 11:50:36 sergefp@mysql.com +20 -10
    Fix for BUG#12941: in create_tmp_field(), if the passed item is an Item_ref, put newly
    created item into item->result_field, not *(item->ref)->result_field.

  mysql-test/t/view.test
    1.103 05/09/07 11:50:36 sergefp@mysql.com +33 -0
    Tescase for BUG#12941

  mysql-test/r/view.result
    1.108 05/09/07 11:50:36 sergefp@mysql.com +26 -0
    Tescase for BUG#12941

ChangeSet
  1.1935.13.20 05/09/07 09:35:46 msvensson@neptunus.(none) +4 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  sql/hostname.cc
    1.33 05/09/07 09:35:43 msvensson@neptunus.(none) +0 -9
    Manual merge

  client/mysqltest.c
    1.158 05/09/07 09:35:43 msvensson@neptunus.(none) +7 -50
    Manual merge

  sql/sql_parse.cc
    1.480 05/09/07 09:33:21 msvensson@neptunus.(none) +0 -10
    Auto merged

  mysql-test/t/mysqltest.test
    1.17 05/09/07 09:33:20 msvensson@neptunus.(none) +0 -1
    Auto merged

ChangeSet
  1.1935.13.19 05/09/06 23:32:00 brian@zim.(none) +1 -0
  Fixed a typo in the configure --help menu. 

  config/ac-macros/ha_federated.m4
    1.2 05/09/06 23:31:55 brian@zim.(none) +1 -1
     Fixed typo

ChangeSet
  1.1616.2143.55 05/09/06 22:20:11 igor@rurik.mysql.com +4 -0
  func_gconcat.result, func_gconcat.test:
    Added test cases for bug #12863.
  item_sum.cc, item_sum.h:
    Fixed bug #12863.
    Added a flag to Item_func_group_concat set to FALSE after
    concatenation of the first element of a group.

  mysql-test/r/func_gconcat.result
    1.27.2.3 05/09/06 22:14:39 igor@rurik.mysql.com +20 -0
    Added test cases for bug #12863.

  mysql-test/t/func_gconcat.test
    1.23.2.3 05/09/06 22:14:08 igor@rurik.mysql.com +16 -0
    Added test cases for bug #12863.

  sql/item_sum.cc
    1.89.11.2 05/09/06 22:13:10 igor@rurik.mysql.com +5 -3
    Fixed bug #12863.
    Added a flag to Item_func_group_concat set to FALSE after
    concatenation of the first element of a group.

  sql/item_sum.h
    1.48.1.33 05/09/06 22:03:08 igor@rurik.mysql.com +1 -0
    Fixed bug #12863.
    Added a flag to Item_func_group_concat set to FALSE after
    concatenation of the first element of a group.

ChangeSet
  1.1935.23.1 05/09/06 18:06:06 reggie@linux.site +5 -0
  A few changes to fix compiling on Windows

  server-tools/instance-manager/mysqlmanager.vcproj
    1.4 05/09/06 18:04:14 reggie@linux.site +119 -41
    fixed up all the filenames in the IM project

  server-tools/instance-manager/instance.cc
    1.24 05/09/06 18:04:14 reggie@linux.site +1 -1
    fixed typo

  scripts/make_win_src_distribution.sh
    1.40 05/09/06 18:04:14 reggie@linux.site +1 -1
    Updated to include server-tools folder (which includes IM)

  VC++Files/mysys/mysys.vcproj
    1.2 05/09/06 18:04:13 reggie@linux.site +3 -0
    Added mf_unixpath.c

  VC++Files/mysql.sln
    1.3 05/09/06 18:04:13 reggie@linux.site +37 -0
    Added instance manager project

ChangeSet
  1.1616.2250.1 05/09/06 22:03:12 msvensson@neptunus.(none) +2 -0
  Backport fixes for mysqltest.test from 5.0

  mysql-test/t/mysqltest.test
    1.3.1.12 05/09/06 22:03:01 msvensson@neptunus.(none) +1 -1
    Remove the extra ;

  client/mysqltest.c
    1.92.1.88 05/09/06 22:03:01 msvensson@neptunus.(none) +51 -26
    Backport from 5.0

ChangeSet
  1.1935.21.1 05/09/06 23:49:54 aivanov@mysql.com +7 -0
  Merge mysql.com:/home/alexi/dev/mysql-4.1-0
  into  mysql.com:/home/alexi/dev/mysql-5.0-0

  BitKeeper/etc/RESYNC_TREE
    1.1 05/09/06 23:49:45 aivanov@mysql.com +0 -0
    New BitKeeper file ``BitKeeper/etc/RESYNC_TREE''

  sql/sql_yacc.yy
    1.416.1.1 05/09/06 23:49:45 aivanov@mysql.com +6 -27
    Manual merge
    

  sql/opt_range.cc
    1.186 05/09/06 23:49:45 aivanov@mysql.com +0 -4
    Manual merge
    

  sql/item_cmpfunc.h
    1.109 05/09/06 23:49:45 aivanov@mysql.com +3 -3
    Manual merge
    

  mysql-test/t/join_outer.test
    1.33 05/09/06 23:49:45 aivanov@mysql.com +47 -48
    Manual merge
    

  mysql-test/r/join_outer.result
    1.43 05/09/06 23:49:45 aivanov@mysql.com +134 -134
    Manual merge
    

  BitKeeper/etc/RESYNC_TREE
    1.0 05/09/06 23:49:45 aivanov@mysql.com +0 -0
    BitKeeper file /home/alexi/dev/mysql-5.0-0/RESYNC/BitKeeper/etc/RESYNC_TREE

  sql/item_cmpfunc.cc
    1.172 05/09/06 23:23:32 aivanov@mysql.com +0 -1
    Auto merged

ChangeSet
  1.1346.852.2 05/09/06 22:56:16 SergeyV@selena. +1 -0
  Fixes a problem with patch 1.2140, that prevented libmysqld 
  to be built successfully.

  libmysqld/lib_vio.c
    1.11.2.1 05/09/06 22:56:11 SergeyV@selena. +9 -0
    Added a copy of vio_was_interrupted() from viosocket.c, for successful build
    of libmysqld that uses own set of vio*() functions.

ChangeSet
  1.1616.2143.54 05/09/06 11:38:52 eric@mysql.com +1 -0
  Merge eherman@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/Users/eric/bktmp/mysql-4.1

  sql/sql_parse.cc
    1.271.1.194 05/09/06 11:38:48 eric@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.19.2 05/09/06 21:20:19 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-mrg-5.0

  sql/mysqld.cc
    1.495 05/09/06 21:20:14 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1616.2143.53 05/09/06 21:18:44 bell@sanja.is.com.ua +1 -0
  postmerge fix

  sql/mysqld.cc
    1.356.98.7 05/09/06 21:18:40 bell@sanja.is.com.ua +1 -0
    postmerge fix

ChangeSet
  1.1935.19.1 05/09/06 20:51:15 bell@sanja.is.com.ua +11 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-mrg-5.0

  sql/sql_cache.h
    1.30 05/09/06 20:51:08 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_cache.cc
    1.84 05/09/06 20:51:08 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/set_var.cc
    1.138 05/09/06 20:51:08 bell@sanja.is.com.ua +1 -11
    Auto merged

  sql/mysqld.cc
    1.494 05/09/06 20:51:08 bell@sanja.is.com.ua +1 -4
    Auto merged

  sql/mysql_priv.h
    1.348 05/09/06 20:51:07 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.249 05/09/06 20:51:07 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/ps.test
    1.53 05/09/06 20:51:07 bell@sanja.is.com.ua +0 -3
    Auto merged

  mysql-test/t/func_math.test
    1.22 05/09/06 20:51:07 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/ps.result
    1.52 05/09/06 20:51:07 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/func_math.result
    1.30 05/09/06 20:51:07 bell@sanja.is.com.ua +0 -0
    Auto merged

  configure.in
    1.342 05/09/06 20:51:07 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1935.18.1 05/09/06 21:43:06 anozdrin@mysql.com +3 -0
  Fix for Bug#12953 "Stored procedures: crash if OPTIMIZE TABLE in function"
  OPTIMIZE TABLE statement is forbidden from usage in stored procedures/functions.
  
  NOTE: OPTIMIZE TABLE statement can be useful in stored procedures. The idea is
  that the user/administrator can create a stored procedure for admin
  tasks (optimizing, backing up, etc). This procedure can be scheduled to run
  automatically (by mean of internal cron (WL#1034)). So, once we can make this
  statement work, it is worth doing it.

  sql/sql_yacc.yy
    1.417 05/09/06 21:42:42 anozdrin@mysql.com +5 -0
    Forbid "OPTIMIZE TABLE" statement from use in stored procedures/functions.

  mysql-test/t/sp-error.test
    1.85 05/09/06 21:42:42 anozdrin@mysql.com +15 -2
    Test case for Bug#12953 "Stored procedures: crash if OPTIMIZE TABLE in function" added.

  mysql-test/r/sp-error.result
    1.81 05/09/06 21:42:42 anozdrin@mysql.com +7 -0
    Results for the test case for Bug#12953 added.

ChangeSet
  1.1935.14.6 05/09/06 20:19:49 jani@ua141d10.elisa.omakaista.fi +1 -0
  Added possibility to use string values 'true' and 'false' case
  insensitively with boolean options. Added a warning if given
  value is invalid and skips the option handling in that case.

  mysys/my_getopt.c
    1.53 05/09/06 20:19:44 jani@ua141d10.elisa.omakaista.fi +15 -3
    Added possibility to use string values 'true' and 'false' case
    insensitively with boolean options. Added a warning if given
    value is invalid and skips the option handling in that case.

ChangeSet
  1.1892.41.1 05/09/06 18:57:21 msvensson@neptunus.(none) +3 -0
  Bug #12715  	Compilation of yassl/algebra.ccp fails on buildqnx2
   - Workaround

  extra/yassl/taocrypt/src/misc.cpp
    1.9 05/09/06 18:57:16 msvensson@neptunus.(none) +0 -1
    Don't include <new>

  extra/yassl/mySTL/list.hpp
    1.5 05/09/06 18:57:16 msvensson@neptunus.(none) +2 -2
    Use workaround for placement new

  extra/yassl/mySTL/helpers.hpp
    1.7 05/09/06 18:57:15 msvensson@neptunus.(none) +1 -7
    Workaround for QNX

ChangeSet
  1.1616.2249.1 05/09/06 18:03:08 aivanov@mysql.com +6 -0
  item_cmpfunc.h:
    Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
     for some expressions.
     The classes Item_func_between, Item_func_if, Item_func_in are modified.
     Item_func_between/in objects can represent now [NOT]BETWEEN/IN expressions.
     The class Item_func_opt_neg is added to factor out the functionality
     common for the modified classes Item_func_between and Item_func_in.
  item_cmpfunc.cc:
    Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
     for some expressions.
     Added Item_func_between::fix_fields(), Item_func_if::fix_fields(),
     Item_func_in::fix_fields(). They correct generic calculation of
     the not_null_tables attribute when it is needed.
     Modified Item_func_between::val_int(), Item_func_in::val_int().
  opt_range.cc:
    Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
     for some expressions.
     The function get_mm_tree() is modified. There cannot be NOT before
     BETWEEN/IN anymore. Rather Item_func_between/in objects can represent
     now [NOT]BETWEEN/IN expressions.
  sql_yacc.yy:
    Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
     for some expressions.
     Item_func_between/in objects can represent now [NOT]BETWEEN/IN expresions.
  join_outer.result:
    Fixed some testcases results (bugs #12101, #12102)
  join_outer.test:
    Added testcases for bugs #12101, #12102

  sql/item_cmpfunc.h
    1.73.9.1 05/09/06 17:55:41 aivanov@mysql.com +38 -17
    Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
     for some expressions.
     The classes Item_func_between, Item_func_if, Item_func_in are modified.
     Item_func_between/in objects can represent now [NOT]BETWEEN/IN expressions.
     The class Item_func_opt_neg is added to factor out the functionality
     common for the modified classes Item_func_between and Item_func_in.

  sql/item_cmpfunc.cc
    1.111.20.1 05/09/06 17:52:02 aivanov@mysql.com +150 -8
    Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
     for some expressions.
     Added Item_func_between::fix_fields(), Item_func_if::fix_fields(),
     Item_func_in::fix_fields(). They correct generic calculation of
     the not_null_tables attribute when it is needed.
     Modified Item_func_between::val_int(), Item_func_in::val_int().

  sql/opt_range.cc
    1.98.2.44 05/09/06 17:49:08 aivanov@mysql.com +3 -2
    Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
     for some expressions.
     The function get_mm_tree() is modified. There cannot be NOT before
     BETWEEN/IN anymore. Rather Item_func_between/in objects can represent
     now [NOT]BETWEEN/IN expressions.

  sql/sql_yacc.yy
    1.203.1.188 05/09/06 17:47:04 aivanov@mysql.com +27 -5
    Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
     for some expressions.
     Item_func_between/in objects can represent now [NOT]BETWEEN/IN expresions.

  mysql-test/r/join_outer.result
    1.24.1.11 05/09/06 17:45:58 aivanov@mysql.com +133 -0
    Fixed some testcases results (bugs #12101, #12102)

  mysql-test/t/join_outer.test
    1.14.1.6 05/09/06 17:45:16 aivanov@mysql.com +46 -0
    Added testcases for bugs #12101, #12102

ChangeSet
  1.1935.13.12 05/09/06 15:41:13 msvensson@neptunus.(none) +1 -0
  Bug #12984  	mysqltest.test: different output from "exec NonExistsinfComamdn"
   - Common error handling regardless of --ps-protocol or not.

  client/mysqltest.c
    1.157 05/09/06 15:41:07 msvensson@neptunus.(none) +87 -152
    Merge normal_handle_error and run_query_stmt_handle_error to get consistent functionality and error messages regardless if --ps-protocol is used or not
    Call handle_error when error occured to check for expected error codes/states
    Call handle_no_error when no error ahs occured to check if an error was expected 

ChangeSet
  1.1616.2248.1 05/09/06 15:39:20 lars@mysql.com +1 -0
  Added synchronization to rpl_slave_status.test
  

  mysql-test/t/rpl_slave_status.test
    1.3.1.2 05/09/06 15:24:32 lthalmann@dl145h.mysql.com +1 -0
    Added synchronization to make result deterministic

ChangeSet
  1.1935.17.2 05/09/06 16:08:05 osku@127.(none) +2 -0
  Add testcase for bug #12084.

  mysql-test/t/innodb.test
    1.106 05/09/06 16:08:02 osku@127.(none) +15 -0
    Add testcase for bug #12084.

  mysql-test/r/innodb.result
    1.131 05/09/06 16:08:02 osku@127.(none) +12 -0
    Add testcase for bug #12084.

ChangeSet
  1.1935.17.1 05/09/06 14:38:21 osku@127.(none) +5 -0
  InnoDB: Reject foreign keys in temporary tables. Closes bug #12084. 

  sql/ha_innodb.cc
    1.255 05/09/06 14:38:17 osku@127.(none) +21 -40
    In create, pass correct reject_fks argument to
    row_table_add_foreign_constraints depending on whether we're creating a
    temporary table or not. Also move duplicated cleanup code to a single
    place.

  innobase/row/row0mysql.c
    1.113 05/09/06 14:38:17 osku@127.(none) +6 -2
    Add reject_fks parameter to row_table_add_foreign_constraints.

  innobase/include/row0mysql.h
    1.44 05/09/06 14:38:17 osku@127.(none) +5 -1
    Add reject_fks parameter to row_table_add_foreign_constraints.

  innobase/include/dict0dict.h
    1.34 05/09/06 14:38:17 osku@127.(none) +4 -1
    Add reject_fks parameter to dict_create_foreign_constraints.

  innobase/dict/dict0dict.c
    1.66 05/09/06 14:38:17 osku@127.(none) +23 -3
    Add reject_fks parameter to dict_create_foreign_constraints_low and
    dict_create_foreign_constraints.

ChangeSet
  1.1616.2143.51 05/09/06 16:19:59 gluh@eagle.intranet.mysql.r18.ru +5 -0
  Bug #6172 RAND(a) should only accept constant values as arguments(2nd version)
    Argument of RAND function can be constant value only

  sql/item_func.cc
    1.124.42.2 05/09/06 16:19:16 gluh@mysql.com +5 -0
    Bug #6172 RAND(a) should only accept constant values as arguments(2nd version)
      Argument of RAND function can be constant value only

  mysql-test/t/ps.test
    1.27.1.16 05/09/06 16:19:16 gluh@mysql.com +1 -3
    Bug #6172 RAND(a) should only accept constant values as arguments(2nd version)
      Argument of RAND function can be constant value only

  mysql-test/t/func_math.test
    1.14.1.3 05/09/06 16:19:16 gluh@mysql.com +9 -0
    Bug #6172 RAND(a) should only accept constant values as arguments(2nd version)
      Argument of RAND function can be constant value only

  mysql-test/r/ps.result
    1.31.1.11 05/09/06 16:19:16 gluh@mysql.com +21 -23
    Bug #6172 RAND(a) should only accept constant values as arguments(2nd version)
      Argument of RAND function can be constant value only

  mysql-test/r/func_math.result
    1.22.1.2 05/09/06 16:19:16 gluh@mysql.com +5 -0
    Bug #6172 RAND(a) should only accept constant values as arguments(2nd version)
      Argument of RAND function can be constant value only

ChangeSet
  1.1616.2226.3 05/09/06 16:16:10 bar@mysql.com +3 -0
  func_like.result, func_like.test:
    adding test case.
  item_cmpfunc.cc:
    Bug#12611
    ESCAPE + LIKE do not work when the escape char is a multibyte one
    Additional fix for 8bit character sets:
    escape character must be converted into
    operation character set.

  mysql-test/r/func_like.result
    1.12.1.3 05/09/06 16:15:43 bar@mysql.com +7 -0
    adding test case.

  mysql-test/t/func_like.test
    1.16 05/09/06 16:15:38 bar@mysql.com +17 -0
    adding test case.

  sql/item_cmpfunc.cc
    1.111.1.83 05/09/06 16:14:56 bar@mysql.com +18 -1
    Bug#12611
    ESCAPE + LIKE do not work when the escape char is a multibyte one
    Additional fix for 8bit character sets:
    escape character must be converted into
    operation character set.

ChangeSet
  1.1935.13.11 05/09/06 12:33:36 msvensson@neptunus.(none) +4 -0
  Detect comment with command using extra delimiter

  mysql-test/t/mysqltest.test
    1.16 05/09/06 12:33:31 msvensson@neptunus.(none) +3 -1
    Add test to detect "comment with command" with extra ; delimiter
    Fix extra ; delimiter

  mysql-test/r/mysqltest.result
    1.12 05/09/06 12:33:31 msvensson@neptunus.(none) +1 -0
    Update test results

  mysql-test/include/have_lowercase0.inc
    1.2 05/09/06 12:33:31 msvensson@neptunus.(none) +2 -2
    Remove extra ; at end of command(causing it to be skipped)

  client/mysqltest.c
    1.156 05/09/06 12:33:31 msvensson@neptunus.(none) +16 -0
    Detect comment with command using extra delimiter

ChangeSet
  1.1935.14.5 05/09/06 15:23:03 bar@mysql.com +1 -0
  mysqld.cc:
    after merge fix

  sql/mysqld.cc
    1.493 05/09/06 15:22:25 bar@mysql.com +0 -1
    after merge fix

ChangeSet
  1.1616.2226.2 05/09/06 14:48:18 bar@mysql.com +1 -0
  item_cmpfunc.h:
    Bug 12611 : ESCAPE + LIKE do not work when the escape char is a multibyte one
    Forgot to commit this file in the previous changeset,
    together with other files.

  sql/item_cmpfunc.h
    1.73.1.36 05/09/06 14:46:56 bar@mysql.com +1 -1
    Bug 12611 : ESCAPE + LIKE do not work when the escape char is a multibyte one
    Forgot to commit this file in the previous changeset,
    together with other files.

ChangeSet
  1.1935.14.4 05/09/06 14:35:36 bar@mysql.com +3 -0
  Merge mysql.com:/usr/home/bar/mysql-4.1.b9948
  into  mysql.com:/usr/home/bar/mysql-5.0

  sql/mysqld.cc
    1.492 05/09/06 14:35:24 bar@mysql.com +1 -0
    after merge fix

  sql/sql_parse.cc
    1.479 05/09/06 14:34:02 bar@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.347 05/09/06 14:34:02 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2247.1 05/09/06 12:18:23 bell@sanja.is.com.ua +7 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.1

  sql/set_var.cc
    1.34.52.32 05/09/06 12:18:21 bell@sanja.is.com.ua +1 -16
    merge

  sql/mysqld.cc
    1.356.98.6 05/09/06 12:18:20 bell@sanja.is.com.ua +0 -27
    merge

  mysql-test/r/fulltext_var.result
    1.13 05/09/06 12:18:20 bell@sanja.is.com.ua +0 -1
    merge

  configure.in
    1.201.1.190 05/09/06 12:18:20 bell@sanja.is.com.ua +0 -1
    merge

  sql/sql_cache.h
    1.26.3.1 05/09/06 12:09:55 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_cache.cc
    1.46.12.9 05/09/06 12:09:55 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.91.39 05/09/06 12:09:55 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.850.1 05/09/06 11:16:53 bell@sanja.is.com.ua +4 -0
  support of concurent query cache resizing (BUG#12848)

  sql/sql_cache.h
    1.17.2.4 05/09/06 11:16:51 bell@sanja.is.com.ua +3 -2
    initialisation moved to mysqld.cc
    removed uneed parameter (now it is always under guard mutex protection or called from destruction)

  sql/sql_cache.cc
    1.29.1.37 05/09/06 11:16:51 bell@sanja.is.com.ua +80 -34
    support of concurent query cache resizing:
          - resizing made atomic
          - check stack size after each quard mutex lock

  sql/mysqld.cc
    1.297.52.6 05/09/06 11:16:51 bell@sanja.is.com.ua +1 -0
    initialisation moved to mysqld.cc

  sql/mysql_priv.h
    1.150.1.87 05/09/06 11:16:51 bell@sanja.is.com.ua +2 -0
    initialisation moved to mysqld.cc

ChangeSet
  1.1935.13.10 05/09/06 09:44:25 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  mysql-test/t/mysqltest.test
    1.15 05/09/06 09:44:20 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1935.13.9 05/09/06 09:42:02 msvensson@neptunus.(none) +15 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  ndb/tools/restore/restore_main.cpp
    1.33 05/09/06 09:41:57 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/tools/restore/consumer_restore.cpp
    1.19 05/09/06 09:41:57 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/tools/ndb_config.cpp
    1.8 05/09/06 09:41:57 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/tools/Makefile.am
    1.21 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/mgmsrv/Services.cpp
    1.51 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.81 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/mgmsrv/ConfigInfo.cpp
    1.67 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/kernel/vm/Emulator.hpp
    1.8 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/kernel/vm/Emulator.cpp
    1.18 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/kernel/main.cpp
    1.53 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/kernel/error/ErrorReporter.cpp
    1.13 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
    1.18 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/include/util/ndb_opts.h
    1.13 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -2
    Auto merged

  mysql-test/t/func_gconcat.test
    1.34 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/func_gconcat.result
    1.44 05/09/06 09:41:56 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.2243.9 05/09/06 09:40:42 msvensson@neptunus.(none) +1 -0
  BUG#12959 mysqltest crashes if testcase passed with -x option
   - Update test cases

  mysql-test/t/mysqltest.test
    1.3.1.11 05/09/06 09:40:38 msvensson@neptunus.(none) +5 -5
    Uncomment the mysqltest -x test. Can't get the output to end up in the result file.

ChangeSet
  1.1935.16.1 05/09/06 09:36:32 serg@serg.mylan +1 -0
  comment out innochecksum until fixed

  extra/Makefile.am
    1.27 05/09/06 09:36:11 serg@serg.mylan +1 -1
    comment out innochecksum until fixed

ChangeSet
  1.1935.14.2 05/09/06 09:01:17 ndbdev@dl145b.mysql.com +15 -0
  Merge

  ndb/tools/restore/restore_main.cpp
    1.31.1.1 05/09/06 09:01:12 ndbdev@dl145b.mysql.com +1 -2
    merge

  ndb/tools/Makefile.am
    1.19.1.1 05/09/06 09:00:43 ndbdev@dl145b.mysql.com +0 -1
    merge

  ndb/include/util/ndb_opts.h
    1.11.1.1 05/09/06 09:00:00 ndbdev@dl145b.mysql.com +2 -3
    merge

  ndb/tools/restore/consumer_restore.cpp
    1.17.1.1 05/09/06 08:57:55 ndbdev@dl145b.mysql.com +0 -0
    Auto merged

  ndb/tools/ndb_config.cpp
    1.6.1.1 05/09/06 08:57:55 ndbdev@dl145b.mysql.com +0 -0
    Auto merged

  ndb/src/mgmsrv/Services.cpp
    1.49.1.1 05/09/06 08:57:55 ndbdev@dl145b.mysql.com +0 -0
    Auto merged

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.79.1.1 05/09/06 08:57:55 ndbdev@dl145b.mysql.com +0 -0
    Auto merged

  ndb/src/mgmsrv/ConfigInfo.cpp
    1.65.1.1 05/09/06 08:57:55 ndbdev@dl145b.mysql.com +0 -0
    Auto merged

  ndb/src/kernel/vm/Emulator.hpp
    1.6.1.1 05/09/06 08:57:55 ndbdev@dl145b.mysql.com +0 -0
    Auto merged

  ndb/src/kernel/vm/Emulator.cpp
    1.16.1.1 05/09/06 08:57:55 ndbdev@dl145b.mysql.com +0 -0
    Auto merged

  ndb/src/kernel/main.cpp
    1.51.1.1 05/09/06 08:57:55 ndbdev@dl145b.mysql.com +0 -0
    Auto merged

  ndb/src/kernel/error/ErrorReporter.cpp
    1.11.1.1 05/09/06 08:57:55 ndbdev@dl145b.mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
    1.16.1.1 05/09/06 08:57:55 ndbdev@dl145b.mysql.com +0 -0
    Auto merged

  mysql-test/t/func_gconcat.test
    1.32.1.1 05/09/06 08:57:55 ndbdev@dl145b.mysql.com +0 -0
    Auto merged

  mysql-test/r/func_gconcat.result
    1.42.1.1 05/09/06 08:57:55 ndbdev@dl145b.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.13.8 05/09/05 22:49:36 msvensson@neptunus.(none) +19 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  ndb/tools/restore/restore_main.cpp
    1.32 05/09/05 22:49:33 msvensson@neptunus.(none) +0 -0
    Manual merge

  ndb/tools/Makefile.am
    1.20 05/09/05 22:49:33 msvensson@neptunus.(none) +0 -1
    Manual merge

  ndb/include/util/ndb_opts.h
    1.12 05/09/05 22:49:33 msvensson@neptunus.(none) +2 -3
    Manual merge

  mysql-test/t/openssl_1.test
    1.11 05/09/05 22:49:33 msvensson@neptunus.(none) +4 -8
    Manual merge

  ndb/tools/restore/consumer_restore.cpp
    1.18 05/09/05 22:42:31 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/tools/ndb_config.cpp
    1.7 05/09/05 22:42:31 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/mgmsrv/Services.cpp
    1.50 05/09/05 22:42:31 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.80 05/09/05 22:42:31 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/mgmsrv/ConfigInfo.cpp
    1.66 05/09/05 22:42:31 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/kernel/vm/Emulator.hpp
    1.7 05/09/05 22:42:30 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/kernel/vm/Emulator.cpp
    1.17 05/09/05 22:42:30 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/kernel/main.cpp
    1.52 05/09/05 22:42:30 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/kernel/error/ErrorReporter.cpp
    1.12 05/09/05 22:42:30 msvensson@neptunus.(none) +0 -0
    Auto merged

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
    1.17 05/09/05 22:42:30 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/mysqltest.test
    1.14 05/09/05 22:42:30 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/func_gconcat.test
    1.33 05/09/05 22:42:30 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/mysqltest.result
    1.11 05/09/05 22:42:30 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/func_gconcat.result
    1.43 05/09/05 22:42:30 msvensson@neptunus.(none) +0 -0
    Auto merged

  client/mysqltest.c
    1.155 05/09/05 22:42:30 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.2243.8 05/09/05 22:40:13 msvensson@neptunus.(none) +2 -0
  BUG#12984 mysqltest.test: different output from "exec NonExistsinfComamdn"

  mysql-test/t/mysqltest.test
    1.3.1.10 05/09/05 22:40:10 msvensson@neptunus.(none) +22 -8
    Disable test for failing --exec and --system since output can't be piped to /dev/null on all platforms
    Avoid "echo -e" by using a temporary .sql file for tests that require more than one line.

  mysql-test/r/mysqltest.result
    1.3.1.8 05/09/05 22:40:10 msvensson@neptunus.(none) +0 -2
    Disable test for failing --exec and --system since output can't be piped to /dev/null on all platforms

ChangeSet
  1.1616.2143.49 05/09/05 20:05:32 bar@mysql.com +2 -0
  Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/usr/home/bar/mysql-4.1.b9948

  sql/sql_parse.cc
    1.271.1.193 05/09/05 20:05:25 bar@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.98.5 05/09/05 20:05:25 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.13.6 05/09/05 17:03:25 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/bug12959/my50-bug12959

  client/mysqltest.c
    1.154 05/09/05 17:03:19 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.2243.6 05/09/05 17:01:15 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
  into  neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959

  client/mysqltest.c
    1.92.1.87 05/09/05 17:01:11 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.2143.48 05/09/05 20:00:11 bar@mysql.com +3 -0
  mysqld.cc, mysql_priv.h, sql_parse.cc:
    bug#9948
    changed client-charset behavior in 4.1.x libmysql, which issue BC prob
    after review fixes

  sql/sql_parse.cc
    1.271.1.192 05/09/05 19:58:55 bar@mysql.com +2 -2

  sql/mysqld.cc
    1.356.98.4 05/09/05 19:58:42 bar@mysql.com +6 -6
    bug#9948
    changed client-charset behavior in 4.1.x libmysql, which issue BC prob
    after review fixes

  sql/mysql_priv.h
    1.186.91.38 05/09/05 19:58:10 bar@mysql.com +1 -0
    bug#9948
    changed client-charset behavior in 4.1.x libmysql, which issue BC prob
    after review fixes

ChangeSet
  1.1935.15.1 05/09/05 16:51:31 msvensson@neptunus.(none) +2 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959
  into  neptunus.(none):/home/msvensson/mysql/bug12959/my50-bug12959

  mysql-test/t/mysqltest.test
    1.13 05/09/05 16:51:26 msvensson@neptunus.(none) +0 -0
    Auto merged

  client/mysqltest.c
    1.150.1.10 05/09/05 16:51:26 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.2240.2 05/09/05 16:50:32 msvensson@neptunus.(none) +3 -0
  Bug#12959  mysqltest crashes if testcase passed with -x option

  mysql-test/include/mysqltest-x.inc
    1.1 05/09/05 16:50:29 msvensson@neptunus.(none) +2 -0
    New BitKeeper file ``mysql-test/include/mysqltest-x.inc''

  mysql-test/t/mysqltest.test
    1.3.1.9 05/09/05 16:50:29 msvensson@neptunus.(none) +13 -0
    Test mysqltest -x <filename>

  mysql-test/include/mysqltest-x.inc
    1.0 05/09/05 16:50:29 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug12959/my41-bug12959/mysql-test/include/mysqltest-x.inc

  client/mysqltest.c
    1.92.18.1 05/09/05 16:50:29 msvensson@neptunus.(none) +7 -5
    Fixes for mysqltest -x  <filename>

ChangeSet
  1.1616.2246.2 05/09/05 16:33:40 tulin@dl145b.mysql.com +9 -0
  added --core-file option to ndb executables
  added parseable printout in ndb_restore

  ndb/tools/restore/restore_main.cpp
    1.25.1.3 05/09/05 16:33:37 tulin@dl145b.mysql.com +29 -19
    added --core-file option to ndb executables
    added parseable printout in ndb_restore

  ndb/tools/restore/consumer_restore.cpp
    1.9.1.4 05/09/05 16:33:37 tulin@dl145b.mysql.com +18 -11
    added --core-file option to ndb executables
    added parseable printout in ndb_restore

  ndb/tools/ndb_config.cpp
    1.3.1.3 05/09/05 16:33:37 tulin@dl145b.mysql.com +1 -0
    added --core-file option to ndb executables
    added parseable printout in ndb_restore

  ndb/tools/Makefile.am
    1.12.1.5 05/09/05 16:33:37 tulin@dl145b.mysql.com +1 -1
    added --core-file option to ndb executables
    added parseable printout in ndb_restore

  ndb/src/mgmsrv/Services.cpp
    1.31.1.4 05/09/05 16:33:37 tulin@dl145b.mysql.com +0 -2
    added --core-file option to ndb executables
    added parseable printout in ndb_restore

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.51.1.12 05/09/05 16:33:37 tulin@dl145b.mysql.com +23 -11
    added --core-file option to ndb executables
    added parseable printout in ndb_restore

  ndb/src/mgmsrv/ConfigInfo.cpp
    1.50.2.11 05/09/05 16:33:37 tulin@dl145b.mysql.com +8 -8
    added --core-file option to ndb executables
    added parseable printout in ndb_restore

  ndb/src/kernel/vm/Emulator.cpp
    1.13.1.4 05/09/05 16:33:37 tulin@dl145b.mysql.com +23 -17
    added --core-file option to ndb executables
    added parseable printout in ndb_restore

  ndb/include/util/ndb_opts.h
    1.4.1.3 05/09/05 16:33:37 tulin@dl145b.mysql.com +11 -1
    added --core-file option to ndb executables
    added parseable printout in ndb_restore

ChangeSet
  1.1616.2245.2 05/09/05 17:58:29 evgen@moonbone.local +2 -0
  func_gconcat.test, func_gconcat.result:
    Test case for bug #12859 group_concat in subquery cause incorrect not null.

  mysql-test/t/func_gconcat.test
    1.23.2.2 05/09/05 17:56:26 evgen@moonbone.local +8 -0
    Test case for bug #12859 group_concat in subquery cause incorrect not null.

  mysql-test/r/func_gconcat.result
    1.27.2.2 05/09/05 17:55:48 evgen@moonbone.local +9 -0
    Test case for bug #12859 group_concat in subquery cause incorrect not null.

ChangeSet
  1.1935.14.1 05/09/05 18:28:56 ramil@mysql.com +7 -0
  Merge mysql.com:/usr/home/ram/work/4.1.b4214
  into  mysql.com:/usr/home/ram/work/mysql-5.0

  myisam/myisampack.c
    1.47 05/09/05 18:28:50 ramil@mysql.com +0 -1
    merging

ChangeSet
  1.1616.2246.1 05/09/05 15:14:44 tulin@dl145b.mysql.com +6 -0
  Bug #12992  Cluster StopOnError = Y restarts ndbd indefinitly

  ndb/src/kernel/vm/Emulator.hpp
    1.4.1.2 05/09/05 15:14:42 tulin@dl145b.mysql.com +2 -1
    Bug #12992  Cluster StopOnError = Y restarts ndbd indefinitly

  ndb/src/kernel/vm/Emulator.cpp
    1.13.1.3 05/09/05 15:14:42 tulin@dl145b.mysql.com +6 -0
    Bug #12992  Cluster StopOnError = Y restarts ndbd indefinitly

  ndb/src/kernel/main.cpp
    1.37.1.6 05/09/05 15:14:42 tulin@dl145b.mysql.com +37 -0
    Bug #12992  Cluster StopOnError = Y restarts ndbd indefinitly

  ndb/src/kernel/error/ErrorReporter.hpp
    1.7 05/09/05 15:14:42 tulin@dl145b.mysql.com +2 -0
    Bug #12992  Cluster StopOnError = Y restarts ndbd indefinitly

  ndb/src/kernel/error/ErrorReporter.cpp
    1.10.1.1 05/09/05 15:14:42 tulin@dl145b.mysql.com +12 -2
    Bug #12992  Cluster StopOnError = Y restarts ndbd indefinitly

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
    1.10.1.4 05/09/05 15:14:41 tulin@dl145b.mysql.com +8 -0
    Bug #12992  Cluster StopOnError = Y restarts ndbd indefinitly

  ndb/src/kernel/vm/Emulator.cpp
    1.16 05/09/05 18:14:09 ramil@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/main.cpp
    1.51 05/09/05 18:14:09 ramil@mysql.com +0 -0
    Auto merged

  myisam/myisamdef.h
    1.78 05/09/05 18:14:09 ramil@mysql.com +0 -0
    Auto merged

  myisam/mi_static.c
    1.18 05/09/05 18:14:09 ramil@mysql.com +0 -0
    Auto merged

  myisam/mi_packrec.c
    1.32 05/09/05 18:14:09 ramil@mysql.com +0 -0
    Auto merged

  myisam/mi_check.c
    1.135 05/09/05 18:14:08 ramil@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2245.1 05/09/05 16:41:01 ramil@mysql.com +2 -0
  Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/usr/home/ram/work/4.1.b4214

  myisam/myisampack.c
    1.37.1.5 05/09/05 16:40:55 ramil@mysql.com +0 -0
    Auto merged

  myisam/mi_check.c
    1.105.1.44 05/09/05 16:40:55 ramil@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2244.1 05/09/05 16:31:42 ramil@mysql.com +5 -0
  a fix (bug #4214: Table corruption with myisampack and large BLOB objects).

  myisam/myisampack.c
    1.37.2.1 05/09/05 16:31:35 ramil@mysql.com +7 -18
    a fix (bug #4214: Table corruption with myisampack and large BLOB objects).
    - code cleanup
    - pass version to the calc_pack_length() and save_pack_length()

  myisam/myisamdef.h
    1.59.1.20 05/09/05 16:31:35 ramil@mysql.com +4 -1
    a fix (bug #4214: Table corruption with myisampack and large BLOB objects).
    - packing version slot introduced (see MI_PACK)

  myisam/mi_static.c
    1.16.1.1 05/09/05 16:31:35 ramil@mysql.com +1 -1
    a fix (bug #4214: Table corruption with myisampack and large BLOB objects).
    - packing version set to 2

  myisam/mi_packrec.c
    1.25.1.2 05/09/05 16:31:35 ramil@mysql.com +53 -60
    a fix (bug #4214: Table corruption with myisampack and large BLOB objects).
    - code cleanup: read_pack_length() and calc_pack_length() introduced, 
                    save_pack_length() modified: now the behavior depends on packing version
    - save packing version in the share->pack.version
    - pass it to the read_pack_length()

  myisam/mi_check.c
    1.105.6.1 05/09/05 16:31:35 ramil@mysql.com +4 -2
    a fix (bug #4214: Table corruption with myisampack and large BLOB objects).
    - pass version to the save_pack_length().

ChangeSet
  1.1616.2243.5 05/09/05 12:33:25 msvensson@neptunus.(none) +1 -0
  Remove extra ;

  mysql-test/t/openssl_1.test
    1.8.1.2 05/09/05 12:33:20 msvensson@neptunus.(none) +4 -4
    Remove extra delimiter ;

ChangeSet
  1.1935.13.5 05/09/05 12:09:35 msvensson@neptunus.(none) +1 -0
  BUG#12983
  TRASH macro confliciting with TRASH in my_sys.h

  mysys/my_alloc.c
    1.31 05/09/05 12:09:31 msvensson@neptunus.(none) +4 -8
    Rename TRASH to TRASH_MEM and use the TRASH macro from my_sys.h

ChangeSet
  1.1935.13.4 05/09/05 09:50:54 joerg@mysql.com +1 -0
  Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0

  client/mysqltest.c
    1.153 05/09/05 09:50:50 joerg@mysql.com +0 -2
    Auto merged

ChangeSet
  1.1616.2243.3 05/09/05 09:29:28 tulin@dl145b.mysql.com +2 -0
  added timestamp to shutdown messages in ndbd

  ndb/src/kernel/vm/Emulator.cpp
    1.13.1.2 05/09/05 09:29:26 tulin@dl145b.mysql.com +14 -12
    added timestamp to shutdown messages in ndbd

  ndb/src/kernel/main.cpp
    1.37.1.5 05/09/05 09:29:26 tulin@dl145b.mysql.com +1 -1
    added timestamp to shutdown messages in ndbd

ChangeSet
  1.1616.2243.2 05/09/05 09:13:28 tulin@dl145b.mysql.com +3 -0
  fixed small bug in ndb redolog printer
  + added option to dumpe rest of page after exnd of data

  ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp
    1.7 05/09/05 09:11:16 ndbdev@dl145b.mysql.com +19 -6
    fixed small bug in ndb redolog printer
    + added option to dumpe rest of page after exnd of data

  ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
    1.4 05/09/05 09:11:16 ndbdev@dl145b.mysql.com +1 -1
    fixed small bug in ndb redolog printer

  ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp
    1.4 05/09/05 09:11:15 ndbdev@dl145b.mysql.com +3 -1
    fixed small bug in ndb redolog printer

ChangeSet
  1.1935.13.3 05/09/05 08:35:58 jan@hundin.mysql.fi +1 -0
  Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  hundin.mysql.fi:/home/jan/new/mysql-5.0

  BitKeeper/etc/ignore
    1.206 05/09/05 08:35:14 jan@hundin.mysql.fi +0 -4
    auto-union

ChangeSet
  1.1935.13.2 05/09/05 01:13:44 heikki@hundin.mysql.fi +2 -0
  row0mysql.c, ha_innodb.cc:
    Fix bug #12308 : do not roll back the whhole transaction in a lock wait timeout error, just roll back the latest SQL statement; note that the locks set in the latest SQL statements remain, as InnoDB does not know what locks were set in which SQL statement

  innobase/row/row0mysql.c
    1.112 05/09/05 01:13:05 heikki@hundin.mysql.fi +3 -2
    Fix bug #12308 : do not roll back the whhole transaction in a lock wait timeout error, just roll back the latest SQL statement; note that the locks set in the latest SQL statements remain, as InnoDB does not know what locks were set in which SQL statement

  sql/ha_innodb.cc
    1.254 05/09/05 01:12:53 heikki@hundin.mysql.fi +3 -7
    Fix bug #12308 : do not roll back the whhole transaction in a lock wait timeout error, just roll back the latest SQL statement; note that the locks set in the latest SQL statements remain, as InnoDB does not know what locks were set in which SQL statement

ChangeSet
  1.1935.13.1 05/09/04 11:25:13 brian@zim.(none) +1 -0
  This patch disables the query cache for the federated engine. 

  sql/ha_federated.h
    1.19 05/09/04 11:25:09 brian@zim.(none) +1 -0
    Fix cache issues

ChangeSet
  1.1935.12.3 05/09/04 21:00:00 hf@deer.(none) +3 -0
  Fix for bug #12938 (decimal arithmetic in the loop fails)

  strings/decimal.c
    1.61 05/09/04 20:59:55 hf@deer.(none) +15 -1
    code to cut heading zeroes off the result of the multiplication added

  mysql-test/t/type_newdecimal.test
    1.28 05/09/04 20:59:55 hf@deer.(none) +22 -0
    test case added

  mysql-test/r/type_newdecimal.result
    1.28 05/09/04 20:59:55 hf@deer.(none) +32 -0
    test result fixed

ChangeSet
  1.1935.12.2 05/09/04 13:00:03 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Better comments about auto-inc and SHOW TABLE STATUS

  sql/ha_innodb.cc
    1.253 05/09/04 12:59:41 heikki@hundin.mysql.fi +5 -3
    Better comments about auto-inc and SHOW TABLE STATUS

ChangeSet
  1.1935.12.1 05/09/04 12:04:21 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Fix bug #12973 : set the table handle field auto_increment_value if ::info() is called with the flag HA_STATUS_AUTO

  sql/ha_innodb.cc
    1.252 05/09/04 12:03:30 heikki@hundin.mysql.fi +34 -2
    Fix bug #12973 : set the table handle field auto_increment_value if ::info() is called with the flag HA_STATUS_AUTO

ChangeSet
  1.1935.11.1 05/09/04 01:34:58 patg@radha.local +3 -0
  BUG #9056 Added --routines flag to mysqldump to enable mysqldump to be able
  to dump PROCEDURES and FUNCTIONS.

  mysql-test/t/mysqldump.test
    1.56 05/09/04 01:34:44 patg@radha.local +81 -0
    BUG #9056 New tests for mysqldump --routines

  mysql-test/r/mysqldump.result
    1.62 05/09/04 01:34:43 patg@radha.local +58 -0
    BUG #9056 new test results for mysqldump --routines

  client/mysqldump.c
    1.196 05/09/04 01:34:43 patg@radha.local +127 -2
    BUG #9056, added dumping of functions/procs to mysqldump
    - added opt_routines (--routines/-R)
    - added dump_routines_for_db, function that dumps proc and funcs
    - added calling of dump_routines to dump_all_tables_in_db and dump_selected_tables

ChangeSet
  1.1935.10.1 05/09/03 09:34:34 jimw@mysql.com +3 -0
  Merge mysql.com:/home/jimw/my/mysql-5.0-11787
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  client/mysqltest.c
    1.152 05/09/03 09:34:31 jimw@mysql.com +4 -7
    Resolve conflict

  sql-common/client.c
    1.76 05/09/03 09:32:09 jimw@mysql.com +0 -0
    Auto merged

  include/mysql.h
    1.153 05/09/03 09:32:09 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.1.15 05/09/03 19:15:37 heikki@hundin.mysql.fi +2 -0
  univ.i, page0page.ic:
    Add a sanity check to page_rec_is_comp; a new univ.i macro UNIV_RELEASE_NOT_YET_STABLE controls such sanity checks that we will remove after the release is stable enough

  innobase/include/univ.i
    1.44 05/09/03 19:15:13 heikki@hundin.mysql.fi +4 -0
    Add a sanity check to page_rec_is_comp; a new univ.i macro UNIV_RELEASE_NOT_YET_STABLE controls such sanity checks that we will remove after the release is stable enough

  innobase/include/page0page.ic
    1.15 05/09/03 19:15:13 heikki@hundin.mysql.fi +13 -0
    Add a sanity check to page_rec_is_comp; a new univ.i macro UNIV_RELEASE_NOT_YET_STABLE controls such sanity checks that we will remove after the release is stable enough

ChangeSet
  1.1935.1.14 05/09/03 12:48:41 heikki@hundin.mysql.fi +1 -0
  row0sel.c:
    Fix a wrong debug assert in the previous patch

  innobase/row/row0sel.c
    1.104 05/09/03 12:48:03 heikki@hundin.mysql.fi +3 -4
    Fix a wrong debug assert in the previous patch

ChangeSet
  1.1935.1.13 05/09/03 12:32:38 heikki@hundin.mysql.fi +1 -0
  row0sel.c:
    Add more comments to row_search_for_mysql() and remove the ugly double use of the variable rec in that function

  innobase/row/row0sel.c
    1.103 05/09/03 12:32:16 heikki@hundin.mysql.fi +49 -29
    Add more comments to row_search_for_mysql() and remove the ugly double use of the variable rec in that function

ChangeSet
  1.1616.2227.6 05/09/02 17:07:05 eric@mysql.com +2 -0
  Backport of JimW's localhost patch  to 4.1 tree.
  Handle systems like default FC4 where 127.0.0.1 doesn't always map to 'localhost' first. 
  (Bug #11822)

  sql/sql_parse.cc
    1.271.119.4 05/09/02 17:06:58 eric@mysql.com +10 -20
    Push special handling of 127.0.0.1 into ip_to_hostname().

  sql/hostname.cc
    1.29.1.1 05/09/02 17:06:58 eric@mysql.com +9 -1
    Short-circuit ip_to_hostname() lookup for INADDR_LOOPBACK to allways return 'localhost'.

ChangeSet
  1.1935.8.1 05/09/03 03:25:59 konstantin@mysql.com +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/kostja/mysql/mysql-5.0-dsql3

  sql/share/errmsg.txt
    1.42 05/09/03 03:25:41 konstantin@mysql.com +2 -2
    manual merge

  sql/sql_parse.cc
    1.478 05/09/03 03:15:02 konstantin@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.346 05/09/03 03:15:02 konstantin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.3.11 05/09/03 03:13:18 konstantin@mysql.com +19 -0
  Implement WL#2661 "Prepared Statements: Dynamic SQL in Stored Procedures".
  The idea of the patch is to separate statement processing logic,
  such as parsing, validation of the parsed tree, execution and cleanup, 
  from global query processing logic, such as logging, resetting
  priorities of a thread, resetting stored procedure cache, resetting
  thread count of errors and warnings.
  This makes PREPARE and EXECUTE behave similarly to the rest of SQL
  statements and allows their use in stored procedures.
  This patch contains a change in behaviour:
  until recently for each SQL prepared statement command, 2 queries
  were written to the general log, e.g.
  [Query]   prepare stmt from @stmt_text;
  [Prepare] select * from t1 <-- contents of @stmt_text
  The chagne was necessary to prevent [Prepare] commands from being written
  to the general log when executing a stored procedure with Dynamic SQL.
  We should consider whether the old behavior is preferrable and probably
  restore it.
  This patch refixes Bug#7115, Bug#10975 (partially), Bug#10605 (various bugs
  in Dynamic SQL reported before it was disabled).

  mysql-test/t/sp-dynamic.test
    1.1 05/09/03 03:13:11 konstantin@mysql.com +335 -0
    - a new test for PREPARE/EXECUTE/DEALLOCATE in stored procedures.

  mysql-test/t/sp-dynamic.test
    1.0 05/09/03 03:13:11 konstantin@mysql.com +0 -0
    BitKeeper file /home/kostja/mysql/mysql-5.0-dsql3/mysql-test/t/sp-dynamic.test

  mysql-test/r/sp-dynamic.result
    1.1 05/09/03 03:13:10 konstantin@mysql.com +364 -0
    - sp-dynamic.test results

  sql/sql_yacc.yy
    1.416 05/09/03 03:13:10 konstantin@mysql.com +15 -40
    - enable PREPARE/EXECUTE/DEALLOCATE in stored procedures
    - produce an error message on attempt to use PREPARE/EXECUTE/DEALLOCATE
      in a stored function or trigger

  sql/sql_prepare.cc
    1.151 05/09/03 03:13:10 konstantin@mysql.com +813 -444
    - major refactoring to ensure PREPARE/EXECUTE commands do not reset global THD
      state and allow their use in stored procedures.
    - add Prepared_statement::flags and use it to ensure no recursive execution
      of a prepared statement is possible
    - better comments

  sql/sql_parse.cc
    1.472.1.12 05/09/03 03:13:10 konstantin@mysql.com +29 -106
    - move prepared statement code to sql_prepare.cc
    - change declarations (refactored code)
    - better error message when one attempts to use Dynamic SQL or a 
      stored procedure that returns a result set in a function or trigger.

  sql/sql_lex.h
    1.195 05/09/03 03:13:10 konstantin@mysql.com +5 -0
    - declare bool LEX::stmt_prepare_mode

  sql/sql_lex.cc
    1.167 05/09/03 03:13:10 konstantin@mysql.com +4 -3
    - add lex->stmt_prepare_mode; we can't rely on thd->command any more,
      because we don't reset it any more (Dynamic SQL requirement is that
      PS are as little intrusive as possible).

  sql/sql_class.cc
    1.206 05/09/03 03:13:10 konstantin@mysql.com +3 -14
    - Statement_map::insert should not delete a statement if it exists,
      now it's done externally to be able to handle the case when the
      statement being deleted is in use.
    - remove extra code (free_list is already reset in free_items)

  mysql-test/r/sp-dynamic.result
    1.0 05/09/03 03:13:10 konstantin@mysql.com +0 -0
    BitKeeper file /home/kostja/mysql/mysql-5.0-dsql3/mysql-test/r/sp-dynamic.result

  sql/sp_head.h
    1.67 05/09/03 03:13:09 konstantin@mysql.com +24 -9
    - replace multiple boolean flags of sp_head with uint m_flags;
    - add flag CONTAINS_DYNAMIC_SQL
    - use this flag to error if a stored procedure with Dynamic SQL is
      called from a function or trigger.

  sql/sp_head.cc
    1.179 05/09/03 03:13:09 konstantin@mysql.com +56 -19
    - extend sp_multi_results_command to return different flags for a
    command (and rename it)
    - add support for SQLCOM_PREPARE,SQLCOM_EXECUTE, SQLCOM_DEALLOCATE
      to sp_get_flags_for_command
    - replace multiple boolean sp_head members with uint m_flags
    - a fix for a crash when user variables are used in a stored procedure
      and binlog is on. A temporary fix for Bug#12637 "SP crashes the server 
     if it has update query with user var & binlog is enabled", which actually
     stands for stored functions: now instead of a crash we break
     replication if a user variable is used in a stored function which 
     is executed in prelocked mode.

  sql/share/errmsg.txt
    1.40.1.1 05/09/03 03:13:09 konstantin@mysql.com +2 -0
    - a new error message, when one attempts to execute a prepared statement
    which is currently being executed (this can happen only in Dynamic SQL
    at the moment).

  sql/mysql_priv.h
    1.342.1.5 05/09/03 03:13:09 konstantin@mysql.com +9 -8
    - fix declarations of sql_prepare.cc API

  sql/log_event.h
    1.115 05/09/03 03:13:09 konstantin@mysql.com +0 -3
    - remove an extra copy of the previous sentence

  sql/item_func.cc
    1.248 05/09/03 03:13:09 konstantin@mysql.com +8 -8
    - we need to pass sql_command explicitly to get_var_with_binlog, because
    when creating a query for SQL prepared statement thd->lex->sql_command
    points at SQLCOM_EXECUTE, which is not listed in the list of update
    queries.

  mysql-test/t/trigger.test
    1.26 05/09/03 03:13:09 konstantin@mysql.com +1 -1
    - a better error message for the case when a stored procedure that
    returns a result set is called from a trigger

  mysql-test/t/sp-error.test
    1.84 05/09/03 03:13:09 konstantin@mysql.com +10 -30
    - a better error message for the case when a stored procedure that
      returns a result set is called from a function.
    - move the comment to its place (end of file).

  mysql-test/r/trigger.result
    1.20 05/09/03 03:13:09 konstantin@mysql.com +1 -1
    - a better error message for the case when a stored procedure that
    returns a result set is called from a trigger

  mysql-test/r/sp-error.result
    1.80 05/09/03 03:13:09 konstantin@mysql.com +1 -15
    - remove obsolete tests
    - a better error message for the case when a stored procedure that
    returns a result set is called from a function

  mysql-test/r/not_embedded_server.result
    1.2 05/09/03 03:13:09 konstantin@mysql.com +1 -1
    Since we don't want to log Dynamic SQL in stored procedures,
    now the general log gets only one log entry per SQL statement.

ChangeSet
  1.1935.1.11 05/09/03 01:38:37 heikki@hundin.mysql.fi +1 -0
  row0sel.c:
    Fix bug #12947 : a consistent read could return inconsistent results; this bug was introduced in 5.0.5

  innobase/row/row0sel.c
    1.102 05/09/03 01:38:08 heikki@hundin.mysql.fi +12 -6
    Fix bug #12947 : a consistent read could return inconsistent results; this bug was introduced in 5.0.5

ChangeSet
  1.1346.1.799 05/09/02 22:52:52 hartmut@mysql.com +1 -0
  fix for BUG#12958 : mysqlimport with -L option crashing on HP-UX 

  client/mysqlimport.c
    1.29.1.8 05/09/02 22:52:48 hartmut@mysql.com +2 -1
    fix for BUG#12958 : mysqlimport with -L option crashing on HP-UX 

ChangeSet
  1.1935.1.10 05/09/02 12:42:00 jimw@mysql.com +4 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-clean
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  scripts/mysqld_multi.sh
    1.27 05/09/02 12:41:58 jimw@mysql.com +3 -4
    Resolve conflict

  mysql-test/r/variables.result
    1.72 05/09/02 12:41:58 jimw@mysql.com +0 -0
    Resolve conflict

  sql/set_var.cc
    1.137 05/09/02 12:40:59 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/variables.test
    1.48 05/09/02 12:40:59 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.7.1 05/09/02 11:40:21 eric@mysql.com +3 -0
  delete row now pulls error message from remote server.
  Added test cases with archive (where delete & update will always fail)
  http://bugs.mysql.com/bug.php?id=12659

  mysql-test/t/federated_archive.test
    1.1 05/09/02 11:40:12 eric@mysql.com +58 -0

  mysql-test/t/federated_archive.test
    1.0 05/09/02 11:40:12 eric@mysql.com +0 -0
    BitKeeper file /Users/eric/bktmp/mysql-5.0/mysql-test/t/federated_archive.test

  mysql-test/r/federated_archive.result
    1.1 05/09/02 11:40:11 eric@mysql.com +48 -0

  mysql-test/r/federated_archive.result
    1.0 05/09/02 11:40:11 eric@mysql.com +0 -0
    BitKeeper file /Users/eric/bktmp/mysql-5.0/mysql-test/r/federated_archive.result

  sql/ha_federated.cc
    1.38 05/09/02 11:40:10 eric@mysql.com +2 -0
    populate the error buffer with error message from remote system

ChangeSet
  1.1616.2242.1 05/09/02 20:07:08 joerg@mysql.com +1 -0
  Compile error fix.

  client/mysqltest.c
    1.92.1.86 05/09/02 20:07:04 joerg@mysql.com +2 -2
    Have variable declarations before "DBUG_ENTER",
    the opposite order will fail to compile on some platforms.

ChangeSet
  1.1935.1.9 05/09/02 17:06:15 bell@sanja.is.com.ua +6 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0

  sql/table.cc
    1.185 05/09/02 17:06:10 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_view.cc
    1.61 05/09/02 17:06:10 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.477 05/09/02 17:06:09 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_base.cc
    1.296 05/09/02 17:06:09 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.345 05/09/02 17:06:09 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.171 05/09/02 17:06:09 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1935.3.10 05/09/02 17:21:19 konstantin@mysql.com +20 -0
  Rename:
  - current_arena to stmt_arena: the thread may have more than one
  'current' arenas: one for runtime data, and one for the parsed 
  tree of a statement. Only one of them is active at any moment.
  - set_item_arena -> set_query_arena, because Item_arena was renamed to 
  Query_arena a while ago
  - set_n_backup_item_arena -> set_n_backup_active_arena;
  the active arena is the arena thd->mem_root and thd->free_list
  are currently pointing at.
  - restore_backup_item_arena -> restore_active_arena (with the same
  rationale)
  - change_arena_if_needed -> activate_stmt_arena_if_needed; this
  method sets thd->stmt_arena active if it's not done yet.

  sql/table.cc
    1.183.1.1 05/09/02 17:21:09 konstantin@mysql.com +4 -4
    Rename.

  sql/sql_view.cc
    1.59.1.1 05/09/02 17:21:09 konstantin@mysql.com +4 -4
    Rename.

  sql/sql_union.cc
    1.128 05/09/02 17:21:09 konstantin@mysql.com +4 -4
    Rename.

  sql/sql_show.cc
    1.273 05/09/02 17:21:08 konstantin@mysql.com +1 -1
    Rename.

  sql/sql_select.cc
    1.365 05/09/02 17:21:08 konstantin@mysql.com +6 -6
    Rename.

  sql/sql_prepare.cc
    1.150 05/09/02 17:21:08 konstantin@mysql.com +11 -11
    Rename.

  sql/sql_parse.cc
    1.472.1.11 05/09/02 17:21:08 konstantin@mysql.com +3 -3
    Rename.

  sql/sql_lex.cc
    1.166 05/09/02 17:21:08 konstantin@mysql.com +3 -3
    Rename.

  sql/sql_class.h
    1.262 05/09/02 17:21:08 konstantin@mysql.com +17 -18
    Rename.

  sql/sql_class.cc
    1.205 05/09/02 17:21:08 konstantin@mysql.com +11 -11
    Rename.

  sql/sql_base.cc
    1.293.1.1 05/09/02 17:21:07 konstantin@mysql.com +16 -16
    Rename.

  sql/sp_head.cc
    1.178 05/09/02 17:21:07 konstantin@mysql.com +34 -38
    Rename.

  sql/sp.cc
    1.92 05/09/02 17:21:07 konstantin@mysql.com +2 -2
    Rename.

  sql/mysql_priv.h
    1.342.1.4 05/09/02 17:21:07 konstantin@mysql.com +0 -1
    Remove an unused forward declaration.

  sql/item_sum.h
    1.91 05/09/02 17:21:07 konstantin@mysql.com +0 -2
    Remove an unused forward declaration.

  sql/item_subselect.h
    1.74 05/09/02 17:21:07 konstantin@mysql.com +0 -1
    Remove an unused forward declaration.

  sql/item_subselect.cc
    1.118 05/09/02 17:21:07 konstantin@mysql.com +6 -6
    Rename.

  sql/item_func.cc
    1.247 05/09/02 17:21:07 konstantin@mysql.com +2 -2
    Rename.

  sql/item_cmpfunc.cc
    1.171 05/09/02 17:21:07 konstantin@mysql.com +1 -1
    Rename.

  sql/item.cc
    1.169.1.1 05/09/02 17:21:07 konstantin@mysql.com +3 -3
    Rename.

ChangeSet
  1.1935.1.8 05/09/02 15:56:14 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0

  sql/sql_parse.cc
    1.476 05/09/02 15:56:09 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1935.3.8 05/09/02 12:20:18 lars@mysql.com +1 -0
  Removed redundant case in Makefile.am
  

  Makefile.am
    1.77 05/09/02 12:18:34 lthalmann@dl145h.mysql.com +0 -6
    Removed redundant case

ChangeSet
  1.1931.1.1 05/09/02 12:03:58 jonas@eel.(none) +5 -0
  Merge eel.(none):/home/jonas/src/mysql-4.1
  into  eel.(none):/home/jonas/src/mysql-5.0

  ndb/src/common/debugger/EventLogger.cpp
    1.22 05/09/02 12:03:54 jonas@eel.(none) +4 -7
    merge

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.82 05/09/02 11:57:26 jonas@eel.(none) +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.34 05/09/02 11:57:26 jonas@eel.(none) +0 -0
    Auto merged

  ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
    1.11 05/09/02 11:57:26 jonas@eel.(none) +0 -0
    Auto merged

  ndb/include/kernel/signaldata/SignalData.hpp
    1.10 05/09/02 11:57:26 jonas@eel.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.2241.3 05/09/02 11:55:41 jonas@eel.(none) +1 -0
  ndb - fix printout related to bug#10987

  ndb/src/common/debugger/EventLogger.cpp
    1.15.1.2 05/09/02 11:55:38 jonas@eel.(none) +4 -2
    Fix extended printout of LCP_FRAGMENT_COMPLETED

ChangeSet
  1.1616.2241.2 05/09/02 11:50:50 jonas@eel.(none) +1 -0
  ndb - bug#12608
    Always abort if node failure occured between startTransaction and commit
    (can later be improved by wl#2610)

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.42.1.16 05/09/02 11:50:45 jonas@eel.(none) +1 -1
    Always abort if node failure occured between startTransaction and commit

ChangeSet
  1.1616.2241.1 05/09/02 11:47:24 jonas@eel.(none) +5 -0
  ndb - bug #10987
    make sure not to cut log to early 
    (specificly not use LCP with maxGciStarted that has not yet completed)

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.14.1.11 05/09/02 11:47:09 jonas@eel.(none) +9 -3
    Add maxGciStarted/Completed to event report
    bug: dont use LCP for calcKeepGci in maxGciSTarted is not completed

  ndb/src/common/debugger/signaldata/StartRec.cpp
    1.2 05/09/02 11:47:08 jonas@eel.(none) +25 -0
    Add signal data printer for START_FRAG_REQ

  ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
    1.6.1.3 05/09/02 11:47:08 jonas@eel.(none) +1 -0
    Add signal data printer for START_FRAG_REQ

  ndb/include/kernel/signaldata/StartFragReq.hpp
    1.2 05/09/02 11:47:08 jonas@eel.(none) +2 -0
    Add signal data printer for START_FRAG_REQ

  ndb/include/kernel/signaldata/SignalData.hpp
    1.7.1.1 05/09/02 11:47:08 jonas@eel.(none) +1 -0
    Add signal data printer for START_FRAG_REQ

ChangeSet
  1.1935.5.1 05/09/02 11:19:46 msvensson@neptunus.(none) +2 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  mysql-test/t/mysqltest.test
    1.12 05/09/02 11:19:30 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/mysqltest.result
    1.10 05/09/02 11:19:30 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.2240.1 05/09/02 11:14:47 msvensson@neptunus.(none) +2 -0
  mysqltest.test: Remove output from shells in result file

  mysql-test/t/mysqltest.test
    1.3.1.8 05/09/02 11:14:38 msvensson@neptunus.(none) +2 -2
    Send output from failed command to /dev/null in order to avoid recording the output from different shells

  mysql-test/r/mysqltest.result
    1.3.1.7 05/09/02 11:14:38 msvensson@neptunus.(none) +2 -5
    Update test results

ChangeSet
  1.1346.849.2 05/09/02 11:11:29 kent@mysql.com +1 -0
  my_global.h:
    Back port of QNX work around for rint()

  include/my_global.h
    1.34.6.1 05/09/02 11:10:18 kent@mysql.com +5 -0
    Back port of QNX work around for rint()

ChangeSet
  1.1616.2239.1 05/09/02 19:09:20 stewart@mysql.com +1 -0
  BUG#11607 Incorrect error code returned on deletion
  
  Save error on first failure.
      
  At end of execute, if the current error is 4350 (transaction already aborted), restore
  the original error (if there was one).

  ndb/src/ndbapi/NdbConnection.cpp
    1.30.4.1 05/09/02 19:09:14 stewart@mysql.com +24 -2
    In NdbConnection::execute - returning 4350 instead of correct error.
    Save error on first failure.
        
    At end of execute, if the current error is 4350 (transaction already aborted), restore
    the original error (if there was one).

ChangeSet
  1.1935.3.6 05/09/02 11:01:00 lars@mysql.com +6 -0
  Merge mysql.com:/users/lthalmann/bk/mysql-4.1
  into  mysql.com:/users/lthalmann/bk/mysql-5.0

  sql/sql_parse.cc
    1.472.1.10 05/09/02 11:00:53 lars@mysql.com +4 -5
    Manual merge

  sql/log_event.cc
    1.190 05/09/02 11:00:53 lars@mysql.com +0 -0
    Manual merge

  mysql-test/r/rpl_replicate_do.result
    1.30 05/09/02 11:00:53 lars@mysql.com +1 -1
    Manual merge

  Makefile.am
    1.76 05/09/02 11:00:53 lars@mysql.com +0 -0
    Manual merge

  scripts/Makefile.am
    1.48 05/09/02 10:53:25 lars@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_replicate_do.test
    1.22 05/09/02 10:53:25 lars@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.849.1 05/09/02 10:44:20 kent@mysql.com +1 -0
  configure.in:
    Back port of code to find the right 'ps' settings

  configure.in
    1.191.21.1 05/09/02 10:33:10 kent@mysql.com +10 -7
    Back port of code to find the right 'ps' settings

ChangeSet
  1.1935.1.6 05/09/02 09:51:32 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0

  sql/sql_parse.cc
    1.475 05/09/02 09:51:27 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1935.1.5 05/09/02 09:50:17 bell@sanja.is.com.ua +5 -0
  postmerge changes 

  sql/sql_insert.cc
    1.173 05/09/02 09:50:10 bell@sanja.is.com.ua +1 -3
    inline function used instead of frequently used expression

  sql/sql_base.cc
    1.295 05/09/02 09:50:09 bell@sanja.is.com.ua +2 -4
    layoutfixed
    inline function used instead of frequently used expression

  sql/item.cc
    1.170 05/09/02 09:50:09 bell@sanja.is.com.ua +1 -4
    inline function used instead of frequently used expression
    removed old TODO

  mysql-test/t/view.test
    1.102 05/09/02 09:50:09 bell@sanja.is.com.ua +36 -36
    error code changed after merege

  mysql-test/t/lowercase_view.test
    1.7 05/09/02 09:50:09 bell@sanja.is.com.ua +34 -34
    error code changed after merege

ChangeSet
  1.1935.3.5 05/09/02 08:38:48 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  mysql-test/t/rpl_slave_status.test
    1.5 05/09/02 08:38:45 msvensson@neptunus.(none) +0 -1
    Merge to 5.0

ChangeSet
  1.1616.2238.1 05/09/02 11:19:43 bar@mysql.com +3 -0
  Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/usr/home/bar/mysql-4.1.b12363

  mysql-test/r/variables.result
    1.21.1.42 05/09/02 11:19:38 bar@mysql.com +0 -0
    SCCS merged

  sql/set_var.cc
    1.34.52.31 05/09/02 11:15:59 bar@mysql.com +0 -0
    Auto merged

  mysql-test/t/variables.test
    1.18.1.33 05/09/02 11:15:59 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.4.1 05/09/02 10:35:51 bar@mysql.com +1 -0
  sp_head.cc:
    Fix crash reported in bug 12849.
    It doesn't fix the whole problem though.
    Let Pem fix it later.

  sql/sp_head.cc
    1.177 05/09/02 10:30:50 bar@mysql.com +2 -2
    Fix crash reported in bug 12849.
    It doesn't fix the whole problem though.
    Let Pem fix it later.

ChangeSet
  1.1937 05/09/02 02:08:46 kent@mysql.com +4 -0
  Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/Users/kent/mysql/bk/mysql-5.0

  mysql-test/lib/mtr_timer.pl
    1.6 05/09/02 02:08:41 kent@mysql.com +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.40 05/09/02 02:08:40 kent@mysql.com +0 -0
    Auto merged

  mysql-test/lib/mtr_report.pl
    1.15 05/09/02 02:08:40 kent@mysql.com +0 -0
    Auto merged

  mysql-test/lib/mtr_process.pl
    1.20 05/09/02 02:08:40 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2232.15 05/09/02 01:37:16 lars@mysql.com +1 -0
  Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
  into  mysql.com:/users/lthalmann/bk/mysql-4.1-bug12542

  sql/sql_parse.cc
    1.271.119.3 05/09/02 01:37:08 lars@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.3.3 05/09/02 01:23:31 dlenev@mysql.com +5 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/dlenev/src/mysql-5.0-merges

  sql/examples/ha_archive.cc
    1.52 05/09/02 01:23:25 dlenev@mysql.com +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.38.1.3 05/09/02 01:23:25 dlenev@mysql.com +0 -0
    Auto merged

  mysql-test/lib/mtr_timer.pl
    1.4.1.2 05/09/02 01:23:25 dlenev@mysql.com +0 -0
    Auto merged

  mysql-test/lib/mtr_report.pl
    1.13.1.2 05/09/02 01:23:25 dlenev@mysql.com +0 -0
    Auto merged

  mysql-test/lib/mtr_process.pl
    1.17.1.2 05/09/02 01:23:25 dlenev@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.2.2 05/09/02 01:01:33 dlenev@mysql.com +1 -0
  Fixes after merging fix for bug #12423 "Deadlock when doing FLUSH PRIVILEGES
  and GRANT in multi-threaded environment" into 5.0 tree.

  sql/sql_acl.cc
    1.167 05/09/02 01:01:25 dlenev@mysql.com +23 -20
    After merge fixes.

ChangeSet
  1.1935.3.2 05/09/01 21:54:18 joerg@mysql.com +1 -0
  Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M50/merge-5.0

  scripts/Makefile.am
    1.47 05/09/01 21:54:15 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.1.4 05/09/01 22:42:37 bell@sanja.is.com.ua +11 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0

  sql/table.h
    1.111 05/09/01 22:42:22 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_view.cc
    1.60 05/09/01 22:42:22 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_update.cc
    1.168 05/09/01 22:42:22 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.474 05/09/01 22:42:22 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_insert.cc
    1.172 05/09/01 22:42:21 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_delete.cc
    1.161 05/09/01 22:42:21 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_base.cc
    1.294 05/09/01 22:42:20 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.344 05/09/01 22:42:20 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/view.test
    1.101 05/09/01 22:42:20 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/view.result
    1.107 05/09/01 22:42:19 bell@sanja.is.com.ua +0 -0
    Auto merged

  BitKeeper/etc/config
    1.21 05/09/01 22:42:19 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1616.2232.14 05/09/01 21:36:16 joerg@mysql.com +1 -0
  Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M41/merge-4.1

  scripts/Makefile.am
    1.39.1.7 05/09/01 21:36:13 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1935.2.1 05/09/01 23:25:29 dlenev@mysql.com +11 -0
  Merge mysql.com:/home/dlenev/src/mysql-4.1-bg12423
  into  mysql.com:/home/dlenev/src/mysql-5.0-merges

  sql/sql_parse.cc
    1.472.1.9 05/09/01 23:25:25 dlenev@mysql.com +0 -2
    Manual merge.

  sql/sql_acl.cc
    1.166 05/09/01 23:25:24 dlenev@mysql.com +4 -9
    Manual merge.

  mysql-test/t/grant2.test
    1.27 05/09/01 23:25:24 dlenev@mysql.com +43 -43
    Manual merge.

  mysql-test/r/grant2.result
    1.20 05/09/01 23:25:24 dlenev@mysql.com +9 -11
    Manual merge.

  mysql-test/mysql-test-run.pl
    1.38.2.1 05/09/01 23:25:24 dlenev@mysql.com +0 -24
    Manual merge.

  mysql-test/lib/mtr_process.pl
    1.17.2.1 05/09/01 23:25:24 dlenev@mysql.com +0 -56
    Manual merge.

ChangeSet
  1.1616.2232.13 05/09/01 21:06:37 joerg@mysql.com +1 -0
  Manual merge.

  Makefile.am
    1.60.1.11 05/09/01 21:06:34 joerg@mysql.com +0 -2
    Manual merge: For "test", use Kent's new version using the Perl script with port variables,
    but also have the "test-force" target (used in the RPM spec!) (still using Shell).

ChangeSet
  1.1616.2232.12 05/09/01 20:49:06 msvensson@neptunus.(none) +1 -0
  Fix missing command terminator

  mysql-test/t/rpl_slave_status.test
    1.3.1.1 05/09/01 20:49:03 msvensson@neptunus.(none) +1 -1
    Missing command terminator for source command.

  sql/examples/ha_archive.cc
    1.50.1.1 05/09/01 22:25:14 dlenev@mysql.com +0 -0
    Auto merged

  sql/sql_acl.h
    1.45 05/09/01 22:25:13 dlenev@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.491 05/09/01 22:25:13 dlenev@mysql.com +0 -0
    Auto merged

  mysql-test/r/grant2.result
    1.8.6.2 05/09/01 22:25:13 dlenev@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/lib/mtr_timer.pl
    1.4.2.1 05/09/01 22:19:44 dlenev@mysql.com +0 -12
    Auto merged

  mysql-test/lib/mtr_report.pl
    1.13.2.1 05/09/01 22:19:44 dlenev@mysql.com +0 -3
    Auto merged

ChangeSet
  1.1935.1.3 05/09/01 20:02:08 msvensson@neptunus.(none) +5 -0
  Fix for spelling miss and eol junk

  mysql-test/t/view.test
    1.99.1.4 05/09/01 20:02:04 msvensson@neptunus.(none) +1 -1
    Eol junk detected, added #

  mysql-test/t/sp.test
    1.143 05/09/01 20:02:04 msvensson@neptunus.(none) +4 -4
    Eol junk detected, added #

  mysql-test/t/rpl_slave_status.test
    1.4 05/09/01 20:02:04 msvensson@neptunus.(none) +1 -1
    Missing ;

  mysql-test/t/information_schema.test
    1.55 05/09/01 20:02:04 msvensson@neptunus.(none) +1 -1
    Eol junk detected, added #

  client/mysqltest.c
    1.150.1.9 05/09/01 20:02:04 msvensson@neptunus.(none) +1 -1
    Fix spelling error

ChangeSet
  1.1346.848.1 05/09/01 20:01:21 joerg@mysql.com +1 -0
  Add "MYSQL_BASE_VERSION" to the list of substituted variables in the "scripts" subdirectory.

  scripts/Makefile.am
    1.21.1.14 05/09/01 20:01:19 joerg@mysql.com +1 -0
    Add "MYSQL_BASE_VERSION" to the list of substituted variables,
    for later (possible) use in "mysql_install_db" and "mysqld_safe".

ChangeSet
  1.1616.2230.2 05/09/01 17:58:00 lars@mysql.com +2 -0
  BUG#12542: Added comments

  sql/sql_parse.cc
    1.271.119.2 05/09/01 17:56:02 lars@mysql.com +2 -1
    Added comments

  sql/log_event.cc
    1.113.1.72 05/09/01 17:55:46 lars@mysql.com +20 -0
    Added comments

ChangeSet
  1.1935.1.2 05/09/01 17:29:49 msvensson@neptunus.(none) +28 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  mysql-test/mysql-test-run.pl
    1.38.1.2 05/09/01 17:29:40 msvensson@neptunus.(none) +0 -24
    Manual merge

  mysql-test/lib/mtr_process.pl
    1.17.1.1 05/09/01 17:29:40 msvensson@neptunus.(none) +0 -56
    Manual merge

  sql/examples/ha_archive.cc
    1.51 05/09/01 17:27:03 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_until.test
    1.19 05/09/01 17:27:03 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_rotate_logs.test
    1.63 05/09/01 17:27:03 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_loaddata.test
    1.19 05/09/01 17:27:02 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_insert_id.test
    1.11 05/09/01 17:27:02 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_flush_log_loop.test
    1.12 05/09/01 17:27:02 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_error_ignored_table.test
    1.16 05/09/01 17:27:02 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_drop_temp.test
    1.7 05/09/01 17:27:02 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_drop.test
    1.5 05/09/01 17:27:02 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_deadlock.test
    1.9 05/09/01 17:27:02 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_change_master.test
    1.12 05/09/01 17:27:02 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_EE_error.test
    1.7 05/09/01 17:27:02 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl000001.test
    1.41 05/09/01 17:27:02 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/ndb_autodiscover2.test
    1.9 05/09/01 17:27:01 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/mysqltest.test
    1.11 05/09/01 17:27:01 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/innodb.test
    1.105 05/09/01 17:27:01 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/innodb-lock.test
    1.9 05/09/01 17:27:01 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/innodb-deadlock.test
    1.9 05/09/01 17:27:00 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/handler.test
    1.23 05/09/01 17:27:00 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/flush.test
    1.19 05/09/01 17:27:00 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/drop.test
    1.22 05/09/01 17:26:59 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/create_select_tmp.test
    1.6 05/09/01 17:26:59 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/create.test
    1.62 05/09/01 17:26:59 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/lib/mtr_timer.pl
    1.4.1.1 05/09/01 17:26:58 msvensson@neptunus.(none) +0 -12
    Auto merged

  mysql-test/lib/mtr_report.pl
    1.13.1.1 05/09/01 17:26:58 msvensson@neptunus.(none) +0 -3
    Auto merged

  client/mysqltest.c
    1.150.1.8 05/09/01 17:26:58 msvensson@neptunus.(none) +0 -1
    Auto merged

ChangeSet
  1.1616.2236.1 05/09/01 17:21:03 msvensson@neptunus.(none) +24 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
  into  neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316

  mysql-test/t/mysqltest.test
    1.3.1.7 05/09/01 17:21:00 msvensson@neptunus.(none) +0 -0
    Manual merge

  client/mysqltest.c
    1.92.1.85 05/09/01 17:21:00 msvensson@neptunus.(none) +1 -1
    Manual merge 

  mysql-test/t/rpl_until.test
    1.8.1.8 05/09/01 17:19:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_rotate_logs.test
    1.48.1.4 05/09/01 17:19:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_loaddata.test
    1.11.1.3 05/09/01 17:19:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_insert_id.test
    1.9.1.1 05/09/01 17:19:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_flush_log_loop.test
    1.6.1.3 05/09/01 17:19:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_error_ignored_table.test
    1.4.1.9 05/09/01 17:19:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_drop_temp.test
    1.1.1.2 05/09/01 17:19:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_drop.test
    1.3.1.1 05/09/01 17:19:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_deadlock.test
    1.1.1.4 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_change_master.test
    1.5.1.3 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_EE_error.test
    1.3.1.2 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl000001.test
    1.37.1.2 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/ndb_autodiscover2.test
    1.7.1.1 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/innodb.test
    1.62.1.11 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/innodb-lock.test
    1.7.1.1 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/innodb-deadlock.test
    1.7.1.1 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/handler.test
    1.21.1.1 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/flush.test
    1.14.1.3 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/drop.test
    1.16.1.4 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/create_select_tmp.test
    1.4.1.1 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/create.test
    1.48.1.10 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.8.2.31 05/09/01 17:19:14 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1935.1.1 05/09/01 17:15:37 msvensson@neptunus.(none) +31 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316

  mysql-test/t/mysqltest.test
    1.10 05/09/01 17:15:33 msvensson@neptunus.(none) +0 -0
    Manual merge

  client/mysqltest.c
    1.150.1.7 05/09/01 17:15:33 msvensson@neptunus.(none) +2 -6
    Merge with --parsing-disabled

  mysql-test/t/type_newdecimal.test
    1.27 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/strict.test
    1.18 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_until.test
    1.18 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_sp.test
    1.6 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_rotate_logs.test
    1.62 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_loaddata.test
    1.18 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_insert_id.test
    1.10 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_flush_log_loop.test
    1.11 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_error_ignored_table.test
    1.15 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_drop_temp.test
    1.6 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_drop.test
    1.4 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_deadlock.test
    1.8 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_change_master.test
    1.11 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_EE_error.test
    1.6 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl000001.test
    1.40 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/ndb_autodiscover2.test
    1.8 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/kill.test
    1.16 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/innodb.test
    1.104 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/innodb-lock.test
    1.8 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/innodb-deadlock.test
    1.8 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/handler.test
    1.22 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/flush.test
    1.18 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/drop.test
    1.21 05/09/01 17:04:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/create_select_tmp.test
    1.5 05/09/01 17:04:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/create.test
    1.61 05/09/01 17:04:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/type_newdecimal.result
    1.27 05/09/01 17:04:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/mysqltest.result
    1.9 05/09/01 17:04:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.272 05/09/01 17:04:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.38.1.1 05/09/01 17:04:15 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1860.110.2 05/09/01 17:01:23 msvensson@neptunus.(none) +8 -0
  mysqltest improvements, updates after merge + test for 5.0

  mysql-test/t/type_newdecimal.test
    1.22.1.1 05/09/01 17:01:15 msvensson@neptunus.(none) +1 -1
    Missing ;

  mysql-test/t/strict.test
    1.13.2.1 05/09/01 17:01:15 msvensson@neptunus.(none) +2 -2
    Convert "!$1292" to "--error 1292"

  mysql-test/t/rpl_sp.test
    1.3.1.1 05/09/01 17:01:15 msvensson@neptunus.(none) +6 -6
    Found extra delimiter

  mysql-test/t/rpl_loaddata.test
    1.16.1.2 05/09/01 17:01:14 msvensson@neptunus.(none) +1 -1
    Found extra delimiter

  mysql-test/t/kill.test
    1.13.1.1 05/09/01 17:01:14 msvensson@neptunus.(none) +1 -1
    Found extra delimiter

  mysql-test/t/flush_read_lock_kill.test
    1.3 05/09/01 17:01:14 msvensson@neptunus.(none) +1 -1
    Found extra delimiter

  mysql-test/r/type_newdecimal.result
    1.22.1.1 05/09/01 17:01:14 msvensson@neptunus.(none) +0 -2
    Update results after correction of testcase

  client/mysqltest.c
    1.150.4.2 05/09/01 17:01:14 msvensson@neptunus.(none) +8 -8
    Fixes after merge

ChangeSet
  1.1932.3.1 05/09/01 19:31:08 bar@mysql.com +3 -0
  Bug#12891:
    UNION doesn't return DISTINCT result for multi-byte characters
  hp_hash.c:
    This piece of code was pretty wrong, looks
    like no necessary changes were made after
    cut-and-paste from fixed length segment processing.
    Itroduced two new variables safe_length1 and
    safe_length2 to remember the original lengths.
    Fixing my_charpos and set_if_smaller calls
    to pass correct parameters.
  ctype_utf8.result, ctype_utf8.test:
    adding test case

  mysql-test/r/ctype_utf8.result
    1.71 05/09/01 19:27:08 bar@mysql.com +12 -0
    adding test case

  mysql-test/t/ctype_utf8.test
    1.67 05/09/01 19:27:01 bar@mysql.com +11 -0
    adding test case

  heap/hp_hash.c
    1.43 05/09/01 19:25:40 bar@mysql.com +6 -4
     Bug#12891:
    UNION doesn't return DISTINCT result for multi-byte characters
    This piece of code was pretty wrong.

ChangeSet
  1.1616.2232.10 05/09/01 17:01:25 dlenev@mysql.com +5 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/home/dlenev/src/mysql-4.1-bg12423

  mysql-test/t/grant2.test
    1.7.1.7 05/09/01 17:01:22 dlenev@mysql.com +0 -0
    Manual merge.

  mysql-test/r/grant2.result
    1.8.6.1 05/09/01 17:01:22 dlenev@mysql.com +2 -2
    Manual merge.

  sql/sql_parse.cc
    1.271.121.1 05/09/01 16:57:49 dlenev@mysql.com +0 -0
    Auto merged

  sql/sql_acl.cc
    1.74.1.94 05/09/01 16:57:48 dlenev@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.101.1 05/09/01 16:57:48 dlenev@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2235.1 05/09/01 16:52:59 dlenev@mysql.com +6 -0
  Fix for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in 
  multi-threaded environment".
  
  To avoid deadlocks between several simultaneously run account management 
  commands (particularly between FLUSH PRIVILEGES/SET PASSWORD and GRANT
  commands) we should always take table and internal locks during their
  execution in the same order. In other words we should first open and lock
  privilege tables and only then obtain acl_cache::lock/LOCK_grant locks.

  sql/sql_parse.cc
    1.271.120.1 05/09/01 16:52:55 dlenev@mysql.com +21 -4
    If reload_acl_and_cache() is called from SIGHUP handler we have to
    allocate temporary THD for execution of acl_reload()/grant_reload().

  sql/sql_acl.h
    1.26.1.7 05/09/01 16:52:55 dlenev@mysql.com +4 -4
    acl_init/grant_init() are now used only at server start up so they always
    allocate temporary THD object and don't need argument for passing pointer
    to it. acl_reload()/grant_reload() now are able to report about their
    success or failure through return value.

  sql/sql_acl.cc
    1.74.29.1 05/09/01 16:52:55 dlenev@mysql.com +241 -161
    To avoid deadlocks between several simultaneously run account management 
    commands (particularly between FLUSH PRIVILEGES/SET PASSWORD and GRANT
    commands) we should always take table and internal locks during their
    execution in the same order. In other words we should first open and lock
    privilege tables and only then obtain acl_cache::lock/LOCK_grant locks.
    
    Changed acl_reload()/grant_reload() and change_password()/update_user_table()
    in such way that they obey this principle. Now in acl_reload()/grant_reload()/
    change_password() we open and lock privilege tables, then obtain internal
    locks and then call acl_load()/grant_load()/update_user_table() functions to
    do actual loading or updating.

  sql/mysqld.cc
    1.356.100.1 05/09/01 16:52:55 dlenev@mysql.com +2 -2
    acl_init/grant_init() are now used only at server start up so they always
    allocate temporary THD object and don't need argument for passing pointer
    to it.

  mysql-test/t/grant2.test
    1.7.3.1 05/09/01 16:52:55 dlenev@mysql.com +43 -0
    Added test for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in 
    multi-threaded environment".

  mysql-test/r/grant2.result
    1.8.5.1 05/09/01 16:52:55 dlenev@mysql.com +9 -0
    Added test for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in 
    multi-threaded environment".

ChangeSet
  1.1933.1.1 05/09/01 14:47:06 msvensson@neptunus.(none) +2 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/bug11286/my50-bug11286

  sql/sql_parse.cc
    1.472.1.8 05/09/01 14:47:00 msvensson@neptunus.(none) +0 -0
    Auto merged

  client/mysqltest.c
    1.150.1.6 05/09/01 14:47:00 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1932.2.2 05/09/01 14:34:33 kent@mysql.com +1 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
  into mysql.com:/Users/kent/mysql/bk/mysql-5.0

  mysql-test/lib/mtr_process.pl
    1.19 05/09/01 14:34:29 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2228.4 05/09/01 14:32:42 kent@mysql.com +1 -0
  mtr_process.pl:
    Make sure mtr_kill_processes() is called with an array ref
    Corrected error string for STDERR redirect

  mysql-test/lib/mtr_process.pl
    1.15.1.3 05/09/01 14:32:05 kent@mysql.com +2 -2
    Make sure mtr_kill_processes() is called with an array ref

ChangeSet
  1.1932.2.1 05/09/01 14:18:19 kent@mysql.com +4 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
  into mysql.com:/Users/kent/mysql/bk/mysql-5.0

  mysql-test/lib/mtr_timer.pl
    1.5 05/09/01 14:18:15 kent@mysql.com +0 -12
    Auto merged

  mysql-test/lib/mtr_report.pl
    1.14 05/09/01 14:18:15 kent@mysql.com +0 -3
    Auto merged

  mysql-test/lib/mtr_process.pl
    1.18 05/09/01 14:18:12 kent@mysql.com +0 -56

  mysql-test/mysql-test-run.pl
    1.39 05/09/01 14:18:01 kent@mysql.com +0 -24

ChangeSet
  1.1932.1.1 05/09/01 14:12:48 pekka@mysql.com +3 -0
  ndb - fix ha_ndb crash on ordered index on nullable varchar

  sql/ha_ndbcluster.cc
    1.203 05/09/01 14:12:04 pekka@mysql.com +1 -1
    fix ha_ndb crash on ordered index on nullable varchar

  mysql-test/t/ndb_index_ordered.test
    1.25 05/09/01 14:12:04 pekka@mysql.com +6 -0
    fix ha_ndb crash on ordered index on nullable varchar

  mysql-test/r/ndb_index_ordered.result
    1.22 05/09/01 14:12:04 pekka@mysql.com +6 -0
    fix ha_ndb crash on ordered index on nullable varchar

ChangeSet
  1.1886.128.1 05/09/01 14:07:45 msvensson@neptunus.(none) +3 -0
  Bug #12717  	yassl: Crashes in "integer.cpp" when compiled with icc
   - Temporary fix, disable x86 assembler.

  BUILD/compile-pentium-icc-yassl
    1.1 05/09/01 14:07:41 msvensson@neptunus.(none) +24 -0
    New BitKeeper file ``BUILD/compile-pentium-icc-yassl''

  extra/yassl/taocrypt/include/misc.hpp
    1.7 05/09/01 14:07:41 msvensson@neptunus.(none) +7 -0
    Disable x86 assembler  when compiling with icc 

  BUILD/compile-pentium-icc
    1.2 05/09/01 14:07:41 msvensson@neptunus.(none) +7 -20
    Cleanup build script for icc

  BUILD/compile-pentium-icc-yassl
    1.0 05/09/01 14:07:41 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug12526/my50-bug12526/BUILD/compile-pentium-icc-yassl

ChangeSet
  1.1860.110.1 05/09/01 12:53:23 msvensson@neptunus.(none) +20 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316
  into  neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316

  mysql-test/t/rpl_until.test
    1.16.1.1 05/09/01 12:53:20 msvensson@neptunus.(none) +0 -1
    Manual merge

  mysql-test/t/rpl_change_master.test
    1.9.1.1 05/09/01 12:53:20 msvensson@neptunus.(none) +1 -2
    Manual merge

  mysql-test/t/mysqltest.test
    1.7.1.1 05/09/01 12:53:20 msvensson@neptunus.(none) +0 -1
    Manual merge

  mysql-test/t/flush.test
    1.15.1.1 05/09/01 12:53:20 msvensson@neptunus.(none) +0 -1
    Manual merge

  mysql-test/r/mysqltest.result
    1.7.1.1 05/09/01 12:53:20 msvensson@neptunus.(none) +0 -0
    Manual merge

  client/mysqltest.c
    1.150.4.1 05/09/01 12:53:19 msvensson@neptunus.(none) +4 -65
    Manual merge

  mysql-test/t/rpl_rotate_logs.test
    1.60.1.1 05/09/01 12:22:18 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_loaddata.test
    1.16.1.1 05/09/01 12:22:18 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_flush_log_loop.test
    1.9.1.1 05/09/01 12:22:18 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_error_ignored_table.test
    1.13.1.1 05/09/01 12:22:18 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_drop_temp.test
    1.3.1.1 05/09/01 12:22:18 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_deadlock.test
    1.5.1.1 05/09/01 12:22:18 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_EE_error.test
    1.4.1.1 05/09/01 12:22:18 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl000001.test
    1.38.1.1 05/09/01 12:22:18 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/innodb.test
    1.95.1.1 05/09/01 12:22:18 msvensson@neptunus.(none) +1 -2
    Auto merged

  mysql-test/t/drop.test
    1.19.1.1 05/09/01 12:22:18 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/create.test
    1.55.1.1 05/09/01 12:22:18 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/rpl_flush_log_loop.result
    1.24 05/09/01 12:22:18 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.270.1.1 05/09/01 12:22:18 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.30.1.1 05/09/01 12:22:18 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1892.40.1 05/09/01 11:46:43 msvensson@neptunus.(none) +5 -0
  Bug #11286  	yassl incompatible with "load data infile"
   - Make sure that mysqltest always uses ssl when connecting to the server.
   - Pass a i32-bit int variable as argument to FIONREAD ioctl.

  vio/viosslfactories.c
    1.18 05/09/01 11:46:37 msvensson@neptunus.(none) +0 -6
    Remove DBUG_PRINT("enter" in sslaccept and sslconnect as it tries to print out null strings. That is not suported on all platforms.

  vio/viossl.c
    1.28 05/09/01 11:46:37 msvensson@neptunus.(none) +4 -3
    Minor fixes
    Add timeout to DBUG_PRINT
    use function vio_ssl_fd to get sd from vio
    Remove extra whitespace

  sql/sql_parse.cc
    1.472.3.1 05/09/01 11:46:37 msvensson@neptunus.(none) +2 -3
    Update error message when sslaccepts fails. Must have been a copy and paste error.

  extra/yassl/src/socket_wrapper.cpp
    1.6 05/09/01 11:46:37 msvensson@neptunus.(none) +6 -2
    64-bit Solaris requires the variable passed to FIONREAD be a 32-bit value.
    Using "int" unless _WIN32_ is defined.

  client/mysqltest.c
    1.150.3.1 05/09/01 11:46:37 msvensson@neptunus.(none) +1 -1
    Set the flag CLIENT_REMENBER_OPTIONS so that all connection attempts from mysqltest is done with the same settings.
    Old impl caused mysqltest to loose all it's settings in the second connection attempt, ex ssl settings.

ChangeSet
  1.1828.267.1 05/09/01 11:36:42 msvensson@neptunus.(none) +6 -0
  Bug10213  mysqldump crashes when dumping VIEWs
   - Added testcase for this bug
   - Check if compact view format can be used
   - Clean up mysqld_show_create

  sql/table.h
    1.100.2.1 05/09/01 11:31:07 msvensson@neptunus.(none) +1 -0
    Add variable for compact_view_format indicator

  sql/sql_show.cc
    1.250.2.1 05/09/01 11:31:07 msvensson@neptunus.(none) +32 -16
    Cleanup of mysqld_show_create
     -remove extra invocation of view_store_create_info
     -Remove unused vars
     -Remove unused codes
    Check if compact show view format can be used 
      - if user has db of this view as current db
      - if this view only references table inside it's own db

  sql/sql_select.cc
    1.315.23.1 05/09/01 11:31:07 msvensson@neptunus.(none) +17 -4
    Check if compact format can be used

  sql/item.cc
    1.134.2.1 05/09/01 11:31:06 msvensson@neptunus.(none) +6 -2
    Check if compact format can be used

  mysql-test/t/mysqldump.test
    1.38.2.1 05/09/01 11:31:06 msvensson@neptunus.(none) +63 -1
    Added testcase

  mysql-test/r/mysqldump.result
    1.44.2.1 05/09/01 11:31:06 msvensson@neptunus.(none) +50 -1
    Updated test result

ChangeSet
  1.1616.2112.7 05/09/01 11:11:10 msvensson@neptunus.(none) +1 -0
  Fix compiler warnings for mysqltest.c

  client/mysqltest.c
    1.92.1.84 05/09/01 11:11:06 msvensson@neptunus.(none) +2 -4
    Fix warnings
    Remove unused vars

ChangeSet
  1.1616.2112.6 05/09/01 10:53:33 msvensson@neptunus.(none) +3 -0
  Bug #3131  	mysqltest fails on $2=$1 assignment in test

  mysql-test/t/mysqltest.test
    1.3.1.6 05/09/01 10:53:30 msvensson@neptunus.(none) +20 -0
    Add test cases for variable to variable assignment

  mysql-test/r/mysqltest.result
    1.3.1.6 05/09/01 10:53:30 msvensson@neptunus.(none) +7 -0
    Update test result

  client/mysqltest.c
    1.92.1.83 05/09/01 10:53:30 msvensson@neptunus.(none) +15 -7
    Fix function var_copy to make it possible to assign one variable to another. 
    ex: let $1=$2 

ChangeSet
  1.1616.2112.5 05/09/01 09:34:40 msvensson@neptunus.(none) +3 -0
  Bug #12471  	mysqltest, --error within loop affects wrong statement
   - Move clearing of expected errors

  mysql-test/t/mysqltest.test
    1.3.1.5 05/09/01 09:34:36 msvensson@neptunus.(none) +13 -0
    Add test for bug#12471

  mysql-test/r/mysqltest.result
    1.3.1.5 05/09/01 09:34:36 msvensson@neptunus.(none) +7 -0
    Update test results

  client/mysqltest.c
    1.92.1.82 05/09/01 09:34:36 msvensson@neptunus.(none) +10 -2
    Move clear of expected errors to the query loop so that the expected error is reset even when the query is retrieved from the q_lines cache.

ChangeSet
  1.1932 05/09/01 09:05:45 msvensson@neptunus.(none) +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  sql/sql_table.cc
    1.269 05/09/01 09:05:39 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/examples/ha_archive.cc
    1.50 05/09/01 09:05:39 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.2232.8 05/09/01 09:01:15 msvensson@neptunus.(none) +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into  neptunus.(none):/home/msvensson/mysql/mysql-4.1

  sql/examples/ha_archive.cc
    1.13.1.15 05/09/01 09:01:08 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1931 05/08/31 19:12:16 jimw@mysql.com +8 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-clean
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  sql/examples/ha_tina.cc
    1.14 05/08/31 19:12:14 jimw@mysql.com +0 -2
    Resolve conflict

  BitKeeper/deleted/.del-extra.c~706f29d72beb2565
    1.14 05/08/31 19:11:41 jimw@mysql.com +0 -0
    Auto merged

  mysys/my_access.c
    1.7 05/08/31 19:11:41 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/lowercase_table.test
    1.20 05/08/31 19:11:41 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/lowercase_table.result
    1.17 05/08/31 19:11:41 jimw@mysql.com +0 -0
    Auto merged

  myisam/mi_extra.c
    1.46 05/08/31 19:11:41 jimw@mysql.com +0 -0
    Auto merged

  include/my_global.h
    1.102 05/08/31 19:11:41 jimw@mysql.com +0 -0
    Auto merged

  configure.in
    1.341 05/08/31 19:11:41 jimw@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-extra.c~706f29d72beb2565
    1.12.1.2 05/08/31 19:11:41 jimw@mysql.com +0 -0
    Merge rename: isam/extra.c -> BitKeeper/deleted/.del-extra.c~706f29d72beb2565

ChangeSet
  1.1616.2234.1 05/08/31 18:32:15 jimw@mysql.com +6 -0
  Fix handling of filenames that start the same as reserved filenames
  on Windows. (Bug #12325)

  mysql-test/t/windows.test
    1.1 05/08/31 18:32:13 jimw@mysql.com +20 -0
    New BitKeeper file ``mysql-test/t/windows.test''

  mysql-test/t/windows.test
    1.0 05/08/31 18:32:13 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-12325/mysql-test/t/windows.test

  mysql-test/r/windows.result
    1.1 05/08/31 18:32:12 jimw@mysql.com +8 -0
    New BitKeeper file ``mysql-test/r/windows.result''

  mysql-test/include/windows.inc
    1.1 05/08/31 18:32:12 jimw@mysql.com +4 -0
    New BitKeeper file ``mysql-test/include/windows.inc''

  mysys/my_access.c
    1.3.1.3 05/08/31 18:32:12 jimw@mysql.com +1 -1
    Check that we've matched the whole forbidden name.

  mysql-test/t/lowercase_table.test
    1.15.1.4 05/08/31 18:32:12 jimw@mysql.com +0 -10
    Move test to new windows.test, since it is Windows-specific

  mysql-test/r/windows.result
    1.0 05/08/31 18:32:12 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-12325/mysql-test/r/windows.result

  mysql-test/r/lowercase_table.result
    1.9.1.7 05/08/31 18:32:12 jimw@mysql.com +0 -6
    Update results

  mysql-test/include/windows.inc
    1.0 05/08/31 18:32:12 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-12325/mysql-test/include/windows.inc

ChangeSet
  1.1930 05/08/31 15:24:06 jimw@mysql.com +27 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-clean
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  sql/item_strfunc.cc
    1.251 05/08/31 15:24:03 jimw@mysql.com +0 -1
    Resolve conflicts

  sql/ha_innodb.cc
    1.251 05/08/31 15:24:03 jimw@mysql.com +8 -9
    Resolve conflicts

  ndb/src/ndbapi/ndberror.c
    1.41 05/08/31 15:24:03 jimw@mysql.com +0 -0
    Resolve conflicts

  tests/mysql_client_test.c
    1.157 05/08/31 15:19:32 jimw@mysql.com +0 -0
    Auto merged

  sql/sql_table.cc
    1.267.1.5 05/08/31 15:19:32 jimw@mysql.com +0 -0
    Auto merged

  sql/item_sum.cc
    1.159 05/08/31 15:19:31 jimw@mysql.com +0 -0
    Auto merged

  ndb/src/mgmsrv/ConfigInfo.cpp
    1.65 05/08/31 15:19:31 jimw@mysql.com +0 -0
    Auto merged

  ndb/src/mgmclient/CommandInterpreter.cpp
    1.53 05/08/31 15:19:31 jimw@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/vm/SimulatedBlock.hpp
    1.13 05/08/31 15:19:31 jimw@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/vm/SimulatedBlock.cpp
    1.19 05/08/31 15:19:31 jimw@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
    1.16 05/08/31 15:19:31 jimw@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
    1.13 05/08/31 15:19:31 jimw@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
    1.17 05/08/31 15:19:31 jimw@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbtup/Dbtup.hpp
    1.23 05/08/31 15:19:31 jimw@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.72 05/08/31 15:19:31 jimw@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
    1.15 05/08/31 15:19:31 jimw@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dblqh/Dblqh.hpp
    1.34 05/08/31 15:19:31 jimw@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.33 05/08/31 15:19:31 jimw@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbdict/Dbdict.hpp
    1.15 05/08/31 15:19:30 jimw@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.54 05/08/31 15:19:30 jimw@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
    1.55 05/08/31 15:19:30 jimw@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
    1.14 05/08/31 15:19:30 jimw@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbacc/Dbacc.hpp
    1.21 05/08/31 15:19:30 jimw@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/backup/BackupInit.cpp
    1.12 05/08/31 15:19:30 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/system_mysql_db_fix.test
    1.15 05/08/31 15:19:30 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/func_gconcat.test
    1.32 05/08/31 15:19:30 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/func_gconcat.result
    1.42 05/08/31 15:19:30 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2232.5 05/09/01 00:13:01 tomas@poseidon.ndb.mysql.com +1 -0
  Bug #12043, do not core on misconfig unless debug compiled

  ndb/src/mgmsrv/ConfigInfo.cpp
    1.50.2.10 05/09/01 00:12:58 tomas@poseidon.ndb.mysql.com +15 -5
    Bug #12043, do not core on misconfig unless debug compiled

ChangeSet
  1.1616.2232.4 05/08/31 23:56:02 tomas@poseidon.ndb.mysql.com +1 -0
  Bug#12833  corrected parsing of CLUSTERLOG command in ndb_mgm

  ndb/src/mgmclient/CommandInterpreter.cpp
    1.44.1.6 05/08/31 23:55:59 tomas@poseidon.ndb.mysql.com +42 -35
    Bug#12833  corrected parsing of CLUSTERLOG command in ndb_mgm

ChangeSet
  1.1616.2233.1 05/08/31 23:24:50 tomas@poseidon.ndb.mysql.com +1 -0
  added make of ndb sys file printer

  ndb/src/kernel/blocks/dbdih/Makefile.am
    1.4 05/08/31 23:24:46 tomas@poseidon.ndb.mysql.com +6 -0
    added make of ndb sys file printer

ChangeSet
  1.1616.2232.1 05/08/31 23:08:58 tomas@poseidon.ndb.mysql.com +3 -0
  improved the ndb redo log reader

  ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp
    1.6 05/08/31 23:08:55 tomas@poseidon.ndb.mysql.com +93 -165
    improved the ndb redo log reader

  ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
    1.3 05/08/31 23:08:55 tomas@poseidon.ndb.mysql.com +2 -0
    improved the ndb redo log reader

  ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp
    1.3 05/08/31 23:08:55 tomas@poseidon.ndb.mysql.com +11 -0
    improved the ndb redo log reader

ChangeSet
  1.1929 05/08/31 22:06:34 evgen@moonbone.local +4 -0
  create.test, create.result, sql_select.cc, item.cc:
    After merge fix for bug #12537

  mysql-test/t/create.test
    1.60 05/08/31 22:05:52 evgen@moonbone.local +1 -2
    After merge fix for bug #12537

  mysql-test/r/create.result
    1.99 05/08/31 22:05:40 evgen@moonbone.local +2 -3
    After merge fix for bug #12537

  sql/sql_select.cc
    1.364 05/08/31 22:05:02 evgen@moonbone.local +2 -1
    After merge fix for bug #12537

  sql/item.cc
    1.169 05/08/31 22:04:26 evgen@moonbone.local +2 -1
    After merge fix for bug #12537

ChangeSet
  1.1928 05/08/31 21:24:25 evgen@moonbone.local +4 -0
  Manual merged

  sql/sql_select.cc
    1.363 05/08/31 21:24:23 evgen@moonbone.local +0 -1
    Manual merged

  sql/item.cc
    1.168 05/08/31 21:24:23 evgen@moonbone.local +0 -4
    Manual merged

ChangeSet
  1.1616.2227.4 05/08/31 10:23:29 jimw@mysql.com +1 -0
  Fix quoting of options passed to external commands by mysqld_multi. (Bug #11280)

  scripts/mysqld_multi.sh
    1.21.1.1 05/08/31 10:23:25 jimw@mysql.com +10 -3
    Fix quoting of options passed to mysqld and mysqladmin

  mysql-test/t/create.test
    1.59 05/08/31 21:22:28 evgen@moonbone.local +0 -0
    Auto merged

  mysql-test/r/create.result
    1.98 05/08/31 21:22:28 evgen@moonbone.local +0 -0
    Auto merged

ChangeSet
  1.1616.2231.1 05/08/31 10:08:55 jimw@mysql.com +5 -0
  Add test for madvise() being declared in C++ code, because it is not
  on Solaris even though it is available, and declare it ourselves in
  that case. (Bug #7156)

  sql/examples/ha_tina.cc
    1.3.1.4 05/08/31 10:08:52 jimw@mysql.com +2 -0
    Test that we have madvise() before trying to call it.

  myisam/mi_extra.c
    1.41.1.1 05/08/31 10:08:52 jimw@mysql.com +3 -3
    Fix typo in define test

  isam/extra.c
    1.12.1.1 05/08/31 10:08:52 jimw@mysql.com +2 -2
    Fix typo in define test

  include/my_global.h
    1.47.1.53 05/08/31 10:08:52 jimw@mysql.com +4 -0
    Handle madvise() being available but not declared in C++

  configure.in
    1.201.1.189 05/08/31 10:08:52 jimw@mysql.com +7 -0
    Add test for madvise() being declared when C++ compiler is used.

ChangeSet
  1.1616.2112.4 05/08/31 18:10:26 msvensson@neptunus.(none) +3 -0
  Remove syntax !$<err_no> to set an expected error code
  Use !<err_no> instead

  mysql-test/t/mysqltest.test
    1.3.1.4 05/08/31 18:10:23 msvensson@neptunus.(none) +4 -2
    Uncomment tests for the deprecated syntax

  mysql-test/r/mysqltest.result
    1.3.1.4 05/08/31 18:10:23 msvensson@neptunus.(none) +0 -5
    Update test result

  client/mysqltest.c
    1.92.1.81 05/08/31 18:10:23 msvensson@neptunus.(none) +5 -35
    Remove syntax !$<err_no> to set an expected error code

ChangeSet
  1.1616.2230.1 05/08/31 18:08:45 lars@mysql.com +3 -0
  BUG#12542: All set statements should be executed by slave thd
  rpl_replicate_do.result:
    New test case
  sql_parse.cc:
    All SET statements should be executed by slave thd
  rpl_replicate_do.test:
    New test case

  mysql-test/r/rpl_replicate_do.result
    1.21.1.2 05/08/31 18:06:25 lthalmann@dl145h.mysql.com +11 -0
    New test case

  sql/sql_parse.cc
    1.271.119.1 05/08/31 18:05:33 lars@mysql.com +45 -28
    All SET commands should be executed by slave thd

  mysql-test/t/rpl_replicate_do.test
    1.19.1.2 05/08/31 18:04:30 lthalmann@dl145h.mysql.com +18 -0
    Added testca[3~

ChangeSet
  1.1616.2112.3 05/08/31 17:16:05 msvensson@neptunus.(none) +14 -0
  BUG#11316: mysqltest, problems when assigning value with '#' to $variable
   - Add stricter checking of syntax in mysqltest

  mysql-test/t/rpl_loaddata.test
    1.11.2.1 05/08/31 17:16:01 msvensson@neptunus.(none) +1 -1
    Remove extra ;

  mysql-test/t/rpl_error_ignored_table.test
    1.4.2.1 05/08/31 17:16:01 msvensson@neptunus.(none) +2 -2
    Remove extra ;

  mysql-test/t/rpl_drop.test
    1.2.1.1 05/08/31 17:16:01 msvensson@neptunus.(none) +1 -1
    Remove extra ;

  mysql-test/t/rpl_EE_error.test
    1.3.2.1 05/08/31 17:16:01 msvensson@neptunus.(none) +1 -1
    Remove extra ;

  mysql-test/t/rpl000001.test
    1.37.2.1 05/08/31 17:16:01 msvensson@neptunus.(none) +1 -1
    Remove extra ;

  mysql-test/t/mysqltest.test
    1.3.1.3 05/08/31 17:16:01 msvensson@neptunus.(none) +63 -0
    Add more tests for replace, replace_columns, comments with commands and sync_with_master

  mysql-test/t/innodb.test
    1.62.3.1 05/08/31 17:16:01 msvensson@neptunus.(none) +1 -1
    Remove extra ;

  mysql-test/t/handler.test
    1.20.1.1 05/08/31 17:16:01 msvensson@neptunus.(none) +9 -9
    Remove extra ;

  mysql-test/t/flush.test
    1.14.2.1 05/08/31 17:16:01 msvensson@neptunus.(none) +1 -1
    Remove extra ;

  mysql-test/t/drop.test
    1.16.2.1 05/08/31 17:16:01 msvensson@neptunus.(none) +5 -5
    Remove extra ;

  mysql-test/t/create_select_tmp.test
    1.3.1.1 05/08/31 17:16:01 msvensson@neptunus.(none) +8 -8
    Remove extra ;

  mysql-test/t/create.test
    1.48.4.1 05/08/31 17:16:01 msvensson@neptunus.(none) +1 -1
    Remove extra ;

  mysql-test/r/mysqltest.result
    1.3.1.3 05/08/31 17:16:01 msvensson@neptunus.(none) +30 -2
    Update test results

  client/mysqltest.c
    1.92.1.80 05/08/31 17:16:01 msvensson@neptunus.(none) +415 -444
    Stricter checking of syntax in mysqltest.

  mysql-test/lib/mtr_process.pl
    1.15.1.2 05/08/31 16:44:49 kent@mysql.com +1 -1
    Corrected error string for STDERR redirect

ChangeSet
  1.1616.2228.3 05/08/31 16:28:47 kent@mysql.com +4 -0
  mtr_timer.pl, mtr_report.pl, mtr_process.pl, mysql-test-run.pl:
    Backporting from 5.0

  mysql-test/lib/mtr_timer.pl
    1.1.1.1 05/08/31 16:27:53 kent@mysql.com +12 -0
    Backporting from 5.0

  mysql-test/lib/mtr_report.pl
    1.11.1.1 05/08/31 16:27:53 kent@mysql.com +3 -2
    Backporting from 5.0

  mysql-test/lib/mtr_process.pl
    1.15.1.1 05/08/31 16:27:53 kent@mysql.com +56 -22
    Backporting from 5.0

  mysql-test/mysql-test-run.pl
    1.8.2.30 05/08/31 16:27:52 kent@mysql.com +24 -21
    Backporting from 5.0

ChangeSet
  1.1616.2229.1 05/08/31 18:26:50 evgen@moonbone.local +3 -0
  Fix bug #12861 client hang with group_concat insubquery FROM DUAL.
  
  Item_func_group_concat::fix_fields() set maybe_null flag to 0, and set it to
  1 only if some of it's arguments may be null. When used in subquery in tmp 
  table created field which can't be null. When no data retireved result field
  have to be set to null and error mentioned in bug report occurs. Also this 
  bug can occur if selecting from not null field in empty table.
  
  Function group_concat now marked maybe_null from the very beginning not only
  if some of it's argument may be null.

ChangeSet
  1.1616.2227.2 05/08/31 16:15:03 tomas@poseidon.ndb.mysql.com +20 -0
  improved error message printing on filesystem refuse signals

  ndb/src/kernel/vm/SimulatedBlock.hpp
    1.11.1.1 05/08/31 16:14:59 tomas@poseidon.ndb.mysql.com +9 -0
    improved error message printing on filesystem refuse signals

  ndb/src/kernel/vm/SimulatedBlock.cpp
    1.16.1.1 05/08/31 16:14:59 tomas@poseidon.ndb.mysql.com +63 -0
    improved error message printing on filesystem refuse signals

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
    1.10.1.3 05/08/31 16:14:59 tomas@poseidon.ndb.mysql.com +4 -8
    improved error message printing on filesystem refuse signals

  ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
    1.6 05/08/31 16:14:59 tomas@poseidon.ndb.mysql.com +0 -1
    improved error message printing on filesystem refuse signals

  ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp
    1.3 05/08/31 16:14:59 tomas@poseidon.ndb.mysql.com +0 -1
    improved error message printing on filesystem refuse signals

  ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
    1.7.1.1 05/08/31 16:14:59 tomas@poseidon.ndb.mysql.com +0 -7
    improved error message printing on filesystem refuse signals

  ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
    1.14.1.2 05/08/31 16:14:59 tomas@poseidon.ndb.mysql.com +0 -30
    improved error message printing on filesystem refuse signals

  ndb/src/kernel/blocks/dbtup/Dbtup.hpp
    1.16.1.3 05/08/31 16:14:58 tomas@poseidon.ndb.mysql.com +0 -5
    improved error message printing on filesystem refuse signals

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.39.1.15 05/08/31 16:14:58 tomas@poseidon.ndb.mysql.com +10 -61
    improved error message printing on filesystem refuse signals

  ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
    1.11.1.3 05/08/31 16:14:58 tomas@poseidon.ndb.mysql.com +2 -5
    improved error message printing on filesystem refuse signals

  ndb/src/kernel/blocks/dblqh/Dblqh.hpp
    1.21.1.6 05/08/31 16:14:58 tomas@poseidon.ndb.mysql.com +0 -3
    improved error message printing on filesystem refuse signals

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.14.1.10 05/08/31 16:14:58 tomas@poseidon.ndb.mysql.com +43 -23
    improved error message printing on filesystem refuse signals

  ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
    1.7 05/08/31 16:14:58 tomas@poseidon.ndb.mysql.com +4 -4
    improved error message printing on filesystem refuse signals

  ndb/src/kernel/blocks/dbdict/Dbdict.hpp
    1.7.1.3 05/08/31 16:14:58 tomas@poseidon.ndb.mysql.com +0 -2
    improved error message printing on filesystem refuse signals

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.26.2.13 05/08/31 16:14:58 tomas@poseidon.ndb.mysql.com +18 -28
    improved error message printing on filesystem refuse signals

  ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
    1.21.1.14 05/08/31 16:14:58 tomas@poseidon.ndb.mysql.com +0 -42
    improved error message printing on filesystem refuse signals

  ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
    1.7.1.2 05/08/31 16:14:58 tomas@poseidon.ndb.mysql.com +0 -5
    improved error message printing on filesystem refuse signals

  ndb/src/kernel/blocks/dbacc/Dbacc.hpp
    1.10.1.4 05/08/31 16:14:58 tomas@poseidon.ndb.mysql.com +0 -5
    improved error message printing on filesystem refuse signals

  ndb/src/kernel/blocks/backup/BackupInit.cpp
    1.8.1.3 05/08/31 16:14:58 tomas@poseidon.ndb.mysql.com +4 -4
    improved error message printing on filesystem refuse signals

  ndb/include/kernel/signaldata/FsRef.hpp
    1.2 05/08/31 16:14:58 tomas@poseidon.ndb.mysql.com +1 -21
    improved error message printing on filesystem refuse signals

  mysql-test/t/func_gconcat.test
    1.23.2.1 05/08/31 18:13:37 evgen@moonbone.local +5 -0
    Test case for bug #12861 client hang with group_concat insubquery FROM DUAL.

  mysql-test/r/func_gconcat.result
    1.27.2.1 05/08/31 18:13:16 evgen@moonbone.local +3 -0
    Test case for bug #12861 client hang with group_concat insubquery FROM DUAL.

  sql/item_sum.cc
    1.89.11.1 05/08/31 18:12:23 evgen@moonbone.local +1 -3
    Fix bug #12861 client hang with group_concat insubquery FROM DUAL.

ChangeSet
  1.1616.2228.2 05/08/31 14:27:44 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Fix bug #12410 : InnoDB was too permissive with LOCK TABLE ... READ LOCAL, and alowed new inserts to the table; we now make READ LOCAL equivalent to READ for InnoDB; note that this will cause slightly more locking in mysqldump, but makes the InnoDB table dumps consistent with MyISAM table dumps; note that the real code change patch was accidentally pushed with my another patch 5 minutes ago

  sql/ha_innodb.cc
    1.90.16.36 05/08/31 14:27:26 heikki@hundin.mysql.fi +3 -1
    Fix bug #12410 : InnoDB was too permissive with LOCK TABLE ... READ LOCAL, and alowed new inserts to the table; we now make READ LOCAL equivalent to READ for InnoDB; note that this will cause slightly more locking in mysqldump, but makes the InnoDB table dumps consistent with MyISAM table dumps; note that the real code change patch was accidentally pushed with my another patch 5 minutes ago

ChangeSet
  1.1616.2228.1 05/08/31 14:17:05 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Fix bug #12852 : do not increment the open handle count to a table if the table does not have an .ibd file and InnoDB decides to return an error from the ::open() function; then the table can be dropped even if the user has tried to open it

  sql/ha_innodb.cc
    1.90.16.35 05/08/31 14:16:46 heikki@hundin.mysql.fi +15 -0
    Fix bug #12852 : do not increment the open handle count to a table if the table does not have an .ibd file and InnoDB decides to return an error from the ::open() function; then the table can be dropped even if the user has tried to open it

ChangeSet
  1.1616.2210.5 05/08/31 13:09:18 tomas@poseidon.ndb.mysql.com +1 -0
  corrected some erroneous ndb error messages

  ndb/src/ndbapi/ndberror.c
    1.20.2.8 05/08/31 13:09:13 tomas@poseidon.ndb.mysql.com +4 -6
    corrected some erroneous ndb error messages

ChangeSet
  1.1346.1.797 05/08/31 12:13:22 joerg@mysql.com +1 -0
  Clone of 4.0.26 is taken, increase version number.

  configure.in
    1.191.1.139 05/08/31 12:13:20 joerg@mysql.com +1 -1
    Clone of 4.0.26 is taken, increase version number.

ChangeSet
  1.1926 05/08/31 13:23:24 sergefp@mysql.com +2 -0
  Fix group_min_max.test - myisam may return slightly row count estimate on amd64

  mysql-test/t/group_min_max.test
    1.14 05/08/31 13:23:20 sergefp@mysql.com +1 -0
    Fix group_min_max.test - myisam may return slightly row count estimate on amd64

  mysql-test/r/group_min_max.result
    1.16 05/08/31 13:23:20 sergefp@mysql.com +1 -1
    Fix group_min_max.test - myisam may return slightly row count estimate on amd64

ChangeSet
  1.1616.2226.1 05/08/31 14:04:54 bar@mysql.com +3 -0
  Bug#12611: ESCAPE + LIKE do not work when the escape char is a multibyte one
  
  item_cmpfunc.cc:
    Pass unicode value as "escape" argument to my_wildcmp
    if a multibyte character set is used.
    For single byte character set nothing has changed:
    native (non-unicode) character code is still passed.
  
  ctype_utf8.result, ctype_utf8.test:
    adding test case

  mysql-test/r/ctype_utf8.result
    1.45.1.19 05/08/31 14:01:25 bar@mysql.com +4 -0
    adding test

  mysql-test/t/ctype_utf8.test
    1.57.1.9 05/08/31 14:01:19 bar@mysql.com +6 -0
    adding test

  sql/item_cmpfunc.cc
    1.111.1.82 05/08/31 14:00:23 bar@mysql.com +19 -1
    Bug#12611: ESCAPE + LIKE do not work when the escape char is a multibyte one
    Pass unicode code instead of native code as
    "escape" argument to my_wildcmp.

ChangeSet
  1.1616.2143.47 05/08/31 13:03:24 bar@mysql.com +2 -0
  
    bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC prob
  
  sql_parse.cc:
  mysqld.cc:
  
    Added --skip-client-character-set-handshake.
    When this option is activated, client side character set
    (which is sent in handshake) is ignored, and server side
    default-character-set value is used for character_set_client
    and character_set_results, thus reprodicing 4.0 behaviour.

  sql/sql_parse.cc
    1.271.1.191 05/08/31 13:00:08 bar@mysql.com +3 -1
    bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC prob
    Added --skip-client-character-set-handshake,
    to reproduce 4.0 behaviour.

  sql/mysqld.cc
    1.356.98.3 05/08/31 12:59:34 bar@mysql.com +7 -0
    bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC prob
    Added --skip-client-character-set-handshake, 
    to reproduce 4.0 behaviour.

ChangeSet
  1.1925 05/08/31 10:25:00 ramil@mysql.com +5 -0
  Merge mysql.com:/usr/home/ram/work/4.1.b9613
  into  mysql.com:/usr/home/ram/work/mysql-5.0

  mysql-test/t/variables.test
    1.47 05/08/31 10:24:55 ramil@mysql.com +9 -7
    merging

  mysql-test/r/variables.result
    1.71 05/08/31 10:24:55 ramil@mysql.com +3 -3
    merging

  sql/set_var.cc
    1.136 05/08/31 10:23:04 ramil@mysql.com +2 -2
    Auto merged

  sql/mysqld.cc
    1.490 05/08/31 10:23:04 ramil@mysql.com +0 -0
    Auto merged

  sql/ha_blackhole.cc
    1.18 05/08/31 10:23:03 ramil@mysql.com +0 -2
    Auto merged

ChangeSet
  1.1924 05/08/31 03:45:04 kent@mysql.com +1 -0
  configure.in:
    Changed back to 5.0.13-beta

  configure.in
    1.340 05/08/31 03:44:37 kent@mysql.com +2 -2
    Changed back to 5.0.13-beta

ChangeSet
  1.1923 05/08/31 03:38:33 kent@mysql.com +1 -0
  mysql-test-run.pl:
    Put back unused old manager dummy arguments, some scripts use them

  mysql-test/mysql-test-run.pl
    1.38 05/08/31 03:38:02 kent@mysql.com +5 -0
    Put back unused old manager dummy arguments, some scripts use them

ChangeSet
  1.1922 05/08/31 02:25:28 kent@mysql.com +1 -0
  Makefile.am:
    Make dist copy of .imtest files not fail the make target, as there are no files yet

  mysql-test/Makefile.am
    1.62 05/08/31 02:23:40 kent@mysql.com +2 -2
    Make dist copy of .imtest files not fail the make target, as there are no files yet

ChangeSet
  1.1918.1.1 05/08/31 00:54:41 evgen@moonbone.local +3 -0
  Fix bug #12489 wrongly printed strcmp() function results in creation of broken
  view.
  
  For Item_func_strcmp print() was not defined and for this class was called
  print_op of it's parent class. Because of this strcmp() was printed wrongly
  and this results int creation of broken view.
  
  Added function Item_func_strcmp::print() which correctly prints strcmp()
  function.

  mysql-test/t/view.test
    1.99.1.3 05/08/31 00:41:00 evgen@moonbone.local +9 -0
    Test case for bug #12489 wrongly printed strcmp() function results in creation of broken view.

  mysql-test/r/view.result
    1.105.1.4 05/08/31 00:40:30 evgen@moonbone.local +6 -0
    Test case for bug #12489 wrongly printed strcmp() function results in creation of broken view.

  sql/item_cmpfunc.h
    1.108 05/08/31 00:39:41 evgen@moonbone.local +1 -0
    Fix bug #12489 wrongly printed strcmp() function results in creation of broken view.

ChangeSet
  1.1616.2225.1 05/08/30 23:29:47 evgen@moonbone.local +2 -0
  manual merge of bug fix#12537

  sql/sql_select.cc
    1.216.1.217 05/08/30 23:29:46 evgen@moonbone.local +2 -2
    manual merge

  sql/item.cc
    1.58.1.162 05/08/30 23:25:47 evgen@moonbone.local +0 -0
    Auto merged

ChangeSet
  1.1616.2143.44 05/08/30 12:24:37 jimw@mysql.com +5 -0
  Fix incorrect spellings of "dropped" in source and tests. (Bug #12828)

  tests/mysql_client_test.c
    1.51.1.106 05/08/30 12:24:34 jimw@mysql.com +2 -2
    Fix incorrect spelling

  sql/sql_table.cc
    1.157.2.144 05/08/30 12:24:33 jimw@mysql.com +1 -1
    Fix incorrect spelling

  mysql-test/t/system_mysql_db_fix.test
    1.7.1.4 05/08/30 12:24:33 jimw@mysql.com +1 -1
    Fix incorrect spelling

  mysql-test/t/rpl000009.test
    1.24 05/08/30 12:24:33 jimw@mysql.com +1 -1
    Fix incorrect spelling

  include/my_alloc.h
    1.5 05/08/30 12:24:33 jimw@mysql.com +1 -1
    Fix incorrect spelling

ChangeSet
  1.1907.10.1 05/08/30 22:19:15 SergeyV@selena. +4 -0
  Fixes bug #11815. Convert file path to UNIX format to build correct query 
  string while replicating LOAD DATA INFILE statement.

  sql/log_event.cc
    1.189 05/08/30 22:19:07 SergeyV@selena. +2 -1
    Convert file path to UNIX format to build correct query string while replicating
    LOAD DATA INFILE statement.

  mysys/mf_format.c
    1.20 05/08/30 22:19:06 SergeyV@selena. +2 -0
    Added an option for fn_format function to convert path from system
    representation to UNIX format.

  include/my_sys.h
    1.167 05/08/30 22:19:05 SergeyV@selena. +1 -0
    Added an option for fn_format function to convert path from system representation
    to UNIX format.

  VC++Files/mysys/mysys.dsp
    1.29 05/08/30 22:19:04 SergeyV@selena. +4 -0
    added mf_unixpath.c into mysys.dsp

ChangeSet
  1.1917.1.3 05/08/30 13:17:50 paul@kite-hub.kitebird.com +1 -0
  ha_innodb.cc:
    Reorder out-of-order status variables

  sql/ha_innodb.cc
    1.250 05/08/30 13:17:41 paul@kite-hub.kitebird.com +4 -4
    Reorder out-of-order status variables

ChangeSet
  1.1917.1.2 05/08/30 13:16:40 paul@kite-hub.kitebird.com +1 -0
  mysqld.cc:
    Reorder out-of-order status variables

  sql/mysqld.cc
    1.489 05/08/30 13:16:02 paul@kite-hub.kitebird.com +6 -6
    Reorder out-of-order status variables

ChangeSet
  1.1917.1.1 05/08/30 13:15:43 paul@kite-hub.kitebird.com +1 -0
  set_var.cc:
    Reorder out-of-order system variables

  sql/set_var.cc
    1.135 05/08/30 13:15:22 paul@kite-hub.kitebird.com +6 -6
    Reorder out-of-order system variables

ChangeSet
  1.1915.1.1 05/08/30 11:04:23 brian@zim.(none) +3 -0
  Fix for bad merge. 

  sql/examples/ha_archive.h
    1.27 05/08/30 11:04:17 brian@zim.(none) +1 -1
    Bad merge.

  mysql-test/t/archive.test
    1.12 05/08/30 11:04:17 brian@zim.(none) +10 -9
    Test fix. The INSERT DELAYED test must always come last. 

  mysql-test/r/archive.result
    1.11 05/08/30 11:04:17 brian@zim.(none) +22 -29
    Updated result file

ChangeSet
  1.1917 05/08/30 12:12:12 paul@kite-hub.kitebird.com +1 -0
  Manual merge.

  sql/mysqld.cc
    1.488 05/08/30 12:12:08 paul@kite-hub.kitebird.com +1 -4
    Manual merge.

ChangeSet
  1.1916 05/08/30 12:11:11 paul@kite-hub.kitebird.com +1 -0
  Merge kite-hub.kitebird.com:/tmp/merge-4.1
  into  kite-hub.kitebird.com:/tmp/merge-5.0

  sql/set_var.cc
    1.134 05/08/30 11:51:01 paul@kite-hub.kitebird.com +0 -0
    Auto merged

ChangeSet
  1.1915 05/08/30 08:28:55 brian@zim.(none) +1 -0
  Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  zim.(none):/home/brian/mysql/mysql-5.0

  sql/handler.h
    1.150 05/08/30 08:28:42 brian@zim.(none) +0 -0
    Auto merged

ChangeSet
  1.1346.847.2 05/08/30 19:19:28 SergeyV@selena. +6 -0
  Fixes bug #5588. vio_was_interrupted() function was added to detect
  read timeout properly on win32.

  vio/viosocket.c
    1.15.1.7 05/08/30 19:19:24 SergeyV@selena. +9 -0
    Added vio_was_interrupted function that returns true if operation was
    not completed due to timeout.

  vio/vio.c
    1.13.1.3 05/08/30 19:19:24 SergeyV@selena. +2 -0
    added initialization code for vio_was_interrupted() function.

  sql/net_serv.cc
    1.46.1.18 05/08/30 19:19:23 SergeyV@selena. +1 -1
    net->last_errno should be equal to ER_NET_READ_INTERRUPTED in case if read
    operation was not completed due to timeout.

  sql/mini_client.cc
    1.48.8.1 05/08/30 19:19:23 SergeyV@selena. +1 -1
    added a check that replication read was not completed due to timeout.

  include/violite.h
    1.21.3.7 05/08/30 19:19:23 SergeyV@selena. +4 -0
    Added vio_was_interrupted function that returns true if operation was
    not completed due to timeout.

  include/my_global.h
    1.34.1.39 05/08/30 19:19:23 SergeyV@selena. +3 -0
    Added win32 specific socket timeout error code.

ChangeSet
  1.1616.2223.1 05/08/30 17:22:19 SergeyV@selena. +3 -0
  Fixes bug #12517. Clear user variables and replication events before 
  closing temp tables in thread cleanup.

  sql/sql_class.cc
    1.105.1.96 05/08/30 17:22:11 SergeyV@selena. +2 -2
    Clear user variables and replication events before
    closing temp tables in thread cleanup.

  mysql-test/t/connect.test
    1.9.1.3 05/08/30 17:22:10 SergeyV@selena. +18 -0
    added test of bug #12517

  mysql-test/r/connect.result
    1.1.1.10 05/08/30 17:22:09 SergeyV@selena. +16 -0
    added results for test of bug #12517

ChangeSet
  1.1616.2222.1 05/08/30 16:19:53 evgen@moonbone.local +4 -0
  Fix bug #12537 UNION produces longtext instead of varchar
  
  Item::tmp_table_field_from_field_type() and create_tmp_field_from_item()
  was converting string field to blob depending on byte-wise length instead of
  character length, which results in converting valid varchar string with
  length == 86 to longtext.
  
  Made that functions above take into account max width of character when
  converting string fields to blobs.

  mysql-test/t/create.test
    1.48.1.9 05/08/30 16:19:23 evgen@moonbone.local +9 -0
    Test case for bug #12537 UNION produces longtext instead of varchar

  mysql-test/r/create.result
    1.75.1.9 05/08/30 16:19:10 evgen@moonbone.local +7 -0
    Test case for bug #12537 UNION produces longtext instead of varchar

  sql/sql_select.cc
    1.216.118.1 05/08/30 16:18:56 evgen@moonbone.local +2 -1
    Fix bug #12537 UNION produces longtext instead of varchar
     create_tmp_field_from_item()now taking into account max char width when creating tmp field for string fields.

  sql/item.cc
    1.58.72.1 05/08/30 16:18:37 evgen@moonbone.local +4 -2
    Fix bug #12537 UNION produces longtext instead of varchar
    Item::tmp_table_field_from_field_type() now taking into account max char width when creating tmp field for string fields.

ChangeSet
  1.1616.2221.1 05/08/30 17:11:59 bar@mysql.com +3 -0
  Bug#12363
  character_set_results is nullable, but value_ptr returns string "NULL"
  
  set_var.cc:
    Create Item_null instead of Item_string for NULL values
  
  variables.result, variables.test:
    adding test case

  mysql-test/r/variables.result
    1.21.4.1 05/08/30 17:11:16 bar@mysql.com +5 -0
    fixing tests accordingly

  mysql-test/t/variables.test
    1.18.6.1 05/08/30 17:11:07 bar@mysql.com +8 -0
    fixing tests accordingly

  sql/set_var.cc
    1.34.63.2 05/08/30 17:10:31 bar@mysql.com +10 -4
    Bug#12363
    character_set_results is nullable, but value_ptr returns string "NULL"
    Create Item_null instead of Item_string for NULL values

ChangeSet
  1.1616.2220.1 05/08/30 15:36:47 bar@mysql.com +3 -0
  Bug #12829
  Cannot convert the charset of a GROUP_CONCAT result:
  
  item_sum.cc:
    "result" character set was not set into proper value.
  
  func_gconcat.result, func_gconcat.test:
    Fixing tests accordingly.

  mysql-test/r/func_gconcat.result
    1.27.1.12 05/08/30 15:35:57 bar@mysql.com +9 -0
    Bug #12829

  mysql-test/t/func_gconcat.test
    1.23.1.8 05/08/30 15:35:52 bar@mysql.com +10 -0
    Bug #12829

ChangeSet
  1.1912.1.1 05/08/30 12:35:37 ingo@mysql.com +4 -0
  Merge mysql.com:/home/mydev/mysql-5.0
  into  mysql.com:/home/mydev/mysql-5.0-5000

  sql/sql_delete.cc
    1.160 05/08/30 12:35:32 ingo@mysql.com +1 -2
    After merge fix.

  sql/item_sum.cc
    1.89.1.54 05/08/30 15:35:05 bar@mysql.com +1 -0
    Bug #12829
    Cannot convert the charset of a GROUP_CONCAT result:
    "result" character set was not set into proper value.

  sql/sql_parse.cc
    1.472.1.7 05/08/30 12:25:03 ingo@mysql.com +0 -0
    Auto merged

  mysql-test/t/innodb.test
    1.103 05/08/30 12:25:02 ingo@mysql.com +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.130 05/08/30 12:25:02 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1913 05/08/30 14:15:05 sergefp@mysql.com +1 -0
  Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/psergey/mysql-5.0-bug12720

  sql/opt_range.cc
    1.185 05/08/30 14:15:03 sergefp@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1910 05/08/30 12:39:20 osku@127.(none) +6 -0
  Bug #11946: Review fixes.

  sql/sql_parse.cc
    1.472.2.1 05/08/30 12:39:17 osku@127.(none) +2 -1
    mysql_execute_command: Adapt to changes in mysql_delete.

  sql/sql_delete.cc
    1.159 05/08/30 12:39:17 osku@127.(none) +6 -5
    Add 'reset_auto_increment' parameter to mysql_delete, and use it instead
    of checking for SQLCOM_TRUNCATE.
    
    mysql_truncate: Adapt to changes in mysql_delete.

  sql/mysql_priv.h
    1.342.1.3 05/08/30 12:39:17 osku@127.(none) +3 -2
    Add 'reset_auto_increment' parameter to mysql_delete.

  sql/handler.h
    1.149 05/08/30 12:39:17 osku@127.(none) +7 -6
    Add 'value' parameter to reset_auto_increment.

  sql/ha_innodb.h
    1.102 05/08/30 12:39:17 osku@127.(none) +1 -1
    Add 'value' parameter to reset_auto_increment.

  sql/ha_innodb.cc
    1.249 05/08/30 12:39:17 osku@127.(none) +2 -2
    Add 'value' parameter to reset_auto_increment.

ChangeSet
  1.1616.2219.1 05/08/30 10:42:41 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
  into  neptunus.(none):/home/msvensson/mysql/bug12527/my41-bug12527

  sql/examples/ha_archive.cc
    1.13.5.1 05/08/30 10:42:37 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1892.16.2 05/08/30 10:40:50 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug12527/my41-bug12527
  into  neptunus.(none):/home/msvensson/mysql/bug12527/my50-bug12527

  sql/examples/ha_archive.cc
    1.47.1.1 05/08/30 10:40:44 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.2218.1 05/08/30 12:33:58 ramil@mysql.com +1 -0
  Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/usr/home/ram/work/4.1.b9613

  sql/set_var.cc
    1.34.52.30 05/08/30 12:33:52 ramil@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1892.25.2 05/08/30 08:58:41 jonas@eel.(none) +1 -0
  Merge eel.(none):/home/jonas/src/mysql-4.1
  into  eel.(none):/home/jonas/src/mysql-5.0

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.53 05/08/30 08:58:34 jonas@eel.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.2204.2 05/08/30 08:56:46 jonas@eel.(none) +1 -0
  bug#12862 - ndb compile error
   fix typo

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.26.2.12 05/08/30 08:56:43 jonas@eel.(none) +1 -1
    fix typo

ChangeSet
  1.1907.8.1 05/08/30 08:18:27 ingo@mysql.com +3 -0
  Merge mysql.com:/home/mydev/mysql-5.0
  into  mysql.com:/home/mydev/mysql-5.0-5000

  sql/sql_table.cc
    1.267.1.4 05/08/30 08:18:12 ingo@mysql.com +0 -0
    Auto merged

  mysql-test/t/alter_table.test
    1.39 05/08/30 08:18:12 ingo@mysql.com +0 -0
    Auto merged

  mysql-test/r/alter_table.result
    1.52 05/08/30 08:18:12 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.1.796 05/08/29 22:35:48 paul@snake-hub.snake.net +1 -0
  fulltext_var.result:
    Update test result.

  mysql-test/r/fulltext_var.result
    1.8.1.1 05/08/29 22:35:34 paul@snake-hub.snake.net +1 -1
    Update test result.

ChangeSet
  1.1616.2214.2 05/08/30 02:46:03 pgalbraith@mysql.com +1 -0
  ha_blackhole.cc:
    Found one more missing DBUG_ENTER. compile-pentium-debug-max does not enable blackhole on 4.1!

  sql/ha_blackhole.cc
    1.2.1.10 05/08/30 02:44:41 pgalbraith@mysql.com +1 -0
    Found one more missing DBUG_ENTER. compile-pentium-debug-max does not enable blackhole on 4.1!

ChangeSet
  1.1899.3.1 05/08/30 03:14:39 sergefp@mysql.com +3 -0
  Fix for BUG#12720: In QUICK_RANGE_SELECT::reset(), reset in_range so next get_next() call
  doesn't continue reading the last range.

  sql/opt_range.cc
    1.183.1.1 05/08/30 03:14:35 sergefp@mysql.com +1 -0
    Fix for BUG#12720: In QUICK_RANGE_SELECT::reset(), reset in_range so next get_next() call
    doesn't continue reading the last range.

  mysql-test/t/index_merge_innodb.test
    1.7 05/08/30 03:14:35 sergefp@mysql.com +73 -0
    Testcase for BUG#12720

  mysql-test/r/index_merge_innodb.result
    1.10 05/08/30 03:14:35 sergefp@mysql.com +69 -0
    Testcase for BUG#12720

ChangeSet
  1.1907.7.1 05/08/29 15:26:05 brian@zim.(none) +5 -0
  Update for delete_all_rows() which will be used for TRUNCATE and DELETE support.

  sql/examples/ha_archive.h
    1.26 05/08/29 15:26:01 brian@zim.(none) +1 -1
    Updated from merge, added new method for solving truncate problems.

  sql/examples/ha_archive.cc
    1.49 05/08/29 15:26:01 brian@zim.(none) +0 -0
    Update for tests

  mysql-test/r/archive.result
    1.10 05/08/29 15:26:01 brian@zim.(none) +28 -0
    Result sets

  sql/handler.h
    1.147.1.1 05/08/29 15:06:22 brian@zim.(none) +0 -0
    Auto merged

  mysql-test/t/archive.test
    1.11 05/08/29 15:06:22 brian@zim.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.2215.1 05/08/29 15:05:16 brian@zim.(none) +5 -0
  Added support for delete_all_rows() for archive. This fixes bug #12836. 

  sql/handler.h
    1.89.19.10 05/08/29 15:05:12 brian@zim.(none) +2 -0
    Added flags for fast delete support for archive and federated.

  sql/examples/ha_archive.h
    1.9.1.6 05/08/29 15:05:12 brian@zim.(none) +1 -0
    Added delete_all_rows() support. 

  sql/examples/ha_archive.cc
    1.13.1.14 05/08/29 15:05:12 brian@zim.(none) +11 -0
    Added delete_all_rows() support. 

  mysql-test/t/archive.test
    1.2.1.4 05/08/29 15:05:12 brian@zim.(none) +14 -1
    Add TRUNCATE and DELETE support. 

  mysql-test/r/archive.result
    1.2.1.2 05/08/29 15:05:12 brian@zim.(none) +3626 -0
    Update for test case to make sure that TRUNCATE and DELETE function(hah!) as designed.

ChangeSet
  1.1907.6.2 05/08/29 23:32:47 konstantin@mysql.com +1 -0
  Remove a no longer used header.

  server-tools/instance-manager/mysql_connection.cc
    1.11 05/08/29 23:32:43 konstantin@mysql.com +0 -1
    Remove a no longer used header.

ChangeSet
  1.1907.6.1 05/08/29 23:29:35 konstantin@mysql.com +19 -0
  Cleanup the instance manager code.

  server-tools/instance-manager/user_map.cc
    1.12 05/08/29 23:29:27 konstantin@mysql.com +1 -1
    - safety: newline can take 2 bytes.

  server-tools/instance-manager/thread_registry.h
    1.3 05/08/29 23:29:27 konstantin@mysql.com +4 -2
    - implement Thread_registry::cond_timedwait; remove
      unused out parameter from Thread_registry::cond_wait.

  server-tools/instance-manager/thread_registry.cc
    1.6 05/08/29 23:29:27 konstantin@mysql.com +24 -5
    - implement Thread_registry::cond_timedwait

  server-tools/instance-manager/portability.h
    1.5 05/08/29 23:29:27 konstantin@mysql.com +1 -1
    - fix coding style (// comments are allowed only at ends of lines)

  server-tools/instance-manager/parse_output.cc
    1.13 05/08/29 23:29:27 konstantin@mysql.com +11 -8
    - in parse_output_and_get_value return error also if the specified
      pattern was not found, or the command failed to execute.

  server-tools/instance-manager/parse.h
    1.6 05/08/29 23:29:27 konstantin@mysql.com +2 -3
    - get rid of Commands_factory

  server-tools/instance-manager/parse.cc
    1.9 05/08/29 23:29:27 konstantin@mysql.com +29 -36
    - get rid of Commands_factory

  server-tools/instance-manager/options.cc
    1.25 05/08/29 23:29:27 konstantin@mysql.com +2 -2
    - fix a possible crash when the instance manager is started with
    --no-defaults --defaults-file=~/.my.cnf: if we return
    without cloning saved_argv by calling load_defaults, Options::cleanup
    will crash on attempt to free_defaults(saved_argv);

  server-tools/instance-manager/mysql_connection.cc
    1.10 05/08/29 23:29:27 konstantin@mysql.com +1 -4
    - remove Commands_factory

  server-tools/instance-manager/manager.cc
    1.27 05/08/29 23:29:27 konstantin@mysql.com +10 -13
    - fix alignment; make some code easier to read.

  server-tools/instance-manager/instance_options.cc
    1.22 05/08/29 23:29:27 konstantin@mysql.com +28 -46
    - cleanup; no else after return (fix coding style).

  server-tools/instance-manager/instance_map.cc
    1.23 05/08/29 23:29:27 konstantin@mysql.com +8 -13
    - cleanup

  server-tools/instance-manager/instance.h
    1.14 05/08/29 23:29:27 konstantin@mysql.com +1 -1
    - move comment to the variable it comments

  server-tools/instance-manager/guardian.h
    1.10 05/08/29 23:29:26 konstantin@mysql.com +3 -3
    - fix coding style: enums must start with enum_

  server-tools/instance-manager/guardian.cc
    1.17 05/08/29 23:29:26 konstantin@mysql.com +11 -8
    - fix coding style and comments.
    - we must register the current thread in the thread registry
      before entering pthread_cond_timedwait, because at shutdown
      the thread registry will try to kick out of wait all blocked 
      threads. Unregistered threads are not awakened by the registry. 
      This fixes the failinig assert in Thread_registry::~Thread_registry
      at shutdown, when shutdown is requested and there is an
      instance monitored by Guardian.

  server-tools/instance-manager/commands.cc
    1.30 05/08/29 23:29:26 konstantin@mysql.com +21 -31
    - fix coding style: no else after return; fix comments, make
    one place a bit faster.

  server-tools/instance-manager/Makefile.am
    1.27 05/08/29 23:29:26 konstantin@mysql.com +0 -1
    - remove Commands_factory: it'll be needed when we add support
    for NNTP/HTTP connections, currently it only adds unnecessary
    complexity.

ChangeSet
  1.1616.2214.1 05/08/29 21:22:06 pgalbraith@mysql.com +1 -0
  ha_blackhole.cc:
    Added missing DBUG enter, compiled and tested on production with debug-max
    build (my regular build missed the previous errors friday)
  
  Changeset:
   Added missing DBUG_ENTER, compiled and tested on production with debug-max
   build!
  

  sql/ha_blackhole.cc
    1.2.1.9 05/08/29 21:19:21 pgalbraith@mysql.com +1 -0
    Added missing DBUG enter, compiled and tested on production with debug-max build (my regular build missed the previous errors friday)
    C

  BitKeeper/deleted/.del-factory.cc~6836cccd4cd35b4d
    1.5 05/08/29 23:15:18 konstantin@mysql.com +0 -0
    Delete: server-tools/instance-manager/factory.cc

  BitKeeper/deleted/.del-factory.h~c1679505d3a6dd53
    1.3 05/08/29 23:15:17 konstantin@mysql.com +0 -0
    Delete: server-tools/instance-manager/factory.h

ChangeSet
  1.1907.3.2 05/08/29 21:11:05 ingo@mysql.com +1 -0
  Merge mysql.com:/home/mydev/mysql-5.0
  into  mysql.com:/home/mydev/mysql-5.0-5000

  sql/sql_yacc.yy
    1.415 05/08/29 21:10:49 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1902.2.4 05/08/29 21:06:45 ingo@mysql.com +3 -0
  After merge fix.

  mysql-test/t/key.test
    1.24 05/08/29 21:06:39 ingo@mysql.com +3 -0
    After merge fix.

  mysql-test/r/key.result
    1.28 05/08/29 21:06:39 ingo@mysql.com +1 -0
    After merge fix.

  mysql-test/r/innodb.result
    1.126.1.4 05/08/29 21:06:39 ingo@mysql.com +1 -1
    After merge fix.
    Test for bug 11816 has four more inserts.

ChangeSet
  1.1907.5.1 05/08/29 21:00:43 andrey@lmy004. +3 -0
  fix for bug 12207 (alter table discard tablespace on MyISAM table
  causes ERROR 2013).
  (all-in-one approved patch)

  sql/sql_table.cc
    1.267.2.1 05/08/29 21:00:37 andrey@lmy004. +3 -3
    send all error message to table->file->print_error() thus not missing
    handing of some (like engine not supported).
    
    fix for bug #12207 (alter table discard tablespace on MyISAM table
    causes ERROR 2013)

  mysql-test/t/alter_table.test
    1.37.1.1 05/08/29 21:00:37 andrey@lmy004. +8 -0
    test for bug #12207 (alter table discard tablescpae on MyISAM table
    causes ERROR 2013)

  mysql-test/r/alter_table.result
    1.50.1.1 05/08/29 21:00:37 andrey@lmy004. +4 -0
    result for test for bug #12207
    (alter table discard database works on mysiam and causes error 2013)

ChangeSet
  1.1907.4.1 05/08/29 22:28:42 anozdrin@mysql.com +4 -0
  Implement WL#2789 "Instance Manager: test using mysql-test-run testing framework"

  mysql-test/mysql-test-run.pl
    1.37 05/08/29 22:28:33 anozdrin@mysql.com +308 -33
    Added support for the Instance Manager tests.

  mysql-test/lib/mtr_process.pl
    1.17 05/08/29 22:28:33 anozdrin@mysql.com +56 -23
    Minor changes:
      - open log files for append, not for overwrite. Append mode is very
        useful for debugging of several tests;
      - extract the code for killing processes into a separate function:
        mtr_kill_processes(). The function is used to stop IM-related processes.

  mysql-test/lib/mtr_cases.pl
    1.10 05/08/29 22:28:33 anozdrin@mysql.com +108 -10
    Make collect_one_test_case() aware of the Instance Manager tests.

  mysql-test/Makefile.am
    1.61 05/08/29 22:28:33 anozdrin@mysql.com +2 -0
    Make installation procedure aware of the Instance Manager tests.

ChangeSet
  1.1907.3.1 05/08/29 22:17:13 bar@mysql.com +4 -0
  Merge mysql.com:/usr/home/bar/mysql-4.1
  into  mysql.com:/usr/home/bar/mysql-5.0

  sql/item.h
    1.166 05/08/29 22:16:51 bar@mysql.com +0 -1
    don't merge bug#12371 fix into 5.0.
    It's correct only for 4.1.

  sql/item.cc
    1.167 05/08/29 22:15:57 bar@mysql.com +0 -26

  mysql-test/t/ctype_utf8.test
    1.66 05/08/29 22:15:47 bar@mysql.com +0 -14

  mysql-test/r/ctype_utf8.result
    1.70 05/08/29 22:15:37 bar@mysql.com +0 -12

ChangeSet
  1.1346.1.795 05/08/29 12:08:04 paul@kite-hub.kitebird.com +1 -0
  set_var.cc:
    Reorder out-of-order system variables.

  sql/set_var.cc
    1.12.1.52 05/08/29 12:07:16 paul@kite-hub.kitebird.com +2 -2
    Reorder out-of-order system variables.

ChangeSet
  1.1907.2.1 05/08/29 10:02:23 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-5.0-11523
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  client/mysql.cc
    1.178 05/08/29 10:02:19 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1902.2.3 05/08/29 18:41:39 ingo@mysql.com +1 -0
  After merge fix.

  sql/sql_parse.cc
    1.472.1.6 05/08/29 18:41:33 ingo@mysql.com +1 -1
    After merge fix.

ChangeSet
  1.1616.2213.1 05/08/29 18:23:53 tomas@poseidon.ndb.mysql.com +3 -0
  updated ndb redo file reader with schemaversion in commit rcord instead of prepare record

  ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp
    1.5 05/08/29 18:23:50 tomas@poseidon.ndb.mysql.com +11 -0
    updated ndb redo file reader with schemaversion in commit rcord instead of prepare record

  ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
    1.2 05/08/29 18:23:50 tomas@poseidon.ndb.mysql.com +2 -2
    updated ndb redo file reader with schemaversion in commit rcord instead of prepare record

  ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp
    1.2 05/08/29 18:23:50 tomas@poseidon.ndb.mysql.com +2 -2
    updated ndb redo file reader with schemaversion in commit rcord instead of prepare record

ChangeSet
  1.1902.2.2 05/08/29 18:18:30 ingo@mysql.com +12 -0
  Merge mysql.com:/home/mydev/mysql-4.1-4100
  into  mysql.com:/home/mydev/mysql-5.0-5000

  sql/sql_parse.cc
    1.472.1.5 05/08/29 18:18:25 ingo@mysql.com +1 -2
    Hand merged.

  sql/sql_delete.cc
    1.156.2.3 05/08/29 18:18:25 ingo@mysql.com +4 -3
    Hand merged.

  mysql-test/t/myisam.test
    1.48 05/08/29 18:18:25 ingo@mysql.com +1 -1
    Hand merged.

  mysql-test/t/key.test
    1.23 05/08/29 18:18:25 ingo@mysql.com +0 -2
    Hand merged.

  mysql-test/r/myisam.result
    1.65 05/08/29 18:18:25 ingo@mysql.com +0 -0
    Hand merged.

  mysql-test/r/key.result
    1.27 05/08/29 18:18:24 ingo@mysql.com +0 -0
    Hand merged.

  mysql-test/r/innodb.result
    1.126.1.3 05/08/29 18:18:24 ingo@mysql.com +0 -0
    Hand merged.

  sql/sql_table.cc
    1.267.1.3 05/08/29 17:38:31 ingo@mysql.com +0 -0
    Auto merged

  mysql-test/t/innodb.test
    1.99.1.3 05/08/29 17:38:30 ingo@mysql.com +0 -0
    Auto merged

  mysql-test/t/alter_table.test
    1.38 05/08/29 17:38:30 ingo@mysql.com +0 -0
    Auto merged

  mysql-test/r/alter_table.result
    1.51 05/08/29 17:38:30 ingo@mysql.com +0 -0
    Auto merged

  myisam/mi_search.c
    1.56 05/08/29 17:38:30 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1902.2.1 05/08/29 17:24:07 ingo@mysql.com +3 -0
  Bug#10056 - PACK_KEYS option take values greater than 1 while creating table
  Added a switch to reject illegal values for PACK_KEYS.

  sql/sql_yacc.yy
    1.413.1.1 05/08/29 17:24:00 ingo@mysql.com +21 -2
    Bug#10056 - PACK_KEYS option take values greater than 1 while creating table
    Added a switch to reject illegal values for PACK_KEYS.

  mysql-test/t/myisam.test
    1.47 05/08/29 17:24:00 ingo@mysql.com +10 -0
    Bug#10056 - PACK_KEYS option take values greater than 1 while creating table
    The test case.

  mysql-test/r/myisam.result
    1.64 05/08/29 17:23:59 ingo@mysql.com +6 -0
    Bug#10056 - PACK_KEYS option take values greater than 1 while creating table
    The test result.

ChangeSet
  1.1616.2212.4 05/08/29 17:08:41 ingo@mysql.com +3 -0
  Bug#12296 - CHECKSUM TABLE reports 0 for the table
  Skipping deleted records instead of breaking the loop
  during checksum calculation.

  sql/sql_table.cc
    1.157.2.143 05/08/29 17:08:36 ingo@mysql.com +8 -1
    Bug#12296 - CHECKSUM TABLE reports 0 for the table
    Skipping deleted records instead of breaking the loop
    during checksum calculation.

  mysql-test/t/myisam.test
    1.33.1.7 05/08/29 17:08:36 ingo@mysql.com +15 -0
    Bug#12296 - CHECKSUM TABLE reports 0 for the table
    The test case.

  mysql-test/r/myisam.result
    1.45.1.6 05/08/29 17:08:36 ingo@mysql.com +14 -0
    Bug#12296 - CHECKSUM TABLE reports 0 for the table
    The test result.

ChangeSet
  1.1616.2212.3 05/08/29 17:01:46 ingo@mysql.com +3 -0
  Bug#11816 - Truncate table doesn't work with temporary innodb tables
  Handle temporary tables like permanent tables: If the storage engine
  cannot truncate, delete instead.

  sql/sql_delete.cc
    1.99.2.36 05/08/29 17:01:42 ingo@mysql.com +16 -13
    Bug#11816 - Truncate table doesn't work with temporary innodb tables
    Handle temporary tables like permanent tables: If the storage engine
    cannot truncate, delete instead.
    Replaced a numeric literal by its symbolic name.

  mysql-test/t/innodb.test
    1.62.1.10 05/08/29 17:01:42 ingo@mysql.com +18 -0
    Bug#11816 - Truncate table doesn't work with temporary innodb tables
    The test case.

  mysql-test/r/innodb.result
    1.75.4.9 05/08/29 17:01:42 ingo@mysql.com +16 -0
    Bug#11816 - Truncate table doesn't work with temporary innodb tables
    The test result.

ChangeSet
  1.1616.2212.2 05/08/29 16:54:33 ingo@mysql.com +3 -0
  Bug#11493 - Alter table rename to default database does not work without db name qualifying
  Supplied the default database name for ALTER TABLE ... RENAME 
  for the new table instead of the old tables db like we do for 
  other ALTERs.

  sql/sql_parse.cc
    1.271.1.190 05/08/29 16:54:29 ingo@mysql.com +18 -1
    Bug#11493 - Alter table rename to default database does not work without db name qualifying
    Supplied the default database name for ALTER TABLE ... RENAME 
    for the new table instead of the old tables db like we do for 
    other ALTERs.

  mysql-test/t/alter_table.test
    1.29.1.10 05/08/29 16:54:29 ingo@mysql.com +31 -0
    Bug#11493 - Alter table rename to default database does not work without db name qualifying
    The test case.

  mysql-test/r/alter_table.result
    1.40.1.9 05/08/29 16:54:29 ingo@mysql.com +15 -0
    Bug#11493 - Alter table rename to default database does not work without db name qualifying
    The test result.

ChangeSet
  1.1616.2212.1 05/08/29 16:50:09 ingo@mysql.com +3 -0
  Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE on large MyISAM table
  Changed end-space comparison so that the key is not used past
  its end. This is due to the new end-space behaviour in 4.1.
  See also bug 6151 and 9188.

  mysql-test/t/key.test
    1.14.1.8 05/08/29 16:50:06 ingo@mysql.com +16 -0
    Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE on large MyISAM table
    The test case.

  mysql-test/r/key.result
    1.18.1.7 05/08/29 16:50:06 ingo@mysql.com +16 -0
    Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE on large MyISAM table
    The test result.

  myisam/mi_search.c
    1.49.1.2 05/08/29 16:50:05 ingo@mysql.com +23 -9
    Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE on large MyISAM table
    Changed end-space comparison so that the key is not used past
    its end. This is due to the new end-space behaviour in 4.1.
    See also bug 6151 and 9188.

ChangeSet
  1.1902.1.8 05/08/29 17:13:42 timour@mysql.com +3 -0
  Fix for BUG#12672.

  sql/opt_range.cc
    1.184 05/08/29 17:13:37 timour@mysql.com +40 -0
    Some storage managers like InnoDB always retrieve the value of
    the primary key (if any) with any other key. For such storage
    managers the optimizer marks an index as covering if that index
    and the primary key contain all query fields. This is good for
    reading data from an index, but not for lookup. The patch detects
    such cases and tests whether an index is really a covering index
    by itself, without the primary key. If yes, then that index can
    be used for the index skip algorithm of the GROUP_MIN_MAX
    access method.

  mysql-test/t/group_min_max.test
    1.13 05/08/29 17:13:37 timour@mysql.com +19 -0
    Test for BUG#12672.

  mysql-test/r/group_min_max.result
    1.15 05/08/29 17:13:37 timour@mysql.com +20 -0
    Test for BUG#12672.

ChangeSet
  1.1907.1.2 05/08/29 15:45:03 andrey@lmy004. +3 -0
  fix for bug #12841
  (Server crash on DO IFNULL(NULL,NULL)
  (fixes also "SELECT CAST(IFNULL(NULL,NULL) as DECIMAL)" unreported
   crash)
  (new revampled fix with suggestions from Igor)

  sql/item_func.cc
    1.246 05/08/29 15:44:57 andrey@lmy004. +9 -4
    don't use the return value of ::str_op() without checking it
    whether checking it for NULL. (fixes bug #12841 as well as
    another not reported bug, but existing one - test case added).
    All other places where ::str_op() is used are safe.

  mysql-test/t/select.test
    1.73 05/08/29 15:44:57 andrey@lmy004. +9 -0
    test for bug #12841
    (Server crash on DO IFNULL(NULL,NULL)

  mysql-test/r/select.result
    1.88 05/08/29 15:44:57 andrey@lmy004. +10 -0
    result of test for bug 12841

ChangeSet
  1.1616.2211.1 05/08/29 14:04:15 msvensson@neptunus.(none) +1 -0
  Bug #12527  	yassl causes errors in "repair" and "optimize"
   - Use constant directly to check that enough number of bytes have been written as header of the archive.

  sql/examples/ha_archive.cc
    1.13.4.1 05/08/29 14:04:09 msvensson@neptunus.(none) +1 -1
    Don't take "sizeof" the constant DATA_BUFFER_SIZE. Simply use DATA_BUFFER_SIZE as is.

ChangeSet
  1.1616.2210.3 05/08/29 16:49:01 bar@mysql.com +3 -0
  ctype_utf8.result, ctype_utf8.test, item.cc:
    Bug#12371 executing prepared statement fails (illegal mix of collations)
    After review fixes.

  mysql-test/r/ctype_utf8.result
    1.45.1.18 05/08/29 16:48:25 bar@mysql.com +3 -0
    Bug#12371 executing prepared statement fails (illegal mix of collations)
    After review fixes.

  mysql-test/t/ctype_utf8.test
    1.57.1.8 05/08/29 16:48:16 bar@mysql.com +2 -0
    Bug#12371 executing prepared statement fails (illegal mix of collations)
    After review fixes.

  sql/item.cc
    1.58.1.161 05/08/29 16:47:50 bar@mysql.com +7 -1
    Bug#12371 executing prepared statement fails (illegal mix of collations)
    After review fixes.

ChangeSet
  1.1616.2210.2 05/08/29 15:44:49 bar@mysql.com +2 -0
  Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/usr/home/bar/mysql-4.1.b12371

  sql/item.h
    1.56.1.134 05/08/29 15:44:43 bar@mysql.com +0 -0
    Auto merged

  sql/item.cc
    1.58.1.160 05/08/29 15:44:43 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1907.1.1 05/08/29 12:20:36 andrey@lmy004. +1 -0
  Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
  into lmy004.:/work/mysql-5.0-ready4

  sql/sql_yacc.yy
    1.414 05/08/29 12:20:33 andrey@lmy004. +0 -0
    Auto merged

ChangeSet
  1.1892.37.1 05/08/29 12:19:08 andrey@lmy004. +3 -0
  fix for bug #12490 (all-in-one patch)
  (Packets out of order if calling HELP CONTENTS from Stored Procedure)

  sql/sql_yacc.yy
    1.410.6.1 05/08/29 12:19:02 andrey@lmy004. +10 -2
    disable HELP in SP
    (fixes bug 12490)

  mysql-test/t/sp-error.test
    1.83 05/08/29 12:19:02 andrey@lmy004. +13 -0
    test for bug 12490
    (Packets out of order if calling HELP CONTENTS from Stored Procedure)

  mysql-test/r/sp-error.result
    1.79 05/08/29 12:19:02 andrey@lmy004. +8 -0
    results of test of bug 12490

ChangeSet
  1.1908 05/08/29 09:06:43 osku@127.(none) +2 -0
  Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  127.(none):/home/osku/mysql-5.0

  sql/sql_delete.cc
    1.158 05/08/29 09:06:38 osku@127.(none) +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.248 05/08/29 09:06:38 osku@127.(none) +0 -0
    Auto merged

ChangeSet
  1.1907 05/08/28 20:21:47 kent@mysql.com +1 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
  into mysql.com:/Users/kent/mysql/bk/mysql-5.0

  Makefile.am
    1.75 05/08/28 20:21:40 kent@mysql.com +15 -16

ChangeSet
  1.1616.2210.1 05/08/28 20:03:03 kent@mysql.com +1 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
  into mysql.com:/Users/kent/mysql/bk/mysql-4.1

  Makefile.am
    1.60.2.1 05/08/28 20:03:01 kent@mysql.com +10 -3

ChangeSet
  1.1346.847.1 05/08/28 19:46:56 kent@mysql.com +1 -0
  Makefile.am:
    Make ports configurable from environment for test

  Makefile.am
    1.40.1.13 05/08/28 19:46:41 kent@mysql.com +10 -3
    Make ports configurable from environment for test

ChangeSet
  1.1904.1.1 05/08/28 20:25:53 sergefp@mysql.com +1 -0
  Fix for valgrind warning: Check for thd->binlog_evt_union.unioned_events only if
  we were doing binlog union (i.e. need_binlog_call==TRUE) 

  sql/sp_head.cc
    1.176 05/08/28 20:25:49 sergefp@mysql.com +1 -1
    Fix for valgrind warning: Check for thd->binlog_evt_union.unioned_events only if
    we were doing binlog union (i.e. need_binlog_call==TRUE) 

ChangeSet
  1.1905 05/08/28 11:38:18 jani@a193-229-222-105.elisa-laajakaista.fi +2 -0
  Applied a couple of Netware related patches.

  netware/mysqladmin.def
    1.7 05/08/28 11:38:09 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size to avoid stack overflow in mysqladmin.NLM

  netware/mysql_test_run.c
    1.14 05/08/28 11:38:09 jani@a193-229-222-105.elisa-laajakaista.fi +2 -1
    - Added missing cast to resolve compilation issues.
    
    - run_test() in mysql_test_run.c needs to check the correct
      error value returned by abort_not_supported_test(). This
      resolves the problem with skipped test cases on NetWare,
      which are supposed to be marked 'skip' instead of 'bad'.

ChangeSet
  1.1346.1.793 05/08/27 22:00:22 paul@frost.snake.net +1 -0
  Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
  into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0

  sql/mysqld.cc
    1.297.52.5 05/08/27 22:00:19 paul@frost.snake.net +0 -0
    Auto merged

ChangeSet
  1.1616.2143.37 05/08/27 21:52:26 paul@frost.snake.net +2 -0
  Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1

  sql/set_var.cc
    1.34.63.1 05/08/27 21:52:10 paul@frost.snake.net +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.98.2 05/08/27 21:52:09 paul@frost.snake.net +0 -0
    Auto merged

ChangeSet
  1.1346.846.2 05/08/27 21:04:58 paul@frost.snake.net +1 -0
  mysqld.cc:
    Reorder out-of-order status variables.

  sql/mysqld.cc
    1.297.53.1 05/08/27 21:02:20 paul@frost.snake.net +26 -26
    Reorder out-of-order status variables.

ChangeSet
  1.1346.846.1 05/08/27 21:02:05 paul@frost.snake.net +1 -0
  set_var.cc:
    Reorder out-of-order system variables.

  sql/set_var.cc
    1.12.1.51 05/08/27 21:01:33 paul@frost.snake.net +15 -15
    Reorder out-of-order system variables.

ChangeSet
  1.1616.2209.2 05/08/27 19:20:10 paul@frost.snake.net +1 -0
  set_var.cc:
    Reorder out-of-order system variables.

  sql/set_var.cc
    1.34.62.1 05/08/27 19:19:43 paul@frost.snake.net +4 -2
    Reorder out-of-order system variables.

ChangeSet
  1.1616.2209.1 05/08/27 19:18:53 paul@frost.snake.net +1 -0
  mysqld.cc:
    Reorder out-of-order status variables.

  sql/mysqld.cc
    1.356.99.1 05/08/27 19:17:57 paul@frost.snake.net +4 -4
    Reorder out-of-order status variables.

ChangeSet
  1.1902.1.7 05/08/27 20:06:35 hf@deer.(none) +2 -0
  gis.test corrected with Pem's wishes

  mysql-test/t/gis.test
    1.22 05/08/27 20:05:19 hf@deer.(none) +3 -0
    test corrected

  mysql-test/r/gis.result
    1.25 05/08/27 20:05:19 hf@deer.(none) +2 -1
    result fixed

ChangeSet
  1.1902.1.6 05/08/27 18:53:54 hf@deer.(none) +1 -0
  Merge deer.(none):/home/hf/work/mysql-5.0.11207
  into deer.(none):/home/hf/work/mysql-5.0.clean

  sql/sql_yacc.yy
    1.413 05/08/27 18:53:47 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.1886.53.2 05/08/27 18:51:11 hf@deer.(none) +1 -0
  Addition to the fix for #11207 (SET GLOBAL TRANSACTION ISOLATION LEVEL)

  sql/sql_yacc.yy
    1.412 05/08/27 18:51:06 hf@deer.(none) +13 -10
    exact types specified for opt_var_type and similar

ChangeSet
  1.1902.1.5 05/08/27 18:13:26 hf@deer.(none) +3 -0
  Merge deer.(none):/home/hf/work/mysql-5.0.10499
  into deer.(none):/home/hf/work/mysql-5.0.clean

  sql/sql_yacc.yy
    1.410.1.10 05/08/27 18:13:19 hf@deer.(none) +0 -0
    Auto merged

  sql/sp_head.h
    1.66 05/08/27 18:13:19 hf@deer.(none) +0 -0
    Auto merged

  sql/sp_head.cc
    1.175 05/08/27 18:13:18 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.1902.1.4 05/08/27 18:10:46 hf@deer.(none) +3 -0
  Merge deer.(none):/home/hf/work/mysql-4.1.clean
  into deer.(none):/home/hf/work/mysql-5.0.clean

  mysql-test/t/gis-rtree.test
    1.13 05/08/27 18:10:39 hf@deer.(none) +0 -0
    Auto merged

  mysql-test/r/gis-rtree.result
    1.14 05/08/27 18:10:39 hf@deer.(none) +0 -0
    Auto merged

  myisam/mi_check.c
    1.134 05/08/27 18:10:39 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.1902.1.3 05/08/27 12:29:36 andrey@lmy004. +4 -0
  retest the fix for bug #10362 (SHOW PROCEDURE always qualifies name with database)
  (already approved)

  sql/sp.cc
    1.91 05/08/27 12:29:30 andrey@lmy004. +0 -2
    don qualify the name

  mysql-test/r/sql_mode.result
    1.25 05/08/27 12:29:29 andrey@lmy004. +4 -4
    update test results

  mysql-test/r/sp.result
    1.148 05/08/27 12:29:29 andrey@lmy004. +10 -10
    update test results

  mysql-test/r/information_schema.result
    1.78 05/08/27 12:29:29 andrey@lmy004. +2 -2
    update test results

ChangeSet
  1.1902.1.2 05/08/27 09:09:54 andrey@lmy004. +2 -0
  Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
  into lmy004.:/work/mysql-5.0-bug11904

  tests/mysql_client_test.c
    1.156 05/08/27 09:09:51 andrey@lmy004. +0 -0
    Auto merged

  sql/sql_select.cc
    1.362 05/08/27 09:09:51 andrey@lmy004. +0 -0
    Auto merged

ChangeSet
  1.1899.2.1 05/08/27 07:26:14 acurtis@xiphis.org +3 -0
  Bug#9048
    "Creating a function with char binary IN parameter fails"
    Parse BINARY as part of type declaration, not as 
    a column attribute.

  sql/sql_yacc.yy
    1.410.1.9 05/08/27 07:25:47 acurtis@xiphis.org +23 -5
    fix bug 9048
    parse BINARY as part of type declaration and not as column modifier.

  mysql-test/t/sp.test
    1.142 05/08/27 07:25:47 acurtis@xiphis.org +13 -0
    test for bug 9048

  mysql-test/r/sp.result
    1.147 05/08/27 07:25:47 acurtis@xiphis.org +7 -0
    test for bug 9048

ChangeSet
  1.1903 05/08/26 22:25:45 igor@rurik.mysql.com +6 -0
  func_str.result, null.result:
    Corrected results after the fix for bug #12791.
  func_test.result, func_test.test:
    Added test cases for bug #12791.
  item_func.h, item_func.cc:
    Fixed bug #12791.
    Made LEAST/GREATES fully Oracle compliant.
    LEAST/GREATEST did not return NULL if only some
    arguments were NULLs. This did not comply with Oracle.

  mysql-test/r/func_str.result
    1.106 05/08/26 22:25:00 igor@rurik.mysql.com +1 -1
    Corrected results after the fix for bug #12791.

  mysql-test/r/null.result
    1.33 05/08/26 22:23:33 igor@rurik.mysql.com +4 -4
    Corrected results after the fix for bug #12791.

  mysql-test/r/func_test.result
    1.29 05/08/26 22:23:08 igor@rurik.mysql.com +12 -1
    Added test cases for bug #12791.

  mysql-test/t/func_test.test
    1.25 05/08/26 22:22:30 igor@rurik.mysql.com +9 -0
    Added test cases for bug #12791.

  sql/item_func.h
    1.128 05/08/26 21:34:19 igor@rurik.mysql.com +0 -1
    Fixed bug #12791.
    Made LEAST/GREATES fully Oracle compliant.
    LEAST/GREATEST did not return NULL if only some
    arguments were NULLs. This did not comply with Oracle.

  sql/item_func.cc
    1.245 05/08/26 21:29:32 igor@rurik.mysql.com +23 -25
    Fixed bug #12791.
    Made LEAST/GREATES fully Oracle compliant.
    LEAST/GREATEST did not return NULL if only some
    arguments were NULLs. This did not comply with Oracle.

ChangeSet
  1.1892.32.11 05/08/27 01:50:38 kent@mysql.com +1 -0
  unireg.h:
    Max index key length increased from 1024 to 3072
    for 64 bit builds.

  sql/unireg.h
    1.40 05/08/27 01:48:58 kent@mysql.com +5 -1
    Max index key length increased from 1024 to 3072
    for 64 bit builds.

