ChangeSet@1.1616.2986.1, 2007-03-20 19:36:11+01:00, joerg@trift2. +2 -0
  Test "help": 
  Shift the ID values up into a range where they will not collide with those
  which we use for real data, when we fill the system tables.
  
  Will be merged up to 5.0 where it is needed for 5.0.38.

  mysql-test/r/help.result@1.4.1.1, 2007-03-20 19:36:09+01:00, joerg@trift2. +44 -44
    Fix the result file according to the changed ID values in "help.test".

  mysql-test/t/help.test@1.6.1.1, 2007-03-20 19:36:09+01:00, joerg@trift2. +22 -22
    Now that (at least in 5.0) the system tables are filled with real data,
    inserting rows vith ID values 1 .. 5 will fail in release build tests (it did in 5.0.38)
    like it should already have done in customer installations.
    
    Shift the ID values up into a high area where they will not conflict,
    also make the distinct for the different kinds of values (= unique throughout the test).
    
    No change to the logic.

ChangeSet@1.1616.2985.1, 2007-03-20 19:19:17+01:00, joerg@trift2. +1 -0
  Test "help": 
  Shift the ID values up into a range where they will not collide with those
  which we use for real data, when we fill the system tables.
  
  Will be merged up to 5.0 where it is needed for 5.0.38.

  mysql-test/t/help.test@1.7, 2007-03-20 19:19:15+01:00, joerg@trift2. +22 -22
    Now that (at least in 5.0) the system tables are filled with real data,
    inserting rows vith ID values 1 .. 5 will fail in release build tests (it did in 5.0.38)
    like it should already have done in customer installations.
    
    Shift the ID values up into a high area where they will not conflict,
    also make the distinct for the different kinds of values (= unique throughout the test).
    
    No change to the logic.

ChangeSet@1.1616.2877.67, 2007-03-20 19:09:28+01:00, tsmith@quadxeon.mysql.com +1 -0
  Bug #27231: Server crash when dumping into outfile with long FIELDS ENCLOSED BY option
  - Problem: data separators were copied to a fixed-size buffer
    on the stack; memcpy was used, without bounds checking; a
    server crash could result if long FIELDS ENCLOSED BY, etc.,
    was given
  - Fix: write the separators directly, instead of copying to
    a buffer first (in select_export::send_data())

  sql/sql_class.cc@1.105.1.109, 2007-03-20 18:59:23+01:00, tsmith@quadxeon.mysql.com +6 -8
    In select_export::send_data(), write data separators
    directly, instead of copying into a fixed-size memory
    buffer before writing.  This avoids a buffer overflow
    when very large separators are specified.

ChangeSet@1.2493, 2007-03-20 15:12:50+01:00, kent@mysql.com +6 -0
  vio.vcproj, mysqld.vcproj, mysys.vcproj, libmysqld.vcproj, mysqldemb.vcproj:
    No need to set LICENSE or USE_SYMDIR from project files
  make_win_bin_dist:
    Changed location of SQL initialization files to be "share/"

  VC++Files/libmysqld/libmysqld.vcproj@1.8, 2007-03-20 14:59:06+01:00, kent@mysql.com +10 -10
    No need to set LICENSE or USE_SYMDIR from project files

  VC++Files/mysqldemb/mysqldemb.vcproj@1.5, 2007-03-20 14:59:06+01:00, kent@mysql.com +10 -10
    No need to set LICENSE or USE_SYMDIR from project files

  VC++Files/mysys/mysys.vcproj@1.13, 2007-03-20 14:59:06+01:00, kent@mysql.com +3 -3
    No need to set LICENSE or USE_SYMDIR from project files

  VC++Files/sql/mysqld.vcproj@1.12, 2007-03-20 14:59:06+01:00, kent@mysql.com +4 -4
    No need to set LICENSE or USE_SYMDIR from project files

  VC++Files/vio/vio.vcproj@1.3, 2007-03-20 14:59:06+01:00, kent@mysql.com +1 -1
    No need to set LICENSE or USE_SYMDIR from project files

  scripts/make_win_bin_dist@1.12, 2007-03-20 14:57:45+01:00, kent@mysql.com +3 -0
    Changed location of SQL initialization files to be "share/"

ChangeSet@1.2492, 2007-03-19 22:41:16+01:00, kent@mysql.com +3 -0
  mysys.vcproj:
    Removed accidently added my_winsem.c
  make_win_bin_dist:
    Corrected test for relwithdebinfo target
  mysql.sln:
    Specify that comp_err depends on zlib

  VC++Files/mysql.sln@1.17, 2007-03-19 21:14:15+01:00, kent@mysql.com +1 -0
    Specify that comp_err depends on zlib

  VC++Files/mysys/mysys.vcproj@1.12, 2007-03-19 21:13:24+01:00, kent@mysql.com +0 -3
    Removed accidently added my_winsem.c

  scripts/make_win_bin_dist@1.11, 2007-03-19 22:41:03+01:00, kent@mysql.com +1 -1
    Corrected test for relwithdebinfo target

ChangeSet@1.2491, 2007-03-19 16:45:37+01:00, kent@mysql.com +1 -0
  make_win_bin_dist:
    Restore accidently removed line

  scripts/make_win_bin_dist@1.10, 2007-03-19 16:45:29+01:00, kent@mysql.com +1 -0
    Restore accidently removed line

ChangeSet@1.2490, 2007-03-19 16:18:10+01:00, kent@mysql.com +46 -0
  Many files:
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/bdb/bdb.vcproj@1.3, 2007-03-19 16:17:48+01:00, kent@mysql.com +15 -2623
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/client/mysql.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +18 -178
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/client/mysql_upgrade.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +19 -103
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/client/mysqladmin.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +19 -103
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/client/mysqlclient.vcproj@1.3, 2007-03-19 16:17:48+01:00, kent@mysql.com +24 -2832
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/client/mysqldump.vcproj@1.3, 2007-03-19 16:17:48+01:00, kent@mysql.com +23 -131
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/client/mysqlimport.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +19 -103
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/client/mysqlshow.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +19 -103
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/client/mysqltest.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +19 -128
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/comp_err/comp_err.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +73 -18
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/dbug/dbug.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +32 -104
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/heap/heap.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +50 -818
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/innobase/innobase.vcproj@1.3, 2007-03-19 16:17:48+01:00, kent@mysql.com +14 -2614
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/libmysql/libmysql.vcproj@1.3, 2007-03-19 16:17:48+01:00, kent@mysql.com +19 -1817
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/libmysqld/examples/test_libmysqld.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +73 -41
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/libmysqld/libmysqld.vcproj@1.7, 2007-03-19 16:17:48+01:00, kent@mysql.com +459 -4013
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/libmysqltest/myTest.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +35 -51
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/my_print_defaults/my_print_defaults.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +31 -116
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/myisam/myisam.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +41 -1737
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/myisam_ftdump/myisam_ftdump.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +20 -37
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/myisamchk/myisamchk.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +30 -116
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/myisamlog/myisamlog.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +20 -106
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/myisammrg/myisammrg.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +54 -726
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/myisampack/myisampack.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +19 -105
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/mysql.sln@1.16, 2007-03-19 16:17:48+01:00, kent@mysql.com +1233 -1148
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/mysqlbinlog/mysqlbinlog.vcproj@1.3, 2007-03-19 16:17:48+01:00, kent@mysql.com +15 -123
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/mysqlcheck/mysqlcheck.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +22 -106
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/mysqldemb/mysqldemb.vcproj@1.4, 2007-03-19 16:17:48+01:00, kent@mysql.com +358 -2579
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/mysqlserver/mysqlserver.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +20 -18
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/mysys/mysys.vcproj@1.11, 2007-03-19 16:17:48+01:00, kent@mysql.com +55 -4385
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/perror/perror.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +21 -110
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/regex/regex.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +14 -126
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/replace/replace.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +20 -103
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/sql/gen_lex_hash.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +27 -22
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/sql/mysqld.vcproj@1.11, 2007-03-19 16:17:48+01:00, kent@mysql.com +222 -8039
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/strings/strings.vcproj@1.3, 2007-03-19 16:17:48+01:00, kent@mysql.com +14 -782
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/test1/test1.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +20 -37
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/tests/mysql_client_test.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +21 -39
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/thr_test/thr_test.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +18 -36
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/vio/vio.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +14 -78
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/zlib/zlib.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +16 -315
    Major cleanup of old Visual Studio project files, aligning engines etc

  extra/yassl/taocrypt/taocrypt.vcproj@1.5, 2007-03-19 16:17:48+01:00, kent@mysql.com +16 -374
    Major cleanup of old Visual Studio project files, aligning engines etc

  extra/yassl/yassl.vcproj@1.5, 2007-03-19 16:17:48+01:00, kent@mysql.com +16 -230
    Major cleanup of old Visual Studio project files, aligning engines etc

  ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj@1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +19 -19
    Major cleanup of old Visual Studio project files, aligning engines etc

  scripts/make_win_bin_dist@1.9, 2007-03-19 16:17:48+01:00, kent@mysql.com +0 -1
    Major cleanup of old Visual Studio project files, aligning engines etc

  server-tools/instance-manager/mysqlmanager.vcproj@1.8, 2007-03-19 16:17:48+01:00, kent@mysql.com +17 -8
    Major cleanup of old Visual Studio project files, aligning engines etc

ChangeSet@1.2487.1.1, 2007-03-19 15:24:07+01:00, joerg@trift2. +1 -0
  netware/Makefile.am  :  "libmysql.imp" must survive a "make clean" for the NetWare builds.

  netware/Makefile.am@1.22, 2007-03-19 15:24:04+01:00, joerg@trift2. +2 -1
    "libmysql.imp" must survive a "make clean" for the NetWare builds.

ChangeSet@1.2487, 2007-03-18 10:47:15+01:00, kent@mysql.com +1 -0
  make_win_bin_dist:
    - Support both "release" and "relwithdebinfo" targets
    - Copy ".pdb" and ".pdb" files for the server and instance manager
    - Removed the examples directory, unsupported
    - Handle both old and new builds in the same script, "-debug" and "-nt"
      extensions, directory "data" and "share" in different location

  scripts/make_win_bin_dist@1.7, 2007-03-18 10:42:35+01:00, kent@mysql.com +54 -34
    - Support both "release" and "relwithdebinfo" targets
    - Copy ".pdb" and ".pdb" files for the server and instance manager
    - Removed the examples directory, unsupported
    - Handle both old and new builds in the same script, "-debug" and "-nt"
      extensions, directory "data" and "share" in different location

ChangeSet@1.2486, 2007-03-17 19:45:01+01:00, joerg@trift2. +1 -0
  Fix a failure in test "func_in" on some 64-bit big-endian hosts in first 5.0.38 builds.

  sql/item_cmpfunc.cc@1.240, 2007-03-17 19:44:58+01:00, joerg@trift2. +2 -2
    Ensure both operands of a comparison are cast to "ulonglong", not just one only.
    Without this, some 64-bit big-endian hosts failed test "func_in" when 5.0.38 builds were started.
    
    Patch provided by Timothy.

ChangeSet@1.2485, 2007-03-16 20:56:16+01:00, joerg@trift2. +9 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Build sql files for netware from the mysql_system_tables*.sq files
   - Fix comments about mysql_create_system_tables.sh
   - Use mysql_install_db.sh to create system tables for mysql_test-run-shell
   - Fix mysql-test-run.pl to also look in share/mysql for the msyql_system*.sql files
  
  Changeset coded today by Magnus Svensson, just the application to 5.0.38 is by Joerg Bruehe.

  BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023@1.9, 2007-03-16 20:47:21+01:00, joerg@trift2. +0 -0
    Delete: netware/init_db.sql

  BitKeeper/deleted/.del-test_db.sql@1.5, 2007-03-16 20:47:45+01:00, joerg@trift2. +0 -0
    Delete: netware/test_db.sql

  BitKeeper/etc/ignore@1.244, 2007-03-16 20:56:13+01:00, joerg@trift2. +2 -0
    Added netware/init_db.sql netware/test_db.sql to the ignore list

  mysql-test/install_test_db.sh@1.39, 2007-03-16 20:56:13+01:00, joerg@trift2. +8 -12
    Use mysql_install_db from install_test_db(which is used by mysql-test-run-shell)
    to install the system tables

  mysql-test/mysql-test-run.pl@1.209, 2007-03-16 20:56:13+01:00, joerg@trift2. +11 -3
    Look for the mysql_system_tables*.sql also in share/mysql

  netware/Makefile.am@1.21, 2007-03-16 20:56:13+01:00, joerg@trift2. +24 -4
    Build netware/init_db.sql and netware/test_db.sql from
    the sources in scripts/msyql_system_tables*.sql

  scripts/make_binary_distribution.sh@1.123, 2007-03-16 20:56:13+01:00, joerg@trift2. +0 -6
    netware/init_db.sql and netware/test_db.sql are now built by the Makefiles
    from the scripts/mysql_system_tables*.sql files

  sql/mysql_priv.h@1.438, 2007-03-16 20:56:13+01:00, joerg@trift2. +3 -2
    Update comment remindging to update the MySQL system table definitions
    when adding a new SQL_MODE

  sql/sql_acl.h@1.53, 2007-03-16 20:56:13+01:00, joerg@trift2. +1 -1
    Update comment reminding to update the MySQL System tables
    when changing the ACL defines

ChangeSet@1.2484, 2007-03-16 19:56:16+01:00, joerg@trift2. +2 -0
  Fix bug#27212, test case "loaddata": Take the file to read from the binary package.

  mysql-test/r/loaddata.result@1.26, 2007-03-16 19:56:11+01:00, joerg@trift2. +3 -3
    Fix bug#27212:  Do not try to read a file which is not contained in a binary distribution,
    because it will be missing when the tests are run during release build or by a customer.

  mysql-test/t/loaddata.test@1.20, 2007-03-16 19:56:11+01:00, joerg@trift2. +2 -2
    Fix bug#27212:  Do not try to read a file which is not contained in a binary distribution,
    because it will be missing when the tests are run during release build or by a customer.

ChangeSet@1.2478.1.1, 2007-03-15 11:51:35+03:00, dlenev@mockturtle.local +3 -0
  Fix for bug #25966 "2MB per second endless memory consumption after LOCK
  TABLE ... WRITE".
  
  Memory and CPU hogging occured when connection which had to wait for table
  lock was serviced by thread which previously serviced connection that was
  killed (note that connections can reuse threads if thread cache is enabled).
  One possible scenario which exposed this problem was when thread which
  provided binlog dump to replication slave was implicitly/automatically
  killed when the same slave reconnected and started pulling data through
  different thread/connection.
  The problem also occured when one killed particular query in connection
  (using KILL QUERY) and later this connection had to wait for some table
  lock.
  
  This problem was caused by the fact that thread-specific mysys_var::abort
  variable, which indicates that waiting operations on mysys layer should
  be aborted (this includes waiting for table locks), was set by kill
  operation but was never reset back. So this value was "inherited" by the
  following statements or even other connections (which reused the same
  physical thread). Such discrepancy between this variable and THD::killed
  flag broke logic on SQL-layer and caused CPU and memory hogging.
  
  This patch tries to fix this problem by properly resetting this member.
  
  There is no test-case associated with this patch since it is hard to test
  for memory/CPU hogging conditions in our test-suite.

  sql/mysqld.cc@1.597, 2007-03-15 11:51:32+03:00, dlenev@mockturtle.local +6 -0
    We should not forget to reset THD::mysys_var::abort after kill operation
    if we are going to use thread to which this operation was applied for
    handling of other connections.

  sql/sp_head.cc@1.237, 2007-03-15 11:51:33+03:00, dlenev@mockturtle.local +1 -0
    We should not forget to reset THD::mysys_var::abort after kill operation
    if we are going to use thread to which this operation was applied for
    handling of further statements.

  sql/sql_parse.cc@1.611, 2007-03-15 11:51:33+03:00, dlenev@mockturtle.local +3 -0
    We should not forget to reset THD::mysys_var::abort after kill operation
    if we are going to use thread to which this operation was applied for
    handling of further statements.

ChangeSet@1.1616.2984.3, 2007-03-15 11:30:17+03:00, dlenev@mockturtle.local +1 -0
  Fix for bug #25966 "2MB per second endless memory consumption after LOCK
  TABLE ... WRITE".
  
  CPU hogging occured when connection which had to wait for table lock was
  serviced by thread which previously serviced connection that was killed
  (note that connections can reuse threads if thread cache is enabled).
  One possible scenario which exposed this problem was when thread which
  provided binlog dump to replication slave was implicitly/automatically
  killed when the same slave reconnected and started pulling data through
  different thread/connection.
  In 5.* versions memory hogging was added to CPU hogging. Moreover in
  those versions the problem also occured when one killed particular query
  in connection (using KILL QUERY) and later this connection had to wait for
  some table lock.
  
  This problem was caused by the fact that thread-specific mysys_var::abort
  variable, which indicates that waiting operations on mysys layer should
  be aborted (this includes waiting for table locks), was set by kill
  operation but was never reset back. So this value was "inherited" by the
  following statements or even other connections (which reused the same
  physical thread). Such discrepancy between this variable and THD::killed
  flag broke logic on SQL-layer and caused CPU and memory hogging.
  
  This patch tries to fix this problem by properly resetting this member.
  
  There is no test-case associated with this patch since it is hard to test
  for memory/CPU hogging conditions in our test-suite.

  sql/mysqld.cc@1.356.98.40, 2007-03-15 11:30:16+03:00, dlenev@mockturtle.local +6 -0
    We should not forget to reset THD::mysys_var::abort after kill operation
    if we are going to use thread to which this operation was applied for
    handling of other connections.

ChangeSet@1.1346.1.867, 2007-03-14 18:28:16+01:00, kent@mysql.com +1 -0
  EXCEPTIONS-CLIENT:
    Updated to version 0.6 of the text

  EXCEPTIONS-CLIENT@1.2, 2007-03-14 18:28:10+01:00, kent@mysql.com +4 -2
    Updated to version 0.6 of the text

ChangeSet@1.1346.1.866, 2007-03-14 14:27:46+01:00, kent@mysql.com +1 -0
  configure.in:
    Added test for sched_yield() possibly in -lposix4 on Solaris

  configure.in@1.191.1.153, 2007-03-14 14:27:40+01:00, kent@mysql.com +3 -0
    Added test for sched_yield() possibly in -lposix4 on Solaris

ChangeSet@1.2478, 2007-03-14 02:30:05+04:00, svoj@mysql.com +1 -0
  Removed tabs.

  myisam/mi_open.c@1.105, 2007-03-14 02:30:03+04:00, svoj@mysql.com +1 -1
    Removed tabs.

ChangeSet@1.1616.2984.2, 2007-03-13 18:02:06+04:00, svoj@mysql.com +5 -0
  BUG#26881 - Large MERGE tables report incorrect specification when no
              differences in tables
  Certain merge tables were wrongly reported as having incorrect definition:
  - Some fields that are 1 byte long (e.g. TINYINT, CHAR(1)), might
    be internally casted (in certain cases) to a different type on a
    storage engine layer. (affects 4.1 and up)
  - If tables in a merge (and a MERGE table itself) had short VARCHAR column (less
    than 4 bytes) and at least one (but not all) tables were ALTER'ed (even to an
    identical table: ALTER TABLE xxx ENGINE=yyy), table definitions went ouf of
    sync. (affects 4.1 only)
  
  This is fixed by relaxing a check for underlying conformance and setting
  field type to FIELD_TYPE_STRING in case varchar is shorter than 4
  when a table is created.

  myisam/mi_create.c@1.37.1.14, 2007-03-13 18:02:04+04:00, svoj@mysql.com +4 -0
    Added a comment.

  mysql-test/r/merge.result@1.32.1.14, 2007-03-13 18:02:04+04:00, svoj@mysql.com +13 -0
    A test case for bug#26881.

  mysql-test/t/merge.test@1.28.1.15, 2007-03-13 18:02:04+04:00, svoj@mysql.com +17 -0
    A test case for bug#26881.

  sql/ha_myisam.cc@1.115.1.50, 2007-03-13 18:02:04+04:00, svoj@mysql.com +36 -1
    Relaxed some checks performed by check_definition():
    As comparing of fulltext keys (and key segments) is not yet implemented,
    only return an error in case one of keys is fulltext and other is not.
    Otherwise, if both keys are fulltext, accept them as is.
    
    As comparing of spatial keys (and key segments) is not yet implemented,
    only return an error in case one of keys is spatial and other is not.
    Otherwise, if both keys are spatial, accept them as is.
    
    A workaround to handle situation when field is casted from FIELD_SKIP_ZERO
    to FIELD_NORMAL. This could happen only in case field length is 1 and row
    format is fixed.

  sql/sql_parse.cc@1.271.1.225, 2007-03-13 18:02:05+04:00, svoj@mysql.com +7 -1
    When a table that has varchar field shorter than 4 is created, field type is
    set to FIELD_TYPE_VAR_STRING. Later, when a table is modified using alter
    table, field type is changed to FIELD_TYPE_STRING (see Field_string::type).
    That means HA_OPTION_PACK_RECORD flag might be lost and thus null_bit might
    be shifted by alter table, in other words alter table doesn't create 100%
    equal table definition.
    
    This is usually not a problem, since when a table is created/altered,
    definition on a storage engine layer is based on one that is passed from
    sql layer. But it is a problem for merge engine - null_bit is shifted when
    a table (merge or underlying) is altered.
    
    Set field type to FIELD_TYPE_STRING in case FIELD_TYPE_VAR_STRING is shorter
    than 4 when a table is created as it is done in Field::type.

ChangeSet@1.1616.2877.62, 2007-03-12 21:27:07+01:00, kent@mysql.com +1 -0
  configure.in:
    Restored accidently removed line to check for zlib

  configure.in@1.201.64.26, 2007-03-12 21:26:03+01:00, kent@mysql.com +2 -0
    Restored accidently removed line to check for zlib

ChangeSet@1.2470.2.2, 2007-03-12 14:52:37+01:00, kent@mysql.com +2 -0
  Makefile.am, CMakeLists.txt:
    Removed references to my_winsem.c

  mysys/CMakeLists.txt@1.4, 2007-03-12 14:52:30+01:00, kent@mysql.com +1 -1
    Removed references to my_winsem.c

  mysys/Makefile.am@1.76, 2007-03-12 14:52:30+01:00, kent@mysql.com +1 -1
    Removed references to my_winsem.c

ChangeSet@1.1616.2877.61, 2007-03-12 13:18:48+01:00, kent@mysql.com +2 -0
  mysys_ia64.dsp, mysys.vcproj:
    Removed references to unused files

  VC++Files/mysys/mysys.vcproj@1.1.1.2, 2007-03-12 13:18:03+01:00, kent@mysql.com +0 -43
    Removed unused files

  VC++Files/mysys/mysys_ia64.dsp@1.2.1.2, 2007-03-12 13:18:03+01:00, kent@mysql.com +0 -4
    Removed unused files

ChangeSet@1.2341.91.1, 2007-03-12 13:15:43+01:00, df@pippilotta.erinye.com +1 -0
  add missing test cases to windows binary distribution

  scripts/make_win_bin_dist@1.5.1.1, 2007-03-12 13:15:41+01:00, df@pippilotta.erinye.com +1 -0
    add missing test cases to windows binary distribution

ChangeSet@1.1346.1.865, 2007-03-12 13:12:42+01:00, kent@mysql.com +7 -0
  Makefile.am, configure.in, mysys.dsp:
    Removed unused files
  .del-my_winsem.c:
    Delete: mysys/my_winsem.c
  .del-my_semaphore.c:
    Delete: mysys/my_semaphore.c
  .del-my_semaphore.h:
    Delete: include/my_semaphore.h

  BitKeeper/deleted/.del-my_semaphore.c@1.3.1.1, 2007-03-12 13:10:40+01:00, kent@mysql.com +0 -0
    Delete: mysys/my_semaphore.c

  BitKeeper/deleted/.del-my_semaphore.h@1.8, 2007-03-12 13:10:40+01:00, kent@mysql.com +0 -0
    Delete: include/my_semaphore.h

  BitKeeper/deleted/.del-my_winsem.c@1.4, 2007-03-12 13:10:40+01:00, kent@mysql.com +0 -0
    Delete: mysys/my_winsem.c

  VC++Files/mysys/mysys.dsp@1.6.1.8, 2007-03-12 13:12:09+01:00, kent@mysql.com +0 -4
    Removed unused files

  configure.in@1.191.1.152, 2007-03-12 13:12:09+01:00, kent@mysql.com +0 -3
    Removed unused files

  include/Makefile.am@1.29.1.12, 2007-03-12 13:12:09+01:00, kent@mysql.com +1 -1
    Removed unused files

  mysys/Makefile.am@1.29.1.17, 2007-03-12 13:12:09+01:00, kent@mysql.com +1 -1
    Removed unused files

ChangeSet@1.2413.37.1, 2007-03-10 19:55:34+03:00, evgen@moonbone.local +3 -0
  Bug#15757: Wrong SUBSTRING() result when a tmp table was employed.
  
  When the SUBSTRING() function was used over a LONGTEXT field the max_length of
  the SUBSTRING() result was wrongly calculated and set to 0. As the max_length
  parameter is used while tmp field creation it limits the length of the result
  field and leads to printing an empty string instead of the correct result.
  
  Now the Item_func_substr::fix_length_and_dec() function correctly calculates
  the max_length parameter.

  mysql-test/r/func_str.result@1.126.3.1, 2007-03-10 19:55:10+03:00, evgen@moonbone.local +11 -0
    Added a test case for the bug#15757: Wrong SUBSTRING() result when a tmp table was employed.

  mysql-test/t/func_str.test@1.99.2.1, 2007-03-10 19:55:04+03:00, evgen@moonbone.local +11 -0
    Added a test case for the bug#15757: Wrong SUBSTRING() result when a tmp table was employed.

  sql/item_strfunc.cc@1.295.2.1, 2007-03-10 19:55:10+03:00, evgen@moonbone.local +3 -4
    Bug#15757: Wrong SUBSTRING() result when a tmp table was employed.
    Now the Item_func_substr::fix_length_and_dec() function correctly calculates
    the max_length parameter.

ChangeSet@1.2472, 2007-03-10 02:47:47-08:00, igor@olga.mysql.com +3 -0
  Fixed bug #26830: a crash for the query with a subselect containing ROLLUP.
  Crash happened because the function get_best_group_min_max detected
  joins with ROLLUP incorrectly.

  mysql-test/r/olap.result@1.36, 2007-03-10 02:47:44-08:00, igor@olga.mysql.com +9 -0
    Added a test case for bug #26830.

  mysql-test/t/olap.test@1.27, 2007-03-10 02:47:44-08:00, igor@olga.mysql.com +15 -0
    Added a test case for bug #26830.

  sql/opt_range.cc@1.241, 2007-03-10 02:47:45-08:00, igor@olga.mysql.com +1 -1
    Fixed bug #26830: a crash for the query with a subselect containing ROLLUP.
    Crash happened because the function get_best_group_min_max detected
    joins with ROLLUP incorrectly.

ChangeSet@1.2465.1.4, 2007-03-10 11:46:20+07:00, tomas@poseidon.mysql.com +1 -0
  disabling _new_ unstable test case

  mysql-test/t/disabled.def@1.45, 2007-03-10 11:46:13+07:00, tomas@poseidon.mysql.com +1 -0
    disabling _new_ unstable test case

ChangeSet@1.2413.17.23, 2007-03-09 23:37:33+01:00, knielsen@ymer.(none) +2 -0
  BUG#27018: Partial blob write inside blob clobbers data after the write.
  
  When doing partial blob update with NdbBlob::writeData(), zero-padding
  after the write was wrongly done, causing part of the old blob value
  to be overwritten with zeros (or spaces for text field).
  
  Fixed by only padding when needed (when writing at end of the blob).

  ndb/src/ndbapi/NdbBlob.cpp@1.33, 2007-03-09 23:37:29+01:00, knielsen@ymer.(none) +3 -1
    Do not pad rest of blob part after the write, unless it is a write at the
    end of the blob.

  ndb/test/ndbapi/testBlobs.cpp@1.32, 2007-03-09 23:37:29+01:00, knielsen@ymer.(none) +53 -1
    Add test case.

ChangeSet@1.2413.36.1, 2007-03-10 00:29:02+03:00, evgen@moonbone.local +12 -0
  Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
  away.
  
  Additional fix for bug#22331. Now Item_field prints its value in the case of
  the const field.

  mysql-test/r/explain.result@1.20, 2007-03-10 00:18:45+03:00, evgen@moonbone.local +3 -3
    Corrected test case after fix for bug#22331.

  mysql-test/r/func_default.result@1.6, 2007-03-10 00:18:44+03:00, evgen@moonbone.local +1 -1
    Corrected test case after fix for bug#22331.

  mysql-test/r/func_regexp.result@1.11, 2007-03-10 00:18:43+03:00, evgen@moonbone.local +1 -1
    Corrected test case after fix for bug#22331.

  mysql-test/r/func_str.result@1.126.2.1, 2007-03-10 00:18:43+03:00, evgen@moonbone.local +3 -3
    Corrected test case after fix for bug#22331.

  mysql-test/r/func_test.result@1.35, 2007-03-10 00:18:42+03:00, evgen@moonbone.local +1 -1
    Corrected test case after fix for bug#22331.

  mysql-test/r/having.result@1.27, 2007-03-10 00:18:42+03:00, evgen@moonbone.local +1 -1
    Corrected test case after fix for bug#22331.

  mysql-test/r/subselect.result@1.172.1.3, 2007-03-10 00:18:41+03:00, evgen@moonbone.local +11 -11
    Corrected test case after fix for bug#22331.

  mysql-test/r/union.result@1.87.1.1, 2007-03-10 00:18:40+03:00, evgen@moonbone.local +1 -1
    Corrected test case after fix for bug#22331.

  mysql-test/r/varbinary.result@1.18, 2007-03-10 00:18:36+03:00, evgen@moonbone.local +1 -1
    Corrected test case after fix for bug#22331.

  sql/item.cc@1.251.2.1, 2007-03-10 00:19:26+03:00, evgen@moonbone.local +19 -2
    Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
    away.
    Added the print() member function to the Item_field class.

  sql/item.h@1.221, 2007-03-10 00:19:10+03:00, evgen@moonbone.local +1 -0
    Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
    away.
    Added the print() member function to the Item_field class.

  sql/sql_union.cc@1.140, 2007-03-10 00:18:58+03:00, evgen@moonbone.local +6 -0
    Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
    away.
    Cleanup of the SELECT_LEX::order_list list.

ChangeSet@1.1616.2983.3, 2007-03-09 16:19:42+01:00, istruewing@chilla.local +1 -0
  Bug#25673 - spatial index corruption, error 126 incorrect key file for table
  Fixed a compiler warning, deteced by pushbuild only.

  myisam/rt_index.c@1.17.2.3, 2007-03-09 16:19:40+01:00, istruewing@chilla.local +1 -1
    Bug#25673 - spatial index corruption, error 126 incorrect key file for table
    Fixed a compiler warning, deteced by pushbuild only.

ChangeSet@1.2377.38.11, 2007-03-09 20:34:00+07:00, tomas@poseidon.mysql.com +2 -0
  added error code for failing send signal and timeout waiting for node failure
  added error code for failing send signal and timeout waiting for node failure

  ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.95.1.2, 2007-03-09 20:33:54+07:00, tomas@poseidon.mysql.com +4 -0
    added error code for failing send signal and timeout waiting for node failure

  ndb/src/ndbapi/ndberror.c@1.56, 2007-03-09 20:33:54+07:00, tomas@poseidon.mysql.com +2 -0
    added error code for failing send signal and timeout waiting for node failure

ChangeSet@1.2413.35.1, 2007-03-09 12:47:12+02:00, gkodinov@magare.gmz +3 -0
  Bug #26281:
   Fixed boundry checks in the INSERT() function:
   were one off.

  mysql-test/r/func_str.result@1.126.1.2, 2007-03-09 12:47:11+02:00, gkodinov@magare.gmz +12 -0
    Bug #26281: test case

  mysql-test/t/func_str.test@1.99.1.2, 2007-03-09 12:47:11+02:00, gkodinov@magare.gmz +8 -0
    Bug #26281: test case

  sql/item_strfunc.cc@1.295.1.1, 2007-03-09 12:47:11+02:00, gkodinov@magare.gmz +5 -5
    Bug #26281: fixed boundry checks

ChangeSet@1.2413.34.1, 2007-03-09 01:45:32-08:00, igor@olga.mysql.com +3 -0
  Fixed bug #26661: crash when order by clause in a union
  construct references invalid name.
  Derived tables currently cannot use outer references.
  Thus there is no outer context for them.
  The 4.1 code takes this fact into account while the 
  Item_field::fix_outer_field code of 5.0 lost the check that blocks
  any attempts to resolve names in outer context for derived tables.

  mysql-test/r/union.result@1.88, 2007-03-09 01:45:30-08:00, igor@olga.mysql.com +11 -0
    Added a test case for bug #26661.

  mysql-test/t/union.test@1.98, 2007-03-09 01:45:30-08:00, igor@olga.mysql.com +13 -0
    Added a test case for bug #26661.

  sql/item.cc@1.251.1.2, 2007-03-09 01:45:30-08:00, igor@olga.mysql.com +6 -1
    Fixed bug #26661.
    Derived tables currently cannot use outer references.
    Thus there is no outer context for them.
    The 4.1 code takes this fact into account while the 
    Item_field::fix_outer_field code of 5.0 lost the check that blocks
    any attempts to resolve names in outer context for derived tables.

ChangeSet@1.2377.38.10, 2007-03-09 16:39:13+07:00, tomas@poseidon.mysql.com +2 -0
  ndb single user basic test

  mysql-test/r/ndb_single_user.result@1.1, 2007-03-09 16:39:03+07:00, tomas@poseidon.mysql.com +46 -0
    ndb single user basic test

  mysql-test/r/ndb_single_user.result@1.0, 2007-03-09 16:39:03+07:00, tomas@poseidon.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.0-telco-gca/mysql-test/r/ndb_single_user.result

  mysql-test/t/ndb_single_user.test@1.1, 2007-03-09 16:39:03+07:00, tomas@poseidon.mysql.com +84 -0
    ndb single user basic test

  mysql-test/t/ndb_single_user.test@1.0, 2007-03-09 16:39:03+07:00, tomas@poseidon.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.0-telco-gca/mysql-test/t/ndb_single_user.test

ChangeSet@1.2467, 2007-03-09 13:37:06+04:00, holyfoot@mysql.com +1 -0
  aftermerge fix

  mysql-test/r/view.result@1.197, 2007-03-09 13:37:05+04:00, holyfoot@mysql.com +37 -0
    merging

ChangeSet@1.2377.38.9, 2007-03-09 15:37:10+07:00, tomas@poseidon.mysql.com +3 -0
  
  Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
  - correction of part 1
      add ndb_waiter option to wait for single user mode

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.71.1.3, 2007-03-09 15:37:02+07:00, tomas@poseidon.mysql.com +21 -15
    Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
    - correction of part 1

  ndb/src/kernel/blocks/dbdict/Dbdict.hpp@1.24.1.2, 2007-03-09 15:37:03+07:00, tomas@poseidon.mysql.com +2 -0
    Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
    - correction of part 1

  ndb/tools/waiter.cpp@1.27, 2007-03-09 15:37:03+07:00, tomas@poseidon.mysql.com +11 -1
    add ndb_waiter option to wait for single user mode

ChangeSet@1.1616.2983.2, 2007-03-08 19:22:43+01:00, istruewing@chilla.local +1 -0
  Bug#25673 - spatial index corruption, error 126 incorrect key file for table
  After backport fix.
  Added forgotten DBUG_RETURNs, which was detected in 5.1 only.

  myisam/rt_index.c@1.17.2.2, 2007-03-08 19:22:41+01:00, istruewing@chilla.local +3 -3
    Bug#25673 - spatial index corruption, error 126 incorrect key file for table
    After backport fix.
    Added forgotten DBUG_RETURNs, which was detected in 5.1 only.

ChangeSet@1.2413.23.11, 2007-03-08 19:38:21+03:00, evgen@moonbone.local +1 -0
  sql_select.cc:
    Postfix for bug#22331.

  sql/sql_select.cc@1.495.1.5, 2007-03-08 19:37:19+03:00, evgen@moonbone.local +2 -1
    Postfix for bug#22331.

ChangeSet@1.2413.33.2, 2007-03-08 12:08:59+01:00, istruewing@chilla.local +1 -0
  Bug#25673 - spatial index corruption, error 126 incorrect key file for table
  After merge fix

  mysql-test/r/gis-rtree.result@1.25, 2007-03-08 12:08:56+01:00, istruewing@chilla.local +1 -0
    Bug#25673 - spatial index corruption, error 126 incorrect key file for table
    After merge fix

