ChangeSet
  1.2484 05/10/10 00:21:10 kent@mysql.com +1 -0
  Makefile.am:
    Copy "disabled.def"

  mysql-test/Makefile.am
    1.49 05/10/10 00:19:52 kent@mysql.com +6 -1
    Copy "disabled.def"

ChangeSet
  1.2483 05/10/09 01:32:09 kent@mysql.com +1 -0
  func_group.test:
    Test requires innodb

  mysql-test/t/func_group.test
    1.32 05/10/09 01:30:23 kent@mysql.com +2 -0
    Test requires innodb

ChangeSet
  1.2482 05/10/07 20:14:34 ramil@mysql.com +2 -0
  Populate t1 in order to get more predictable explain results.

  mysql-test/t/subselect2.test
    1.5 05/10/07 20:13:58 ramil@mysql.com +2 -0
    Populate t1 in order to get more predictable explain results.

  mysql-test/r/subselect2.result
    1.8 05/10/07 20:13:58 ramil@mysql.com +1 -0
    Populate t1 in order to get more predictable explain results.

ChangeSet
  1.2481 05/10/07 16:37:53 joerg@mysql.com +1 -0
  Copy zlib.a and valgrind.supp if exists.
  Copy disabled.def
  (Backport of Kent's change from the main tree to the 4.1.15 build clone.
  Original changeset:  2005/10/07 13:08:07+02:00 kent@mysql.com )

  scripts/make_binary_distribution.sh
    1.84 05/10/07 16:37:47 joerg@mysql.com +4 -1
    Copy zlib.a and valgrind.supp if exists.
    Copy disabled.def
    (Backport of Kent's change from the main tree to the 4.1.15 build clone.)

ChangeSet
  1.2480 05/10/07 04:02:53 monty@mysql.com +0 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/home/my/mysql-4.1

ChangeSet
  1.2468.1.1 05/10/07 03:12:15 monty@mysql.com +5 -0
  Review of new code since last pull
  - Use %lx instead of %p as %p is not portable
  - Don't replace ROW item with Item_null

  sql/item.cc
    1.223 05/10/07 03:12:13 monty@mysql.com +11 -22
    We can't replace a ROW item with Item_null because:
    - Arg_comparator is still using the orignal row items and it's not good to have args[0] different from what is actually compared
    - If we are using the <=> comparator, NULL can still be compared as true
    - We would break things if we would ever use resolve_const_item() for operators like >, < etc.

  mysql-test/t/select.test
    1.48 05/10/07 03:12:13 monty@mysql.com +4 -0
    More test for ROW comparison

  mysql-test/r/select.result
    1.64 05/10/07 03:12:13 monty@mysql.com +7 -0
    More test for ROW comparison

  myisam/mi_search.c
    1.53 05/10/07 03:12:13 monty@mysql.com +25 -20
    Use %lx instead of %p as %p is not portable

  myisam/mi_rkey.c
    1.18 05/10/07 03:12:13 monty@mysql.com +2 -2
    Use %lx instead of %p as %p is not portable

ChangeSet
  1.2479 05/10/07 01:56:11 kent@mysql.com +2 -0
  make_binary_distribution.sh:
    Corrected platform name output
  Services.cpp:
    Dont print null address (back port from 5.0)

  scripts/make_binary_distribution.sh
    1.83 05/10/07 01:55:07 kent@mysql.com +2 -2
    Corrected platform name output

  ndb/src/mgmsrv/Services.cpp
    1.39 05/10/07 01:37:57 kent@mysql.com +1 -1
    Dont print null address (back port from 5.0)

ChangeSet
  1.2478 05/10/06 22:57:13 kent@mysql.com +1 -0
  make_binary_distribution.sh:
    Reintroduced --machine
    Better sh compatibility, "for i ; do" is not portable

  scripts/make_binary_distribution.sh
    1.82 05/10/06 22:50:46 kent@mysql.com +20 -11
    Reintroduced --machine
    Better sh compatibility, "for i ; do" is not portable

ChangeSet
  1.2476 05/10/06 18:00:23 kent@mysql.com +1 -0
  make_binary_distribution.sh:
    Replaced --machine with --platform
    General code cleanup

  scripts/make_binary_distribution.sh
    1.81 05/10/06 17:58:02 kent@mysql.com +102 -118
    Replaced --machine with --platform
    General code cleanup

ChangeSet
  1.2473.1.1 05/10/06 19:51:08 gluh@eagle.intranet.mysql.r18.ru +2 -0
  Fix for bug#13605 'rpl_openssl' test hangs

  mysql-test/t/rpl_openssl.test
    1.6 05/10/06 19:50:26 gluh@mysql.com +1 -1
    Fix for bug#13605 'rpl_openssl' test hangs

  mysql-test/r/rpl_openssl.result
    1.8 05/10/06 19:50:26 gluh@mysql.com +3 -3
    Fix for bug#13605 'rpl_openssl' test hangs

ChangeSet
  1.2474 05/10/06 15:42:50 kent@mysql.com +1 -0
  Merge

  client/mysql.cc
    1.214 05/10/06 15:42:45 kent@mysql.com +0 -1

ChangeSet
  1.2473 05/10/06 15:26:59 bar@mysql.com +1 -0
  item_cmpfunc.cc:
    Wrong variable.

  sql/item_cmpfunc.cc
    1.202 05/10/06 15:25:59 bar@mysql.com +1 -1
    Wrong variable.

ChangeSet
  1.2472 05/10/06 09:44:25 pekka@mysql.com +3 -0
  ndb - prelim perl scripts to autotest

  BitKeeper/deleted/.del-ndb_range_bounds.pl~ff7e47a35fb44c74
    1.4 05/10/06 09:42:45 pekka@mysql.com +0 -0
    Delete: mysql-test/ndb/ndb_range_bounds.pl

  ndb/test/sql/test_range_bounds.pl
    1.1 05/10/06 09:42:23 pekka@mysql.com +218 -0

  ndb/test/sql/test_range_bounds.pl
    1.0 05/10/06 09:42:23 pekka@mysql.com +0 -0
    BitKeeper file /space/pekka/ndb/version/my41/ndb/test/sql/test_range_bounds.pl

  ndb/test/sql/test_create_drop.pl
    1.1 05/10/06 09:42:22 pekka@mysql.com +179 -0

  ndb/test/sql/test_create_drop.pl
    1.0 05/10/06 09:42:22 pekka@mysql.com +0 -0
    BitKeeper file /space/pekka/ndb/version/my41/ndb/test/sql/test_create_drop.pl

ChangeSet
  1.2469.1.1 05/10/05 14:35:41 msvensson@neptunus.(none) +1 -0
  Revert 

  BUILD/SETUP.sh
    1.37 05/10/05 14:35:36 msvensson@neptunus.(none) +1 -1
    Remov -ansi flag

ChangeSet
  1.2470 05/10/05 17:33:39 bar@mysql.com +1 -0
  item_cmpfunc.cc:
    wrong variable.

  sql/item_cmpfunc.cc
    1.201 05/10/05 17:33:20 bar@mysql.com +1 -1
    wrong variable.

ChangeSet
  1.2468 05/10/04 10:54:58 georg@lmy002.wdf.sap.corp +1 -0
  Windows compilation fix: Added typecast (const char* to char *)

  client/mysql.cc
    1.212.1.1 05/10/04 10:54:09 georg@lmy002.wdf.sap.corp +1 -1
    Windows compilation fix: Added typecast (const char* to char *)

ChangeSet
  1.2465.1.1 05/10/03 17:54:39 marko@hundin.mysql.fi +1 -0
  Merge hundin.mysql.fi:/home/marko/mysql-4.0
  into  hundin.mysql.fi:/home/marko/mysql-4.1
  (Bug #13002)

  sql/ha_innodb.cc
    1.211 05/10/03 17:54:30 marko@hundin.mysql.fi +0 -1
    Merged

ChangeSet
  1.1346.1.813 05/10/03 17:46:27 marko@hundin.mysql.fi +1 -0
  InnoDB: Display an error message in /* */ comments
  in SHOW CREATE TABLE if a temporary file cannot be created.
  (Bug #13002)

  sql/ha_innodb.cc
    1.73.1.163 05/10/03 17:46:12 marko@hundin.mysql.fi +2 -2
    ha_innobase::get_foreign_key_create_info(): Display an error
    message to the user if a temporary file cannot be created.

ChangeSet
  1.2466 05/10/03 16:24:47 msvensson@neptunus.(none) +1 -0
  Move -ansi flag from global_warnings to cxx_warnings

  BUILD/SETUP.sh
    1.36 05/10/03 16:24:36 msvensson@neptunus.(none) +2 -2
    ansi glags should only be set for C++ compilation

ChangeSet
  1.2465 05/10/03 00:05:50 heikki@hundin.mysql.fi +1 -0
  os0sync.c:
    Add diagnostic code to track an assertion failure of 0 == pthread_mutex_destroy(); this was reported on the MySQL mailing list Sept 23, 2005

  innobase/os/os0sync.c
    1.25 05/10/03 00:05:34 heikki@hundin.mysql.fi +15 -1
    Add diagnostic code to track an assertion failure of 0 == pthread_mutex_destroy(); this was reported on the MySQL mailing list Sept 23, 2005

ChangeSet
  1.2461.1.2 05/09/30 15:06:41 marko@hundin.mysql.fi +1 -0
  InnoDB: After review fix

  sql/ha_innodb.cc
    1.210 05/09/30 15:06:31 marko@hundin.mysql.fi +1 -1
    Avoid bitwise arithmetics, as it might be difficult to read.  The
    added readability costs one register and two instructions on x86.

ChangeSet
  1.2462.1.1 05/09/30 14:03:55 kent@mysql.com +44 -0
  Many files:
    New VC7 project files
  des_key_file.cc:
    Visual C++ wants '"' for local include
  mysql.cc:
    Cast my_cgets() argument for VC6 and VC7
  dummy.cpp:
    Added to convince VS .Net generate a lib for mysqlserver

  scripts/make_win_src_distribution.sh
    1.34 05/09/30 14:03:04 kent@mysql.com +10 -6
    New VC7 project files

  sql/des_key_file.cc
    1.12 05/09/30 13:57:32 kent@mysql.com +1 -1
    Visual C++ wants '"' for local include

  client/mysql.cc
    1.213 05/09/30 13:56:13 kent@mysql.com +1 -1
    Cast my_cgets() argument for VC6 and VC7

  VC++Files/zlib/zlib.vcproj
    1.1 05/09/30 13:52:39 kent@mysql.com +483 -0
    New VC7 project files

  VC++Files/vio/vio.vcproj
    1.1 05/09/30 13:52:39 kent@mysql.com +204 -0
    New VC7 project files

  VC++Files/thr_test/thr_test.vcproj
    1.1 05/09/30 13:52:39 kent@mysql.com +162 -0
    New VC7 project files

  VC++Files/tests/mysql_client_test.vcproj
    1.1 05/09/30 13:52:39 kent@mysql.com +163 -0
    New VC7 project files

  VC++Files/test1/test1.vcproj
    1.1 05/09/30 13:52:39 kent@mysql.com +161 -0
    New VC7 project files

  VC++Files/strings/strings.vcproj
    1.1 05/09/30 13:52:39 kent@mysql.com +993 -0
    New VC7 project files

  VC++Files/sql/mysqld.vcproj
    1.1 05/09/30 13:52:39 kent@mysql.com +7834 -0
    New VC7 project files

  VC++Files/replace/replace.vcproj
    1.1 05/09/30 13:52:39 kent@mysql.com +229 -0
    New VC7 project files

  VC++Files/zlib/zlib.vcproj
    1.0 05/09/30 13:52:39 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/zlib/zlib.vcproj

  VC++Files/vio/vio.vcproj
    1.0 05/09/30 13:52:39 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/vio/vio.vcproj

  VC++Files/thr_test/thr_test.vcproj
    1.0 05/09/30 13:52:39 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/thr_test/thr_test.vcproj

  VC++Files/tests/mysql_client_test.vcproj
    1.0 05/09/30 13:52:39 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/tests/mysql_client_test.vcproj

  VC++Files/test1/test1.vcproj
    1.0 05/09/30 13:52:39 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/test1/test1.vcproj

  VC++Files/strings/strings.vcproj
    1.0 05/09/30 13:52:39 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/strings/strings.vcproj

  VC++Files/sql/mysqld.vcproj
    1.0 05/09/30 13:52:39 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/sql/mysqld.vcproj

  VC++Files/replace/replace.vcproj
    1.0 05/09/30 13:52:39 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/replace/replace.vcproj

  VC++Files/regex/regex.vcproj
    1.1 05/09/30 13:52:39 kent@mysql.com +252 -0
    New VC7 project files

  VC++Files/perror/perror.vcproj
    1.1 05/09/30 13:52:38 kent@mysql.com +255 -0
    New VC7 project files

  VC++Files/mysys/mysys.vcproj
    1.1 05/09/30 13:52:38 kent@mysql.com +4792 -0
    New VC7 project files

  VC++Files/mysqlserver/mysqlserver.vcproj
    1.1 05/09/30 13:52:38 kent@mysql.com +126 -0
    New VC7 project files

  VC++Files/mysqldemb/mysqldemb.vcproj
    1.1 05/09/30 13:52:38 kent@mysql.com +2960 -0
    New VC7 project files

  VC++Files/mysqlcheck/mysqlcheck.vcproj
    1.1 05/09/30 13:52:38 kent@mysql.com +244 -0
    New VC7 project files

  VC++Files/mysqlbinlog/mysqlbinlog.vcproj
    1.1 05/09/30 13:52:38 kent@mysql.com +271 -0
    New VC7 project files

  VC++Files/mysql.sln
    1.1 05/09/30 13:52:38 kent@mysql.com +1159 -0
    New VC7 project files

  VC++Files/mysql-test/mysql_test_run_new.vcproj
    1.1 05/09/30 13:52:38 kent@mysql.com +204 -0
    New VC7 project files

  VC++Files/myisampack/myisampack.vcproj
    1.1 05/09/30 13:52:38 kent@mysql.com +247 -0
    New VC7 project files

  VC++Files/myisammrg/myisammrg.vcproj
    1.1 05/09/30 13:52:38 kent@mysql.com +968 -0
    New VC7 project files

  VC++Files/myisamlog/myisamlog.vcproj
    1.1 05/09/30 13:52:38 kent@mysql.com +244 -0
    New VC7 project files

  VC++Files/myisamchk/myisamchk.vcproj
    1.1 05/09/30 13:52:38 kent@mysql.com +244 -0
    New VC7 project files

  VC++Files/myisam_ftdump/myisam_ftdump.vcproj
    1.1 05/09/30 13:52:38 kent@mysql.com +174 -0
    New VC7 project files

  VC++Files/myisam/myisam.vcproj
    1.1 05/09/30 13:52:38 kent@mysql.com +2094 -0
    New VC7 project files

  VC++Files/regex/regex.vcproj
    1.0 05/09/30 13:52:38 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/regex/regex.vcproj

  VC++Files/perror/perror.vcproj
    1.0 05/09/30 13:52:38 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/perror/perror.vcproj

  VC++Files/mysys/mysys.vcproj
    1.0 05/09/30 13:52:38 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/mysys/mysys.vcproj

  VC++Files/mysqlserver/mysqlserver.vcproj
    1.0 05/09/30 13:52:38 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/mysqlserver/mysqlserver.vcproj

  VC++Files/mysqldemb/mysqldemb.vcproj
    1.0 05/09/30 13:52:38 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/mysqldemb/mysqldemb.vcproj

  VC++Files/mysqlcheck/mysqlcheck.vcproj
    1.0 05/09/30 13:52:38 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/mysqlcheck/mysqlcheck.vcproj

  VC++Files/mysqlbinlog/mysqlbinlog.vcproj
    1.0 05/09/30 13:52:38 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/mysqlbinlog/mysqlbinlog.vcproj

  VC++Files/mysql.sln
    1.0 05/09/30 13:52:38 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/mysql.sln

  VC++Files/mysql-test/mysql_test_run_new.vcproj
    1.0 05/09/30 13:52:38 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/mysql-test/mysql_test_run_new.vcproj

  VC++Files/myisampack/myisampack.vcproj
    1.0 05/09/30 13:52:38 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/myisampack/myisampack.vcproj

  VC++Files/myisammrg/myisammrg.vcproj
    1.0 05/09/30 13:52:38 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/myisammrg/myisammrg.vcproj

  VC++Files/myisamlog/myisamlog.vcproj
    1.0 05/09/30 13:52:38 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/myisamlog/myisamlog.vcproj

  VC++Files/myisamchk/myisamchk.vcproj
    1.0 05/09/30 13:52:38 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/myisamchk/myisamchk.vcproj

  VC++Files/myisam_ftdump/myisam_ftdump.vcproj
    1.0 05/09/30 13:52:38 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/myisam_ftdump/myisam_ftdump.vcproj

  VC++Files/myisam/myisam.vcproj
    1.0 05/09/30 13:52:38 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/myisam/myisam.vcproj

  VC++Files/my_print_defaults/my_print_defaults.vcproj
    1.1 05/09/30 13:52:38 kent@mysql.com +245 -0
    New VC7 project files

  VC++Files/libmysqltest/myTest.vcproj
    1.1 05/09/30 13:52:37 kent@mysql.com +162 -0
    New VC7 project files

  VC++Files/libmysqld/libmysqld.vcproj
    1.1 05/09/30 13:52:37 kent@mysql.com +4104 -0
    New VC7 project files

  VC++Files/libmysqld/examples/test_libmysqld.vcproj
    1.1 05/09/30 13:52:37 kent@mysql.com +130 -0
    New VC7 project files

  VC++Files/libmysql/libmysql.vcproj
    1.1 05/09/30 13:52:37 kent@mysql.com +2260 -0
    New VC7 project files

  VC++Files/innobase/innobase.vcproj
    1.1 05/09/30 13:52:37 kent@mysql.com +2958 -0
    New VC7 project files

  VC++Files/heap/heap.vcproj
    1.1 05/09/30 13:52:37 kent@mysql.com +1061 -0
    New VC7 project files

  VC++Files/dbug/dbug.vcproj
    1.1 05/09/30 13:52:37 kent@mysql.com +249 -0
    New VC7 project files

  VC++Files/comp_err/comp_err.vcproj
    1.1 05/09/30 13:52:37 kent@mysql.com +93 -0
    New VC7 project files

  VC++Files/client/mysqltest.vcproj
    1.1 05/09/30 13:52:37 kent@mysql.com +264 -0
    New VC7 project files

  VC++Files/client/mysqlshow.vcproj
    1.1 05/09/30 13:52:37 kent@mysql.com +232 -0
    New VC7 project files

  VC++Files/client/mysqlimport.vcproj
    1.1 05/09/30 13:52:37 kent@mysql.com +232 -0
    New VC7 project files

  VC++Files/client/mysqldump.vcproj
    1.1 05/09/30 13:52:37 kent@mysql.com +232 -0
    New VC7 project files

  VC++Files/my_print_defaults/my_print_defaults.vcproj
    1.0 05/09/30 13:52:37 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/my_print_defaults/my_print_defaults.vcproj

  VC++Files/libmysqltest/myTest.vcproj
    1.0 05/09/30 13:52:37 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/libmysqltest/myTest.vcproj

  VC++Files/libmysqld/libmysqld.vcproj
    1.0 05/09/30 13:52:37 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/libmysqld/libmysqld.vcproj

  VC++Files/libmysqld/examples/test_libmysqld.vcproj
    1.0 05/09/30 13:52:37 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/libmysqld/examples/test_libmysqld.vcproj

  VC++Files/libmysql/libmysql.vcproj
    1.0 05/09/30 13:52:37 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/libmysql/libmysql.vcproj

  VC++Files/innobase/innobase.vcproj
    1.0 05/09/30 13:52:37 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/innobase/innobase.vcproj

  VC++Files/heap/heap.vcproj
    1.0 05/09/30 13:52:37 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/heap/heap.vcproj

  VC++Files/dbug/dbug.vcproj
    1.0 05/09/30 13:52:37 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/dbug/dbug.vcproj

  VC++Files/comp_err/comp_err.vcproj
    1.0 05/09/30 13:52:37 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/comp_err/comp_err.vcproj

  VC++Files/client/mysqltest.vcproj
    1.0 05/09/30 13:52:37 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/client/mysqltest.vcproj

  VC++Files/client/mysqlshow.vcproj
    1.0 05/09/30 13:52:37 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/client/mysqlshow.vcproj

  VC++Files/client/mysqlimport.vcproj
    1.0 05/09/30 13:52:37 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/client/mysqlimport.vcproj

  VC++Files/client/mysqldump.vcproj
    1.0 05/09/30 13:52:37 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/client/mysqldump.vcproj

  VC++Files/client/mysqlclient.vcproj
    1.1 05/09/30 13:52:36 kent@mysql.com +3330 -0
    New VC7 project files

  VC++Files/client/mysqladmin.vcproj
    1.1 05/09/30 13:52:36 kent@mysql.com +232 -0
    New VC7 project files

  VC++Files/client/mysql.vcproj
    1.1 05/09/30 13:52:36 kent@mysql.com +318 -0
    New VC7 project files

  VC++Files/bdb/bdb.vcproj
    1.1 05/09/30 13:52:36 kent@mysql.com +3227 -0
    New VC7 project files

  VC++Files/client/mysqlclient.vcproj
    1.0 05/09/30 13:52:36 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/client/mysqlclient.vcproj

  VC++Files/client/mysqladmin.vcproj
    1.0 05/09/30 13:52:36 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/client/mysqladmin.vcproj

  VC++Files/client/mysql.vcproj
    1.0 05/09/30 13:52:36 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/client/mysql.vcproj

  VC++Files/bdb/bdb.vcproj
    1.0 05/09/30 13:52:36 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/bdb/bdb.vcproj

  VC++Files/mysqlserver/dummy.cpp
    1.1 05/09/30 13:06:30 kent@mysql.com +0 -0
    Added to convince VS .Net generate a lib for mysqlserver

  VC++Files/mysqlserver/dummy.cpp
    1.0 05/09/30 13:06:29 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/VC++Files/mysqlserver/dummy.cpp

ChangeSet
  1.2461.1.1 05/09/30 13:58:00 marko@hundin.mysql.fi +1 -0
  InnoDB: On UPDATE, trim UCS2 columns correctly. (Bug #12178)

  sql/ha_innodb.cc
    1.209 05/09/30 13:57:52 marko@hundin.mysql.fi +30 -10
    innobase_convert_and_store_changed_col(), calc_row_difference():
     Replace parameter "is_unsigned" with "prtype".
    innobase_convert_and_store_changed_col():
     When trimming spaces, note that UCS2 spaces are 0x0020, not 0x20.

ChangeSet
  1.2446.1.6 05/09/30 12:22:00 jonas@perch.ndb.mysql.com +1 -0
  ndb_config
    Check returnvalue on load/fetch configuration

  ndb/tools/ndb_config.cpp
    1.8 05/09/30 12:21:59 jonas@perch.ndb.mysql.com +5 -0
    Check returnvalue on load/fetch configuration

ChangeSet
  1.2446.1.5 05/09/30 11:39:49 jonas@perch.ndb.mysql.com +5 -0
  ndb -
   add support for reading config.ini from ndb_config
   (as alternative to contacting ndb_mgmd)

  ndb/tools/ndb_config.cpp
    1.7 05/09/30 11:39:48 jonas@perch.ndb.mysql.com +101 -61
    Add support for reading config.ini from ndb_config

  ndb/src/mgmsrv/InitConfigFileParser.hpp
    1.7 05/09/30 11:39:48 jonas@perch.ndb.mysql.com +4 -2
    Handle prinouts better

  ndb/src/mgmsrv/InitConfigFileParser.cpp
    1.19 05/09/30 11:39:48 jonas@perch.ndb.mysql.com +12 -7
    Handle prinouts better

  mysql-test/t/ndb_config.test
    1.6 05/09/30 11:39:48 jonas@perch.ndb.mysql.com +1 -0
    Add support for reading config.ini from ndb_config

  mysql-test/r/ndb_config.result
    1.2 05/09/30 11:39:48 jonas@perch.ndb.mysql.com +1 -0
    Add support for reading config.ini from ndb_config

ChangeSet
  1.2458.3.4 05/09/30 00:52:18 kent@mysql.com +3 -0
  mtr_report.pl:
    Text formatting, adjust table header
  mysql-test-run.pl:
    Remove requirement for source tree to run embedded server test
  mysqldump.test:
    Removed ending ';' from --exec line

  mysql-test/lib/mtr_report.pl
    1.15 05/09/30 00:50:09 kent@mysql.com +2 -2
    Text formatting, adjust table header

  mysql-test/mysql-test-run.pl
    1.48 05/09/30 00:49:04 kent@mysql.com +1 -7
    Remove requirement for source tree to run embedded server test

  mysql-test/t/mysqldump.test
    1.40 05/09/29 19:23:12 kent@mysql.com +1 -1
    Removed ending ';' from --exec line

ChangeSet
  1.2458.4.1 05/09/29 13:57:41 lenz@mysql.com +1 -0
  Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1

  support-files/mysql.spec.sh
    1.105 05/09/29 13:57:39 lenz@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.853.1 05/09/29 13:55:54 lenz@mysql.com +1 -0
   - fixed the removing of the RPM_BUILD_ROOT in the %clean section of the RPM
     spec file (the $RBR variable did not get expanded, thus leaving old build
     roots behind)

  support-files/mysql.spec.sh
    1.61.1.32 05/09/29 13:55:52 lenz@mysql.com +6 -1
     - fixed the removing of the RPM_BUILD_ROOT in the %clean section (the
       $RBR variable did not get expanded, thus leaving old build roots behind)

ChangeSet
  1.2458.3.2 05/09/29 13:44:17 ingo@mysql.com +2 -0
  Merge mysql.com:/home/mydev/mysql-4.0-4000
  into  mysql.com:/home/mydev/mysql-4.1-4100

  mysql-test/r/merge.result
    1.38 05/09/29 13:44:12 ingo@mysql.com +0 -0
    SCCS merged

  mysql-test/t/merge.test
    1.36 05/09/29 13:43:26 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.1.811 05/09/29 13:37:30 ingo@mysql.com +2 -0
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Second platform fix for floating point rounding.

  mysql-test/t/merge.test
    1.18.1.7 05/09/29 13:37:27 ingo@mysql.com +1 -1
    Bug#9112 - Merge table with composite index producing invalid results with some queries
    Second platform fix for floating point rounding.

  mysql-test/r/merge.result
    1.11.1.16 05/09/29 13:37:27 ingo@mysql.com +3 -3
    Bug#9112 - Merge table with composite index producing invalid results with some queries
    Second platform fix for floating point rounding.

ChangeSet
  1.2458.3.1 05/09/29 16:17:45 gluh@eagle.intranet.mysql.r18.ru +3 -0
  Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment
    "CHARACTER SET", "COLLATE", and "DEFAULT" are always
    printed(excepting MODE_MYSQL323 and MODE_MYSQL40)
    "AUTO_INCREMENT", "ON UPDATE CURRENT_TIMESTAMP" are printed only 
    if NO_FIELD_OPTIONS is not set.

  sql/sql_show.cc
    1.204 05/09/29 16:17:01 gluh@mysql.com +6 -4
    Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment
      "CHARACTER SET", "COLLATE", and "DEFAULT" are always
      printed(excepting MODE_MYSQL323 and MODE_MYSQL40)
      "AUTO_INCREMENT", "ON UPDATE CURRENT_TIMESTAMP" are printed only 
      if NO_FIELD_OPTIONS is not set.

  mysql-test/t/sql_mode.test
    1.10 05/09/29 16:17:01 gluh@mysql.com +12 -0
    Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment
      test case

  mysql-test/r/sql_mode.result
    1.13 05/09/29 16:17:01 gluh@mysql.com +23 -3
    Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment
      test case

ChangeSet
  1.2458.2.2 05/09/29 16:07:33 bar@mysql.com +1 -0
  Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/usr/home/bar/mysql-4.1.b13046

  sql/item_cmpfunc.cc
    1.200 05/09/29 16:07:27 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2452.10.1 05/09/29 10:30:20 msvensson@neptunus.(none) +1 -0
  Add -ansi flag when building with gcc

  BUILD/SETUP.sh
    1.35 05/09/29 10:30:17 msvensson@neptunus.(none) +1 -1
    Add -ansi flag, make gcc not allow "C++ comments in C" 

ChangeSet
  1.2452.8.5 05/09/29 02:08:24 kent@mysql.com +19 -0
  Many files:
    Prefix regex functions/types with "my_" as our
    library is not compatible with normal regex lib.
  my_regex.h:
    Rename: regex/regex.h -> regex/my_regex.h

  sql/mysqld.cc
    1.602 05/09/29 02:07:38 kent@mysql.com +4 -4
    Prefix regex functions/types with "my_" as our
    library is not compatible with normal regex lib.

  sql/item_cmpfunc.h
    1.112 05/09/29 02:07:36 kent@mysql.com +2 -2
    Prefix regex functions/types with "my_" as our
    library is not compatible with normal regex lib.

  sql/item_cmpfunc.cc
    1.197.1.1 05/09/29 02:07:35 kent@mysql.com +16 -16
    Prefix regex functions/types with "my_" as our
    library is not compatible with normal regex lib.

  regex/reginit.c
    1.8 05/09/29 02:07:33 kent@mysql.com +2 -2
    Prefix regex functions/types with "my_" as our
    library is not compatible with normal regex lib.

  regex/regfree.c
    1.4 05/09/29 02:07:31 kent@mysql.com +3 -3
    Prefix regex functions/types with "my_" as our
    library is not compatible with normal regex lib.

  regex/regexec.c
    1.7 05/09/29 02:07:28 kent@mysql.com +4 -5
    Prefix regex functions/types with "my_" as our
    library is not compatible with normal regex lib.

  regex/my_regex.h
    1.7 05/09/29 02:07:27 kent@mysql.com +8 -8
    Prefix regex functions/types with "my_" as our
    library is not compatible with normal regex lib.

  regex/regerror.ih
    1.3 05/09/29 02:07:25 kent@mysql.com +1 -1
    Prefix regex functions/types with "my_" as our
    library is not compatible with normal regex lib.

  regex/regerror.c
    1.7 05/09/29 02:07:22 kent@mysql.com +3 -3
    Prefix regex functions/types with "my_" as our
    library is not compatible with normal regex lib.

  regex/regcomp.c
    1.17 05/09/29 02:07:20 kent@mysql.com +5 -5
    Prefix regex functions/types with "my_" as our
    library is not compatible with normal regex lib.

  regex/main.ih
    1.3 05/09/29 02:07:18 kent@mysql.com +1 -1
    Prefix regex functions/types with "my_" as our
    library is not compatible with normal regex lib.

  regex/main.c
    1.11 05/09/29 02:07:16 kent@mysql.com +26 -26
    Prefix regex functions/types with "my_" as our
    library is not compatible with normal regex lib.

  regex/engine.ih
    1.4 05/09/29 02:07:14 kent@mysql.com +1 -1
    Prefix regex functions/types with "my_" as our
    library is not compatible with normal regex lib.

  regex/engine.c
    1.5 05/09/29 02:07:11 kent@mysql.com +4 -4
    Prefix regex functions/types with "my_" as our
    library is not compatible with normal regex lib.

  regex/debug.ih
    1.4 05/09/29 02:07:09 kent@mysql.com +1 -1
    Prefix regex functions/types with "my_" as our
    library is not compatible with normal regex lib.

  regex/debug.c
    1.6 05/09/29 02:07:06 kent@mysql.com +3 -2
    Prefix regex functions/types with "my_" as our
    library is not compatible with normal regex lib.

  regex/Makefile.am
    1.13 05/09/29 02:07:03 kent@mysql.com +1 -1
    Prefix regex functions/types with "my_" as our
    library is not compatible with normal regex lib.

  os2/MySQL-Source.icc
    1.4 05/09/29 02:06:50 kent@mysql.com +2 -2
    Prefix regex functions/types with "my_" as our
    library is not compatible with normal regex lib.

  client/mysqltest.c
    1.187 05/09/29 02:04:24 kent@mysql.com +10 -9
    Prefix regex functions/types with "my_" as our
    library is not compatible with normal regex lib.

ChangeSet
  1.2452.9.1 05/09/28 19:03:35 dean@mysql.com +1 -0
  Fix for BUG#13582.  Theoretically possible to try to overallocate RAM in some fulltext queries.

  myisam/ft_nlq_search.c
    1.39 05/09/28 19:02:23 dean@mysql.com +2 -1

  regex/my_regex.h
    1.6 05/09/29 00:15:42 kent@mysql.com +0 -0
    Rename: regex/regex.h -> regex/my_regex.h

ChangeSet
  1.2452.8.4 05/09/28 23:53:31 kent@mysql.com +1 -0
  mtr_process.pl:
    Append to some of the log files, not overwrite

  mysql-test/lib/mtr_process.pl
    1.20 05/09/28 23:53:13 kent@mysql.com +2 -1
    Append to some of the log files, not overwrite

ChangeSet
  1.2452.8.3 05/09/28 23:52:10 kent@mysql.com +1 -0
  mysql-test-run.pl:
    Append to some of the log files, not overwrite.
    Changed introduction text to reflect the current
    status of the Perl version of mysql-test-run.
    Some code cleanup.

  mysql-test/mysql-test-run.pl
    1.47 05/09/28 23:51:02 kent@mysql.com +84 -67
    Append to some of the log files, not overwrite.
    Changed introduction text to reflect the current
    status of the Perl version of mysql-test-run.
    Some code cleanup.

ChangeSet
  1.2452.8.2 05/09/28 23:24:44 kent@mysql.com +1 -0
  mysql-test-run.pl:
    Pass on all --skip-* to mysqld

  mysql-test/mysql-test-run.pl
    1.46 05/09/28 23:22:18 kent@mysql.com +16 -1
    Pass on all --skip-* to mysqld

ChangeSet
  1.2452.8.1 05/09/28 23:04:35 lenz@mysql.com +1 -0
   - compile fix: don't use C++ - style comments in .c files!

  client/mysqltest.c
    1.186 05/09/28 23:04:32 lenz@mysql.com +1 -1
     - compile fix: don't use C++ - style comments in .c files!

ChangeSet
  1.2452.1.4 05/09/28 13:39:28 kent@mysql.com +1 -0
  mysql_config.sh:
    Added -lz to link using libmysqld

  scripts/mysql_config.sh
    1.20 05/09/28 13:37:21 kent@mysql.com +1 -1
    Added -lz to link using libmysqld

ChangeSet
  1.2452.7.1 05/09/28 14:14:49 jan@hundin.mysql.fi +3 -0
  Fixed a bug checksum table locks the InnoDB table and does not use a
  consistent read (Bug #12669).

  sql/ha_innodb.cc
    1.208 05/09/28 14:14:40 jan@hundin.mysql.fi +7 -0
    Use consistent read for checksum table and convert MySQL lock type
    to the TL_READ because at the moment MySQL uses TL_READ_NO_INSERT.

  mysql-test/t/innodb.test
    1.76 05/09/28 14:14:40 jan@hundin.mysql.fi +41 -0
    Added test case for a checksum bug #12669.

  mysql-test/r/innodb.result
    1.105 05/09/28 14:14:40 jan@hundin.mysql.fi +28 -0
    Added test results for a checksum test.

ChangeSet
  1.2452.6.1 05/09/28 00:58:12 evgen@moonbone.local +3 -0
  Fix bug#13356 resolve_const_item() wasn't able to handle Item_row items.
  
  resolve_const_item() assumed to be not called for Item_row items. For
  ensuring that DBUG_ASSERT(0) was set there.
  
  This patch adds section for Item_row items. If it can it recursively calls
  resolve_const_item() for each item the Item_row contains. If any of the
  contained items is null then whole Item_row substitued by Item_null. Otherwise
  it just returns.

  mysql-test/r/select.result
    1.63 05/09/28 00:40:41 evgen@moonbone.local +9 -0
    Test case for bug#13356 resolve_const_item() wasn't able to handle Item_row items.

  mysql-test/t/select.test
    1.47 05/09/28 00:40:10 evgen@moonbone.local +10 -0
    Test case for bug#13356 resolve_const_item() wasn't able to handle Item_row items.

  sql/item.cc
    1.222 05/09/28 00:39:39 evgen@moonbone.local +29 -0
    Fix bug#13356 resolve_const_item() wasn't able to handle Item_row items.
    
    Added section to resolve_const_item() for Item_row items. If it can it
    recursively calls resolve_const_item() for each item the Item_row contains. If
    any of the contained items is null then Item_row is substituted by Item_null.
    Otherwise it just returns.
    Comment moved closer to function it belongs to.

ChangeSet
  1.2452.5.1 05/09/27 23:36:02 dlenev@mysql.com +1 -0
  Fix for bug #13501 "build problem: too many arguments to function my_bool
  acl_init".
  
  Updated calls to acl_init()/grant_init() in init_embedded_server() - their
  signatures were changed recently, now they don't need argument for passing
  pointer to THD object (this code was only compiled if one built embedded
  server library with --with-embedded-privilege-control switch).

  libmysqld/lib_sql.cc
    1.125 05/09/27 23:35:58 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.

ChangeSet
  1.2452.4.1 05/09/27 16:48:41 msvensson@neptunus.(none) +2 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
  into  neptunus.(none):/home/msvensson/mysql/fix_mysqltest/my41-fix_mysqltest

  mysql-test/mysql-test-run.pl
    1.45 05/09/27 16:48:38 msvensson@neptunus.(none) +0 -12
    patch alredy commited

  client/mysqltest.c
    1.185 05/09/27 16:48:38 msvensson@neptunus.(none) +0 -0
    Manual merge

ChangeSet
  1.2452.2.5 05/09/27 15:42:14 ingo@mysql.com +2 -0
  Merge mysql.com:/home/mydev/mysql-4.0-4000
  into  mysql.com:/home/mydev/mysql-4.1-4100

  mysql-test/t/merge.test
    1.35 05/09/27 15:42:10 ingo@mysql.com +0 -4
    Bug#9112 - Merge table with composite index producing invalid results with some queries
    Manual merge

  mysql-test/r/merge.result
    1.37 05/09/27 15:42:10 ingo@mysql.com +0 -0
    Bug#9112 - Merge table with composite index producing invalid results with some queries
    Manual merge

ChangeSet
  1.1346.1.810 05/09/27 15:26:16 ingo@mysql.com +2 -0
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Reduced the precision of the test numbers.
  Not all platforms could reproduce the exact numbers.

  mysql-test/t/merge.test
    1.18.1.6 05/09/27 15:26:14 ingo@mysql.com +4 -4
    Bug#9112 - Merge table with composite index producing invalid results with some queries
    Reduced the precision of the test numbers.
    Not all platforms could reproduce the exact numbers.

  mysql-test/r/merge.result
    1.11.1.15 05/09/27 15:26:14 ingo@mysql.com +6 -6
    Bug#9112 - Merge table with composite index producing invalid results with some queries
    The new test result

ChangeSet
  1.2452.3.2 05/09/26 16:49:18 lars@mysql.com +1 -0
  Fixed gcc error on AMD64: cast from 'char*' to 'unsigned int' loses precision

  sql/ha_ndbcluster.cc
    1.172 05/09/26 16:49:10 lars@mysql.com +2 -2
    Fixed gcc error on AMD64: cast from 'char*' to 'unsigned int' loses precision

ChangeSet
  1.2452.3.1 05/09/26 10:26:38 tulin@dl145b.mysql.com +2 -0
  added make target for printSchemaFile

  ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
    1.8 05/09/26 10:25:36 ndbdev@dl145b.mysql.com +1 -10
    added make target for printSchemaFile

  ndb/src/kernel/blocks/dbdict/Makefile.am
    1.4 05/09/26 10:25:36 ndbdev@dl145b.mysql.com +10 -2
    added make target for printSchemaFile

ChangeSet
  1.2452.2.1 05/09/25 21:22:23 monty@mysql.com +8 -0
  Fixed error found during review of new pushed code

  sql/sql_update.cc
    1.143 05/09/25 21:22:21 monty@mysql.com +1 -0
    Ensure 'allow_sum_func' is reset before call to setup_conds

  sql/sql_prepare.cc
    1.155 05/09/25 21:22:21 monty@mysql.com +0 -1
    allow_sum_func doesn't have to be reset for each query
    (It's to be reset in setup_fields() or before call to setup_conds()

  sql/sql_load.cc
    1.86 05/09/25 21:22:21 monty@mysql.com +5 -5
    Move set of auto_increment_field_not_null so that it's not set if field value is NULL

  sql/sql_lex.cc
    1.149 05/09/25 21:22:20 monty@mysql.com +0 -1
    allow_sum_func doesn't have to be reset for each query
    (It's to be reset in setup_fields() or before call to setup_conds()

  sql/sql_delete.cc
    1.136 05/09/25 21:22:20 monty@mysql.com +3 -2
    Ensure 'allow_sum_func' is reset before call to setup_conds

  sql/opt_sum.cc
    1.45 05/09/25 21:22:20 monty@mysql.com +7 -7
    Fix bugs found during review
    - Changed code to be able to remove one if
    - Ensure that count == 0 only if is_exact_count == TRUE

  mysql-test/r/cast.result
    1.23 05/09/25 21:22:20 monty@mysql.com +12 -0
    More test for CAST(0x.... as signed)

  client/mysql.cc
    1.212 05/09/25 21:22:20 monty@mysql.com +2 -2
    Don't use c_ptr() for cgets() and ensure buffer is not overwritten

ChangeSet
  1.2452.1.1 05/09/25 11:35:32 kent@mysql.com +1 -0
  disabled.def:
    Disable unstable test cases
    new file

  mysql-test/t/disabled.def
    1.1 05/09/25 11:32:01 kent@mysql.com +16 -0
    Disable unstable test cases

  mysql-test/t/disabled.def
    1.0 05/09/25 11:32:01 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1/mysql-test/t/disabled.def

ChangeSet
  1.2449.8.3 05/09/24 02:42:38 kent@mysql.com +3 -0
  Makefile.am:
    Revert to shell test script for test targets
  mysqltest.c:
    Windows pclose() returns error code in low byte
  mysql_config.sh:
    Remove -Xa -xstrconst from --cflags for Sun C++

  Makefile.am
    1.72 05/09/24 02:40:58 kent@mysql.com +13 -2
    Revert to shell test script for test targets

  client/mysqltest.c
    1.184 05/09/24 01:41:27 kent@mysql.com +5 -1
    Windows pclose() returns error code in low byte

ChangeSet
  1.2449.9.2 05/09/24 01:39:50 sergefp@mysql.com +5 -0
  BUG#12232: Addressing docs team feedback: s/inequal/unequal/

  sql/mysqld.cc
    1.601 05/09/24 01:39:47 sergefp@mysql.com +4 -4
    BUG#12232: Addressing docs team feedback: s/inequal/unequal/

  sql/ha_myisam.cc
    1.161 05/09/24 01:39:47 sergefp@mysql.com +1 -1
    BUG#12232: Addressing docs team feedback: s/inequal/unequal/

  mysql-test/r/myisam.result
    1.53 05/09/24 01:39:46 sergefp@mysql.com +2 -2
    BUG#12232: Addressing docs team feedback: s/inequal/unequal/

  myisam/myisamchk.c
    1.128 05/09/24 01:39:46 sergefp@mysql.com +3 -3
    BUG#12232: Addressing docs team feedback: s/inequal/unequal/

  myisam/mi_check.c
    1.151 05/09/24 01:39:46 sergefp@mysql.com +1 -1
    BUG#12232: Addressing docs team feedback: s/inequal/unequal/

  scripts/mysql_config.sh
    1.19 05/09/23 22:59:44 kent@mysql.com +8 -5
    Remove -Xa -xstrconst from --cflags for Sun C++

ChangeSet
  1.2449.9.1 05/09/23 14:14:34 paul@kite-hub.kitebird.com +1 -0
  mysqld.cc:
    Fix out-of-order status variable.

  sql/mysqld.cc
    1.600 05/09/23 14:14:09 paul@kite-hub.kitebird.com +1 -1
    Fix out-of-order status variable.

ChangeSet
  1.2449.7.2 05/09/23 17:22:36 ingo@mysql.com +1 -0
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  After merge fix

  mysql-test/t/merge.test
    1.34 05/09/23 17:22:32 ingo@mysql.com +4 -0
    Bug#9112 - Merge table with composite index producing invalid results with some queries
    After merge fix

ChangeSet
  1.2406.5.6 05/09/23 14:07:31 msvensson@neptunus.(none) +1 -0
  Bug #7037  	Test "mysql_protocols" fails on Solaris 8 + 9 /x86

  mysys/my_init.c
    1.41 05/09/23 14:07:28 msvensson@neptunus.(none) +7 -2
    Updated after review

ChangeSet
  1.2449.8.1 05/09/23 13:43:20 sergefp@mysql.com +3 -0
  Fix for BUG#13419: In "ref" optimizer, take into account that item=Item_func_in(x,y) is 
  not equivalent to "x=y" when item->negated == TRUE.

  sql/sql_select.cc
    1.437 05/09/23 13:43:16 sergefp@mysql.com +2 -2
    Fix for BUG#13419:
    * Take into account that item=Item_func_in(x,y) is not equivalent to "x=y" when 
      item->negated == TRUE.
    * Removed comment that is no longer true.

  mysql-test/t/func_in.test
    1.16 05/09/23 13:43:16 sergefp@mysql.com +7 -0
    Testcase for BUG#13419

  mysql-test/r/func_in.result
    1.16 05/09/23 13:43:16 sergefp@mysql.com +9 -0
    Testcase for BUG#13419

ChangeSet
  1.2449.7.1 05/09/23 10:49:08 ingo@mysql.com +7 -0
  Merge mysql.com:/home/mydev/mysql-4.0-4000
  into  mysql.com:/home/mydev/mysql-4.1-4100

  mysql-test/t/merge.test
    1.33 05/09/23 10:48:57 ingo@mysql.com +0 -1
    Bug#9112 - Merge table with composite index producing invalid results with some queries
    Manual merge

  mysql-test/r/merge.result
    1.36 05/09/23 10:48:57 ingo@mysql.com +0 -0
    Bug#9112 - Merge table with composite index producing invalid results with some queries
    Manual merge

  myisammrg/myrg_rkey.c
    1.17 05/09/23 10:48:56 ingo@mysql.com +0 -0
    Bug#9112 - Merge table with composite index producing invalid results with some queries
    Manual merge

  myisam/myisamdef.h
    1.80 05/09/23 10:44:57 ingo@mysql.com +0 -0
    Auto merged

  myisam/mi_search.c
    1.52 05/09/23 10:44:57 ingo@mysql.com +0 -0
    Auto merged

  myisam/mi_rkey.c
    1.17 05/09/23 10:44:57 ingo@mysql.com +0 -0
    Auto merged

  myisam/mi_dbug.c
    1.12 05/09/23 10:44:57 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.1.809 05/09/23 10:15:11 ingo@mysql.com +7 -0
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  The problem was an ab-use of last_rkey_length.
  Formerly we saved the packed key length (of the search key)
  in this element. But in certain cases it got replaced by 
  the (packed) result key length.
  Now we use a new element of MI_INFO to save the packed key 
  length of the search key.

  mysql-test/t/merge.test
    1.18.1.5 05/09/23 10:15:08 ingo@mysql.com +33 -0
    Bug#9112 - Merge table with composite index producing invalid results with some queries
    The test case.

  mysql-test/r/merge.result
    1.11.1.14 05/09/23 10:15:08 ingo@mysql.com +26 -0
    Bug#9112 - Merge table with composite index producing invalid results with some queries
    The test result.

  myisammrg/myrg_rkey.c
    1.14.1.2 05/09/23 10:15:08 ingo@mysql.com +12 -5
    Bug#9112 - Merge table with composite index producing invalid results with some queries
    Changed to use the new element of MI_INFO to get at the
    packed key length.

  myisam/myisamdef.h
    1.45.1.18 05/09/23 10:15:08 ingo@mysql.com +1 -0
    Bug#9112 - Merge table with composite index producing invalid results with some queries
    Added a new element to store the packed key length
    for use by the MyISAMMRG engine.

  myisam/mi_search.c
    1.30.1.13 05/09/23 10:15:08 ingo@mysql.com +13 -3
    Bug#9112 - Merge table with composite index producing invalid results with some queries
    Added a comment and trace prints.

  myisam/mi_rkey.c
    1.11.1.3 05/09/23 10:15:08 ingo@mysql.com +5 -2
    Bug#9112 - Merge table with composite index producing invalid results with some queries
    Saved the packed key length in a new element of MI_INFO.

  myisam/mi_dbug.c
    1.9.1.2 05/09/23 10:15:08 ingo@mysql.com +2 -2
    Bug#9112 - Merge table with composite index producing invalid results with some queries
    Fixed the recognition of NULL values in _mi_print_key().

ChangeSet
  1.2406.5.5 05/09/23 09:47:41 msvensson@neptunus.(none) +1 -0
  BUG#7037 MySQL Bugs: #7037: Test "mysql_protocols" fails on Solaris 8 + 9 /x86

  mysys/my_init.c
    1.40 05/09/23 09:47:37 msvensson@neptunus.(none) +14 -6
    Changed implementation slightly to use a local variable for keeping track of wheter we should print to the info_file even if the flag is not set in infoflag
    Explicitly turn off print_info if there is no DBUG_FILE

ChangeSet
  1.2449.4.3 05/09/22 21:24:57 msvensson@neptunus.(none) +1 -0
  Bug #13384  	mysqltest, no protocol when script contains only lines with eval

  client/mysqltest.c
    1.183 05/09/22 21:24:54 msvensson@neptunus.(none) +1 -0
    Set query_executed also for eval, that results in a query being executed and output is likely.

ChangeSet
  1.2433.3.4 05/09/22 21:55:10 stewart@mysql.com +2 -0
  Add documentation about intricacies of MgmtSrvr::versionNode and ::status

  ndb/src/mgmsrv/MgmtSrvr.hpp
    1.33 05/09/22 21:55:08 stewart@mysql.com +8 -2
    Document the usage of the address pointer returned from status()

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.72 05/09/22 21:55:08 stewart@mysql.com +10 -0
    Document why getOwnNodeID==nodeId is different in ::versionNode

ChangeSet
  1.2449.6.1 05/09/22 12:46:01 gluh@eagle.intranet.mysql.r18.ru +3 -0
  Fix for bug#12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO setting
    set auto_increment_field_not_null to true to preserve zero values
    for autoincrement fields during LOAD DATA execution if 
    NO_AUTO_VALUE_ON_ZERO sql mode is set

  sql/sql_load.cc
    1.85 05/09/22 12:45:57 gluh@mysql.com +4 -0
    Fix for bug#12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO setting
      set auto_increment_field_not_null to true to preserve zero values
      for autoincrement fields during LOAD DATA execution if 
      NO_AUTO_VALUE_ON_ZERO sql mode is set

  mysql-test/t/loaddata.test
    1.10 05/09/22 12:45:57 gluh@mysql.com +27 -0
    Fix for bug#12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO setting
      test case

  mysql-test/r/loaddata.result
    1.15 05/09/22 12:45:57 gluh@mysql.com +10 -0
    Fix for bug#12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO setting
      test case

ChangeSet
  1.2446.1.4 05/09/22 09:09:27 jonas@perch.ndb.mysql.com +2 -0
  Add testcase for bug#13316
    ndb big alter table

  mysql-test/t/ndb_alter_table.test
    1.23 05/09/22 09:09:25 jonas@perch.ndb.mysql.com +119 -0
    Add testcase for bug#13316

  mysql-test/r/ndb_alter_table.result
    1.22 05/09/22 09:09:25 jonas@perch.ndb.mysql.com +116 -0
    Add testcase for bug#13316

ChangeSet
  1.2449.4.1 05/09/22 11:46:54 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.b11553

  sql/sql_yacc.yy
    1.394 05/09/22 11:46:44 ramil@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2443.7.1 05/09/22 11:45:16 ramil@mysql.com +1 -0
  a fix (#11553: gives error if aggregate user-defined function in HAVING clause).

  sql/sql_yacc.yy
    1.392.1.1 05/09/22 11:45:11 ramil@mysql.com +20 -4
    a fix (#11553: gives error if aggregate user-defined function in HAVING clause).
    udf_sum_expr_list rule introduced and used for aggregate udf functions:            
      - call inc_in_sum_expr() before udf_expr_list parsing                            
        (as in_sum_expr rule does).                                                    

ChangeSet
  1.2446.1.3 05/09/22 08:35:27 jonas@perch.ndb.mysql.com +1 -0
  bug#13316
    ndb alter table with big dicttabinfo
    send alter_tab_req fragmented as signal can get larger than MAX_MESSAGE_SIZE

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.42 05/09/22 08:35:26 jonas@perch.ndb.mysql.com +4 -4
    DictTabInfo used during alter table can easily becom larger than MAX_MESSAGE_SIZE
      send fragmented instead

ChangeSet
  1.2449.1.7 05/09/22 16:35:03 stewart@mysql.com +1 -0
  GCC4 build fix

  ndb/src/ndbapi/NdbUtil.hpp
    1.6 05/09/22 16:34:58 stewart@mysql.com +1 -0
    GCC4 build fix

ChangeSet
  1.2446.1.2 05/09/22 07:11:53 jonas@perch.ndb.mysql.com +1 -0
  ndb - fix gcc4 compile problem

  ndb/src/ndbapi/Ndbinit.cpp
    1.30 05/09/22 07:11:51 jonas@perch.ndb.mysql.com +4 -0
    fix gcc4 compile problem

ChangeSet
  1.2449.2.1 05/09/21 15:17:48 jimw@mysql.com +17 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-zlib
  into  mysql.com:/home/jimw/my/mysql-4.1-clean

  zlib/zutil.h
    1.5 05/09/21 15:17:45 jimw@mysql.com +0 -1
    Auto merged

  zlib/zlib.h
    1.5 05/09/21 15:17:45 jimw@mysql.com +1 -6
    Auto merged

  zlib/zlib.3
    1.5 05/09/21 15:17:45 jimw@mysql.com +0 -1
    Auto merged

  zlib/zconf.h
    1.5 05/09/21 15:17:45 jimw@mysql.com +4 -5
    Auto merged

  zlib/trees.c
    1.5 05/09/21 15:17:45 jimw@mysql.com +0 -0
    Auto merged

  zlib/inftrees.h
    1.6 05/09/21 15:17:45 jimw@mysql.com +0 -5
    Auto merged

  zlib/inftrees.c
    1.6 05/09/21 15:17:45 jimw@mysql.com +0 -3
    Auto merged

  zlib/inflate.c
    1.5 05/09/21 15:17:45 jimw@mysql.com +0 -0
    Auto merged

  zlib/inffast.c
    1.5 05/09/21 15:17:45 jimw@mysql.com +0 -0
    Auto merged

  zlib/infback.c
    1.4 05/09/21 15:17:45 jimw@mysql.com +0 -0
    Auto merged

  zlib/gzio.c
    1.5 05/09/21 15:17:45 jimw@mysql.com +0 -4
    Auto merged

  zlib/deflate.h
    1.5 05/09/21 15:17:45 jimw@mysql.com +0 -0
    Auto merged

  zlib/deflate.c
    1.5 05/09/21 15:17:45 jimw@mysql.com +0 -1
    Auto merged

  zlib/crc32.c
    1.5 05/09/21 15:17:45 jimw@mysql.com +0 -0
    Auto merged

  zlib/README
    1.6 05/09/21 15:17:45 jimw@mysql.com +0 -2
    Auto merged

  zlib/FAQ
    1.6 05/09/21 15:17:45 jimw@mysql.com +0 -4
    Auto merged

  zlib/ChangeLog
    1.5 05/09/21 15:17:44 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2442.2.1 05/09/22 01:38:39 evgen@moonbone.local +4 -0
  Fix bug #13180 thd->allow_sum_funcs wasn't reset before query processing.
  
  thd->allow_sum_func was left 'true' after previous statement thus allowing
  sum funcs to be present in conditions.
  
  thd->allow_sum_func should be set to 0 for each query and each prepared
  statement reinitialization. This is done in lex_start() and 
  reset_stmt_for_execute().

  mysql-test/r/update.result
    1.24 05/09/22 01:38:24 evgen@moonbone.local +12 -0
    Test case for bug#13180 thd->allow_sum_funcs wasn't reset before query
    processing.

  mysql-test/t/update.test
    1.22 05/09/22 01:38:16 evgen@moonbone.local +12 -0
    Test case for bug#13180 thd->allow_sum_funcs wasn't reset before query
    processing.

  sql/sql_prepare.cc
    1.154 05/09/22 01:37:40 evgen@moonbone.local +1 -0
    Fix bug#13180 thd->allow_sum_func wasn't reset obefore query processing.
    thd->allow_sum_func is set to 0 in  reset_stmt_for_execute().

  sql/sql_lex.cc
    1.148 05/09/22 01:37:15 evgen@moonbone.local +1 -0
    Fix bug#13180 thd->allow_sum_func wasn't reset obefore query processing.
    thd->allow_sum_func is set to 0 in lex_start().

ChangeSet
  1.2443.6.1 05/09/21 23:10:51 bar@mysql.com +30 -0
    Bug#13046: LIKE pattern matching using prefix
               index doesn't return correct result
  item_cmpfunc.cc:
    Use charset of LIKE to decide whether
    to use 8bit or Unicode "escape" value.
    But use charset of "escape" to scan escape character.
  strings/ctype-xxx.c:
    We cannot reduce "end" pointer using charpos(),
    because of possible escape characters in the string.
    Limit the loop using count of written characters instead.
  ctype_like_escape.inc:
    new file
  mysql-test/t/ctype_xxx:
  mysql-test/r/ctype_xxx:
    Adding test case.

  sql/item_cmpfunc.cc
    1.199 05/09/21 22:38:43 bar@mysql.com +3 -2
    More fixes.

  sql/item_cmpfunc.cc
    1.198 05/09/21 22:18:11 bar@mysql.com +1 -1
    Use charset of "escape" rather than
    charset of LIKE. Note: "escape" string
    is not aggregated with LIKE arguments,
    so we should use charset of "escape"
    to scan a character from it.

  mysql-test/r/ctype_utf8.result
    1.65 05/09/21 22:17:30 bar@mysql.com +36 -0
    Adding test case.

  mysql-test/r/ctype_ujis.result
    1.12 05/09/21 22:17:30 bar@mysql.com +36 -0
    Adding test case.

  mysql-test/r/ctype_ucs.result
    1.26 05/09/21 22:17:29 bar@mysql.com +36 -0
    Adding test case.

  mysql-test/r/ctype_uca.result
    1.14 05/09/21 22:17:28 bar@mysql.com +18 -0
    Adding test case.

  mysql-test/r/ctype_tis620.result
    1.9 05/09/21 22:17:28 bar@mysql.com +36 -0
    Adding test case.

  mysql-test/r/ctype_sjis.result
    1.8 05/09/21 22:17:27 bar@mysql.com +36 -0
    Adding test case.

  mysql-test/r/ctype_latin1.result
    1.6 05/09/21 22:17:26 bar@mysql.com +36 -0
    Adding test case.

  mysql-test/r/ctype_gbk.result
    1.2 05/09/21 22:17:25 bar@mysql.com +36 -0
    Adding test case.

  mysql-test/r/ctype_cp932.result
    1.6 05/09/21 22:17:24 bar@mysql.com +36 -0
    Adding test case.

  mysql-test/r/ctype_big5.result
    1.9 05/09/21 22:17:20 bar@mysql.com +36 -0
    Adding test case.

  mysql-test/t/ctype_utf8.test
    1.67 05/09/21 22:13:38 bar@mysql.com +2 -0
    Adding test case.

  mysql-test/t/ctype_ujis.test
    1.15 05/09/21 22:13:37 bar@mysql.com +2 -0
    Adding test case.

  mysql-test/t/ctype_ucs.test
    1.25 05/09/21 22:13:36 bar@mysql.com +2 -0
    Adding test case.

  mysql-test/t/ctype_uca.test
    1.12 05/09/21 22:13:35 bar@mysql.com +1 -0
    Adding test case.

  mysql-test/t/ctype_tis620.test
    1.11 05/09/21 22:13:35 bar@mysql.com +2 -0
    Adding test case.

  mysql-test/t/ctype_sjis.test
    1.9 05/09/21 22:13:34 bar@mysql.com +2 -0
    Adding test case.

  mysql-test/t/ctype_latin1.test
    1.6 05/09/21 22:13:33 bar@mysql.com +2 -0
    Adding test case.

  mysql-test/t/ctype_gbk.test
    1.3 05/09/21 22:13:32 bar@mysql.com +2 -0
    Adding test case.

  mysql-test/t/ctype_cp932.test
    1.7 05/09/21 22:13:27 bar@mysql.com +2 -0
    Adding test case.

  mysql-test/t/ctype_big5.test
    1.9 05/09/21 22:13:01 bar@mysql.com +2 -0
    Adding test case.

  strings/ctype-ucs2.c
    1.44 05/09/21 22:12:22 bar@mysql.com +4 -2
    Bug#13046: LIKE pattern matching using prefix index doesn't return correct
    result
    We cannot change "end" pointer using charpos(),
    because of possible escape characters.
    Use limit by count of written characters instead

  strings/ctype-tis620.c
    1.82 05/09/21 22:12:21 bar@mysql.com +3 -68
    Bug#13046: LIKE pattern matching using prefix index doesn't return correct
    result
    We cannot change "end" pointer using charpos(),
    because of possible escape characters.
    Use limit by count of written characters instead

  strings/ctype-sjis.c
    1.81 05/09/21 22:12:18 bar@mysql.com +4 -7
    Bug#13046: LIKE pattern matching using prefix index doesn't return correct
    result
    We cannot change "end" pointer using charpos(),
    because of possible escape characters.
    Use limit by count of written characters instead

  strings/ctype-simple.c
    1.66 05/09/21 22:12:15 bar@mysql.com +3 -8
    Bug#13046: LIKE pattern matching using prefix index doesn't return correct
    result
    We cannot change "end" pointer using charpos(),
    because of possible escape characters.
    Use limit by count of written characters instead

  strings/ctype-mb.c
    1.41 05/09/21 22:12:14 bar@mysql.com +4 -13
    Bug#13046: LIKE pattern matching using prefix index doesn't return correct
    result
    We cannot change "end" pointer using charpos(),
    because of possible escape characters.
    Use limit by count of written characters instead

  strings/ctype-gbk.c
    1.72 05/09/21 22:12:12 bar@mysql.com +7 -8
    Bug#13046: LIKE pattern matching using prefix index doesn't return correct
    result
    We cannot change "end" pointer using charpos(),
    because of possible escape characters.
    Use limit by count of written characters instead

  strings/ctype-cp932.c
    1.7 05/09/21 22:11:48 bar@mysql.com +4 -7
    Bug#13046: LIKE pattern matching using prefix index doesn't return correct
    result
    We cannot change "end" pointer using charpos(),
    because of possible escape characters.
    Use limit by count of written characters instead

  strings/ctype-big5.c
    1.78 05/09/21 22:10:01 bar@mysql.com +7 -8
    Bug#13046: LIKE pattern matching using prefix index doesn't return correct result
    We cannot change "end" pointer using charpos(),
    because of possible escape characters.
    Use limit by count of written characters instead.

  mysql-test/include/ctype_like_escape.inc
    1.1 05/09/21 22:09:49 bar@mysql.com +18 -0

  mysql-test/include/ctype_like_escape.inc
    1.0 05/09/21 22:09:49 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/include/ctype_like_escape.inc

ChangeSet
  1.2449.1.3 05/09/21 19:30:28 sergefp@mysql.com +1 -0
  Fix compiler error: C++ code in C 

  myisam/myisamchk.c
    1.127 05/09/21 19:30:25 sergefp@mysql.com +1 -1
    Fix compiler error: C++ code in C 

ChangeSet
  1.2446.1.1 05/09/21 17:24:39 jonas@perch.ndb.mysql.com +3 -0
  bug#12950
      ndb backup with charsets and simultanious updates
      make sure that backup _dont_ read xfrm data

  ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
    1.8 05/09/21 17:24:38 jonas@perch.ndb.mysql.com +7 -5
    Fix so that backup dont read xfrm data

  ndb/src/kernel/blocks/dbtup/Dbtup.hpp
    1.20 05/09/21 17:24:38 jonas@perch.ndb.mysql.com +2 -1
    Fix so that backup dont read xfrm data

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.21 05/09/21 17:24:38 jonas@perch.ndb.mysql.com +1 -0
    Backup can do dirty read

ChangeSet
  1.2433.3.3 05/09/22 00:41:46 stewart@mysql.com +5 -0
  BUG#11595 ndb_mgm shows from IP for second mgmd
  BUG#12037 ndb_mgmd IP address do not show in other ndb_mgmd processes
  
  Extend ApiVersionConf to include address.

  ndb/src/mgmsrv/Services.cpp
    1.38 05/09/22 00:41:44 stewart@mysql.com +5 -3
    Get the connect address from mgmsrv.status()

  ndb/src/mgmsrv/MgmtSrvr.hpp
    1.32 05/09/22 00:41:44 stewart@mysql.com +4 -3
    Add char **address to prototypes.

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.71 05/09/22 00:41:44 stewart@mysql.com +43 -7
    ::status() now also returns char* address of the node.
    For API or MGM, this is in ApiVersionConf.
    For NDB, this is the standard get_connect_address.
    
    When sending ApiVersionReq, try to send to a STARTED node (as these have
    properly joined the cluster and know the connect addresses).
    
    If versionNode is called for getOwnNodeId()==nodeId, try to get the address
    via ApiVersionConf. If that fails, look it up in the configuration.

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.15 05/09/22 00:41:41 stewart@mysql.com +2 -0
    include connect address in ApiVersionConf

  ndb/include/kernel/signaldata/ApiVersion.hpp
    1.2 05/09/22 00:41:40 stewart@mysql.com +2 -3
    Extend ApiVersionConf to include inet_addr. the address used for communication to this node.

ChangeSet
  1.2442.1.1 05/09/21 17:28:25 monty@mysql.com +2 -0
  Ensure that hex strings are used as integers in cast(... signed/unsigned)
  This fixes the new report for bug #7036

  sql/item.h
    1.191 05/09/21 17:28:23 monty@mysql.com +1 -0
    Ensure that hex strings are used as integers in cast(... signed/unsigned)

  mysql-test/t/cast.test
    1.19 05/09/21 17:28:23 monty@mysql.com +4 -0
    Added test for cast(hex-value to signed/unsigned)

ChangeSet
  1.2449 05/09/21 14:39:28 jonas@perch.ndb.mysql.com +1 -0
  Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push

  sql/mysqld.cc
    1.599 05/09/21 14:39:25 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2443.5.1 05/09/21 14:32:19 ramil@mysql.com +5 -0
  a fix (bug #7589: Decimal types are ignored when updating data from another column).

  sql/field_conv.cc
    1.38 05/09/21 14:32:12 ramil@mysql.com +3 -0
    a fix (bug #7589: Decimal types are ignored when updating data from another column).
    use memcpy() only for identical decimals.

  mysql-test/t/union.test
    1.87 05/09/21 14:32:12 ramil@mysql.com +0 -8
    a fix (bug #7589: Decimal types are ignored when updating data from another column).
    removed wrong test result (see #13372)

  mysql-test/t/type_decimal.test
    1.20 05/09/21 14:32:12 ramil@mysql.com +10 -0
    a fix (bug #7589: Decimal types are ignored when updating data from another column).

  mysql-test/r/union.result
    1.92 05/09/21 14:32:12 ramil@mysql.com +0 -15
    a fix (bug #7589: Decimal types are ignored when updating data from another column).
    removed wrong test result (see #13372)

  mysql-test/r/type_decimal.result
    1.25 05/09/21 14:32:12 ramil@mysql.com +9 -0
    a fix (bug #7589: Decimal types are ignored when updating data from another column).

ChangeSet
  1.2443.4.1 05/09/21 10:24:46 msvensson@neptunus.(none) +1 -0
  Don't add all args to mysqltest to MYSQL_TEST env var 

  mysql-test/mysql-test-run.pl
    1.44 05/09/21 10:24:42 msvensson@neptunus.(none) +12 -8
    Not all args to mysqltest should be added to the MYSQL_TEST environment variable. The MYSQL_TEST var is used when testing mysqltest and --record and result_file should not be set.  

ChangeSet
  1.2443.1.6 05/09/21 09:53:42 timour@mysql.com +1 -0
  Merge mysql.com:/home/timka/mysql/src/4.1-virgin
  into  mysql.com:/home/timka/mysql/src/4.1-dbg

  sql/opt_sum.cc
    1.44 05/09/21 09:53:38 timour@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2420.6.1 05/09/21 09:49:19 timour@mysql.com +4 -0
  Fix for BUG#12882 - min/max inconsistent on empty table.
  
  The problem was in that the MIN/MAX optimization in opt_sum_query was
  replacing MIN/MAX functions with their constant argument without
  taking into account that a query has no result rows.

  sql/opt_sum.cc
    1.42.1.1 05/09/21 09:49:16 timour@mysql.com +67 -29
    * Do not apply MIN/MAX optimization when the operand of MIN/MAX is
      a constant if it can't be determined whether the query has any
      result rows. The reason is that if the query has result rows,
      then the result of MIN/MAX is its constant argument, but if the
      query result is empty, then the result of MIN/MAX must be NULL
      irrespective of its argument.
    
    * The patch also simplifies a bit the branch that hadles COUNT().

  sql/item_sum.cc
    1.146 05/09/21 09:49:16 timour@mysql.com +1 -1
    If it is known that a query has no result rows, do not call add()
    via the call to Item_sum::no_rows_in_result() which calls reset().
    Instead directly call clear() so that the MIN and MAX functions
    produce NULL when there are no result rows.

  mysql-test/t/func_group.test
    1.31 05/09/21 09:49:16 timour@mysql.com +69 -0
    Test for BUG#12882.

  mysql-test/r/func_group.result
    1.39 05/09/21 09:49:16 timour@mysql.com +136 -0
    Test for BUG#12882.

ChangeSet
  1.2443.1.5 05/09/21 02:20:55 sergefp@mysql.com +1 -0
  Merge mysql.com:/home/psergey/bk-trees/mysql-4.1
  into mysql.com:/home/psergey/mysql-4.1-csc6030-r3

  sql/mysqld.cc
    1.597.1.1 05/09/21 02:20:54 sergefp@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2406.6.2 05/09/21 02:18:29 sergefp@mysql.com +10 -0
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index
  statistics (like 4.0 did) (patch #3, with review #1 & #2 feedback addressed)

  sql/sql_class.h
    1.283 05/09/21 02:18:26 sergefp@mysql.com +1 -0
    BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics

  sql/set_var.cc
    1.178 05/09/21 02:18:26 sergefp@mysql.com +10 -0
    BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics

  sql/mysqld.cc
    1.595.1.1 05/09/21 02:18:26 sergefp@mysql.com +28 -0
    BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics

  sql/handler.h
    1.143 05/09/21 02:18:26 sergefp@mysql.com +1 -0
    BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics

  sql/ha_myisam.cc
    1.160 05/09/21 02:18:26 sergefp@mysql.com +9 -0
    BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics

  mysql-test/t/myisam.test
    1.41 05/09/21 02:18:26 sergefp@mysql.com +47 -0
    BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics

  mysql-test/r/myisam.result
    1.52 05/09/21 02:18:26 sergefp@mysql.com +61 -0
    BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics

  myisam/myisamchk.c
    1.126 05/09/21 02:18:26 sergefp@mysql.com +26 -1
    BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics

  myisam/mi_check.c
    1.150 05/09/21 02:18:26 sergefp@mysql.com +17 -13
    BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics

  include/myisam.h
    1.64 05/09/21 02:18:25 sergefp@mysql.com +15 -0
    BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics

ChangeSet
  1.2443.1.4 05/09/20 20:11:38 SergeyV@selena. +1 -0
  Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  selena.:H:/MYSQL/src/#12929-mysql-4.1

  include/my_sys.h
    1.144 05/09/20 20:11:29 SergeyV@selena. +0 -0
    Auto merged

ChangeSet
  1.2398.19.2 05/09/20 20:03:51 SergeyV@selena. +1 -0
  Small update for lock functions used in my_cgets()

  mysys/my_conio.c
    1.2 05/09/20 20:03:44 SergeyV@selena. +91 -20
    Small update for lock functions used in my_cgets()

ChangeSet
  1.2443.1.3 05/09/20 14:20:02 tomas@poseidon.ndb.mysql.com +1 -0
  Bug #10694  	LOAD DATA FROM INFILE fails with 'Out of operation records'

  sql/sql_load.cc
    1.84 05/09/20 14:19:58 tomas@poseidon.ndb.mysql.com +5 -2
    Bug #10694  	LOAD DATA FROM INFILE fails with 'Out of operation records'

ChangeSet
  1.2406.5.4 05/09/20 14:11:58 msvensson@neptunus.(none) +4 -0
  BUG#12959 mysqltest crashes if testcase passed with -x option
   - Enable testcases after help from Serg 

  mysql-test/t/mysqltest.test
    1.17 05/09/20 14:11:55 msvensson@neptunus.(none) +5 -5
    Add test for mysqltest -x

  mysql-test/r/mysqltest.result
    1.13 05/09/20 14:11:55 msvensson@neptunus.(none) +4 -0
    Add test for mysqltest -x

  mysql-test/mysql-test-run.pl
    1.41.1.1 05/09/20 14:11:55 msvensson@neptunus.(none) +12 -7
    Don't add all args to the MYSQL_TEST environment variable.

  client/mysqltest.c
    1.180.1.3 05/09/20 14:11:55 msvensson@neptunus.(none) +16 -8
    Dump output to stdout if no result file is specified
    Don't print verbose_msg when command fails whith expected error 

ChangeSet
  1.2406.5.3 05/09/20 12:13:17 msvensson@neptunus.(none) +1 -0
  Improved output

  client/mysqltest.c
    1.180.1.2 05/09/20 12:13:12 msvensson@neptunus.(none) +2 -1
    Don't print "At line: 0"

ChangeSet
  1.2448 05/09/20 09:50:10 jonas@perch.ndb.mysql.com +2 -0
  Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push

  sql/sql_yacc.yy
    1.393 05/09/20 09:50:07 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.468 05/09/20 09:50:07 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2433.3.2 05/09/20 17:34:46 stewart@mysql.com +8 -0
  Remove old and usused configuration locking code.
  
  Some new code that does this job is being written against 5.1. This code is
  largely removed from that work.

  ndb/src/mgmsrv/Services.hpp
    1.9 05/09/20 17:34:43 stewart@mysql.com +0 -3
    remove usused configuration locking code

  ndb/src/mgmsrv/Services.cpp
    1.37 05/09/20 17:34:43 stewart@mysql.com +0 -59
    remove unused configuration locking code

  ndb/src/mgmsrv/MgmtSrvrConfig.cpp
    1.7 05/09/20 17:34:43 stewart@mysql.com +0 -235
    remove CONFIG (UN)LOCK signals, lockConf/unlockConf, commit/rollback and changeConfig.
    
    never used.

  ndb/src/mgmsrv/MgmtSrvr.hpp
    1.31 05/09/20 17:34:43 stewart@mysql.com +0 -36
    remove prototypes for config lock and commit/rollback.

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.70 05/09/20 17:34:43 stewart@mysql.com +0 -20
    remove unused getPrimaryNode

  ndb/src/mgmsrv/Config.hpp
    1.7 05/09/20 17:34:43 stewart@mysql.com +0 -10
    remove unused generation number prototypes.

  ndb/src/mgmsrv/Config.cpp
    1.7 05/09/20 17:34:43 stewart@mysql.com +0 -87
    remove unused generation number code.
    
    remove unused Config::change

  ndb/include/kernel/GlobalSignalNumbers.h
    1.10 05/09/20 17:34:43 stewart@mysql.com +0 -8
    remove dead (never used) MGM_(UN)LOCK signal numbers

ChangeSet
  1.2443.3.3 05/09/19 19:33:59 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
  Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
  into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

  client/mysqltest.c
    1.182 05/09/19 19:33:56 jani@a193-229-222-105.elisa-laajakaista.fi +4 -3
    Merged from 4.0.

ChangeSet
  1.1346.1.808 05/09/19 18:45:22 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
  Fixed Bug#13275 mysqltest empty file bug

  client/mysqltest.c
    1.77.1.48 05/09/19 18:45:19 jani@a193-229-222-105.elisa-laajakaista.fi +31 -11
    Fixed Bug#13275 mysqltest empty file bug

ChangeSet
  1.2446 05/09/19 15:35:07 jonas@perch.ndb.mysql.com +6 -0
  ndb - imlp. show engine ndb status;
    that dump free list allocation per connection

  sql/sql_yacc.yy
    1.391.1.1 05/09/19 15:35:05 jonas@perch.ndb.mysql.com +3 -0
    imlp. show engine ndb status;
      that dump free list allocation per connection

  sql/sql_parse.cc
    1.466.1.1 05/09/19 15:35:05 jonas@perch.ndb.mysql.com +11 -0
    imlp. show engine ndb status;
      that dump free list allocation per connection

  sql/sql_lex.h
    1.186 05/09/19 15:35:04 jonas@perch.ndb.mysql.com +1 -1
    imlp. show engine ndb status;
      that dump free list allocation per connection

  sql/mysqld.cc
    1.598 05/09/19 15:35:04 jonas@perch.ndb.mysql.com +1 -0
    imlp. show engine ndb status;
      that dump free list allocation per connection

  sql/ha_ndbcluster.h
    1.57 05/09/19 15:35:04 jonas@perch.ndb.mysql.com +2 -0
    imlp. show engine ndb status;
      that dump free list allocation per connection

  sql/ha_ndbcluster.cc
    1.171 05/09/19 15:35:04 jonas@perch.ndb.mysql.com +46 -0
    imlp. show engine ndb status;
      that dump free list allocation per connection

ChangeSet
  1.2445 05/09/19 15:00:13 jonas@perch.ndb.mysql.com +1 -0
  Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push

  ndb/src/ndbapi/Ndbinit.cpp
    1.29 05/09/19 15:00:10 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2443.3.2 05/09/19 14:58:06 kent@mysql.com +1 -0
  mysql-test-run.pl:
    Added flag --valgrind-mysqltest

  mysql-test/mysql-test-run.pl
    1.43 05/09/19 14:47:38 kent@mysql.com +16 -5
    Added flag --valgrind-mysqltest

ChangeSet
  1.2443.3.1 05/09/19 14:05:54 jonas@perch.ndb.mysql.com +2 -0
  bug#9282 - ndb 
    big delete from causing NdbObjectIdMap::expand at same time 
    as receiver thread perform getObjectId 

  ndb/src/ndbapi/ObjectMap.hpp
    1.8 05/09/19 14:05:47 jonas@perch.ndb.mysql.com +20 -13
    Protect NdbObjectIdMap::expand from getObjectId

  ndb/src/ndbapi/Ndbinit.cpp
    1.27.1.1 05/09/19 14:05:47 jonas@perch.ndb.mysql.com +2 -1
    Protect NdbObjectIdMap::expand from getObjectId

ChangeSet
  1.2406.5.2 05/09/19 12:24:59 msvensson@neptunus.(none) +1 -0
  Clean up printout of line numbers

  client/mysqltest.c
    1.180.1.1 05/09/19 12:24:55 msvensson@neptunus.(none) +11 -16
    Only print line no if start_lineno > 0
    Remove lineno in calls to verbose_msg and die, this is handled by the function.

ChangeSet
  1.2443.2.2 05/09/19 04:39:49 evgen@moonbone.local +3 -0
  Fix bug #13218: InnoDB: using a partial-field key prefix in search
    
  This is backport from 5.0 of fix for bug #11039

  sql/opt_sum.cc
    1.43 05/09/19 04:39:31 evgen@moonbone.local +2 -1
    Fix bug #13218:  backport from 5.0 of bug #11039 fix

  mysql-test/r/innodb.result
    1.104 05/09/19 04:39:25 evgen@moonbone.local +9 -0
    Backport from 5.0 of test case for bug#11039

  mysql-test/t/innodb.test
    1.75 05/09/19 04:39:17 evgen@moonbone.local +9 -0
    Backport from 5.0 of test case for bug#11039

ChangeSet
  1.1346.1.807 05/09/18 13:16:32 paul@snake-hub.snake.net +1 -0
  .del-which.2~463417adb2e37122:
    Delete: man/which.2

  BitKeeper/deleted/.del-which.2~463417adb2e37122
    1.3 05/09/18 13:15:59 paul@snake-hub.snake.net +0 -0
    Delete: man/which.2

ChangeSet
  1.2443.1.1 05/09/17 18:46:54 sasha@asksasha.com +3 -0
  Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139

  mysql-test/t/rpl_multi_delete2.test
    1.5 05/09/17 18:46:49 sasha@asksasha.com +0 -0
    Auto merged

  mysql-test/t/rpl_multi_delete2-slave.opt
    1.4 05/09/17 18:46:49 sasha@asksasha.com +0 -0
    Auto merged

  mysql-test/r/rpl_multi_delete2.result
    1.5 05/09/17 18:46:49 sasha@asksasha.com +0 -0
    Auto merged

  mysql-test/t/rpl_multi_delete2.test
    1.4 05/09/17 18:46:49 sasha@asksasha.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_multi_delete2-slave.opt
    1.3 05/09/17 18:46:49 sasha@asksasha.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/r/rpl_multi_delete2.result
    1.4 05/09/17 18:46:49 sasha@asksasha.com +0 -0
    Turn off EOLN_NATIVE flag

ChangeSet
  1.2443 05/09/17 01:09:32 kent@mysql.com +1 -0
  mysql-test-run.pl:
    Enabled --valgrind to work (bug#13280)

  mysql-test/mysql-test-run.pl
    1.42 05/09/17 00:49:34 kent@mysql.com +73 -49
    Enabled --valgrind to work (bug#13280)

ChangeSet
  1.2420.5.2 05/09/16 14:18:27 jonas@perch.ndb.mysql.com +7 -0
  ndb 
    remove extra ";" from test programs

  ndb/test/src/NdbRestarts.cpp
    1.4 05/09/16 14:18:25 jonas@perch.ndb.mysql.com +15 -15
    Remove extra ";"

  ndb/test/src/NdbBackup.cpp
    1.23 05/09/16 14:18:25 jonas@perch.ndb.mysql.com +1 -1
    Remove extra ";"

  ndb/test/src/NDBT_Test.cpp
    1.21 05/09/16 14:18:25 jonas@perch.ndb.mysql.com +1 -1
    Remove extra ";"

  ndb/test/src/HugoCalculator.cpp
    1.7 05/09/16 14:18:25 jonas@perch.ndb.mysql.com +3 -3
    Remove extra ";"

  ndb/test/ndbapi/testOIBasic.cpp
    1.29 05/09/16 14:18:25 jonas@perch.ndb.mysql.com +3 -3
    Remove extra ";"

  ndb/test/ndbapi/bank/BankLoad.cpp
    1.7 05/09/16 14:18:25 jonas@perch.ndb.mysql.com +2 -2
    Remove extra ";"

  ndb/test/include/NDBT_Test.hpp
    1.11 05/09/16 14:18:25 jonas@perch.ndb.mysql.com +1 -1
    Remove extra ";"

ChangeSet
  1.2420.5.1 05/09/16 11:26:34 jonas@eel.(none) +18 -0
  ndb
    impl support for querying resource usage in ndb api
    to help track down mem leaks

  ndb/tools/restore/Restore.cpp
    1.24 05/09/16 11:26:31 jonas@eel.(none) +1 -1
    Impl. reporting of free list usage
    Put free list into handler class

  ndb/src/ndbapi/Ndblist.cpp
    1.13 05/09/16 11:26:31 jonas@eel.(none) +139 -382
    Impl. reporting of free list usage
    Put free list into handler class

  ndb/src/ndbapi/Ndbinit.cpp
    1.28 05/09/16 11:26:31 jonas@eel.(none) +0 -39
    Impl. reporting of free list usage
    Put free list into handler class

  ndb/src/ndbapi/Ndbif.cpp
    1.26 05/09/16 11:26:31 jonas@eel.(none) +0 -9
    Impl. reporting of free list usage
    Put free list into handler class

  ndb/src/ndbapi/NdbUtil.hpp
    1.5 05/09/16 11:26:31 jonas@eel.(none) +23 -17
    Impl. reporting of free list usage
    Put free list into handler class

  ndb/src/ndbapi/NdbUtil.cpp
    1.2 05/09/16 11:26:31 jonas@eel.(none) +6 -10
    Impl. reporting of free list usage
    Put free list into handler class

  ndb/src/ndbapi/NdbRecAttr.cpp
    1.14 05/09/16 11:26:31 jonas@eel.(none) +2 -2
    Impl. reporting of free list usage
    Put free list into handler class

  ndb/src/ndbapi/NdbImpl.hpp
    1.7 05/09/16 11:26:31 jonas@eel.(none) +119 -0
    Impl. reporting of free list usage
    Put free list into handler class

  ndb/src/ndbapi/NdbBlob.cpp
    1.19 05/09/16 11:26:31 jonas@eel.(none) +1 -1
    Impl. reporting of free list usage
    Put free list into handler class

  ndb/src/ndbapi/NdbApiSignal.hpp
    1.4 05/09/16 11:26:31 jonas@eel.(none) +2 -1
    Impl. reporting of free list usage
    Put free list into handler class

  ndb/src/ndbapi/NdbApiSignal.cpp
    1.8 05/09/16 11:26:31 jonas@eel.(none) +19 -0
    Impl. reporting of free list usage
    Put free list into handler class

  ndb/include/ndbapi/NdbRecAttr.hpp
    1.9 05/09/16 11:26:31 jonas@eel.(none) +5 -2
    Impl. reporting of free list usage
    Put free list into handler class

  ndb/include/ndbapi/NdbOperation.hpp
    1.19 05/09/16 11:26:31 jonas@eel.(none) +5 -3
    Impl. reporting of free list usage
    Put free list into handler class

  ndb/include/ndbapi/NdbIndexScanOperation.hpp
    1.8 05/09/16 11:26:31 jonas@eel.(none) +2 -0
    Impl. reporting of free list usage
    Put free list into handler class

  ndb/include/ndbapi/NdbIndexOperation.hpp
    1.7 05/09/16 11:26:31 jonas@eel.(none) +1 -0
    Impl. reporting of free list usage
    Put free list into handler class

  ndb/include/ndbapi/NdbConnection.hpp
    1.25 05/09/16 11:26:30 jonas@eel.(none) +6 -6
    Impl. reporting of free list usage
    Put free list into handler class

  ndb/include/ndbapi/NdbBlob.hpp
    1.10 05/09/16 11:26:30 jonas@eel.(none) +5 -1
    Impl. reporting of free list usage
    Put free list into handler class

  ndb/include/ndbapi/Ndb.hpp
    1.18 05/09/16 11:26:30 jonas@eel.(none) +13 -15
    Impl. reporting of free list usage
    Put free list into handler class

ChangeSet
  1.2398.19.1 05/09/16 01:56:16 SergeyV@selena. +5 -0
  Fixes bug #12929. Uses my_cgets instead of _cgets function, thus eliminating
  a restriction to 255 chars for editable buffer.

  mysys/my_conio.c
    1.1 05/09/16 01:56:09 SergeyV@selena. +146 -0
    Added _cgets() replacement that is not limited to 255 chars retrieval
    from win32 console.

  mysys/my_conio.c
    1.0 05/09/16 01:56:09 SergeyV@selena. +0 -0
    BitKeeper file H:/MYSQL/src/#12929-mysql-4.1/mysys/my_conio.c

  include/my_sys.h
    1.141.1.1 05/09/16 01:56:09 SergeyV@selena. +3 -0
    Added declarations for my_conio.c functions

  client/mysql.cc
    1.211 05/09/16 01:56:08 SergeyV@selena. +28 -3
    Fixes bug #12929. Uses my_cgets instead of _cgets function, thus eliminating
    a restriction to 255 chars for editable buffer.

  VC++Files/mysys/mysys_ia64.dsp
    1.3 05/09/16 01:56:08 SergeyV@selena. +4 -0
    Added my_conio.c

  VC++Files/mysys/mysys.dsp
    1.26 05/09/16 01:56:07 SergeyV@selena. +4 -0
    Added my_conio.c

ChangeSet
  1.2433.4.1 05/09/15 21:34:11 evgen@moonbone.local +3 -0
  Fix bug#12887 Distinct is not always applied after rollup
  
  For queries with GROUP BY and without hidden GROUP BY fields DISTINCT is
  optimized away becuase such queries produce result set without duplicates.
  But ROLLUP can add rows which may be same to some rows and this fact was
  ignored.
  
  Added check so if ROLLUP is present DISTINCT can't be optimized away.

  mysql-test/t/olap.test
    1.19 05/09/15 21:33:31 evgen@moonbone.local +9 -0
    Test case for bug #12887 Distinct is not always applied after rollup

  mysql-test/r/olap.result
    1.22 05/09/15 21:33:23 evgen@moonbone.local +12 -0
    Test case for bug #12887 Distinct is not always applied after rollup

  sql/sql_select.cc
    1.436 05/09/15 21:32:18 evgen@moonbone.local +1 -1
    Fix bug #12887 Distinct is not always applied after rollup

ChangeSet
  1.2441 05/09/15 10:00:25 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-12723
  into  mysql.com:/home/jimw/my/mysql-4.1-clean

  vio/viosocket.c
    1.34 05/09/15 10:00:23 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2440 05/09/15 17:59:01 monty@mysql.com +19 -0
  Turn off EOLN_NATIVE flag of some test files

  mysql-test/r/timezone3.result
    1.3 05/09/15 17:18:54 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/r/rpl_start_stop_slave.result
    1.5 05/09/15 17:18:54 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/r/rpl_set_charset.result
    1.5 05/09/15 17:18:54 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/r/rpl_server_id2.result
    1.6 05/09/15 17:18:54 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/r/rpl_server_id1.result
    1.5 05/09/15 17:18:53 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/r/rpl_multi_update2.result
    1.3 05/09/15 17:18:53 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/r/rpl_multi_update.result
    1.6 05/09/15 17:18:53 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/r/rpl_multi_delete2.result
    1.2.1.1 05/09/15 17:18:53 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/r/rpl_free_items.result
    1.3 05/09/15 17:18:53 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/r/rpl_drop.result
    1.3 05/09/15 17:18:53 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/r/rpl_commit_after_flush.result
    1.3 05/09/15 17:18:53 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/r/lock_multi.result
    1.10 05/09/15 17:18:53 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/r/innodb-lock.result
    1.6 05/09/15 17:18:53 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/r/have_outfile.require
    1.2 05/09/15 17:18:53 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/r/have_moscow_leap_timezone.require
    1.2 05/09/15 17:18:53 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/r/flush_table.result
    1.6 05/09/15 17:18:53 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/r/flush_block_commit.result
    1.5 05/09/15 17:18:52 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/r/create_select_tmp.result
    1.4 05/09/15 17:18:52 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/r/analyze.result
    1.2 05/09/15 17:18:52 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

ChangeSet
  1.2439 05/09/15 17:17:26 monty@mysql.com +121 -0
  Merge mysql.com:/home/my/mysql-4.0
  into  mysql.com:/home/my/mysql-4.1

  mysql-test/t/timezone3.test
    1.4 05/09/15 17:17:22 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/variables-master.opt
    1.4 05/09/15 17:17:22 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/type_set.test
    1.10 05/09/15 17:17:22 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/timezone3.test
    1.3 05/09/15 17:17:22 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/timezone.test
    1.9 05/09/15 17:17:22 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/timezone-master.opt
    1.3 05/09/15 17:17:22 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/system_mysql_db_fix-master.opt
    1.8 05/09/15 17:17:21 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/system_mysql_db_refs.test
    1.8 05/09/15 17:17:21 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/system_mysql_db_fix.test
    1.12 05/09/15 17:17:21 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/system_mysql_db_fix-master.opt
    1.7 05/09/15 17:17:21 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/system_mysql_db.test
    1.6 05/09/15 17:17:21 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_trunc_binlog.test
    1.11 05/09/15 17:17:21 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_start_stop_slave.test
    1.4 05/09/15 17:17:21 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_set_charset.test
    1.7 05/09/15 17:17:20 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_server_id2.test
    1.7 05/09/15 17:17:20 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_server_id1.test
    1.7 05/09/15 17:17:20 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_multi_update2.test
    1.5 05/09/15 17:17:20 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_multi_update.test
    1.8 05/09/15 17:17:20 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_start_stop_slave.test
    1.3 05/09/15 17:17:20 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_skip_error.test
    1.6 05/09/15 17:17:20 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_skip_error-slave.opt
    1.3 05/09/15 17:17:20 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_set_charset.test
    1.6 05/09/15 17:17:20 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_server_id2.test
    1.6 05/09/15 17:17:20 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_server_id1.test
    1.6 05/09/15 17:17:20 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_reset_slave.test
    1.7 05/09/15 17:17:20 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_relayspace.test
    1.5 05/09/15 17:17:20 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_relayspace-slave.opt
    1.5 05/09/15 17:17:20 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_optimize.test
    1.4 05/09/15 17:17:20 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_multi_update2.test
    1.4 05/09/15 17:17:20 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_multi_update.test
    1.7 05/09/15 17:17:20 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_multi_delete2.test
    1.2.1.2 05/09/15 17:17:19 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_multi_delete2.test
    1.2.1.1 05/09/15 17:17:19 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_multi_delete.test
    1.4 05/09/15 17:17:19 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_multi_delete-slave.opt
    1.3 05/09/15 17:17:19 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_max_relay_size.test
    1.12 05/09/15 17:17:19 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_master_pos_wait.test
    1.6 05/09/15 17:17:19 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_log-slave.opt
    1.3 05/09/15 17:17:19 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_log-master.opt
    1.3 05/09/15 17:17:19 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_loaddatalocal.test
    1.5 05/09/15 17:17:19 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_loaddata_rule_s.test
    1.4 05/09/15 17:17:19 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_loaddata_rule_s-slave.opt
    1.3 05/09/15 17:17:19 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_loaddata_rule_m.test
    1.6 05/09/15 17:17:19 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_loaddata_rule_m-master.opt
    1.3 05/09/15 17:17:19 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_loaddata.test
    1.15 05/09/15 17:17:19 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_free_items.test
    1.4 05/09/15 17:17:18 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_insert_id.test
    1.11 05/09/15 17:17:18 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_ignore_grant.test
    1.5 05/09/15 17:17:18 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_ignore_grant-slave.opt
    1.3 05/09/15 17:17:18 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_heap.test
    1.6 05/09/15 17:17:18 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_get_lock.test
    1.13 05/09/15 17:17:18 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_free_items.test
    1.3 05/09/15 17:17:18 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_flush_log_loop.test
    1.10 05/09/15 17:17:18 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_flush_log_loop-slave.sh
    1.3 05/09/15 17:17:18 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_flush_log_loop-slave.opt
    1.4 05/09/15 17:17:17 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_flush_log_loop-master.sh
    1.3 05/09/15 17:17:17 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_flush_log_loop-master.opt
    1.4 05/09/15 17:17:17 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_failsafe.test
    1.9 05/09/15 17:17:17 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_error_ignored_table.test
    1.15 05/09/15 17:17:16 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_drop.test
    1.6 05/09/15 17:17:16 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_commit_after_flush.test
    1.5 05/09/15 17:17:16 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_error_ignored_table.test
    1.14 05/09/15 17:17:16 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_error_ignored_table-slave.opt
    1.5 05/09/15 17:17:16 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_empty_master_crash.test
    1.9 05/09/15 17:17:16 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_drop.test
    1.5 05/09/15 17:17:16 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_do_grant.test
    1.5 05/09/15 17:17:16 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_commit_after_flush.test
    1.4 05/09/15 17:17:16 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_change_master.test
    1.9 05/09/15 17:17:16 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_chain_temp_table.test
    1.5 05/09/15 17:17:16 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_alter.test
    1.8 05/09/15 17:17:16 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_EE_error.test
    1.6 05/09/15 17:17:15 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/repair.test
    1.12 05/09/15 17:17:15 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/query_cache_merge.test
    1.6 05/09/15 17:17:15 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/query_cache.test
    1.47 05/09/15 17:17:15 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/packet.test
    1.7 05/09/15 17:17:15 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/mysqldump.test
    1.39 05/09/15 17:17:15 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/mysqlbinlog.test
    1.15 05/09/15 17:17:15 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/mysqlbinlog-master.opt
    1.3 05/09/15 17:17:15 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/myisam-blob.test
    1.5 05/09/15 17:17:15 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/myisam-blob-master.opt
    1.3 05/09/15 17:17:15 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/lock_multi.test
    1.11 05/09/15 17:17:14 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/multi_update-master.opt
    1.3 05/09/15 17:17:14 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/mix_innodb_myisam_binlog.test
    1.10 05/09/15 17:17:14 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/lowercase_table3.test
    1.8 05/09/15 17:17:14 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/lowercase_table3-master.opt
    1.4 05/09/15 17:17:14 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/lowercase_table2.test
    1.13 05/09/15 17:17:14 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/lowercase_table.test
    1.20 05/09/15 17:17:14 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/lowercase_table-master.opt
    1.3 05/09/15 17:17:14 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/lock_tables_lost_commit.test
    1.8 05/09/15 17:17:14 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/lock_tables_lost_commit-master.opt
    1.5 05/09/15 17:17:14 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/lock_multi.test
    1.10 05/09/15 17:17:14 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/loaddata.test
    1.9 05/09/15 17:17:14 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/isam.test
    1.13 05/09/15 17:17:14 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/innodb_handler.test
    1.10 05/09/15 17:17:14 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/innodb_cache.test
    1.11 05/09/15 17:17:14 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/innodb_cache-master.opt
    1.3 05/09/15 17:17:14 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/innodb-lock.test
    1.10 05/09/15 17:17:13 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/innodb-lock.test
    1.9 05/09/15 17:17:13 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/innodb-deadlock.test
    1.9 05/09/15 17:17:13 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/init_file.test
    1.6 05/09/15 17:17:13 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/init_file-master.opt
    1.4 05/09/15 17:17:13 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/grant_cache.test
    1.14 05/09/15 17:17:13 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/grant.test
    1.31 05/09/15 17:17:13 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/gcc296.test
    1.5 05/09/15 17:17:13 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/func_isnull.test
    1.5 05/09/15 17:17:13 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/func_if.test
    1.15 05/09/15 17:17:13 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/flush_block_commit.test
    1.8 05/09/15 17:17:12 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/func_if.test
    1.14 05/09/15 17:17:12 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/func_encrypt-master.opt
    1.4 05/09/15 17:17:12 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/func_concat.test
    1.8 05/09/15 17:17:12 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/flush_block_commit.test
    1.7 05/09/15 17:17:12 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/drop_temp_table.test
    1.7 05/09/15 17:17:12 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/ctype_ujis.test
    1.14 05/09/15 17:17:12 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/ctype_tis620.test
    1.10 05/09/15 17:17:12 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/ctype_latin1_de.test
    1.23 05/09/15 17:17:12 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/ctype_latin1_de.test
    1.22 05/09/15 17:17:11 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/ctype_latin1_de-master.opt
    1.7 05/09/15 17:17:11 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/ctype_cp1251.test
    1.7 05/09/15 17:17:11 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/create_select_tmp.test
    1.7 05/09/15 17:17:10 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/create_select_tmp.test
    1.6 05/09/15 17:17:10 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/constraints.test
    1.6 05/09/15 17:17:10 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/cast.test
    1.18 05/09/15 17:17:10 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/bool.test
    1.7 05/09/15 17:17:10 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/bdb_cache.test
    1.8 05/09/15 17:17:10 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/bdb_cache-master.opt
    1.3 05/09/15 17:17:10 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/bdb-deadlock.test
    1.9 05/09/15 17:17:10 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/bdb-alter-table-2-master.opt
    1.3 05/09/15 17:17:10 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/backup-master.sh
    1.3 05/09/15 17:17:09 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/ansi.test
    1.8 05/09/15 17:17:09 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/analyze.test
    1.5 05/09/15 17:17:08 monty@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-rpl000016-slave.opt~ef76f85ddcc13b87
    1.4 05/09/15 17:17:08 monty@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-query_cache_notembedded.test
    1.5 05/09/15 17:17:08 monty@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-ctype_ujis-master.opt~9f5cc09930fc1cf9
    1.4 05/09/15 17:17:08 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/analyze.test
    1.4 05/09/15 17:17:08 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  BitKeeper/deleted/.del-rpl000016-slave.opt~ef76f85ddcc13b87
    1.3 05/09/15 17:17:08 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  BitKeeper/deleted/.del-repair_part2.test~c20f60783b04d001
    1.4 05/09/15 17:17:08 monty@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-repair_part2-master.sh~f44a8c15d6c36585
    1.4 05/09/15 17:17:08 monty@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-query_cache_notembedded.test
    1.4 05/09/15 17:17:08 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  BitKeeper/deleted/.del-grant_cache-master.opt~1b04b4b1116a7a2
    1.4 05/09/15 17:17:08 monty@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-ctype_ujis-master.opt~9f5cc09930fc1cf9
    1.3 05/09/15 17:17:07 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  BitKeeper/deleted/.del-convert.test~f4ceb743194dfe72
    1.4 05/09/15 17:17:07 monty@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-ansi-master.opt~4d337eb61642a838
    1.4 05/09/15 17:17:07 monty@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-repair_part2.test~c20f60783b04d001
    1.1.1.2 05/09/15 17:17:07 monty@mysql.com +0 -0
    Merge rename: mysql-test/t/repair_part2.test -> BitKeeper/deleted/.del-repair_part2.test~c20f60783b04d001

  BitKeeper/deleted/.del-repair_part2-master.sh~f44a8c15d6c36585
    1.1.1.2 05/09/15 17:17:07 monty@mysql.com +0 -0
    Merge rename: mysql-test/t/repair_part2-master.sh -> BitKeeper/deleted/.del-repair_part2-master.sh~f44a8c15d6c36585

  BitKeeper/deleted/.del-query_cache_notembedded.test
    1.2.1.2 05/09/15 17:17:07 monty@mysql.com +0 -0
    Merge rename: mysql-test/t/query_cache_notembedded.test -> BitKeeper/deleted/.del-query_cache_notembedded.test

  BitKeeper/deleted/.del-grant_cache-master.opt~1b04b4b1116a7a2
    1.1.1.2 05/09/15 17:17:07 monty@mysql.com +0 -0
    Merge rename: mysql-test/t/grant_cache-master.opt -> BitKeeper/deleted/.del-grant_cache-master.opt~1b04b4b1116a7a2

  BitKeeper/deleted/.del-ctype_ujis-master.opt~9f5cc09930fc1cf9
    1.1.1.2 05/09/15 17:17:07 monty@mysql.com +0 -0
    Merge rename: mysql-test/t/ctype_ujis-master.opt -> BitKeeper/deleted/.del-ctype_ujis-master.opt~9f5cc09930fc1cf9

  BitKeeper/deleted/.del-ctype_tis620-master.opt~38b79f80b9348a14
    1.4 05/09/15 17:17:07 monty@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-ctype_cp1251-master.opt~68be9a59ec8ee106
    1.4 05/09/15 17:17:07 monty@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-convert.test~f4ceb743194dfe72
    1.3 05/09/15 17:17:07 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  BitKeeper/deleted/.del-ansi-master.opt~4d337eb61642a838
    1.3 05/09/15 17:17:07 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  BitKeeper/deleted/.del-rpl000016-slave.opt~ef76f85ddcc13b87
    1.1.1.2 05/09/15 17:17:06 monty@mysql.com +0 -0
    Merge rename: mysql-test/t/rpl000016-slave.opt -> BitKeeper/deleted/.del-rpl000016-slave.opt~ef76f85ddcc13b87

  BitKeeper/deleted/.del-ctype_tis620-master.opt~38b79f80b9348a14
    1.1.1.2 05/09/15 17:17:06 monty@mysql.com +0 -0
    Merge rename: mysql-test/t/ctype_tis620-master.opt -> BitKeeper/deleted/.del-ctype_tis620-master.opt~38b79f80b9348a14

  BitKeeper/deleted/.del-ctype_cp1251-master.opt~68be9a59ec8ee106
    1.1.1.2 05/09/15 17:17:06 monty@mysql.com +0 -0
    Merge rename: mysql-test/t/ctype_cp1251-master.opt -> BitKeeper/deleted/.del-ctype_cp1251-master.opt~68be9a59ec8ee106

  BitKeeper/deleted/.del-convert.test~f4ceb743194dfe72
    1.1.1.2 05/09/15 17:17:06 monty@mysql.com +0 -0
    Merge rename: mysql-test/t/convert.test -> BitKeeper/deleted/.del-convert.test~f4ceb743194dfe72

  BitKeeper/deleted/.del-ansi-master.opt~4d337eb61642a838
    1.1.1.2 05/09/15 17:17:06 monty@mysql.com +0 -0
    Merge rename: mysql-test/t/ansi-master.opt -> BitKeeper/deleted/.del-ansi-master.opt~4d337eb61642a838

  BitKeeper/etc/ignore
    1.233 05/09/15 17:16:58 monty@mysql.com +4 -6
    auto-union

ChangeSet
  1.1346.1.806 05/09/15 17:14:39 monty@mysql.com +127 -0
  Turn off EOLN_NATIVE flag for all test files
  Ignored some generated files

  BitKeeper/etc/ignore
    1.107.1.55 05/09/15 17:13:30 monty@mysql.com +1 -0
    added support-files/MacOSX/preflight

  BitKeeper/etc/ignore
    1.107.1.54 05/09/15 17:13:25 monty@mysql.com +1 -1
    added support-files/MacOSX/postflight

  BitKeeper/etc/ignore
    1.107.1.53 05/09/15 17:12:19 monty@mysql.com +1 -0
    added support-files/MacOSX/postflight.sh

  mysql-test/t/variables-master.opt
    1.1.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/type_set.test
    1.2.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/timezone3.test
    1.1.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/timezone3-master.opt
    1.2 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/timezone.test
    1.4.2.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/timezone-master.opt
    1.1.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/system_mysql_db_refs.test
    1.2.2.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/system_mysql_db_fix.test
    1.2.2.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/system_mysql_db_fix-master.opt
    1.1.1.3 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/system_mysql_db.test
    1.1.2.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_trunc_binlog.test
    1.2.1.5 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_start_stop_slave.test
    1.1.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_skip_error.test
    1.2.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_skip_error-slave.opt
    1.1.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_set_charset.test
    1.3.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_server_id2.test
    1.4.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_server_id2-slave.opt
    1.2 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_server_id1.test
    1.2.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_reset_slave.test
    1.1.1.2 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_relayspace.test
    1.2.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_relayspace-slave.opt
    1.2.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_optimize.test
    1.1.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_multi_update2.test
    1.1.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_multi_update2-slave.opt
    1.2 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_multi_update.test
    1.1.1.2 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_multi_delete2.test
    1.1.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_multi_delete2-slave.opt
    1.1.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_multi_delete.test
    1.1.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_multi_delete-slave.opt
    1.1.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_max_relay_size.test
    1.3.2.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_master_pos_wait.test
    1.2.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_log-slave.opt
    1.1.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_log-master.opt
    1.1.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_loaddatalocal.test
    1.2.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_loaddata_rule_s.test
    1.1.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_loaddata_rule_s-slave.opt
    1.1.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_loaddata_rule_m.test
    1.1.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_loaddata_rule_m-master.opt
    1.1.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_loaddata.test
    1.2.1.8 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_insert_id.test
    1.1.3.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_ignore_grant.test
    1.1.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_ignore_grant-slave.opt
    1.1.1.1 05/09/15 17:04:45 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_heap.test
    1.1.2.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_get_lock.test
    1.8.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_free_items.test
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_free_items-slave.opt
    1.2 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_flush_log_loop.test
    1.2.1.2 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_flush_log_loop-slave.sh
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_flush_log_loop-slave.opt
    1.2.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_flush_log_loop-master.sh
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_flush_log_loop-master.opt
    1.2.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_failsafe.test
    1.5.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_error_ignored_table.test
    1.2.1.5 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_error_ignored_table-slave.opt
    1.3.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_empty_master_crash.test
    1.3.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_drop.test
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_do_grant.test
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_commit_after_flush.test
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_change_master.test
    1.1.1.2 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_chain_temp_table.test
    1.2.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_alter.test
    1.2.1.2 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl_EE_error.test
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/rpl000016-slave.opt
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/repair_part2.test
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/repair_part2-master.sh
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/repair.test
    1.1.1.4 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/query_cache_notembedded.test
    1.2.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/query_cache_merge.test
    1.2.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/query_cache.test
    1.16.5.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/packet.test
    1.2.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/mysqldump.test
    1.1.2.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/mysqlbinlog.test
    1.4.1.3 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/mysqlbinlog-master.opt
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/myisam-blob.test
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/myisam-blob-master.opt
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/multi_update-master.opt
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/mix_innodb_myisam_binlog.test
    1.2.2.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/mix_innodb_myisam_binlog-master.opt
    1.2 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/lowercase_table3.test
    1.2.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/lowercase_table3-master.opt
    1.2.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/lowercase_table2.test
    1.2.2.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/lowercase_table.test
    1.1.3.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/lowercase_table-master.opt
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/lock_tables_lost_commit.test
    1.1.1.2 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/lock_tables_lost_commit-master.opt
    1.1.1.2 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/lock_multi.test
    1.3.1.3 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/loaddata.test
    1.1.1.4 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/isam.test
    1.5.1.2 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/innodb_handler.test
    1.2.1.5 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/innodb_cache.test
    1.4.2.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/innodb_cache-master.opt
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/innodb-lock.test
    1.1.1.4 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/innodb-deadlock.test
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/init_file.test
    1.3.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/init_file-master.opt
    1.2.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/grant_cache.test
    1.2.2.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/grant_cache-master.opt
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/grant.test
    1.4.6.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/gcc296.test
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/func_isnull.test
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/func_if.test
    1.2.2.2 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/func_encrypt-master.opt
    1.2.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/func_concat.test
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/flush_block_commit.test
    1.1.1.2 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/drop_temp_table.test
    1.2.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/ctype_ujis.test
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/ctype_ujis-master.opt
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/ctype_tis620.test
    1.2.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/ctype_tis620-master.opt
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/ctype_latin1_de.test
    1.4.1.5 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/ctype_latin1_de-master.opt
    1.2.1.2 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/ctype_cp1251.test
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/ctype_cp1251-master.opt
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/create_select_tmp.test
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/convert.test
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/constraints.test
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/cast.test
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/bool.test
    1.2.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/bdb_cache.test
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/bdb_cache-master.opt
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/bdb-deadlock.test
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/bdb-alter-table-2-master.opt
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/backup-master.sh
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/ansi.test
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/ansi-master.opt
    1.1.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/analyze.test
    1.2.1.1 05/09/15 17:04:44 monty@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

ChangeSet
  1.2438 05/09/15 14:48:49 pekka@mysql.com +5 -0
  ndb - bug#9994 backpatch fixes from 5.0
        IGNORE on merge 4.1->5.0

  ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
    1.7 05/09/15 14:47:19 pekka@mysql.com +4 -0
    bug#9994 backpatch fixes from 5.0

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.59 05/09/15 14:47:14 pekka@mysql.com +8 -2
    bug#9994 backpatch fixes from 5.0

  ndb/src/kernel/blocks/dbdict/Dbdict.hpp
    1.11 05/09/15 14:47:14 pekka@mysql.com +230 -99
    bug#9994 backpatch fixes from 5.0

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.41 05/09/15 14:47:14 pekka@mysql.com +92 -56
    bug#9994 backpatch fixes from 5.0

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.9 05/09/15 14:47:14 pekka@mysql.com +4 -1
    bug#9994 backpatch fixes from 5.0

ChangeSet
  1.2433.2.1 05/09/14 06:37:52 sasha@asksasha.com +1 -0
  Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139

  sql/sql_parse.cc
    1.467 05/09/14 06:37:45 sasha@asksasha.com +0 -0
    Auto merged

ChangeSet
  1.2408.1.1 05/09/14 06:31:38 sasha@asksasha.com +7 -0
  fix for BUG#11139 (multi-delete with alias breaking replication if table rules are
   present): the problem originally was that the tables in auxilliary_tables did not have 
  the correct real_name, which caused problems in the second call to tables_ok(). 
  The fix corrects the real_name problem, and also sets the updating flag properly, 
  which makes the second call to tables_ok() unnecessary.

  sql/sql_yacc.yy
    1.392 05/09/14 06:31:33 sasha@asksasha.com +4 -6
    fix for BUG#11139 (multi-delete with alias breaking replication if table rules are
     present)

  sql/sql_parse.cc
    1.465.1.1 05/09/14 06:31:33 sasha@asksasha.com +39 -11
    fix for BUG#11139 (multi-delete with alias breaking replication if table rules are
     present)

  sql/slave.cc
    1.276 05/09/14 06:31:33 sasha@asksasha.com +1 -8
    fix for BUG#11139 (multi-delete with alias breaking replication if table rules are
     present)

  sql/mysql_priv.h
    1.367 05/09/14 06:31:32 sasha@asksasha.com +2 -0
    fix for BUG#11139 (multi-delete with alias breaking replication if table rules are
     present)

  mysql-test/t/rpl_multi_delete2.test
    1.3 05/09/14 06:31:32 sasha@asksasha.com +44 -1
    updates for for BUG#11139

  mysql-test/t/rpl_multi_delete2-slave.opt
    1.2 05/09/14 06:31:32 sasha@asksasha.com +1 -1
    updates for for BUG#11139

  mysql-test/r/rpl_multi_delete2.result
    1.3 05/09/14 06:31:32 sasha@asksasha.com +26 -3
    updates for for BUG#11139

ChangeSet
  1.2433.1.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.14 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.19 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.2436 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.40 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.35 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.203 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.597 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.52 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.143 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.2433.1.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.13 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.2435 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.34 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.596 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.51 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.142 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.

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.53.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.1.37 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.2420.1.2 05/09/14 16:28:19 stewart@mysql.com +1 -0
  WL#2779 ndb_size.pl
  
  Bug reported by Adam Dixon - table name needs quoting.

  ndb/tools/ndb_size.pl
    1.2 05/09/14 16:28:16 stewart@mysql.com +7 -4
    Always quote the table and database names when sending to cluster.

ChangeSet
  1.2434 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.259 05/09/13 20:46:53 ingo@mysql.com +0 -0
    Auto merged

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

  configure.in
    1.395 05/09/13 20:46:53 ingo@mysql.com +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.2433 05/09/13 18:11:51 jani@ua141d10.elisa.omakaista.fi +1 -0
  Merged code. Removed unneccessary repeating.
  

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

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

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

ChangeSet
  1.2431 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.394 05/09/12 16:47:58 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2427.2.1 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.392.1.1 05/09/13 01:12:14 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2427.1.5 05/09/13 00:22:06 tomas@poseidon.ndb.mysql.com +2 -0
  corrected prev patch on ndb_mgmd usage of SignalSender

  ndb/src/mgmsrv/MgmtSrvr.hpp
    1.30 05/09/13 00:22:02 tomas@poseidon.ndb.mysql.com +3 -2
    corrected prev patch on ndb_mgmd usage of SignalSender

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.69 05/09/13 00:22:02 tomas@poseidon.ndb.mysql.com +14 -3
    corrected prev patch on ndb_mgmd usage of SignalSender

ChangeSet
  1.2427.1.4 05/09/12 22:53:31 tomas@poseidon.ndb.mysql.com +1 -0
  Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
  into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.68 05/09/12 22:53:29 tomas@poseidon.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2424.2.2 05/09/12 22:51:44 tomas@poseidon.ndb.mysql.com +1 -0
  adopted to corrected ndb SendSignal Node failrep

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.67 05/09/12 22:51:39 tomas@poseidon.ndb.mysql.com +15 -6
    adopted to corrected ndb SendSignal Node failrep

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

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

ChangeSet
  1.2427.1.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.102 05/09/12 22:18:54 SergeyV@selena. +0 -0
    Auto merged

ChangeSet
  1.2420.4.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.852.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.2428 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.29 05/09/12 10:19:53 jimw@mysql.com +0 -0
    Auto merged

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

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

ChangeSet
  1.2425.1.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.2420.4.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.435 05/09/12 18:48:12 monty@mishka.mysql.com +6 -6
    Moved variable to outer level

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

  sql/filesort.cc
    1.94 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.74 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.103 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.181 05/09/12 18:48:12 monty@mishka.mysql.com +2 -1
    Code cleanup during review

  ndb/src/ndbapi/SignalSender.cpp
    1.3 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.65.1.1 05/09/12 17:00:46 tulin@dl145b.mysql.com +1 -4
    Corrected construct of faked Node fail signals in ndb SignalSender

ChangeSet
  1.2413.1.5 05/09/12 16:08:16 tomas@poseidon.ndb.mysql.com +11 -0
  reengineered ndb_mgmd to use SignalSender and remove some multi user issues

  ndb/src/mgmsrv/Services.cpp
    1.36 05/09/12 16:08:12 tomas@poseidon.ndb.mysql.com +8 -0
    reengineered ndb_mgmd to use SignalSender and remove some multi user issues

  ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp
    1.3 05/09/12 16:08:12 tomas@poseidon.ndb.mysql.com +0 -120
    reengineered ndb_mgmd to use SignalSender and remove some multi user issues

  ndb/src/mgmsrv/MgmtSrvrConfig.cpp
    1.6 05/09/12 16:08:12 tomas@poseidon.ndb.mysql.com +4 -0
    reengineered ndb_mgmd to use SignalSender and remove some multi user issues

  ndb/src/mgmsrv/MgmtSrvr.hpp
    1.29 05/09/12 16:08:12 tomas@poseidon.ndb.mysql.com +23 -115
    reengineered ndb_mgmd to use SignalSender and remove some multi user issues

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.66 05/09/12 16:08:12 tomas@poseidon.ndb.mysql.com +480 -981
    reengineered ndb_mgmd to use SignalSender and remove some multi user issues

  ndb/src/mgmclient/CommandInterpreter.cpp
    1.51 05/09/12 16:08:12 tomas@poseidon.ndb.mysql.com +3 -4
    reengineered ndb_mgmd to use SignalSender and remove some multi user issues

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
    1.15 05/09/12 16:08:12 tomas@poseidon.ndb.mysql.com +47 -18
    reengineered ndb_mgmd to use SignalSender and remove some multi user issues

  ndb/src/common/debugger/EventLogger.cpp
    1.18 05/09/12 16:08:12 tomas@poseidon.ndb.mysql.com +12 -457
    reengineered ndb_mgmd to use SignalSender and remove some multi user issues

  ndb/include/kernel/signaldata/StopReq.hpp
    1.2 05/09/12 16:08:12 tomas@poseidon.ndb.mysql.com +9 -1
    reengineered ndb_mgmd to use SignalSender and remove some multi user issues

  ndb/include/kernel/signaldata/EventReport.hpp
    1.3 05/09/12 16:08:12 tomas@poseidon.ndb.mysql.com +3 -3
    reengineered ndb_mgmd to use SignalSender and remove some multi user issues

  ndb/include/kernel/GlobalSignalNumbers.h
    1.9 05/09/12 16:08:12 tomas@poseidon.ndb.mysql.com +1 -1
    reengineered ndb_mgmd to use SignalSender and remove some multi user issues

ChangeSet
  1.2420.3.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.302 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.131 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.59 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.31 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.11 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.85 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.2424 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.30 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.2420.3.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.21 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.27 05/09/12 14:20:55 gluh@mysql.com +3 -3
    ps_6bdb, ps_7ndb tests failure fix

ChangeSet
  1.2422 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.6 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.2420.1.1 05/09/12 15:54:23 stewart@mysql.com +2 -0
  W#2776 Utility for calculating storage requirements for NDB
  
  Initial ndb_size.pl
  
  Connects to an existing MySQL database and produces a XHTML document containing
  an estimation of storage requirements.

  ndb/tools/ndb_size.tmpl
    1.1 05/09/12 15:54:20 stewart@mysql.com +175 -0
    Initial checkin of XHTML template file for ndb_size.pl

  ndb/tools/ndb_size.tmpl
    1.0 05/09/12 15:54:20 stewart@mysql.com +0 -0
    BitKeeper file /home/stewart/Documents/MySQL/4.1/wl2779/ndb/tools/ndb_size.tmpl

  ndb/tools/ndb_size.pl
    1.1 05/09/12 15:54:19 stewart@mysql.com +260 -0
    Initial checkin of ndb_size.pl

  ndb/tools/ndb_size.pl
    1.0 05/09/12 15:54:19 stewart@mysql.com +0 -0
    BitKeeper file /home/stewart/Documents/MySQL/4.1/wl2779/ndb/tools/ndb_size.pl

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

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

ChangeSet
  1.2386.17.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/r/insert_select.result
    1.28 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.22 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.

ChangeSet
  1.2416.1.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.2406.9.1 05/09/09 19:06:15 aivanov@mysql.com +1 -0
  BUG #12101: Additional fix.

  sql/item_cmpfunc.cc
    1.196 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.53 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.14 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.17 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.2398.16.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.14 05/09/09 12:39:02 jonas@eel.(none) +19 -3
    close transaction if failed

  ndb/test/src/NDBT_Test.cpp
    1.20 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.6 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.8 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.17 05/09/09 12:39:02 jonas@eel.(none) +4 -1
    new test program

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

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

ChangeSet
  1.2413.1.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.158 05/09/09 13:22:12 gluh@mysql.com +3 -3
    Bug #12817 SHOW STATUS now blob fields

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

  sql/item.cc
    1.221 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.26 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.26 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.28 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.27 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.23 05/09/09 13:22:12 gluh@mysql.com +6 -6
    Bug #12817 SHOW STATUS now blob fields

ChangeSet
  1.2413.3.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.111 05/09/08 23:11:03 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.2406.8.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.108.2.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.43 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.52 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.2055.498.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.20.1.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.2413.2.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.434 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.18 05/09/08 12:32:12 igor@rurik.mysql.com +13 -0
    Added test case for bug #12885.

  mysql-test/r/olap.result
    1.21 05/09/08 12:31:31 igor@rurik.mysql.com +13 -0
    Added test case for bug #12885.

ChangeSet
  1.2413.1.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.2409.1.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.56 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.29 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.2413 05/09/08 16:47:27 tomas@poseidon.ndb.mysql.com +1 -0
  corrected typo

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.65 05/09/08 16:47:21 tomas@poseidon.ndb.mysql.com +1 -0
    corrected typo

ChangeSet
  1.2406.4.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.22 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.9 05/09/08 15:43:41 tomas@poseidon.ndb.mysql.com +1 -1
    missed this file in prev commit

ChangeSet
  1.2406.4.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.20 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.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.2409.1.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.55 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.28 05/09/08 11:53:02 mronstrom@mysql.com +17 -3
    Bug #12594:
    Added debug info to all log page headers

ChangeSet
  1.2406.4.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.11 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.28 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.64 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.8 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.19 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.2406.7.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.100.1.1 05/09/08 11:12:00 joerg@mysql.com +0 -5
    Auto merged

  configure.in
    1.392 05/09/08 11:12:00 joerg@mysql.com +0 -10
    Auto merged

ChangeSet
  1.1346.851.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.2388.5.2 05/09/08 12:09:30 SergeyV@selena. +2 -0
  Modified test case for bug #12517

  mysql-test/t/connect.test
    1.13 05/09/08 12:09:24 SergeyV@selena. +10 -10
    Modified test case for bug #12517

  mysql-test/r/connect.result
    1.12 05/09/08 12:09:23 SergeyV@selena. +2 -12
    Modified test case for bug #12517

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

  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

ChangeSet
  1.2408 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.145 05/09/07 16:33:06 igor@rurik.mysql.com +0 -0
    Auto merged

  mysql-test/t/func_gconcat.test
    1.33 05/09/07 16:33:06 igor@rurik.mysql.com +0 -0
    Auto merged

  mysql-test/r/func_gconcat.result
    1.41 05/09/07 16:33:06 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2406.3.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.51 05/09/08 00:49:57 hartmut@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.498.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.350.1.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.77.1.1 05/09/07 20:16:52 jimw@mysql.com +0 -5
    Remove unnecessary define -- configure should define HAVE_NONPOSIX_SIGWAIT

ChangeSet
  1.2406.6.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.8 05/09/07 10:30:02 brian@zim.(none) +2 -1
    Small tweak for random read performance. 

ChangeSet
  1.2406.3.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.110 05/09/07 18:55:24 aivanov@mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.195 05/09/07 18:55:23 aivanov@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2406.5.1 05/09/07 16:39:16 msvensson@neptunus.(none) +2 -0
  BUG#12984 mysqltest.test: different output from "exec NonExistsinfComamdn"
   - Improved solution

  mysql-test/t/mysqltest.test
    1.16 05/09/07 16:39:13 msvensson@neptunus.(none) +4 -6
    Fix test for failing "exec" and "system", by using the false command

  mysql-test/r/mysqltest.result
    1.12 05/09/07 16:39:13 msvensson@neptunus.(none) +2 -0
    Update test results

ChangeSet
  1.2398.16.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.23 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.2406.1.4 05/09/07 15:57:14 SergeyV@selena. +5 -0
  Fixes bug #5588. Additions after merge from 4.0.

  vio/viossl.c
    1.27 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.32.1.2 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.22 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.87 05/09/07 15:57:04 SergeyV@selena. +1 -1
    Fixes bug #5588. checks if operation was timed out.

ChangeSet
  1.2406.1.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.101 05/09/07 14:59:36 SergeyV@selena. +0 -0
    SCCS merged

  vio/viosocket.c
    1.32.1.1 05/09/07 14:59:02 SergeyV@selena. +0 -0
    Auto merged

  vio/vio.c
    1.21 05/09/07 14:59:02 SergeyV@selena. +0 -0
    Auto merged

  sql/net_serv.cc
    1.75 05/09/07 14:59:02 SergeyV@selena. +0 -0
    Auto merged

  include/violite.h
    1.41 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.2405.2.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.44 05/09/07 12:49:07 tomas@poseidon.ndb.mysql.com +1 -1
    Modified ndb log message on startup failure

ChangeSet
  1.2406.1.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.144 05/09/07 13:12:18 bar@mysql.com +0 -0
    Auto merged

  mysql-test/t/func_gconcat.test
    1.32 05/09/07 13:12:17 bar@mysql.com +0 -0
    Auto merged

  mysql-test/r/func_gconcat.result
    1.40 05/09/07 13:12:17 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2407 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.38.1.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.30.1.3 05/09/06 22:14:08 igor@rurik.mysql.com +16 -0
    Added test cases for bug #12863.

  sql/item_sum.cc
    1.142.1.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.81 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.2405.1.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.15 05/09/06 22:03:01 msvensson@neptunus.(none) +1 -1
    Remove the extra ;

  client/mysqltest.c
    1.180 05/09/06 22:03:01 msvensson@neptunus.(none) +51 -26
    Backport from 5.0

ChangeSet
  1.1346.851.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.2406 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.465 05/09/06 11:38:48 eric@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2405 05/09/06 21:18:44 bell@sanja.is.com.ua +1 -0
  postmerge fix

  sql/mysqld.cc
    1.595 05/09/06 21:18:40 bell@sanja.is.com.ua +1 -0
    postmerge fix

ChangeSet
  1.2402.1.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.108.1.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.192.1.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.142 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.391 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.35 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.20 05/09/06 17:45:16 aivanov@mysql.com +46 -0
    Added testcases for bugs #12101, #12102

ChangeSet
  1.2398.18.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.5 05/09/06 15:24:32 lthalmann@dl145h.mysql.com +1 -0
    Added synchronization to make result deterministic

ChangeSet
  1.2403 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.254 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.43 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.17 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.42 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.24 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.2398.1.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.15 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.194 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.2398.1.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.109 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.2401.1.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.177 05/09/06 12:18:21 bell@sanja.is.com.ua +1 -16
    merge

  sql/mysqld.cc
    1.594 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.391 05/09/06 12:18:20 bell@sanja.is.com.ua +0 -1
    merge

  sql/sql_cache.h
    1.27 05/09/06 12:09:55 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_cache.cc
    1.94 05/09/06 12:09:55 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.366 05/09/06 12:09:55 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.849.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.51.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.2398.15.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.14 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.2398.15.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.13 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.11 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.2401 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.464 05/09/05 20:05:25 bar@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.593 05/09/05 20:05:25 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2398.15.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.179 05/09/05 17:01:11 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2400 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.463 05/09/05 19:58:55 bar@mysql.com +2 -2

  sql/mysqld.cc
    1.592 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.365 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.2398.12.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.12 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.177.1.1 05/09/05 16:50:29 msvensson@neptunus.(none) +7 -5
    Fixes for mysqltest -x  <filename>

ChangeSet
  1.2398.17.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.28 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.13 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.6 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.17 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.35 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.63 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.61 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.17 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.7 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.2398.16.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.30.1.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.38.1.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.2398.17.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.6 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.16 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.43 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.11 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.14 05/09/05 15:14:41 tulin@dl145b.mysql.com +8 -0
    Bug #12992  Cluster StopOnError = Y restarts ndbd indefinitly

ChangeSet
  1.2398.16.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.42 05/09/05 16:40:55 ramil@mysql.com +0 -0
    Auto merged

  myisam/mi_check.c
    1.149 05/09/05 16:40:55 ramil@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2386.16.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.40.1.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.79 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.17 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.27 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.147.1.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.2398.15.5 05/09/05 12:33:25 msvensson@neptunus.(none) +1 -0
  Remove extra ;

  mysql-test/t/openssl_1.test
    1.10 05/09/05 12:33:20 msvensson@neptunus.(none) +4 -4
    Remove extra delimiter ;

ChangeSet
  1.2398.15.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.15 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.42 05/09/05 09:29:26 tulin@dl145b.mysql.com +1 -1
    added timestamp to shutdown messages in ndbd

ChangeSet
  1.2398.15.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.2398.2.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.461.1.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.30 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.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.2398.14.1 05/09/02 20:07:08 joerg@mysql.com +1 -0
  Compile error fix.

  client/mysqltest.c
    1.178 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.2398.13.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.17 05/09/02 11:55:38 jonas@eel.(none) +4 -2
    Fix extended printout of LCP_FRAGMENT_COMPLETED

ChangeSet
  1.2398.13.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.58 05/09/02 11:50:45 jonas@eel.(none) +1 -1
    Always abort if node failure occured between startTransaction and commit

ChangeSet
  1.2398.13.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.25 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.9 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.8 05/09/02 11:47:08 jonas@eel.(none) +1 -0
    Add signal data printer for START_FRAG_REQ

ChangeSet
  1.2398.12.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.11 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.10 05/09/02 11:14:38 msvensson@neptunus.(none) +2 -5
    Update test results

ChangeSet
  1.1346.848.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.2398.11.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.35 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.1346.848.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.2398.10.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.63 05/09/02 11:19:38 bar@mysql.com +0 -0
    SCCS merged

  sql/set_var.cc
    1.176 05/09/02 11:15:59 bar@mysql.com +0 -0
    Auto merged

  mysql-test/t/variables.test
    1.51 05/09/02 11:15:59 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2398.5.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.461.1.3 05/09/02 01:37:08 lars@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2398.5.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.46 05/09/01 21:36:13 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2398.5.13 05/09/01 21:06:37 joerg@mysql.com +1 -0
  Manual merge.

  Makefile.am
    1.71 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.2398.5.12 05/09/01 20:49:06 msvensson@neptunus.(none) +1 -0
  Fix missing command terminator

  mysql-test/t/rpl_slave_status.test
    1.4 05/09/01 20:49:03 msvensson@neptunus.(none) +1 -1
    Missing command terminator for source command.

ChangeSet
  1.1346.847.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.2395.3.2 05/09/01 17:58:00 lars@mysql.com +2 -0
  BUG#12542: Added comments

  sql/sql_parse.cc
    1.461.1.2 05/09/01 17:56:02 lars@mysql.com +2 -1
    Added comments

  sql/log_event.cc
    1.185 05/09/01 17:55:46 lars@mysql.com +20 -0
    Added comments

ChangeSet
  1.2398.8.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.10 05/09/01 17:21:00 msvensson@neptunus.(none) +0 -0
    Manual merge

  client/mysqltest.c
    1.177 05/09/01 17:21:00 msvensson@neptunus.(none) +1 -1
    Manual merge 

  mysql-test/t/rpl_until.test
    1.16 05/09/01 17:19:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_rotate_logs.test
    1.52 05/09/01 17:19:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_loaddata.test
    1.14 05/09/01 17:19:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_insert_id.test
    1.10 05/09/01 17:19:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_flush_log_loop.test
    1.9 05/09/01 17:19:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_error_ignored_table.test
    1.13 05/09/01 17:19:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_drop_temp.test
    1.3 05/09/01 17:19:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_drop.test
    1.4 05/09/01 17:19:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_deadlock.test
    1.5 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_change_master.test
    1.8 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_EE_error.test
    1.5 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl000001.test
    1.39 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/ndb_autodiscover2.test
    1.8 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/innodb.test
    1.73 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/innodb-lock.test
    1.8 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/innodb-deadlock.test
    1.8 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/handler.test
    1.22 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/flush.test
    1.17 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/drop.test
    1.20 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/create_select_tmp.test
    1.5 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/create.test
    1.58 05/09/01 17:19:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.41 05/09/01 17:19:14 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2398.5.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.14 05/09/01 17:01:22 dlenev@mysql.com +0 -0
    Manual merge.

  mysql-test/r/grant2.result
    1.13 05/09/01 17:01:22 dlenev@mysql.com +2 -2
    Manual merge.

  sql/sql_parse.cc
    1.461.2.1 05/09/01 16:57:49 dlenev@mysql.com +0 -0
    Auto merged

  sql/sql_acl.cc
    1.168 05/09/01 16:57:48 dlenev@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.590.1.1 05/09/01 16:57:48 dlenev@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2381.7.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.460.1.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.33 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.166.1.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.588.1.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.12.1.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.11.1.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.2398.3.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.18 05/09/01 14:32:05 kent@mysql.com +2 -2
    Make sure mtr_kill_processes() is called with an array ref

ChangeSet
  1.2324.3.7 05/09/01 11:11:10 msvensson@neptunus.(none) +1 -0
  Fix compiler warnings for mysqltest.c

  client/mysqltest.c
    1.176 05/09/01 11:11:06 msvensson@neptunus.(none) +2 -4
    Fix warnings
    Remove unused vars

ChangeSet
  1.2324.3.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.9 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.9 05/09/01 10:53:30 msvensson@neptunus.(none) +7 -0
    Update test result

  client/mysqltest.c
    1.175 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.2324.3.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.8 05/09/01 09:34:36 msvensson@neptunus.(none) +13 -0
    Add test for bug#12471

  mysql-test/r/mysqltest.result
    1.8 05/09/01 09:34:36 msvensson@neptunus.(none) +7 -0
    Update test results

  client/mysqltest.c
    1.174 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.2398.5.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.28 05/09/01 09:01:08 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2395.4.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.6 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.19 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.16 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.2398.5.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.60 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.2398.7.1 05/08/31 15:04:25 jimw@mysql.com +1 -0
  Fix shared memory connection handling on Windows. (Bug #12723)

  vio/viosocket.c
    1.33 05/08/31 15:04:22 jimw@mysql.com +1 -1
    Don't pay attention to changes of nonblocking flag for shared memory
    connections.

ChangeSet
  1.2398.5.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.50 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.2398.6.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.2398.5.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.2398.2.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.22 05/08/31 10:23:25 jimw@mysql.com +10 -3
    Fix quoting of options passed to mysqld and mysqladmin

ChangeSet
  1.2386.15.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.7 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.42 05/08/31 10:08:52 jimw@mysql.com +3 -3
    Fix typo in define test

  isam/extra.c
    1.13 05/08/31 10:08:52 jimw@mysql.com +2 -2
    Fix typo in define test

  include/my_global.h
    1.100 05/08/31 10:08:52 jimw@mysql.com +4 -0
    Handle madvise() being available but not declared in C++

  configure.in
    1.390 05/08/31 10:08:52 jimw@mysql.com +7 -0
    Add test for madvise() being declared when C++ compiler is used.

ChangeSet
  1.2324.3.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.7 05/08/31 18:10:23 msvensson@neptunus.(none) +4 -2
    Uncomment tests for the deprecated syntax

  mysql-test/r/mysqltest.result
    1.7 05/08/31 18:10:23 msvensson@neptunus.(none) +0 -5
    Update test result

  client/mysqltest.c
    1.173 05/08/31 18:10:23 msvensson@neptunus.(none) +5 -35
    Remove syntax !$<err_no> to set an expected error code

ChangeSet
  1.2395.3.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.23 05/08/31 18:06:25 lthalmann@dl145h.mysql.com +11 -0
    New test case

  sql/sql_parse.cc
    1.461.1.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.21 05/08/31 18:04:30 lthalmann@dl145h.mysql.com +18 -0
    Added testca[3~

ChangeSet
  1.2324.3.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.12.1.1 05/08/31 17:16:01 msvensson@neptunus.(none) +1 -1
    Remove extra ;

  mysql-test/t/rpl_error_ignored_table.test
    1.11.1.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.1.1 05/08/31 17:16:01 msvensson@neptunus.(none) +1 -1
    Remove extra ;

  mysql-test/t/rpl000001.test
    1.37.1.1 05/08/31 17:16:01 msvensson@neptunus.(none) +1 -1
    Remove extra ;

  mysql-test/t/mysqltest.test
    1.6 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.70.1.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.1.1 05/08/31 17:16:01 msvensson@neptunus.(none) +1 -1
    Remove extra ;

  mysql-test/t/drop.test
    1.18.1.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.54.1.1 05/08/31 17:16:01 msvensson@neptunus.(none) +1 -1
    Remove extra ;

  mysql-test/r/mysqltest.result
    1.6 05/08/31 17:16:01 msvensson@neptunus.(none) +30 -2
    Update test results

  client/mysqltest.c
    1.172 05/08/31 17:16:01 msvensson@neptunus.(none) +415 -444
    Stricter checking of syntax in mysqltest.

  mysql-test/lib/mtr_process.pl
    1.17 05/08/31 16:44:49 kent@mysql.com +1 -1
    Corrected error string for STDERR redirect

ChangeSet
  1.2398.3.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.2 05/08/31 16:27:53 kent@mysql.com +12 -0
    Backporting from 5.0

  mysql-test/lib/mtr_report.pl
    1.12 05/08/31 16:27:53 kent@mysql.com +3 -2
    Backporting from 5.0

  mysql-test/lib/mtr_process.pl
    1.16 05/08/31 16:27:53 kent@mysql.com +56 -22
    Backporting from 5.0

  mysql-test/mysql-test-run.pl
    1.40 05/08/31 16:27:52 kent@mysql.com +24 -21
    Backporting from 5.0

ChangeSet
  1.2398.4.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.2398.2.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.12 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.17 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.13 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.8 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.16 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.19 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.54 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.14 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.27 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.24 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.10 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.40 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.35 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.9 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.14 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.11 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.30.1.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.38.1.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.142.1.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.2398.3.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.207 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.2398.3.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.206 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.2388.1.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.29 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.2398.1.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.64 05/08/31 14:01:25 bar@mysql.com +4 -0
    adding test

  mysql-test/t/ctype_utf8.test
    1.66 05/08/31 14:01:19 bar@mysql.com +6 -0
    adding test

  sql/item_cmpfunc.cc
    1.193 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.2399 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.462 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.591 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.2395.2.1 05/08/30 23:29:47 evgen@moonbone.local +2 -0
  manual merge of bug fix#12537

  sql/sql_select.cc
    1.433 05/08/30 23:29:46 evgen@moonbone.local +2 -2
    manual merge

  sql/item.cc
    1.220 05/08/30 23:25:47 evgen@moonbone.local +0 -0
    Auto merged

ChangeSet
  1.2396 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.157 05/08/30 12:24:34 jimw@mysql.com +2 -2
    Fix incorrect spelling

  sql/sql_table.cc
    1.301 05/08/30 12:24:33 jimw@mysql.com +1 -1
    Fix incorrect spelling

  mysql-test/t/system_mysql_db_fix.test
    1.11 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.1346.846.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.2388.5.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.201 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.12 05/08/30 17:22:10 SergeyV@selena. +18 -0
    added test of bug #12517

  mysql-test/r/connect.result
    1.11 05/08/30 17:22:09 SergeyV@selena. +16 -0
    added results for test of bug #12517

ChangeSet
  1.2377.7.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.57 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.84 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.430.2.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.216.1.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.2390.5.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.61.1.1 05/08/30 17:11:16 bar@mysql.com +5 -0
    fixing tests accordingly

  mysql-test/t/variables.test
    1.49.1.1 05/08/30 17:11:07 bar@mysql.com +8 -0
    fixing tests accordingly

  sql/set_var.cc
    1.173.1.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.2390.4.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.39 05/08/30 15:35:57 bar@mysql.com +9 -0
    Bug #12829

  mysql-test/t/func_gconcat.test
    1.31 05/08/30 15:35:52 bar@mysql.com +10 -0
    Bug #12829

  sql/item_sum.cc
    1.143 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.

ChangeSet
  1.2386.14.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.26.1.1 05/08/30 10:42:37 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2390.3.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.175 05/08/30 12:33:52 ramil@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2383.1.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.39 05/08/30 08:56:43 jonas@eel.(none) +1 -1
    fix typo

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.2390.1.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.12 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.2388.3.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.142 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.15 05/08/29 15:05:12 brian@zim.(none) +1 -0
    Added delete_all_rows() support. 

  sql/examples/ha_archive.cc
    1.27 05/08/29 15:05:12 brian@zim.(none) +11 -0
    Added delete_all_rows() support. 

  mysql-test/t/archive.test
    1.6 05/08/29 15:05:12 brian@zim.(none) +14 -1
    Add TRUNCATE and DELETE support. 

  mysql-test/r/archive.result
    1.4 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.2390.1.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.11 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

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.2386.13.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.2388.2.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.300 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.40 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.51 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.2388.2.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.135 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.72 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.102 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.2388.2.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.461 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.39 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.49 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.2388.2.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.22 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.25 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.51 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.2377.6.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.25.1.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.2388.1.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.63 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.65 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.219 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.2388.1.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.190 05/08/29 15:44:43 bar@mysql.com +0 -0
    Auto merged

  sql/item.cc
    1.218 05/08/29 15:44:43 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2388.1.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.68.1.1 05/08/28 20:03:01 kent@mysql.com +10 -3

ChangeSet
  1.1346.846.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.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.51.5 05/08/27 22:00:19 paul@frost.snake.net +0 -0
    Auto merged

ChangeSet
  1.2389 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.173.1.1 05/08/27 21:52:10 paul@frost.snake.net +0 -0
    Auto merged

  sql/mysqld.cc
    1.590 05/08/27 21:52:09 paul@frost.snake.net +0 -0
    Auto merged

ChangeSet
  1.1346.845.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.52.1 05/08/27 21:02:20 paul@frost.snake.net +26 -26
    Reorder out-of-order status variables.

ChangeSet
  1.1346.845.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.2377.5.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.172.1.1 05/08/27 19:19:43 paul@frost.snake.net +4 -2
    Reorder out-of-order system variables.

ChangeSet
  1.2377.5.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.585.1.1 05/08/27 19:17:57 paul@frost.snake.net +4 -4
    Reorder out-of-order status variables.

ChangeSet
  1.2386.12.1 05/08/26 20:29:26 patg@radha.local +1 -0
  typo to DBUG_RETURN fixed

  sql/ha_blackhole.cc
    1.10 05/08/26 20:29:18 patg@radha.local +1 -1
    Typo to DBUG_RETURN fixed

ChangeSet
  1.2386.10.3 05/08/26 13:23:32 ramil@mysql.com +3 -0
  workaround (bug #9613: Some read-only variables are selectable, others are not).

  sql/set_var.cc
    1.174 05/08/26 13:23:26 ramil@mysql.com +10 -0
    workaround (bug #9613: Some read-only variables are selectable, others are not).
    sys_have_innodb variable added.

  mysql-test/t/variables.test
    1.50 05/08/26 13:23:26 ramil@mysql.com +7 -0
    workaround (bug #9613: Some read-only variables are selectable, others are not).

  mysql-test/r/variables.result
    1.62 05/08/26 13:23:26 ramil@mysql.com +3 -0
    workaround (bug #9613: Some read-only variables are selectable, others are not).

ChangeSet
  1.2386.11.1 05/08/26 02:09:56 patg@radha.local +2 -0
  ha_blackhole changes, same patch as http://lists.mysql.com/internals/27878, per brian

  sql/ha_blackhole.h
    1.4 05/08/26 02:09:14 patg@radha.local +1 -0
    blackhold lock changes added per brian

  sql/ha_blackhole.cc
    1.9 05/08/26 02:09:13 patg@radha.local +6 -4
    Blackhole Lock changes to blackhole per Brian, reapplied

ChangeSet
  1.2386.1.9 05/08/25 12:34:42 jimw@mysql.com +1 -0
  Fix crash in DES_DECRYPT(NULL). (Bug #12757)

  sql/item_strfunc.cc
    1.236 05/08/25 12:34:39 jimw@mysql.com +3 -3
    Don't call res->length() when res may be NULL because args[0] is a NULL.

ChangeSet
  1.2383.1.1 05/08/25 13:16:29 jonas@eel.(none) +1 -0
  bug#12027 - ndb 
    When detecting corrupt schema file.
    Make sure to close it (as it will be opened later when rewriting a clean copy)

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.38 05/08/25 13:16:26 jonas@eel.(none) +8 -2
    bug#12027 
      When detecting corrupt schema file.
      Make sure to close it (as it will be opened later when rewriting a clean copy)

ChangeSet
  1.2386.9.1 05/08/25 13:04:53 tomas@poseidon.ndb.mysql.com +1 -0
  config:
    changed tomas default checkout

  BitKeeper/etc/config
    1.16 05/08/25 13:04:19 tomas@poseidon.ndb.mysql.com +1 -0
    changed tomas default checkout

ChangeSet
  1.2381.5.3 05/08/25 11:17:54 joerg@mysql.com +1 -0
  Correct a typing error: Missing ".pl" suffix is essential.

  Makefile.am
    1.70 05/08/25 11:17:50 joerg@mysql.com +1 -1
    Correct a typing error: Missing ".pl" suffix is essential.

ChangeSet
  1.2386.7.1 05/08/25 12:08:26 jani@a193-229-222-105.elisa-laajakaista.fi +30 -0
  Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
  into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

  sql/mysqld.cc
    1.589 05/08/25 12:08:20 jani@a193-229-222-105.elisa-laajakaista.fi +0 -12
    Merged from 4.0.

  netware/mysqld_safe.c
    1.8 05/08/25 12:08:20 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Merged from 4.0.

  netware/mysql_test_run.c
    1.12 05/08/25 12:08:20 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Merged from 4.0.

  myisam/myisampack.c
    1.41 05/08/25 12:08:20 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Merged from 4.0.

  myisam/myisamchk.c
    1.125 05/08/25 12:08:20 jani@a193-229-222-105.elisa-laajakaista.fi +1 -3
    Merged from 4.0.

  client/mysqlshow.c
    1.39 05/08/25 12:08:20 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Merged from 4.0.

  client/mysqldump.c
    1.196 05/08/25 12:08:20 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Merged from 4.0.

  client/mysqlbinlog.cc
    1.106 05/08/25 12:08:20 jani@a193-229-222-105.elisa-laajakaista.fi +0 -1
    Merged from 4.0.

  client/mysqladmin.cc
    1.106 05/08/25 12:08:20 jani@a193-229-222-105.elisa-laajakaista.fi +0 -9
    Merged from 4.0.

  client/mysql.cc
    1.210 05/08/25 12:08:20 jani@a193-229-222-105.elisa-laajakaista.fi +2 -2
    Merged from 4.0.

  client/client_priv.h
    1.36 05/08/25 12:08:20 jani@a193-229-222-105.elisa-laajakaista.fi +2 -2
    Merged from 4.0.

ChangeSet
  1.2386.1.6 05/08/25 10:19:06 monty@mishka.mysql.com +1 -0
  Add back changes lost in merge
  (Faster test)

  mysql-test/t/rpl_drop_db.test
    1.5 05/08/25 10:18:59 monty@mishka.mysql.com +2 -2
    Add back changes lost in merge

ChangeSet
  1.2386.6.1 05/08/25 09:03:41 monty@mishka.local +1 -0
  Remove function that was accidently added back

  mysys/charset.c
    1.142 05/08/25 09:03:30 monty@mishka.local +0 -19
    Remove function that was accidently added back

ChangeSet
  1.2386.1.4 05/08/25 00:08:02 serg@sergbook.mysql.com +3 -0
  merged

  sql/sql_db.cc
    1.130 05/08/25 00:07:58 serg@sergbook.mysql.com +5 -8
    merged

  mysql-test/t/rpl_drop_db.test
    1.4 05/08/25 00:07:58 serg@sergbook.mysql.com +1 -19
    merged

  mysql-test/r/rpl_drop_db.result
    1.4 05/08/25 00:07:58 serg@sergbook.mysql.com +0 -17
    merged

ChangeSet
  1.2386.2.4 05/08/24 23:07:06 serg@sergbook.mysql.com +1 -0
  memroot: trash the memory in free_root()

  mysys/my_alloc.c
    1.25 05/08/24 23:07:01 serg@sergbook.mysql.com +14 -1
    memroot: trash the memory in free_root()

  netware/mysqlshow.def
    1.5 05/08/24 22:06:23 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/mysqlimport.def
    1.6 05/08/24 22:06:23 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/mysqldump.def
    1.6 05/08/24 22:06:23 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/mysqlcheck.def
    1.6 05/08/24 22:06:23 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/mysqlbinlog.def
    1.6 05/08/24 22:06:23 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/mysqladmin.def
    1.5 05/08/24 22:06:23 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/mysql.def
    1.5 05/08/24 22:06:23 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/myisamchk.def
    1.6 05/08/24 22:06:23 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  myisam/myisamlog.c
    1.29 05/08/24 22:06:23 jani@a193-229-222-105.elisa-laajakaista.fi +0 -2
    Auto merged

  isam/pack_isam.c
    1.20 05/08/24 22:06:23 jani@a193-229-222-105.elisa-laajakaista.fi +0 -4
    Auto merged

  isam/isamchk.c
    1.34 05/08/24 22:06:23 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  include/help_start.h
    1.3 05/08/24 22:06:22 jani@a193-229-222-105.elisa-laajakaista.fi +0 -2
    Auto merged

  include/help_end.h
    1.3 05/08/24 22:06:22 jani@a193-229-222-105.elisa-laajakaista.fi +0 -1
    Auto merged

  extra/resolve_stack_dump.c
    1.16 05/08/24 22:06:22 jani@a193-229-222-105.elisa-laajakaista.fi +0 -5
    Auto merged

  extra/perror.c
    1.39 05/08/24 22:06:22 jani@a193-229-222-105.elisa-laajakaista.fi +0 -5
    Auto merged

  extra/my_print_defaults.c
    1.21 05/08/24 22:06:22 jani@a193-229-222-105.elisa-laajakaista.fi +0 -4
    Auto merged

  client/mysqltest.c
    1.169.1.3 05/08/24 22:06:22 jani@a193-229-222-105.elisa-laajakaista.fi +0 -5
    Auto merged

  client/mysqlimport.c
    1.50 05/08/24 22:06:22 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  client/mysqlcheck.c
    1.48 05/08/24 22:06:21 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  client/mysqladmin.cc
    1.66.3.2 05/08/24 22:06:21 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Merge rename: client/mysqladmin.c -> client/mysqladmin.cc

ChangeSet
  1.1346.1.792 05/08/24 22:03:34 jani@a193-229-222-105.elisa-laajakaista.fi +30 -0
  Several fixes for Netware.

  sql/mysqld.cc
    1.297.51.4 05/08/24 22:03:30 jani@a193-229-222-105.elisa-laajakaista.fi +13 -3
    Abnormal end patch when shutting down and volume not ready.

  netware/mysqlshow.def
    1.3.1.1 05/08/24 22:03:30 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Scrollable screen patch.

  netware/mysqlimport.def
    1.4.1.1 05/08/24 22:03:30 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Scrollable screen patch.

  netware/mysqldump.def
    1.4.1.1 05/08/24 22:03:30 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Scrollable screen patch.

  netware/mysqld_safe.c
    1.6.1.1 05/08/24 22:03:29 jani@a193-229-222-105.elisa-laajakaista.fi +0 -2
    Removed debug message for Netware.

  netware/mysqlcheck.def
    1.4.1.1 05/08/24 22:03:28 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Scrollable screen patch.

  netware/mysqlbinlog.def
    1.4.1.1 05/08/24 22:03:26 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Scrollable screen patch.

  netware/mysqladmin.def
    1.3.1.1 05/08/24 22:03:25 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Scrollable screen patch.

  netware/mysql_test_run.c
    1.5.1.3 05/08/24 22:03:24 jani@a193-229-222-105.elisa-laajakaista.fi +4 -0
    Fixed strindex for Netware.

  netware/mysql.def
    1.3.1.1 05/08/24 22:03:22 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Scrollable screen patch.

  netware/myisamchk.def
    1.4.1.1 05/08/24 22:03:21 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Scrollable screen patch.

  myisam/myisampack.c
    1.22.1.14 05/08/24 22:03:19 jani@a193-229-222-105.elisa-laajakaista.fi +10 -1
    Added auto close for Netware.

  myisam/myisamlog.c
    1.17.1.3 05/08/24 22:03:18 jani@a193-229-222-105.elisa-laajakaista.fi +2 -0
    Added help for Netware.

  myisam/myisamchk.c
    1.80.1.36 05/08/24 22:03:17 jani@a193-229-222-105.elisa-laajakaista.fi +11 -1
    Added auto close of window for Netware

  isam/pack_isam.c
    1.8.1.9 05/08/24 22:03:15 jani@a193-229-222-105.elisa-laajakaista.fi +4 -0
    Added auto close of window for Netware

  isam/isamchk.c
    1.21.1.4 05/08/24 22:03:15 jani@a193-229-222-105.elisa-laajakaista.fi +10 -1
    Added auto close of window for Netware

  include/help_start.h
    1.1.1.1 05/08/24 22:03:14 jani@a193-229-222-105.elisa-laajakaista.fi +2 -0
    Fixed help messages for Netware.

  include/help_end.h
    1.1.1.1 05/08/24 22:03:13 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Fixed help messages for Netware.

  extra/resolve_stack_dump.c
    1.8.1.8 05/08/24 22:03:13 jani@a193-229-222-105.elisa-laajakaista.fi +5 -0
    Fixed help messages for Netware.

  extra/perror.c
    1.20.1.7 05/08/24 22:03:13 jani@a193-229-222-105.elisa-laajakaista.fi +5 -0
    Fixed help messages for Netware.

  extra/my_print_defaults.c
    1.10.1.7 05/08/24 22:03:12 jani@a193-229-222-105.elisa-laajakaista.fi +5 -0
    Fixed help messages for Netware.

  client/mysqltest.c
    1.77.1.47 05/08/24 22:03:12 jani@a193-229-222-105.elisa-laajakaista.fi +5 -0
    Fixed help messages for Netware.

  client/mysqlshow.c
    1.25.1.5 05/08/24 22:03:12 jani@a193-229-222-105.elisa-laajakaista.fi +9 -0
    Added option auto close for Netware.

  client/mysqlimport.c
    1.29.1.7 05/08/24 22:03:11 jani@a193-229-222-105.elisa-laajakaista.fi +9 -0
    Added option auto close for Netware.

  client/mysqldump.c
    1.65.1.54 05/08/24 22:03:11 jani@a193-229-222-105.elisa-laajakaista.fi +9 -0
    Added option auto close for Netware.

  client/mysqlcheck.c
    1.25.1.7 05/08/24 22:03:10 jani@a193-229-222-105.elisa-laajakaista.fi +9 -0
    Added option auto close for Netware.

  client/mysqlbinlog.cc
    1.70.1.34 05/08/24 22:03:09 jani@a193-229-222-105.elisa-laajakaista.fi +11 -1
    Added option auto close for Netware.

  client/mysqladmin.c
    1.66.3.1 05/08/24 22:03:09 jani@a193-229-222-105.elisa-laajakaista.fi +9 -0
    Added option auto close for Netware.

  client/mysql.cc
    1.93.1.67 05/08/24 22:03:09 jani@a193-229-222-105.elisa-laajakaista.fi +9 -0
    Added option auto close for Netware.

  client/client_priv.h
    1.15.1.4 05/08/24 22:03:08 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Added option auto close for Netware.

ChangeSet
  1.2386.5.1 05/08/24 19:37:27 monty@mishka.local +5 -0
  Review fixes

  sql/sql_db.cc
    1.128.1.1 05/08/24 19:37:22 monty@mishka.local +47 -49
    Indentation & style fixes
    Simple optimization (remove constant and boolean variable)

  mysql-test/t/rpl_drop_db.test
    1.2.1.1 05/08/24 19:37:22 monty@mishka.local +19 -15
    Use 'mysqltest' as database instead of 'd1'
    Made test faster by using longer table names instead of lots of tables

  mysql-test/t/ctype_cp932.test
    1.6 05/08/24 19:37:22 monty@mishka.local +1 -1
    Remove first event to make things portable

  mysql-test/r/rpl_drop_db.result
    1.2.1.1 05/08/24 19:37:22 monty@mishka.local +17 -1017
    Use 'mysqltest' as database instead of 'd1'
    Made test faster by using longer table names instead of lots of tables

  mysql-test/r/ctype_cp932.result
    1.5 05/08/24 19:37:22 monty@mishka.local +1 -2
    Remove first event to make things portable

ChangeSet
  1.2386.4.2 05/08/24 18:05:54 heikki@hundin.mysql.fi +1 -0
  subselect2.result:
    Update test result to reflect the fix of Bug #12779 : EXPLAIN SELECT of a subquery is now different

  mysql-test/r/subselect2.result
    1.7 05/08/24 18:05:34 heikki@hundin.mysql.fi +1 -1
    Update test result to reflect the fix of Bug #12779 : EXPLAIN SELECT of a subquery is now different

ChangeSet
  1.2386.4.1 05/08/24 17:30:25 heikki@hundin.mysql.fi +1 -0
  Merge hundin.mysql.fi:/home/heikki/mysql-4.0
  into  hundin.mysql.fi:/home/heikki/mysql-4.1

  sql/ha_innodb.cc
    1.205 05/08/24 17:30:14 heikki@hundin.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.1.791 05/08/24 17:27:46 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Fix bug #12779 : never give a row count estimate of 0 to the MySQL query optimizer, as then left join optimizer may beleive it KNOWS that the table is empty; note that this fix may change query optimization of many other queries where one table is empty; note that the proper fix would be to make the query optimizer to know that the row count estimates it receives really are just estimates, it cannot assume they are certain

  sql/ha_innodb.cc
    1.73.1.162 05/08/24 17:27:34 heikki@hundin.mysql.fi +25 -1
    Fix bug #12779 : never give a row count estimate of 0 to the MySQL query optimizer, as then left join optimizer may beleive it KNOWS that the table is empty; note that this fix may change query optimization of many other queries where one table is empty; note that the proper fix would be to make the query optimizer to know that the row count estimates it receives really are just estimates, it cannot assume they are certain

ChangeSet
  1.2386.3.2 05/08/24 16:13:48 joerg@mysql.com +1 -0
  Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/M41/mysql-4.1

  mysys/charset.c
    1.141 05/08/24 16:13:45 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2381.6.1 05/08/24 16:11:38 joerg@mysql.com +1 -0
  Merge

  mysys/charset.c
    1.139.1.1 05/08/24 16:11:38 joerg@mysql.com +0 -0
    SCCS merged

ChangeSet
  1.2381.5.2 05/08/23 19:16:43 joerg@mysql.com +1 -0
  Add the "test-force" target to "Makefile.am".

  Makefile.am
    1.69 05/08/23 19:16:39 joerg@mysql.com +7 -1
    Add the "test-force" target, because we use it in RPM building.
    (Backport of Monty's fix from 5.0)

ChangeSet
  1.2386.3.1 05/08/23 18:06:24 kent@mysql.com +1 -0
  Merge

  mysys/charset.c
    1.140 05/08/23 18:06:19 kent@mysql.com +19 -0

ChangeSet
  1.2386.2.3 05/08/23 13:52:52 serg@sergbook.mysql.com +1 -0
  Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
  into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1

ChangeSet
  1.2386.2.2 05/08/23 12:16:16 tomas@poseidon.ndb.mysql.com +9 -0
  removed ndb grep from configure .in

  configure.in
    1.389 05/08/23 13:52:44 serg@sergbook.mysql.com +0 -0
    Auto merged

  configure.in
    1.387.1.1 05/08/23 12:16:04 tomas@poseidon.ndb.mysql.com +0 -1
    removed ndb grep from configure .in

  BitKeeper/deleted/.del-testGrep.cpp~2106eb0a6bf2a1b5
    1.6 05/08/23 12:09:37 tomas@poseidon.ndb.mysql.com +0 -0
    Delete: ndb/test/ndbapi/testGrep.cpp

  BitKeeper/deleted/.del-grep_systab_test.cpp~c7305578bec8cb62
    1.2 05/08/23 12:05:31 tomas@poseidon.ndb.mysql.com +0 -0
    Delete: ndb/src/kernel/blocks/grep/systab_test/grep_systab_test.cpp

  BitKeeper/deleted/.del-Makefile~b293ae88e4394490
    1.2 05/08/23 12:05:26 tomas@poseidon.ndb.mysql.com +0 -0
    Delete: ndb/src/kernel/blocks/grep/systab_test/Makefile

  BitKeeper/deleted/.del-GrepInit.cpp~df28ab3a892455fd
    1.5 05/08/23 12:05:17 tomas@poseidon.ndb.mysql.com +0 -0
    Delete: ndb/src/kernel/blocks/grep/GrepInit.cpp

  BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387
    1.4 05/08/23 12:05:10 tomas@poseidon.ndb.mysql.com +0 -0
    Delete: ndb/src/kernel/blocks/grep/Grep.hpp

  BitKeeper/deleted/.del-Makefile.am~f73be89578d3b6cc
    1.4 05/08/23 12:05:03 tomas@poseidon.ndb.mysql.com +0 -0
    Delete: ndb/src/kernel/blocks/grep/Makefile.am

  BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667
    1.6 05/08/23 12:04:37 tomas@poseidon.ndb.mysql.com +0 -0
    Delete: ndb/src/kernel/blocks/grep/Grep.cpp

  BitKeeper/deleted/.del-Makefile~e0b7d67078f0fae0
    1.2 05/08/23 11:51:12 tomas@poseidon.ndb.mysql.com +0 -0
    Delete: ndb/src/kernel/blocks/dblqh/redoLogReader/Makefile

ChangeSet
  1.2386.2.1 05/08/23 11:50:24 tomas@poseidon.ndb.mysql.com +2 -0
  enabled make of ndb_redo_log_reader

  ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp
    1.4 05/08/23 11:50:19 tomas@poseidon.ndb.mysql.com +2 -2
    enabled make of ndb_redo_log_reader

  ndb/src/kernel/blocks/dblqh/Makefile.am
    1.4 05/08/23 11:50:19 tomas@poseidon.ndb.mysql.com +6 -2
    enabled make of ndb_redo_log_reader

ChangeSet
  1.2386.1.1 05/08/22 15:48:50 jimw@mysql.com +4 -0
  Use the hostname with which the user authenticated when determining which
  user to update with 'SET PASSWORD = ...'. (Bug #12302)

  sql/sql_acl.cc
    1.167 05/08/22 15:48:47 jimw@mysql.com +11 -8
    Add exact flag for find_acl_user, so we can specify that we want
    an exact match on the hostname.

  sql/set_var.cc
    1.173 05/08/22 15:48:47 jimw@mysql.com +12 -1
    Pass priv_host into check_change_password().

  mysql-test/t/grant2.test
    1.13 05/08/22 15:48:47 jimw@mysql.com +38 -0
    Add new tests

  mysql-test/r/grant2.result
    1.12 05/08/22 15:48:47 jimw@mysql.com +26 -0
    Add new results

ChangeSet
  1.2386 05/08/22 15:46:14 evgen@moonbone.local +1 -0
  Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
  into moonbone.local:/work/11718-bug-4.1-mysql

  sql/sql_select.cc
    1.432 05/08/22 15:46:12 evgen@moonbone.local +0 -0
    Auto merged

ChangeSet
  1.2381.5.1 05/08/22 12:48:01 joerg@mysql.com +1 -0
  Ensure that a failing test does not stop testing or the whole RPM build process.

  support-files/mysql.spec.sh
    1.104 05/08/22 12:47:56 joerg@mysql.com +2 -2
    Ensure that a failing test does not stop testing or the whole RPM build process.

ChangeSet
  1.2381.4.1 05/08/22 13:20:02 serg@sergbook.mysql.com +6 -0
  after pull cleanup

  sql/table.h
    1.74 05/08/22 13:19:57 serg@sergbook.mysql.com +0 -3
    after pull cleanup

  sql/sql_table.cc
    1.299 05/08/22 13:19:56 serg@sergbook.mysql.com +0 -3
    after pull cleanup

  sql/sql_db.cc
    1.129 05/08/22 13:19:56 serg@sergbook.mysql.com +9 -12
    after pull cleanup

  mysql-test/t/rpl_drop_db.test
    1.3 05/08/22 13:19:56 serg@sergbook.mysql.com +17 -14
    test case cleanup

  mysql-test/r/rpl_drop_db.result
    1.3 05/08/22 13:19:56 serg@sergbook.mysql.com +17 -1017
    test case cleanup

  configure.in
    1.388 05/08/22 13:19:56 serg@sergbook.mysql.com +1 -1
    don't be too restrictive

ChangeSet
  1.2381.1.4 05/08/20 10:07:46 pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  Bug #12460 Table Full
  On 64 bit platforms the changed statement doesn't work
  so making sure that the larger value is first and using
  subtraction is a quick and backwards-compatible fix of this
  line.

  heap/hp_delete.c
    1.13 05/08/20 10:07:41 pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Bug #12460 Table Full
    On 64 bit platforms the changed statement doesn't work
    so making sure that the larger value is first and using
    subtraction is a quick and backwards-compatible fix of this
    line.

ChangeSet
  1.2381.3.1 05/08/19 17:55:28 elliot@mysql.com +2 -0
  Fix ctype_cp932 test to be deterministic on different machines.

  mysql-test/t/ctype_cp932.test
    1.5 05/08/19 17:55:25 elliot@mysql.com +3 -1
    Updated test to be deterministic on all machines

  mysql-test/r/ctype_cp932.result
    1.4 05/08/19 17:55:24 elliot@mysql.com +8 -5
    Update results to make them deterministic

ChangeSet
  1.2381.2.2 05/08/19 23:44:40 patg@radha.local +1 -0
  Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  radha.local:/Users/patg/mysql-build/mysql-4.1.clean

  sql/mysqld.cc
    1.588 05/08/19 23:44:27 patg@radha.local +0 -0
    Auto merged

ChangeSet
  1.2381.2.1 05/08/19 14:49:34 elliot@mysql.com +9 -0
  Bug#11338 Fixes from review (identical functionality).

  sql/sql_prepare.cc
    1.153 05/08/19 14:49:29 elliot@mysql.com +6 -3
    Fixes from review, store character_set_client differently so that 
    Item_param::query_val_str can use it.

  sql/log_event.h
    1.98 05/08/19 14:49:29 elliot@mysql.com +1 -1
    Added prototype for str_to_hex (now used by item.cc)

  sql/log_event.cc
    1.184 05/08/19 14:49:29 elliot@mysql.com +1 -1
    Fixes from review, str_to_hex is now used by item.cc

  sql/item.h
    1.188.1.3 05/08/19 14:49:29 elliot@mysql.com +2 -1
    Fixes from review

  sql/item.cc
    1.217 05/08/19 14:49:29 elliot@mysql.com +7 -8
    Fixes from review (store character_set_client differently so that
    fix can be merged forward to 5.0)

  mysys/charset.c
    1.138.1.1 05/08/19 14:49:29 elliot@mysql.com +0 -18
    Fixes from review (use version in log_event.cc instead)

  mysql-test/t/ctype_cp932.test
    1.4 05/08/19 14:49:29 elliot@mysql.com +20 -0
    udpated test for bug#11338 (logging of prepared statement w/ blob type)

  mysql-test/r/ctype_cp932.result
    1.3 05/08/19 14:49:29 elliot@mysql.com +14 -0
    Updated test for bug#11338 (logging of prepared statement w/ blob type)

  include/my_sys.h
    1.141 05/08/19 14:49:29 elliot@mysql.com +0 -1
    Fixes from review (use version in log_event.cc instead)

ChangeSet
  1.2381.1.1 05/08/19 01:57:22 igor@rurik.mysql.com +3 -0
  distinct.test, distinct.result:
    Added test cases for bug #12625.
  sql_select.cc:
    Fixed bug #12625.
    Fixed invalid removal of constant items from the DISTINCT
    list in the function create_distinct_group.

  mysql-test/t/distinct.test
    1.17 05/08/19 01:55:24 igor@rurik.mysql.com +17 -0
    Added test cases for bug #12625.

  mysql-test/r/distinct.result
    1.32 05/08/19 01:54:51 igor@rurik.mysql.com +40 -0
    Added test cases for bug #12625.

  sql/sql_select.cc
    1.430.1.1 05/08/19 01:53:02 igor@rurik.mysql.com +1 -3
    Fixed bug #12625.

ChangeSet
  1.2377.1.12 05/08/19 10:12:44 jonas@eel.(none) +1 -0
  ndb -
  remove grep from Makefile

  ndb/src/kernel/Makefile.am
    1.11 05/08/19 10:12:40 jonas@eel.(none) +0 -2
    remove grep from Makefile

ChangeSet
  1.2377.1.11 05/08/19 09:04:30 jonas@eel.(none) +1 -0
  jonas - 
  Fix checkout properties

  BitKeeper/etc/config
    1.15 05/08/19 09:04:27 jonas@eel.(none) +1 -0
    Fix checkout properties

ChangeSet
  1.2377.1.10 05/08/19 07:51:47 jonas@eel.(none) +3 -0
  Merge eel.(none):/home/jonas/src/mysql-4.1-push
  into  eel.(none):/home/jonas/src/mysql-4.1

  ndb/tools/ndb_config.cpp
    1.5 05/08/19 07:51:39 jonas@eel.(none) +0 -0
    Auto merged

  ndb/tools/Makefile.am
    1.16 05/08/19 07:51:39 jonas@eel.(none) +0 -1
    Auto merged

  mysql-test/t/ndb_config.test
    1.5 05/08/19 07:51:38 jonas@eel.(none) +0 -0
    Auto merged

ChangeSet
  1.2370.8.1 05/08/19 07:51:22 patg@radha.local +1 -0
  BUG #12498 Fixed mispelling

  sql/mysqld.cc
    1.584.1.1 05/08/19 07:51:02 patg@radha.local +1 -1
    BUG #12498 Fixed Mispelled 'type'

ChangeSet
  1.2314.7.15 05/08/19 07:48:59 jonas@eel.(none) +3 -0
  ndb 
  rename config.cpp -> ndb_config.cpp for case insesitive filesystems
  why wasn't this done in 4.1 directly

  ndb/tools/Makefile.am
    1.14.1.1 05/08/19 07:48:56 jonas@eel.(none) +1 -1
    rename config.cpp -> ndb_config.cpp for case insesitive filesystems
    why wasn't this done in 4.1 directly

  mysql-test/t/ndb_config.test
    1.3.1.1 05/08/19 07:48:55 jonas@eel.(none) +0 -1
    remove include only present in 5.0

  ndb/tools/ndb_config.cpp
    1.2.1.1 05/08/19 07:44:24 jonas@eel.(none) +0 -0
    Rename: ndb/tools/config.cpp -> ndb/tools/ndb_config.cpp

ChangeSet
  1.2377.3.2 05/08/18 21:40:14 sasha@asksasha.com +7 -0
  updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication). 
  We binlog the DROP TABLE for each table that was actually dropped. Per Sergei's 
  suggestion a fixed buffer for the DROP TABLE query is pre-allocated from THD pool, and 
  logging now is done in batches - new batch is started if the buffer becomes full.
  Reduced memory usage by reusing the table list instead of accumulating a list of 
  dropped table names. Also fixed the problem if the table was not actually dropped, eg
  due to permissions. Extended the test case to make sure batched query 
  logging does work.  

  sql/table.h
    1.73 05/08/18 21:40:11 sasha@asksasha.com +3 -0
    updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)

  sql/sql_table.cc
    1.298 05/08/18 21:40:11 sasha@asksasha.com +4 -19
    updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)

  sql/sql_db.cc
    1.128 05/08/18 21:40:11 sasha@asksasha.com +58 -29
    updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)

  BitKeeper/etc/ignore
    1.231 05/08/18 21:40:11 sasha@asksasha.com +2 -0
    Added support-files/MacOSX/postflight support-files/MacOSX/preflight to the ignore list

  sql/mysql_priv.h
    1.364 05/08/18 21:40:10 sasha@asksasha.com +1 -1
    updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)

  mysql-test/t/rpl_drop_db.test
    1.2 05/08/18 21:40:10 sasha@asksasha.com +13 -0
    test for query buffer overrun

  mysql-test/r/rpl_drop_db.result
    1.2 05/08/18 21:40:10 sasha@asksasha.com +1005 -0
    test for query buffer overrun

ChangeSet
  1.2377.2.6 05/08/18 22:27:12 kent@mysql.com +3 -0
  ps_conv.inc:
    Adjustment of float results for Windows
  mysql-test-run.pl:
    Added --port to make MYSQL_DUMP and MYSQL_SHOW work on windows
  have_lowercase0.inc:
    new file

  mysql-test/include/ps_conv.inc
    1.4 05/08/18 22:26:51 kent@mysql.com +16 -0
    Adjustment of float results for Windows

  mysql-test/mysql-test-run.pl
    1.39 05/08/18 22:26:20 kent@mysql.com +2 -0
    Added --port to make MYSQL_DUMP and MYSQL_SHOW work on windows

ChangeSet
  1.2381 05/08/18 21:49:46 jani@a193-229-222-105.elisa-laajakaista.fi +3 -0
  Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
  into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

  include/config-netware.h
    1.8 05/08/18 21:49:43 jani@a193-229-222-105.elisa-laajakaista.fi +0 -12
    Manual merge from 4.0 to 4.1.

  mysql-test/include/have_lowercase0.inc
    1.1 05/08/18 20:47:53 kent@mysql.com +4 -0

  mysql-test/include/have_lowercase0.inc
    1.0 05/08/18 20:47:53 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1-release/mysql-test/include/have_lowercase0.inc

  sql/mysqld.cc
    1.587 05/08/18 21:45:04 jani@a193-229-222-105.elisa-laajakaista.fi +0 -1
    Auto merged

  netware/BUILD/nwbootstrap
    1.10 05/08/18 21:45:04 jani@a193-229-222-105.elisa-laajakaista.fi +0 -1
    Auto merged

ChangeSet
  1.1346.1.790 05/08/18 21:26:25 jani@a193-229-222-105.elisa-laajakaista.fi +3 -0
  Some minor fixes for Netware. These were required after we started building
  against a later version of libc.

  sql/mysqld.cc
    1.297.51.3 05/08/18 21:26:19 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Added an include.

  netware/BUILD/nwbootstrap
    1.5.1.3 05/08/18 21:26:19 jani@a193-229-222-105.elisa-laajakaista.fi +1 -7
    Fix to build script.

  include/config-netware.h
    1.4.1.1 05/08/18 21:26:19 jani@a193-229-222-105.elisa-laajakaista.fi +12 -0
    Changes for Netware. Needed to build against newer libc.

ChangeSet
  1.2380 05/08/18 21:22:35 jani@a193-229-222-105.elisa-laajakaista.fi +2 -0
  Changes for Netware. This is needed when building against newer Libc
  than we've used before.

  sql/mysqld.cc
    1.586 05/08/18 21:22:30 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Changes for Netware. This is needed when building against newer Libc
    than we've used before.

  include/config-netware.h
    1.7 05/08/18 21:22:25 jani@a193-229-222-105.elisa-laajakaista.fi +12 -0
    Changes for Netware. This is needed when building against newer Libc
    than we've used before.

ChangeSet
  1.2377.2.5 05/08/18 17:29:24 kent@mysql.com +6 -0
  mysqld.dsp:
    Added archive and example storage engine to Windows build
  ha_example.cc, ha_archive.cc:
    Windows fix, use relative include path to "mysql_priv.h"
  ha_archive.h:
    Windows VC6 compile needed (char*) cast of byte var
  mysqltest.dsp, mysql_test_run_new.dsp:
    Added /FD flag, to avoid include file warnings

  VC++Files/sql/mysqld.dsp
    1.35 05/08/18 17:28:42 kent@mysql.com +15 -7
    Added archive and example storage engine to Windows build

  sql/examples/ha_example.cc
    1.12 05/08/18 17:27:35 kent@mysql.com +1 -1
    Windows fix, use relative include path to "mysql_priv.h"

  sql/examples/ha_archive.cc
    1.26 05/08/18 17:27:34 kent@mysql.com +1 -1
    Windows fix, use relative include path to "mysql_priv.h"

  sql/examples/ha_archive.h
    1.14 05/08/18 17:25:36 kent@mysql.com +1 -1
    Windows VC6 compile needed (char*) cast of byte var

  VC++Files/client/mysqltest.dsp
    1.6 05/08/18 17:04:21 kent@mysql.com +6 -6
    Added /FD flag, to avoid include file warnings

  VC++Files/mysql-test/mysql_test_run_new.dsp
    1.7 05/08/18 17:00:38 kent@mysql.com +4 -4
    Added /FD flag, to avoid include file warnings

ChangeSet
  1.2377.1.9 05/08/18 14:07:31 jonas@eel.(none) +8 -0
  Merge eel.(none):/home/jonas/src/mysql-4.1
  into  eel.(none):/home/jonas/src/mysql-4.1-push

  mysql-test/t/ndb_alter_table.test
    1.22 05/08/18 14:07:29 jonas@eel.(none) +0 -1
    merge

  sql/ha_ndbcluster.cc
    1.170 05/08/18 14:04:50 jonas@eel.(none) +0 -0
    Auto merged

  ndb/src/ndbapi/TransporterFacade.cpp
    1.32 05/08/18 14:04:50 jonas@eel.(none) +0 -0
    Auto merged

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.62 05/08/18 14:04:50 jonas@eel.(none) +0 -0
    Auto merged

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.14 05/08/18 14:04:50 jonas@eel.(none) +0 -0
    Auto merged

  ndb/src/kernel/blocks/qmgr/Qmgr.hpp
    1.4 05/08/18 14:04:50 jonas@eel.(none) +0 -0
    Auto merged

  ndb/src/common/util/version.c
    1.19 05/08/18 14:04:50 jonas@eel.(none) +0 -0
    Auto merged

  mysql-test/t/ndb_config.test
    1.4 05/08/18 14:04:50 jonas@eel.(none) +0 -0
    Auto merged

ChangeSet
  1.2314.7.14 05/08/18 14:02:25 jonas@eel.(none) +31 -0
  bug#12118 - ndb alter table data loss 
    Split table version into 2 (major, minor)
    Impl. signaling to API when table has been altered
    Allow running transactions to use any minor number for transactions

  ndb/include/kernel/signaldata/ApiBroadcast.hpp
    1.1 05/08/18 14:02:20 jonas@eel.(none) +31 -0
    New BitKeeper file ``ndb/include/kernel/signaldata/ApiBroadcast.hpp''

  sql/ha_ndbcluster.cc
    1.163.1.1 05/08/18 14:02:20 jonas@eel.(none) +4 -1
    Allow running transactions to use tables in state ALTERED...but new transactions may not...

  ndb/src/ndbapi/TransporterFacade.cpp
    1.30.1.1 05/08/18 14:02:20 jonas@eel.(none) +12 -0
    Add support for ALTER_TABLE_REP

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.54 05/08/18 14:02:20 jonas@eel.(none) +9 -12
    Change alter table so that remove from global cache is used wo/ retreiving it from there first
      as ALTER_TABLE_REP might already have changed the table object...

  ndb/src/ndbapi/DictCache.hpp
    1.8 05/08/18 14:02:20 jonas@eel.(none) +3 -0
    Add support for alter_table_rep
      by setting status to Altered
    
    NOTE special handling of tables in state RETREIVING

  ndb/src/ndbapi/DictCache.cpp
    1.13 05/08/18 14:02:20 jonas@eel.(none) +68 -4
    Add support for alter_table_rep
      by setting status to Altered
    
    NOTE special handling of tables in state RETREIVING

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.59.2.1 05/08/18 14:02:20 jonas@eel.(none) +1 -38
    remove GREP

  ndb/src/kernel/blocks/suma/Suma.cpp
    1.15 05/08/18 14:02:20 jonas@eel.(none) +2 -18
    remove GREP

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.12.1.1 05/08/18 14:02:20 jonas@eel.(none) +28 -10
    Add support for sending REP to ALL api nodes

  ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
    1.4 05/08/18 14:02:20 jonas@eel.(none) +2 -1
    Add support for sending REP to ALL api nodes

  ndb/src/kernel/blocks/qmgr/Qmgr.hpp
    1.2.1.1 05/08/18 14:02:20 jonas@eel.(none) +1 -0
    Add support for sending REP to ALL api nodes

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
    1.12 05/08/18 14:02:20 jonas@eel.(none) +1 -6
    remove GREP

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.57 05/08/18 14:02:20 jonas@eel.(none) +2 -2
    1) Use table_ version_major when checking table version
    2) Dummy fix for BUG that tableSchemaVersion is only 16 bit in LQHKEYREQ

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp
    1.21 05/08/18 14:02:20 jonas@eel.(none) +2 -1
    1) Use table_ version_major when checking table version
    2) Dummy fix for BUG that tableSchemaVersion is only 16 bit in LQHKEYREQ

  ndb/include/kernel/signaldata/ApiBroadcast.hpp
    1.0 05/08/18 14:02:20 jonas@eel.(none) +0 -0
    BitKeeper file /home/jonas/src/mysql-4.1/ndb/include/kernel/signaldata/ApiBroadcast.hpp

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.53 05/08/18 14:02:19 jonas@eel.(none) +4 -3
    1) Use table_ version_major when checking table version
    2) Dummy fix for BUG that tableSchemaVersion is only 16 bit in LQHKEYREQ

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.23 05/08/18 14:02:19 jonas@eel.(none) +0 -2
    remove grep

  ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
    1.7 05/08/18 14:02:19 jonas@eel.(none) +2 -1
    Update schema printer

  ndb/src/kernel/blocks/dbdict/Dbdict.hpp
    1.9 05/08/18 14:02:19 jonas@eel.(none) +1 -0
    Check for same ndb versions

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.37 05/08/18 14:02:19 jonas@eel.(none) +81 -8
    Split tableSchemaVersion into 2 part
    24 bit real version
     8 bit for online alter table where old table definition is still usable

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
    1.18 05/08/18 14:02:19 jonas@eel.(none) +0 -1
    remove GREP

  ndb/src/kernel/blocks/Makefile.am
    1.3 05/08/18 14:02:19 jonas@eel.(none) +0 -1
    remove GREP

  ndb/src/kernel/SimBlockList.cpp
    1.7 05/08/18 14:02:19 jonas@eel.(none) +3 -3
    remove GREP

  ndb/src/common/util/version.c
    1.17.1.1 05/08/18 14:02:19 jonas@eel.(none) +3 -1
    Fix upgrades

  ndb/src/common/debugger/BlockNames.cpp
    1.2 05/08/18 14:02:19 jonas@eel.(none) +0 -1
    remove GREP

  ndb/include/ndbapi/NdbDictionary.hpp
    1.22 05/08/18 14:02:19 jonas@eel.(none) +3 -2
    Add state on table object to represent an altered but still valid table object

  ndb/include/kernel/signaldata/AlterTable.hpp
    1.4 05/08/18 14:02:19 jonas@eel.(none) +24 -1
    New error code for alter table during rolling upgrade

  ndb/include/kernel/kernel_types.h
    1.2 05/08/18 14:02:19 jonas@eel.(none) +7 -0
    table_version_major

  ndb/include/kernel/GlobalSignalNumbers.h
    1.8 05/08/18 14:02:19 jonas@eel.(none) +2 -2
    Add ALTER_TABL_REP and API_BROADCAST_REP

  ndb/include/kernel/BlockNumbers.h
    1.4 05/08/18 14:02:19 jonas@eel.(none) +1 -3
    remove GREP

  mysql-test/t/ndb_alter_table.test
    1.19.1.1 05/08/18 14:02:19 jonas@eel.(none) +25 -1
    Allow running transactions to use old table definition when possible.

  mysql-test/r/ndb_alter_table.result
    1.21 05/08/18 14:02:19 jonas@eel.(none) +17 -1
    Allow running transactions to use old table definition when possible.

ChangeSet
  1.2377.2.4 05/08/18 00:16:44 kent@mysql.com +4 -0
  mtr_timer.pl, mysql-test-run.pl, mtr_report.pl, mtr_process.pl:
    Added suite and test case timeout
  mtr_timer.pl:
    new file

  mysql-test/lib/mtr_timer.pl
    1.1 05/08/18 00:14:44 kent@mysql.com +127 -0
    Added suite and test case timeout

  mysql-test/lib/mtr_timer.pl
    1.0 05/08/18 00:14:44 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1-release/mysql-test/lib/mtr_timer.pl

  mysql-test/mysql-test-run.pl
    1.38 05/08/18 00:13:51 kent@mysql.com +25 -3
    Added suite and test case timeout

  mysql-test/lib/mtr_report.pl
    1.11 05/08/18 00:13:51 kent@mysql.com +8 -1
    Added suite and test case timeout

  mysql-test/lib/mtr_process.pl
    1.15 05/08/18 00:13:51 kent@mysql.com +20 -1
    Added suite and test case timeout

ChangeSet
  1.2377.2.3 05/08/18 00:07:17 kent@mysql.com +1 -0
  mtr_process.pl:
    Bug#11792: Create a shell like 'mysqltest' exit status

  mysql-test/lib/mtr_process.pl
    1.14 05/08/18 00:05:03 kent@mysql.com +20 -14
    Bug#11792: Create a shell like 'mysqltest' exit status

ChangeSet
  1.2377.2.2 05/08/17 23:47:03 kent@mysql.com +1 -0
  mtr_process.pl:
    Longer shutdown timeout, slave may be in reconnect
    HUP seem to disturb exit(), added sleep to make sure
    output is flushed

ChangeSet
  1.2377.4.1 05/08/17 23:53:12 evgen@moonbone.local +2 -0
  Fix bug #11718 query with function, join and order by returns wrong type.
  
  create_tmp_field_from_item() was creating tmp field without regard to
  original field type of Item. This results in wrong type being reported to
  client.
  
  To create_tmp_field_from_item() added special handling for Items with 
  DATE/TIME field types to preserve their type.

  tests/mysql_client_test.c
    1.156 05/08/17 23:38:42 evgen@moonbone.local +35 -0
    Test case for bug #11718: query with function, join and order by returns wrong type

  sql/sql_select.cc
    1.431 05/08/17 23:33:38 evgen@moonbone.local +9 -1
    Fix bug #11718 query with function, join and order by returns wrong type.

ChangeSet
  1.2377.3.1 05/08/17 12:39:30 sasha@asksasha.com +1 -0
  Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1

  sql/mysql_priv.h
    1.363 05/08/17 12:39:25 sasha@asksasha.com +0 -0
    Auto merged

  mysql-test/lib/mtr_process.pl
    1.13 05/08/17 15:14:12 kent@mysql.com +10 -4
    Longer shutdown timeout, slave may be in reconnect
    HUP seem to disturb exit(), added sleep to make sure
    output is flushed

ChangeSet
  1.2377.2.1 05/08/17 15:11:29 joerg@mysql.com +1 -0
  No C++ style comments in C source!

  mysys/charset.c
    1.139 05/08/17 15:11:25 joerg@mysql.com +1 -1
    No C++ style comments in C source!