ChangeSet@1.1616.2983.1, 2007-03-08 09:54:37+01:00, istruewing@chilla.local +5 -0
  Bug#25673 - spatial index corruption, error 126
            incorrect key file for table
  
  In certain cases it could happen that deleting a row could
  corrupt an RTREE index.
  
  According to Guttman's algorithm, page underflow is handled
  by storing the page in a list for later re-insertion. The
  keys from the stored pages have to be inserted into the
  remaining pages of the same level of the tree. Hence the
  level number is stored in the re-insertion list together
  with the page.
  
  In the MySQL RTree implementation the level counts from zero
  at the root page, increasing numbers for levels down the tree.
  
  If during re-insertion of the keys the tree height grows, all
  level numbers become invalid. The remaining keys will be
  inserted at the wrong level.
  
  The fix is to increment the level numbers stored in the
  reinsert list after a split of the root block during reinsertion.

  myisam/rt_index.c@1.17.2.1, 2007-03-08 09:54:35+01:00, istruewing@chilla.local +75 -25
    Bug#25673 - spatial index corruption, error 126
                incorrect key file for table
    Added a loop in rtree_delete() to increment the level numbers
    stored in the reinsert list after a split of the root block
    during reinsertion.
    Added comments and DBUG statements.

  myisam/rt_key.c@1.8.1.1, 2007-03-08 09:54:35+01:00, istruewing@chilla.local +12 -5
    Bug#25673 - spatial index corruption, error 126
                incorrect key file for table
    Added DBUG statements.

  myisam/rt_split.c@1.11.2.3, 2007-03-08 09:54:35+01:00, istruewing@chilla.local +5 -2
    Bug#25673 - spatial index corruption, error 126
                incorrect key file for table
    Added DBUG statements.

  mysql-test/r/gis-rtree.result@1.8.1.7, 2007-03-08 09:54:35+01:00, istruewing@chilla.local +552 -0
    Bug#25673 - spatial index corruption, error 126
                incorrect key file for table
    Added the test result.

  mysql-test/t/gis-rtree.test@1.9.1.6, 2007-03-08 09:54:35+01:00, istruewing@chilla.local +556 -0
    Bug#25673 - spatial index corruption, error 126
                incorrect key file for table
    Added a test.

ChangeSet@1.2459.1.12, 2007-03-08 08:15:30+01:00, tsmith@quadxeon.mysql.com +1 -0
  comp_err.c:  return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning

  extra/comp_err.c@1.28.1.1, 2007-03-08 08:15:05+01:00, tsmith@quadxeon.mysql.com +2 -2
    return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning

ChangeSet@1.2459.3.1, 2007-03-07 23:49:46+01:00, tsmith@quadxeon.mysql.com +1 -0
  update test results for bdb_gis after merge of fix for b26038

  mysql-test/r/bdb_gis.result@1.4, 2007-03-07 23:49:21+01:00, tsmith@quadxeon.mysql.com +2 -2
    update test results for bdb_gis after merge of fix for b26038

ChangeSet@1.2413.23.10, 2007-03-08 00:27:42+03:00, evgen@moonbone.local +3 -0
  sql_select.cc:
    Postfix for bug#22331 for windows platform.
  explain.test, explain.result:
    Cleanup after bugfix#22331.

  mysql-test/r/explain.result@1.19, 2007-03-08 00:27:00+03:00, evgen@moonbone.local +1 -0
    Cleanup after bugfix#22331.

  mysql-test/t/explain.test@1.12, 2007-03-08 00:26:50+03:00, evgen@moonbone.local +1 -0
    Cleanup after bugfix#22331.

  sql/sql_select.cc@1.495.1.4, 2007-03-08 00:27:05+03:00, evgen@moonbone.local +1 -1
    Postfix for bug#22331 for windows platform.

ChangeSet@1.2413.32.1, 2007-03-07 22:11:57+03:00, evgen@moonbone.local +3 -0
  Bug#25373: Stored functions wasn't compared correctly which leads to a wrong
  result.
  
  For built-in functions like sqrt() function names are hard-coded and can be
  compared by pointer. But this isn't the case for a used-defined stored
  functions - names there are dynamical and should be compared as strings.
  
  Now the Item_func::eq() function employs my_strcasecmp() function to compare
  used-defined stored functions names.

  mysql-test/r/sp.result@1.218.2.1, 2007-03-07 22:05:53+03:00, evgen@moonbone.local +13 -0
    Added a test case for bug#25373: Stored functions wasn't compared correctly which leads to a wrong result.

  mysql-test/t/sp.test@1.208.2.1, 2007-03-07 22:05:47+03:00, evgen@moonbone.local +15 -0
    Added a test case for bug#25373: Stored functions wasn't compared correctly which leads to a wrong result.

  sql/item_func.cc@1.322.1.1, 2007-03-07 22:05:57+03:00, evgen@moonbone.local +7 -2
    Bug#25373: Stored functions wasn't compared correctly which leads to a wrong
    result.
    Now the Item_func::eq() function employs my_strcasecmp() function to compare
    used-defined stored functions names.

ChangeSet@1.2377.29.8, 2007-03-07 21:44:58+03:00, evgen@moonbone.local +8 -0
  Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
  away.
  
  During optimization stage the WHERE conditions can be changed or even
  be removed at all if they know for sure to be true of false. Thus they aren't
  showed in the EXPLAIN EXTENDED which prints conditions after optimization.
  
  Now if all elements of an Item_cond were removed this Item_cond is substituted
  for an Item_int with the int value of the Item_cond.
  If there were conditions that were totally optimized away then values of the
  saved cond_value and having_value will be printed instead.

  mysql-test/r/explain.result@1.18, 2007-03-07 21:31:36+03:00, evgen@moonbone.local +29 -0
    Added a test case for the bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized away.

  mysql-test/r/func_test.result@1.34, 2007-03-07 21:31:34+03:00, evgen@moonbone.local +1 -1
    Corrected test case result after fix for bug#22331.

  mysql-test/r/subselect.result@1.172.2.1, 2007-03-07 21:31:33+03:00, evgen@moonbone.local +8 -8
    Corrected test case result after fix for bug#22331.

  mysql-test/t/explain.test@1.11, 2007-03-07 21:31:28+03:00, evgen@moonbone.local +14 -0
    Added a test case for the bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized away.

  sql/sql_lex.cc@1.209.4.1, 2007-03-07 21:43:19+03:00, evgen@moonbone.local +1 -0
    Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
    away.
    The initialization of the cond_value and the having_value variables.

  sql/sql_lex.h@1.233.6.1, 2007-03-07 21:42:15+03:00, evgen@moonbone.local +2 -0
    Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
    away.
    The cond_value and the having_value variables are
    added to the SELECT_LEX class.

  sql/sql_select.cc@1.488.1.3, 2007-03-07 21:40:05+03:00, evgen@moonbone.local +18 -5
    Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
    away.
    Now if all elements of an Item_cond were removed this Item_cond is substituted
    for an Item_int with the int value of the Item_cond.
    If there were conditions that were totally optimized away then values of the
    saved cond_value and having_value will be printed instead.

  sql/sql_select.h@1.116, 2007-03-07 21:44:25+03:00, evgen@moonbone.local +1 -1
    Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
    away.
    Now having_value is also stored in the JOIN class.

ChangeSet@1.2459.1.9, 2007-03-07 10:46:38-05:00, iggy@recycle.(none) +1 -0
  Bug#25222 Win32 HANDLE leak in my_sopen()
  - When attempting to associate a Windows File handle to a C run-time file
  handle there is an upper bound.  Once reached, the newly created handles
  will cause a memory leak since they are not properly associated with a
  handle that can later be cleaned up.

  mysys/my_open.c@1.28, 2007-03-07 10:46:36-05:00, iggy@recycle.(none) +6 -1
    Bug#25222 Win32 HANDLE leak in my_sopen()
    - Check for failure in _open_osfhandle and close allocated HANDLE on failure.

ChangeSet@1.2413.17.18, 2007-03-07 14:03:44+03:00, kostja@bodhi.local +1 -0
  A fix for the windows build (harmless warning).

  sql/sql_lex.cc@1.216, 2007-03-07 14:03:41+03:00, kostja@bodhi.local +1 -1
    A fix for the windows build.

ChangeSet@1.2413.31.1, 2007-03-07 12:24:46+03:00, kostja@bodhi.local +10 -0
  A fix for Bug#26750 "valgrind leak in sp_head" (and post-review
  fixes).
  
  The legend: on a replication slave, in case a trigger creation
  was filtered out because of application of replicate-do-table/
  replicate-ignore-table rule, the parsed definition of a trigger was not 
  cleaned up properly. LEX::sphead member was left around and leaked 
  memory. Until the actual implementation of support of 
  replicate-ignore-table rules for triggers by the patch for Bug 24478 it 
  was never the case that "case SQLCOM_CREATE_TRIGGER"
  was not executed once a trigger was parsed,
  so the deletion of lex->sphead there worked and the memory did not leak.
  
  The fix: 
  
  The real cause of the bug is that there is no 1 or 2 places where
  we can clean up the main LEX after parse. And the reason we 
  can not have just one or two places where we clean up the LEX is
  asymmetric behaviour of MYSQLparse in case of success or error. 
  
  One of the root causes of this behaviour is the code in Item::Item()
  constructor. There, a newly created item adds itself to THD::free_list
  - a single-linked list of Items used in a statement. Yuck. This code
  is unaware that we may have more than one statement active at a time,
  and always assumes that the free_list of the current statement is
  located in THD::free_list. One day we need to be able to explicitly
  allocate an item in a given Query_arena.
  Thus, when parsing a definition of a stored procedure, like
  CREATE PROCEDURE p1() BEGIN SELECT a FROM t1; SELECT b FROM t1; END;
  we actually need to reset THD::mem_root, THD::free_list and THD::lex
  to parse the nested procedure statement (SELECT *).
  The actual reset and restore is implemented in semantic actions
  attached to sp_proc_stmt grammar rule.
  The problem is that in case of a parsing error inside a nested statement
  Bison generated parser would abort immediately, without executing the
  restore part of the semantic action. This would leave THD in an 
  in-the-middle-of-parsing state.
  This is why we couldn't have had a single place where we clean up the LEX
  after MYSQLparse - in case of an error we needed to do a clean up
  immediately, in case of success a clean up could have been delayed.
  This left the door open for a memory leak.
  
  One of the following possibilities were considered when working on a fix:
  - patch the replication logic to do the clean up. Rejected
  as breaks module borders, replication code should not need to know the
  gory details of clean up procedure after CREATE TRIGGER.
  - wrap MYSQLparse with a function that would do a clean up.
  Rejected as ideally we should fix the problem when it happens, not
  adjust for it outside of the problematic code.
  - make sure MYSQLparse cleans up after itself by invoking the clean up
  functionality in the appropriate places before return. Implemented in 
  this patch.
  - use %destructor rule for sp_proc_stmt to restore THD - cleaner
  than the prevoius approach, but rejected
  because needs a careful analysis of the side effects, and this patch is 
  for 5.0, and long term we need to use the next alternative anyway
  - make sure that sp_proc_stmt doesn't juggle with THD - this is a 
  large work that will affect many modules.
  
  Cleanup: move main_lex and main_mem_root from Statement to its
  only two descendants Prepared_statement and THD. This ensures that
  when a Statement instance was created for purposes of statement backup,
  we do not involve LEX constructor/destructor, which is fairly expensive.
  In order to track that the transformation produces equivalent 
  functionality please check the respective constructors and destructors
  of Statement, Prepared_statement and THD - these members were
  used only there.
  This cleanup is unrelated to the patch.

  sql/log_event.cc@1.228, 2007-03-07 12:24:41+03:00, kostja@bodhi.local +2 -2
    THD::main_lex is private and should not be used.

  sql/mysqld.cc@1.592.2.1, 2007-03-07 12:24:42+03:00, kostja@bodhi.local +0 -12
    Move MYSQLerror to sql_yacc.yy as it depends on LEX headers now.

  sql/sql_class.cc@1.261.2.1, 2007-03-07 12:24:42+03:00, kostja@bodhi.local +14 -18
    Cleanup: move main_lex and main_mem_root to THD and Prepared_statement

  sql/sql_class.h@1.321.2.1, 2007-03-07 12:24:42+03:00, kostja@bodhi.local +39 -16
    Cleanup: move main_lex and main_mem_root to THD and Prepared_statement

  sql/sql_lex.cc@1.215, 2007-03-07 12:24:42+03:00, kostja@bodhi.local +30 -0
    Implement st_lex::restore_lex()

  sql/sql_lex.h@1.240, 2007-03-07 12:24:42+03:00, kostja@bodhi.local +4 -0
    Declare st_lex::restore_lex().

  sql/sql_parse.cc@1.605.2.1, 2007-03-07 12:24:42+03:00, kostja@bodhi.local +7 -27
    Consolidate the calls to unit.cleanup() and deletion of lex->sphead
    in mysql_parse (COM_QUERY handler)

  sql/sql_prepare.cc@1.196, 2007-03-07 12:24:42+03:00, kostja@bodhi.local +32 -18
    No need to delete lex->sphead to restore memory roots now in case of a 
    parse error - this is done automatically inside MYSQLparse

  sql/sql_trigger.cc@1.65, 2007-03-07 12:24:42+03:00, kostja@bodhi.local +2 -5
    This code could lead to double deletion apparently, as in case
    of an error lex.sphead was never reset.

  sql/sql_yacc.yy@1.509, 2007-03-07 12:24:42+03:00, kostja@bodhi.local +394 -327
    Trap all returns from the parser to ensure that MySQL-specific cleanup
    is invoked: we need to restore the global state of THD and LEX in 
    case of a parsing error. In case of a parsing success this happens as 
    part of normal grammar reduction process.

ChangeSet@1.2377.38.8, 2007-03-07 10:37:30+07:00, tomas@poseidon.mysql.com +1 -0
  source code indentation alignment with 5.1, no real change

  ndb/src/ndbapi/NdbRecAttr.cpp@1.28, 2007-03-07 10:37:19+07:00, tomas@poseidon.mysql.com +193 -189
    source code indentation alignment with 5.1, no real change

ChangeSet@1.2377.38.7, 2007-03-07 08:11:16+07:00, tomas@poseidon.mysql.com +1 -0
  ndb -
    fix printout
    crashes testSystemRestart -n SR_UNDO

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.66.1.1, 2007-03-07 08:11:07+07:00, tomas@poseidon.mysql.com +1 -1
    fix printout
    crashes testSystemRestart -n SR_UNDO

ChangeSet@1.2456.3.2, 2007-03-06 14:55:52-07:00, tsmith@siva.hindu.god +1 -0
  Bug #25075: sql_class.cc doesn't compile with --without-query-cache
  
  Wrap query_cache_init_query() call with #ifdef HAVE_QUERY_CACHE in THD::THD()

  sql/sql_class.cc@1.256.1.3, 2007-03-06 14:55:48-07:00, tsmith@siva.hindu.god +2 -0
    Bug #25075: sql_class.cc doesn't compile with --without-query-cache
    
    Wrap query_cache_init_query() call with #ifdef HAVE_QUERY_CACHE in THD::THD()

ChangeSet@1.2456.3.1, 2007-03-06 14:47:26-07:00, tsmith@siva.hindu.god +1 -0
  Fix for bug #25595 "missing DBUG_RETURN in function "mysql_stat""

  libmysql/libmysql.c@1.252.1.1, 2007-03-06 14:47:21-07:00, tsmith@siva.hindu.god +1 -1
    Fix for bug #25595 "missing DBUG_RETURN in function "mysql_stat""
    
    Use DBUG_RETURN instead of return

ChangeSet@1.2413.17.16, 2007-03-06 14:30:28-07:00, malff@weblab.(none) +2 -0
  Manual merge

  mysql-test/r/trigger.result@1.55, 2007-03-06 14:30:25-07:00, malff@weblab.(none) +37 -0
    Manual merge

  mysql-test/t/trigger.test@1.62, 2007-03-06 14:30:25-07:00, malff@weblab.(none) +74 -0
    Manual merge

ChangeSet@1.2413.29.1, 2007-03-06 23:58:10+03:00, evgen@moonbone.local +3 -0
  Bug#25376: Incomplete setup of ORDER BY clause results in a wrong result.
  
  Functions over sum functions wasn't set up correctly for the ORDER BY clause
  which leads to a wrong order of the result set.
  
  The split_sum_func() function is called now for each ORDER BY item that
  contains a sum function to set it up correctly.

  mysql-test/r/order_by.result@1.59.1.1, 2007-03-06 23:49:17+03:00, evgen@moonbone.local +8 -0
    Added a test case for bug#25376: Incomplete setup of ORDER BY clause results in a wrong result.

  mysql-test/t/order_by.test@1.42.1.1, 2007-03-06 23:49:15+03:00, evgen@moonbone.local +8 -0
    Added a test case for bug#25376: Incomplete setup of ORDER BY clause results in a wrong result.

  sql/sql_select.cc@1.495.3.1, 2007-03-06 23:49:29+03:00, evgen@moonbone.local +11 -0
    Bug#25376: Incomplete setup of ORDER BY clause results in a wrong result.
    The split_sum_func() function is called now for each ORDER BY item that
    contains a sum function to set it up correctly.

ChangeSet@1.2377.45.3, 2007-03-06 18:52:00+02:00, gkodinov@macbook.gmz +2 -0
  Bug#19342: additional test case for code coverage

  mysql-test/r/func_in.result@1.33, 2007-03-06 18:51:53+02:00, gkodinov@macbook.gmz +7 -1
    Bug#19342: additional test case for code coverage

  mysql-test/t/func_in.test@1.27, 2007-03-06 18:51:54+02:00, gkodinov@macbook.gmz +5 -1
    Bug#19342: additional test case for code coverage

ChangeSet@1.2377.46.1, 2007-03-05 19:42:07-07:00, malff@weblab.(none) +18 -0
  Bug#8407 (Stored functions/triggers ignore exception handler)
  Bug 18914 (Calling certain SPs from triggers fail)
  Bug 20713 (Functions will not not continue for SQLSTATE VALUE '42S02')
  Bug 21825 (Incorrect message error deleting records in a table with a
    trigger for inserting)
  Bug 22580 (DROP TABLE in nested stored procedure causes strange dependency
    error)
  Bug 25345 (Cursors from Functions)
  
  
  This fix resolves a long standing issue originally reported with bug 8407,
  which affect the behavior of Stored Procedures, Stored Functions and Trigger
  in many different ways, causing symptoms reported by all the bugs listed.
  In all cases, the root cause of the problem traces back to 8407 and how the
  server locks tables involved with sub statements.
  
  Prior to this fix, the implementation of stored routines would:
  - compute the transitive closure of all the tables referenced by a top level
  statement
  - open and lock all the tables involved
  - execute the top level statement
  "transitive closure of tables" means collecting:
  - all the tables,
  - all the stored functions,
  - all the views,
  - all the table triggers
  - all the stored procedures
  involved, and recursively inspect these objects definition to find more
  references to more objects, until the list of every object referenced does
  not grow any more.
  This mechanism is known as "pre-locking" tables before execution.
  The motivation for locking all the tables (possibly) used at once is to
  prevent dead locks.
  
  One problem with this approach is that, if the execution path the code
  really takes during runtime does not use a given table, and if the table is
  missing, the server would not execute the statement.
  This in particular has a major impact on triggers, since a missing table
  referenced by an update/delete trigger would prevent an insert trigger to run.
  
  Another problem is that stored routines might define SQL exception handlers
  to deal with missing tables, but the server implementation would never give
  user code a chance to execute this logic, since the routine is never
  executed when a missing table cause the pre-locking code to fail.
  
  With this fix, the internal implementation of the pre-locking code has been
  relaxed of some constraints, so that failure to open a table does not
  necessarily prevent execution of a stored routine.
  
  In particular, the pre-locking mechanism is now behaving as follows:
  
  1) the first step, to compute the transitive closure of all the tables
  possibly referenced by a statement, is unchanged.
  
  2) the next step, which is to open all the tables involved, only attempts
  to open the tables added by the pre-locking code, but silently fails without
  reporting any error or invoking any exception handler is the table is not
  present. This is achieved by trapping internal errors with
  Prelock_error_handler
  
  3) the locking step only locks tables that were successfully opened.
  
  4) when executing sub statements, the list of tables used by each statements
  is evaluated as before. The tables needed by the sub statement are expected
  to be already opened and locked. Statement referencing tables that were not
  opened in step 2) will fail to find the table in the open list, and only at
  this point will execution of the user code fail.
  
  5) when a runtime exception is raised at 4), the instruction continuation
  destination (the next instruction to execute in case of SQL continue
  handlers) is evaluated.
  This is achieved with sp_instr::exec_open_and_lock_tables()
  
  6) if a user exception handler is present in the stored routine, that
  handler is invoked as usual, so that ER_NO_SUCH_TABLE exceptions can be
  trapped by stored routines. If no handler exists, then the runtime execution
  will fail as expected.
  
  With all these changes, a side effect is that view security is impacted, in
  two different ways.
  
  First, a view defined as "select stored_function()", where the stored
  function references a table that may not exist, is considered valid.
  The rationale is that, because the stored function might trap exceptions
  during execution and still return a valid result, there is no way to decide
  when the view is created if a missing table really cause the view to be invalid.
  
  Secondly, testing for existence of tables is now done later during
  execution. View security, which consist of trapping errors and return a
  generic ER_VIEW_INVALID (to prevent disclosing information) was only
  implemented at very specific phases covering *opening* tables, but not
  covering the runtime execution. Because of this existing limitation,
  errors that were previously trapped and converted into ER_VIEW_INVALID are
  not trapped, causing table names to be reported to the user.
  This change is exposing an existing problem, which is independent and will
  be resolved separately.

  mysql-test/r/information_schema_db.result@1.10, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +3 -3
    Revised the pre-locking code implementation, aligned the tests.

  mysql-test/r/sp-error.result@1.111, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +137 -6
    Revised the pre-locking code implementation, aligned the tests.

  mysql-test/r/sp.result@1.218.1.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +40 -2
    Revised the pre-locking code implementation, aligned the tests.

  mysql-test/r/trigger.result@1.50.1.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +37 -0
    Revised the pre-locking code implementation, aligned the tests.

  mysql-test/r/view.result@1.186.2.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +3 -3
    Revised the pre-locking code implementation, aligned the tests.

  mysql-test/t/sp-error.test@1.112, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +187 -6
    Revised the pre-locking code implementation, aligned the tests.

  mysql-test/t/sp.test@1.208.1.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +49 -4
    Revised the pre-locking code implementation, aligned the tests.

  mysql-test/t/trigger.test@1.58.1.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +74 -0
    Revised the pre-locking code implementation, aligned the tests.

  sql/lock.cc@1.94, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +1 -1
    table->placeholder now checks for schema_table

  sql/mysqld.cc@1.582.18.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +8 -0
    my_message_sql(): invoke internal exception handlers

  sql/sp_head.cc@1.230.3.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +40 -9
    exec_open_and_lock_tables(): open and lock tables, or return the
    continuation destination of this instruction

  sql/sp_head.h@1.90.1.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +24 -0
    exec_open_and_lock_tables(): open and lock tables, or return the
    continuation destination of this instruction

  sql/sql_base.cc@1.363.1.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +94 -8
    Prelock_error_handler: delay open table errors until execution

  sql/sql_class.cc@1.256.6.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +32 -0
    THD: add internal error handler, as an exception mechanism.

  sql/sql_class.h@1.317.2.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +67 -0
    THD: add internal error handler, as an exception mechanism.

  sql/sql_update.cc@1.205.4.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +1 -1
    table->placeholder now checks for schema_table

  sql/table.cc@1.240.4.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +3 -1
    st_table_list::hide_view_error(): masked more errors for view security

  sql/table.h@1.137.1.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +1 -1
    table->placeholder now checks for schema_table, and unopened tables

ChangeSet@1.2463, 2007-03-05 17:16:16+01:00, msvensson@pilot.blaudden +1 -0
  Fix VC++ warning, "conversion from ha_checksum to char"

  extra/comp_err.c@1.29, 2007-03-05 17:16:15+01:00, msvensson@pilot.blaudden +1 -1
    Fix VC++ warning, "conversion from ha_checksum to char"

ChangeSet@1.2456.1.2, 2007-03-05 14:02:29+01:00, tnurnberg@mysql.com +1 -0
  Bug#21103: DATE column not compared as DATE
  
  When comparing a DATE field with a DATETIME constant, we now compare
  as DATETIMEs, not as DATEs.  Fix BDB queries to still work.

  mysql-test/r/ps_6bdb.result@1.47, 2007-03-05 14:02:26+01:00, tnurnberg@mysql.com +6 -6
    Bug#21103: DATE column not compared as DATE
    
    When comparing a DATE field with a DATETIME constant, we now compare
    as DATETIMEs, not as DATEs.  Fix BDB queries to still work.

ChangeSet@1.1616.2980.1, 2007-03-05 11:52:28+01:00, istruewing@chilla.local +3 -0
  Bug#26464 - insert delayed + update + merge = corruption
  
  Using INSERT DELAYED on MERGE tables could lead to table
  corruptions.
  
  The manual lists a couple of storage engines, which can be
  used with INSERT DELAYED. MERGE is not in this list.
  
  The attempt to try it anyway has not been rejected yet.
  This bug was not detected earlier as it can work under
  special circumstances. Most notable is low concurrency.
  
  To be safe, this patch rejects any attempt to use INSERT
  DELAYED on MERGE tables.

  mysql-test/r/merge.result@1.32.1.13, 2007-03-05 11:52:25+01:00, istruewing@chilla.local +5 -0
    Bug#26464 - insert delayed + update + merge = corruption
    Added test result.

  mysql-test/t/merge.test@1.28.1.14, 2007-03-05 11:52:26+01:00, istruewing@chilla.local +9 -0
    Bug#26464 - insert delayed + update + merge = corruption
    Added test.

  sql/ha_myisammrg.h@1.35.1.5, 2007-03-05 11:52:26+01:00, istruewing@chilla.local +1 -1
    Bug#26464 - insert delayed + update + merge = corruption
    Removed HA_CAN_INSERT_DELAYED flag from table_flags().
    The insert delayed thread upgrades the lock from the first
    entry in MYSQL_LOCK::locks only. Hence it is incapable to
    handle MERGE tables, which have as many entries in this
    array as they have MyISAM sub-tables.

ChangeSet@1.2456.2.3, 2007-03-05 11:42:03+01:00, msvensson@pilot.blaudden +2 -0
  Remove ssl_des.test and ssl_des.result

  BitKeeper/deleted/.del-ssl_des.result@1.2, 2007-03-05 11:41:44+01:00, msvensson@pilot.blaudden +0 -0
    Delete: mysql-test/r/ssl_des.result

  BitKeeper/deleted/.del-ssl_des.test@1.3, 2007-03-05 11:41:37+01:00, msvensson@pilot.blaudden +0 -0
    Delete: mysql-test/t/ssl_des.test

ChangeSet@1.2456.2.2, 2007-03-05 10:07:22+01:00, msvensson@pilot.blaudden +2 -0
  Bug#21781 Replication slave io thread hangs
   - Add test case that shows how slave server hangs in "STOP SLAVE"
     when run on MySQL version 5.0.33 compiled with OpenSSL.
     Works fine with latest version of MySQL since that problem
     has been fixed by patch for bug#24148. The fix has been noted in
     the changelog for MySQL 5.0.36

  mysql-test/r/rpl_ssl.result@1.1, 2007-03-05 10:07:21+01:00, msvensson@pilot.blaudden +93 -0
    New BitKeeper file ``mysql-test/r/rpl_ssl.result''

  mysql-test/r/rpl_ssl.result@1.0, 2007-03-05 10:07:21+01:00, msvensson@pilot.blaudden +0 -0

  mysql-test/t/rpl_ssl.test@1.1, 2007-03-05 10:07:21+01:00, msvensson@pilot.blaudden +60 -0
    New BitKeeper file ``mysql-test/t/rpl_ssl.test''

  mysql-test/t/rpl_ssl.test@1.0, 2007-03-05 10:07:21+01:00, msvensson@pilot.blaudden +0 -0

ChangeSet@1.2456.2.1, 2007-03-05 10:03:42+01:00, msvensson@pilot.blaudden +13 -0
  Add "have_ssl" as synonym for "have_openssl"

  mysql-test/t/ssl_des.test@1.2, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +1 -1
    Add "have_ssl" as synonym for "have_openssl"

  mysql-test/include/have_ssl.inc@1.6, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +2 -2
    Add "have_ssl" as synonym for "have_openssl"

  mysql-test/include/have_ssl.inc@1.5, 2007-03-02 16:51:17+01:00, msvensson@pilot.blaudden +0 -0
    Rename: mysql-test/include/have_openssl.inc -> mysql-test/include/have_ssl.inc

  mysql-test/r/have_ssl.require@1.5, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +1 -1
    Add "have_ssl" as synonym for "have_openssl"

  mysql-test/r/have_ssl.require@1.4, 2007-03-02 16:51:58+01:00, msvensson@pilot.blaudden +0 -0
    Rename: mysql-test/r/have_openssl.require -> mysql-test/r/have_ssl.require

  mysql-test/t/func_des_encrypt.test@1.3, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +1 -1
    Add "have_ssl" as synonym for "have_openssl"

  mysql-test/t/func_encrypt.test@1.8, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +1 -1
    Add "have_ssl" as synonym for "have_openssl"

  mysql-test/t/openssl_1.test@1.18, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +4 -3
    Add "have_ssl" as synonym for "have_openssl"
    Correct comment

  mysql-test/t/rpl_openssl.test@1.21, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +1 -1
    Add "have_ssl" as synonym for "have_openssl"

  mysql-test/t/ssl.test@1.4, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +1 -1
    Add "have_ssl" as synonym for "have_openssl"

  mysql-test/t/ssl_compress.test@1.4, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +1 -1
    Add "have_ssl" as synonym for "have_openssl"

  mysql-test/t/ssl_connect.test@1.2, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +1 -1
    Add "have_ssl" as synonym for "have_openssl"

  sql/mysql_priv.h@1.429.2.9, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +1 -1
    Add "have_ssl" as synonym for "have_openssl"

  sql/mysqld.cc@1.582.1.20, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +5 -5
    Add "have_ssl" as synonym for "have_openssl"

  sql/set_var.cc@1.176.1.5, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +3 -1
    Add "have_ssl" as synonym for "have_openssl"

ChangeSet@1.1616.2979.1, 2007-03-05 09:52:40+01:00, msvensson@pilot.blaudden +1 -0
  Bug #26792 Add DBX debugger support to mysql-test-run.pl
   - Add --debugger=dbx
   - Fix --debugger=devenv, --debugger=DevEnv and --debugger=/path/devenv

  mysql-test/mysql-test-run.pl@1.8.20.7, 2007-03-05 09:52:39+01:00, msvensson@pilot.blaudden +20 -6
    Add support for --debugger=dbx to mysql-test-run.pl
    Fix case senitive match for vc, vcexpress or deven
    Make it possible to use full path to debugger for
    --debugger=/path/vcexpress

ChangeSet@1.2413.23.7, 2007-03-04 19:54:35-08:00, igor@olga.mysql.com +7 -0
  Fixed bug #26560.
  The flag alias_name_used was not set on for the outer references
  in subqueries. It resulted in replacement of any outer reference
  resolved against an alias for a full field name when the frm 
  representation of a view with a subquery was generated. 
  If the subquery and the outer query referenced the same table in
  their from lists this replacement effectively changed the meaning
  of the view and led to wrong results for selects from this view. 
  
  Modified several functions to ensure setting the right value of
  the alias_name_used flag for outer references resolved against
  aliases.
   

  mysql-test/r/view.result@1.191.1.1, 2007-03-04 19:54:30-08:00, igor@olga.mysql.com +37 -0
    Added a test case for bug #26560.
    

  mysql-test/t/view.test@1.176.1.1, 2007-03-04 19:54:30-08:00, igor@olga.mysql.com +40 -0
    Added a test case for bug #26560.

  sql/item.cc@1.251.1.1, 2007-03-04 19:54:30-08:00, igor@olga.mysql.com +17 -9
    Fixed bug #26560.
    Made the function resolve_ref_in_select_and_group analyze the return
    value of the last parameter with the type of the name resolution for
    the submitted reference. If the reference has been resolved against 
    an alias name from select list then its flag alias_name_used is set on.
    Now this value is used in Item_field::fix_outer_field to initialize the flag
    when the item_ref object is created for an outer reference.
    Added a parameter for the second Item_ref::Item_ref constructor to initialize
    properly the flag alias_name_used. The default value of the parameter is FALSE.
    If this flag is set on at the creation of an object by this constructor it
    will never be changed. Corrected appropriately the Item_ref::set_properties
    function.
    The function Item_ref::print now prints alias name for an outer reference
    if the flag alias_name_used is set on.  

  sql/item.h@1.220, 2007-03-04 19:54:30-08:00, igor@olga.mysql.com +7 -3
    Fixed bug #26560.
    Added a parameter for the second Item_ref::Item_ref constructor to initialize
    properly the flag alias_name_used. The default value of the parameter is FALSE.
    A similar change has been applied to the first Item_direct_ref::Item_direct_ref
    constructor.

  sql/mysql_priv.h@1.429.1.6, 2007-03-04 19:54:30-08:00, igor@olga.mysql.com +21 -1
    Fixed bug #26560.
    Added an an enumeration type enum_resolution_type to return info on
    how the function find_item_in_list has resolved the submitted item.
    The type is used only for this function.

  sql/sql_base.cc@1.367.1.3, 2007-03-04 19:54:30-08:00, igor@olga.mysql.com +69 -52
    Fixed bug #26560.
    Made the last parameter of the function find_field_in_tables return
    more detailed information on how the submitted item has been resolved.
    Now it says whether the item has been resolved
      against an alias name,
      or as a field name without alias,
      or as a field name hidden by alias, 
      or was resolved ignoring alias. 

  sql/sql_select.cc@1.495.1.1, 2007-03-04 19:54:30-08:00, igor@olga.mysql.com +4 -4
    Fixed bug #26560.
    Took into account the new type of the last parameter of the function
    find_item_in_list. 

ChangeSet@1.1616.2978.1, 2007-03-04 00:47:42+03:00, evgen@sunlight.local +4 -0
  Bug#25126: Wrongly resolved field leads to a crash.
  
  When the ORDER BY clause gets fixed it's allowed to search in the current
  item_list in order to find aliased fields and expressions. This is ok for a
  SELECT but wrong for an UPDATE statement. If the ORDER BY clause will
  contain a non-existing field which is mentioned in the UPDATE set list
  then the server will crash due to using of non-existing (0x0) field.
  
  When an Item_field is getting fixed it's allowed to search item list for
  aliased expressions and fields only for selects.

  mysql-test/r/update.result@1.22.1.9, 2007-03-04 00:46:39+03:00, evgen@sunlight.local +4 -0
    Added a test case for bug#25126: Wrongly resolved field leads to a crash.

  mysql-test/t/update.test@1.19.1.10, 2007-03-04 00:46:43+03:00, evgen@sunlight.local +8 -0
    Added a test case for bug#25126: Wrongly resolved field leads to a crash.

  sql/sql_base.cc@1.145.1.131, 2007-03-04 00:45:51+03:00, evgen@sunlight.local +30 -1
    Bug#25126: Wrongly resolved field leads to a crash.
    When an Item_field is getting fixed it's allowed to search item list for
    aliased expressions and fields only for selects.

  sql/sql_select.cc@1.216.125.20, 2007-03-04 00:46:24+03:00, evgen@sunlight.local +2 -5
    Bug#25126: Wrongly resolved field leads to a crash.
    When an Item_field is getting fixed it's allowed to search item list for
    aliased expressions and fields only for selects.

ChangeSet@1.2413.23.6, 2007-03-02 19:32:46+02:00, gkodinov@magare.gmz +1 -0
  fixed win32 warnings

  sql/item_cmpfunc.h@1.143.2.2, 2007-03-02 19:32:45+02:00, gkodinov@magare.gmz +1 -1
    fixed win32 warnings

ChangeSet@1.2377.45.2, 2007-03-02 19:27:32+02:00, gkodinov@macbook.gmz +1 -0
  fixed win32 warning

  sql/item_cmpfunc.h@1.139.2.2, 2007-03-02 19:27:26+02:00, gkodinov@macbook.gmz +1 -1
    fixed win32 warning

ChangeSet@1.1616.2976.6, 2007-03-02 16:32:27+01:00, joerg@trift2. +1 -0
  More man pages for the RPMs.

  support-files/mysql.spec.sh@1.83.1.49, 2007-03-02 16:32:25+01:00, joerg@trift2. +2 -0
    More man pages.

ChangeSet@1.1346.894.2, 2007-03-02 16:30:22+01:00, joerg@trift2. +1 -0
  Another man page in the RPMs.

  support-files/mysql.spec.sh@1.61.1.39, 2007-03-02 16:30:21+01:00, joerg@trift2. +1 -0
    Another man page.

ChangeSet@1.2377.45.1, 2007-03-02 16:25:56+02:00, gkodinov@macbook.gmz +5 -0
  Bug #19342:
  Several problems here :
   1. The conversion to double of an hex string const item
   was not taking into account the unsigned flag.
   
   2. IN was not behaving in the same was way as comparisons
   when performed over an INT/DATE/DATETIME/TIMESTAMP column
   and a constant. The ordinary comparisons in that case 
   convert the constant to an INTEGER value and do int 
   comparisons. Fixed the IN to do the same.
   
   3. IN is not taking into account the unsigned flag when 
   calculating <expr> IN (<int_const1>, <int_const2>, ...).
   Extended the implementation of IN to store and process
   the unsigned flag for its arguments.

  mysql-test/r/func_in.result@1.32, 2007-03-02 16:25:48+02:00, gkodinov@macbook.gmz +66 -0
    Bug #19342: test case

  mysql-test/t/func_in.test@1.26, 2007-03-02 16:25:48+02:00, gkodinov@macbook.gmz +58 -0
    Bug #19342: test case

  sql/item.h@1.213.6.1, 2007-03-02 16:25:49+02:00, gkodinov@macbook.gmz +4 -1
    Bug #19342: correct handling of sign in conersion to real.

  sql/item_cmpfunc.cc@1.231.2.1, 2007-03-02 16:25:50+02:00, gkodinov@macbook.gmz +125 -5
    Bug #19342: exteneded the IN values list
     to support unsigned longlong values.
     Correct comparison of integers in IN with
     regard of signedness.
     Compare DATE/DATETIME/TIMESTAMP values as
     integers in IN.

  sql/item_cmpfunc.h@1.139.2.1, 2007-03-02 16:25:50+02:00, gkodinov@macbook.gmz +15 -2
    Bug #19342: exteneded the IN values list
     to support unsigned longlong values.
     Correct comparison of integers in IN with
     regard of signedness.

ChangeSet@1.2456.1.1, 2007-03-02 15:23:13+01:00, tnurnberg@mysql.com +9 -0
  Bug #21103: DATE column not compared as DATE
  
  If we compare two items A and B, with B being (a constant) of a
  larger type, then A gets promoted to B's type for comparison if
  it's a constant, function, or CAST() column, but B gets demoted
  to A's type if A is a (not explicitly CAST()) column. This is
  counter-intuitive and not mandated by the standard.
   
  Disabling optimisation where it would be lossy so field value
  will properly get promoted and compared as binary string (rather
  than as integers).

  mysql-test/include/ps_conv.inc@1.6, 2007-03-02 15:23:09+01:00, tnurnberg@mysql.com +6 -6
    Bug #21103: DATE column not compared as DATE
    
    When comparing a DATE field with a DATETIME constant, we now compare
    as DATETIMEs, not as DATEs.  Fix certain queries to still work.

  mysql-test/r/func_time.result@1.79.1.2, 2007-03-02 15:23:10+01:00, tnurnberg@mysql.com +17 -0
    Bug #21103: DATE column not compared as DATE
    
    When comparing a DATE field with a DATETIME constant, we now compare
    as DATETIMEs, not as DATEs.  Show that everything works as expected.

  mysql-test/r/ps_2myisam.result@1.45, 2007-03-02 15:23:10+01:00, tnurnberg@mysql.com +6 -6
    Bug #21103: DATE column not compared as DATE
    
    When comparing a DATE field with a DATETIME constant, we now compare
    as DATETIMEs, not as DATEs.  Fix certain queries to still work.

  mysql-test/r/ps_3innodb.result@1.48, 2007-03-02 15:23:10+01:00, tnurnberg@mysql.com +6 -6
    Bug #21103: DATE column not compared as DATE
    
    When comparing a DATE field with a DATETIME constant, we now compare
    as DATETIMEs, not as DATEs.  Fix certain queries to still work.

  mysql-test/r/ps_4heap.result@1.44, 2007-03-02 15:23:10+01:00, tnurnberg@mysql.com +6 -6
    Bug #21103: DATE column not compared as DATE
    
    When comparing a DATE field with a DATETIME constant, we now compare
    as DATETIMEs, not as DATEs.  Fix certain queries to still work.

  mysql-test/r/ps_5merge.result@1.45, 2007-03-02 15:23:10+01:00, tnurnberg@mysql.com +12 -12
    Bug #21103: DATE column not compared as DATE
    
    When comparing a DATE field with a DATETIME constant, we now compare
    as DATETIMEs, not as DATEs.  Fix certain queries to still work.

  mysql-test/r/ps_7ndb.result@1.48, 2007-03-02 15:23:10+01:00, tnurnberg@mysql.com +6 -6
    Bug #21103: DATE column not compared as DATE
    
    When comparing a DATE field with a DATETIME constant, we now compare
    as DATETIMEs, not as DATEs.  Fix certain queries to still work.

  mysql-test/t/func_time.test@1.66.1.2, 2007-03-02 15:23:10+01:00, tnurnberg@mysql.com +13 -0
    Bug #21103: DATE column not compared as DATE
    
    When comparing a DATE field with a DATETIME constant, we now compare
    as DATETIMEs, not as DATEs.  Show that everything works as expected.

  sql/field.cc@1.335.3.1, 2007-03-02 15:23:10+01:00, tnurnberg@mysql.com +13 -10
    Bug #21103: DATE column not compared as DATE
    
    #0 stores the date only as a 3-byte integer; save_in_field() in
    #1 saves 'this' in field's format (DATE), #2 "converts a constant
    item to an int and replaces the original item" -- consequently,
    this replaces the Item_string "2006-11-06 04:08:36.0" with the
    Item_int_with_ref 20061106.
    
    #0  Field_newdate::store (this=0x8d26880, from=0x8d5e658 "2006-11-06
    04:08:36.0", len=21, cs=0x88022c0) at field.cc:5344
    #1  0x0817e3b0 in Item_string::save_in_field (this=0x8d5e670, field=0x8d26880, no_conversions=true) at item.cc:4340
    #2  0x081b22ae in convert_constant_item (thd=0x8d25240, field=0x8d26880, item=0x8d5e74c) at item_cmpfunc.cc:245
    #3  0x081b8a36 in Item_bool_func2::fix_length_and_dec (this=0x8d5e6f8) at item_cmpfunc.cc:309
    #4  0x081a3427 in Item_func::fix_fields (this=0x8d5e6f8, thd=0x8d25240, ref=0x8d5f5fc) at item_func.cc:190
    #5  0x0825bc2d in setup_conds (thd=0x8d25240, tables=0x8d5e410, leaves=0x8d5e410, conds=0x8d5f5fc) at sql_base.cc:4941
    ...
    
    Disabling optimisation where it would be lossy so field value will
    properly get promoted and compared as binary string (rather than as
    integers).

ChangeSet@1.2460, 2007-03-02 15:21:01+01:00, msvensson@pilot.blaudden +1 -0
  Add hint about using --help to see what options are available

  BUILD/SETUP.sh@1.64, 2007-03-02 15:21:00+01:00, msvensson@pilot.blaudden +1 -0
    Add hint about using --help to see what options are available

ChangeSet@1.2413.26.1, 2007-03-02 14:08:32+01:00, joerg@trift2. +1 -0
  Add the man pages for NDB to the RPMs.

  support-files/mysql.spec.sh@1.167, 2007-03-02 14:08:29+01:00, joerg@trift2. +21 -6
    Add the man pages for NDB.

ChangeSet@1.1616.2976.4, 2007-03-02 14:05:43+01:00, joerg@trift2. +1 -0
  Add the man pages for NDB to the RPMs.

  support-files/mysql.spec.sh@1.83.1.47, 2007-03-02 14:05:40+01:00, joerg@trift2. +19 -5
    Add the man pages for NDB.

ChangeSet@1.1346.894.1, 2007-03-02 14:03:28+01:00, joerg@trift2. +1 -0
  Add missing man pages to the RPMs.

  support-files/mysql.spec.sh@1.61.1.38, 2007-03-02 14:03:27+01:00, joerg@trift2. +9 -0
    Add missing man pages.

ChangeSet@1.2413.17.13, 2007-03-02 15:05:16+03:00, kostja@bodhi.local +1 -0
  Freeze the number of conflicts. We should not introduce any more
  conflicts without proper analysis and documentation of the nature of
  the conflict.

  sql/sql_yacc.yy@1.508, 2007-03-02 15:05:13+03:00, kostja@bodhi.local +5 -0
    Freeze the number of conflicts. We should not introduce any more
    conflicts without proper analysis and documentation of the nature of
    the conflict.

ChangeSet@1.2413.17.12, 2007-03-02 14:29:51+03:00, kostja@bodhi.local +1 -0
  Rename a macro to better reflect the action taken.

  sql/sql_yacc.yy@1.507, 2007-03-02 14:29:48+03:00, kostja@bodhi.local +19 -19
    Rename: YYERROR_UNLESS -> YYABORT_UNLESS
    yyerror doesn't have to abort of the parser, whereas this macro
    does explicitly call YYABORT.

ChangeSet@1.2417.2.2, 2007-03-02 15:09:44+04:00, ramil@mysql.com +7 -0
  after merge fix (bug #26038)
  
  Item_func_geometry_from_text::val_str() should set null_value
  in case of wrong data.

  mysql-test/include/gis_generic.inc@1.4, 2007-03-02 15:09:43+04:00, ramil@mysql.com +2 -2
    after merge fix
    
    Item_func_geometry_from_text::val_str() should set null_value
    in case of wrong data.

  mysql-test/r/archive_gis.result@1.4, 2007-03-02 15:09:43+04:00, ramil@mysql.com +2 -2
    after merge fix
    
    Item_func_geometry_from_text::val_str() should set null_value
    in case of wrong data.

  mysql-test/r/gis.result@1.41, 2007-03-02 15:09:43+04:00, ramil@mysql.com +46 -4
    after merge fix
    
    Item_func_geometry_from_text::val_str() should set null_value
    in case of wrong data.

  mysql-test/r/innodb_gis.result@1.4, 2007-03-02 15:09:43+04:00, ramil@mysql.com +2 -2
    after merge fix
    
    Item_func_geometry_from_text::val_str() should set null_value
    in case of wrong data.

  mysql-test/r/ndb_gis.result@1.5, 2007-03-02 15:09:43+04:00, ramil@mysql.com +4 -4
    after merge fix
    
    Item_func_geometry_from_text::val_str() should set null_value
    in case of wrong data.

  mysql-test/t/gis.test@1.34, 2007-03-02 15:09:43+04:00, ramil@mysql.com +2 -2
    after merge fix
    
    Item_func_geometry_from_text::val_str() should set null_value
    in case of wrong data.

  sql/item_geofunc.cc@1.27.1.4, 2007-03-02 15:09:43+04:00, ramil@mysql.com +2 -5
    after merge fix
    
    Item_func_geometry_from_text::val_str() should set null_value
    in case of wrong data.

ChangeSet@1.2413.23.3, 2007-03-02 13:25:41+03:00, evgen@sunlight.local +1 -0
  sql_base.cc:
    Post fix for bug#25122.

  sql/sql_base.cc@1.367.1.2, 2007-03-02 13:23:54+03:00, evgen@sunlight.local +2 -1
    Post fix for bug#25122.

ChangeSet@1.2413.25.1, 2007-03-02 12:14:50+02:00, gkodinov@magare.gmz +3 -0
  Bug #26537: item_unhex() was not expected 
  to return NULL for non-NULL arguments.
  This is not the case as it can return NULL
  for invalid hexidecimal strings.
  Fixed by setting the maybe_null flag.

  mysql-test/r/func_str.result@1.126.1.1, 2007-03-02 12:14:49+02:00, gkodinov@magare.gmz +6 -0
    Bug #26537: test case

  mysql-test/t/func_str.test@1.99.1.1, 2007-03-02 12:14:49+02:00, gkodinov@magare.gmz +6 -0
    Bug #26537: test case

  sql/item_strfunc.h@1.121, 2007-03-02 12:14:49+02:00, gkodinov@magare.gmz +5 -1
    Bug #26537: item_unhex() can return NULLs
    even for guaranteed non-null arguments.

ChangeSet@1.2377.44.1, 2007-03-01 19:20:47-07:00, malff@weblab.(none) +3 -0
  Bug#26093 (SELECT BENCHMARK() for SELECT statements does not produce valid
    results)
  
  Before this fix, the function BENCHMARK() would fail to evaluate expressions
  like "(select avg(a) from t1)" in debug builds (with an assert),
  or would report a time of zero in non debug builds.
  
  The root cause is that evaluation of DECIMAL_RESULT expressions was not
  supported in Item_func_benchmark::val_int().
  
  This has been fixed by this change.

  mysql-test/r/func_misc.result@1.27, 2007-03-01 19:20:46-07:00, malff@weblab.(none) +44 -0
    Added support for DECIMAL_RESULT in Item_func_benchmark::val_int()

  mysql-test/t/func_misc.test@1.21, 2007-03-01 19:20:46-07:00, malff@weblab.(none) +57 -0
    Added support for DECIMAL_RESULT in Item_func_benchmark::val_int()

  sql/item_func.cc@1.317.6.1, 2007-03-01 19:20:46-07:00, malff@weblab.(none) +4 -0
    Added support for DECIMAL_RESULT in Item_func_benchmark::val_int()

ChangeSet@1.2377.38.6, 2007-03-02 09:06:05+07:00, tomas@poseidon.mysql.com +7 -0
  Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
  (part 1)
  - add signal data
  - add ref in dict on create/drop table/index

  ndb/include/kernel/signaldata/AlterTable.hpp@1.7, 2007-03-02 09:05:59+07:00, tomas@poseidon.mysql.com +2 -1
    Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
    (part 1)
    - add signal data
    - add ref in dict on create/drop table/index

  ndb/include/kernel/signaldata/CreateIndx.hpp@1.9, 2007-03-02 09:05:59+07:00, tomas@poseidon.mysql.com +2 -1
    Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
    (part 1)
    - add signal data
    - add ref in dict on create/drop table/index

  ndb/include/kernel/signaldata/CreateTable.hpp@1.6, 2007-03-02 09:05:59+07:00, tomas@poseidon.mysql.com +2 -1
    Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
    (part 1)
    - add signal data
    - add ref in dict on create/drop table/index

  ndb/include/kernel/signaldata/DropIndx.hpp@1.6, 2007-03-02 09:05:59+07:00, tomas@poseidon.mysql.com +2 -1
    Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
    (part 1)
    - add signal data
    - add ref in dict on create/drop table/index

  ndb/include/kernel/signaldata/DropTable.hpp@1.6, 2007-03-02 09:05:59+07:00, tomas@poseidon.mysql.com +2 -1
    Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
    (part 1)
    - add signal data
    - add ref in dict on create/drop table/index

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.71.1.2, 2007-03-02 09:05:59+07:00, tomas@poseidon.mysql.com +41 -0
    Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
    (part 1)
    - add signal data
    - add ref in dict on create/drop table/index

  ndb/src/ndbapi/ndberror.c@1.55, 2007-03-02 09:05:59+07:00, tomas@poseidon.mysql.com +1 -0
    Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
    (part 1)
    - add signal data
    - add ref in dict on create/drop table/index

ChangeSet@1.2377.38.5, 2007-03-02 08:56:22+07:00, tomas@poseidon.mysql.com +1 -0
  Bug #26720 Infinite loop on unknown signal in logging function
  - terminate printing

  ndb/src/common/debugger/signaldata/PackedSignal.cpp@1.3, 2007-03-02 08:56:14+07:00, tomas@poseidon.mysql.com +2 -0
    Bug #26720 Infinite loop on unknown signal in logging function
    - terminate printing

ChangeSet@1.2413.3.16, 2007-03-02 00:54:02+01:00, kent@mysql.com +1 -0
  mysql.sln:
    Correction of embedded build types

  VC++Files/mysql.sln@1.15, 2007-03-02 00:04:10+01:00, kent@mysql.com +4 -4
    Correction of embedded build types

ChangeSet@1.2413.3.15, 2007-03-01 23:48:22+01:00, kent@mysql.com +1 -0
  mysql.sln:
    Disabled build of all embedded server libraries, "libmysqld.ldd"
    "mysqldemb.lib" and "mysqlserver.lib"

  VC++Files/mysql.sln@1.14, 2007-03-01 23:45:55+01:00, kent@mysql.com +15 -22
    Disabled build of all embedded server libraries, "libmysqld.ldd"
    "mysqldemb.lib" and "mysqlserver.lib"

ChangeSet@1.2413.17.10, 2007-03-01 15:10:14-07:00, malff@weblab.(none) +2 -0
  Manual merge of 5.0 into 5.0-runtime

  mysql-test/r/subselect.result@1.176, 2007-03-01 15:10:11-07:00, malff@weblab.(none) +51 -9
    Manual merge

  mysql-test/t/subselect.test@1.143, 2007-03-01 15:10:11-07:00, malff@weblab.(none) +28 -0
    Manual merge

ChangeSet@1.2411.6.6, 2007-03-02 00:09:22+03:00, evgen@moonbone.local +7 -0
  Bug#25122: Views based on a self-joined table aren't insertable.
  
  When INSERT is done over a view the table being inserted into is 
  checked to be unique among all views tables. But if the view contains
  self-joined table an error will be thrown even if all tables are used under
  different aliases.
  
  The unique_table() function now also checks tables' aliases when needed.

  sql/mysql_priv.h@1.429.11.1, 2007-03-02 00:09:02+03:00, evgen@moonbone.local +2 -1
    Bug#25122:  Views based on a self-joined table aren't insertable.
    Updated prototype of the unique_table() function.

  sql/sql_base.cc@1.366.1.1, 2007-03-02 00:09:04+03:00, evgen@moonbone.local +7 -2
    Bug#25122:  Views based on a self-joined table aren't insertable.
    Now the unique_table() function checks tables' aliases when needed.

  sql/sql_delete.cc@1.191.1.1, 2007-03-02 00:09:05+03:00, evgen@moonbone.local +2 -2
    Bug#25122:  Views based on a self-joined table aren't insertable.
    Updated calls to the unique_table() function.

  sql/sql_insert.cc@1.211.3.6, 2007-03-02 00:09:05+03:00, evgen@moonbone.local +2 -2
    Bug#25122:  Views based on a self-joined table aren't insertable.
    Updated calls to the unique_table() function.

  sql/sql_load.cc@1.102.3.1, 2007-03-02 00:09:06+03:00, evgen@moonbone.local +1 -1
    Bug#25122:  Views based on a self-joined table aren't insertable.
    Updated calls to the unique_table() function.

  sql/sql_parse.cc@1.601.5.1, 2007-03-02 00:09:06+03:00, evgen@moonbone.local +2 -2
    Bug#25122:  Views based on a self-joined table aren't insertable.
    Updated calls to the unique_table() function.

  sql/sql_update.cc@1.205.3.1, 2007-03-02 00:09:07+03:00, evgen@moonbone.local +3 -3
    Bug#25122:  Views based on a self-joined table aren't insertable.
    Updated calls to the unique_table() function.

ChangeSet@1.2459, 2007-03-01 20:59:08+01:00, msvensson@pilot.blaudden +2 -0
  After merge fixes

  mysql-test/r/mysqlbinlog.result@1.33, 2007-03-01 20:59:07+01:00, msvensson@pilot.blaudden +1 -2
    After merge fixes

  mysql-test/t/mysqlbinlog.test@1.44, 2007-03-01 20:59:07+01:00, msvensson@pilot.blaudden +1 -2
    After merge fixes

ChangeSet@1.1616.2977.5, 2007-03-01 19:09:43+01:00, msvensson@pilot.blaudden +1 -0
  Add two more USE_CYGWIN ifdefs to mysqltest

  client/mysqltest.c@1.92.21.52, 2007-03-01 19:09:42+01:00, msvensson@pilot.blaudden +4 -0
    Add two more USE_CYGWIN ifdefs to mysqltest

ChangeSet@1.1616.2977.4, 2007-03-01 18:31:09+01:00, msvensson@pilot.blaudden +1 -0
  Fix bug in mtr.pl where slave wes using same query log file as master

  mysql-test/mysql-test-run.pl@1.8.20.6, 2007-03-01 18:31:09+01:00, msvensson@pilot.blaudden +1 -1
    Fix bug in mtr.pl where slave wes using same query log file as master

ChangeSet@1.1616.2977.3, 2007-03-01 18:30:29+01:00, msvensson@pilot.blaudden +1 -0
  Don't set the "is_windows" flag if using cygwin

  client/mysqltest.c@1.92.21.51, 2007-03-01 18:30:28+01:00, msvensson@pilot.blaudden +2 -0
    Don't set the "is_windows" flag if using cygwin

ChangeSet@1.2413.23.1, 2007-03-01 15:28:10+02:00, gkodinov@magare.gmz +1 -0
  Correctly recognize Intel Core2Duo Extreme
  in build.

  BUILD/check-cpu@1.19, 2007-03-01 15:28:09+02:00, gkodinov@magare.gmz +4 -0
    Correctly recognize Intel Core2Duo Extreme.

ChangeSet@1.1616.2967.24, 2007-03-01 11:41:29+01:00, msvensson@pilot.blaudden +1 -0
  MySQL versions before 5.0 still use cygwin, no need
  to convert path

  mysql-test/lib/mtr_misc.pl@1.5.1.7, 2007-03-01 11:41:29+01:00, msvensson@pilot.blaudden +6 -0
    MySQL versions before 5.0 still use cygwin, no need
    to convert path

ChangeSet@1.2413.21.1, 2007-03-01 10:40:48+01:00, rafal@quant.(none) +2 -0
  Removing two more compilation warnings.

  sql/slave.cc@1.294, 2007-03-01 10:38:17+01:00, rafal@quant.(none) +2 -0
    Guard declaration of variable to avoid "unused variable" warning.

  sql/sql_repl.cc@1.158, 2007-03-01 10:38:17+01:00, rafal@quant.(none) +2 -0
    Guard declaration of variable to avoid "unused variable" warning.

ChangeSet@1.2413.16.3, 2007-03-01 11:28:33+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -0
  Fixed compiler warnings.

  client/mysqltest.c@1.279, 2007-03-01 11:28:30+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -1
    Fixed a compiler warning.

  support-files/compiler_warnings.supp@1.8, 2007-03-01 11:28:30+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -0
    Suppressed compiler warnings on Win 64.

ChangeSet@1.2413.16.2, 2007-03-01 10:52:25+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -0
  Disabled compiler warnings.

  sql/ha_archive.cc@1.83, 2007-03-01 10:52:22+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +3 -1
    Fixed a warning from unused computed value. This block is
    only used in debug mode and changes nothing.

  support-files/compiler_warnings.supp@1.7, 2007-03-01 10:52:22+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -0
    Disabled a warning from BDB.

ChangeSet@1.2413.17.6, 2007-03-01 12:26:07+04:00, bar@mysql.com +2 -0
  Fix for wrong replace command.

  mysql-test/r/mysqlbinlog.result@1.31, 2007-03-01 12:26:05+04:00, bar@mysql.com +7 -7
    Fix for wrong replace command.

  mysql-test/t/mysqlbinlog.test@1.42, 2007-03-01 12:26:05+04:00, bar@mysql.com +1 -1
    Fix for wrong replace command.

ChangeSet@1.2413.20.1, 2007-03-01 11:52:25+04:00, bar@mysql.com +2 -0
  Renaming recenly added test case, because of name conflict
  when merging into 5.1.

  mysql-test/r/rpl_loaddata_charset.result@1.2, 2007-03-01 11:50:27+04:00, bar@mysql.com +0 -0
    Rename: mysql-test/r/rpl_loaddata2.result -> mysql-test/r/rpl_loaddata_charset.result

  mysql-test/t/rpl_loaddata_charset.test@1.2, 2007-03-01 11:50:13+04:00, bar@mysql.com +0 -0
    Rename: mysql-test/t/rpl_loaddata2.test -> mysql-test/t/rpl_loaddata_charset.test

ChangeSet@1.2413.19.1, 2007-03-01 08:41:13+01:00, rafal@quant.(none) +4 -0
  Fixes of compilation warnings and errors.

  sql/mysql_priv.h@1.432.1.1, 2007-03-01 08:41:12+01:00, rafal@quant.(none) +1 -1
    Removing compiler warning "NULL used in arithmetic"

  sql/mysqld.cc@1.592, 2007-03-01 08:41:12+01:00, rafal@quant.(none) +1 -1
    First argument to WARN_DEPRECATED is supposed to be a pointer (to THD structure)

  sql/sql_insert.cc@1.218.1.1, 2007-03-01 08:41:12+01:00, rafal@quant.(none) +2 -0
    Removing compiler warning "unused variable". Apparently query is not used when compiling libmysqld.

  sql/sql_yacc.yy@1.502.2.1, 2007-03-01 08:41:12+01:00, rafal@quant.(none) +1 -0
    Removing compiler error "Macro already defined"

ChangeSet@1.2413.17.2, 2007-03-01 11:23:12+04:00, bar@mysql.com +2 -0
  Additional fix for bug N 15126
  Replacing local directory.

  mysql-test/r/mysqlbinlog.result@1.30, 2007-03-01 11:23:09+04:00, bar@mysql.com +7 -7
    Additional fix for bug N 15126

  mysql-test/t/mysqlbinlog.test@1.41, 2007-03-01 11:23:09+04:00, bar@mysql.com +1 -0
    Additional fix for bug N 15126

ChangeSet@1.2377.38.4, 2007-03-01 08:34:59+07:00, tomas@poseidon.mysql.com +2 -0
  ndb - rel5.1.16 NdbRecAttr print of blob length assumed uint64 aligned buffer
  ndb - 5.1.16 uint64 align for ndb_restore
  (backport)

  ndb/src/ndbapi/NdbRecAttr.cpp@1.27, 2007-03-01 08:34:52+07:00, tomas@poseidon.mysql.com +19 -19
     ndb - rel5.1.16 NdbRecAttr print of blob length assumed uint64 aligned buffer
    (backport)

  ndb/tools/restore/Restore.cpp@1.29, 2007-03-01 08:34:52+07:00, tomas@poseidon.mysql.com +6 -1
     ndb - 5.1.16 uint64 align for ndb_restore
    (backport)

ChangeSet@1.1346.891.8, 2007-02-28 22:30:50+01:00, kent@mysql.com +1 -0
  Makefile.am:
    EXCEPTIONS-CLIENT is now static part of repository

  Docs/Makefile.am@1.38.1.18, 2007-02-28 22:30:09+01:00, kent@mysql.com +1 -1
    EXCEPTIONS-CLIENT is now static part of repository

ChangeSet@1.1346.891.7, 2007-02-28 22:09:09+01:00, kent@mysql.com +2 -0
  Makefile.am:
    EXCEPTIONS-CLIENT is now static part of repository
  EXCEPTIONS-CLIENT:
    BitKeeper file /home/kent/bk/tmp/mysql-4.0/EXCEPTIONS-CLIENT

  Docs/Makefile.am@1.38.1.17, 2007-02-28 22:07:29+01:00, kent@mysql.com +0 -3
    EXCEPTIONS-CLIENT is now static part of repository

  EXCEPTIONS-CLIENT@1.1, 2007-02-28 21:54:33+01:00, kent@mysql.com +117 -0
    BitKeeper file /home/kent/bk/tmp/mysql-4.0/EXCEPTIONS-CLIENT

  EXCEPTIONS-CLIENT@1.0, 2007-02-28 21:54:33+01:00, kent@mysql.com +0 -0

ChangeSet@1.2413.16.1, 2007-02-28 22:23:35+02:00, jani@ua141d10.elisa.omakaista.fi +12 -0
  Fixed compiler warnings.

  client/mysql_upgrade.c@1.18, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +20 -9
    Fixed problem with mysql_upgrade being dependent
    on local my.cnf files and problem with memory not being freed.

  client/mysqltest.c@1.278, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +1 -1
    Changed type to avoid warning.

  cmd-line-utils/readline/xmalloc.c@1.9, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +3 -4
    Fix to avoid warning.

  include/my_dbug.h@1.22, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +2 -0
    To disable parts from code in non-debug more.

  sql/field.cc@1.339.1.1, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +3 -3
    Fixed warning.

  sql/ha_archive.cc@1.82, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +1 -1
    Fixed warning.

  sql/ha_berkeley.cc@1.167, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +3 -3
    Added casts to avoid warnings.

  sql/ha_ndbcluster.cc@1.300, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +22 -7
    Fixed warnings.

  sql/log.cc@1.202.1.1, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +2 -2
    Added casts to avoid warnings.

  sql/slave.cc@1.291.1.1, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +2 -0
    Avoid warning.

  sql/sql_repl.cc@1.156.1.1, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +2 -0
    Avoid warning.

  support-files/compiler_warnings.supp@1.6, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +53 -3
    Added disabled warnings to compiler_warnings.supp file.
    These are backported mainly from 5.1 suppress file, but there
    are some additional new ones.

ChangeSet@1.2433.1.1, 2007-02-28 21:05:39+01:00, msvensson@pilot.blaudden +1 -0
  Bug #25074 mysql_upgrade test can't give consistent results
   - Tell the programs executed by mysql_upgrade to only read
    from the defaults file generated by msyql_upgrade
   - Fix memory leaks

  client/mysql_upgrade.c@1.14.1.4, 2007-02-28 21:05:38+01:00, msvensson@pilot.blaudden +65 -55
    - Always generate defaults file used for the programs executed
      by mysql_upgrade.
    - Set the executed programs to read options _only_ from the
      generated defaults file 
    - Add DBUG printouts
    - Add comments
    - Fix memory leaks
    - Change one 'my_delete'(delete a file) to 'my_free'(free memory)
    - Free memory allocated by 'load_default'

ChangeSet@1.2455, 2007-02-28 20:44:49+01:00, msvensson@pilot.blaudden +2 -0
  Bug #20166 mysql-test-run.pl does not test system privilege tables creation
   - No .sql files in mysql-test/lib/ anymore, don't copy them

  scripts/make_binary_distribution.sh@1.120.1.1, 2007-02-28 20:44:48+01:00, msvensson@pilot.blaudden +0 -1
    No need to copy mysql-test/lib/*.sql there are no sql files there anymore

  scripts/make_win_bin_dist@1.6, 2007-02-28 20:44:48+01:00, msvensson@pilot.blaudden +0 -1
    No need to copy mysql-test/lib/*.sql there are no sql files there anymore

ChangeSet@1.1616.2975.1, 2007-02-28 16:37:50+01:00, msvensson@pilot.blaudden +1 -0
  Bug#24878 mysql server doesn't log incident time in "mysqld got signal 11" error messages
   - Add printout of current time when mysqld is killed by an
     unhandled signal

  sql/mysqld.cc@1.356.115.1, 2007-02-28 16:37:50+01:00, msvensson@pilot.blaudden +10 -1
    Add printout of current time before the "mysqld got signal %d" message
    Hopefully we don't crash in the calls to 'time' or 'localtime_r'
    but if that should start to happen we can move the printout of
    time further down. At least it's now below the check for segfault
    inside of segfault handler. 

ChangeSet@1.2413.15.1, 2007-02-28 18:34:35+04:00, svoj@mysql.com +3 -0
  BUG#26238 - inserted delayed always inserts 0 for BIT columns
  
  INSERT DELAYED inserts garbage for BIT columns.
  
  When delayed thread clones TABLE object, it didn't adjusted bit_ptr
  to newly created record (though it correctly adjusts ptr and null_ptr).
  
  This is fixed by correctly adjusting bit_ptr when performing a clone.
  With this fix BIT values are stored correctly by INSERT DELAYED.

  mysql-test/r/delayed.result@1.13, 2007-02-28 18:34:33+04:00, svoj@mysql.com +7 -0
    A test case for BUG#26238.

  mysql-test/t/delayed.test@1.17, 2007-02-28 18:34:33+04:00, svoj@mysql.com +8 -0
    A test case for BUG#26238.

  sql/field.h@1.192.1.9, 2007-02-28 18:34:34+04:00, svoj@mysql.com +6 -1
    Added move_field() to Field_bit class. When moving a field, adjust
    bit_ptr also, which is specific to Field_bit class.

ChangeSet@1.2452, 2007-02-28 15:15:38+01:00, msvensson@pilot.blaudden +2 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Null merge 4.1 patch

  mysql-test/Makefile.am@1.88, 2007-02-28 15:15:36+01:00, msvensson@pilot.blaudden +1 -6
    Null merge to 4.1 patch

  scripts/Makefile.am@1.58, 2007-02-28 15:15:36+01:00, msvensson@pilot.blaudden +0 -1
    No need to clean mysql_create_system_tablesa anyomre

ChangeSet@1.2413.13.6, 2007-02-28 18:13:23+04:00, bar@mysql.com +3 -0
  Additional test changes for
  Bug N 15126 character_set_database is not replicated (LOAD DATA INFILE need it)
  Positions of some binlog events were changed because of
  additional logging of @@collation_database.

  mysql-test/r/ctype_cp932_binlog.result@1.7, 2007-02-28 18:13:20+04:00, bar@mysql.com +9 -9
    Additional test changes for
    Bug N 15126 character_set_database is not replicated (LOAD DATA INFILE need it)
    Positions of some binlog events were changed because of
    additional logging of @@collation_database.

  mysql-test/r/ctype_cp932_notembedded.result@1.2, 2007-02-28 18:13:20+04:00, bar@mysql.com +3 -3
    Additional test changes for
    Bug N 15126 character_set_database is not replicated (LOAD DATA INFILE need it)
    Positions of some binlog events were changed because of
    additional logging of @@collation_database.

  mysql-test/t/ctype_cp932_binlog.test@1.4, 2007-02-28 18:13:20+04:00, bar@mysql.com +1 -1
    Additional test changes for
    Bug N 15126 character_set_database is not replicated (LOAD DATA INFILE need it)
    Positions of some binlog events were changed because of
    additional logging of @@collation_database.

ChangeSet@1.1616.2967.22, 2007-02-28 15:03:47+01:00, msvensson@pilot.blaudden +4 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Build lib/init-db.sql from the output of mysql_create_system_tables
   - Remove mysql-test/init_db.sql and mysql-test/lib/init_db.sql
   - Leave netware/init_db.sql until 5.0 where we should soon have possibility
     to test with mysql-test-run.pl

  BitKeeper/deleted/.del-init_db.sql@1.2.1.1, 2007-02-28 15:01:02+01:00, msvensson@pilot.blaudden +0 -0
    Delete: mysql-test/init_db.sql

  BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8@1.4.1.2, 2007-02-28 15:01:05+01:00, msvensson@pilot.blaudden +0 -0
    Delete: mysql-test/lib/init_db.sql

  BitKeeper/etc/ignore@1.153.1.88, 2007-02-28 15:03:46+01:00, msvensson@pilot.blaudden +1 -0
    Added mysql-test/lib/init_db.sql to the ignore list

  mysql-test/Makefile.am@1.39.1.21, 2007-02-28 15:03:46+01:00, msvensson@pilot.blaudden +6 -1
    Build lib/init_db.sql from the output of mysql_create_system_tables

ChangeSet@1.2413.13.5, 2007-02-28 17:32:18+04:00, bar@mysql.com +2 -0
  After merge fix

  mysql-test/r/mysqlbinlog.result@1.29, 2007-02-28 17:32:15+04:00, bar@mysql.com +0 -1
    After merge fix

  mysql-test/t/mysqlbinlog.test@1.40, 2007-02-28 17:32:15+04:00, bar@mysql.com +0 -2
    After merge fix

ChangeSet@1.2450, 2007-02-28 14:26:58+01:00, msvensson@pilot.blaudden +6 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Split out initial data in mysql_system_tables.sql to  it's own file
   - Use file from mysql_install_db and mysql-test-run

  mysql-test/mysql-test-run.pl@1.202, 2007-02-28 14:26:57+01:00, msvensson@pilot.blaudden +10 -4
    - Add mysql_system_tables_data.sql as part of the bootstrap
    - Remove the addition of pid to end of bootstrap.sql, now
      to file used for bootstrap will be $opt_vardir/tmp/bootstrap.sql
    - Improve error message descibing how to find cause of a
      failed bootstrap

  scripts/Makefile.am@1.57, 2007-02-28 14:26:57+01:00, msvensson@pilot.blaudden +9 -7
    - Rename mysql_fix_privileg_tables.sql.in to mysql_system_tables_fix.sql
    - Build mysql_fix_privilege_tables from mysql_system_tables.sql and
      mysql_system_tables_fix.sql
    - Add mysql_system_tables_fix.sql to EXTRA_DIST

  scripts/mysql_install_db.sh@1.71, 2007-02-28 14:26:57+01:00, msvensson@pilot.blaudden +11 -1
    - Use mysql_system_tables_data.sql file when bootstrapping
      mysql, it will contain initial data for MysQL system tables

  scripts/mysql_system_tables.sql@1.4, 2007-02-28 14:26:57+01:00, msvensson@pilot.blaudden +0 -10
    Move initial data for system tables to it's own file

  scripts/mysql_system_tables_data.sql@1.1, 2007-02-28 14:26:57+01:00, msvensson@pilot.blaudden +13 -0
    Move initial data for system tables to it's own file

  scripts/mysql_system_tables_data.sql@1.0, 2007-02-28 14:26:57+01:00, msvensson@pilot.blaudden +0 -0

  scripts/mysql_system_tables_fix.sql@1.44, 2007-02-28 11:37:38+01:00, msvensson@pilot.blaudden +0 -0
    Rename: scripts/mysql_fix_privilege_tables.sql.in -> scripts/mysql_system_tables_fix.sql

ChangeSet@1.2341.90.1, 2007-02-28 17:06:57+04:00, bar@mysql.com +11 -0
  Bug#15126 character_set_database is not replicated (LOAD DATA INFILE need it)
  This patch fixes problem that LOAD DATA could use different
  character sets when loading files on master and on slave sides:
  - Adding replication of thd->variables.collation_database
  - Adding optional character set clause into LOAD DATA
  
  Note, the second way, with explicit CHARACTER SET clause
  should be the recommended way to load data using an alternative
  character set.
  The old way, using "SET @@character_set_database=xxx" should be
  gradually depricated.

  mysql-test/r/mysqlbinlog.result@1.26.2.1, 2007-02-28 17:06:54+04:00, bar@mysql.com +58 -0
    Adding test case

  mysql-test/r/rpl_loaddata2.result@1.1, 2007-02-28 17:06:54+04:00, bar@mysql.com +37 -0
    New BitKeeper file ``mysql-test/r/rpl_loaddata2.result''

  mysql-test/r/rpl_loaddata2.result@1.0, 2007-02-28 17:06:54+04:00, bar@mysql.com +0 -0
    BitKeeper file /home/bar/mysql-5.0.b15126/mysql-test/r/rpl_loaddata2.result

  mysql-test/std_data/loaddata6.dat@1.1, 2007-02-28 17:06:54+04:00, bar@mysql.com +1 -0
    New BitKeeper file ``mysql-test/std_data/loaddata6.dat''

  mysql-test/std_data/loaddata6.dat@1.0, 2007-02-28 17:06:54+04:00, bar@mysql.com +0 -0
    BitKeeper file /home/bar/mysql-5.0.b15126/mysql-test/std_data/loaddata6.dat

  mysql-test/t/mysqlbinlog.test@1.36.3.1, 2007-02-28 17:06:54+04:00, bar@mysql.com +24 -0
    Adding test case

  mysql-test/t/rpl_loaddata2.test@1.1, 2007-02-28 17:06:55+04:00, bar@mysql.com +33 -0
    New BitKeeper file ``mysql-test/t/rpl_loaddata2.test''

  mysql-test/t/rpl_loaddata2.test@1.0, 2007-02-28 17:06:55+04:00, bar@mysql.com +0 -0
    BitKeeper file /home/bar/mysql-5.0.b15126/mysql-test/t/rpl_loaddata2.test

  sql/log_event.cc@1.223.1.2, 2007-02-28 17:06:54+04:00, bar@mysql.com +44 -4
    Adding logging of thd->variables.collation_database

  sql/log_event.h@1.130.1.2, 2007-02-28 17:06:54+04:00, bar@mysql.com +4 -1
    Adding declarations

  sql/sql_class.cc@1.256.5.1, 2007-02-28 17:06:54+04:00, bar@mysql.com +1 -0
    Exchange character set is null by default

  sql/sql_class.h@1.316.2.1, 2007-02-28 17:06:54+04:00, bar@mysql.com +1 -0
    Adding character set into sql_exchange

  sql/sql_load.cc@1.102.2.1, 2007-02-28 17:06:54+04:00, bar@mysql.com +2 -1
    - Using exchange character set (if it was specified in LOAD DATA syntax)
    - Using thd->variables.collation_database by default

  sql/sql_yacc.yy@1.498.6.1, 2007-02-28 17:06:54+04:00, bar@mysql.com +7 -0
    Adding optional character set clause into LOAD DATA syntax

ChangeSet@1.2413.5.12, 2007-02-28 16:03:38+03:00, kostja@bodhi.local +1 -0
  Add more comments to open_table and open_tables. No real changes.

  sql/sql_base.cc@1.365.2.1, 2007-02-28 16:03:35+03:00, kostja@bodhi.local +111 -5
    Add more comments to open_table and open_tables. No real changes.

ChangeSet@1.1616.2967.21, 2007-02-28 13:47:41+01:00, msvensson@pilot.blaudden +1 -0
  When using a --mem=<dir> the memdir must be removed to assure
  afresh start

  mysql-test/mysql-test-run.pl@1.8.20.5, 2007-02-28 13:47:40+01:00, msvensson@pilot.blaudden +10 -0
    When using a --mem=<dir> the memdir must be removed to assure
    afresh start

ChangeSet@1.2413.14.1, 2007-02-28 11:23:00+01:00, joerg@trift2. +1 -0
  A binary package should also contain the "mysqld-debug" server (backport from 5.1).

  scripts/make_binary_distribution.sh@1.121, 2007-02-28 11:22:57+01:00, joerg@trift2. +2 -1
    A binary package should also contain the "mysqld-debug" server (backport from 5.1).

ChangeSet@1.1616.2967.20, 2007-02-28 10:52:51+01:00, msvensson@pilot.blaudden +1 -0
  Bug#26416 mysql-test-run exits with "Hangup" when piped to grep
   - Thanks to Christian for the patch!

  mysql-test/lib/mtr_process.pl@1.15.1.18, 2007-02-28 10:52:50+01:00, msvensson@pilot.blaudden +2 -8
    Avoid printout of "Hangup" when script exits by using
    POSIX::kill

ChangeSet@1.1616.2967.19, 2007-02-28 10:37:32+01:00, msvensson@pilot.blaudden +1 -0
  Bug#26686 mysql-test-run.pl aborts when waitpid returns -1
   - Add error handling for waitpid returns -1 for "simple run of command"

  mysql-test/lib/mtr_process.pl@1.15.1.17, 2007-02-28 10:37:31+01:00, msvensson@pilot.blaudden +20 -9
    - Add error handling for waitpid returns -1
    when a simple command is run.
    - Add missing return
    - Add mtr_errors where the program should never come 
    - Remove an else to improve program readability
    - Change mtr_debug to mtr_warning for "Got EAGAIN from fork()..." 

ChangeSet@1.1616.2967.17, 2007-02-28 10:05:51+01:00, msvensson@pilot.blaudden +1 -0
  Use cygwin for --exec and --system in mysqltest for MySQL before 5.0

  client/mysqltest.c@1.92.21.49, 2007-02-28 10:05:50+01:00, msvensson@pilot.blaudden +5 -0
    Use cygwin for --exec and --system in mysqltest for MySQL before 5.0

ChangeSet@1.1616.2974.1, 2007-02-28 09:10:38+01:00, msvensson@pilot.blaudden +1 -0
  Bug#19410 Test 'kill' fails on Windows + SCO
  - Use "mysql_stmt_field_count" to determine if there is a need to
  call "mysql_stmt_store_result"

  client/mysqltest.c@1.92.26.1, 2007-02-28 09:10:37+01:00, msvensson@pilot.blaudden +2 -1
    Only call 'mysql_stmt_store_result' if 'mysql_stmt_field_count' is
    greater than 0 indicating that this query has a result set.
    This change is mainly since if mysql_stmt_store_result fails
    the value returned by mysql_stmt_field_count will be reset.

ChangeSet@1.2413.12.1, 2007-02-27 10:32:45-05:00, cbell@mysql_cab_desk. +1 -0
  BUG#20141 "User-defined variables are not replicated properly for 
            SF/Triggers in SBR mode."
  BUG#14914 "SP: Uses of session variables in routines are not always replicated"
  BUG#25167 "Dupl. usage of user-variables in trigger/function is not replicated
            correctly"
  
  This patch corrects a minor error in the previous patch for BUG#20141. This patch
  corrects an errant code change to sp_head.cc. The comments for the first patch follow:
  
  User-defined variables used inside of stored functions/triggers in
  statements which did not update tables directly were not replicated.
  We also had problems with replication of user-defined variables which
  were used in triggers (or stored functions called from table-updating
  statements) more than once.
  
  This patch addresses the first issue by enabling logging of all
  references to user-defined variables in triggers/stored functions
  and not only references from table-updating statements.
  
  The second issue stemmed from the fact that for user-defined
  variables used from triggers or stored functions called from
  table-updating statements we were writing binlog events for each
  reference instead of only one event for the first reference.
  This problem is already solved for stored functions called from
  non-updating statements with help of "event unioning" mechanism.
  So the patch simply extends this mechanism to the case affected.
  It also fixes small problem in this mechanism which caused wrong
  logging of references to user-variables in cases when non-updating
  statement called several stored functions which used the same
  variable and some of these function calls were omitted from binlog
  as they were not updating any tables.

  sql/sp_head.cc@1.234, 2007-02-27 10:32:40-05:00, cbell@mysql_cab_desk. +1 -1
    BUG#20141 "User-defined variables are not replicated properly for 
              SF/Triggers in SBR mode."
    
    This patch corrects a minor error in the previous patch for BUG#20141. The code:
    
    q= ::query_id; 
    
    was an errant line of code that was not intended to be in the patch. Instead, the
    correct line of code is:
    
    q= global_query_id;

ChangeSet@1.2449, 2007-02-27 15:28:19+01:00, msvensson@pilot.blaudden +1 -0
  Bug#23669 mysql.proc not created in default install
   - Remove DEFAULT values for blob's in mysql_system_tables.sql

  scripts/mysql_system_tables.sql@1.3, 2007-02-27 15:28:18+01:00, msvensson@pilot.blaudden +1 -1
    Remove attempt to set default value for blob columns since
    they can't have any. Depending on 'sql_mode' the default values
    has either been silently dropped or thrown an error as reported
    by the bug. 

ChangeSet@1.2445.1.1, 2007-02-27 14:18:12+01:00, msvensson@pilot.blaudden +2 -0
  Bug#26678 SSL tests fail on win64
   - Import a patch from yaSSL CVS that uses "word" instead
  of "unsigned long" in three function's that uses sizeof to find
  out the word size being used. NOTE! long is 32 bit also on 
  64 bit windows.

  extra/yassl/taocrypt/include/misc.hpp@1.17, 2007-02-27 12:05:12+01:00, msvensson@pilot.blaudden +3 -3
    Import patch yassl.diff

  extra/yassl/taocrypt/src/misc.cpp@1.20, 2007-02-27 12:05:13+01:00, msvensson@pilot.blaudden +3 -3
    Import patch yassl.diff

ChangeSet@1.2425.1.6, 2007-02-27 14:10:27+01:00, msvensson@pilot.blaudden +1 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Escape undercore character in mysql.db to only allow
    access test_% and not test%

  scripts/mysql_system_tables.sql@1.2, 2007-02-27 14:10:26+01:00, msvensson@pilot.blaudden +1 -1
    underscore is a wildcard character so it need to be
    expaed to only match one _

ChangeSet@1.2413.3.10, 2007-02-27 12:37:17+04:00, gluh@mysql.com +1 -0
  removed unused variable

  sql/sql_select.cc@1.495, 2007-02-27 12:37:15+04:00, gluh@mysql.com +0 -1
    removed unused variable

ChangeSet@1.2443.1.1, 2007-02-27 11:01:58+04:00, ramil@mysql.com +2 -0
  Fix for bug #25834: Test failure in "func_group"
  
  Round the results of std() for some calls with double arguments
  to avoid double math precision problems.

  mysql-test/r/func_group.result@1.59, 2007-02-27 11:01:57+04:00, ramil@mysql.com +15 -15
    Fix for bug #25834: Test failure in "func_group"
    
    Round the results of std() for some calls with double arguments
    to avoid double math precision problems.

  mysql-test/t/func_group.test@1.54, 2007-02-27 11:01:57+04:00, ramil@mysql.com +3 -3
    Fix for bug #25834: Test failure in "func_group"
    
    Round the results of std() for some calls with double arguments
    to avoid double math precision problems.

ChangeSet@1.1616.2877.53, 2007-02-26 20:35:28+01:00, gbichot@dl145h.mysql.com +1 -0
  Fix for BUG#26050 "LOAD DATA INFILE breaks ACID"; the ok must be sent
  to the client only after the binlog write and engine commit.
  No testcase for this bug, as to reproduce it, we need to "kill -9" mysqld,
  which we cannot do in the testsuite. But, I tested by hand.

  sql/sql_load.cc@1.46.3.43, 2007-02-26 20:33:55+01:00, gbichot@dl145h.mysql.com +3 -1
    D in ACID means that once the client got the ok from the server, the data
    is durable on disk. Implies that the ok must be sent after the binlog write
    and after the engine commit, not before.

ChangeSet@1.1616.2967.16, 2007-02-26 14:52:51+01:00, msvensson@pilot.blaudden +1 -0
  Only allow a version number to be read from "/etc/debian_version"

  mysql-test/mysql-test-run.pl@1.8.20.4, 2007-02-26 14:52:50+01:00, msvensson@pilot.blaudden +1 -1
    Only allow a version number to be read from "/etc/debian_version"

ChangeSet@1.2425.1.5, 2007-02-26 14:49:41+01:00, msvensson@pilot.blaudden +1 -0
  Remove another spurious "

  scripts/mysql_fix_privilege_tables.sql.in@1.43, 2007-02-26 14:49:40+01:00, msvensson@pilot.blaudden +1 -1
    Remove another spurious "

ChangeSet@1.2425.1.4, 2007-02-26 14:48:41+01:00, msvensson@pilot.blaudden +1 -0
  Remove spurious "

  scripts/mysql_fix_privilege_tables.sql.in@1.42, 2007-02-26 14:48:40+01:00, msvensson@pilot.blaudden +1 -1
    Remove spurious "

ChangeSet@1.2341.89.1, 2007-02-26 15:25:43+04:00, bar@mysql.com +5 -0
  Bug#24478 DROP TRIGGER is not caught by replicate-*-table filters
  Problem: DROP TRIGGER was not properly handled in combination
  with slave filters, which made replication stop
  Fix: loading table name before checking slave filters when
  dropping a trigger.

  mysql-test/r/rpl_replicate_do.result@1.34, 2007-02-26 15:25:40+04:00, bar@mysql.com +34 -0
    Adding test case

  mysql-test/t/rpl_replicate_do.test@1.26, 2007-02-26 15:25:40+04:00, bar@mysql.com +32 -0
    Adding test case

  sql/sql_parse.cc@1.590.10.1, 2007-02-26 15:25:40+04:00, bar@mysql.com +25 -0
    Loading table name when dropping a trigger
    before checking slave filtering rules.

  sql/sql_trigger.cc@1.60.2.1, 2007-02-26 15:25:40+04:00, bar@mysql.com +1 -5
    Making add_table_for_trigger() public

  sql/sql_trigger.h@1.22.2.1, 2007-02-26 15:25:40+04:00, bar@mysql.com +4 -0
    Making add_table_for_trigger() public

ChangeSet@1.2425.1.3, 2007-02-26 11:49:24+01:00, msvensson@pilot.blaudden +31 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Use mysql_system_tables.sql to create MySQL system tables in
     all places where we create them(mysql_install_db, mysql-test-run-pl
     and mysql_fix_privilege_tables.sql)

  BitKeeper/deleted/.del-init_db.sql@1.5, 2007-02-26 11:48:43+01:00, msvensson@pilot.blaudden +0 -0
    Rename: mysql-test/init_db.sql -> BitKeeper/deleted/.del-init_db.sql

  BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8@1.15, 2007-02-26 11:48:43+01:00, msvensson@pilot.blaudden +0 -0
    Rename: mysql-test/lib/init_db.sql -> BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8

  BitKeeper/deleted/.del-mysql_create_system_tables.sh@1.31, 2007-02-26 11:48:43+01:00, msvensson@pilot.blaudden +0 -0
    Rename: scripts/mysql_create_system_tables.sh -> BitKeeper/deleted/.del-mysql_create_system_tables.sh

  BitKeeper/etc/ignore@1.241.1.1, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +1 -0
    Added scripts/mysql_fix_privilege_tables.sql to the ignore list

  mysql-test/Makefile.am@1.86, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +0 -2
    lib/init_db.sql has been removed

  mysql-test/include/add_anonymous_users.inc@1.1, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +7 -0
    New BitKeeper file ``mysql-test/include/add_anonymous_users.inc''

  mysql-test/include/add_anonymous_users.inc@1.0, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +0 -0

  mysql-test/include/delete_anonymous_users.inc@1.1, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +5 -0
    New BitKeeper file ``mysql-test/include/delete_anonymous_users.inc''

  mysql-test/include/delete_anonymous_users.inc@1.0, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +0 -0

  mysql-test/mysql-test-run.pl@1.200, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +37 -34
    - Build var/tmp/bootstrap.sql from mysql_system_tables.sql,
    mysql_test_data_timezone.sql and fill_help_tables.sql and use
    it when bootsraping the system tables to use during test. 

  mysql-test/r/create.result@1.124, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +2 -0
    Update result file

  mysql-test/r/derived.result@1.58, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +2 -0
    Update result file

  mysql-test/r/join.result@1.41, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +1 -1
    Update result file

  mysql-test/r/mysql_upgrade.result@1.2, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +0 -30
    Update result file

  mysql-test/r/sp-security.result@1.32, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +3 -3
    Update result file

  mysql-test/t/create.test@1.84, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +3 -1
    Add user mysqltest_1 before trying to connect as that user - no
    anon users by default anymore

  mysql-test/t/derived.test@1.53, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +6 -1
    Add user mysqltest_1 before trying to connect as that user - no
    anon users by default anymore

  mysql-test/t/grant2.test@1.38, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +4 -0
    Add anonymous users for part of thes that need it.

  mysql-test/t/grant_cache.test@1.18, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +6 -0
    Add anonymous users for part of thes that need it.

  mysql-test/t/init_connect.test@1.9, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +4 -0
    Add anonymous users for part of thes that need it.

  mysql-test/t/lock_multi.test@1.22, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +6 -0
    Add anonymous users for part of thes that need it.

  mysql-test/t/ndb_basic.test@1.38, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +3 -3
    Connect as "root", blank user will take currently logged in
    username

  mysql-test/t/ndb_index_ordered.test@1.28, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +2 -2
    Connect as "root", blank user will take currently logged in
    username

  mysql-test/t/ndb_multi.test@1.11, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +2 -2
    Connect as "root", blank user will take currently logged in
    username

  mysql-test/t/overflow.test@1.9, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +1 -1
    Connect as root - no anonymous users by default anymore

  mysql-test/t/rpl_temporary.test@1.22.1.1, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +8 -2
    Add anonymous users for the test

  mysql-test/t/xa.test@1.8, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +1 -1
    Connect as "root", blank user wil pick currently logged in user

  scripts/Makefile.am@1.56, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +16 -6
    Remove mysql_create_system_tables.sh
    Add mysql_system_tables.sql and mysql_test_data_timezone.sql
    Build mysql_fix_privilege_tables.sql from mysql_system_tables.sql
    and mysql_fix_privilege_tables.sql.in

  scripts/mysql_fix_privilege_tables.sh@1.38, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +1 -5
    Update message describing what the script does

  scripts/mysql_install_db.sh@1.70, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +120 -81
    Use mysql_system_tables.sql to create the MySQL system tables
    Update comments and indentation
    Add more descriptive comments about --windows switch
    Reduce number of hardcoded names for the SQL files the script
    looks for

  scripts/mysql_system_tables.sql@1.1, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +65 -0
    New BitKeeper file ``scripts/mysql_system_tables.sql''

  scripts/mysql_system_tables.sql@1.0, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +0 -0

  scripts/mysql_fix_privilege_tables.sql.in@1.41, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +43 -222
    Remove the part that creates system tables as that will be added to
    mysql_fix_privileg_tables.sql from mysql_system_tables.sql
    Change all comments to use # 

  scripts/mysql_fix_privilege_tables.sql.in@1.40, 2007-02-26 11:48:43+01:00, msvensson@pilot.blaudden +0 -0
    Rename: scripts/mysql_fix_privilege_tables.sql -> scripts/mysql_fix_privilege_tables.sql.in

  scripts/mysql_test_data_timezone.sql@1.1, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +5 -0
    New BitKeeper file ``scripts/mysql_test_data_timezone.sql''

  scripts/mysql_test_data_timezone.sql@1.0, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +0 -0

ChangeSet@1.2445, 2007-02-26 09:24:03+01:00, msvensson@pilot.blaudden +1 -0
  Use binary file mode when writing the modified .TRG file to avoid CR/LF's being added on windows

  mysql-test/t/trigger-grant.test@1.9, 2007-02-26 09:24:02+01:00, msvensson@pilot.blaudden +2 -0
    Use binary file mode when writing the modified .TRG file to avoid CR/LF's being added on windows

ChangeSet@1.2444, 2007-02-26 09:16:22+01:00, msvensson@pilot.blaudden +2 -0
  Workaround non portable use of "grep" and "cut" by loading the whole processlist
  into temporary table and selecting the correct row with SQL

  mysql-test/include/get_binlog_dump_thread_id.inc@1.4, 2007-02-26 09:16:21+01:00, msvensson@pilot.blaudden +16 -3
    Workaround non portable use of "grep" and "cut" by loading the whole processlist
    into temporary table and selecting the correct row with SQL

  mysql-test/r/rpl_temporary.result@1.27, 2007-02-26 09:16:21+01:00, msvensson@pilot.blaudden +10 -1
    Workaround non portable use of "grep" and "cut" by loading the whole processlist
    into temporary table and selecting the correct row with SQL

ChangeSet@1.2413.3.8, 2007-02-26 08:11:10+01:00, knielsen@ymer.(none) +1 -0
  Compiler warning suppression fix: Add missing file to 'make dist'.

  support-files/Makefile.am@1.35, 2007-02-26 08:11:07+01:00, knielsen@ymer.(none) +2 -1
    Add missing file to 'make dist'.

ChangeSet@1.2411.5.8, 2007-02-26 09:01:43+03:00, evgen@sunlight.local +2 -0
  item.cc, item.h:
    Post fix for bug#23800.

  sql/item.cc@1.245.9.4, 2007-02-26 09:00:57+03:00, evgen@sunlight.local +1 -0
    Post fix for bug#23800.

  sql/item.h@1.213.1.11, 2007-02-26 09:00:36+03:00, evgen@sunlight.local +0 -1
    Post fix for bug#23800.

ChangeSet@1.2411.5.7, 2007-02-25 23:02:11+03:00, evgen@sunlight.local +1 -0
  item.h:
    Post fix for bug#23800.
    Copy the table name of an Item_outer_ref to the conventional memory.

  sql/item.h@1.213.1.10, 2007-02-25 23:01:05+03:00, evgen@sunlight.local +1 -0
    Post fix for bug#23800.
    Copy the table name of an Item_outer_ref to the conventional memory.

ChangeSet@1.2413.11.3, 2007-02-25 00:31:26+01:00, lars@mysql.com +1 -0
  log_on needed also in embedded server

  sql/sql_insert.cc@1.218, 2007-02-25 00:31:24+01:00, lars@mysql.com +0 -2
    log_on needed also in embedded server

ChangeSet@1.2411.8.1, 2007-02-24 23:04:15+03:00, evgen@moonbone.local +4 -0
  item.cc:
    Post fix for bug#23800.
    The Item_field constructor now increases the select_n_where_fields counter.
  sql_yacc.yy:
    Post fix for bug#23800.
    Take into account fields that might be added by subselects.
  sql_lex.h:
    Post fix for bug#23800.
    Added the select_n_where_fields variable to the st_select_lex class.
  sql_lex.cc:
    Post fix for bug#23800.
    Initialization of the select_n_where_fields variable.

  sql/item.cc@1.245.9.3, 2007-02-24 23:00:46+03:00, evgen@moonbone.local +3 -0
    Post fix for bug#23800.
    The Item_field constructor now increases the select_n_where_fields counter.

  sql/sql_lex.cc@1.209.3.2, 2007-02-24 22:55:10+03:00, evgen@moonbone.local +2 -0
    Post fix for bug#23800.
    Initialization of the select_n_where_fields variable.

  sql/sql_lex.h@1.233.5.2, 2007-02-24 22:58:14+03:00, evgen@moonbone.local +5 -0
    Post fix for bug#23800.
    Added the select_n_where_fields variable to the st_select_lex class.

  sql/sql_yacc.yy@1.498.5.2, 2007-02-24 23:02:49+03:00, evgen@moonbone.local +6 -0
    Post fix for bug#23800.
    Take into account fields that might be added by subselects.

ChangeSet@1.2413.5.11, 2007-02-24 13:18:09+03:00, anozdrin@booka.opbmk +1 -0
  Fix for BUG#22511: IM does not remove angel-pid-file on clean shutdown

  server-tools/instance-manager/mysqlmanager.cc@1.21, 2007-02-24 13:18:06+03:00, anozdrin@booka.opbmk +4 -0
    Delete IM-angel pid file on exit.

ChangeSet@1.2413.5.10, 2007-02-24 13:12:20+03:00, anozdrin@booka.opbmk +4 -0
  IM test suite fix.
  
  Log messages from shell-scripts were put to var/log/<test id>.log
  file. Now, this file is used by mysql-test-run.pl. So, move log
  messages to var/log/<test id>.script.log.

  mysql-test/t/kill_n_check.sh@1.6, 2007-02-24 13:12:18+03:00, anozdrin@booka.opbmk +1 -1
    Log messages from shell-scripts were put to var/log/<test id>.log
    file. Now, this file is used by mysql-test-run.pl. So, move log
    messages to var/log/<test id>.script.log.

  mysql-test/t/log.sh@1.3, 2007-02-24 13:12:18+03:00, anozdrin@booka.opbmk +1 -1
    Log messages from shell-scripts were put to var/log/<test id>.log
    file. Now, this file is used by mysql-test-run.pl. So, move log
    messages to var/log/<test id>.script.log.

  mysql-test/t/wait_for_process.sh@1.3, 2007-02-24 13:12:18+03:00, anozdrin@booka.opbmk +1 -1
    Log messages from shell-scripts were put to var/log/<test id>.log
    file. Now, this file is used by mysql-test-run.pl. So, move log
    messages to var/log/<test id>.script.log.

  mysql-test/t/wait_for_socket.sh@1.4, 2007-02-24 13:12:18+03:00, anozdrin@booka.opbmk +1 -1
    Log messages from shell-scripts were put to var/log/<test id>.log
    file. Now, this file is used by mysql-test-run.pl. So, move log
    messages to var/log/<test id>.script.log.

ChangeSet@1.2413.5.9, 2007-02-24 13:10:04+03:00, anozdrin@booka.opbmk +2 -0
  Fix shutdown delay option name according to The Manual.

  mysql-test/mysql-test-run.pl@1.196.2.3, 2007-02-24 13:09:58+03:00, anozdrin@booka.opbmk +1 -1
    Fix shutdown delay option name according to The Manual.

  server-tools/instance-manager/instance_options.cc@1.32.1.2, 2007-02-24 13:09:58+03:00, anozdrin@booka.opbmk +1 -1
    Fix shutdown delay option name according to The Manual.

ChangeSet@1.2443, 2007-02-24 08:18:57+01:00, msvensson@pilot.blaudden +1 -0
  Replace non portable system commmands in trigger-grant

  mysql-test/t/trigger-grant.test@1.8, 2007-02-24 08:18:56+01:00, msvensson@pilot.blaudden +13 -3
    Replace non portable system commmands in trigger-grant

ChangeSet@1.2413.5.8, 2007-02-23 21:51:33+03:00, anozdrin@alik.opbmk +1 -0
  Fix mysql-test-run.pl: IM in 5.0 uses old incorrect
  'shutdown_delay' option name.

  mysql-test/mysql-test-run.pl@1.196.2.2, 2007-02-23 21:51:31+03:00, anozdrin@alik.opbmk +1 -1
    IM in 5.0 uses old incorrect 'shutdown_delay' option name.

ChangeSet@1.2413.5.7, 2007-02-23 21:13:21+03:00, anozdrin@alik.opbmk +1 -0
  Fix result file.

  mysql-test/r/im_daemon_life_cycle.result@1.10, 2007-02-23 21:13:20+03:00, anozdrin@alik.opbmk +1 -1
    Fix result file.

ChangeSet@1.2341.87.1, 2007-02-23 12:58:56-05:00, cbell@mysql_cab_desk. +7 -0
  BUG#20141 "User-defined variables are not replicated properly for SF/
             Triggers in SBR mode."
  BUG#14914 "SP: Uses of session variables in routines are not always
             replicated"
  BUG#25167 "Dupl. usage of user-variables in trigger/function is not
             replicated correctly"
  
  User-defined variables used inside of stored functions/triggers in
  statements which did not update tables directly were not replicated.
  We also had problems with replication of user-defined variables which
  were used in triggers (or stored functions called from table-updating
  statements) more than once.
  
  This patch addresses the first issue by enabling logging of all
  references to user-defined variables in triggers/stored functions
  and not only references from table-updating statements.
  
  The second issue stemmed from the fact that for user-defined
  variables used from triggers or stored functions called from
  table-updating statements we were writing binlog events for each
  reference instead of only one event for the first reference.
  This problem is already solved for stored functions called from
  non-updating statements with help of "event unioning" mechanism.
  So the patch simply extends this mechanism to the case affected.
  It also fixes small problem in this mechanism which caused wrong
  logging of references to user-variables in cases when non-updating
  statement called several stored functions which used the same
  variable and some of these function calls were omitted from binlog
  as they were not updating any tables.

  mysql-test/r/rpl_user_variables.result@1.18, 2007-02-23 12:57:17-05:00, Chuck@mysql_cab_desk. +176 -0
    BUG#20141 - User-defined variables are not replicated properly for SF/Triggers in SBR mode.
    This patch adds the correct results for execution of the added test procedures to the
    rpl_user_variables test.

  mysql-test/t/rpl_user_variables.test@1.15, 2007-02-23 12:57:18-05:00, Chuck@mysql_cab_desk. +300 -3
    BUG#20141 - User-defined variables are not replicated properly for SF/Triggers in SBR mode.
    This patch adds additional tests to the rpl_user_variables test that test many of the
    different ways user-defined variables can be required to be replicated.

  sql/item_func.cc@1.317.5.1, 2007-02-23 12:57:18-05:00, Chuck@mysql_cab_desk. +8 -1
    BUG#20141 - User-defined variables are not replicated properly for SF/Triggers in SBR mode.
    To properly log accesses to user-defined variables from stored functions/triggers,
    the get_var_with_binlog() method needs to log references to such variables even from 
    non-table-updating statements within them.

  sql/log.cc@1.200.3.1, 2007-02-23 12:57:19-05:00, Chuck@mysql_cab_desk. +2 -2
    BUG#20141 - User-defined variables are not replicated properly for SF/Triggers in SBR mode.
    This patch modifies the start_union_events method to accept the query id from a parameter.
    This allows callers to set the query_id to the id of the sub statement such as a trigger
    or stored function. Which permits the code to identify when a user defined variable has
    been used by the statement and this already present in THD::user_var_event.
    
    Note:
    The changes to sql_class.cc, sp_head.cc, and log.cc are designed to allow the proper 
    replication of access to user-defined variables under a special test case (the last case 
    shown in rpl_user_variables.test).

  sql/sp_head.cc@1.230.2.1, 2007-02-23 12:57:19-05:00, Chuck@mysql_cab_desk. +17 -1
    BUG#20141 - User-defined variables are not replicated properly for SF/Triggers in SBR mode.
    This patch modifies the code to allow for cases where events for function calls have
    a separate union for each event and thus cannot use the query_id of the caller as the
    start of the union. Thus, we use an artifically created query_id to set the start of 
    the events.
    
    Note:
    The changes to sql_class.cc, sp_head.cc, and log.cc are designed to allow the proper 
    replication of access to user-defined variables under a special test case (the last case 
    shown in rpl_user_variables.test).

  sql/sql_class.cc@1.256.4.1, 2007-02-23 12:57:20-05:00, Chuck@mysql_cab_desk. +7 -0
    BUG#20141 - User-defined variables are not replicated properly for SF/Triggers in SBR mode.
    This patch adds the query_id parameter to the calls to mysql_bin_log.start_union_events().
    
    Note:
    The changes to sql_class.cc, sp_head.cc, and log.cc are designed to allow the proper 
    replication of access to user-defined variables under a special test case (the last case 
    shown in rpl_user_variables.test).

  sql/sql_class.h@1.316.1.1, 2007-02-23 12:57:20-05:00, Chuck@mysql_cab_desk. +1 -1
    BUG#20141 - User-defined variables are not replicated properly for SF/Triggers in SBR mode.
    This patch adds the query_id parameter to the calls to mysql_bin_log.start_union_events().

ChangeSet@1.2413.5.6, 2007-02-23 20:49:01+03:00, anozdrin@alik.opbmk +2 -0
  Fix test for views with national characters,
  which accidentally got broken during the merge
  on 16-Feb-2007.

  mysql-test/r/view.result@1.194, 2007-02-23 20:49:00+03:00, anozdrin@alik.opbmk +10 -8
    Updated result file.

  mysql-test/t/view.test@1.179, 2007-02-23 20:49:00+03:00, anozdrin@alik.opbmk +8 -6
    Fix test for views with national characters,
    which accidentally got broken during the merge
    on 16-Feb-2007.
    
    Now view.test is in UTF8 character set,
    so SET NAMES is required.

ChangeSet@1.2413.5.5, 2007-02-23 20:24:32+03:00, anozdrin@alik.opbmk +2 -0
  BUG#24415: im_daemon_life_cycle.imtest fails
  
  Fix timeouts. Only test suite is changed.

  mysql-test/mysql-test-run.pl@1.196.2.1, 2007-02-23 20:24:30+03:00, anozdrin@alik.opbmk +1 -0
    Decrease MySQL server shutdown delay.
    Trasactional storage engines are not used here,
    so it should be enough.

  mysql-test/t/im_daemon_life_cycle.imtest@1.12, 2007-02-23 20:24:30+03:00, anozdrin@alik.opbmk +12 -7
    Increase wait-timeout.

ChangeSet@1.2442, 2007-02-23 18:05:32+01:00, msvensson@pilot.blaudden +1 -0
  Convert "system cp" to portable mysqltest commands

  mysql-test/t/type_varchar.test@1.12, 2007-02-23 18:05:31+01:00, msvensson@pilot.blaudden +3 -2
    Convert "system cp" to portable mysqltest commands

ChangeSet@1.2440, 2007-02-23 17:33:11+01:00, msvensson@pilot.blaudden +2 -0
  Bug#26536 func_time failure on vm-win2003-64-b, occurs every time
   - Avoid overflow in sec_since_epoch by shifting the time
     back 2 days for times close to the maximum range of my_time_t
   - Improve comment about why we need my_time_t
   - Patch will also fix timezone2.test

  include/my_time.h@1.16.1.3, 2007-02-23 17:33:11+01:00, msvensson@pilot.blaudden +7 -1
    Improve comment for my_time_t, especially that we require
    it to be at least a 32bit unsigned type

  sql/tztime.cc@1.36.1.2, 2007-02-23 17:33:11+01:00, msvensson@pilot.blaudden +20 -3
    - Add assert in sec_since_epoch to guard it against broken down time
    values that would cause overflow in my_time_t on systems with 32 bit
    my_time_t
    - Avoid overflow in sec_since_epoch by "shifting" the broken down
    time back 2 days for times that are near the max value.c

ChangeSet@1.2417.1.5, 2007-02-23 16:51:13+01:00, msvensson@pilot.blaudden +1 -0
  Link comp_err with zlib

  extra/CMakeLists.txt@1.4, 2007-02-23 16:51:11+01:00, msvensson@pilot.blaudden +1 -1
    Link comp_err with zlib

ChangeSet@1.2341.86.1, 2007-02-23 15:32:51+01:00, gbichot@dl145h.mysql.com +2 -0
  the fix for BUG#24432
    "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values"
  didn't make it into 5.0.36 and 5.1.16,
  so we need to adjust the bug-detection-based-on-version-number code.
  Because the rpl tree has a too old version, rpl_insert_id cannot pass,
  so I disable it (like is already the case in 5.1-rpl for the same reason),
  and the repl team will re-enable it when they merge 5.0 and 5.1 into
  their trees (thus getting the right version number).

  mysql-test/t/disabled.def@1.39.1.1, 2007-02-23 15:26:32+01:00, gbichot@dl145h.mysql.com +1 -0
        rpl_insert_id tests statement-based replication of INSERT ON
        DUPLICATE KEY UPDATE. This type of INSERT had BUG#24432, which is
        fixed in 5.0.38; we made the slave detect if it is connected to a
        <5.0.38 master and if so refuse to replicate.
        The problem is that this 5.0-rpl tree, even though it will produce
        the 5.0.38 release, still has a 5.0.36 version in configure.in.
        Thus rpl_insert_id fails. So I disable it. As soon as the 5.0-rpl
        tree gets the changesets from the main 5.0, its version will change
        to 5.0.38 and so the repl team will re-enable the test.

  sql/slave.cc@1.286.4.2, 2007-02-23 15:28:39+01:00, gbichot@dl145h.mysql.com +2 -2
    the fix for BUG#24432 didn't make it into 5.0.36 and 5.1.16,
    so we need to adjust the bug-detection-based-on-version-number code.

ChangeSet@1.2406.1.1, 2007-02-23 10:28:50+01:00, msvensson@pilot.blaudden +3 -0
  Bug#25197 repeat function returns null when using table field directly as count
   - Return empty string also if count is unsigned and value is 0

  mysql-test/r/func_str.result@1.127, 2007-02-23 10:28:49+01:00, msvensson@pilot.blaudden +14 -0
    Update test result

  mysql-test/t/func_str.test@1.100, 2007-02-23 10:28:49+01:00, msvensson@pilot.blaudden +22 -0
    Add test case for using an unsigned value as count parameter
    for REPEAT

  sql/item_strfunc.cc@1.292.4.1, 2007-02-23 10:28:49+01:00, msvensson@pilot.blaudden +3 -1
    The repeat function should return the emptystring if
    count is unsigned and equal to zero or
    count is signed and less than or equal to zero

ChangeSet@1.2413.9.2, 2007-02-22 20:20:49+02:00, monty@mysql.com +2 -0
  Portability fix
  Suppress compiler warnings from bdb and (for the moment) warnings from ndb

  client/mysqltest.c@1.277, 2007-02-22 20:20:47+02:00, monty@mysql.com +1 -1
    Portability fix for windows (windows doesn't have mode_t)

  support-files/compiler_warnings.supp@1.5, 2007-02-22 20:20:48+02:00, monty@mysql.com +14 -0
    Suppress warnings from bdb and (for the moment) warnings from ndb

ChangeSet@1.2413.10.2, 2007-02-22 17:53:41+01:00, msvensson@pilot.blaudden +1 -0
  Bug#24617  	Typo in Czech translation

  sql/share/errmsg.txt@1.75.2.2, 2007-02-22 17:53:39+01:00, msvensson@pilot.blaudden +1 -1
    Add the missing "d"

ChangeSet@1.2413.10.1, 2007-02-22 16:41:51+01:00, msvensson@pilot.blaudden +3 -0
  Bug #26571  	Different format specifiers in errmsg.txt
  - Add check of format specifiers in error message strings
  - Update error message text accordingly to be equal between all translations

  extra/Makefile.am@1.38, 2007-02-22 16:41:49+01:00, msvensson@pilot.blaudden +2 -1
    comp_err uses my_cheksum, link with zlib

  extra/comp_err.c@1.25.2.1, 2007-02-22 16:41:49+01:00, msvensson@pilot.blaudden +119 -0
    Add check of format specifiers in error message strings

  sql/share/errmsg.txt@1.75.2.1, 2007-02-22 16:41:49+01:00, msvensson@pilot.blaudden +540 -540
    Update error messages after checks
    ---
    Remove the newly added space in error message, should not be there

ChangeSet@1.2413.9.1, 2007-02-22 16:59:57+02:00, monty@mysql.com +43 -0
  Fixed compiler warnings (for linux and win32 and win64)
  Fixed a couple of usage of not initialized warnings (unlikely cases)

  client/mysqldump.c@1.257, 2007-02-22 16:59:54+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings from 'max' build

  client/mysqltest.c@1.276, 2007-02-22 16:59:54+02:00, monty@mysql.com +9 -8
    Removed compiler warnings

  cmd-line-utils/readline/xmalloc.c@1.8, 2007-02-22 16:59:54+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings from 'max' build

  extra/comp_err.c@1.25.1.1, 2007-02-22 16:59:54+02:00, monty@mysql.com +4 -0
    Fixed compiler warnings from 'max' build

  extra/yassl/include/openssl/ssl.h@1.21, 2007-02-22 16:59:54+02:00, monty@mysql.com +6 -2
    Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit

  extra/yassl/include/socket_wrapper.hpp@1.11, 2007-02-22 16:59:54+02:00, monty@mysql.com +2 -4
    Moved socket_t to ssl.h, to be able to removed compiler warnings on windows 64 bit

  extra/yassl/src/ssl.cpp@1.26, 2007-02-22 16:59:54+02:00, monty@mysql.com +1 -1
    Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit

  extra/yassl/taocrypt/src/integer.cpp@1.29, 2007-02-22 16:59:54+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  include/my_global.h@1.136, 2007-02-22 16:59:54+02:00, monty@mysql.com +15 -0
    Added my_offsetof() macro from 5.1 to get rid of compiler warnings

  innobase/include/ut0byte.ic@1.5, 2007-02-22 16:59:54+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings on win64

  innobase/include/ut0ut.ic@1.4, 2007-02-22 16:59:54+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings on win64

  libmysql/libmysql.def@1.45, 2007-02-22 16:59:54+02:00, monty@mysql.com +0 -1
    Fixed compiler warnings on win64

  myisam/mi_packrec.c@1.42, 2007-02-22 16:59:54+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings on win64

  myisam/myisamchk.c@1.125, 2007-02-22 16:59:54+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings from 'max' build

  mysys/base64.c@1.15, 2007-02-22 16:59:54+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings on win64

  mysys/mf_keycache.c@1.61, 2007-02-22 16:59:54+02:00, monty@mysql.com +4 -1
    Fixed compiler warnings from 'max' build

  mysys/my_getopt.c@1.62, 2007-02-22 16:59:54+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings from 'max' build

  mysys/my_init.c@1.48, 2007-02-22 16:59:54+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings from 'max' build

  mysys/my_thr_init.c@1.40.1.1, 2007-02-22 16:59:54+02:00, monty@mysql.com +3 -3
    Fixed compiler warnings

  mysys/ptr_cmp.c@1.8, 2007-02-22 16:59:54+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings from 'max' build

  ndb/include/kernel/signaldata/DictTabInfo.hpp@1.24, 2007-02-22 16:59:54+02:00, monty@mysql.com +5 -5
    Fixed compiler warnings

  server-tools/instance-manager/mysql_connection.cc@1.19, 2007-02-22 16:59:54+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  server-tools/instance-manager/mysqlmanager.cc@1.19.1.1, 2007-02-22 16:59:54+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  sql/filesort.cc@1.116, 2007-02-22 16:59:55+02:00, monty@mysql.com +1 -1
    Initalize variable that was used unitialized in error conditions

  sql/ha_berkeley.cc@1.166, 2007-02-22 16:59:55+02:00, monty@mysql.com +10 -0
    Moved get_auto_primary_key() here as int5store() gives (wrong) compiler warnings in win64

  sql/ha_berkeley.h@1.81, 2007-02-22 16:59:55+02:00, monty@mysql.com +1 -7
    Moved get_auto_primary_key() to ha_berkeley.cc

  sql/ha_innodb.cc@1.308, 2007-02-22 16:59:55+02:00, monty@mysql.com +6 -3
    Fixed compiler warnings

  sql/item.cc@1.250, 2007-02-22 16:59:55+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings from 'max' build

  sql/item_timefunc.cc@1.141, 2007-02-22 16:59:55+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  sql/mysqld.cc@1.589, 2007-02-22 16:59:55+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  sql/sql_acl.cc@1.217, 2007-02-22 16:59:55+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings from 'max' build

  sql/sql_base.cc@1.365.1.1, 2007-02-22 16:59:55+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings from 'max' build

  sql/sql_insert.cc@1.216, 2007-02-22 16:59:55+02:00, monty@mysql.com +1 -0
    Initialize variable that may be used unitialized on error conditions (not fatal)

  sql/sql_prepare.cc@1.194, 2007-02-22 16:59:55+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings from 'max' build

  sql/sql_select.cc@1.493, 2007-02-22 16:59:55+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  sql/sql_show.cc@1.341, 2007-02-22 16:59:55+02:00, monty@mysql.com +4 -3
    Fixed compiler warnings

  sql/udf_example.def@1.3, 2007-02-22 16:59:55+02:00, monty@mysql.com +0 -1
    Fixed compiler warnings on win64

  sql/unireg.cc@1.83, 2007-02-22 16:59:55+02:00, monty@mysql.com +3 -0
    Initialize variable that may be used unitialized on error conditions

  strings/ctype-ucs2.c@1.65, 2007-02-22 16:59:55+02:00, monty@mysql.com +4 -1
    Fixed compiler warnings

  strings/ctype-utf8.c@1.105, 2007-02-22 16:59:55+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings

  strings/decimal.c@1.77, 2007-02-22 16:59:55+02:00, monty@mysql.com +3 -0
    Fixed compiler warnings

  support-files/compiler_warnings.supp@1.4, 2007-02-22 16:59:56+02:00, monty@mysql.com +8 -0
    Ignore warnings from sql_yacc.cc that are hard to remove
    Ignore some not important warnings from windows 64 bit build

  tools/mysqlmanager.c@1.50, 2007-02-22 16:59:56+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings

ChangeSet@1.2216.70.50, 2007-02-22 15:31:21+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#26481 - fix of bug fix 5.0 version

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.97.2.3, 2007-02-22 15:31:19+01:00, jonas@perch.ndb.mysql.com +7 -4
    ndb - bug#26481 - fix of bug fix 5.0 version

ChangeSet@1.2377.43.1, 2007-02-22 14:11:01+01:00, mhansson@linux-st28.site +2 -0
  Bug #24010: INSERT INTO ... SELECT fails on unique constraint with data 
  it doesn't select.
  
  This bug was fixed along with bug #16861: User defined variable can 
  have a wrong value if a tmp table was used.
  
  There the fix consisted of Item_func_set_user_var overloading the method
  Item::save_in_field. Consider the query from the test case:
  
  
  INSERT INTO foo( bar, baz )
  SELECT 
    bar,
    @newBaz := 1 + baz
  FROM 
    foo
  WHERE 
    quux <= 0.1;
  
  Here the assignment expression '@newBaz := 1 + baz' is represented by an 
  Item_func_set_user_var. Its member method save_in_field, which writes the 
  value of this assignment into the result field, writes the val_xxx() value, 
  which is not updated at this point. In the fix introduced by the patch,
  the save_in_field method reads the actual variable value instead.
  
  See also comment for 
  ChangeSet@1.2368.1.3, 2007-01-09 23:24:56+03:00, evgen@moonbone.local +4 -0
  and comment for
  Item_func_set_user_var::save_in_field (item_func.cc)

  mysql-test/r/update.result@1.32, 2007-02-22 14:11:00+01:00, mhansson@linux-st28.site +19 -0
    BUG#24010
    The correct, and expected, result

  mysql-test/t/update.test@1.30, 2007-02-22 14:11:00+01:00, mhansson@linux-st28.site +26 -0
    BUG#24010
    The test case for this bug. When the bug is active, the INSERT ... SELECT 
    statement will try to insert the values <1, 2> which gives an error

ChangeSet@1.2417.1.3, 2007-02-22 15:28:42+03:00, kaa@polly.local +1 -0
  Force the server restart before running mysqlbinlog-cp932.test to fix PB failures introduced by the patch for bug #18743.

  mysql-test/t/mysqlbinlog-cp932-master.opt@1.1, 2007-02-22 15:28:39+03:00, kaa@polly.local +1 -0
    New BitKeeper file ``mysql-test/t/mysqlbinlog-cp932-master.opt''

  mysql-test/t/mysqlbinlog-cp932-master.opt@1.0, 2007-02-22 15:28:39+03:00, kaa@polly.local +0 -0

ChangeSet@1.2377.42.1, 2007-02-21 23:00:32+03:00, evgen@moonbone.local +11 -0
  Bug#23800: Outer fields in correlated subqueries is used in a temporary table
  created for sorting.
  
  Any outer reference in a subquery was represented by an Item_field object.
  If the outer select employs a temporary table all such fields should be
  replaced with fields from that temporary table in order to point to the 
  actual data. This replacement wasn't done and that resulted in a wrong
  subquery evaluation and a wrong result of the whole query.
  
  Now any outer field is represented by two objects - Item_field placed in the
  outer select and Item_outer_ref in the subquery. Item_field object is
  processed as a normal field and the reference to it is saved in the
  ref_pointer_array. Thus the Item_outer_ref is always references the correct
  field. The original field is substituted for a reference in the
  Item_field::fix_outer_field() function.
  
  New function called fix_inner_refs() is added to fix fields referenced from
  inner selects and to fix references (Item_ref objects) to these fields.
  
  The new Item_outer_ref class is a descendant of the Item_direct_ref class.
  It additionally stores a reference to the original field and designed to
  behave more like a field.

  mysql-test/r/subselect.result@1.172.1.1, 2007-02-21 22:59:50+03:00, evgen@moonbone.local +51 -9
    Added a test case for bug#23800: Correlated sub query returning incorrect results when
    operated upon.

  mysql-test/r/subselect3.result@1.5, 2007-02-21 22:59:51+03:00, evgen@moonbone.local +11 -11
    Corrected test cases result after fix for bug#23800: Correlated sub query returning
    incorrect results when operated upon.

  mysql-test/t/subselect.test@1.139.1.1, 2007-02-21 22:59:51+03:00, evgen@moonbone.local +28 -1
    Added a test case for bug#23800: Correlated sub query returning incorrect results when
    operated upon.

  sql/item.cc@1.245.10.1, 2007-02-21 22:59:45+03:00, evgen@moonbone.local +71 -9
    Bug#23800: Correlated sub query returning incorrect results when operated upon.
    Now all outer fields are substituted with references to them (Item_outer_ref objects)
    in the Item_field::fix_outer_field() function.
    The original field is saved in the Item_outer_ref object.

  sql/item.h@1.213.5.1, 2007-02-21 22:59:48+03:00, evgen@moonbone.local +37 -3
    Bug#23800: Correlated sub query returning incorrect results when operated upon.
    Added the Item_outer_ref class.

  sql/mysql_priv.h@1.429.7.3, 2007-02-21 22:59:48+03:00, evgen@moonbone.local +2 -0
    Bug#23800: Correlated sub query returning incorrect results when operated upon.
    Added the fix_inner_refs() function prototype.

  sql/sql_delete.cc@1.192, 2007-02-21 22:59:49+03:00, evgen@moonbone.local +6 -0
    Bug#23800: Correlated sub query returning incorrect results when operated upon.
    Added call to the fix_inner_refs() function.

  sql/sql_lex.cc@1.209.3.1, 2007-02-21 23:00:04+03:00, evgen@moonbone.local +1 -0
    Bug#23800: Correlated sub query returning incorrect results when operated upon.
    Added cleanup of the inner_refs_list.

  sql/sql_lex.h@1.233.5.1, 2007-02-21 23:00:14+03:00, evgen@moonbone.local +2 -1
    Bug#23800: Correlated sub query returning incorrect results when operated upon.
    The inner_refs_list is added to the SELECT_LEX class.

  sql/sql_select.cc@1.488.2.2, 2007-02-21 22:59:49+03:00, evgen@moonbone.local +76 -7
    Bug#23800: Correlated sub query returning incorrect results when operated upon.
    The new function called fix_inner_refs() is added.

  sql/sql_update.cc@1.205.1.8, 2007-02-21 22:59:50+03:00, evgen@moonbone.local +5 -0
    Bug#23800: Correlated sub query returning incorrect results when operated upon.
    Added call to the fix_inner_refs() function.

ChangeSet@1.2413.7.2, 2007-02-21 19:38:40+02:00, monty@mysql.com +18 -0
  After merge fixes
  This also fixes a bug in counting number of rows that are updated when we have many simultanous queries

  extra/yassl/src/ssl.cpp@1.25, 2007-02-21 19:38:38+02:00, monty@mysql.com +1 -1
    Removed compiler warning

  extra/yassl/taocrypt/src/asn.cpp@1.14, 2007-02-21 19:38:38+02:00, monty@mysql.com +0 -2
    After merge fixes

  extra/yassl/testsuite/testsuite.cpp@1.7, 2007-02-21 19:38:38+02:00, monty@mysql.com +2 -2
    Removed compiler warning

  mysql-test/r/ndb_lock.result@1.14, 2007-02-21 19:38:38+02:00, monty@mysql.com +1 -1
    After merge fixes

  ndb/src/common/debugger/EventLogger.cpp@1.30.1.1, 2007-02-21 19:38:38+02:00, monty@mysql.com +3 -0
    Removed compiler warning

  ndb/src/common/util/ConfigValues.cpp@1.14, 2007-02-21 19:38:38+02:00, monty@mysql.com +0 -2
    Removed compiler warning

  ndb/src/common/util/NdbSqlUtil.cpp@1.35, 2007-02-21 19:38:38+02:00, monty@mysql.com +0 -2
    Removed compiler warning

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.103.1.1, 2007-02-21 19:38:38+02:00, monty@mysql.com +0 -3
    Removed compiler warning

  ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp@1.15, 2007-02-21 19:38:38+02:00, monty@mysql.com +0 -2
    Removed compiler warning

  ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp@1.8, 2007-02-21 19:38:38+02:00, monty@mysql.com +0 -2
    Removed compiler warning

  ndb/src/kernel/vm/ndbd_malloc.cpp@1.3, 2007-02-21 19:38:38+02:00, monty@mysql.com +2 -0
    Removed compiler warning

  ndb/src/mgmclient/main.cpp@1.25, 2007-02-21 19:38:38+02:00, monty@mysql.com +0 -2
    Removed compiler warning

  ndb/src/ndbapi/SignalSender.cpp@1.11, 2007-02-21 19:38:38+02:00, monty@mysql.com +0 -8
    Removed compiler warning

  sql/ha_ndbcluster.cc@1.297, 2007-02-21 19:38:38+02:00, monty@mysql.com +3 -0
    Some extra safety

  sql/item_cmpfunc.cc@1.236, 2007-02-21 19:38:39+02:00, monty@mysql.com +1 -1
    After merge fixes

  sql/item_subselect.cc@1.151.1.2, 2007-02-21 19:38:39+02:00, monty@mysql.com +4 -5
    After merge fixes

  sql/sql_insert.cc@1.215, 2007-02-21 19:38:39+02:00, monty@mysql.com +1 -1
    After merge fixes
    (This actually fixes a bug in old code when many connections are in use)

  support-files/compiler_warnings.supp@1.3, 2007-02-21 19:38:39+02:00, monty@mysql.com +2 -10
    Removed some suppressed warnings

ChangeSet@1.2216.70.49, 2007-02-21 18:01:04+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    Make StartREDO come up as default in cluster log

  ndb/src/common/debugger/EventLogger.cpp@1.27.1.1, 2007-02-21 18:01:02+01:00, jonas@perch.ndb.mysql.com +1 -1
    Make StartREDO come up as default in cluster log

ChangeSet@1.2216.70.48, 2007-02-21 18:00:12+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#26515
    make sure logPartPtr is correctly initialized

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.97.2.2, 2007-02-21 18:00:10+01:00, jonas@perch.ndb.mysql.com +4 -0
    fix bug#26515
      make sure logPartPtr is correctly initialized

ChangeSet@1.2377.5.5, 2007-02-21 13:02:57+02:00, monty@mysql.com +5 -0
  Fixed unsafe define of uint4korr()
  Fixed that --extern works with mysql-test-run.pl
  Small trivial cleanups

  include/my_global.h@1.134, 2007-02-21 13:02:55+02:00, monty@mysql.com +1 -1
    Fixed unsafe define of uint4korr()

  mysql-test/lib/mtr_report.pl@1.35, 2007-02-21 13:02:55+02:00, monty@mysql.com +4 -2
    Removed wrong messages when using --extern

  mysql-test/mysql-test-run.pl@1.190.2.1, 2007-02-21 13:02:55+02:00, monty@mysql.com +99 -80
    Fixed that --extern works
    Print help on stdout instead of stderr (make it easier to pipe it to less)

  mysql-test/t/ndb_lock.test@1.16, 2007-02-21 13:02:55+02:00, monty@mysql.com +1 -1
    Added other possible error code

  sql/sql_prepare.cc@1.192, 2007-02-21 13:02:55+02:00, monty@mysql.com +2 -2
    Removed not needed casts

ChangeSet@1.1616.2969.6, 2007-02-21 14:45:19+04:00, ramil@mysql.com +6 -0
  Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL
  
  Having maybe_null flag unset for geometry/spatial functions leads to
  wrong Item_func_isnull::val_int()'s results.
  Fix: set maybe_null flag and add is_null() methods.

  mysql-test/r/gis.result@1.15.1.9, 2007-02-21 14:45:18+04:00, ramil@mysql.com +43 -1
    Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL
      - test result.

  mysql-test/t/gis.test@1.17.1.5, 2007-02-21 14:45:18+04:00, ramil@mysql.com +35 -1
    Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL
      - test case.

  sql/item_geofunc.cc@1.18.1.7, 2007-02-21 14:45:18+04:00, ramil@mysql.com +17 -12
    Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL
      - set maybe_null flag for Item_geometry_func and Item_func_as_wkt.
      - moved length check to the beginnig of the 
        Item_func_spatial_collection::val_str() to affect geometry 
        collection objects at once.
      - changed Item_func_isempty::val_int() and Item_func_issimple::val_int()
        to properly handle null_value.

  sql/item_geofunc.h@1.8.1.3, 2007-02-21 14:45:18+04:00, ramil@mysql.com +32 -5
    Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL
      - set maybe_null flag for geometry/spatial functions.
      - added is_null() to Item_geometry_func and Item_func_spatial_rel
        classes.

  sql/spatial.cc@1.19.2.1, 2007-02-21 14:45:18+04:00, ramil@mysql.com +7 -6
    Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL
      - changed return type of Geometry::create_from_wkb() to be 
        consistent with Geometry::create_from_wkt(), now it returns
        Geometry object or NULL in case of error.

  sql/spatial.h@1.12.1.5, 2007-02-21 14:45:18+04:00, ramil@mysql.com +2 -2
    Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL
      - changed return type of Geometry::create_from_wkb() to be 
        consistent with Geometry::create_from_wkt(), now it returns
        Geometry object or NULL in case of error.

ChangeSet@1.2413.5.4, 2007-02-20 22:31:50+03:00, anozdrin@alik.opbmk +7 -0
  Fix for BUG#24415: Instance manager test im_daemon_life_cycle fails randomly.
  
  The cause of im_daemon_life_cycle.imtest random failures was the following
  behaviour of some implementations of LINUX threads: let's suppose that a
  process has several threads (in LINUX threads, there is a separate process for
  each thread). When the main process gets killed, the parent receives SIGCHLD
  before all threads (child processes) die. In other words, the parent receives
  SIGCHLD, when its child is not completely dead.
  
  In terms of IM, that means that IM-angel receives SIGCHLD when IM-main is not dead
  and still holds some resources. After receiving SIGCHLD, IM-angel restarts
  IM-main, but IM-main failed to initialize, because previous instance (copy) of
  IM-main still holds server socket (TCP-port).
  
  Another problem here was that IM-angel restarted IM-main only if it was killed
  by signal. If it exited with error, IM-angel thought it's intended / graceful
  shutdown and exited itself.
  
  So, when the second instance of IM-main failed to initialize, IM-angel thought
  it's intended shutdown and quit.
  
  The fix is
    1. to change IM-angel so that it restarts IM-main if it exited with error code;
    2. to change IM-main so that it returns proper exit code in case of failure.

  mysql-test/t/disabled.def@1.43, 2007-02-20 22:31:48+03:00, anozdrin@alik.opbmk +0 -1
    Enable im_daemon_life_cycle.

  server-tools/instance-manager/listener.cc@1.30, 2007-02-20 22:31:48+03:00, anozdrin@alik.opbmk +3 -0
    Set error status if Listener failed to initialize.

  server-tools/instance-manager/manager.cc@1.39, 2007-02-20 22:31:48+03:00, anozdrin@alik.opbmk +9 -5
    Return exit code from the manager.

  server-tools/instance-manager/manager.h@1.8, 2007-02-20 22:31:48+03:00, anozdrin@alik.opbmk +1 -1
    Return exit code from the manager.

  server-tools/instance-manager/mysqlmanager.cc@1.20, 2007-02-20 22:31:48+03:00, anozdrin@alik.opbmk +13 -15
    1. Restart IM-main if exit code is not EXIT_SUCCESS (0).
    2. Log IM-main exit code in case of failure.

  server-tools/instance-manager/thread_registry.cc@1.13, 2007-02-20 22:31:48+03:00, anozdrin@alik.opbmk +21 -0
    Add support for exit code.

  server-tools/instance-manager/thread_registry.h@1.9, 2007-02-20 22:31:48+03:00, anozdrin@alik.opbmk +4 -0
    Add support for exit code.

ChangeSet@1.2417.1.2, 2007-02-20 22:29:18+03:00, kaa@polly.local +1 -0
  Fixed the binlog numbering after changes introduced by patch for bug18743.

  mysql-test/t/mysqlbinlog.test@1.36.2.2, 2007-02-20 22:29:16+03:00, kaa@polly.local +3 -3
    Fixed the binlog numbering after changes introduced by patch for bug18743.

ChangeSet@1.2439, 2007-02-20 18:35:59+01:00, msvensson@pilot.blaudden +1 -0
  Use a temporary file to execute SQL commands with utf-8 chararcters

  mysql-test/t/rpl_temporary.test@1.23, 2007-02-20 18:35:58+01:00, msvensson@pilot.blaudden +8 -1
    Use a temporary file to execute SQL commands with utf-8 chararcters

ChangeSet@1.2438, 2007-02-20 18:22:33+01:00, msvensson@pilot.blaudden +1 -0
  Replace "exec diff" with diff_files

  mysql-test/t/mysql.test@1.24.1.4, 2007-02-20 18:22:32+01:00, msvensson@pilot.blaudden +1 -1
    Replace "exec diff" with diff_files

ChangeSet@1.1616.2967.15, 2007-02-20 18:20:58+01:00, msvensson@pilot.blaudden +2 -0
  Add "diff_files" command to mysqltest

  client/mysqltest.c@1.92.21.48, 2007-02-20 18:20:57+01:00, msvensson@pilot.blaudden +75 -1
    Add "diff_files" command to mysqltest

  mysql-test/t/mysqltest.test@1.3.1.25, 2007-02-20 18:20:57+01:00, msvensson@pilot.blaudden +35 -0
    Add "diff_files" command to mysqltest

ChangeSet@1.2413.6.1, 2007-02-20 16:50:54+01:00, bteam@mysql.com +1 -0
  Raise version number after cloning 5.0.36

  configure.in@1.427, 2007-02-20 16:50:44+01:00, bteam@mysql.com +2 -2
    Raise version number after cloning 5.0.36

ChangeSet@1.2425.1.2, 2007-02-20 16:24:38+01:00, msvensson@pilot.blaudden +5 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Part 2, add @@hostname system variable

  mysql-test/r/variables.result@1.91, 2007-02-20 16:24:37+01:00, msvensson@pilot.blaudden +8 -0
    Add testcase for @@hostname

  mysql-test/t/variables.test@1.66, 2007-02-20 16:24:37+01:00, msvensson@pilot.blaudden +11 -0
    Add testcase for @@hostname

  sql/log.cc@1.200.2.1, 2007-02-20 16:24:37+01:00, msvensson@pilot.blaudden +1 -1
    Use pidfile_name as base when generating the default log name

  sql/mysqld.cc@1.582.1.17, 2007-02-20 16:24:37+01:00, msvensson@pilot.blaudden +10 -4
    Init "glob_hostname" to that of hostname, fallback to "localhost"
    if 'gethostname' should fail.
    Init "pidfile_name" to hostname.pid and fallback to "mysql.pid" if
    'gethostname' should fail 

  sql/set_var.cc@1.176.1.4, 2007-02-20 16:24:37+01:00, msvensson@pilot.blaudden +6 -0
    Add new system variable "hostname"

ChangeSet@1.1616.2967.14, 2007-02-20 14:20:49+01:00, msvensson@pilot.blaudden +1 -0
  New version of 'do_cat_file' that will trim cr/lf to lf

  client/mysqltest.c@1.92.21.47, 2007-02-20 14:20:48+01:00, msvensson@pilot.blaudden +20 -3
    New version of 'do_cat_file' that will trim cr/lf to lf

ChangeSet@1.1616.2877.51, 2007-02-20 13:10:27+01:00, joerg@trift2. +1 -0
  After-merge fix:
  The declaration of "thr_client_alarm" had got lost, keep it in "mysys/thr_alarm.c".

  mysys/thr_alarm.c@1.44.2.6, 2007-02-20 13:10:25+01:00, joerg@trift2. +1 -0
    After-merge fix:
    In 4.1, the variable "thr_client_alarm" is declared in this module.

ChangeSet@1.2435, 2007-02-20 13:06:01+01:00, msvensson@pilot.blaudden +1 -0
  Change "exec echo" commands with different delimiters that are also
  escape chars to use "write_file" to avoid confusion about what's what.

  mysql-test/t/mysql.test@1.24.1.3, 2007-02-20 13:05:59+01:00, msvensson@pilot.blaudden +10 -4
    Change "exec echo" commands with different delimiters that are also
    escape chars to use "write_file" to avoid confusion about what's what.

ChangeSet@1.2425.1.1, 2007-02-20 12:48:15+01:00, msvensson@pilot.blaudden +4 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Add test of bootstrap mode
   - Make mysqld return error if bootstrap failed  

  mysql-test/mysql-test-run.pl@1.199, 2007-02-20 12:48:13+01:00, msvensson@pilot.blaudden +5 -2
    Remove options --skip-grant-tables as that is always
    turned on by --bootstrap
    Remove options --console as that does not affect --bootstrap mode
    at all
    Add environment variable MYSQLD_BOOTSTRAP_CMD containing path 
    to mysqld and the arguments used for bootstrap

  mysql-test/r/bootstrap.result@1.1, 2007-02-20 12:48:14+01:00, msvensson@pilot.blaudden +8 -0
    New BitKeeper file ``mysql-test/r/bootstrap.result''

  mysql-test/r/bootstrap.result@1.0, 2007-02-20 12:48:14+01:00, msvensson@pilot.blaudden +0 -0

  mysql-test/t/bootstrap.test@1.1, 2007-02-20 12:48:14+01:00, msvensson@pilot.blaudden +46 -0
    New BitKeeper file ``mysql-test/t/bootstrap.test''

  mysql-test/t/bootstrap.test@1.0, 2007-02-20 12:48:14+01:00, msvensson@pilot.blaudden +0 -0

  sql/sql_parse.cc@1.601.4.1, 2007-02-20 12:48:14+01:00, msvensson@pilot.blaudden +12 -1
    Abort bootstrap if execution fails
    Report error to stderr/log

ChangeSet@1.2434, 2007-02-20 12:06:04+01:00, msvensson@pilot.blaudden +1 -0
  Bug#25807 LOAD DATA INFILE does not work with Pipes
   - Additional fix for io_cache_init being called on a closed file

  mysys/mf_iocache.c@1.66, 2007-02-20 12:06:02+01:00, msvensson@pilot.blaudden +19 -15
    The file does not need to be open when init_io_cache is called
    so don't call my_tell in that case

ChangeSet@1.2413.3.2, 2007-02-20 10:01:54+01:00, istruewing@chilla.local +1 -0
  Fixed a bad merge. Got a duplicate symbol on OSX.

  mysys/my_thr_init.c@1.40, 2007-02-20 10:01:52+01:00, istruewing@chilla.local +0 -2
    Fixed a bad merge. Got a duplicate symbol on OSX.

ChangeSet@1.2216.70.47, 2007-02-20 00:55:33+01:00, jonas@perch.ndb.mysql.com +1 -0
  fix compile error in testBitfield

  ndb/test/ndbapi/testBitfield.cpp@1.11, 2007-02-20 00:55:32+01:00, jonas@perch.ndb.mysql.com +9 -0
    fix compile error in testBitfield

ChangeSet@1.2216.70.46, 2007-02-19 22:51:04+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - fix correct argv/argc handling in testBitfield

  ndb/test/ndbapi/testBitfield.cpp@1.10, 2007-02-19 22:51:02+01:00, jonas@perch.ndb.mysql.com +4 -3
    fix correct argv/argc handling in testBitfield

ChangeSet@1.2216.70.45, 2007-02-19 22:30:54+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    forgott to add testcase for bug#26481

  ndb/test/run-test/daily-basic-tests.txt@1.41.1.8, 2007-02-19 22:30:52+01:00, jonas@perch.ndb.mysql.com +4 -0
    forgott to add testcase for bug#26481

ChangeSet@1.1616.2967.13, 2007-02-19 20:34:12+01:00, msvensson@pilot.blaudden +1 -0
  Turn the "is_windows" flag _on_ when compiled on windows

  client/mysqltest.c@1.92.21.46, 2007-02-19 20:34:11+01:00, msvensson@pilot.blaudden +1 -1
    Turn the "is_windows" flag _on_ when compiled on windows

ChangeSet@1.2432, 2007-02-19 20:30:34+01:00, msvensson@pilot.blaudden +1 -0
  Remove extra ; at end of line

  mysql-test/t/mysqldump.test@1.110, 2007-02-19 20:30:33+01:00, msvensson@pilot.blaudden +4 -4
    Remove extra ; at end of line

ChangeSet@1.2216.70.44, 2007-02-19 20:13:08+01:00, jonas@perch.ndb.mysql.com +5 -0
  ndb - bug#26481
    fix for killed node during initial node restart

  ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.14.2.1, 2007-02-19 20:13:07+01:00, jonas@perch.ndb.mysql.com +1 -0
    add flag for initial node restart, to keep track on when to concider it to be "done"

  ndb/src/kernel/blocks/dbdih/DbdihInit.cpp@1.13.1.1, 2007-02-19 20:13:07+01:00, jonas@perch.ndb.mysql.com +1 -0
    add flag for initial node restart, to keep track on when to concider it to be "done"

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.55.1.13, 2007-02-19 20:13:07+01:00, jonas@perch.ndb.mysql.com +22 -0
    add flag for initial node restart, to keep track on when to concider it to be "done"

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.97.2.1, 2007-02-19 20:13:07+01:00, jonas@perch.ndb.mysql.com +2 -1
    Check cstartRecReq also when refusing GCP_SAVEREQ

  ndb/test/ndbapi/testNodeRestart.cpp@1.24.1.4, 2007-02-19 20:13:07+01:00, jonas@perch.ndb.mysql.com +43 -0
    add testcase

ChangeSet@1.2431, 2007-02-19 18:25:42+01:00, msvensson@pilot.blaudden +1 -0
  Remove unportable constructs in mysqldump.test

  mysql-test/t/mysqldump.test@1.109, 2007-02-19 18:25:41+01:00, msvensson@pilot.blaudden +14 -12
    Remove unportable constructs in mysqldump.test

ChangeSet@1.1616.2967.12, 2007-02-19 18:23:59+01:00, msvensson@pilot.blaudden +2 -0
  Commment out two test's thats just confusing for cmd.exe 

  mysql-test/r/mysqltest.result@1.3.1.19, 2007-02-19 18:23:58+01:00, msvensson@pilot.blaudden +0 -3
    Commment out two test's thats just confusing for cmd.exe 

  mysql-test/t/mysqltest.test@1.3.1.24, 2007-02-19 18:23:58+01:00, msvensson@pilot.blaudden +4 -4
    Commment out two test's thats just confusing for cmd.exe 

ChangeSet@1.1616.2967.11, 2007-02-19 18:19:47+01:00, msvensson@pilot.blaudden +3 -0
  Add cat_file command to mysqltest

  client/mysqltest.c@1.92.21.45, 2007-02-19 18:19:46+01:00, msvensson@pilot.blaudden +47 -1
    Add cat_file command to mysqltest

  mysql-test/r/mysqltest.result@1.3.1.18, 2007-02-19 18:19:46+01:00, msvensson@pilot.blaudden +4 -0
    Add cat_file command to mysqltest

  mysql-test/t/mysqltest.test@1.3.1.23, 2007-02-19 18:19:46+01:00, msvensson@pilot.blaudden +14 -0
    Add cat_file command to mysqltest

ChangeSet@1.2428, 2007-02-19 17:40:34+01:00, msvensson@pilot.blaudden +1 -0
  Use a temporary file to pass UTF8 chars to "mysql" in a portable
  way

  mysql-test/t/mysqlbinlog.test@1.36.1.1, 2007-02-19 17:40:33+01:00, msvensson@pilot.blaudden +9 -1
    Use a temporary file to pass UTF8 chars to "mysql" in a portable
    way

ChangeSet@1.1616.2967.10, 2007-02-19 16:39:50+01:00, msvensson@pilot.blaudden +2 -0
  Add "append_file" command to mysqltest

  client/mysqltest.c@1.92.21.44, 2007-02-19 16:39:49+01:00, msvensson@pilot.blaudden +90 -30
    Add "append_file" command to mysqltest

  mysql-test/t/mysqltest.test@1.3.1.22, 2007-02-19 16:39:49+01:00, msvensson@pilot.blaudden +19 -0
    Add "append_file" command to mysqltest

ChangeSet@1.2426, 2007-02-19 15:46:32+01:00, msvensson@pilot.blaudden +1 -0
  Replace "exec rm" with  remove_file and "exec touch" with "write_file"

  mysql-test/t/csv.test@1.10, 2007-02-19 15:46:30+01:00, msvensson@pilot.blaudden +4 -2
    Replace "exec rm" with  remove_file and "exec touch" with "write_file"

ChangeSet@1.2377.4.14, 2007-02-19 14:57:54+01:00, thek@kpdesk.mysql.com +4 -0
  Bug#23240 --init_file statements with NOW() reports '1970-01-01 11:00:00'as the date time
  
  - Starting time of a query sent by bootstrapping wasn't initialized
    and starting time defaulted to 0. This later used value by NOW-
    item and was translated to 1970-01-01 11:00:00.
  - Marketing the time with thd->set_time() before the call to
    mysql_parse resolves this issue.
  - set_time was refactored to be part of the thd->init_for_queries-
    process.

  mysql-test/r/init_file.result@1.3, 2007-02-19 14:57:52+01:00, thek@kpdesk.mysql.com +7 -0
    Manual merge from 4.1

  mysql-test/std_data/init_file.dat@1.8, 2007-02-19 14:57:52+01:00, thek@kpdesk.mysql.com +9 -0
    Manual merge from 4.1

  sql/sql_class.cc@1.256.3.1, 2007-02-19 14:57:52+01:00, thek@kpdesk.mysql.com +1 -0
    - Moved set_time into init_for_queries process.

  sql/sql_parse.cc@1.601.3.2, 2007-02-19 14:57:52+01:00, thek@kpdesk.mysql.com +1 -2
    Bug#23240 --init_file statements with NOW() reports '1970-01-01 11:00:00'as the date time
    
    - Starting time of a query sent by bootstrapping wasn't initialized
      and starting time defaulted to 0. This later used value by NOW-
      item and was translated to 1970-01-01 11:00:00.
    - Marketing the time with thd->set_time() before the call to
      mysql_parse resolves this issue.
    - set_time was refactored to be part of the thd->init_for_queries-
      process.

ChangeSet@1.2377.41.1, 2007-02-19 14:39:37+02:00, gkodinov@macbook.gmz +9 -0
  Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.
   Several problems fixed: 
    1. There was a "catch-all" context initialization in setup_tables()
      that was causing the table that we insert into to be visible in the 
      SELECT part of an INSERT .. SELECT .. statement with no tables in
      its FROM clause. This was making sure all the under-initialized
      contexts in various parts of the code are not left uninitialized.
      Fixed by removing the "catch-all" statement and initializing the 
      context in the parser.
    2. Incomplete name resolution context when resolving the right-hand
      values in the ON DUPLICATE KEY UPDATE ... part of an INSERT ... SELECT ...
      caused columns from NATURAL JOIN/JOIN USING table references in the
      FROM clause of the select to be unavailable.
      Fixed by establishing a proper name resolution context.
    3. When setting up the special name resolution context for problem 2
      there was no check for cases where an aggregate function without a
      GROUP BY effectively takes the column from the SELECT part of an 
      INSERT ... SELECT unavailable for ON DUPLICATE KEY UPDATE.
      Fixed by checking for that condition when setting up the name 
      resolution context.

  mysql-test/r/insert_update.result@1.21, 2007-02-19 14:39:24+02:00, gkodinov@macbook.gmz +17 -0
    Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.
     - test case

  mysql-test/t/insert_update.test@1.21, 2007-02-19 14:39:25+02:00, gkodinov@macbook.gmz +23 -0
    Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.
     - test case

  sql/item.h@1.213.4.1, 2007-02-19 14:39:25+02:00, gkodinov@macbook.gmz +6 -1
    Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.
     - save_next_local is not referenced any more outside class methods

  sql/sql_base.cc@1.364.1.1, 2007-02-19 14:39:26+02:00, gkodinov@macbook.gmz +2 -15
    Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.
     - removed a "catch-all" code to cater for correct context initialization

  sql/sql_help.cc@1.54, 2007-02-19 14:39:27+02:00, gkodinov@macbook.gmz +2 -0
    Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.
     - fixed the name resolution context initialization

  sql/sql_insert.cc@1.211.5.1, 2007-02-19 14:39:28+02:00, gkodinov@macbook.gmz +39 -38
    Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.
     - Fixed the context of resolving the values in INSERT SELECT ON UPDATE

  sql/sql_prepare.cc@1.187.4.1, 2007-02-19 14:39:29+02:00, gkodinov@macbook.gmz +8 -13
    Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.
     - Correct context for name resolution of prepared INSERT .. SELECT

  sql/sql_union.cc@1.134.1.3, 2007-02-19 14:39:30+02:00, gkodinov@macbook.gmz +2 -0
    Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.
     - fixed the name resolution context initialization

  sql/sql_yacc.yy@1.498.4.1, 2007-02-19 14:39:30+02:00, gkodinov@macbook.gmz +6 -1
    Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.
     - Set the context here instead of setup_tables()

ChangeSet@1.2425, 2007-02-19 13:21:06+01:00, msvensson@pilot.blaudden +1 -0
  Add echo.c as EXTRA_DIST file

  client/Makefile.am@1.64, 2007-02-19 13:21:04+01:00, msvensson@pilot.blaudden +1 -1
    Add echo.c as EXTRA_DIST file

ChangeSet@1.2422, 2007-02-19 12:03:42+01:00, msvensson@pilot.blaudden +2 -0
  Update for running with cmd.exe directly

  mysql-test/r/mysqltest.result@1.40.1.2, 2007-02-19 12:03:41+01:00, msvensson@pilot.blaudden +0 -2
    Update result file after removing one test

  mysql-test/t/mysqltest.test@1.49.1.3, 2007-02-19 12:03:41+01:00, msvensson@pilot.blaudden +35 -22
    Remove use of "ls" in system
    Rewrite "system echo" which introduces CR/LF problems
    with  "write_file"
    Remove test for end of line junk for "write_file" - it has mismatching number of "'s 

ChangeSet@1.1616.2967.9, 2007-02-19 12:00:17+01:00, msvensson@pilot.blaudden +1 -0
  Don't output escape char from 'do_eval' on windows. "It" won't 
  know it's an escape char.
  Replace /dev/null with NUL
  Replace "closed stdout" with "not open fd"

  client/mysqltest.c@1.92.21.43, 2007-02-19 12:00:16+01:00, msvensson@pilot.blaudden +20 -3
    Don't output escape char from 'do_eval' on windows. "It" won't 
    know it's an escape char.
    Replace /dev/null with NUL
    Replace "closed stdout" with "not open fd"

ChangeSet@1.2360.4.1, 2007-02-19 13:57:06+03:00, kaa@polly.local +19 -0
  Bug#18743: Several test cases fails if "classic" configuration in 5.0
  The problem happened because those tests were using "cp932" and "ucs2" without checking whether these character sets are available. This fix moves test parts to make character set specific parts be tested only if they are:
  - some parts were moved to "ctype_ucs.test" and "ctype_cp932.test"
  - some parts were moved to the newly added tests "innodb-ucs2.test", "mysqlbinglog-cp932.test" and "sp-ucs2.test"

  mysql-test/r/ctype_cp932.result@1.8.1.1, 2007-02-19 13:57:02+03:00, kaa@polly.local +10 -0
    Moved cp932-specific test case from mysql.test

  mysql-test/r/innodb-ucs2.result@1.1, 2007-02-19 13:57:03+03:00, kaa@polly.local +313 -0
    New BitKeeper file ``mysql-test/r/innodb-ucs2.result''

  mysql-test/r/innodb-ucs2.result@1.0, 2007-02-19 13:57:03+03:00, kaa@polly.local +0 -0

  mysql-test/r/innodb.result@1.163.1.1, 2007-02-19 13:57:02+03:00, kaa@polly.local +0 -312
    Moved ucs2-specific test cases to innodb-ucs2.test

  mysql-test/r/mysql.result@1.27, 2007-02-19 13:57:02+03:00, kaa@polly.local +0 -10
    Move cp932-specific test cases to ctype_cp932.test

  mysql-test/r/mysqlbinlog-cp932.result@1.1, 2007-02-19 13:57:03+03:00, kaa@polly.local +19 -0
    New BitKeeper file ``mysql-test/r/mysqlbinlog-cp932.result''

  mysql-test/r/mysqlbinlog-cp932.result@1.0, 2007-02-19 13:57:03+03:00, kaa@polly.local +0 -0

  mysql-test/r/mysqlbinlog.result@1.24.2.1, 2007-02-19 13:57:02+03:00, kaa@polly.local +2 -18
    Moved cp932-specific test case to mysqlbinlog-cp932.test

  mysql-test/r/sp-ucs2.result@1.1, 2007-02-19 13:57:03+03:00, kaa@polly.local +14 -0
    New BitKeeper file ``mysql-test/r/sp-ucs2.result''

  mysql-test/r/sp-ucs2.result@1.0, 2007-02-19 13:57:03+03:00, kaa@polly.local +0 -0

  mysql-test/r/sp.result@1.217.1.1, 2007-02-19 13:57:02+03:00, kaa@polly.local +0 -14
    Moved ucs2-specific test case to sp-ucs2.test

  mysql-test/t/ctype_cp932.test@1.10.1.1, 2007-02-19 13:57:02+03:00, kaa@polly.local +14 -0
    Moved cp932-specific test case from mysql.test

  mysql-test/t/ctype_ucs2_def-master.opt@1.4, 2007-02-19 13:57:02+03:00, kaa@polly.local +1 -1
    Use the comma-separated list of character sets to avoid mysql-test errors when ucs2 is not available in the server

  mysql-test/t/ctype_ucs2_def.test@1.4, 2007-02-19 13:57:02+03:00, kaa@polly.local +2 -0
    Added requirement for ucs2 in the server

  mysql-test/t/innodb-ucs2.test@1.1, 2007-02-19 13:57:03+03:00, kaa@polly.local +226 -0
    New BitKeeper file ``mysql-test/t/innodb-ucs2.test''

  mysql-test/t/innodb-ucs2.test@1.0, 2007-02-19 13:57:03+03:00, kaa@polly.local +0 -0

  mysql-test/t/innodb.test@1.134.1.2, 2007-02-19 13:57:02+03:00, kaa@polly.local +0 -222
    Moved ucs2-specific test cases to innodb-ucs2.test

  mysql-test/t/mysql.test@1.24.2.1, 2007-02-19 13:57:02+03:00, kaa@polly.local +0 -14
    Move cp932-specific test cases to ctype_cp932.test

  mysql-test/t/mysqlbinlog-cp932.test@1.1, 2007-02-19 13:57:03+03:00, kaa@polly.local +19 -0
    New BitKeeper file ``mysql-test/t/mysqlbinlog-cp932.test''

  mysql-test/t/mysqlbinlog-cp932.test@1.0, 2007-02-19 13:57:03+03:00, kaa@polly.local +0 -0

  mysql-test/t/mysqlbinlog.test@1.33.3.1, 2007-02-19 13:57:02+03:00, kaa@polly.local +3 -18
    Moved cp932-specific test case to mysqlbinlog-cp932.test

  mysql-test/t/sp-ucs2.test@1.1, 2007-02-19 13:57:03+03:00, kaa@polly.local +28 -0
    New BitKeeper file ``mysql-test/t/sp-ucs2.test''

  mysql-test/t/sp-ucs2.test@1.0, 2007-02-19 13:57:03+03:00, kaa@polly.local +0 -0

  mysql-test/t/sp.test@1.207.1.1, 2007-02-19 13:57:02+03:00, kaa@polly.local +2 -23
    Moved ucs2-specific test case to sp-ucs2.test

  sql/mysqld.cc@1.582.14.1, 2007-02-19 13:57:03+03:00, kaa@polly.local +27 -4
    Allow specifying several character sets for test purposes, to make "mysqld" start even if the character set being tested is not compiled:
    mysqld --default-character-set=ucs2,latin1
    The first available character set will be chosen.

ChangeSet@1.1616.2953.2, 2007-02-19 09:37:34+01:00, thek@kpdesk.mysql.com +4 -0
  Bug#23240 --init-file statements with NOW() reports '1970-01-01 11:00:00'as the date time
  
  - Starting time of a query sent by file bootstrapping wasn't initialized
    and starting time defaulted to 0. This later used value by the Now-
    item and is translated to 1970-01-01 11:00:00.
  - marking the time with thd->set_time() before the call to 
    mysql_parse resolves this issue.

  mysql-test/r/init_file.result@1.1.1.1, 2007-02-19 09:37:32+01:00, thek@kpdesk.mysql.com +7 -0
    Appended test case

  mysql-test/std_data/init_file.dat@1.3.2.1, 2007-02-19 09:37:32+01:00, thek@kpdesk.mysql.com +8 -0
    Appended test case

  mysql-test/t/init_file.test@1.6.1.2, 2007-02-19 09:37:32+01:00, thek@kpdesk.mysql.com +9 -0
    Appended test case

  sql/sql_parse.cc@1.271.132.1, 2007-02-19 09:37:32+01:00, thek@kpdesk.mysql.com +1 -0
    Bug#23240 --init-file statements with NOW() reports '1970-01-01 11:00:00'as the date time
    
    - Starting time of a query sent by file bootstrapping wasn't initialized
      and starting time defaulted to 0. This later used value by the Now-
      item and is translated to 1970-01-01 11:00:00.
    - marking the time with thd->set_time() before the call to 
      mysql_parse resolves this issue.

ChangeSet@1.2216.70.43, 2007-02-17 23:52:17+01:00, jonas@perch.ndb.mysql.com +6 -0
  ndb - bug#26457
    master failure during master take over

  ndb/src/kernel/blocks/ERROR_codes.txt@1.26, 2007-02-17 23:52:15+01:00, jonas@perch.ndb.mysql.com +3 -1
    new error code

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.55.1.12, 2007-02-17 23:52:15+01:00, jonas@perch.ndb.mysql.com +26 -1
    Make sure to clear NF_XX_LCP if master fails during master take-over

  ndb/test/include/NdbRestarter.hpp@1.5.1.1, 2007-02-17 23:52:15+01:00, jonas@perch.ndb.mysql.com +2 -0
    Add support for querying next master and node group
      (for multi node failure testing)

  ndb/test/ndbapi/testNodeRestart.cpp@1.24.1.3, 2007-02-17 23:52:15+01:00, jonas@perch.ndb.mysql.com +42 -0
    testcase

  ndb/test/run-test/daily-basic-tests.txt@1.41.1.7, 2007-02-17 23:52:15+01:00, jonas@perch.ndb.mysql.com +4 -0
    testcase

  ndb/test/src/NdbRestarter.cpp@1.12.1.1, 2007-02-17 23:52:15+01:00, jonas@perch.ndb.mysql.com +62 -0
    Add support for querying next master and node group
      (for multi node failure testing)

ChangeSet@1.2411.6.4, 2007-02-16 15:43:50-08:00, igor@olga.mysql.com +1 -0
  Adjusted results after fix for bug 25971.

  mysql-test/r/bdb.result@1.55, 2007-02-16 15:43:49-08:00, igor@olga.mysql.com +1 -1
    Adjusted results after fix for bug 25971.

ChangeSet@1.2411.6.3, 2007-02-16 14:30:25-08:00, igor@olga.mysql.com +1 -0
  Adjusted results after fix for bug 25971.

  mysql-test/r/bdb.result@1.54, 2007-02-16 14:30:23-08:00, igor@olga.mysql.com +1 -1
    Adjusted results after fix for bug 25971.

ChangeSet@1.2413.5.2, 2007-02-16 13:42:52-07:00, malff@weblab.(none) +4 -0
  Manual merge

  mysql-test/r/subselect.result@1.174, 2007-02-16 13:42:51-07:00, malff@weblab.(none) +125 -18
    Manual merge

  mysql-test/r/view.result@1.193, 2007-02-16 13:42:51-07:00, malff@weblab.(none) +121 -9
    Manual merge

  mysql-test/t/subselect.test@1.141, 2007-02-16 13:42:51-07:00, malff@weblab.(none) +93 -0
    Manual merge

  mysql-test/t/view.test@1.178, 2007-02-16 13:42:51-07:00, malff@weblab.(none) +89 -7
    Manual merge

ChangeSet@1.2216.70.42, 2007-02-16 18:20:24+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug in my.cnf handling on resize of vector
    backport fix from 5.1

  ndb/src/mgmsrv/InitConfigFileParser.cpp@1.26.2.1, 2007-02-16 18:20:23+01:00, jonas@perch.ndb.mysql.com +7 -6
    backport fix from 5.1

ChangeSet@1.2216.70.41, 2007-02-16 18:10:27+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#26454
    make lockpages=1 run a bit earlier in startup

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@1.32.1.1, 2007-02-16 18:10:25+01:00, jonas@perch.ndb.mysql.com +1 -1
    change order

ChangeSet@1.2377.40.1, 2007-02-16 19:39:28+03:00, evgen@moonbone.local +6 -0
  Bug#16630: The update fields of the INSERT .. SELECT .. ON DUPLICATE KEY
  UPDATE contains wrong data if the SELECT employs a temporary table.
  
  If the UPDATE values of the INSERT .. SELECT .. ON DUPLICATE KEY UPDATE
  statement contains fields from the SELECT part and the select employs a
  temporary table then those fields will contain wrong values because they
  aren't corrected to get data from the temporary table.
  
  The solution is to add these fields to the selects all_fields list,
  to store pointers to those fields in the selects ref_pointer_array and
  to access them via Item_ref objects.
  
  The substitution for Item_ref objects is done in the new function called 
  Item_field::update_value_transformer(). It is called through the
  item->transform() mechanism at the end of the select_insert::prepare()
  function.

  mysql-test/r/insert_select.result@1.45, 2007-02-16 19:38:47+03:00, evgen@moonbone.local +13 -0
    Added a test case for bug#16630: The update fields of the INSERT .. SELECT ..
    ON DUPLICATE KEY UPDATE contains wrong data if the SELECT employs a 
    temporary table.

  mysql-test/t/insert_select.test@1.37, 2007-02-16 19:38:50+03:00, evgen@moonbone.local +15 -0
    Added a test case for bug#16630: The update fields of the INSERT .. SELECT ..
    ON DUPLICATE KEY UPDATE contains wrong data if the SELECT employs a 
    temporary table.

  sql/item.cc@1.245.8.1, 2007-02-16 19:38:21+03:00, evgen@moonbone.local +45 -0
    Bug#16630: The update fields of the INSERT .. SELECT .. ON DUPLICATE KEY
    UPDATE contains wrong data if the SELECT employs a temporary table.
    The new method Item_field::update_value_transformer() is added. It
    substitutes fields in the update values list for references 
    (Item_ref objects) to them.

  sql/item.h@1.213.1.7, 2007-02-16 19:38:36+03:00, evgen@moonbone.local +2 -0
    Bug#16630: The update fields of the INSERT .. SELECT .. ON DUPLICATE KEY
    UPDATE contains wrong data if the SELECT employs a temporary table.
    The update_value_transformer() method is added to the Item and to the
    Item_field classes.

  sql/sql_insert.cc@1.211.3.4, 2007-02-16 19:38:40+03:00, evgen@moonbone.local +16 -0
    Bug#16630: The update fields of the INSERT .. SELECT .. ON DUPLICATE KEY
    UPDATE contains wrong data if the SELECT employs a temporary table.
    Traverse update values and substitute fields from the select for
    references (Item_ref objects) to them.

  sql/sql_select.cc@1.488.3.1, 2007-02-16 19:38:45+03:00, evgen@moonbone.local +3 -3
    Bug#16630: The update fields of the INSERT .. SELECT .. ON DUPLICATE KEY
    UPDATE contains wrong data if the SELECT employs a temporary table.
    Traverse update values and substitute fields from the select for
    references (Item_ref objects) to them.

ChangeSet@1.1346.893.4, 2007-02-16 16:31:31+01:00, joerg@trift2. +1 -0
  include/config-win.h  :  
  Companion change to this one
     ChangeSet@1.2206, 2007-01-22 02:32:07+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -0
       include/my_pthread.h@1.67, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +31 -10
  which renamed "sigset()" -> "my_sigset()" but forgot to do it for Windows ...
  TAG: mysql-4.0.30

  include/config-win.h@1.23.1.15, 2007-02-16 16:31:29+01:00, joerg@trift2. +1 -1
    Companion change to this one
       ChangeSet@1.2206, 2007-01-22 02:32:07+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -0
         include/my_pthread.h@1.67, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +31 -10
    which renamed "sigset()" -> "my_sigset()" but forgot to do it for Windows ...

ChangeSet@1.2421, 2007-02-16 16:08:08+01:00, msvensson@pilot.blaudden +1 -0
  Use " instead of ' to avoid win problem with '

  mysql-test/t/mysql.test@1.24.1.2, 2007-02-16 16:08:06+01:00, msvensson@pilot.blaudden +2 -2
    Use " instead of ' to avoid win problem with '

ChangeSet@1.2420, 2007-02-16 15:25:49+01:00, msvensson@pilot.blaudden +1 -0
  Add echo.c to be built on Windows

  client/CMakeLists.txt@1.5, 2007-02-16 15:25:48+01:00, msvensson@pilot.blaudden +2 -0
    Add echo.c to be built on Windows

ChangeSet@1.1616.2973.1, 2007-02-16 15:19:38+01:00, msvensson@neptunus.(none) +4 -0
  Workaround for problem where cygwin's bash/sh randomly fails with error 128 which 
  mainly occurs on win2003 64bit.
   - Execute "exec" commands directly with cmd.exe and replace "--exec echo ..." with "--exec .\echo.exe ..." 

  client/echo.c@1.1, 2007-02-16 15:19:35+01:00, msvensson@neptunus.(none) +45 -0
    New BitKeeper file ``client/echo.c''

  client/echo.c@1.0, 2007-02-16 15:19:35+01:00, msvensson@neptunus.(none) +0 -0

  client/mysqltest.c@1.92.25.1, 2007-02-16 15:19:35+01:00, msvensson@neptunus.(none) +84 -9
    Workaround the problem with "echo" in windows not behaving like "echo" in Unix.
    - Replace "--exec echo ..." with "--exec <path to mysqltest>\echo.exe" thus forcing
      use of our own echo implementation which baheves like on Unix.
    - The above change makes it possible to remove the need to execute all --exec's
      inside cygwin. Add ifdefs to only use use cygwin's bash conditionally  

  mysql-test/lib/mtr_misc.pl@1.5.1.6, 2007-02-16 15:19:35+01:00, msvensson@neptunus.(none) +11 -0
    Add function for converting to the OS's native format

  mysql-test/mysql-test-run.pl@1.8.20.3, 2007-02-16 15:19:35+01:00, msvensson@neptunus.(none) +21 -13
    Convert path to executables to "windows native" (c:\<path>\) instead of "mixed"(c:/<path>) mode
    necessary for pipes and redirects to work properly in cmd.exe

ChangeSet@1.2341.84.2, 2007-02-15 15:50:56+01:00, guilhem@gbichot3.local +2 -0
  Backport from the Falcon tree.
  When opening/creating the transaction coordinator's log, if binlog is
  used, the tc log is the binlog so we use the binlog's name; otherwise
  we use the mmap-based log, named after the mandatory argument of the
  --log-tc option (meant for that).

  sql/log.cc@1.200.1.1, 2007-02-15 15:50:54+01:00, guilhem@gbichot3.local +1 -1
    fixing wrong order of arguments to my_create()
    (3rd param is the desired modes of the file; "0" lead to no rights
    for anybody on the file).

  sql/mysqld.cc@1.582.7.5, 2007-02-15 15:50:54+01:00, guilhem@gbichot3.local +1 -1
    When opening/creating the transaction coordinator's log, if binlog is
    used, the tc log is the binlog so we use the binlog's name; otherwise
    we use the mmap-based log, named after the mandatory argument of the
    --log-tc option (meant for that).

ChangeSet@1.2341.84.1, 2007-02-15 15:39:03+01:00, guilhem@gbichot3.local +5 -0
  Fix for BUG#25507 "multi-row insert delayed + auto increment causes
  duplicate key entries on slave" (two concurrrent connections doing
  multi-row INSERT DELAYED to insert into an auto_increment column,
  caused replication slave to stop with "duplicate key error" (and
  binlog was wrong)), and BUG#26116 "If multi-row INSERT
  DELAYED has errors, statement-based binlogging breaks" (the binlog
  was not accounting for all rows inserted, or slave could stop).
  The fix is that: if (statement-based) binlogging is on, a multi-row
  INSERT DELAYED is silently converted to a non-delayed INSERT.
  Note: it is not possible to test BUG#25507 in 5.0 (requires mysqlslap),
  so it is tested only in the changeset for 5.1. However, BUG#26116
  is tested here, and the fix for BUG#25507 is the same code change.

  mysql-test/r/innodb-replace.result@1.3, 2007-02-15 15:39:01+01:00, guilhem@gbichot3.local +2 -2
    result update

  mysql-test/r/rpl_insert_delayed.result@1.1, 2007-02-15 15:39:01+01:00, guilhem@gbichot3.local +31 -0
    result. Master and slave match.

  mysql-test/r/rpl_insert_delayed.result@1.0, 2007-02-15 15:39:01+01:00, guilhem@gbichot3.local +0 -0

  mysql-test/t/innodb-replace.test@1.4, 2007-02-15 15:39:01+01:00, guilhem@gbichot3.local +2 -2
    now that multi-row delayed inserts are converted to normal inserts
    if the statement-based binlog is enabled,
    no error is issued even if this engine does not support INSERT DELAYED,
    as the insert does not go through the INSERT DELAYED code.
    To preserve the goal of this test, we change the statements to single-
    row inserts.

  mysql-test/t/rpl_insert_delayed.test@1.1, 2007-02-15 15:39:01+01:00, guilhem@gbichot3.local +67 -0
    Test for BUG#26116 (see if one error at first row on master makes the
    slave's data incorrect, see if one error at second row on master
    makes slave stop).

  mysql-test/t/rpl_insert_delayed.test@1.0, 2007-02-15 15:39:01+01:00, guilhem@gbichot3.local +0 -0

  sql/sql_insert.cc@1.211.4.2, 2007-02-15 15:39:01+01:00, guilhem@gbichot3.local +21 -0
    A multi-row INSERT DELAYED cannot be recorded to a statement-based
    binlog in a way that describes the insertions actually done;
    in that case we fallback to a non-delayed INSERT.

ChangeSet@1.2413.2.2, 2007-02-15 11:17:25+01:00, msvensson@pilot.mysql.com +1 -0
  Remove the newly added space in error message, should not be there

  sql/share/errmsg.txt@1.75.1.2, 2007-02-15 11:17:23+01:00, msvensson@pilot.mysql.com +1 -1
    Remove the newly added space in error message, should not be there

ChangeSet@1.2411.6.1, 2007-02-14 22:06:41-08:00, igor@olga.mysql.com +7 -0
  Fixed bug #25971: indexes on text columns were ignored when ref accesses
  were evaluated.
  According to the new rules for string comparison partial indexes on text
  columns can be used in the same cases when partial indexes on varchar
  columns can be used.

  mysql-test/r/endspace.result@1.11, 2007-02-14 22:06:38-08:00, igor@olga.mysql.com +1 -1
    Adjusted results after the fix for bug #25971.

  mysql-test/r/innodb.result@1.164, 2007-02-14 22:06:39-08:00, igor@olga.mysql.com +1 -1
    Adjusted results after the fix for bug #25971.

  mysql-test/r/myisam.result@1.98, 2007-02-14 22:06:39-08:00, igor@olga.mysql.com +1 -1
    Adjusted results after the fix for bug #25971.

  mysql-test/r/select.result@1.151, 2007-02-14 22:06:39-08:00, igor@olga.mysql.com +148 -0
    Added a test case for bug #25971.

  mysql-test/r/type_blob.result@1.53.1.1, 2007-02-14 22:06:39-08:00, igor@olga.mysql.com +2 -2
    Adjusted results after the fix for bug #25971.

  mysql-test/t/select.test@1.125, 2007-02-14 22:06:39-08:00, igor@olga.mysql.com +46 -0
    Added a test case for bug #25971.

  sql/sql_select.cc@1.490.1.1, 2007-02-14 22:06:39-08:00, igor@olga.mysql.com +1 -7
    Fixed bug #25971: indexes on text columns were ignored when ref accesses
    were evaluated.
    According to the new rules for string comparison partial indexes on text
    columns can be used in the same cases when partial indexes on varchar
    columns can be used.

ChangeSet@1.2413.2.1, 2007-02-14 19:31:06+01:00, msvensson@pilot.mysql.com +2 -0
  Add check of format specifiers in error message strings
  Update error message text accordingly to be equal between all translations

  extra/comp_err.c@1.26, 2007-02-14 19:31:02+01:00, msvensson@pilot.mysql.com +120 -0
    Add check of format specifiers in error message strings

  sql/share/errmsg.txt@1.75.1.1, 2007-02-14 19:31:03+01:00, msvensson@pilot.mysql.com +541 -541
    Update error messages after checks

ChangeSet@1.2411.5.1, 2007-02-14 18:35:59+02:00, gkodinov@macbook.gmz +3 -0
  Bug#19717: The blackhole engine is returning an OK flag in 
  index_read(), whereas it must return HA_ERR_END_OF_FILE
  instead (as there are by definition no rows in a table of 
  that engine.

  mysql-test/r/blackhole.result@1.11, 2007-02-14 18:35:52+02:00, gkodinov@macbook.gmz +11 -0
    Bug#19717: test case

  mysql-test/t/blackhole.test@1.9, 2007-02-14 18:35:53+02:00, gkodinov@macbook.gmz +15 -0
    Bug#19717: test case

  sql/ha_blackhole.cc@1.26, 2007-02-14 18:35:54+02:00, gkodinov@macbook.gmz +1 -1
    Bug#19717: return no rows instead of success.

ChangeSet@1.1616.2969.5, 2007-02-14 16:49:41+01:00, msvensson@pilot.mysql.com +1 -0
  Use my_vsnprintf instead of vsnprintf

  client/mysqltest.c@1.92.21.41, 2007-02-14 16:49:40+01:00, msvensson@pilot.mysql.com +1 -1
    Use my_vsnprintf instead of vsnprintf

ChangeSet@1.2385.7.2, 2007-02-14 14:44:34+01:00, msvensson@pilot.mysql.com +17 -0
  Bug#18628 mysql-test-run: security problem(part1)
   - Implement --secure-file-priv=<dir> option that limits
    "load_file", "LOAD DATA" and "SELECT .. INTO OUTFILE" to work 
    with files in specified dir.
   - Use above option for mysqld in mysql-test-run.pl 

  mysql-test/mysql-test-run.pl@1.191.1.1, 2007-02-14 14:44:30+01:00, msvensson@pilot.mysql.com +6 -0
    Add usage of --secure-file-priv=vardir when starting mysqld

  mysql-test/r/loaddata.result@1.25, 2007-02-14 14:44:30+01:00, msvensson@pilot.mysql.com +16 -0
    Update test result after adding test to check that secure-file-priv
    works for "load data" and "load_file"

  mysql-test/r/outfile.result@1.7, 2007-02-14 14:44:30+01:00, msvensson@pilot.mysql.com +6 -1
    Update result

  mysql-test/r/query_cache.result@1.78, 2007-02-14 14:44:30+01:00, msvensson@pilot.mysql.com +1 -1
    Can't load from outside of vardir anymore

  mysql-test/r/type_blob.result@1.54, 2007-02-14 14:44:30+01:00, msvensson@pilot.mysql.com +12 -12
    Can't load from outside of vardir anymore

  mysql-test/t/loaddata.test@1.19, 2007-02-14 14:44:30+01:00, msvensson@pilot.mysql.com +23 -0
    Update test result after adding test to check that secure-file-priv 
    works for "load data" and "load_file"

  mysql-test/t/outfile.test@1.15, 2007-02-14 14:44:30+01:00, msvensson@pilot.mysql.com +12 -0
    Update test result after adding test to check that secure-file-priv
    works for "SELECT .. INTO OUTFILE"

  mysql-test/t/query_cache.test@1.57, 2007-02-14 14:44:30+01:00, msvensson@pilot.mysql.com +2 -2
    Can't load from outside of vardir anymore

  mysql-test/t/type_blob.test@1.34, 2007-02-14 14:44:31+01:00, msvensson@pilot.mysql.com +13 -14
    Can't load from outside of vardir anymore

  sql/item_strfunc.cc@1.292.3.1, 2007-02-14 14:44:31+01:00, msvensson@pilot.mysql.com +5 -0
    Check that the path "load_file" uses for the file is within 
    what's specified with --secure-file-priv

  sql/mysql_priv.h@1.429.9.1, 2007-02-14 14:44:31+01:00, msvensson@pilot.mysql.com +1 -0
    Add secure_file_priv

  sql/mysqld.cc@1.582.13.1, 2007-02-14 14:44:31+01:00, msvensson@pilot.mysql.com +19 -1
    Add "--secure_file_priv"

  sql/set_var.cc@1.176.2.1, 2007-02-14 14:44:31+01:00, msvensson@pilot.mysql.com +4 -0
    Add variable "secure_file_priv" to "show variables"

  sql/share/errmsg.txt@1.76, 2007-02-14 14:44:32+01:00, msvensson@pilot.mysql.com +1 -1
    Fix swedish error message for ER_OPTION_PREVENTS_STATMENT wich was hardcoded
    to --skip-grant-tables

  sql/sql_class.cc@1.256.2.1, 2007-02-14 14:44:31+01:00, msvensson@pilot.mysql.com +10 -2
    Check that the path "load_file" uses for the file is within 
    what's specified with --secure-file-priv

  sql/sql_class.h@1.317.1.1, 2007-02-14 14:44:31+01:00, msvensson@pilot.mysql.com +1 -1
    Fix spelling error

  sql/sql_load.cc@1.102.1.3, 2007-02-14 14:44:31+01:00, msvensson@pilot.mysql.com +9 -0
    Check that the path "load_file" uses for the file is within 
    what's specified with --secure-file-priv

ChangeSet@1.2411.4.3, 2007-02-14 15:33:48+07:00, tomas@poseidon.mysql.com +2 -0
  ndb_config_4_node.ini, ndb_config_1_node.ini:
    new file

  mysql-test/ndb/ndb_config_1_node.ini@1.1, 2007-02-14 15:27:30+07:00, tomas@poseidon.mysql.com +43 -0

  mysql-test/ndb/ndb_config_1_node.ini@1.0, 2007-02-14 15:27:30+07:00, tomas@poseidon.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.0-ndb/mysql-test/ndb/ndb_config_1_node.ini

  mysql-test/ndb/ndb_config_4_node.ini@1.1, 2007-02-14 15:27:33+07:00, tomas@poseidon.mysql.com +52 -0

  mysql-test/ndb/ndb_config_4_node.ini@1.0, 2007-02-14 15:27:33+07:00, tomas@poseidon.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.0-ndb/mysql-test/ndb/ndb_config_4_node.ini

ChangeSet@1.2411.4.2, 2007-02-14 15:26:06+07:00, tomas@poseidon.mysql.com +4 -0
      backport some mysql-test ndbcluster things from 5.1
      remove compiler warning EventLogger.cpp
      Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
       - partial fix
       - object map to handle failed realloc
  

  mysql-test/ndb/ndb_config_2_node.ini@1.16, 2007-02-14 15:25:51+07:00, tomas@poseidon.mysql.com +10 -0
    backport some mysql-test ndbcluster things from 5.1

  mysql-test/ndb/ndbcluster.sh@1.48, 2007-02-14 15:25:51+07:00, tomas@poseidon.mysql.com +65 -32
    backport some mysql-test ndbcluster things from 5.1

  ndb/src/common/debugger/EventLogger.cpp@1.32, 2007-02-14 15:25:51+07:00, tomas@poseidon.mysql.com +2 -2
    remove compiler warning

  ndb/src/ndbapi/ObjectMap.hpp@1.10, 2007-02-14 15:25:52+07:00, tomas@poseidon.mysql.com +7 -6
    Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
     - partial fix
     - object map to handle failed realloc

ChangeSet@1.2377.38.3, 2007-02-14 15:16:26+07:00, tomas@poseidon.mysql.com +1 -0
  Bug #21033 Error 0 in readAutoIncrementValue()
  - do not call function if table has no autoincrement

  sql/ha_ndbcluster.cc@1.291.4.1, 2007-02-14 15:16:01+07:00, tomas@poseidon.mysql.com +1 -1
    Bug #21033 Error 0 in readAutoIncrementValue()
    - do not call function if table has no autoincrement

ChangeSet@1.2377.39.7, 2007-02-14 16:03:25+11:00, stewart@willster.(none) +25 -0
  BUG#26358  	remove unused and non-working SET_VAR_REQ/CONF signals
  
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)

  ndb/include/kernel/GlobalSignalNumbers.h@1.20, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +3 -3
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/common/debugger/signaldata/SignalNames.cpp@1.13, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -3
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@1.28.2.3, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -157
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp@1.7, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -5
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dbacc/Dbacc.hpp@1.25, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dbacc/DbaccInit.cpp@1.18, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@1.62, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -27
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.14.1.2, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dbdih/DbdihInit.cpp@1.15, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.65.1.1, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -24
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.41.1.2, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dblqh/DblqhInit.cpp@1.18, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.97.1.2, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -24
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp@1.36.1.3, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dbtc/DbtcInit.cpp@1.15, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.104, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -30
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.28.1.2, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dbtup/DbtupGen.cpp@1.22, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -28
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp@1.6.1.2, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp@1.11, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@1.34.1.2, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -17
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/qmgr/Qmgr.hpp@1.11.1.3, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/qmgr/QmgrInit.cpp@1.10, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@1.36.1.3, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -28
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/mgmsrv/MgmtSrvr.hpp@1.48.1.2, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

ChangeSet@1.2377.39.6, 2007-02-14 15:55:08+11:00, stewart@willster.(none) +4 -0
  BUG#26357  	remove unused GSN_STATISTICS_REQ and CONF
  
  remove GSN_STATISTICS_REQ and CONF
  
  These are unused and have been since BK import. not needed.

  ndb/include/kernel/GlobalSignalNumbers.h@1.19, 2007-02-14 15:55:06+11:00, stewart@willster.(none) +2 -2
    remove STATISTICS_REQ and CONF

  ndb/src/common/debugger/signaldata/SignalNames.cpp@1.12, 2007-02-14 15:55:06+11:00, stewart@willster.(none) +1 -3
    remove signal names for STATISTICS_REQ and CONF (unused)

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@1.28.2.2, 2007-02-14 15:55:06+11:00, stewart@willster.(none) +0 -19
    remove unused STATISTICS signals

  ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp@1.6, 2007-02-14 15:55:06+11:00, stewart@willster.(none) +0 -1
    remove unused STATISTICS signals

ChangeSet@1.2377.39.5, 2007-02-14 15:51:16+11:00, stewart@willster.(none) +1 -0
  BUG#26356  	uninitialised data sent from TAMPER_ORD to DIHNDBTAMPER
  
  Don't send uninit data in TAMPER_ORD to DIHNDBTAMPER
  
  Even though this data is unused from the CMVMI (mgmd) signal,
  we shouldn't be doing stuff with uninited data.

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@1.28.2.1, 2007-02-14 15:51:14+11:00, stewart@willster.(none) +1 -1
    init the 3rd word of DIHNDBTAMPER before sending to DIH.

ChangeSet@1.2377.39.4, 2007-02-14 15:47:34+11:00, stewart@willster.(none) +2 -0
  BUG#26355  	FIXME: use constant for max loglevel in ndb_mgmd

  ndb/include/mgmapi/mgmapi.h@1.55, 2007-02-14 15:47:33+11:00, stewart@willster.(none) +2 -0
    use constant for max log level in ndb_mgmd.
    
    (more useful in 5.1 due to other defines and refinements of mgmapi)

  ndb/src/mgmsrv/Services.cpp@1.72.1.3, 2007-02-14 15:47:33+11:00, stewart@willster.(none) +3 -5
    fix the XXX fixme of constant for max log level

ChangeSet@1.2377.39.3, 2007-02-14 15:35:29+11:00, stewart@willster.(none) +2 -0
  BUG#26353 remove GET_CONFIG_BACKWARDS_COMPAT from ndb_mgmd
  
  there is backwards compatibility for GET CONFIG style configuration requests in
  ndb_mgmd. None of the ndbd versions that use this couldn't possibly connect to a
  5.0 or 5.1 cluster. remove the backwards compat
  
  remove it

  ndb/src/mgmsrv/Services.cpp@1.72.1.2, 2007-02-14 15:35:27+11:00, stewart@willster.(none) +3 -83
    remove MGM_GET_CONFIG_BACKWARDS_COMPAT code.
    
    any client using GET CONFIG will just not work with modern NDB.

  ndb/src/mgmsrv/Services.hpp@1.23, 2007-02-14 15:35:27+11:00, stewart@willster.(none) +0 -9
    remove GET CONFIG support

ChangeSet@1.2377.39.2, 2007-02-14 15:28:04+11:00, stewart@willster.(none) +1 -0
  BUG#26352  	unused ndb_mgm_rep_command in mgmapi.cpp

  ndb/src/mgmapi/mgmapi.cpp@1.66.1.3, 2007-02-14 15:28:02+11:00, stewart@willster.(none) +0 -37
    remove ndb_mgm_rep_command function

ChangeSet@1.2377.39.1, 2007-02-14 15:22:03+11:00, stewart@willster.(none) +2 -0
  WL#3704 mgmapi timeouts (and cleanups)
  
  indicate units in SocketOutputStream timeout
  
  rename timeout in SocketOutputStream to reflect units (ms)
  
  In 5.0 as well as is safe cleanup patch that will help with merging.

  ndb/include/util/OutputStream.hpp@1.4.1.2, 2007-02-14 15:22:00+11:00, stewart@willster.(none) +3 -3
    rename timeout in SocketOutputStream to reflect units (ms)

  ndb/src/common/util/OutputStream.cpp@1.6, 2007-02-14 15:22:00+11:00, stewart@willster.(none) +4 -4
    rename timeout in SocketOutputStream to reflect units (ms)

ChangeSet@1.2377.38.2, 2007-02-14 11:16:10+07:00, tomas@poseidon.mysql.com +2 -0
  make sure some printouts in ndbd out file is done with g_eventLogger

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.66, 2007-02-14 11:16:04+07:00, tomas@poseidon.mysql.com +66 -64
    make sure some printouts in ndbd out file is done with g_eventLogger

  ndb/src/kernel/vm/WatchDog.cpp@1.6, 2007-02-14 11:16:04+07:00, tomas@poseidon.mysql.com +5 -2
    make sure some printouts in ndbd out file is done with g_eventLogger

ChangeSet@1.2377.38.1, 2007-02-14 11:05:38+07:00, tomas@poseidon.mysql.com +7 -0
  Bug#26293 cluster mgmt node sometimes doesn't receive events from all nodes on restart
  - signals where sometimes sent too early when setting up subscriptions

  ndb/include/kernel/signaldata/DumpStateOrd.hpp@1.11, 2007-02-14 11:05:31+07:00, tomas@poseidon.mysql.com +4 -0
    added dump for active subscriptions in cmvmi

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@1.28.1.3, 2007-02-14 11:05:31+07:00, tomas@poseidon.mysql.com +19 -1
    added dump for active subscriptions in cmvmi

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.110.2.2, 2007-02-14 11:05:31+07:00, tomas@poseidon.mysql.com +74 -20
    bug in that signals where sent prior to api reg conf arrived, causing thrown away signals and subsequent hangs in mgmtserver
    also add retry if node connected but not yet received api reg conf

  ndb/src/ndbapi/ClusterMgr.cpp@1.32, 2007-02-14 11:05:31+07:00, tomas@poseidon.mysql.com +4 -1
    added status variable m_api_reg_conf in cluster manager to correctly be able to determine if a node is sendable

  ndb/src/ndbapi/ClusterMgr.hpp@1.11.1.3, 2007-02-14 11:05:31+07:00, tomas@poseidon.mysql.com +1 -0
    added status variable m_api_reg_conf in cluster manager to correctly be able to determine if a node is sendable

  ndb/src/ndbapi/SignalSender.cpp@1.6.1.3, 2007-02-14 11:05:31+07:00, tomas@poseidon.mysql.com +2 -0
    assert to see that node is sendable when signal is sent

  ndb/src/ndbapi/SignalSender.hpp@1.3, 2007-02-14 11:05:31+07:00, tomas@poseidon.mysql.com +1 -1
    manke metchd const

ChangeSet@1.1616.2969.4, 2007-02-13 18:59:46+01:00, msvensson@pilot.mysql.com +1 -0
  Write some debug info to result log file before dying in 'do_exec'

  client/mysqltest.c@1.92.21.40, 2007-02-13 18:59:45+01:00, msvensson@pilot.mysql.com +27 -0
    Write some debug info to result log file before dying in 'do_exec'

ChangeSet@1.1616.2969.3, 2007-02-13 16:59:58+01:00, msvensson@pilot.mysql.com +1 -0
  Reset value of variable "escaped" in "default" label causing $variables not
  to be expanded in same cases 

  client/mysqltest.c@1.92.21.39, 2007-02-13 16:59:57+01:00, msvensson@pilot.mysql.com +1 -0
    Reset value of variable "escaped" in "default" label 

ChangeSet@1.2377.4.12, 2007-02-12 13:59:29-07:00, malff@weblab.(none) +7 -0
  Bug#24532 (The return data type of IS TRUE is different from similar
    operations)
  
  Before this change, the boolean predicates:
  - X IS TRUE,
  - X IS NOT TRUE,
  - X IS FALSE,
  - X IS NOT FALSE
  were implemented by expanding the Item tree in the parser, by using a
  construct like:
  Item_func_if(Item_func_ifnull(X, <value>), <value>, <value>)
  
  Each <value> was a constant integer, either 0 or 1.
  
  A bug in the implementation of the function IF(a, b, c), in
  Item_func_if::fix_length_and_dec(), would cause the following :
  
  When the arguments b and c are both unsigned, the result type of the
  function was signed, instead of unsigned.
  
  When the result of the if function is signed, space for the sign could be
  counted twice (in the max() expression for a signed argument, and in the
  total), causing the member max_length to be too high.
  
  An effect of this is that the final type of IF(x, int(1), int(1)) would be
  int(2) instead of int(1).
  
  With this fix, the problems found in Item_func_if::fix_length_and_dec()
  have been fixed.
  
  While it's semantically correct to represent 'X IS TRUE' with
  Item_func_if(Item_func_ifnull(X, <value>), <value>, <value>),
  there are however more problems with this construct.
  
  a)
  Building the parse tree involves :
  - creating 5 Item instances (3 ints, 1 ifnull, 1 if),
  - creating each Item calls my_pthread_getspecific_ptr() once in the operator
    new(size), and a second time in the Item::Item() constructor, resulting
    in a total of 10 calls to get the current thread.
  Evaluating the expression involves evaluating up to 4 nodes at runtime.
  This representation could be greatly simplified and improved.
  
  b)
  Transforming the parse tree internally with if(ifnull(...)) is fine as long
  as this transformation is internal to the server implementation.
  With views however, the result of the parse tree is later exposed by the
  ::print() functions, and stored as part of the view definition.
  Doing this has long term consequences:
  
  1)
  The original semantic 'X IS TRUE' is lost, and replaced by the
  if(ifnull(...)) expression. As a result, SHOW CREATE VIEW does not restore
  the original code.
  
  2)
  Should a future version of MySQL implement the SQL BOOLEAN data type for
  example, views created today using 'X IS NULL' can be exported using
  mysqldump, and imported again. Such views would be converted correctly and
  automatically to use a BOOLEAN column in the future version.
  With 'X IS TRUE' and the current implementations, views using these
  "boolean" predicates would not be converted during the export/import, and
  would use integer columns instead.
  The difference traces back to how SHOW CREATE VIEW preserves 'X IS NULL' but
  does not preserve the 'X IS TRUE' semantic.
  
  With this fix, internal representation of 'X IS TRUE' booleans predicates
  has changed, so that:
  - dedicated Item classes are created for each predicate,
  - only 1 Item is created to represent 1 predicate
  - my_pthread_getspecific_ptr() is invoked 1 time instead of 10
  - SHOW CREATE VIEW preserves the original semantic, and prints 'X IS TRUE'.
  
  Note that, because of the fix in Item_func_if, views created before this fix
  will:
  - correctly use a int(1) type instead of int(2) for boolean predicates,
  - incorrectly print the if(ifnull(...), ...) expression in SHOW CREATE VIEW,
  since the original semantic (X IS TRUE) has been lost.
  - except for the syntax used in SHOW CREATE VIEW, these views will operate
  properly, no action is needed.
  
  Views created after this fix will operate correctly, and will preserve the
  original code semantic in SHOW CREATE VIEW.

  mysql-test/r/func_if.result@1.24, 2007-02-12 13:59:26-07:00, malff@weblab.(none) +3 -0
    IF(x, unsigned, unsigned) should be unsigned.

  mysql-test/r/view.result@1.186.1.2, 2007-02-12 13:59:26-07:00, malff@weblab.(none) +125 -0
    Preserve the semantic of 'X IS [NOT] (TRUE|FALSE)' boolean predicates.

  mysql-test/t/func_if.test@1.22, 2007-02-12 13:59:26-07:00, malff@weblab.(none) +11 -0
    IF(x, unsigned, unsigned) should be unsigned.

  mysql-test/t/view.test@1.171.1.2, 2007-02-12 13:59:26-07:00, malff@weblab.(none) +86 -0
    Preserve the semantic of 'X IS [NOT] (TRUE|FALSE)' boolean predicates.

  sql/item_cmpfunc.cc@1.228.5.1, 2007-02-12 13:59:26-07:00, malff@weblab.(none) +68 -6
    Preserve the semantic of 'X IS [NOT] (TRUE|FALSE)' boolean predicates.
    IF(x, unsigned, unsigned) should be unsigned.

  sql/item_cmpfunc.h@1.136.4.1, 2007-02-12 13:59:26-07:00, malff@weblab.(none) +86 -0
    Preserve the semantic of 'X IS [NOT] (TRUE|FALSE)' boolean predicates.

  sql/sql_yacc.yy@1.498.1.7, 2007-02-12 13:59:26-07:00, malff@weblab.(none) +12 -16
    Preserve the semantic of 'X IS [NOT] (TRUE|FALSE)' boolean predicates.

ChangeSet@1.1346.893.3, 2007-02-12 20:13:34+01:00, joerg@trift2. +2 -0
  Fix a linkage problem with the previous patch for "thr_client_alarm".

  mysys/my_pthread.c@1.35.1.9, 2007-02-12 20:13:34+01:00, joerg@trift2. +1 -0
    Linkage problem with previous patch: "thr_client_alarm" must be declared in here.

  mysys/thr_alarm.c@1.41.1.4, 2007-02-12 20:13:34+01:00, joerg@trift2. +0 -1
    Linkage problem: Declare "thr_client_alarm" over in "mysys/my_pthread.c".

ChangeSet@1.1346.893.2, 2007-02-12 19:55:33+01:00, joerg@trift2. +1 -0
  Break a double declare of "uint thr_client_alarm" between "mysys/thr_alarm.c" and "mysys/my_pthread.c".

  mysys/my_pthread.c@1.35.1.8, 2007-02-12 19:55:31+01:00, joerg@trift2. +0 -1
    Break a double declare: "uint thr_client_alarm" is also declared in "mysys/thr_alarm.c", take it from there.

ChangeSet@1.1346.893.1, 2007-02-12 15:03:11+01:00, joerg@trift2. +1 -0
  Compile error on Windows: Signal names are undefined. Fix by hiding the whole section.

  mysys/my_thr_init.c@1.21.1.7, 2007-02-12 15:03:10+01:00, joerg@trift2. +3 -0
    Compile error on Windows: Both "SIGALRM" and "SIGUSR1" are undefined.
    Fix by hiding the whole section, according to Jani it is not needed on Windows.

ChangeSet@1.1346.891.5, 2007-02-09 17:08:37+01:00, mysqldev@mysql.com +1 -0
  Raise version number after cloning 4.0.30

  configure.in@1.191.1.151, 2007-02-09 17:08:25+01:00, mysqldev@mysql.com +1 -1
    Raise version number after cloning 4.0.30

ChangeSet@1.2377.32.1, 2007-02-09 13:31:51+00:00, lzhou@dev3-63.(none) +1 -0
  BUG#22025 Return correct error message when transporter error occur.

  ndb/src/common/debugger/EventLogger.cpp@1.31, 2007-02-09 13:31:46+00:00, lzhou@dev3-63.(none) +95 -4
    Add correct error string when transporter error occur.

ChangeSet@1.1346.891.4, 2007-02-09 13:03:37+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -0
  Fixes a compilation problem on Windows. Backport of the
  same fix from 4.0.
  TAG: clone-4.0.30-build

  sql/mysqld.cc@1.297.52.12, 2007-02-09 13:03:36+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +4 -0
    Fixes a compilation problem on Windows. Backport of the
    same fix from 4.0.

ChangeSet@1.1616.2970.1, 2007-02-09 11:05:36+01:00, cmiller@calliope.local.cmiller +3 -0
  Bug#25126: Reference to non-existant column in UPDATE...ORDER BY... crashes server
  
  "update existingtable set anycolumn=nonexisting order by nonexisting" would crash
  the server.
  
  Though we would find the reference to a field, that doesn't mean we can then use
  it to set some values.  It could be a reference to another field.  If it is NULL, 
  don't try to use it to set values in the Item_field and instead return an error.
  
  Over the previous patch, this signals an error at the location of the error, rather
  than letting the subsequent deref signal it.

  mysql-test/r/order_by.result@1.40.2.1, 2007-02-09 11:05:29+01:00, cmiller@calliope.local.cmiller +24 -0
    Verify that all permutations work.

  mysql-test/t/order_by.test@1.29.2.1, 2007-02-09 11:05:30+01:00, cmiller@calliope.local.cmiller +30 -0
    Verify that all permutations work.

  sql/item.cc@1.58.79.1, 2007-02-09 11:05:30+01:00, cmiller@calliope.local.cmiller +12 -1
    When the field is NULL, don't dereference it when we set_field().  
    Instead, raise an error.

ChangeSet@1.2341.72.4, 2007-02-04 18:46:48+01:00, rafal@quant.(none) +1 -0
  BUG#25463 (Memory allocation problems in replication slave thread):
  The problem is (most probably) caused by whole server shutting down before a 
  slave thread terminates correctly. Fixing this requires fixing server shutdown
  code which has been done in 5.1 tree. Thus we ignore the issue in 5.0 assuming 
  that it is fixed in 5.1.  

  mysql-test/valgrind.supp@1.8, 2007-02-04 18:46:45+01:00, rafal@quant.(none) +17 -0
    Added a suppresion rule.

ChangeSet@1.2341.82.1, 2007-02-08 15:53:14+01:00, guilhem@gbichot3.local +10 -0
  Fix for BUG#24432
  "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values".
  When in an INSERT ON DUPLICATE KEY UPDATE, using
  an autoincrement column, we inserted some autogenerated values and
  also updated some rows, some autogenerated values were not used
  (for example, even if 10 was the largest autoinc value in the table
  at the start of the statement, 12 could be the first autogenerated
  value inserted by the statement, instead of 11). One autogenerated
  value was lost per updated row. Led to exhausting the range of the
  autoincrement column faster.
  Bug introduced by fix of BUG#20188; present since 5.0.24 and 5.1.12.
  This bug breaks replication from a pre-5.0.24 master.
  But the present bugfix, as it makes INSERT ON DUP KEY UPDATE
  behave like pre-5.0.24, breaks replication from a [5.0.24,5.0.34]
  master to a fixed (5.0.36) slave! To warn users against this when
  they upgrade their slave, as agreed with the support team, we add
  code for a fixed slave to detect that it is connected to a buggy
  master in a situation (INSERT ON DUP KEY UPDATE into autoinc column)
  likely to break replication, in which case it cannot replicate so
  stops and prints a message to the slave's error log and to SHOW SLAVE
  STATUS.
  For 5.0.36->[5.0.24,5.0.34] replication we cannot warn as master
  does not know the slave's version (but we always recommended to users
  to have slave at least as new as master).
  As agreed with support, I'll also ask for an alert to be put into
  the MySQL Network Monitoring and Advisory Service.

  mysql-test/r/rpl_insert_id.result@1.22, 2007-02-08 15:53:11+01:00, guilhem@gbichot3.local +58 -0
    results to check the bugfix; without the bugfix, you would see, in
    master and slave:
    "3,2" instead of "2,2" for the INSERT VALUES testcase,
    "11,6,..." instead of "6,6,..." for the INSERT SELECT testcase.

  mysql-test/r/rpl_known_bugs_detection.result@1.1, 2007-02-08 15:53:12+01:00, guilhem@gbichot3.local +133 -0
    see that SHOW SLAVE STATUS prints information that slave found a bug
    in master, and does not execute the dangerous event (table stays
    empty).

  mysql-test/r/rpl_known_bugs_detection.result@1.0, 2007-02-08 15:53:12+01:00, guilhem@gbichot3.local +0 -0

  mysql-test/t/rpl_insert_id.test@1.23, 2007-02-08 15:53:11+01:00, guilhem@gbichot3.local +53 -0
    testing that BUG#24432 is fixed

  mysql-test/t/rpl_known_bugs_detection-master.opt@1.1, 2007-02-08 15:53:12+01:00, guilhem@gbichot3.local +1 -0
    pass debug symbol to make the master pretend it has BUG#24432

  mysql-test/t/rpl_known_bugs_detection-master.opt@1.0, 2007-02-08 15:53:12+01:00, guilhem@gbichot3.local +0 -0

  mysql-test/t/rpl_known_bugs_detection.test@1.1, 2007-02-08 15:53:12+01:00, guilhem@gbichot3.local +90 -0
    new test to see if bug detection by slave works

  mysql-test/t/rpl_known_bugs_detection.test@1.0, 2007-02-08 15:53:12+01:00, guilhem@gbichot3.local +0 -0

  sql/log_event.cc@1.223.1.1, 2007-02-08 15:53:11+01:00, guilhem@gbichot3.local +37 -0
    A trick to force the master to pretend it is old and features BUG#24432.
    To do fast lookups in the list of known bugs by version, we compute
    the 3 X.Y.Z numbers from the master's version string and cache that
    into a new member Format_description_log_event::server_version_split.
    We do this computation in the event's two constructors.
    A simple prevention against buffer overrun when reading the master's
    version from a binlog event (assume the event is corrupted on disk,
    and so the version string on disk is longer than ST_SERVER_VER_LEN
    (50), then we would not get a closing 0 at the end of the class member.

  sql/log_event.h@1.130.1.1, 2007-02-08 15:53:12+01:00, guilhem@gbichot3.local +2 -0
    new member to hold the "split server version" (3 numbers X.Y.Z),
    and a method to compute this from the version string.

  sql/slave.cc@1.286.4.1, 2007-02-08 15:53:12+01:00, guilhem@gbichot3.local +64 -0
    a function which tells, based on master's version (as found
    in the Format_description event in the relay log being executed),
    if master can have a certain bug. This function uses a list of
    bug_id / first_version_with_bug / first_version_with_fix.
    If the test is positive, a short error message is put into SHOW SLAVE
    STATUS, and a verbose message is put into the slave's error log.
    The caller is expected to stop the slave in this case.

  sql/slave.h@1.100, 2007-02-08 15:53:12+01:00, guilhem@gbichot3.local +1 -0
    new function to test if the replication master has a bug

  sql/sql_insert.cc@1.211.4.1, 2007-02-08 15:53:12+01:00, guilhem@gbichot3.local +19 -1
    Fix for BUG#24432:t he reason was a misplaced restore_auto_increment() 
    (misplaced when fixing BUG#20188). Indeed, when updating the row,
    it is clear that the autogenerated auto_increment value will not be
    used for this row (and if by "chance" the autoinc value present
    in the updated row is >= to the not used autogenerated value,
    adjust_next_insert_id_after_explicit_value() will fix next_insert_id).
    We also add code for a fixed slave to detect that it is connected to
    a buggy master (in which case it cannot replicate so stops).

ChangeSet@1.2377.13.17, 2007-02-07 14:22:19-08:00, antony@ppcg5.local +3 -0
  Bug#12204
    "CONNECTION is a reserved keyword"
    Allow connection to be used as an ordinary identifier
    Tests included.

  mysql-test/r/keywords.result@1.8, 2007-02-07 14:22:16-08:00, antony@ppcg5.local +13 -0
    test that CONNECTION may be used as ordinary identifier
    test that CONNECTION may be used in stored procedure.

  mysql-test/t/keywords.test@1.8, 2007-02-07 14:22:16-08:00, antony@ppcg5.local +22 -0
    test that CONNECTION may be used as ordinary identifier
    test that CONNECTION may be used in stored procedure.

  sql/sql_yacc.yy@1.498.3.2, 2007-02-07 14:22:17-08:00, antony@ppcg5.local +1 -0
    Set CONNECTION as an unreserved keyword

ChangeSet@1.1616.2966.1, 2007-02-07 09:46:20+01:00, msvensson@neptunus.(none) +1 -0
  Bug#10777 ERROR File = sql_lex.cc, Line = 93 The identifier "symbols" is undefined.
   - Protect againt empty/corrupt lex_hash-h by writing output from gen_lex_hash to 
     a temporary file first.

  sql/Makefile.am@1.77.1.41, 2007-02-07 09:46:18+01:00, msvensson@neptunus.(none) +2 -1
    Protect against empty lex_hash.h due to failed execution of
    gen_lex_hash by writing outpout to a tmp file first

ChangeSet@1.2377.13.16, 2007-02-06 15:19:01-08:00, antony@ppcg5.local +2 -0
  thd_lib_detected moved so that it is correctly declared as a data
  section symbol and not a common symbol on gcc 4.0.1 on darwin 8.8.0
  PowerPC MacOS X 10.4.8

  mysys/my_pthread.c@1.48, 2007-02-06 15:18:57-08:00, antony@ppcg5.local +0 -1
    thd_lib_detected moved to my_thr_init.c

  mysys/my_thr_init.c@1.39, 2007-02-06 15:18:57-08:00, antony@ppcg5.local +2 -0
    thd_lib_detected moved here so that it is correctly declared as a
    data section symbol and not a common symbol on gcc 4.0.1 on darwin 8.8.0
    PowerPC MacOS X 10.4.8

ChangeSet@1.2377.4.11, 2007-02-06 16:01:22-07:00, malff@weblab.(none) +3 -0
  Bug#12976 (stored procedures local variables of type bit)
  
  Before this change, a local variables in stored procedures / stored functions
  or triggers, when declared with a type of bit(N), would not evaluate their
  value properly.
  
  The problem was that the data was incorrectly typed as a string,
  causing for example bit b'1', implemented as a byte 0x01, to be interpreted
  as a string starting with the character 0x01. This later would cause
  implicit conversions to integers or booleans to fail.
  
  The root cause of this problem was an incorrect translation between field
  types, like bit(N), and internal types used when representing values in Item
  objects.
  
  Also, before this change, the function HEX() would sometime print extra "0"
  characters when invoked with bit(N) values.
  
  With this fix, the type translation (sp_map_result_type, sp_map_item_type)
  has been changed so that bit(N) fields are represented with integer values.
  
  A consequence is that, for the function HEX(), when called with a stored
  procedure local variable of type bit(N) as argument, HEX() is provided with an
  integer instead of a string, and therefore does not print "0" padding.
  
  A test case for Bug 12976 was present in the test suite, and has been updated.

  mysql-test/r/sp-vars.result@1.6, 2007-02-06 16:01:20-07:00, malff@weblab.(none) +55 -7
    Local stored procedure variables of type bit(N) are integer values.

  mysql-test/t/sp-vars.test@1.5, 2007-02-06 16:01:20-07:00, malff@weblab.(none) +58 -7
    Local stored procedure variables of type bit(N) are integer values.

  sql/sp_head.cc@1.230.1.1, 2007-02-06 16:01:20-07:00, malff@weblab.(none) +2 -0
    Local stored procedure variables of type bit(N) are integer values.

ChangeSet@1.2377.4.10, 2007-02-04 16:49:24+03:00, kroki@moonlight.home +4 -0
  BUG#25897: Some queries are no longer possible after a CREATE VIEW
             fails
  
  The bug was introduced with the push of the fix for bug#20953: after
  the error on view creation we never reset the error state, so some
  valid statements would give the same error after that.
  
  The solution is to properly reset the error state.

  mysql-test/r/view.result@1.186.1.1, 2007-02-04 16:49:19+03:00, kroki@moonlight.home +10 -0
    Add result for bug#25897: Some queries are no longer possible after
    a CREATE VIEW fails.

  mysql-test/t/view.test@1.171.1.1, 2007-02-04 16:49:19+03:00, kroki@moonlight.home +18 -0
    Add test case for bug#25897: Some queries are no longer possible after
    a CREATE VIEW fails.

  sql/sql_lex.cc@1.209.2.1, 2007-02-04 16:49:19+03:00, kroki@moonlight.home +11 -0
    Add st_parsing_options::reset() method, call it from lex_start().

  sql/sql_lex.h@1.233.4.1, 2007-02-04 16:49:20+03:00, kroki@moonlight.home +2 -4
    Add st_parsing_options::reset() method, call it from constructor.

ChangeSet@1.2341.81.1, 2007-02-03 20:14:16+01:00, rafal@quant.(none) +2 -0
  BUG#25306 (Race conditions during replication slave shutdown (valgrind stacks)):
  The possibility of the race is removed by changing sequence of calls
  
    pthread_mutex_unlock(&mi->run_lock);
    pthread_cond_broadcast(&mi->stop_cond);  
  
  into
  
    pthread_cond_broadcast(&mi->stop_cond);
    pthread_mutex_unlock(&mi->run_lock);
  
  at the end of I/O thread (similar change at the end of SQL thread). This ensures 
  that no thread waiting on the condition executes between the broadcast and the 
  unlock and thus can't delete the mi structure which caused the bug.

  sql/slave.cc@1.286.2.1, 2007-02-03 20:14:12+01:00, rafal@quant.(none) +14 -5
    Change order of condition broadcast and mutex unlock at the end of slave's 
    I/O thread and SQL thread.

  sql/sql_repl.cc@1.155.1.1, 2007-02-03 20:14:13+01:00, rafal@quant.(none) +5 -3
    Add DBUG_ENTER() call

ChangeSet@1.2377.4.9, 2007-02-01 09:36:17-07:00, malff@weblab.(none) +1 -0
  Improved comments

  sql/item_subselect.h@1.85.2.2, 2007-02-01 09:36:15-07:00, malff@weblab.(none) +5 -1
    Improved comments

ChangeSet@1.1616.2954.2, 2007-01-30 22:40:30+01:00, kent@mysql.com +1 -0
  mysql.spec.sh:
    Added man page mysql_install_db.1

  support-files/mysql.spec.sh@1.83.1.46, 2007-01-30 22:37:12+01:00, kent@mysql.com +1 -0
    Added man page mysql_install_db.1

ChangeSet@1.2294.63.1, 2007-01-29 17:32:52-07:00, malff@weblab.(none) +5 -0
  Bug#21904 (parser problem when using IN with a double "(())")
  
  Before this fix, a IN predicate of the form: "IN (( subselect ))", with two
  parenthesis, would be evaluated as a single row subselect: if the subselect
  returns more that 1 row, the statement would fail.
  
  The SQL:2003 standard defines a special exception in the specification,
  and mandates that this particular form of IN predicate shall be equivalent
  to "IN ( subselect )", which involves a table subquery and works with more
  than 1 row.
  
  This fix implements "IN (( subselect ))", "IN ((( subselect )))" etc
  as per the SQL:2003 requirement.
  
  All the details related to the implementation of this change have been
  commented in the code, and the relevant sections of the SQL:2003 spec
  are given for reference, so they are not repeated here.
  
  Having access to the spec is a requirement to review in depth this patch.

  mysql-test/r/subselect.result@1.166.1.1, 2007-01-29 17:32:49-07:00, malff@weblab.(none) +113 -0
    Implement IN predicate special exceptions with subselects.

  mysql-test/t/subselect.test@1.134.2.1, 2007-01-29 17:32:49-07:00, malff@weblab.(none) +100 -0
    Implement IN predicate special exceptions with subselects.

  sql/item_subselect.cc@1.142.4.1, 2007-01-29 17:32:49-07:00, malff@weblab.(none) +30 -0
    Implement IN predicate special exceptions with subselects.

  sql/item_subselect.h@1.82.2.1, 2007-01-29 17:32:49-07:00, malff@weblab.(none) +16 -0
    Implement IN predicate special exceptions with subselects.

  sql/sql_yacc.yy@1.497.2.2, 2007-01-29 17:32:49-07:00, malff@weblab.(none) +98 -17
    Implement IN predicate special exceptions with subselects, cleanup.

ChangeSet@1.2294.62.1, 2007-01-25 20:00:12+03:00, kroki@moonlight.home +1 -0
  BUG#23527: set global query_cache_size can crash the server under
             high load
  
  MySQL server could crash if two or more threads would initiate query
  cache resize at the moments very close in time.
  
  The problem was introduced with the fix of bug 21051 in 5.0 and 5.1:
  simultaneous query cache resizes would wait for the first one in
  progress, but then each thread would try to finish the operation,
  accessing the data that was already reset (attempt to dereference
  'bins' pointer, which may be NULL already).
  
  The solution is to check after synchronization if another thread has
  done the reset already (test 'query_cache_size > 0' again).
  
  No test case is provided because the bug is a subject to a race.

  sql/sql_cache.cc@1.95.1.1, 2007-01-25 20:00:10+03:00, kroki@moonlight.home +17 -1
    We release 'structure_guard_mutex' in flush_cache(), so after the
    call we check if another thread had reset the cache before us.

ChangeSet@1.2377.12.1, 2007-01-25 19:58:04+03:00, kaa@polly.local +2 -0
  Added a test case for bug #20293 "group by cuts off value from time_format"

  mysql-test/r/func_time.result@1.80, 2007-01-25 19:57:29+03:00, kaa@polly.local +4 -0
    Added a test case for bug #20293 "group by cuts off value from time_format"

  mysql-test/t/func_time.test@1.67, 2007-01-25 19:58:02+03:00, kaa@polly.local +8 -0
    Added a test case for bug #20293 "group by cuts off value from time_format"

ChangeSet@1.2341.72.2, 2007-01-24 16:37:38+04:00, bar@mysql.com +3 -0
  Bug#25815 Data truncated for column TEXT
  Problem: "Data truncated" warning was incorrectly generated
  when storing a Japanese character encoded in utf8
  into a cp932 column.
  Reason: Incorrect wrong warning condition
  compared the original length of the character in bytes
  (which is 3 in utf8) to the converted length of the
  character in bytes (which is 2 in cp932).
  Fix: use "how many bytes were scanned from input" instead
  of "how many bytes were put to the column" in the condition.

  mysql-test/r/ctype_cp932.result@1.9, 2007-01-24 16:37:34+04:00, bar@mysql.com +12 -0
    Adding test case

  mysql-test/t/ctype_cp932.test@1.11, 2007-01-24 16:37:34+04:00, bar@mysql.com +11 -0
    Adding test case

  sql/field.cc@1.335.2.3, 2007-01-24 16:37:34+04:00, bar@mysql.com +1 -1
    Change warning condition from:
    "if number of bytes written to destination is less than full source length"
    to
    "if number of bytes read from source is less than full source length"
     

ChangeSet@1.2377.5.4, 2007-01-23 16:42:03+02:00, monty@mysql.com +4 -0
  Avoid compiler warnings on powermacg5
  Fixed compilation error when trying to compile libmysqld on powermac

  configure.in@1.419.2.1, 2007-01-23 16:41:58+02:00, monty@mysql.com +1 -1
    Added flag if __cxa_pure_virtual() should be defined.
    Without this flag, we get a warning from my_global.h for every compiled file on powermacg5

  extra/yassl/taocrypt/include/type_traits.hpp@1.4, 2007-01-23 16:41:58+02:00, monty@mysql.com +5 -1
    Avoid compiler warning

  include/my_global.h@1.133, 2007-01-23 16:41:59+02:00, monty@mysql.com +1 -1
    Avoid compiler warning on powermacg5

  sql/mysqld.cc@1.587, 2007-01-23 16:42:00+02:00, monty@mysql.com +1 -1
    Fix compiler error when compiling embedded on powermac

ChangeSet@1.2377.5.3, 2007-01-22 15:52:15+02:00, monty@mysql.com +8 -0
  Fixed compiler warnings
  Fixed wrong merge that disabled 'make test'
  Renamed all suppress files to end in '.supp'
  Don't give "skipped %d bytes from file" warnings in 5.0

  Makefile.am@1.96, 2007-01-22 15:52:14+02:00, monty@mysql.com +1 -0
    Added back missing cd from wrong merge

  heap/hp_write.c@1.29, 2007-01-22 15:52:14+02:00, monty@mysql.com +1 -1
    Fixed compiler warning

  mysql-test/purify.supp@1.2, 2007-01-22 15:50:29+02:00, monty@mysql.com +0 -0
    Rename: mysql-test/suppress.purify -> mysql-test/purify.supp

  mysql-test/r/mysqlbinlog.result@1.27, 2007-01-22 15:52:14+02:00, monty@mysql.com +7 -5
    Fixed test case to drop all used tables at start and used tables after each test group

  mysql-test/t/mysqlbinlog.test@1.38, 2007-01-22 15:52:14+02:00, monty@mysql.com +10 -5
    Fixed test case to drop all used tables at start and used tables after each test group

  sql/net_serv.cc@1.98, 2007-01-22 15:52:14+02:00, monty@mysql.com +1 -1
    Don't give "skipped %d bytes from file" warnings in 5.0
    (The proper fix for this is in 5.1)

  sql/table.cc@1.243, 2007-01-22 15:52:14+02:00, monty@mysql.com +2 -1
    Fixed compiler warning

  support-files/compiler_warnings.supp@1.2, 2007-01-22 15:50:29+02:00, monty@mysql.com +0 -0
    Rename: support-files/disabled_compiler_warnings.txt -> support-files/compiler_warnings.supp

ChangeSet@1.2341.54.2, 2007-01-18 13:35:49-05:00, cbell@mysql_cab_desk. +2 -0
  BUG#21490 - No warning issued for deprecated replication parameters
  This patch deprecates the replication startup options in the configuration
  file and on the command line. The options deprecated include:
  
  MASTER_HOST, MASTER_USER, MASTER_PASSWORD, MASTER_PORT, MASTER_CONNECT_RETRY,
  MASTER_SSL, MASTER_SSL_CA, MASTER_SSL_CAPATH, MASTER_SSL_CERT, MASTER_SSL_KEY,
  and MASTER_SSL_CIPHER
  
  The code is designed to print the warning message once.

  sql/mysql_priv.h@1.427.1.1, 2007-01-18 13:35:46-05:00, cbell@mysql_cab_desk. +12 -0
    BUG#21490 - No warning issued for deprecated replication parameters
    This patch modifies the WARN_DEPRECATED macro to permit displaying a deprecated 
    warning to the user at startup when the replication startup options are detected.
    It displays the same messae as the original version of the macro but allows the 
    macro to be called before a thread is created and the ER() macro is defined.

  sql/mysqld.cc@1.582.8.1, 2007-01-18 13:35:47-05:00, cbell@mysql_cab_desk. +25 -0
    BUG#21490 - No warning issued for deprecated replication parameters
    This patch deprecates the replication startup options in the configuration
    file and on the command line. The options deprecated include:
    
    MASTER_HOST, MASTER_USER, MASTER_PASSWORD, MASTER_PORT, MASTER_CONNECT_RETRY,
    MASTER_SSL, MASTER_SSL_CA, MASTER_SSL_CAPATH, MASTER_SSL_CERT, MASTER_SSL_KEY,
    and MASTER_SSL_CIPHER
    
    The code is designed to print the warning message once.

ChangeSet@1.2341.43.3, 2007-01-10 19:05:13+02:00, jani@ua141d10.elisa.omakaista.fi +1 -0
  New file for autopush. To disable (known) compiler warnings.

  support-files/disabled_compiler_warnings.txt@1.1, 2007-01-10 19:04:39+02:00, jani@ua141d10.elisa.omakaista.fi +12 -0
    BitKeeper file /home/my/bk/mysql-5.0/support-files/disabled_compiler_warnings.txt

  support-files/disabled_compiler_warnings.txt@1.0, 2007-01-10 19:04:39+02:00, jani@ua141d10.elisa.omakaista.fi +0 -0

ChangeSet@1.2294.59.1, 2007-01-10 16:55:53+02:00, jani@ua141d10.elisa.omakaista.fi +2 -0
  Added two possible error cases for a test.

  mysql-test/r/wait_timeout.result@1.4, 2007-01-10 16:55:49+02:00, jani@ua141d10.elisa.omakaista.fi +2 -2
    Added two possible error cases for a test. Depending
    on a platform, either errno can occur and is correct.
    
    Possible errors are CR_SERVER_GONE_ERROR and
    CR_SERVER_LOST

  mysql-test/t/wait_timeout.test@1.9, 2007-01-10 16:55:50+02:00, jani@ua141d10.elisa.omakaista.fi +4 -2
    Added two possible error cases for a test. Depending
    on a platform, either errno can occur and is correct.
    
    Possible errors are CR_SERVER_GONE_ERROR and
    CR_SERVER_LOST

ChangeSet@1.1616.2897.16, 2006-12-26 15:08:41+04:00, ramil@mysql.com +4 -0
  Fix for bug #23616: Week() changed behaviour between 5.0.22 and 5.0.24
  
  Consider double values as legal date{time} function's arguments
  (i.e. allow dates in internal format YYYYMMDDHHMMSS.XXXXXX).

  mysql-test/r/func_sapdb.result@1.2.1.10, 2006-12-26 15:08:39+04:00, ramil@mysql.com +1 -3
    Fix for bug #23616: Week() changed behaviour between 5.0.22 and 5.0.24
      - result adjusted.

  mysql-test/r/func_time.result@1.23.6.7, 2006-12-26 15:08:39+04:00, ramil@mysql.com +4 -0
    Fix for bug #23616: Week() changed behaviour between 5.0.22 and 5.0.24
      - test result.

  mysql-test/t/func_time.test@1.21.5.7, 2006-12-26 15:08:39+04:00, ramil@mysql.com +7 -0
    Fix for bug #23616: Week() changed behaviour between 5.0.22 and 5.0.24
      - test case.

  sql-common/my_time.c@1.6.1.13, 2006-12-26 15:08:39+04:00, ramil@mysql.com +1 -1
    Fix for bug #23616: Week() changed behaviour between 5.0.22 and 5.0.24
      - consider '.' as an acceptable separator for dates like YYYYYMMDDHHMMSS.XXXXXX

ChangeSet@1.2341.15.2, 2006-12-15 06:21:15+02:00, monty@mysql.com +5 -0
  After merge fixes:
  - Remove compiler warnings
  - Fix merge errors
  - Indentation fixes

  sql/ha_ndbcluster.cc@1.293, 2006-12-15 06:21:13+02:00, monty@mysql.com +9 -9
    After merge fixes

  sql/slave.cc@1.288, 2006-12-15 06:21:13+02:00, monty@mysql.com +3 -1
    After merge fixes

  sql/sp.cc@1.125, 2006-12-15 06:21:13+02:00, monty@mysql.com +0 -5
    After merge fixes

  sql/sql_table.cc@1.330, 2006-12-15 06:21:13+02:00, monty@mysql.com +8 -6
    After merge fixes

  sql/sql_view.cc@1.102, 2006-12-15 06:21:13+02:00, monty@mysql.com +6 -4
    After merge fixes

ChangeSet@1.2294.31.13, 2006-12-15 00:51:37+02:00, monty@mysql.com +227 -0
  Fixed compiler warnings detected by option -Wshadow and -Wunused:
  - Removed not used variables and functions
  - Added #ifdef around code that is not used
  - Renamed variables and functions to avoid conflicts
  - Removed some not used arguments
  
  Fixed some class/struct warnings in ndb
  Added define IS_LONGDATA() to simplify code in libmysql.c
  
  I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes

  BUILD/SETUP.sh@1.62, 2006-12-15 00:51:28+02:00, monty@mysql.com +6 -3
    Added printing of unused functions and variables.
    Made it easy to test compiling with -Wshadow

  BUILD/compile-pentium-gcov@1.15, 2006-12-15 00:51:28+02:00, monty@mysql.com +3 -1
    Added warnings
    Mark binary with -gcov

  client/mysql.cc@1.227.1.2, 2006-12-15 00:51:28+02:00, monty@mysql.com +34 -33
    Fixed warnings found with gcc -Wshadow

  client/mysql_upgrade.c@1.10.2.1, 2006-12-15 00:51:28+02:00, monty@mysql.com +2 -2
    Fixed warnings found with gcc -Wshadow

  client/mysqlbinlog.cc@1.130.2.1, 2006-12-15 00:51:28+02:00, monty@mysql.com +33 -29
    Fixed warnings found with gcc -Wshadow

  client/mysqldump.c@1.252.1.1, 2006-12-15 00:51:28+02:00, monty@mysql.com +11 -9
    Fixed warnings found with gcc -Wshadow

  client/mysqltest.c@1.259.2.2, 2006-12-15 00:51:28+02:00, monty@mysql.com +62 -72
    Fixed warnings found with gcc -Wshadow

  client/sql_string.cc@1.26, 2006-12-15 00:51:28+02:00, monty@mysql.com +32 -18
    Fixed warnings found with gcc -Wshadow
    Merged with sql/sql_string.cc

  client/sql_string.h@1.16, 2006-12-15 00:51:28+02:00, monty@mysql.com +5 -1
    Fixed warnings found with gcc -Wshadow
    Merged with sql/sql_string.h

  cmd-line-utils/readline/display.c@1.16, 2006-12-15 00:51:28+02:00, monty@mysql.com +1 -1
    Fixed compiler warning

  cmd-line-utils/readline/histexpand.c@1.13, 2006-12-15 00:51:28+02:00, monty@mysql.com +4 -4
    Fixed warnings found with gcc -Wshadow
    

  cmd-line-utils/readline/input.c@1.14, 2006-12-15 00:51:28+02:00, monty@mysql.com +4 -4
    Fixed warnings found with gcc -Wshadow
    

  cmd-line-utils/readline/text.c@1.8, 2006-12-15 00:51:28+02:00, monty@mysql.com +3 -3
    Fixed warnings found with gcc -Wshadow
    

  cmd-line-utils/readline/vi_mode.c@1.14, 2006-12-15 00:51:28+02:00, monty@mysql.com +4 -4
    Fixed warnings found with gcc -Wshadow
    

  dbug/dbug_analyze.c@1.7, 2006-12-15 00:51:28+02:00, monty@mysql.com +27 -27
    Fixed warnings found with gcc -Wshadow
    

  extra/my_print_defaults.c@1.24, 2006-12-15 00:51:28+02:00, monty@mysql.com +5 -4
    Prefixed defaults_extra_file and defaults_group_suffix with 'my' to avoid conflicts with similar named local variables

  extra/yassl/include/buffer.hpp@1.7, 2006-12-15 00:51:28+02:00, monty@mysql.com +3 -0
    Fixed compiler warnings

  extra/yassl/include/crypto_wrapper.hpp@1.6, 2006-12-15 00:51:28+02:00, monty@mysql.com +6 -0
    Fixed compiler warnings

  extra/yassl/include/yassl_imp.hpp@1.6.1.1, 2006-12-15 00:51:28+02:00, monty@mysql.com +16 -1
    Fixed compiler warnings

  extra/yassl/include/yassl_int.hpp@1.14.1.1, 2006-12-15 00:51:28+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  extra/yassl/src/crypto_wrapper.cpp@1.10, 2006-12-15 00:51:28+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings

  extra/yassl/taocrypt/benchmark/benchmark.cpp@1.3, 2006-12-15 00:51:28+02:00, monty@mysql.com +16 -16
    Fixed warnings found with gcc -Wshadow
    

  extra/yassl/taocrypt/include/algebra.hpp@1.4.1.2, 2006-12-15 00:51:28+02:00, monty@mysql.com +3 -0
    Fixed compiler warnings

  extra/yassl/taocrypt/include/des.hpp@1.4.1.1, 2006-12-15 00:51:28+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  extra/yassl/taocrypt/include/hash.hpp@1.7, 2006-12-15 00:51:28+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  extra/yassl/taocrypt/include/hmac.hpp@1.7, 2006-12-15 00:51:28+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  extra/yassl/taocrypt/include/modarith.hpp@1.4, 2006-12-15 00:51:28+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  extra/yassl/taocrypt/include/modes.hpp@1.7.1.1, 2006-12-15 00:51:28+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  extra/yassl/taocrypt/include/rsa.hpp@1.3.1.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +19 -15
    Fixed compiler warnings

  extra/yassl/taocrypt/mySTL/list.hpp@1.2, 2006-12-15 00:51:29+02:00, monty@mysql.com +8 -8
    Fixed compiler warnings

  extra/yassl/taocrypt/src/aes.cpp@1.4.1.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +9 -2
    Fixed compiler warnings

  extra/yassl/taocrypt/src/algebra.cpp@1.11.1.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +3 -3
    Fixed compiler warnings

  extra/yassl/taocrypt/src/asn.cpp@1.12, 2006-12-15 00:51:29+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  extra/yassl/taocrypt/test/test.cpp@1.3.1.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +46 -46
    Fixed compiler warnings

  extra/yassl/testsuite/testsuite.cpp@1.5, 2006-12-15 00:51:29+02:00, monty@mysql.com +7 -6
    Fixed compiler warnings

  include/m_ctype.h@1.124, 2006-12-15 00:51:29+02:00, monty@mysql.com +1 -1
    Fixed warnings found with gcc -Wshadow

  include/my_pthread.h@1.92.2.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +8 -8
    Fixed warnings found with gcc -Wshadow

  include/my_sys.h@1.189.1.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +4 -3
    Fixed warnings found with gcc -Wshadow

  include/my_time.h@1.17, 2006-12-15 00:51:29+02:00, monty@mysql.com +5 -5
    Fixed warnings found with gcc -Wshadow

  include/mysql.h@1.166.1.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +2 -1
    Fixed warnings found with gcc -Wshadow
    Added define IS_LONGDATA() to simplify code in libmysql.c

  libmysql/libmysql.c@1.249.2.2, 2006-12-15 00:51:29+02:00, monty@mysql.com +129 -121
    Fixed warnings found with gcc -Wshadow
    (Mostly replaced bind -> my_bind and time -> my_time)

  libmysqld/lib_sql.cc@1.117.1.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +1 -2
    Removed not used variables and labels

  myisam/ft_boolean_search.c@1.94, 2006-12-15 00:51:29+02:00, monty@mysql.com +8 -8
    Fixed warnings found with gcc -Wshadow

  myisam/mi_open.c@1.98.2.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +3 -3
    Fixed warnings found with gcc -Wshadow

  myisam/mi_search.c@1.62, 2006-12-15 00:51:29+02:00, monty@mysql.com +7 -7
    Fixed warnings found with gcc -Wshadow

  myisam/mi_unique.c@1.27, 2006-12-15 00:51:29+02:00, monty@mysql.com +1 -1
    Fixed compiler warning

  myisam/myisampack.c@1.55.1.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +5 -4
    Fixed warnings found with gcc -Wshadow

  myisam/rt_index.c@1.18, 2006-12-15 00:51:29+02:00, monty@mysql.com +0 -3
    Remove not used variables

  myisam/sort.c@1.58, 2006-12-15 00:51:29+02:00, monty@mysql.com +3 -3
    Fixed warnings found with gcc -Wshadow

  mysql-test/r/mysqlcheck.result@1.3, 2006-12-15 00:51:29+02:00, monty@mysql.com +3 -0
    Remove databases and tables possible left by previous test

  mysql-test/r/mysqltest.result@1.38.1.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +2 -0
    New test results

  mysql-test/t/mysql.test@1.22.1.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +11 -1
    Coverage tests

  mysql-test/t/mysqlbinlog.test@1.33.2.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +8 -0
    Coverage tests

  mysql-test/t/mysqlcheck.test@1.3, 2006-12-15 00:51:29+02:00, monty@mysql.com +9 -0
    Remove databases and tables possible left by previous test

  mysql-test/t/mysqltest.test@1.47.1.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +20 -0
    Coverage tests

  mysys/default.c@1.84, 2006-12-15 00:51:29+02:00, monty@mysql.com +19 -19
    Prefixed defaults_file, defaults_group_suffix and defaults_extra_file with 'my' to avoid conflicts with local variables in some functions

  mysys/mf_iocache2.c@1.28, 2006-12-15 00:51:29+02:00, monty@mysql.com +13 -13
    Fixed warnings found with gcc -Wshadow

  mysys/mf_keycache.c@1.58, 2006-12-15 00:51:29+02:00, monty@mysql.com +3 -2
    Fixed warnings found with gcc -Wshadow

  mysys/my_bitmap.c@1.35, 2006-12-15 00:51:29+02:00, monty@mysql.com +3 -3
    Fixed warnings found with gcc -Wshadow

  mysys/sha1.c@1.7, 2006-12-15 00:51:29+02:00, monty@mysql.com +6 -6
    Fixed warnings found with gcc -Wshadow

  ndb/include/kernel/signaldata/ArbitSignalData.hpp@1.4, 2006-12-15 00:51:29+02:00, monty@mysql.com +2 -0
    Fixed compiler warning

  ndb/include/kernel/signaldata/DictTabInfo.hpp@1.21, 2006-12-15 00:51:29+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings

  ndb/include/ndbapi/NdbReceiver.hpp@1.16, 2006-12-15 00:51:29+02:00, monty@mysql.com +1 -1
    Fixed warnings found with gcc -Wshadow

  ndb/include/transporter/TransporterDefinitions.hpp@1.13, 2006-12-15 00:51:29+02:00, monty@mysql.com +5 -0
    Fixed compiler warning

  ndb/include/util/InputStream.hpp@1.6, 2006-12-15 00:51:29+02:00, monty@mysql.com +1 -0
    Fixed compiler warning

  ndb/include/util/OutputStream.hpp@1.5, 2006-12-15 00:51:29+02:00, monty@mysql.com +2 -0
    Fixed compiler warning

  ndb/include/util/SimpleProperties.hpp@1.7, 2006-12-15 00:51:29+02:00, monty@mysql.com +1 -0
    Fixed compiler warning

  ndb/include/util/SocketAuthenticator.hpp@1.3, 2006-12-15 00:51:29+02:00, monty@mysql.com +1 -0
    Fixed compiler warning

  ndb/include/util/SocketServer.hpp@1.10, 2006-12-15 00:51:29+02:00, monty@mysql.com +1 -0
    Fixed compiler warning

  ndb/src/common/mgmcommon/ConfigRetriever.cpp@1.36, 2006-12-15 00:51:30+02:00, monty@mysql.com +4 -3
    Fixed warnings found with gcc -Wshadow

  ndb/src/common/portlib/NdbTick.c@1.6, 2006-12-15 00:51:30+02:00, monty@mysql.com +2 -2
    Fixed warnings found with gcc -Wshadow

  ndb/src/common/transporter/SHM_Transporter.cpp@1.17, 2006-12-15 00:51:30+02:00, monty@mysql.com +2 -2
    Fixed warnings found with gcc -Wshadow

  ndb/src/common/transporter/TCP_Transporter.cpp@1.11, 2006-12-15 00:51:30+02:00, monty@mysql.com +2 -2
    Fixed warnings found with gcc -Wshadow

  ndb/src/common/transporter/TCP_Transporter.hpp@1.6, 2006-12-15 00:51:30+02:00, monty@mysql.com +1 -0
    Fixed compiler warning

  ndb/src/common/transporter/Transporter.cpp@1.23, 2006-12-15 00:51:30+02:00, monty@mysql.com +2 -2
    Removed not used variable

  ndb/src/common/transporter/TransporterRegistry.cpp@1.62, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -2
    Removed not used variable

  ndb/src/common/util/Bitmask.cpp@1.9, 2006-12-15 00:51:30+02:00, monty@mysql.com +15 -15
    Moved function to avoid warnings of not used function

  ndb/src/common/util/ConfigValues.cpp@1.10, 2006-12-15 00:51:30+02:00, monty@mysql.com +3 -3
    Fixed warnings found with gcc -Wshadow

  ndb/src/common/util/File.cpp@1.12.2.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +2 -2
    Fixed warnings found with gcc -Wshadow

  ndb/src/common/util/Properties.cpp@1.11, 2006-12-15 00:51:30+02:00, monty@mysql.com +2 -2
    Fixed warnings found with gcc -Wshadow

  ndb/src/common/util/SocketClient.cpp@1.9, 2006-12-15 00:51:30+02:00, monty@mysql.com +1 -1
    Fixed wrong return value

  ndb/src/common/util/random.c@1.5, 2006-12-15 00:51:30+02:00, monty@mysql.com +4 -4
    Fixed warnings found with gcc -Wshadow

  ndb/src/common/util/socket_io.cpp@1.9.1.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +2 -2
    Fixed warnings found with gcc -Wshadow

  ndb/src/cw/cpcd/APIService.cpp@1.9, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -1
    Removed not used variable

  ndb/src/cw/cpcd/main.cpp@1.11, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -2
    Removed not used variables

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@1.25.1.2, 2006-12-15 00:51:30+02:00, monty@mysql.com +4 -4
    Fixed compiler warnings

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.70.1.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -5
    Removed not used variables

  ndb/src/kernel/blocks/dbdict/Dbdict.hpp@1.25, 2006-12-15 00:51:30+02:00, monty@mysql.com +6 -0
    Fixed compiler warnings

  ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.13.1.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +3 -0
    Fixed compiler warnings

  ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.40.1.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +3 -0
    Fixed compiler warnings

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.96.1.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -9
    Removed not used variables

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp@1.35.1.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +4 -0
    Fixed compiler warnings

  ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.27.1.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@1.4, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -1
    Removed not used variable

  ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp@1.17, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -2
    Removed not used variables

  ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp@1.31, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -2
    Removed not used variables

  ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp@1.15, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -1
    Removed not used variables

  ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp@1.7, 2006-12-15 00:51:30+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@1.35, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -4
    Removed not used variables

  ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp@1.5, 2006-12-15 00:51:30+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings

  ndb/src/kernel/blocks/qmgr/Qmgr.hpp@1.12, 2006-12-15 00:51:30+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@1.37, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -2
    Removed not used variables

  ndb/src/kernel/blocks/suma/Suma.cpp@1.23, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -6
    Removed not used variables

  ndb/src/kernel/blocks/suma/Suma.hpp@1.7, 2006-12-15 00:51:30+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  ndb/src/kernel/vm/MetaData.hpp@1.5, 2006-12-15 00:51:30+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  ndb/src/mgmapi/LocalConfig.cpp@1.23, 2006-12-15 00:51:30+02:00, monty@mysql.com +9 -9
    Fixed warnings found with gcc -Wshadow

  ndb/src/mgmapi/mgmapi.cpp@1.67, 2006-12-15 00:51:30+02:00, monty@mysql.com +6 -7
    Fixed warnings found with gcc -Wshadow

  ndb/src/mgmclient/CommandInterpreter.cpp@1.71.1.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -3
    Removed not used variables

  ndb/src/mgmsrv/ConfigInfo.cpp@1.81, 2006-12-15 00:51:30+02:00, monty@mysql.com +2 -4
    Fixed warnings found with gcc -Wshadow
    Removed not used variables

  ndb/src/mgmsrv/ConfigInfo.hpp@1.12, 2006-12-15 00:51:30+02:00, monty@mysql.com +5 -2
    Fixed warnings found with gcc -Wshadow

  ndb/src/mgmsrv/InitConfigFileParser.cpp@1.27, 2006-12-15 00:51:30+02:00, monty@mysql.com +13 -12
    Prefixed defaults_file, defaults_group_suffix and defaults_extra_file with 'my' to avoid conflicts with local variables in some functions

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.108.1.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +4 -4
    Removed not used variables and functions

  ndb/src/mgmsrv/MgmtSrvr.hpp@1.49, 2006-12-15 00:51:31+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  ndb/src/mgmsrv/Services.cpp@1.70.1.3, 2006-12-15 00:51:31+02:00, monty@mysql.com +4 -5
    Removed not used variables and functions

  ndb/src/mgmsrv/main.cpp@1.49, 2006-12-15 00:51:31+02:00, monty@mysql.com +0 -1
    Removed not used variable

  ndb/src/ndbapi/ClusterMgr.hpp@1.12, 2006-12-15 00:51:31+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  ndb/src/ndbapi/Ndb.cpp@1.63, 2006-12-15 00:51:31+02:00, monty@mysql.com +0 -2
    Removed not used variables

  ndb/src/ndbapi/NdbBlob.cpp@1.30, 2006-12-15 00:51:31+02:00, monty@mysql.com +0 -2
    Removed not used variables

  ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.96, 2006-12-15 00:51:31+02:00, monty@mysql.com +0 -5
    Removed not used variables

  ndb/src/ndbapi/NdbIndexOperation.cpp@1.26, 2006-12-15 00:51:31+02:00, monty@mysql.com +0 -2
    Removed not used variables

  ndb/src/ndbapi/NdbOperationDefine.cpp@1.21, 2006-12-15 00:51:31+02:00, monty@mysql.com +1 -2
    Removed not used variables

  ndb/src/ndbapi/NdbOperationExec.cpp@1.22, 2006-12-15 00:51:31+02:00, monty@mysql.com +0 -2
    Removed not used variables

  ndb/src/ndbapi/NdbOperationSearch.cpp@1.27, 2006-12-15 00:51:31+02:00, monty@mysql.com +0 -3
    Removed not used variables

  ndb/src/ndbapi/NdbScanFilter.cpp@1.9, 2006-12-15 00:51:31+02:00, monty@mysql.com +1 -0
    Fixed compiler warning

  ndb/src/ndbapi/NdbScanOperation.cpp@1.81, 2006-12-15 00:51:31+02:00, monty@mysql.com +0 -3
    Removed not used variables

  ndb/src/ndbapi/SignalSender.cpp@1.7, 2006-12-15 00:51:31+02:00, monty@mysql.com +2 -0
    Removed not used variables

  ndb/src/ndbapi/ndb_cluster_connection.cpp@1.38, 2006-12-15 00:51:31+02:00, monty@mysql.com +0 -1
    Removed not used variable

  ndb/tools/delete_all.cpp@1.20, 2006-12-15 00:51:31+02:00, monty@mysql.com +2 -0
    Removed not used variable

  ndb/tools/desc.cpp@1.22, 2006-12-15 00:51:31+02:00, monty@mysql.com +2 -0
    Removed not used variable

  ndb/tools/drop_index.cpp@1.17, 2006-12-15 00:51:31+02:00, monty@mysql.com +2 -0
    Removed not used variable

  ndb/tools/drop_tab.cpp@1.17, 2006-12-15 00:51:31+02:00, monty@mysql.com +2 -0
    Removed not used variable

  ndb/tools/listTables.cpp@1.23, 2006-12-15 00:51:31+02:00, monty@mysql.com +2 -0
    Removed not used variable

  ndb/tools/ndb_config.cpp@1.18.1.2, 2006-12-15 00:51:31+02:00, monty@mysql.com +9 -4
    Fixed warnings found with gcc -Wshadow
    Added missing puts(desc)

  ndb/tools/restore/Restore.hpp@1.21, 2006-12-15 00:51:31+02:00, monty@mysql.com +2 -1
    Changed delimiter to define instead of static variable, as the static variable caused a LOT of compiler warnings
    Fixed compiler warning

  ndb/tools/restore/consumer.hpp@1.7, 2006-12-15 00:51:31+02:00, monty@mysql.com +1 -0
    Fixed compiler warning

  ndb/tools/restore/restore_main.cpp@1.37, 2006-12-15 00:51:31+02:00, monty@mysql.com +6 -6
    Fixed compiler warnings

  ndb/tools/select_all.cpp@1.24, 2006-12-15 00:51:31+02:00, monty@mysql.com +3 -1
    Removed not used variables

  ndb/tools/select_count.cpp@1.21, 2006-12-15 00:51:31+02:00, monty@mysql.com +2 -0
    Removed not used variable

  server-tools/instance-manager/commands.h@1.10, 2006-12-15 00:51:31+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  server-tools/instance-manager/guardian.cc@1.25.1.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +3 -3
    Fixed compiler warnings

  server-tools/instance-manager/instance_options.cc@1.33, 2006-12-15 00:51:31+02:00, monty@mysql.com +0 -2
    Removed not used variables

  server-tools/instance-manager/mysql_connection.cc@1.16, 2006-12-15 00:51:31+02:00, monty@mysql.com +3 -3
    Fixed compiler warnings

  server-tools/instance-manager/options.cc@1.34, 2006-12-15 00:51:31+02:00, monty@mysql.com +8 -8
    Fixed compiler warnings

  server-tools/instance-manager/options.h@1.17, 2006-12-15 00:51:31+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  server-tools/instance-manager/parse.cc@1.14, 2006-12-15 00:51:31+02:00, monty@mysql.com +0 -1
    Removed not used variable

  server-tools/instance-manager/user_map.cc@1.16, 2006-12-15 00:51:31+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  server-tools/instance-manager/user_map.h@1.6, 2006-12-15 00:51:31+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  sql-common/client.c@1.104.1.3, 2006-12-15 00:51:34+02:00, monty@mysql.com +2 -2
    Removed not used variable

  sql-common/my_time.c@1.25.2.2, 2006-12-15 00:51:34+02:00, monty@mysql.com +29 -28
    Removed not used variable
    time -> my_time

  sql/field.cc@1.331.1.2, 2006-12-15 00:51:31+02:00, monty@mysql.com +95 -102
    Fixed compiler warnings

  sql/field.h@1.191.2.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +27 -27
    Fixed compiler warnings

  sql/filesort.cc@1.109.1.2, 2006-12-15 00:51:31+02:00, monty@mysql.com +3 -1
    Fixed compiler warnings

  sql/ha_archive.cc@1.79, 2006-12-15 00:51:31+02:00, monty@mysql.com +11 -9
    Removed table and share arguments from get_share() / free_share() to get rid of compiler warnings

  sql/ha_archive.h@1.36, 2006-12-15 00:51:31+02:00, monty@mysql.com +2 -2
    Removed table and share arguments from get_share() / free_share() to get rid of compiler warnings

  sql/ha_federated.cc@1.71.1.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +4 -4
    Fixed compiler warnings

  sql/ha_heap.cc@1.81, 2006-12-15 00:51:31+02:00, monty@mysql.com +14 -14
    Fixed compiler warnings

  sql/ha_myisam.cc@1.171, 2006-12-15 00:51:31+02:00, monty@mysql.com +45 -43
    Fixed compiler warnings

  sql/ha_myisammrg.cc@1.86, 2006-12-15 00:51:32+02:00, monty@mysql.com +14 -14
    Fixed compiler warnings

  sql/ha_ndbcluster.cc@1.286.1.3, 2006-12-15 00:51:32+02:00, monty@mysql.com +43 -48
    Fixed compiler warnings

  sql/handler.cc@1.222.2.2, 2006-12-15 00:51:32+02:00, monty@mysql.com +2 -7
    Fixed compiler warnings

  sql/item.cc@1.242.2.2, 2006-12-15 00:51:32+02:00, monty@mysql.com +32 -31
    Fixed compiler warnings

  sql/item.h@1.212.1.1, 2006-12-15 00:51:32+02:00, monty@mysql.com +19 -18
    Fixed compiler warnings
    new_item() -> clone_item(), to avoid a lot of warnings with variable 'new_item'
    el() -> element_index()

  sql/item_cmpfunc.cc@1.224.2.1, 2006-12-15 00:51:32+02:00, monty@mysql.com +40 -37
    Fixed compiler warnings

  sql/item_cmpfunc.h@1.134.1.1, 2006-12-15 00:51:32+02:00, monty@mysql.com +14 -14
    Fixed compiler warnings

  sql/item_func.cc@1.312.2.3, 2006-12-15 00:51:32+02:00, monty@mysql.com +11 -9
    Fixed compiler warnings

  sql/item_geofunc.cc@1.28, 2006-12-15 00:51:32+02:00, monty@mysql.com +3 -2
    Fixed compiler warnings

  sql/item_row.h@1.22, 2006-12-15 00:51:32+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  sql/item_strfunc.cc@1.288.1.2, 2006-12-15 00:51:32+02:00, monty@mysql.com +4 -11
    Fixed compiler warnings

  sql/item_subselect.cc@1.142.2.1, 2006-12-15 00:51:32+02:00, monty@mysql.com +20 -21
    Fixed compiler warnings

  sql/item_subselect.h@1.82.1.1, 2006-12-15 00:51:32+02:00, monty@mysql.com +3 -3
    Fixed compiler warnings

  sql/item_sum.cc@1.189.2.2, 2006-12-15 00:51:32+02:00, monty@mysql.com +11 -14
    Fixed compiler warnings

  sql/item_timefunc.cc@1.133.2.2, 2006-12-15 00:51:32+02:00, monty@mysql.com +5 -5
    Fixed compiler warnings

  sql/log.cc@1.198.1.1, 2006-12-15 00:51:32+02:00, monty@mysql.com +35 -20
    Fixed compiler warnings
    More comments
    Added #ifdef HAVE_REPLICATION

  sql/log_event.cc@1.214.1.3, 2006-12-15 00:51:32+02:00, monty@mysql.com +7 -3
    Fixed compiler warnings

  sql/log_event.h@1.126.2.1, 2006-12-15 00:51:32+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings

  sql/mysql_priv.h@1.423.1.2, 2006-12-15 00:51:32+02:00, monty@mysql.com +4 -4
    query_id -> global_query_id, to avoid a lot of clashes with function and class variables
    start_time -> server_start_time

  sql/mysqld.cc@1.577.5.1, 2006-12-15 00:51:32+02:00, monty@mysql.com +65 -35
    Fixed compiler warnings:
    - Removed not used variables
    - Added #ifndef EMBEDDED_LIBRARY
    - Fixed shadow warnings

  sql/net_serv.cc@1.93.1.1, 2006-12-15 00:51:32+02:00, monty@mysql.com +7 -1
    Fixed compiler warnings

  sql/opt_range.cc@1.232.1.2, 2006-12-15 00:51:32+02:00, monty@mysql.com +70 -86
    range -> last_range to avoid shadow warnings
    Removed not used function print_rowid()

  sql/opt_range.h@1.66, 2006-12-15 00:51:32+02:00, monty@mysql.com +1 -1
    range -> last_range to avoid shadow warnings
    

  sql/password.c@1.41, 2006-12-15 00:51:32+02:00, monty@mysql.com +4 -3
    Fixed compiler warnings

  sql/protocol.cc@1.119, 2006-12-15 00:51:33+02:00, monty@mysql.com +3 -1
    Fixed compiler warnings

  sql/repl_failsafe.cc@1.62, 2006-12-15 00:51:33+02:00, monty@mysql.com +6 -6
    Fixed compiler warnings

  sql/set_var.cc@1.171.1.3, 2006-12-15 00:51:33+02:00, monty@mysql.com +3 -6
    Fixed compiler warnings

  sql/set_var.h@1.78.1.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +42 -40
    type() -> show_type()
    Fixed compiler warnings

  sql/slave.cc@1.287, 2006-12-15 00:51:33+02:00, monty@mysql.com +14 -12
    Fixed compiler warnings

  sql/sp_head.cc@1.225.1.2, 2006-12-15 00:51:33+02:00, monty@mysql.com +4 -6
    Fixed compiler warnings

  sql/sp_head.h@1.88.1.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +5 -4
    Fixed compiler warnings

  sql/spatial.cc@1.28, 2006-12-15 00:51:33+02:00, monty@mysql.com +12 -13
    Fixed compiler warnings

  sql/spatial.h@1.21, 2006-12-15 00:51:33+02:00, monty@mysql.com +6 -6
    length() -> geom_length() to avoid compiler warnings
    wkb_end -> wkb_last to avoid compiler warnings with local variables named 'wkb_end'

  sql/sql_cache.h@1.34, 2006-12-15 00:51:33+02:00, monty@mysql.com +3 -3
    Fixed compiler warnings

  sql/sql_class.cc@1.254.2.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +8 -6
    Fixed compiler warnings

  sql/sql_class.h@1.310.6.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +19 -15
    log -> log_xid() to avoid compiler warnings
    Fixed shadow compiler warnings

  sql/sql_derived.cc@1.79, 2006-12-15 00:51:33+02:00, monty@mysql.com +0 -2
    Removed not used variable

  sql/sql_insert.cc@1.206.2.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +5 -7
    Fixed compiler warnings

  sql/sql_lex.cc@1.206.3.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +20 -17
    Fixed compiler warnings

  sql/sql_lex.h@1.234, 2006-12-15 00:51:33+02:00, monty@mysql.com +2 -1
    res -> saved_error to make the meaning of the variable clear and avoid shadow warnings

  sql/sql_load.cc@1.100.1.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +5 -1
    Fixed compiler warnings

  sql/sql_parse.cc@1.590.7.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +97 -99
    Fixed compiler warnings

  sql/sql_prepare.cc@1.188, 2006-12-15 00:51:33+02:00, monty@mysql.com +7 -6
    Fixed compiler warnings

  sql/sql_select.cc@1.475.1.4, 2006-12-15 00:51:33+02:00, monty@mysql.com +55 -50
    Fixed compiler warnings

  sql/sql_show.cc@1.333.1.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +21 -13
    Fixed compiler warnings

  sql/sql_string.cc@1.95, 2006-12-15 00:51:33+02:00, monty@mysql.com +9 -10
    Fixed compiler warnings

  sql/sql_string.h@1.62.1.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +2 -1
    Fixed compiler warnings

  sql/sql_table.cc@1.325.2.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +29 -26
    Fixed compiler warnings

  sql/sql_trigger.cc@1.58.1.2, 2006-12-15 00:51:33+02:00, monty@mysql.com +9 -8
    Fixed compiler warnings

  sql/sql_trigger.h@1.23, 2006-12-15 00:51:33+02:00, monty@mysql.com +3 -2
    table -> trigger_table to avoid warnings from local variables

  sql/sql_union.cc@1.135, 2006-12-15 00:51:33+02:00, monty@mysql.com +45 -44
    Fixed compiler warnings
    (mainly res -> saved_error)

  sql/sql_update.cc@1.206, 2006-12-15 00:51:34+02:00, monty@mysql.com +0 -1
    Removed not used variable

  sql/sql_view.cc@1.101, 2006-12-15 00:51:34+02:00, monty@mysql.com +0 -1
    Removed not used variable

  sql/sql_yacc.yy@1.494.1.3, 2006-12-15 00:51:34+02:00, monty@mysql.com +1 -6
    Removed not used variable

  sql/table.cc@1.237.2.3, 2006-12-15 00:51:34+02:00, monty@mysql.com +31 -31
    Removed not used variable

  sql/tztime.cc@1.37, 2006-12-15 00:51:34+02:00, monty@mysql.com +2 -2
    Removed not used variable

  sql/unireg.cc@1.79, 2006-12-15 00:51:34+02:00, monty@mysql.com +7 -7
    Removed not used variable

  strings/ctype-bin.c@1.72, 2006-12-15 00:51:34+02:00, monty@mysql.com +3 -3
    mblen -> mb_len to avoid compiler warnings with local variable mblen

  strings/ctype-cp932.c@1.14, 2006-12-15 00:51:34+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  strings/ctype-eucjpms.c@1.15, 2006-12-15 00:51:34+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  strings/ctype-mb.c@1.53, 2006-12-15 00:51:34+02:00, monty@mysql.com +32 -32
    mblen -> mb_len to avoid compiler warnings with local variable mblen

  strings/ctype-simple.c@1.80, 2006-12-15 00:51:34+02:00, monty@mysql.com +7 -7
    mblen -> mb_len to avoid compiler warnings with local variable mblen
    exp -> exponent

  strings/ctype-sjis.c@1.91, 2006-12-15 00:51:34+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  strings/ctype-uca.c@1.41, 2006-12-15 00:51:34+02:00, monty@mysql.com +13 -13
    mblen -> mb_len to avoid compiler warnings with local variable mblen

  strings/ctype-ujis.c@1.72, 2006-12-15 00:51:34+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  strings/ctype-utf8.c@1.102, 2006-12-15 00:51:34+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  strings/decimal.c@1.71.1.2, 2006-12-15 00:51:34+02:00, monty@mysql.com +14 -13
    Fixed compiler warnings

  strings/my_vsnprintf.c@1.36, 2006-12-15 00:51:34+02:00, monty@mysql.com +7 -0
    Added comment

  strings/strtod.c@1.23.1.1, 2006-12-15 00:51:34+02:00, monty@mysql.com +14 -13
    Fixed compiler warnings

  tests/mysql_client_test.c@1.212.1.2, 2006-12-15 00:51:34+02:00, monty@mysql.com +1237 -1237
    Fixed compiler warnings
    (Biggest part of patch is to not get a conflict with global function 'bind')

ChangeSet@1.2196.1.38, 2006-07-23 22:13:12+02:00, msvensson@neptunus.(none) +1 -0
  Remove strange comment

  client/mysql.cc@1.208.1.2, 2006-07-23 22:13:10+02:00, msvensson@neptunus.(none) +0 -4
    Remove strange comment

