ChangeSet@1.2568, 2008-04-08 11:44:18+02:00, kent@mysql.com +3 -0
  Makefile.am:
    Add ChangeLog if it exists
    - Removed separate 'normal+rowrepl' test run, not needed any longer
    - Removed separate 'rpl' test run, included in main test run already
    - Renamed some test "comments", to use similar naming style
    - Limited one of the Cluster test runs to 'ndb' and 'rpl_ndb' suites
    - Reordered test runs, to be aligned with Windows test runs
  mysql.spec.sh:
    - No longer including the "Example" storage engine
    - Added to configure "--without-ENGINE" if not to compile engine as plugin

  Docs/Makefile.am@1.73, 2008-04-07 16:37:27+02:00, kent@mysql.com +16 -3
    Add ChangeLog if it exists

  Makefile.am@1.152, 2008-04-08 11:41:57+02:00, kent@mysql.com +15 -20
    - Removed separate 'normal+rowrepl' test run, not needed any longer
    - Removed separate 'rpl' test run, included in main test run already
    - Renamed some test "comments", to use similar naming style
    - Limited one of the Cluster test runs to 'ndb' and 'rpl_ndb' suites
    - Reordered test runs, to be aligned with Windows test runs

  support-files/mysql.spec.sh@1.201, 2008-04-08 11:41:57+02:00, kent@mysql.com +4 -2
    - No longer including the "Example" storage engine
    - Added to configure "--without-ENGINE" if not to compile engine as plugin

ChangeSet@1.2566.1.1, 2008-04-08 10:43:00+03:00, aelkin@mysql1000.(none) +3 -0
  Bug #35762 Failing CREATE-SELECT steels Table map of the following query
  
  Among two claimed artifacts the critical one is in that the Table map of 
  a query following the failing with a duplicate key error CREATE-SELECT is skipped from
  instantionating (and thus binlogging). That leads to sending a "chopped" group of the data
  row-events without the table map head to the slave. 
  The slave can not apply the only data row events.
  It's not easy to force the slave to react with an error in such a case (the second complaint
  on the bug report), because the lack of a table Rows_log_event::do_apply_event the data row event
  handler is a common situation which  normally designates the event has to be filtered out
  basing on the repliation do/ingore rules decision.
  
  Fixed: table map creating and binlogging is restored via deploying the standard cleanup call in
  select_create::abort().
  No error is reported if by chance the table map was not been binlogged.
  Leaving this out to resolve with considering how to combine the do/ingore rules with the situation
  when erronoulsy the Table_map is not written to binlog.

  mysql-test/suite/rpl/r/rpl_row_create_table.result@1.24, 2008-04-08 10:42:59+03:00, aelkin@mysql1000.(none) +14 -0
    results changed

  mysql-test/suite/rpl/t/rpl_row_create_table.test@1.19, 2008-04-08 10:42:59+03:00, aelkin@mysql1000.(none) +27 -0
    regression test for the bug

  sql/sql_insert.cc@1.313, 2008-04-08 10:42:59+03:00, aelkin@mysql1000.(none) +1 -1
    adding resetting of thd binlogging state that was missed for the particular case of failing CREATE..SELECT

ChangeSet@1.2567, 2008-04-08 10:20:58+05:00, ramil@mysql.com +4 -0
  Fix for bug #35732: read-only blocks SELECT statements in InnoDB
  
  Problem: SELECTs prohibited for a transactional SE in autocommit mode
  if read_only is set.
  
  Fix: allow them.

  mysql-test/r/read_only_innodb.result@1.2, 2008-04-08 10:20:56+05:00, ramil@mysql.com +30 -0
    Fix for bug #35732: read-only blocks SELECT statements in InnoDB
      - test result.

  mysql-test/t/read_only_innodb.test@1.2, 2008-04-08 10:20:56+05:00, ramil@mysql.com +42 -0
    Fix for bug #35732: read-only blocks SELECT statements in InnoDB
      - test case.

  sql/handler.cc@1.340, 2008-04-08 10:20:56+05:00, ramil@mysql.com +33 -25
    Fix for bug #35732: read-only blocks SELECT statements in InnoDB
      - in autocommit mode thd->transaction.all list is empty thus 
        is_real_trans set to TRUE for any SELECTs, so using it in the
        "read_only" check is insufficient.
        ha_check_and_coalesce_trx_read_only() changed to return number
        of engines with read-write changes. This value is used in the
        "read-only" check and checks for GLOBAL READ LOCK.

  sql/lock.cc@1.113, 2008-04-08 10:20:56+05:00, ramil@mysql.com +1 -0
    Fix for bug #35732: read-only blocks SELECT statements in InnoDB
      - added assert(protect_against_global_read_lock) before decreasing,
        in order to catch (uint) 0 - 1 situation due to wrong 
        wait_if_global_read_lock()/start_waiting_global_read_lock() call
        sequence.

ChangeSet@1.2566, 2008-04-04 13:46:05-03:00, davi@mysql.com +1 -0
  Bug#35824: mysql_upgrade does not fix scheduler tables when upgrading from 5.1.23 to 5.1.24
  
  The problem is that when upgrading the event table, the sql_mode
  column was always being added instead of being updated to list new
  sql_mode values, causing upgrades of the event which already have
  a sql_mode column to not be updated to the new sql_mode values.
  
  The solution is to always add first a stub sql_mode column and
  subsequently update the column to the new sql_mode values.

  scripts/mysql_system_tables_fix.sql@1.69, 2008-04-04 13:46:02-03:00, davi@mysql.com +4 -1
    Always add and update the sql_mode column of the event table.

ChangeSet@1.2565, 2008-04-02 22:24:53+02:00, kent@mysql.com +3 -0
  mysql.spec.sh:
    If excluding Federated, make sure dynamic plugin is not built
  Makefile.am:
    Only run cluster test when compiled with cluster
  lib_sql.cc:
    Work around for Visual Studio 2003, that lacks vsnprintf() but has _vsnprintf()

  Makefile.am@1.151, 2008-04-02 20:59:31+02:00, kent@mysql.com +11 -6
    Only run cluster test when compiled with cluster

  libmysqld/lib_sql.cc@1.152, 2008-04-02 21:00:00+02:00, kent@mysql.com +3 -0
    Work around for Visual Studio 2003, that lacks vsnprintf() but has _vsnprintf()

  support-files/mysql.spec.sh@1.200, 2008-04-02 21:00:40+02:00, kent@mysql.com +4 -0
    If excluding Federated, make sure dynamic plugin is not built

ChangeSet@1.2564, 2008-04-02 00:43:17+02:00, kent@mysql.com +5 -0
  mysqld.cc:
    Corrects build problems embedded on Windows
  Makefile.am:
    Install .sym or mysqld-debug if exists
  query_cache_debug.test, query_cache_debug.result:
    Set more resonable query cache size (bug#35749)
  CMakeLists.txt:
    Added missing stacktrace.c

  libmysqld/CMakeLists.txt@1.20, 2008-04-02 00:33:24+02:00, kent@mysql.com +1 -1
    Added missing stacktrace.c

  mysql-test/r/query_cache_debug.result@1.3, 2008-04-01 21:14:19+02:00, kent@mysql.com +1 -1
    Set more resonable query cache size (bug#35749)

  mysql-test/t/query_cache_debug.test@1.3, 2008-04-01 21:14:19+02:00, kent@mysql.com +1 -1
    Set more resonable query cache size (bug#35749)

  sql/Makefile.am@1.197, 2008-04-02 00:33:51+02:00, kent@mysql.com +7 -1
    Install .sym or mysqld-debug if exists

  sql/mysqld.cc@1.696, 2008-04-02 00:42:29+02:00, kent@mysql.com +2 -0
    Corrects build problems embedded on Windows

ChangeSet@1.2560.2.1, 2008-04-01 19:22:37+02:00, mleich@five.local.lan +16 -0
  Fixes for failing funcs_1 tests in mysql-5.1.24-rc
  Problems were caused by modifications of
  - the server
    - HANDLER FOR SQLSTATE '00000' is now rejected (bug fix)
      affects several ..._storedproc* tests
    - improved error message
      affects the ..._trig_03e
    - improved content of information_schema.COLUMNS about
      information_schema.REFERENTIAL_CONSTRAINTS
      affects is_columns_is
  - the content of the community build (collations)
      affects charset_collation_3 

  mysql-test/suite/funcs_1/r/charset_collation_3.result@1.2, 2008-04-01 19:22:32+02:00, mleich@five.local.lan +51 -48
    Updated result

  mysql-test/suite/funcs_1/r/innodb_storedproc.result@1.8, 2008-04-01 19:22:32+02:00, mleich@five.local.lan +7243 -7241
    Updated result

  mysql-test/suite/funcs_1/r/innodb_storedproc_02.result@1.8, 2008-04-01 19:22:33+02:00, mleich@five.local.lan +1 -6
    Updated result

  mysql-test/suite/funcs_1/r/innodb_trig_03e.result@1.5, 2008-04-01 19:22:33+02:00, mleich@five.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/is_columns_is.result@1.3, 2008-04-01 19:22:33+02:00, mleich@five.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/memory_storedproc.result@1.8, 2008-04-01 19:22:33+02:00, mleich@five.local.lan +7207 -7205
    Updated result

  mysql-test/suite/funcs_1/r/memory_storedproc_02.result@1.8, 2008-04-01 19:22:33+02:00, mleich@five.local.lan +1 -6
    Updated result

  mysql-test/suite/funcs_1/r/memory_trig_03e.result@1.5, 2008-04-01 19:22:33+02:00, mleich@five.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/myisam_storedproc.result@1.8, 2008-04-01 19:22:33+02:00, mleich@five.local.lan +7243 -7241
    Updated result

  mysql-test/suite/funcs_1/r/myisam_storedproc_02.result@1.8, 2008-04-01 19:22:33+02:00, mleich@five.local.lan +1 -6
    Updated result

  mysql-test/suite/funcs_1/r/myisam_trig_03e.result@1.5, 2008-04-01 19:22:33+02:00, mleich@five.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_storedproc.result@1.5, 2008-04-01 19:22:34+02:00, mleich@five.local.lan +7228 -7226
    Updated result

  mysql-test/suite/funcs_1/r/ndb_storedproc_02.result@1.3, 2008-04-01 19:22:34+02:00, mleich@five.local.lan +1 -6
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_03e.result@1.6, 2008-04-01 19:22:34+02:00, mleich@five.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/storedproc/storedproc_02.inc@1.7, 2008-04-01 19:22:34+02:00, mleich@five.local.lan +1 -3
    Corrected script

  mysql-test/suite/funcs_1/storedproc/storedproc_master.inc@1.9, 2008-04-01 19:22:34+02:00, mleich@five.local.lan +4 -11
    Corrected script

ChangeSet@1.2560.1.1, 2008-04-01 14:40:23+02:00, mats@mats-laptop.(none) +2 -0
  Fixes to eliminate some race conditions in tests.

  mysql-test/include/master-slave-reset.inc@1.2, 2008-04-01 14:40:21+02:00, mats@mats-laptop.(none) +2 -1
    Adding missing waits for slave to start and stop causing test failures.

  mysql-test/suite/rpl/t/rpl_insert.test@1.9, 2008-04-01 14:40:22+02:00, mats@mats-laptop.(none) +6 -3
    Waiting for the rows to be inserted instead of relying on the binlog position
    to be updated correctly.

ChangeSet@1.2561, 2008-04-01 11:03:12+02:00, df@pippilotta.erinye.com +1 -0
  Portability fix

  sql/set_var.cc@1.275, 2008-04-01 11:03:06+02:00, df@pippilotta.erinye.com +1 -1
    Unbreak REPORT_PORT on big endian machines where sizeof long != sizeof int.

ChangeSet@1.2560, 2008-03-31 19:48:54+02:00, kent@mysql.com +1 -0
  mysql.spec.sh:
    Made Federated and Cluster optional

  support-files/mysql.spec.sh@1.199, 2008-03-31 19:48:39+02:00, kent@mysql.com +35 -1
    Made Federated and Cluster optional

ChangeSet@1.2559, 2008-03-31 19:01:56+02:00, kent@mysql.com +3 -0
  disabled.def:
    Disabled 'rpl_redirect', failure is sporadic and and the test is superfluous
  rpl_packet.test, rpl_packet.result:
    Removing race conditions from rpl_packet causing test to fail

  mysql-test/suite/rpl/r/rpl_packet.result@1.11, 2008-03-31 18:59:01+02:00, kent@mysql.com +4 -0
    Result change.

  mysql-test/suite/rpl/t/disabled.def@1.26, 2008-03-31 18:45:03+02:00, kent@mysql.com +1 -0
    Disabled 'rpl_redirect', failure is sporadic and and the test is superfluous

  mysql-test/suite/rpl/t/rpl_packet.test@1.14, 2008-03-31 18:59:01+02:00, kent@mysql.com +15 -1
    Setting net_buffer_length correctly for the test instead of relying on it
    being set correctly. Waiting for slave to stop after issuing a SLAVE STOP
    and waiting for slave to start when issuing a SLAVE START to prevent race
    conditions causing test failure.

ChangeSet@1.2558, 2008-03-31 14:13:42+03:00, gkodinov@magare.gmz +1 -0
  merge 5.1-main to 5.1-bugteam
  TAG: clone-5.1.24-build

  mysql-test/r/binlog_index.result@1.3, 2008-03-31 14:13:41+03:00, gkodinov@magare.gmz +2 -2
    merge 5.1-main to 5.1-bugteam

ChangeSet@1.2542.61.1, 2008-03-31 11:29:03+02:00, mats@mats-laptop.(none) +2 -0
  Updating commit.inc since the number of commits done for non-transactional
  tables is not zero any more. For row-based logging, there is an extra commit
  for sending rows changed by the statement to the binary log.

  mysql-test/include/commit.inc@1.5, 2008-03-31 11:29:01+02:00, mats@mats-laptop.(none) +12 -4
    For row-based logging, an extra commit is done for each statement to commit
    non-transactional changes to the binary log.

  mysql-test/r/commit_1innodb.result@1.5, 2008-03-31 11:29:01+02:00, mats@mats-laptop.(none) +12 -4
    Result change.

ChangeSet@1.1810.3674.26, 2008-03-30 15:46:37-04:00, iggy@amd64.(none) +1 -0
  Bug#26243 - Cleanup Valgrind error

  sql/tztime.cc@1.24.5.2, 2008-03-30 15:46:35-04:00, iggy@amd64.(none) +1 -1
    Bug#26243 - Cleanup Valgrind error

ChangeSet@1.2554, 2008-03-30 00:54:08+02:00, aelkin@mysql1000.(none) +9 -0
  Bug #35675  	reset master finds assert if a binlog file can not be deleted
  
  If a binlog file is manually replaced with a namesake directory the internal purging did
  not handle the error of deleting the file so that eventually
  a post-execution guards fires an assert.
  
  Fixed with reusing a snippet of code for bug@18199 to tolerate lack of the file but no other error 
  at an attempt to delete it.
  The same applied to the index file deletion.
  
  The cset carries pieces of manual merging.

  mysql-test/r/binlog_index.result@1.2, 2008-03-30 00:54:06+02:00, aelkin@mysql1000.(none) +2 -2
    new results

  mysql-test/r/ctype_big5.result@1.20, 2008-03-30 00:54:06+02:00, aelkin@mysql1000.(none) +2 -2
    results changed

  mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result@1.3, 2008-03-30 00:54:06+02:00, aelkin@mysql1000.(none) +1 -0
    new results

  mysql-test/suite/binlog/r/binlog_stm_blackhole.result@1.29, 2008-03-30 00:54:06+02:00, aelkin@mysql1000.(none) +7 -0
    new results

  mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test@1.4, 2008-03-30 00:54:06+02:00, aelkin@mysql1000.(none) +7 -0
    cleanup. still todo: to let the test run multiple times w/o restarting the server (just ./mtr test)

  mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result@1.4, 2008-03-30 00:54:06+02:00, aelkin@mysql1000.(none) +4 -0
    results changed

  mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result@1.3, 2008-03-30 00:52:21+02:00, aelkin@mysql1000.(none) +0 -0
    Rename: mysql-test/r/rpl_auto_increment_bug33029.result -> mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result

  mysql-test/suite/rpl/t/rpl_stm_auto_increment_bug33029.test@1.4, 2008-03-30 00:54:06+02:00, aelkin@mysql1000.(none) +1 -0
    guarding the test with statement format condition as the logics of the test requires

  mysql-test/suite/rpl/t/rpl_stm_auto_increment_bug33029.test@1.3, 2008-03-30 00:52:21+02:00, aelkin@mysql1000.(none) +0 -0
    Rename: mysql-test/t/rpl_auto_increment_bug33029.test -> mysql-test/suite/rpl/t/rpl_stm_auto_increment_bug33029.test

  sql/log.cc@1.302.15.2, 2008-03-30 00:54:06+02:00, aelkin@mysql1000.(none) +57 -17
    two changes. One for the bug, other manual merge.
    The bug change needs MYF(0) to pass to my_delete because not all error out of the function
    are critical. The finer check is done on the caller of my_delete similarly how it was implemented
    for bug@18199 fixes. Non-existance of a file is not a critical error.

  sql/sql_class.cc@1.352.1.17, 2008-03-30 00:54:06+02:00, aelkin@mysql1000.(none) +0 -13
    manual merge, removing extra automatically brought hunk.

ChangeSet@1.1810.3674.25, 2008-03-29 17:50:46+02:00, gkodinov@macbook.gmz +7 -0
  fixed warnings from the fix of 26243

  mysys/mf_keycache.c@1.55.1.11, 2008-03-29 17:50:43+02:00, gkodinov@macbook.gmz +1 -1
    fixed warnings from the fix of 26243

  sql/item_func.cc@1.270.1.99, 2008-03-29 17:50:43+02:00, gkodinov@macbook.gmz +1 -1
    fixed warnings from the fix of 26243

  sql/lock.cc@1.64.5.8, 2008-03-29 17:50:43+02:00, gkodinov@macbook.gmz +1 -1
    fixed warnings from the fix of 26243

  sql/sql_analyse.cc@1.67.1.6, 2008-03-29 17:50:43+02:00, gkodinov@macbook.gmz +12 -12
    fixed warnings from the fix of 26243

  sql/examples/ha_tina.cc@1.10.11.1, 2008-03-29 17:50:44+02:00, gkodinov@macbook.gmz +1 -1
    fixed warnings from the fix of 26243

  myisam/mi_check.c@1.129.35.1, 2008-03-29 17:50:43+02:00, gkodinov@macbook.gmz +1 -1
    fixed warnings from the fix of 26243

  myisam/mi_keycache.c@1.9.4.1, 2008-03-29 17:50:43+02:00, gkodinov@macbook.gmz +1 -0
    fixed warnings from the fix of 26243

ChangeSet@1.1810.3674.24, 2008-03-29 16:12:23+02:00, gkodinov@macbook.gmz +4 -0
  fixes for warnings and compile errors for the fix of bug 26243

  sql/ha_berkeley.cc@1.151.14.1, 2008-03-29 16:12:21+02:00, gkodinov@macbook.gmz +4 -4
    fixes for warnings and compile errors for the fix of bug 26243

  extra/charset2html.c@1.9.1.1, 2008-03-29 16:12:21+02:00, gkodinov@macbook.gmz +2 -0
    fixes for warnings and compile errors for the fix of bug 26243

  sql/mysqld.cc@1.439.1.201, 2008-03-29 16:12:21+02:00, gkodinov@macbook.gmz +1 -1
    fixes for warnings and compile errors for the fix of bug 26243

  sql/sql_union.cc@1.130.1.15, 2008-03-29 16:12:21+02:00, gkodinov@macbook.gmz +2 -0
    fixes for warnings and compile errors for the fix of bug 26243

ChangeSet@1.2551, 2008-03-29 14:01:56+02:00, aelkin@mysql1000.(none) +1 -0
  Fixing rpl suite disabled.def: rpl_stm_extraColmaster_ndb does not exist in the suite.

  mysql-test/suite/rpl/t/disabled.def@1.25, 2008-03-29 14:01:55+02:00, aelkin@mysql1000.(none) +0 -1
    removing the line because there is no such test in the suite anymore.

ChangeSet@1.1810.3674.23, 2008-03-29 09:52:16+02:00, gkodinov@macbook.gmz +27 -0
  fixed warnings and compile errors from the fix for bug 26243

  configure.in@1.245.77.60, 2008-03-29 09:52:01+02:00, gkodinov@macbook.gmz +3 -0
    fixed warnings and compile errors from the fix for bug 26243

  libmysql/libmysql.c@1.233.1.21, 2008-03-29 09:52:01+02:00, gkodinov@macbook.gmz +1 -1
    fixed warnings and compile errors from the fix for bug 26243

  sql-common/client.c@1.83.1.39, 2008-03-29 09:52:04+02:00, gkodinov@macbook.gmz +1 -1
    fixed warnings and compile errors from the fix for bug 26243

  sql/ha_ndbcluster.cc@1.175.94.4, 2008-03-29 09:52:04+02:00, gkodinov@macbook.gmz +16 -18
    fixed warnings and compile errors from the fix for bug 26243

  sql/ha_ndbcluster_cond.cc@1.4.1.4, 2008-03-29 09:52:04+02:00, gkodinov@macbook.gmz +1 -1
    fixed warnings and compile errors from the fix for bug 26243

  sql/ha_federated.cc@1.24.39.1, 2008-03-29 09:52:03+02:00, gkodinov@macbook.gmz +1 -1
    fixed warnings and compile errors from the fix for bug 26243

  heap/hp_test2.c@1.21.4.1, 2008-03-29 09:52:01+02:00, gkodinov@macbook.gmz +0 -2
    fixed warnings and compile errors from the fix for bug 26243

  sql/ha_innodb.cc@1.202.58.1, 2008-03-29 09:52:03+02:00, gkodinov@macbook.gmz +1 -1
    fixed warnings and compile errors from the fix for bug 26243

  myisam/mi_check.c@1.129.34.1, 2008-03-29 09:52:02+02:00, gkodinov@macbook.gmz +10 -10
    fixed warnings and compile errors from the fix for bug 26243

  myisam/mi_delete.c@1.33.13.1, 2008-03-29 09:52:02+02:00, gkodinov@macbook.gmz +11 -11
    fixed warnings and compile errors from the fix for bug 26243

  myisam/mi_dynrec.c@1.37.20.1, 2008-03-29 09:52:02+02:00, gkodinov@macbook.gmz +3 -3
    fixed warnings and compile errors from the fix for bug 26243

  myisam/mi_key.c@1.38.18.1, 2008-03-29 09:52:02+02:00, gkodinov@macbook.gmz +1 -1
    fixed warnings and compile errors from the fix for bug 26243

  myisam/mi_open.c@1.90.36.1, 2008-03-29 09:52:02+02:00, gkodinov@macbook.gmz +1 -1
    fixed warnings and compile errors from the fix for bug 26243

  myisam/mi_packrec.c@1.30.20.1, 2008-03-29 09:52:02+02:00, gkodinov@macbook.gmz +1 -1
    fixed warnings and compile errors from the fix for bug 26243

  myisam/mi_page.c@1.22.5.1, 2008-03-29 09:52:02+02:00, gkodinov@macbook.gmz +2 -2
    fixed warnings and compile errors from the fix for bug 26243

  myisam/mi_search.c@1.53.13.1, 2008-03-29 09:52:02+02:00, gkodinov@macbook.gmz +4 -4
    fixed warnings and compile errors from the fix for bug 26243

  myisam/mi_statrec.c@1.10.7.1, 2008-03-29 09:52:02+02:00, gkodinov@macbook.gmz +2 -2
    fixed warnings and compile errors from the fix for bug 26243

  myisam/mi_test1.c@1.25.8.1, 2008-03-29 09:52:02+02:00, gkodinov@macbook.gmz +0 -1
    fixed warnings and compile errors from the fix for bug 26243

  myisam/mi_test2.c@1.27.5.1, 2008-03-29 09:52:02+02:00, gkodinov@macbook.gmz +2 -4
    fixed warnings and compile errors from the fix for bug 26243

  myisam/mi_test3.c@1.16.3.1, 2008-03-29 09:52:02+02:00, gkodinov@macbook.gmz +0 -2
    fixed warnings and compile errors from the fix for bug 26243

  myisam/mi_write.c@1.50.17.1, 2008-03-29 09:52:03+02:00, gkodinov@macbook.gmz +4 -4
    fixed warnings and compile errors from the fix for bug 26243

  myisammrg/myrg_rkey.c@1.16.7.1, 2008-03-29 09:52:03+02:00, gkodinov@macbook.gmz +1 -1
    fixed warnings and compile errors from the fix for bug 26243

  ndb/src/ndbapi/DictCache.cpp@1.12.15.1, 2008-03-29 09:52:03+02:00, gkodinov@macbook.gmz +1 -1
    fixed warnings and compile errors from the fix for bug 26243

  ndb/src/ndbapi/NdbBlob.cpp@1.22.17.1, 2008-03-29 09:52:03+02:00, gkodinov@macbook.gmz +5 -3
    fixed warnings and compile errors from the fix for bug 26243

  ndb/src/ndbapi/NdbOperationDefine.cpp@1.19.12.1, 2008-03-29 09:52:03+02:00, gkodinov@macbook.gmz +1 -1
    fixed warnings and compile errors from the fix for bug 26243

  ndb/src/ndbapi/NdbOperationInt.cpp@1.15.3.1, 2008-03-29 09:52:03+02:00, gkodinov@macbook.gmz +1 -1
    fixed warnings and compile errors from the fix for bug 26243

  ndb/src/ndbapi/NdbOperationSearch.cpp@1.24.8.1, 2008-03-29 09:52:03+02:00, gkodinov@macbook.gmz +1 -1
    fixed warnings and compile errors from the fix for bug 26243

ChangeSet@1.2542.60.2, 2008-03-29 00:05:20+03:00, anozdrin@quad.opbmk +1 -0
  Fix manual merge.

  mysql-test/r/loaddata.result@1.37, 2008-03-29 00:05:19+03:00, anozdrin@quad.opbmk +27 -27
    Fix manual merge.

ChangeSet@1.1810.3699.1, 2008-03-28 23:39:47+03:00, anozdrin@quad.opbmk +3 -0
  Fix tree:
    1. Use 'dat' extension, because it is handled in Makefile.am;
    2. Fix typo: the bug id is 35469, not 35649.

  mysql-test/r/loaddata.result@1.20.1.14, 2008-03-28 23:39:47+03:00, anozdrin@quad.opbmk +4 -4
    Update result file.

  mysql-test/std_data/bug35469.dat@1.2, 2008-03-28 23:37:48+03:00, anozdrin@quad.opbmk +0 -0
    Rename: mysql-test/std_data/bug35649.data -> mysql-test/std_data/bug35469.dat

  mysql-test/t/loaddata.test@1.15.2.3, 2008-03-28 23:39:47+03:00, anozdrin@quad.opbmk +4 -4
    1. Use 'dat' extension, because it is handled in Makefile.am;
    2. Fix typo: the bug id is 35469, not 35649.

ChangeSet@1.2542.54.6, 2008-03-28 21:59:20+02:00, gkodinov@magare.gmz +1 -0
  perror.c:
    fixed warning in 5.1-marvel in fix for bug 25177

  extra/perror.c@1.54, 2008-03-28 21:58:45+02:00, gkodinov@magare.gmz +1 -0
    fixed warning in 5.1-marvel in fix for bug 25177

ChangeSet@1.2542.54.5, 2008-03-28 21:11:07+02:00, gkodinov@magare.gmz +1 -0
  Makefile.am:
    added my_handler_errors.h

  mysys/Makefile.am@1.92, 2008-03-28 21:08:26+02:00, gkodinov@magare.gmz +1 -1
    added my_handler_errors.h

ChangeSet@1.2542.51.8, 2008-03-28 19:57:39+01:00, mats@mats-laptop.(none) +1 -0
  Fixes to eliminate compiler warnings.

  sql/log.cc@1.302.1.14, 2008-03-28 19:57:38+01:00, mats@mats-laptop.(none) +1 -1
    Reordering initialalizer list to eliminate compiler warnings.

ChangeSet@1.1810.3693.2, 2008-03-28 14:02:27-04:00, iggy@amd64.(none) +19 -0
  Bug#26243 mysql command line crash after control-c
  - Backported the 5.1 DBUG to 5.0.
  - Avoid memory cleanup race on Windows client for CTRL-C

  client/mysql.cc@1.199.1.51, 2008-03-28 14:02:22-04:00, iggy@amd64.(none) +19 -5
    Bug#26243 mysql command line crash after control-c
    - On Windows, the sigint handler shouldn't call mysql_end
    because the main thread will do so automatically.
    - Remove unnecessary signal call from the sigint handler.
    - Call my_end with proper value.

  dbug/dbug.c@1.21.2.4, 2008-03-28 14:02:22-04:00, iggy@amd64.(none) +1466 -1247
    Bug#26243 mysql command line crash after control-c
    - Backported the 5.1 DBUG library. The old version uses a non-thread 
    safe global variable 'static struct state *stack'.

  dbug/factorial.c@1.4.1.1, 2008-03-28 14:02:22-04:00, iggy@amd64.(none) +12 -2
    Bug#26243 mysql command line crash after control-c
    - Backported the 5.1 DBUG library. The old version uses a non-thread 
    safe global variable 'static struct state *stack'.

  dbug/user.r@1.6.1.1, 2008-03-28 14:02:22-04:00, iggy@amd64.(none) +185 -112
    Bug#26243 mysql command line crash after control-c
    - Backported the 5.1 DBUG library. The old version uses a non-thread 
    safe global variable 'static struct state *stack'.

  include/my_dbug.h@1.16.3.2, 2008-03-28 14:02:22-04:00, iggy@amd64.(none) +52 -44
    Bug#26243 mysql command line crash after control-c
    - Backported the 5.1 DBUG library. The old version uses a non-thread 
    safe global variable 'static struct state *stack'.

  libmysql/libmysql.c@1.233.30.1, 2008-03-28 14:02:22-04:00, iggy@amd64.(none) +0 -4
    Bug#26243 mysql command line crash after control-c
    - Update for new DBUG library.

  sql/item_cmpfunc.cc@1.187.47.17, 2008-03-28 14:02:23-04:00, iggy@amd64.(none) +1 -1
    Bug#26243 mysql command line crash after control-c
    - Update for new DBUG library.

  sql/mysqld.cc@1.439.1.200, 2008-03-28 14:02:23-04:00, iggy@amd64.(none) +4 -9
    Bug#26243 mysql command line crash after control-c
    - Update for new DBUG library.

  sql/net_serv.cc@1.88.1.16, 2008-03-28 14:02:23-04:00, iggy@amd64.(none) +2 -2
    Bug#26243 mysql command line crash after control-c
    - Update for new DBUG library.

  sql/opt_range.cc@1.159.1.99, 2008-03-28 14:02:23-04:00, iggy@amd64.(none) +1 -5
    Bug#26243 mysql command line crash after control-c
    - Update for new DBUG library.

  sql/set_var.cc@1.125.35.9, 2008-03-28 14:02:23-04:00, iggy@amd64.(none) +1 -1
    Bug#26243 mysql command line crash after control-c
    - Update for new DBUG library.

  sql/slave.cc@1.241.32.1, 2008-03-28 14:02:23-04:00, iggy@amd64.(none) +1 -1
    Bug#26243 mysql command line crash after control-c
    - Update for new DBUG library.

  sql/sql_cache.cc@1.76.16.1, 2008-03-28 14:02:23-04:00, iggy@amd64.(none) +3 -3
    Bug#26243 mysql command line crash after control-c
    - Update for new DBUG library.

  sql/sql_select.cc@1.312.196.1, 2008-03-28 14:02:23-04:00, iggy@amd64.(none) +1 -1
    Bug#26243 mysql command line crash after control-c
    - Update for new DBUG library.

  sql/ha_federated.cc@1.24.37.1, 2008-03-28 14:02:23-04:00, iggy@amd64.(none) +1 -1
    Bug#26243 mysql command line crash after control-c
    - Update for new DBUG library.

  sql/ha_innodb.cc@1.202.57.1, 2008-03-28 14:02:23-04:00, iggy@amd64.(none) +1 -1
    Bug#26243 mysql command line crash after control-c
    - Update for new DBUG library.

  myisam/mi_open.c@1.90.34.1, 2008-03-28 14:02:23-04:00, iggy@amd64.(none) +1 -1
    Bug#26243 mysql command line crash after control-c
    - Update for new DBUG library.

  sql/ha_myisammrg.cc@1.59.25.1, 2008-03-28 14:02:23-04:00, iggy@amd64.(none) +1 -1
    Bug#26243 mysql command line crash after control-c
    - Update for new DBUG library.

  tests/mysql_client_test.c@1.167.43.4, 2008-03-28 14:02:23-04:00, iggy@amd64.(none) +0 -1
    Bug#26243 mysql command line crash after control-c
    - Update for new DBUG library.

ChangeSet@1.2542.51.6, 2008-03-28 18:56:43+01:00, mats@mats-laptop.(none) +4 -0
  Post-merge fixes to remove test failures resulting from merge.

  mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result@1.10, 2008-03-28 18:56:41+01:00, mats@mats-laptop.(none) +4 -0
    Result change.

  mysql-test/suite/rpl/r/rpl_extraCol_myisam.result@1.17, 2008-03-28 18:56:42+01:00, mats@mats-laptop.(none) +2 -2
    Result change.

  mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result@1.28, 2008-03-28 18:56:42+01:00, mats@mats-laptop.(none) +0 -438
    Result change.

  mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test@1.22, 2008-03-28 18:56:42+01:00, mats@mats-laptop.(none) +0 -2
    Removing rows causing tests to be non-deterministic.

ChangeSet@1.2542.54.4, 2008-03-28 18:45:03+02:00, gkodinov@magare.gmz +5 -0
  Fixed problem with non-synchronous error lists
    in perror and handler descriptors (BUG#25177)
  Fixed problem of masking mysql error by system
    error in perror (BUG#23028)

  extra/perror.c@1.53, 2008-03-28 18:45:02+02:00, gkodinov@magare.gmz +30 -49
    Used common handlers error list.
    Fixed BUG#23028 ignoring mysql error in case of
    OS and mysql error codes overlapping.

  include/my_base.h@1.112, 2008-03-28 18:45:02+02:00, gkodinov@magare.gmz +7 -3
    Added errors of maria engine.
    Fixed incorrect comment in #define (can be cause of
    seriouse problems)

  include/my_handler.h@1.15, 2008-03-28 18:45:02+02:00, gkodinov@magare.gmz +6 -0
    Added ability to be included into C++ code.

  mysys/my_handler.c@1.33, 2008-03-28 18:45:02+02:00, gkodinov@magare.gmz +10 -42
    Error texts moved to the separate files.

  mysys/my_handler_errors.h@1.1, 2008-03-28 18:45:02+02:00, gkodinov@magare.gmz +67 -0
    New BitKeeper file ``mysys/my_handler_errors.h''

  mysys/my_handler_errors.h@1.0, 2008-03-28 18:45:02+02:00, gkodinov@magare.gmz +0 -0

ChangeSet@1.2542.54.3, 2008-03-28 18:43:13+02:00, gkodinov@magare.gmz +1 -0
  fixed compiler error in 5.1-marvel.

  sql/sql_plugin.cc@1.88, 2008-03-28 18:43:11+02:00, gkodinov@magare.gmz +0 -1
    fixed compiler error in 5.1-marvel.

ChangeSet@1.2550, 2008-03-28 18:25:49+02:00, aelkin@mysql1000.(none) +1 -0
  wl#4091
  
  improving a test that shows a failure.
  
  the wait condition was for data in tables but the 
  log positions are updates after the data are unlocked.
  So there was a time window
  [after_table_unlock_for_select, log_pos_updated] where the
  orig cond was true but log position might be changed.
  the correct one is to expect the last pos of the
  slave's insert in the output of show_slave_status on the
  master.

  mysql-test/suite/rpl/t/rpl_flushlog_loop.test@1.25, 2008-03-28 18:25:48+02:00, aelkin@mysql1000.(none) +12 -6
    refining a sychronization condition (2 times)

ChangeSet@1.1810.3698.1, 2008-03-28 18:59:13+03:00, anozdrin@quad.opbmk +5 -0
  Fix for Bug#35469: server crash with LOAD DATA INFILE to a VIEW.
  
  The problem was that LOAD DATA code (sql_load.cc) didn't take into
  account that there may be items, representing references to other
  columns. This is a usual case in views. The crash happened because
  Item_direct_view_ref was casted to Item_user_var_as_out_param,
  which is not a base class.
  
  The fix is to
    1) Handle references properly;
    2) Ensure that an item is treated as a user variable only when
       it is a user variable indeed;
    3) Report an error if LOAD DATA is used to load data into
       non-updatable column.

  mysql-test/r/loaddata.result@1.20.1.13, 2008-03-28 18:59:13+03:00, anozdrin@quad.opbmk +76 -0
    Update result file.

  mysql-test/std_data/bug35649.data@1.1, 2008-03-28 18:59:13+03:00, anozdrin@quad.opbmk +3 -0
    Add a data file for the test case.

  mysql-test/std_data/bug35649.data@1.0, 2008-03-28 18:59:13+03:00, anozdrin@quad.opbmk +0 -0

  mysql-test/t/loaddata.test@1.15.2.2, 2008-03-28 18:59:13+03:00, anozdrin@quad.opbmk +82 -0
    Add a test case form Bug#35469: server crash with
    LOAD DATA INFILE to a VIEW.

  sql/share/errmsg.txt@1.42.25.1, 2008-03-28 18:59:13+03:00, anozdrin@quad.opbmk +4 -0
    Introduce a new error.

  sql/sql_load.cc@1.78.1.42, 2008-03-28 18:59:13+03:00, anozdrin@quad.opbmk +42 -14
    Handle reference-items properly.

ChangeSet@1.2542.54.2, 2008-03-28 17:24:23+02:00, gkodinov@macbook.gmz +1 -0
  fixed a hand in 5.1-marvel : 
  Removed a double release of the mutex on error

  sql/sql_plugin.cc@1.87, 2008-03-28 17:24:16+02:00, gkodinov@macbook.gmz +0 -5
    fixed a hand in 5.1-marvel : 
    Removed a double release of the mutex on error

ChangeSet@1.2542.58.1, 2008-03-28 19:16:52+04:00, ramil@mysql.com +3 -0
  Fix for bug #35392: Delete all statement does not execute properly 
  after few delete statements
  
  Problem: changing a file size might require that it must be 
  unmapped beforehand.
    
  Fix: unmap the file before changing its size.

  mysql-test/r/temp_table.result@1.29, 2008-03-28 19:16:49+04:00, ramil@mysql.com +11 -0
    Fix for bug #35392: Delete all statement does not execute properly 
    after few delete statements
      - test result.

  mysql-test/t/temp_table.test@1.20, 2008-03-28 19:16:49+04:00, ramil@mysql.com +14 -0
    Fix for bug #35392: Delete all statement does not execute properly 
    after few delete statements
      - test case.

  storage/myisam/mi_delete_all.c@1.23, 2008-03-28 19:16:49+04:00, ramil@mysql.com +7 -4
    Fix for bug #35392: Delete all statement does not execute properly 
    after few delete statements
      - unmap file before changing its size as it's required 
        by SetEndOfFile() function (see my_chsize()).
      - as no other threads allowed to perform concurrent inserts 
        when delete_all is called, mmap_lock locking removed.

ChangeSet@1.2549, 2008-03-28 16:07:50+02:00, aelkin@mysql1000.(none) +1 -0
  BUG#33029
  
  refining a test for embedded env.

  mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test@1.3, 2008-03-28 16:07:48+02:00, aelkin@mysql1000.(none) +2 -0
    test must ensure there is binlog capability on the server

ChangeSet@1.1616.3138.2, 2008-03-28 14:27:22+01:00, mattiasj@witty. +1 -0
  Bug#21413 - Engine table handler used by multiple threads
              in REPLACE DELAYED
      
  post push patch, removing the optimization for
  copying delayed_insert variables.

  sql/sql_insert.cc@1.86.27.4, 2008-03-28 14:27:21+01:00, mattiasj@witty. +2 -3
    Bug#21413 - Engine table handler used by multiple threads
                in REPLACE DELAYED
    
    post push patch, removing the optimization for
    copying delayed_insert variables.
    (restored some parts which caused errors)

ChangeSet@1.2542.55.1, 2008-03-28 13:16:41+01:00, mats@mats-laptop.(none) +33 -0
  BUG#29020 (Event results not correctly replicated to slave in RBR):
  
  The bug allow multiple executing transactions working with non-transactional
  to interfere with each others by interleaving the events of different trans-
  actions.
  
  Bug is fixed by writing non-transactional events to the transaction cache and
  flushing the cache to the binary log at statement commit. To mimic the behavior
  of normal statement-based replication, we flush the transaction cache in row-
  based mode when there is no committed statements in the transaction cache,
  which means we are committing the first one. This means that it will be written
  to the binary log as a "mini-transaction" with just the rows for the statement.
  
  Note that the changes here does not take effect when building the server with
  HAVE_TRANSACTIONS set to false, but it is not clear if this was possible before
  this patch either.
  
  For row-based logging, we also have that when AUTOCOMMIT=1, the code now always
  generates a BEGIN/COMMIT pair for single statements, or BEGIN/ROLLBACK pair in the
  case of non-transactional changes in a statement that was rolled back. Note that
  for the case where changes to a non-transactional table causes a rollback due
  to error, the statement will now be logged with a BEGIN/ROLLBACK pair, even
  though some changes has been committed to the non-transactional table.

  mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test@1.6, 2008-03-28 13:16:35+01:00, mats@mats-laptop.(none) +0 -1
    Removing SHOW BINLOG EVENTS causing test to be non-deterministic.

  mysql-test/r/ctype_cp932_binlog_row.result@1.7, 2008-03-28 13:16:36+01:00, mats@mats-laptop.(none) +2 -0
    Result change.

  mysql-test/suite/binlog/r/binlog_base64_flag.result@1.2.1.1, 2008-03-28 13:16:36+01:00, mats@mats-laptop.(none) +1 -0
    Result change.

  mysql-test/suite/binlog/r/binlog_multi_engine.result@1.14, 2008-03-28 13:16:36+01:00, mats@mats-laptop.(none) +2 -0
    Result file change.

  mysql-test/suite/binlog/r/binlog_row_binlog.result@1.25, 2008-03-28 13:16:36+01:00, mats@mats-laptop.(none) +27 -3
    Result file change.

  mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result@1.9, 2008-03-28 13:16:36+01:00, mats@mats-laptop.(none) +13 -0
    Result file change.

  mysql-test/suite/binlog/r/binlog_row_insert_select.result@1.9, 2008-03-28 13:16:36+01:00, mats@mats-laptop.(none) +2 -0
    Result file change.

  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result@1.35, 2008-03-28 13:16:36+01:00, mats@mats-laptop.(none) +35 -3
    Result file change.

  mysql-test/suite/binlog/r/binlog_stm_binlog.result@1.40, 2008-03-28 13:16:36+01:00, mats@mats-laptop.(none) +6 -0
    Result file change.

  mysql-test/suite/binlog/t/binlog_base64_flag.test@1.3.1.1, 2008-03-28 13:16:37+01:00, mats@mats-laptop.(none) +3 -0
    Removing table that will be used in test to prevent failing if preceeding
    tests forgot to drop the table.

  mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result@1.14, 2008-03-28 13:16:37+01:00, mats@mats-laptop.(none) +6 -2
    Result file change.

  mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result@1.25, 2008-03-28 13:16:37+01:00, mats@mats-laptop.(none) +6 -2
    Result file change.

  mysql-test/suite/rpl/r/rpl_row_create_table.result@1.20.2.1, 2008-03-28 13:16:37+01:00, mats@mats-laptop.(none) +53 -46
    Result file change.

  mysql-test/suite/rpl/r/rpl_row_delayed_ins.result@1.11, 2008-03-28 13:16:37+01:00, mats@mats-laptop.(none) +0 -10
    Result file change.

  mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result@1.9, 2008-03-28 13:16:37+01:00, mats@mats-laptop.(none) +2 -2
    Result file change.

  mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result@1.14, 2008-03-28 13:16:37+01:00, mats@mats-laptop.(none) +2 -2
    Result file change.

  mysql-test/suite/rpl/r/rpl_row_log.result@1.25, 2008-03-28 13:16:37+01:00, mats@mats-laptop.(none) +26 -8
    Result file change.

  mysql-test/suite/rpl/r/rpl_row_log_innodb.result@1.26, 2008-03-28 13:16:38+01:00, mats@mats-laptop.(none) +2 -0
    Result file change.

  mysql-test/suite/rpl/r/rpl_row_until.result@1.13, 2008-03-28 13:16:38+01:00, mats@mats-laptop.(none) +10 -10
    Result file change.

  mysql-test/suite/rpl/r/rpl_slave_skip.result@1.7, 2008-03-28 13:16:38+01:00, mats@mats-laptop.(none) +10 -4
    Result file change.

  mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result@1.27, 2008-03-28 13:16:38+01:00, mats@mats-laptop.(none) +100 -330
    Result file change.

  mysql-test/suite/rpl/r/rpl_truncate_2myisam.result@1.9, 2008-03-28 13:16:38+01:00, mats@mats-laptop.(none) +6 -0
    Result file change.

  mysql-test/suite/rpl/t/rpl_row_create_table.test@1.18, 2008-03-28 13:16:38+01:00, mats@mats-laptop.(none) +3 -3
    Binlog position change.

  mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test@1.9, 2008-03-28 13:16:38+01:00, mats@mats-laptop.(none) +1 -1
    Binlog position change.

  mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test@1.9, 2008-03-28 13:16:38+01:00, mats@mats-laptop.(none) +11 -6
    Binlog position change. Added stop position to mysqlbinlog argments to prevent
    extreneous output.

  mysql-test/suite/rpl/t/rpl_row_until.test@1.10, 2008-03-28 13:16:38+01:00, mats@mats-laptop.(none) +1 -1
    Binlog position change.

  mysql-test/suite/rpl/t/rpl_slave_skip.test@1.5, 2008-03-28 13:16:38+01:00, mats@mats-laptop.(none) +1 -1
    Binlog position change.

  mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test@1.21, 2008-03-28 13:16:39+01:00, mats@mats-laptop.(none) +1 -1
    Removing extreneous SHOW BINLOG EVENTS causing test to be non-deterministic.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result@1.33, 2008-03-28 13:16:39+01:00, mats@mats-laptop.(none) +2 -0
    Result change.

  sql/log.cc@1.302.14.1, 2008-03-28 13:16:39+01:00, mats@mats-laptop.(none) +131 -50
    Adding variable at_least_one_stmt to denote that there is at least one
    statement committed to the transaction cache (but there might be more).
    
    Removing duplicate checks from binlog_end_trans(). The transaction cache
    should always be committed or rolled back when this function is called.
    
    Correcting conditions for binlog_rollback() and binlog_commit() and removing
    the previous "invisible commit" in favor of always using explicit commits
    in the binary log.

  sql/log_event.cc@1.290.3.1, 2008-03-28 13:16:39+01:00, mats@mats-laptop.(none) +1 -16
    Marking table map event to be cached. Removing Muted_query_log_event from code.

  sql/log_event.h@1.173.1.1, 2008-03-28 13:16:39+01:00, mats@mats-laptop.(none) +0 -25
    Removing unused class Muted_query_log_event.

  sql/sql_insert.cc@1.307.2.1, 2008-03-28 13:16:40+01:00, mats@mats-laptop.(none) +6 -6
    Adding missing call to ha_autocommit_or_rollback() for delayed thread. Marking
    CREATE-SELECT statements as transactional, since they don't need to be logged.

ChangeSet@1.2542.50.1, 2008-03-27 19:39:21+02:00, gkodinov@magare.gmz +3 -0
  Bug #35206: select query result different if the key is indexed or not
  
  The code for executing indexed ORDER BY was not setting all the 
  internal fields correctly when selecting to execute ORDER BY over
  and index.
  Fixed by change the access method to one that will use the 
  quick indexed access if one is selected while selecting indexed
  ORDER BY.

  mysql-test/r/order_by.result@1.73, 2008-03-27 19:39:18+02:00, gkodinov@magare.gmz +30 -0
    Bug #35206: test case

  mysql-test/t/order_by.test@1.57, 2008-03-27 19:39:19+02:00, gkodinov@magare.gmz +462 -0
    Bug #35206: test case

  sql/sql_select.cc@1.583.4.1, 2008-03-27 19:39:19+02:00, gkodinov@magare.gmz +17 -0
    Bug #35206: Change the access method when selecting a 
    quick indexed access.

ChangeSet@1.1810.3667.6, 2008-03-27 19:49:32+03:00, evgen@moonbone.local +10 -0
  Bug#27219: Aggregate functions in ORDER BY.
  
  Mixing aggregate functions and non-grouping columns is not allowed in the
  ONLY_FULL_GROUP_BY mode. However in some cases the error wasn't thrown because
  of insufficient check.
  
  In order to check more thoroughly the new algorithm employs a list of outer
  fields used in a sum function and a SELECT_LEX::full_group_by_flag.
  Each non-outer field checked to find out whether it's aggregated or not and
  the current select is marked accordingly.
  All outer fields that are used under an aggregate function are added to the
  Item_sum::outer_fields list and later checked by the Item_sum::check_sum_func
  function.

  mysql-test/r/group_by.result@1.69.1.14, 2008-03-27 19:49:15+03:00, evgen@moonbone.local +146 -0
    Added a test case for the bug#27219: Aggregate functions in ORDER BY.

  mysql-test/t/group_by.test@1.59.1.9, 2008-03-27 19:49:13+03:00, evgen@moonbone.local +117 -0
    Added a test case for the bug#27219: Aggregate functions in ORDER BY.

  sql/item.cc@1.113.115.1, 2008-03-27 19:49:19+03:00, evgen@moonbone.local +24 -4
    Bug#27219: Aggregate functions in ORDER BY.
    Now the Item_field::fix_fields function checks whether the field is aggregated
    or not and marks its select_lex accordingly.

  sql/item_subselect.cc@1.113.20.1, 2008-03-27 19:49:18+03:00, evgen@moonbone.local +14 -0
    Bug#27219: Aggregate functions in ORDER BY.
    The Item_in_subselect::select_in_like_transformer function now drops
    ORDER BY clause in all selects in a subquery.

  sql/item_sum.cc@1.170.30.1, 2008-03-27 19:49:18+03:00, evgen@moonbone.local +64 -0
    Bug#27219: Aggregate functions in ORDER BY.
    Now the Item_sum::check_sum_func function now checks whether fields in the
    outer_fields list are aggregated or not and marks selects accordingly.

  sql/item_sum.h@1.102.1.13, 2008-03-27 19:49:17+03:00, evgen@moonbone.local +7 -0
    Bug#27219: Aggregate functions in ORDER BY.
    The outer_fields list is added to the Item_sum class.

  sql/mysql_priv.h@1.290.134.1, 2008-03-27 19:49:17+03:00, evgen@moonbone.local +7 -0
    Bug#27219: Aggregate functions in ORDER BY.
    Defined a set of constants used in the new check for mixing non aggregated
    fields and sum functions in the ONLY_FULL_GROUP_BY_MODE.

  sql/sql_lex.cc@1.142.42.15, 2008-03-27 19:49:16+03:00, evgen@moonbone.local +1 -2
    Bug#27219: Aggregate functions in ORDER BY.
    Initialization of the full_group_by_flag bitmap.
    SELECT_LEX::test_limit function doesn't reset ORDER BY
    clause anymore.
    

  sql/sql_lex.h@1.175.41.14, 2008-03-27 19:49:16+03:00, evgen@moonbone.local +10 -1
    Bug#27219: Aggregate functions in ORDER BY.
    The full_group_by_flag is added to the SELECT_LEX class.

  sql/sql_select.cc@1.312.195.1, 2008-03-27 19:49:15+03:00, evgen@moonbone.local +5 -29
    Bug#27219: Aggregate functions in ORDER BY.
    Implementation of new check for mixing non aggregated fields and aggregation
    function in the ONLY_FULL_GROUP_BY mode.

ChangeSet@1.2542.41.5, 2008-03-27 17:43:17+01:00, tnurnberg@mysql.com +2 -0
  Bug#35272: @@global.key_buffer_size = 4294967295 let the server crash
  
  reverting test that has been obsoleted by changes to the code

  mysql-test/r/key_cache.result@1.26, 2008-03-27 17:43:16+01:00, tnurnberg@mysql.com +0 -5
    reverting test that has been obsoleted by changes to the code

  mysql-test/t/key_cache.test@1.22, 2008-03-27 17:43:16+01:00, tnurnberg@mysql.com +0 -25
    reverting test that has been obsoleted by changes to the code

ChangeSet@1.2542.14.24, 2008-03-27 15:13:10+01:00, df@pippilotta.erinye.com +11 -0
  apply snapshot innodb-5.1-ss2387
  
  ------------------------------------------------------------------------
  r2361 | sunny | 2008-03-12 09:08:09 +0200 (Wed, 12 Mar 2008) | 3 lines
  Changed paths:
     M /branches/5.1/include/srv0srv.h
     M /branches/5.1/os/os0file.c
     M /branches/5.1/srv/srv0srv.c
     M /branches/5.1/srv/srv0start.c
  
  branches/5.1: Remove the innodb_flush_method fdatasync option since it was
  not being used and there was a potential it could mislead users.
  
  ------------------------------------------------------------------------
  r2367 | marko | 2008-03-17 10:23:03 +0200 (Mon, 17 Mar 2008) | 5 lines
  Changed paths:
     M /branches/5.1/handler/ha_innodb.cc
  
  branches/5.1: ha_innobase::check_if_incompatible_data(): Check
  HA_CREATE_USED_ROW_FORMAT before comparing row_type.  Previously,
  the comparison was incorrectly guarded by the presence of an
  AUTO_INCREMENT attribute.
  
  ------------------------------------------------------------------------
  r2374 | vasil | 2008-03-18 09:35:30 +0200 (Tue, 18 Mar 2008) | 11 lines
  Changed paths:
     M /branches/5.1/dict/dict0dict.c
     A /branches/5.1/mysql-test/innodb_bug35220.result
     A /branches/5.1/mysql-test/innodb_bug35220.test
  
  branches/5.1:
  
  Fix Bug#35220 ALTER TABLE too picky on reserved word "foreign".
  
  In ALTER TABLE, change the internal parser to search for
  ``FOREIGN[[:space:]]'' instead of only ``FOREIGN'' when parsing
  ALTER TABLE ... DROP FOREIGN KEY ...; otherwise it could be mistaken
  with ALTER TABLE ... DROP foreign_col;
  
  Approved by:    Heikki
  
  ------------------------------------------------------------------------
  r2379 | vasil | 2008-03-19 18:48:00 +0200 (Wed, 19 Mar 2008) | 10 lines
  Changed paths:
     M /branches/5.1/os/os0file.c
  
  branches/5.1:
  
  Fix Bug#34823:
  fsync() occasionally returns ENOLCK and causes InnoDB to restart mysqld
  
  Create a wrapper to fsync(2) that retries the operation if the error is
  ENOLCK. Use that wrapper instead of fsync(2).
  
  Approved by:    Heikki
  
  ------------------------------------------------------------------------
  r2380 | sunny | 2008-03-21 05:03:56 +0200 (Fri, 21 Mar 2008) | 9 lines
  Changed paths:
     M /branches/5.1/include/trx0undo.h
     M /branches/5.1/trx/trx0trx.c
     M /branches/5.1/trx/trx0undo.c
  
  branches/5.1: Fix for Bug# 35352. We've added a heuristic that checks
  the size of the UNDO slots cache lists (insert and upate). If either of
  cached lists has more than 500 entries then we add any UNDO slots that are
  freed, to the common free list instead of the cache list, this is to avoid
  the case where all the free slots end up in only one of the lists on startup
  after a crash.
  
  Tested with test case for 26590 and passes all mysql-test(s).
  
  ------------------------------------------------------------------------
  r2383 | vasil | 2008-03-26 09:35:22 +0200 (Wed, 26 Mar 2008) | 4 lines
  Changed paths:
     M /branches/5.1/include/row0mysql.h
  
  branches/5.1:
  
  Fix typo in comment.
  
  ------------------------------------------------------------------------
  r2384 | vasil | 2008-03-26 18:26:54 +0200 (Wed, 26 Mar 2008) | 20 lines
  Changed paths:
     A /branches/5.1/mysql-test/innodb_bug34300.result
     A /branches/5.1/mysql-test/innodb_bug34300.test
     M /branches/5.1/row/row0sel.c
  
  branches/5.1:
  
  Fix Bug#34300 Tinyblob & tinytext fields currupted after export/import and alter in 5.1
  
  Copy the BLOB fields, that are stored internally, to a safe place
  (prebuilt->blob_heap) when converting a row from InnoDB format to
  MySQL format in row_sel_store_mysql_rec().
  
  The bug was introduced in:
  
   ------------------------------------------------------------------------
   r587 | osku | 2006-05-23 15:35:58 +0300 (Tue, 23 May 2006) | 3 lines
  
   Optimize BLOB selects by using prebuilt->blob_heap directly instead of first
   reading BLOB data to a temporary heap and then copying it to
   prebuilt->blob_heap.
   ------------------------------------------------------------------------
  
  Approved by:    Heikki
  
  ------------------------------------------------------------------------
  r2386 | vasil | 2008-03-27 07:45:02 +0200 (Thu, 27 Mar 2008) | 22 lines
  Changed paths:
     M /branches/5.1/mysql-test/innodb.result
  
  branches/5.1:
  
  Merge change from MySQL (this fixes the failing innodb test):
  
  ChangeSet@1.1810.3601.4, 2008-02-07 02:33:21+04:00, gshchepa@host.loc +9 -0
    Fixed bug#30059.
    Server handles truncation for assignment of too-long values
    into CHAR/VARCHAR/TEXT columns in a different ways when the
    truncated characters are spaces:
    1. CHAR(N) columns silently ignore end-space truncation;
    2. TEXT columns post a truncation warning/error in the
       non-strict/strict mode.
    3. VARCHAR columns always post a truncation note in
       any mode.
  
    Space truncation processing has been synchronised over
    CHAR/VARCHAR/TEXT columns: current behavior of VARCHAR
    columns has been propagated as standard.
  
    Binary-encoded string/BLOB columns are not affected.
  
  
  ------------------------------------------------------------------------
  r2387 | vasil | 2008-03-27 08:49:05 +0200 (Thu, 27 Mar 2008) | 8 lines
  Changed paths:
     M /branches/5.1/row/row0sel.c
  
  branches/5.1:
  
  Check whether *trx->mysql_query_str is != NULL in addition to
  trx->mysql_query_str. This adds more safety.
  
  This may or may not fix Bug#35226 RBR event crashes slave.
  
  
  ------------------------------------------------------------------------

  storage/innobase/dict/dict0dict.c@1.111, 2008-03-27 15:12:48+01:00, df@pippilotta.erinye.com +1 -1
    apply snapshot innodb-5.1-ss2387

  storage/innobase/handler/ha_innodb.cc@1.372.1.2, 2008-03-27 15:12:49+01:00, df@pippilotta.erinye.com +1 -1
    apply snapshot innodb-5.1-ss2387

  storage/innobase/include/row0mysql.h@1.56, 2008-03-27 15:12:49+01:00, df@pippilotta.erinye.com +1 -1
    apply snapshot innodb-5.1-ss2387

  storage/innobase/include/srv0srv.h@1.65, 2008-03-27 15:12:49+01:00, df@pippilotta.erinye.com +1 -5
    apply snapshot innodb-5.1-ss2387

  storage/innobase/include/trx0undo.h@1.11, 2008-03-27 15:12:49+01:00, df@pippilotta.erinye.com +1 -0
    apply snapshot innodb-5.1-ss2387

  storage/innobase/os/os0file.c@1.134, 2008-03-27 15:12:49+01:00, df@pippilotta.erinye.com +52 -9
    apply snapshot innodb-5.1-ss2387

  storage/innobase/row/row0sel.c@1.125, 2008-03-27 15:12:49+01:00, df@pippilotta.erinye.com +22 -1
    apply snapshot innodb-5.1-ss2387

  storage/innobase/srv/srv0srv.c@1.113, 2008-03-27 15:12:49+01:00, df@pippilotta.erinye.com +1 -1
    apply snapshot innodb-5.1-ss2387

  storage/innobase/srv/srv0start.c@1.106, 2008-03-27 15:12:49+01:00, df@pippilotta.erinye.com +3 -3
    apply snapshot innodb-5.1-ss2387

  storage/innobase/trx/trx0trx.c@1.79, 2008-03-27 15:12:49+01:00, df@pippilotta.erinye.com +3 -3
    apply snapshot innodb-5.1-ss2387

  storage/innobase/trx/trx0undo.c@1.31, 2008-03-27 15:12:49+01:00, df@pippilotta.erinye.com +22 -4
    apply snapshot innodb-5.1-ss2387

ChangeSet@1.1810.3694.3, 2008-03-27 09:37:20-03:00, davi@mysql.com +2 -0
  Patch clean up.
  Fixed interference between tests: Users were added but not properly removed.
  This caused later tests to fail.

  mysql-test/r/grant.result@1.37.15.3, 2008-03-27 09:37:18-03:00, davi@mysql.com +2 -2
    Fixed interference between tests: Users were added but not properly removed.
    This caused later tests to fail.

  mysql-test/t/grant.test@1.41.10.3, 2008-03-27 09:37:19-03:00, davi@mysql.com +2 -2
    Fixed interference between tests: Users were added but not properly removed.
    This caused later tests to fail.

ChangeSet@1.1810.3696.1, 2008-03-27 13:02:59+01:00, df@pippilotta.erinye.com +1 -0
  BUG#25340

  win/configure.js@1.1.12.1, 2008-03-27 13:02:57+01:00, df@pippilotta.erinye.com +2 -0
    BUG#25340

ChangeSet@1.2548, 2008-03-27 13:48:04+08:00, hezx@mail.hezx.com +2 -0
  post fix after push of bug#33029

  mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result@1.2, 2008-03-27 13:47:59+08:00, hezx@mail.hezx.com +5 -0
    clean up objects used by test

  mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test@1.2, 2008-03-27 13:47:59+08:00, hezx@mail.hezx.com +9 -0
    clean up objects used by test

ChangeSet@1.1810.3620.30, 2008-03-27 13:42:34+08:00, hezx@mail.hezx.com +6 -0
  post fix after push of BUG#33029

  mysql-test/r/binlog_killed_simulate.result@1.1.1.1, 2008-03-27 13:42:30+08:00, hezx@mail.hezx.com +3 -3
    Update test result after push of bug#33029

  mysql-test/r/multi_update.result@1.44.1.6, 2008-03-27 13:42:30+08:00, hezx@mail.hezx.com +2 -2
    Update test result after push of bug#33029

  mysql-test/r/mix_innodb_myisam_binlog.result@1.24.17.1, 2008-03-27 13:42:30+08:00, hezx@mail.hezx.com +93 -93
    Update test result after push of bug#33029

  mysql-test/r/rpl_auto_increment_bug33029.result@1.2, 2008-03-27 13:42:30+08:00, hezx@mail.hezx.com +0 -2
    disable warning messages

  mysql-test/r/rpl_user.result@1.1.3.1, 2008-03-27 13:42:30+08:00, hezx@mail.hezx.com +7 -7
    Update test result after push of bug#33029

  mysql-test/t/rpl_auto_increment_bug33029.test@1.2, 2008-03-27 13:42:30+08:00, hezx@mail.hezx.com +2 -0
    disable warning messages

ChangeSet@1.2542.46.1, 2008-03-27 02:40:45+01:00, tsmith@rhel5-ia64-a.mysql.com +10 -0
  Apply innodb-5.1-ss2360 snapshot
  
  Fixes:
  - Bug #34920: auto_increment resets to 1 on foreign key creation
    We need to use/inherit the passed in autoinc counter for ALTER TABLE
    statements too.

  mysql-test/r/innodb.result@1.213, 2008-03-27 02:37:03+01:00, tsmith@rhel5-ia64-a.mysql.com +19 -0
    Apply innodb-5.1-ss2360 snapshot
    
    Revision r2345:
    branches/5.1: Fix Bug# 34920. We need to use/inherit the passed in autoinc
    counter for ALTER TABLE statements too.

  mysql-test/t/innodb.test@1.177, 2008-03-27 02:37:04+01:00, tsmith@rhel5-ia64-a.mysql.com +23 -0
    Apply innodb-5.1-ss2360 snapshot
    
    Revision r2345:
    branches/5.1: Fix Bug# 34920. We need to use/inherit the passed in autoinc
    counter for ALTER TABLE statements too.

  storage/innobase/dict/dict0dict.c@1.110, 2008-03-27 02:37:04+01:00, tsmith@rhel5-ia64-a.mysql.com +3 -3
    Apply innodb-5.1-ss2360 snapshot
    
    Revision r2353:
    branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
    new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
    the assertion where it crashed previously, since the type has now changed
    to unsigned, it doesn't make sense to check for < 0. Added new tests, to
    check for overflow, for the different INT types supported for both
    signed and unsigned.

  storage/innobase/handler/ha_innodb.cc@1.372.1.1, 2008-03-27 02:37:05+01:00, tsmith@rhel5-ia64-a.mysql.com +43 -16
    Apply innodb-5.1-ss2360 snapshot
    
    Revision r2353:
    branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
    new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
    the assertion where it crashed previously, since the type has now changed
    to unsigned, it doesn't make sense to check for < 0. Added new tests, to
    check for overflow, for the different INT types supported for both
    signed and unsigned.
    
    
    Revision r2345:
    branches/5.1: Fix Bug# 34920. We need to use/inherit the passed in autoinc
    counter for ALTER TABLE statements too.

  storage/innobase/handler/ha_innodb.h@1.148, 2008-03-27 02:37:06+01:00, tsmith@rhel5-ia64-a.mysql.com +1 -1
    Apply innodb-5.1-ss2360 snapshot
    
    Revision r2353:
    branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
    new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
    the assertion where it crashed previously, since the type has now changed
    to unsigned, it doesn't make sense to check for < 0. Added new tests, to
    check for overflow, for the different INT types supported for both
    signed and unsigned.

  storage/innobase/include/dict0dict.h@1.53, 2008-03-27 02:37:06+01:00, tsmith@rhel5-ia64-a.mysql.com +3 -3
    Apply innodb-5.1-ss2360 snapshot
    
    Revision r2353:
    branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
    new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
    the assertion where it crashed previously, since the type has now changed
    to unsigned, it doesn't make sense to check for < 0. Added new tests, to
    check for overflow, for the different INT types supported for both
    signed and unsigned.

  storage/innobase/include/dict0mem.h@1.37, 2008-03-27 02:37:06+01:00, tsmith@rhel5-ia64-a.mysql.com +1 -1
    Apply innodb-5.1-ss2360 snapshot
    
    Revision r2353:
    branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
    new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
    the assertion where it crashed previously, since the type has now changed
    to unsigned, it doesn't make sense to check for < 0. Added new tests, to
    check for overflow, for the different INT types supported for both
    signed and unsigned.

  storage/innobase/include/row0sel.h@1.13, 2008-03-27 02:37:07+01:00, tsmith@rhel5-ia64-a.mysql.com +1 -1
    Apply innodb-5.1-ss2360 snapshot
    
    Revision r2353:
    branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
    new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
    the assertion where it crashed previously, since the type has now changed
    to unsigned, it doesn't make sense to check for < 0. Added new tests, to
    check for overflow, for the different INT types supported for both
    signed and unsigned.

  storage/innobase/include/univ.i@1.66, 2008-03-27 02:37:07+01:00, tsmith@rhel5-ia64-a.mysql.com +3 -0
    Apply innodb-5.1-ss2360 snapshot
    
    Revision r2353:
    branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
    new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
    the assertion where it crashed previously, since the type has now changed
    to unsigned, it doesn't make sense to check for < 0. Added new tests, to
    check for overflow, for the different INT types supported for both
    signed and unsigned.

  storage/innobase/row/row0sel.c@1.124, 2008-03-27 02:37:08+01:00, tsmith@rhel5-ia64-a.mysql.com +5 -5
    Apply innodb-5.1-ss2360 snapshot
    
    Revision r2353:
    branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
    new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
    the assertion where it crashed previously, since the type has now changed
    to unsigned, it doesn't make sense to check for < 0. Added new tests, to
    check for overflow, for the different INT types supported for both
    signed and unsigned.

ChangeSet@1.1616.3138.1, 2008-03-27 01:13:39+01:00, mattiasj@witty. +1 -0
  Recommit of antonys previous commit.
  
  Bug#21413
  "Engine table handler used by multiple threads in REPLACE DELAYED"
  When executing a REPLACE DELAYED statement, the storage engine
  ::extra() method was invoked by a different thread than the thread
  which has acquired the handler instance.
  
  This did not cause problems within the current server and with
  the current storage engines.
  But it has the potential to confuse future storage engines.
  
  Added code to avoid surplus calls to extra() method in case of DELAYED
  which avoids calling storage engine from a different thread than
  expected.
  
  No test case.
  This change does not change behavior in conjunction with current
  storage engines. So it cannot be tested by the regression test suite.

  sql/sql_insert.cc@1.86.27.3, 2008-03-27 01:13:38+01:00, mattiasj@witty. +30 -14
    Bug#21413
    When performing DELAYED operations, we should not call
    the storage engine methods from the 'wrong' context.
    Ensure that the calls to the methods are appropiately guarded
    by either moving calls to sections where the lock_type is checked.
    No need to copy all elements of TABLE_LIST when opening table
    using open_ltable().

ChangeSet@1.2542.21.23, 2008-03-27 00:55:13+04:00, gshchepa@host.loc +1 -0
  view.result:
    Post-merge fix (bug #35193).

  mysql-test/r/view.result@1.254, 2008-03-27 00:54:25+04:00, gshchepa@host.loc +2 -2
    Post-merge fix (bug #35193).

ChangeSet@1.2542.14.18, 2008-03-26 20:27:23+01:00, istruewing@stella.local +1 -0
  Post-merge fix.
  Query cache does now work with concurrent_insert=0. See
  Bug 33756 - query cache with concurrent_insert=0 appears broken

  mysql-test/r/sp_notembedded.result@1.12, 2008-03-26 20:27:21+01:00, istruewing@stella.local +1 -1
    Post-merge fix.
    Query cache does now work with concurrent_insert=0. See
    Bug 33756 - query cache with concurrent_insert=0 appears broken

ChangeSet@1.1810.3692.1, 2008-03-26 22:43:12+04:00, gshchepa@host.loc +3 -0
  Fixed bug #35193.
  View definition as SELECT ... FROM DUAL WHERE ... has
  valid syntax, but use of such view in SELECT or
  SHOW CREATE VIEW syntax causes unexpected syntax error.
  
  Server omits FROM DUAL clause when storing view body
  string in a .frm file for further evaluation.
  However, syntax of SELECT-witout-FROM query is more
  restrictive than SELECT FROM DUAL syntax, and doesn't
  allow the WHERE clause.
  
  NOTE: this syntax difference is not documented.
  
  
  View registration procedure has been modified to
  preserve original structure of view's body.
  

  mysql-test/r/view.result@1.138.1.77, 2008-03-26 22:09:59+04:00, gshchepa@host.loc +18 -0
    Added test case for bug #35193.

  mysql-test/t/view.test@1.126.1.69, 2008-03-26 22:09:59+04:00, gshchepa@host.loc +23 -0
    Added test case for bug #35193.

  sql/sql_select.cc@1.312.1.247, 2008-03-26 22:10:00+04:00, gshchepa@host.loc +8 -0
    Fixed bug #35193.
    The st_select_lex::print function always omits FROM DUAL clause,
    even if original SELECT query has the WHERE clause.
    
    The mysql_register_view function uses this function to reconstruct
    a body of view's AS clause for further evaluation and stores that
    reconstructed clause in a .frm file.
    
    SELECT without FROM syntax is more restrictive than 
    SELECT FROM DUAL syntax: second one allows
    the WHERE clause, but first one is not.
    
    Use of this view in SELECT or SHOW CREATE VIEW queries
    causes unexpected syntax errors.
    
    
    The st_select_lex::print function has been modified to
    reconstruct FROM DUAL clause in queries when needed.
    
    
    TODO: Syntax difference is not documented and should be
    eliminated, however improvement of
    the SELECT-without-FROM syntax is not trivial and leads to
    significant modification of grammar file because of additional
    shift/reduce conflicts.

ChangeSet@1.2542.44.1, 2008-03-26 19:37:36+03:00, kaa@kaamos.(none) +3 -0
  Fix for bug #34928: Confusion by having Primary Key and Index
  
  The bug is a regression introduced in 5.1 by the patch for bug28404.
  
  Under some circumstances test_if_skip_sort_order() could leave some
  data structures in an inconsistent state so that some parts of code
  could assume the selected execution strategy for GROUP BY/DISTINCT as
  a loose index scan (e.g. JOIN_TAB::is_using_loose_index_scan()), while
  the actual strategy chosen was an ordered index scan, which led to
  wrong data being returned.
  
  Fixed test_if_skip_sort_order() so that when changing the type for a
  join table, select->quick is reset not only for EXPLAIN, but for the 
  actual join execution as well, to not confuse code that depends on its
  value to determine the chosen GROUP BY/DISTINCT strategy.

  mysql-test/r/distinct.result@1.59, 2008-03-26 19:37:34+03:00, kaa@kaamos.(none) +23 -0
    Added a test case for bug #34928.

  mysql-test/t/distinct.test@1.33, 2008-03-26 19:37:34+03:00, kaa@kaamos.(none) +23 -0
    Added a test case for bug #34928.

  sql/sql_select.cc@1.583.1.8, 2008-03-26 19:37:34+03:00, kaa@kaamos.(none) +5 -5
    When changing the table's join type to JT_NEXT in 
    test_if_skip_sort_order(), also reset select->quick because other
    code may depend on its value to determine the GROUP BY/DISTINCT
    execution strategy.

ChangeSet@1.2542.42.4, 2008-03-26 16:22:10+01:00, istruewing@stella.local +1 -0
  Post-merge fix

  storage/federated/ha_federated.cc@1.120, 2008-03-26 16:22:08+01:00, istruewing@stella.local +2 -1
    Post-merge fix

ChangeSet@1.2542.14.15, 2008-03-26 13:15:03+03:00, anozdrin@quad.opbmk +1 -0
  Dummy change to force PushBuild.

  README@1.11, 2008-03-26 13:15:02+03:00, anozdrin@quad.opbmk +0 -1
    Dummy change to force PushBuild.

ChangeSet@1.2542.14.14, 2008-03-26 13:14:30+03:00, anozdrin@quad.opbmk +1 -0
  Dummy change to force PushBuild.

  README@1.10, 2008-03-26 13:14:29+03:00, anozdrin@quad.opbmk +1 -0
    Dummy change to force PushBuild.

ChangeSet@1.2542.21.20, 2008-03-25 17:48:05-06:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  Manual merge

  mysql-test/r/sp-code.result@1.21, 2008-03-25 17:47:59-06:00, malff@lambda.hsd1.co.comcast.net. +5 -5
    manual merge, adjust test results

ChangeSet@1.2542.18.17, 2008-03-25 21:30:45+01:00, istruewing@stella.local +1 -0
  Bug#35559 - plugin_load.test creates warnings
  
  plugin_load.test created lines in the warnings files and made
  pushbuild cells yellow. Some pushbuild systems are configured
  so that they don't build the ha_example plugin. Trying to load
  them creates error messages in the error log. These were copied
  to the warnings file.
  
  Fixed by ignoring expected error messages for non-existent
  ha_example.

  mysql-test/lib/mtr_report.pl@1.73.3.1, 2008-03-25 21:30:42+01:00, istruewing@stella.local +2 -0
    Bug#35559 - plugin_load.test creates warnings
    Ignore expected error messages for non-existent ha_example.

ChangeSet@1.2542.41.2, 2008-03-25 15:53:57-03:00, davi@mysql.com +3 -0
  Bug#35272: @@global.key_buffer_size = 4294967295 let the server crash
  
  When trying to get the requested amount of memory for the keybuffer,
  the out of memory could be signaled if one of the tentative allocations
  fail. Later the server would crash (debug assert) when trying to send
  a ok packet with a error set.
  
  The solution is only to signal the error if all tentative allocations
  for the keybuffer fail.

  mysql-test/r/key_cache.result@1.25, 2008-03-25 15:53:54-03:00, davi@mysql.com +5 -0
    Add test case result for Bug#35272

  mysql-test/t/key_cache.test@1.21, 2008-03-25 15:53:55-03:00, davi@mysql.com +25 -0
    Add test case for Bug#35272

  mysys/mf_keycache.c@1.76.1.1, 2008-03-25 15:53:55-03:00, davi@mysql.com +3 -1
    Don't set error on my_large_malloc if allocation fails.
    Set the error if all tentative allocations failed.

ChangeSet@1.1810.3685.7, 2008-03-25 11:20:11-06:00, malff@lambda.hsd1.co.comcast.net. +2 -0
  Bug#20906 (Multiple assignments in SET in stored routine produce incorrect
  instructions)
  
  This bug can not be reproduced in the current version,
  adding the test case to the test suite for coverage, no code change.

  mysql-test/r/sp-code.result@1.5.1.8, 2008-03-25 11:20:08-06:00, malff@lambda.hsd1.co.comcast.net. +28 -0
    Bug#20906 (Multiple assignments in SET in stored routine produce incorrect
    instructions)

  mysql-test/t/sp-code.test@1.6.1.4, 2008-03-25 11:20:08-06:00, malff@lambda.hsd1.co.comcast.net. +32 -0
    Bug#20906 (Multiple assignments in SET in stored routine produce incorrect
    instructions)

ChangeSet@1.2542.41.1, 2008-03-25 18:18:58+02:00, andrey@whirlpool.hristov.com +2 -0
  Fix for Bug #27944 Filtering THD::client capabilities
  
  The server used to trust blindly information from the client about
  its capabilities. During the connection handshake the server sends
  information about what it supports and then the client sends back a
  set of capabilities which cover all of the server's or less.
  Before this changeset the server didn't check whether the flags sent
  by the client were valid for the server. For example, if the server
  doesn't support compressed protocol but the client does and sends that
  bit turned on, the server didn't check it. The change make the server code
  less error prone to problems related to the value of THD::client_capabilities.
  
  Clearly there is no vulnerability being fixed but this is a maintainenance
  fix to prevent misusage in the future.

  include/mysql_com.h@1.130, 2008-03-25 18:18:57+02:00, andrey@whirlpool.hristov.com +31 -0
    List all CLIENT flags in a common defition. Add also a definition
    which excludes flags, which are optoinal.

  sql/sql_connect.cc@1.22.1.1, 2008-03-25 18:18:57+02:00, andrey@whirlpool.hristov.com +16 -7
    Renamed client_flags to server_capabilities to reflect what
    the server supports. Only allow from the client the flags the
    server supports.

ChangeSet@1.1810.3685.6, 2008-03-25 19:44:27+04:00, gshchepa@host.loc +2 -0
  information_schema.test, information_schema.result:
    Minor test case cleanup after bug#34529.

  mysql-test/r/information_schema.result@1.87.4.13, 2008-03-25 19:30:52+04:00, gshchepa@host.loc +2 -1
    Minor test case cleanup after bug#34529.

  mysql-test/t/information_schema.test@1.65.4.11, 2008-03-25 19:43:31+04:00, gshchepa@host.loc +4 -2
    Minor test case cleanup after bug#34529.

ChangeSet@1.2545, 2008-03-25 16:27:23+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#34761 Mysql-test-run.pl script hangs on Windows

  mysql-test/mysql-test-run.pl@1.353, 2008-03-25 16:27:21+01:00, msvensson@pilot.mysql.com +19 -24
    Group all code to find extra suites together
    Fix problem with infinite loop by using splitdir to split the path
    Use a hash to map clone name -> extr suite

ChangeSet@1.2542.39.1, 2008-03-25 15:20:42+01:00, mkindahl@dl145h.mysql.com +2 -0
  Eliminating compiler warnings.

  mysql-test/suite/binlog/combinations@1.1, 2008-03-25 15:20:36+01:00, mkindahl@dl145h.mysql.com +8 -0
    New BitKeeper file ``mysql-test/suite/binlog/combinations''

  mysql-test/suite/binlog/combinations@1.0, 2008-03-25 15:20:36+01:00, mkindahl@dl145h.mysql.com +0 -0

  sql/set_var.h@1.118, 2008-03-25 15:20:36+01:00, mkindahl@dl145h.mysql.com +2 -2
    Changing order of initializer list for sys_var class constructor to
    eliminate compiler warning.

ChangeSet@1.2542.26.15, 2008-03-25 17:37:53+04:00, svoj@mysql.com +3 -0
  BUG#34789 - drop server/create server leaks memory !
  BUG#34790 - 'create server' doesn't handle out of memory scenario
              well enough
  
  This is an addition to fixes for these bugs, which makes gcov
  happy.

  mysql-test/r/federated.result@1.58, 2008-03-25 17:37:51+04:00, svoj@mysql.com +2 -0
    CREATE SERVER is only tested by federated_server.test, which requires
    big-test option. Added dummy test case to make gcov happy.

  mysql-test/t/federated.test@1.48, 2008-03-25 17:37:51+04:00, svoj@mysql.com +6 -0
    CREATE SERVER is only tested by federated_server.test, which requires
    big-test option. Added dummy test case to make gcov happy.

  sql/sql_parse.cc@1.718.1.4, 2008-03-25 17:37:51+04:00, svoj@mysql.com +1 -1
    Make gcov happy.

ChangeSet@1.2542.26.14, 2008-03-25 17:28:12+04:00, svoj@mysql.com +4 -0
  BUG#34768 - nondeterministic INSERT using LIMIT logged in stmt mode
              if binlog_format=mixed
  
  Addition to fix for BUG#34768: fixed test case failures discovered
  by pushbuild.

  mysql-test/suite/binlog/r/binlog_stm_ps.result@1.4, 2008-03-25 17:28:10+04:00, svoj@mysql.com +3 -2
    Fixed binlog_stm_ps failure when binlog format is statement:
    - this test case makes sence only if binlog format is statement,
      thus execute it only in this mode;
    - added a warning that insert ... select ... limit is not safe
      to execute in statement mode.

  mysql-test/suite/binlog/t/binlog_stm_ps.test@1.4, 2008-03-25 17:28:10+04:00, svoj@mysql.com +1 -1
    Fixed binlog_stm_ps failure when binlog format is statement:
    - this test case makes sence only if binlog format is statement,
      thus execute it only in this mode;
    - added a warning that insert ... select ... limit is not safe
      to execute in statement mode.

  mysql-test/suite/rpl/t/rpl_optimize.test@1.9, 2008-03-25 17:28:10+04:00, svoj@mysql.com +2 -0
    rpl_optimize test may be executed in various binlog format modes.
    In statement mode delete ... limit issues a warning, in mixed and
    row modes it does not.
    
    Fixed a test case so it is still possible to execute it in all binlog
    format modes by ignoring delete ... limit warnings.

  mysql-test/suite/rpl/t/rpl_user_variables.test@1.27, 2008-03-25 17:28:10+04:00, svoj@mysql.com +2 -0
    rpl_user_variables test may be executed in various binlog format modes.
    In statement mode insert ... select ... limit issues a warning,
    in mixed and row modes it does not.
    
    Fixed a test case so it is still possible to execute it in all binlog
    format modes by ignoring insert ... select ... limit warnings.

ChangeSet@1.1810.3679.6, 2008-03-25 12:47:57+04:00, svoj@mysql.com +2 -0
  BUG#35509 - Federated leaks memory when connecting to
              localhost/default port
  
  When creating federated table that points to unspecified host or
  localhost on unspecified port or port is 0, small memory leak occurs.
  
  This happens because we make a copy of unix socket path, which is
  never freed.
  
  With this fix we do not make a copy of unix socket path, instead
  share->socket points to MYSQL_UNIX_ADDR constant directly.
  
  This fix is covered by a test case for BUG34788.
  
  Affects 5.0 only.

  mysql-test/t/federated.test@1.19.9.6, 2008-03-25 12:47:55+04:00, svoj@mysql.com +5 -0
    A test case for BUG#35509.

  sql/ha_federated.cc@1.24.35.1, 2008-03-25 12:47:55+04:00, svoj@mysql.com +1 -2
    When creating federated table we call parse_url() to check if connect
    string is correct. parse_url() may make a copy of unix socket path if
    port is not specified or 0 and host is not specified or 'localhost'.
    This copy is never freed.
    
    As there is no need to make a copy of unix socket path, let
    share->socket point to MYSQL_UNIX_ADDR directly.

ChangeSet@1.2542.30.10, 2008-03-24 22:39:48-03:00, davi@mysql.com +1 -0
  Patch for bug 28386 enabled table logging for all tests in
  mysql_client_test causing a severe slowdown and increase
  in memory usage, especially for test cases with long queries.
  
  The solution is to enable the general log only in tests that
  actually need the general log and disable it during the
  execution of all other tests.

  tests/mysql_client_test.c@1.271, 2008-03-24 22:39:45-03:00, davi@mysql.com +42 -11
    Selectively enable and disable the general log.

ChangeSet@1.2542.21.16, 2008-03-23 14:29:35+02:00, gkodinov@macbook.gmz +3 -0
  merge bug 26461 to 5.1-opt

  sql/handler.h@1.277.1.8, 2008-03-23 14:29:31+02:00, gkodinov@macbook.gmz +1 -1
    merge bug 26461 to 5.1-opt

  sql/log.cc@1.302.12.2, 2008-03-23 14:29:31+02:00, gkodinov@macbook.gmz +1 -1
    merge bug 26461 to 5.1-opt

  sql/sql_table.cc@1.457.8.5, 2008-03-23 14:29:31+02:00, gkodinov@macbook.gmz +2 -2
    merge bug 26461 to 5.1-opt

ChangeSet@1.2542.30.9, 2008-03-22 11:32:24+03:00, anozdrin@quad.opbmk +3 -0
  Fix for Bug#34274: Invalid handling of 'DEFAULT 0'
  for YEAR data type.
  
  The problem was that for some unknown reason 0 was not allowed
  as a default value for YEAR data type. That was coded before BK.
  However the Manual does not say a word about such a limitation.
  Also, it looks inconsistent with other data types.
  
  The fix is to allow 0 as a default value.

  mysql-test/r/create.result@1.163, 2008-03-22 11:32:23+03:00, anozdrin@quad.opbmk +41 -0
    Update result file.

  mysql-test/t/create.test@1.113, 2008-03-22 11:32:23+03:00, anozdrin@quad.opbmk +49 -1
    Add a test case for Bug#34274: Invalid handling of 'DEFAULT 0'
    for YEAR data type.

  sql/unireg.cc@1.104.1.7, 2008-03-22 11:32:23+03:00, anozdrin@quad.opbmk +1 -3
    Allow 0 as a default value for YEAR data type.

ChangeSet@1.2542.30.8, 2008-03-22 11:01:31+03:00, anozdrin@quad.opbmk +4 -0
  Fix result files (Bug#21854).

  mysql-test/r/information_schema_db.result@1.27, 2008-03-22 11:01:30+03:00, anozdrin@quad.opbmk +3 -3
    Update result file.

  mysql-test/r/sp-security.result@1.41, 2008-03-22 11:01:30+03:00, anozdrin@quad.opbmk +4 -4
    Update result file.

  mysql-test/r/trigger_notembedded.result@1.18, 2008-03-22 11:01:30+03:00, anozdrin@quad.opbmk +2 -2
    Update result file.

  mysql-test/r/view_grant.result@1.42, 2008-03-22 11:01:30+03:00, anozdrin@quad.opbmk +8 -8
    Update result file.

ChangeSet@1.2542.37.1, 2008-03-21 12:08:04-06:00, malff@lambda.hsd1.co.comcast.net. +3 -0
  Bug#8759 (Stored Procedures: SQLSTATE '00000' should be illegal)
  
  Fixed the parser to reject SQLSTATE '00000',
  since '00000' is the successful completion condition,
  and can not be caught by an exception handler in SQL.

  mysql-test/r/sp-error.result@1.138, 2008-03-21 12:07:58-06:00, malff@lambda.hsd1.co.comcast.net. +12 -0
    Bug#8759 (Stored Procedures: SQLSTATE '00000' should be illegal)

  mysql-test/t/sp-error.test@1.133, 2008-03-21 12:07:59-06:00, malff@lambda.hsd1.co.comcast.net. +26 -0
    Bug#8759 (Stored Procedures: SQLSTATE '00000' should be illegal)

  sql/sp_pcontext.cc@1.36, 2008-03-21 12:07:59-06:00, malff@lambda.hsd1.co.comcast.net. +2 -0
    Bug#8759 (Stored Procedures: SQLSTATE '00000' should be illegal)

ChangeSet@1.2542.30.7, 2008-03-21 18:34:12+03:00, anozdrin@quad.opbmk +5 -0
  A patch for Bug#21854: Problems with CREATE TRIGGER without
  DEFINER clause in --skip-grant-tables mode.
  
  Update error message.

  mysql-test/r/information_schema_db.result@1.26, 2008-03-21 18:34:11+03:00, anozdrin@quad.opbmk +3 -3
    Update result file.

  mysql-test/r/sp-security.result@1.40, 2008-03-21 18:34:11+03:00, anozdrin@quad.opbmk +4 -4
    Update result file.

  mysql-test/r/trigger_notembedded.result@1.17, 2008-03-21 18:34:11+03:00, anozdrin@quad.opbmk +2 -2
    Update result file.

  mysql-test/r/view_grant.result@1.41, 2008-03-21 18:34:11+03:00, anozdrin@quad.opbmk +8 -8
    Update result file.

  sql/share/errmsg.txt@1.175, 2008-03-21 18:34:11+03:00, anozdrin@quad.opbmk +1 -2
    Update error message.

ChangeSet@1.1810.3689.1, 2008-03-21 17:23:17+02:00, gkodinov@macbook.gmz +17 -0
  Bug #26461: Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes)
  
  The bool data type was redefined to BOOL (4 bytes on windows).
  Removed the #define and fixed some of the warnings that were uncovered
  by this.
  Note that the fix also disables 2 warnings :
  4800 : 'type' : forcing value to bool 'true' or 'false' (performance warning)
  4805: 'operation' : unsafe mix of type 'type' and type 'type' in operation
  
  These warnings will be handled in a separate bug, as they are performance related or bogus.
  
  Fixed to int the return type of functions that return more than 
  2 distinct values.

  CMakeLists.txt@1.1.31.1, 2008-03-21 17:23:13+02:00, gkodinov@macbook.gmz +4 -0
    Bug #26461: disable the C4800 and C4805 warnings temporarily

  include/config-win.h@1.71.9.1, 2008-03-21 17:23:13+02:00, gkodinov@macbook.gmz +1 -3
    Bug #26461: 
     - no need for this define for Windows.
     - windows C++ compilers have a bool type

  include/my_global.h@1.96.16.1, 2008-03-21 17:23:13+02:00, gkodinov@macbook.gmz +1 -1
    Bug #26461: removed bool_defined (no longer needed)

  sql/handler.h@1.138.2.52, 2008-03-21 17:23:13+02:00, gkodinov@macbook.gmz +1 -1
    Bug #26461: bool functions must return boolean values

  sql/mysql_priv.h@1.290.127.13, 2008-03-21 17:23:13+02:00, gkodinov@macbook.gmz +7 -7
    Bug #26461: fixed return type of functions that return more than
    2 distinct values.

  sql/procedure.h@1.21.1.3, 2008-03-21 17:23:13+02:00, gkodinov@macbook.gmz +1 -1
    Bug #26461: fixed return type of functions that return more than
    2 distinct values.

  sql/sql_acl.cc@1.128.1.101, 2008-03-21 17:23:14+02:00, gkodinov@macbook.gmz +3 -3
    Bug #26461: fixed return type of functions that return more than
    2 distinct values.

  sql/sql_acl.h@1.28.1.28, 2008-03-21 17:23:14+02:00, gkodinov@macbook.gmz +3 -3
    Bug #26461: fixed return type of functions that return more than
    2 distinct values.

  sql/sql_analyse.cc@1.67.1.5, 2008-03-21 17:23:14+02:00, gkodinov@macbook.gmz +1 -1
    Bug #26461: fixed return type of functions that return more than
    2 distinct values.

  sql/sql_analyse.h@1.20.1.3, 2008-03-21 17:23:14+02:00, gkodinov@macbook.gmz +1 -1
    Bug #26461: fixed return type of functions that return more than
    2 distinct values.

  sql/sql_base.cc@1.235.79.40, 2008-03-21 17:23:14+02:00, gkodinov@macbook.gmz +1 -1
    Bug #26461: fixed return type of functions that return more than
    2 distinct values.

  sql/sql_db.cc@1.120.1.18, 2008-03-21 17:23:14+02:00, gkodinov@macbook.gmz +1 -1
    Bug #26461: fixed return type of functions that return more than
    2 distinct values.

  sql/sql_delete.cc@1.144.29.1, 2008-03-21 17:23:14+02:00, gkodinov@macbook.gmz +2 -2
    Bug #26461: fixed return type of functions that return more than
    2 distinct values.

  sql/sql_load.cc@1.78.1.41, 2008-03-21 17:23:14+02:00, gkodinov@macbook.gmz +1 -1
    Bug #26461: fixed return type of functions that return more than
    2 distinct values.

  sql/sql_parse.cc@1.426.138.54, 2008-03-21 17:23:14+02:00, gkodinov@macbook.gmz +2 -2
    Bug #26461: fixed return type of functions that return more than
    2 distinct values.

  sql/sql_prepare.cc@1.142.39.1, 2008-03-21 17:23:14+02:00, gkodinov@macbook.gmz +3 -3
    Bug #26461: fixed return type of functions that return more than
    2 distinct values.

  sql/sql_update.cc@1.154.45.1, 2008-03-21 17:23:14+02:00, gkodinov@macbook.gmz +1 -1
    Bug #26461: fixed return type of functions that return more than
    2 distinct values.

ChangeSet@1.2542.30.6, 2008-03-21 10:52:00+03:00, anozdrin@quad.opbmk +1 -0
  Fix tree.

  mysql-test/t/drop.test@1.24.1.2, 2008-03-21 10:51:59+03:00, anozdrin@quad.opbmk +6 -6
    Fix tree.

ChangeSet@1.1810.3679.5, 2008-03-20 19:07:17+04:00, svoj@mysql.com +3 -0
  BUG#34788 - malformed federated connection url is not handled
              correctly - crashes server !
  
  Creating federated table with connect string containing empty
  (zero-length) host name and port is evaluated as 0 (port is
  incorrect, omitted or 0) crashes server.
  
  This happens because federated calls strcmp() with NULL pointer.
  
  Fixed by avoiding strcmp() call if hostname is set to NULL.

  mysql-test/r/federated.result@1.25.11.5, 2008-03-20 19:07:16+04:00, svoj@mysql.com +2 -0
    A test case for BUG#34788.

  mysql-test/t/federated.test@1.19.9.5, 2008-03-20 19:07:16+04:00, svoj@mysql.com +7 -0
    A test case for BUG#34788.

  sql/ha_federated.cc@1.24.34.1, 2008-03-20 19:07:16+04:00, svoj@mysql.com +8 -1
    Fixed that parse_url() may call strcmp() with NULL pointer.

ChangeSet@1.2542.30.5, 2008-03-20 11:36:35+03:00, anozdrin@quad. +2 -0
  A test case for Bug#29958: Weird message on DROP DATABASE
  if mysql.proc does not exist.

  mysql-test/r/drop.result@1.35.1.1, 2008-03-20 11:36:34+03:00, anozdrin@quad. +16 -0
    Update result file.

  mysql-test/t/drop.test@1.24.1.1, 2008-03-20 11:36:34+03:00, anozdrin@quad. +34 -0
    Add a test case for Bug#29958: Weird message on DROP DATABASE
    if mysql.proc does not exist.

ChangeSet@1.2542.34.1, 2008-03-20 11:57:30+04:00, svoj@mysql.com +2 -0
  BUG#34789 - drop server/create server leaks memory !
  
  When CREATE SERVER is issued, it allocates memory on memory root
  to store cached server structure. When DROP SERVER is issued,
  it doesn't release this memory, as it is impossible with the
  memory root.
  
  We use the same allocation strategy for plugins and acl. The problem
  here that there was no way (except for the server restart) to force
  'servers' code to release this memory.
  
  With this fix it is possible to release unused server cache memory
  by FLUSH PRIVILEGES.
  
  No test case for this fix.

  sql/sql_parse.cc@1.718.1.3, 2008-03-20 11:57:28+04:00, svoj@mysql.com +2 -0
    Reload servers table on FLUSH PRIVILEGES.

  sql/sql_servers.cc@1.17.1.1, 2008-03-20 11:57:28+04:00, svoj@mysql.com +5 -3
    Instead of just marking memory blocks as unused, release memory
    used by servers cache and initialize new memory root.
    
    This is needed for FLUSH PRIVILEGES to release unused memory
    blocks.

ChangeSet@1.2542.26.12, 2008-03-20 11:40:26+04:00, svoj@mysql.com +1 -0
  BUG#34790 - 'create server' doesn't handle out of memory scenario
              well enough
  
  CREATE SERVER may cause server crash if there is not enough memory
  to execute this operation.
  
  Fixed that create_server() and prepare_server_struct_for_insert()
  didn't check return value of functions that allocate memory.
  
  As this is out of memory issue fix, not test case available.

  sql/sql_servers.cc@1.18, 2008-03-20 11:40:24+04:00, svoj@mysql.com +47 -31
    Fixed that create_server() and prepare_server_struct_for_insert()
    didn't check return value of functions that allocate memory.

ChangeSet@1.1810.3688.2, 2008-03-19 18:36:41-04:00, cmiller@zippy.cornsilk.net +1 -0
  Suggestion of Tim.  Avoid unnecessary sleep.

  support-files/mysql.server.sh@1.49.1.11, 2008-03-19 18:36:39-04:00, cmiller@zippy.cornsilk.net +1 -1
    Suggestion of Tim.  Avoid unnecessary sleep.

ChangeSet@1.1810.3688.1, 2008-03-19 18:13:56-04:00, cmiller@zippy.cornsilk.net +1 -0
  Bug#30378: mysql.server needs to skip wait_for_pid() when mysqld \
  	isn't running
  
  Pass the process id of the manager as a parameter to "wait_for_pid"
  and if the manager isn't running, then do not continue to wait.
  
  Also, capture the error message of our process-existence test, 
  "kill -0", as we expect errors and shouldn't pass them to the user.  
  Additionally, be a bit more descriptive of what the problem is.

  support-files/mysql.server.sh@1.49.1.10, 2008-03-19 18:13:55-04:00, cmiller@zippy.cornsilk.net +27 -4
    Test that the PID-file's manager is running while we're waiting for
    something to happen with the pid-file.
    
    Capture the error message of our process-existence test, "kill -0",
    as we expect errors and shouldn't pass them to the user.
    Additionally, be a bit more descriptive of what the problem is.

ChangeSet@1.1616.3137.1, 2008-03-19 19:13:28+01:00, joerg@trift2. +1 -0
  support-files/mysql.spec.sh  :   Add the man pages for "ndbd" and "ndb_mgmd".

  support-files/mysql.spec.sh@1.83.8.1, 2008-03-19 19:13:26+01:00, joerg@trift2. +6 -0
    Add the man pages for "ndbd" and "ndb_mgmd".

ChangeSet@1.1810.3676.6, 2008-03-19 15:01:03-03:00, davi@mysql.com +1 -0
  Bug#30960 processlist state '*** DEAD ***' on recent 5.0.48 windows builds
  
  The problem is that unimplemented WIN32 version of pthread_kill
  is returning ESRCH no matter the arguments, causing calls to
  mysqld_list_processes to set the procinfo to dead because
  pthread_kill returns non zero. The dead procinfo would show
  up on a second invocation of show processlist.

  include/my_pthread.h@1.90.1.12, 2008-03-19 15:00:53-03:00, davi@mysql.com +4 -4
    When unimplemented, pthread_kill must return zero for
    any process id other then zero.

ChangeSet@1.1810.3686.1, 2008-03-19 18:44:50+02:00, aelkin@mysql1000.(none) +3 -0
  Bug #35178 INSERT_ID not written to binary log for inserts against BLACKHOLE backed tables
  
  binlogging of insert into a autoincrement blackhole table ignored
  an explicit set insert_id.
  
  Fixed with refining of the blackhole's insert method to call
  update_auto_increment() that prepares binlogging the insert query 
  with the preceeding set insert_id.
  
  Note, as the engine does not store any actual data one has to explicitly
  provide to the server with the value of the autoincrement column via
  set insert_id. Otherwise binlogging will happend with the default 
  set insert_id=1.

  mysql-test/t/blackhole.test@1.4.18.1, 2008-03-19 18:44:49+02:00, aelkin@mysql1000.(none) +24 -2
    a regression test for the bug added

  mysql-test/r/blackhole.result@1.5.10.1, 2008-03-19 18:44:49+02:00, aelkin@mysql1000.(none) +17 -0
    results changed

  sql/ha_blackhole.cc@1.21.9.1, 2008-03-19 18:44:49+02:00, aelkin@mysql1000.(none) +1 -1
    blackhole's insert method is refined to call update_auto_increment()
    that prepares binlogging the insert query with the preceeding set insert_id.

ChangeSet@1.1810.3668.2, 2008-03-19 14:32:28+01:00, mhansson@riffraff.(none) +3 -0
  Bug#34529: Crash on complex Falcon I_S select after ALTER .. PARTITION BY
    
  When swapping out heap I_S tables to disk, this is done after plan refinement.
  Thus, READ_RECORD::file will still point to the (deleted) heap handler at start
  of execution. This causes segmentation fault if join buffering is used and the 
  query is a star query where the result is found to be empty before accessing
  some table. In this case that table has not been initialized (i.e. had its 
  READ_RECORD re-initialized) before the cleanup routine tries to close the handler.
  Fixed by updating READ_RECORD::file when changing handler.

  mysql-test/r/information_schema.result@1.87.4.12, 2008-03-19 14:32:27+01:00, mhansson@riffraff.(none) +10 -0
    Bug#34529: Test result.

  mysql-test/t/information_schema.test@1.65.4.10, 2008-03-19 14:32:27+01:00, mhansson@riffraff.(none) +21 -0
    Bug#34529: Test case.

  sql/sql_show.cc@1.253.59.10, 2008-03-19 14:32:27+01:00, mhansson@riffraff.(none) +2 -0
    Bug#34529: The fix.

ChangeSet@1.1810.3684.1, 2008-03-19 15:51:22+04:00, holyfoot@mysql.com +3 -0
  Bug #33334 mysqltest_embedded crashes when disconnecting before reap.
  
  Before breaking the connection we have to check that there's no query
    executing at the moment. Otherwise it can lead to crash in embedded server.

  client/mysqltest.c@1.155.37.4, 2008-03-19 15:51:20+04:00, holyfoot@mysql.com +25 -9
    Bug #33334 mysqltest_embedded crashes when disconnecting before reap.
    
    Wait until the query thread is finished before we break the connection.
    Waiting part moved to a separate wait_query_thread_end() function

  mysql-test/r/flush.result@1.16.1.2, 2008-03-19 15:51:20+04:00, holyfoot@mysql.com +1 -0
    Bug #33334 mysqltest_embedded crashes when disconnecting before reap.
    
    test result

  mysql-test/t/flush.test@1.22.1.2, 2008-03-19 15:51:20+04:00, holyfoot@mysql.com +9 -0
    Bug #33334 mysqltest_embedded crashes when disconnecting before reap.
    
    test case

ChangeSet@1.2542.32.1, 2008-03-18 20:25:34+04:00, svoj@mysql.com +6 -0
  BUG#34768 - nondeterministic INSERT using LIMIT logged in stmt mode if
              binlog_format=mixed
  
  Statement-based replication of DELETE ... LIMIT, UPDATE ... LIMIT,
  INSERT ... SELECT ... LIMIT is not safe as order of rows is not
  defined.
  
  With this fix, we issue a warning that this statement is not safe to
  replicate in statement mode, or go to row-based mode in mixed mode.
  
  Note that we may consider a statement as safe if ORDER BY primary_key
  is present. However it may confuse users to see very similiar statements
  replicated differently.
  
  Note 2: regular UPDATE statement (w/o LIMIT) is unsafe as well, but
  this patch doesn't address this issue. See comment from Kristian
  posted 18 Mar 10:55.

  mysql-test/suite/binlog/r/binlog_stm_ps.result@1.3, 2008-03-18 20:25:32+04:00, svoj@mysql.com +2 -1
    Updated a test case according to fix for BUG#34768:
    INSERT ... SELECT ... LIMIT is now replicated in row mode.

  mysql-test/suite/binlog/r/binlog_unsafe.result@1.7.1.1, 2008-03-18 20:25:32+04:00, svoj@mysql.com +28 -0
    A test case for BUG#34768.

  mysql-test/suite/binlog/t/binlog_unsafe.test@1.4.1.1, 2008-03-18 20:25:32+04:00, svoj@mysql.com +21 -1
    A test case for BUG#34768.

  sql/sql_delete.cc@1.237.2.1, 2008-03-18 20:25:32+04:00, svoj@mysql.com +13 -0
    Statement-based replication of DELETE ... LIMIT is not safe as order of
    rows is not defined, so in mixed mode we go to row-based.

  sql/sql_insert.cc@1.307.1.1, 2008-03-18 20:25:32+04:00, svoj@mysql.com +13 -0
    Statement-based replication of INSERT ... SELECT ... LIMIT is not safe
    as order of rows is not defined, so in mixed mode we go to row-based.

  sql/sql_update.cc@1.249.1.1, 2008-03-18 20:25:32+04:00, svoj@mysql.com +13 -0
    Statement-based replication of UPDATE ... LIMIT is not safe as order of
    rows is not defined, so in mixed mode we go to row-based.

ChangeSet@1.2542.21.9, 2008-03-18 19:42:04+04:00, gluh@mysql.com +1 -0
  Bug#35406 5.1-opt crashes on select from I_S.REFERENTIAL_CONSTRAINTS
  added intialization of f_key_info.referenced_key_name for the case when
  referenced table is dropped

  storage/innobase/handler/ha_innodb.cc@1.373, 2008-03-18 19:41:43+04:00, gluh@mysql.com +2 -0
    added intialization of f_key_info.referenced_key_name for the case when
    referenced table is dropped

ChangeSet@1.1810.3679.4, 2008-03-18 16:38:12+04:00, svoj@mysql.com +2 -0
  Make gcov happy.

  sql/log_event.cc@1.174.27.10, 2008-03-18 16:38:10+04:00, svoj@mysql.com +1 -1
    Make gcov happy.

  sql/repl_failsafe.cc@1.53.6.3, 2008-03-18 16:38:10+04:00, svoj@mysql.com +1 -1
    Make gcov happy.

ChangeSet@1.2542.29.1, 2008-03-18 10:45:36+01:00, thek@adventure.(none) +3 -0
  Bug#25175 Too much memory used by MySQL grant system
  
  Each time the server reloads privileges containing table grants, the 
  system will allocate too much memory than needed because of badly
  chosen growth prediction in the underlying dynamic arrays.
  
  This patch introduces a new signature to the hash container initializer
  which enables a much more pessimistic approach in favour for more
  efficient memory useage.
  
  This patch was supplied by Google Inc.

  include/hash.h@1.22, 2008-03-18 10:45:32+01:00, thek@adventure.(none) +4 -3
    * New signature for _hash_init.
    * Defined new function hash_init2 which takes growth_size argument.

  mysys/hash.c@1.60, 2008-03-18 10:45:32+01:00, thek@adventure.(none) +3 -2
    * New signature for _hash_init.

  sql/sql_acl.cc@1.259.2.1, 2008-03-18 10:45:32+01:00, thek@adventure.(none) +2 -2
    * Changed hash_init signature so that it takes a 'growth_size' smaller
    than the default. Each time a GRANT_TABLE is allocated a pre-allocated
    dynamic array is instantiated. A large growth size can result in too
    many unused hash-entries per table-entry and thus be a waste of free
    memory.

ChangeSet@1.1616.3136.2, 2008-03-18 00:57:57+01:00, kent@mysql.com +1 -0
  Raise version number after cloning 4.1.24

  configure.in@1.201.75.1, 2008-03-18 00:57:45+01:00, kent@mysql.com +2 -2
    Raise version number after cloning 4.1.24

ChangeSet@1.2542.11.16, 2008-03-17 16:39:09-03:00, davi@buzz.(none) +4 -0
  Post-merge fixes for Bug 35103

  libmysql/libmysql.c@1.305.1.4, 2008-03-17 16:39:08-03:00, davi@buzz.(none) +1 -1
    Manual merge

  sql/sql_class.cc@1.352.11.1, 2008-03-17 16:39:08-03:00, davi@buzz.(none) +18 -4
    Don't send anything back to the client if disabled.

  sql/sql_prepare.cc@1.246, 2008-03-17 16:39:08-03:00, davi@buzz.(none) +2 -2
    Don't send any packet back for statement close.

  tests/mysql_client_test.c@1.264.1.3, 2008-03-17 16:39:08-03:00, davi@buzz.(none) +19 -9
    Manual merge

ChangeSet@1.1810.3683.1, 2008-03-17 20:19:04+02:00, aelkin@mysql1000.(none) +5 -0
  Bug #18199  PURGE BINARY LOGS fails silently with missing logs;
  Bug #18453  Warning/error message if there is a mismatch between ...
   
  There were three problems:
   
   1. the reported lack of warnings for the BEFORE syntax of PURGE;
   2. the similar lack of warnings for the TO syntax;
   3. incompatible behaviour between the two in that the latter blanked out
      regardlessly of presence or lack the actual file corresponding to
      an index record; the former version gave up at the first mismatch.
  
  fixed with deploying the warning's generation and synronizing logics of 
  purge_logs() and purge_logs_before_date().
  my_stat() is called in either of two branches of purge_logs() (responsible
  for the TO syntax of PURGE) similarly to how it has behaved in the BEFORE syntax.
  If there is no actual binlog file, my_stat returns NULL and my_delete is
  not invoked.
  A critical error is reported to the user if a file from the index
  could not be retrieved info about or deleted with a system error code
  different than ENOENT.

  mysql-test/include/show_binary_logs.inc@1.1, 2008-03-17 20:19:03+02:00, aelkin@mysql1000.(none) +3 -0
    a new macro - shortcut of show binary logs

  mysql-test/include/show_binary_logs.inc@1.0, 2008-03-17 20:19:03+02:00, aelkin@mysql1000.(none) +0 -0

  mysql-test/r/binlog_index.result@1.1, 2008-03-17 20:19:03+02:00, aelkin@mysql1000.(none) +39 -0
    new results

  mysql-test/r/binlog_index.result@1.0, 2008-03-17 20:19:03+02:00, aelkin@mysql1000.(none) +0 -0

  mysql-test/t/binlog_index.test@1.1, 2008-03-17 20:19:03+02:00, aelkin@mysql1000.(none) +69 -0
    a regression test for the bugs

  mysql-test/t/binlog_index.test@1.0, 2008-03-17 20:19:03+02:00, aelkin@mysql1000.(none) +0 -0

  sql/log.cc@1.158.27.1, 2008-03-17 20:19:03+02:00, aelkin@mysql1000.(none) +127 -26
    generating warning in two functions.
    refining logics to call my_stat() by purge_logs() as it happens
    in purge_logs_before_date().
    my_delete() is called only if my_stat() ensured existance of the file.
    A critical error is reported to the user if a file from the index
    could not be my_stat():ed or my_delete():d with an error different
    than ENOENT.

  sql/share/errmsg.txt@1.42.1.41, 2008-03-17 20:19:03+02:00, aelkin@mysql1000.(none) +2 -0
    new error message

ChangeSet@1.2542.26.10, 2008-03-17 16:18:02+01:00, mattiasj@witty. +14 -0
  Bug#35306: partition_basic_symlink test failures
  
  Have changed the DATA/INDEX dir to not be a database dir.
  (and made some changes for better result files.)

  mysql-test/suite/parts/inc/partition_basic_symlink.inc@1.2, 2008-03-17 16:18:00+01:00, mattiasj@witty. +23 -138
    Bug#35306: partition_basic_symlink test failures
    
    after bug 32167 it is not allowed with DATA/INDEX DIR in any database
    directory.
    
    remade the inc-files to make better use of each other (less duplicate tests)

  mysql-test/suite/parts/inc/partition_directory.inc@1.7, 2008-03-17 16:18:00+01:00, mattiasj@witty. +27 -44
    Removed disable/enable_query_log for better result files

  mysql-test/suite/parts/inc/partition_layout_check1.inc@1.7, 2008-03-17 16:18:00+01:00, mattiasj@witty. +2 -1
    changed DATA/INDEX DIR

  mysql-test/suite/parts/inc/partition_layout_check2.inc@1.6, 2008-03-17 16:18:00+01:00, mattiasj@witty. +5 -0
    added check with_directories

  mysql-test/suite/parts/inc/partition_methods1.inc@1.7, 2008-03-17 16:18:00+01:00, mattiasj@witty. +106 -58
    Removed disable/enable_query_log for better result files

  mysql-test/suite/parts/inc/partition_methods2.inc@1.6, 2008-03-17 16:18:00+01:00, mattiasj@witty. +177 -22
    Removed disable/enable_query_log for better result files
    Added with_directories for testing of DATA/INDEX DIR

  mysql-test/suite/parts/r/partition_basic_innodb.result@1.7.1.2, 2008-03-17 16:18:00+01:00, mattiasj@witty. +720 -200
    Updated test result due to test case changes

  mysql-test/suite/parts/r/partition_basic_myisam.result@1.7.1.2, 2008-03-17 16:18:00+01:00, mattiasj@witty. +232 -4
    Updated test result due to test case changes

  mysql-test/suite/parts/r/partition_basic_symlink_innodb.result@1.3, 2008-03-17 16:18:00+01:00, mattiasj@witty. +25 -37458
    Updated test result due to test case changes

  mysql-test/suite/parts/r/partition_basic_symlink_myisam.result@1.3, 2008-03-17 16:18:01+01:00, mattiasj@witty. +1799 -4152
    Updated test result due to test case changes

  mysql-test/suite/parts/t/disabled.def@1.12, 2008-03-17 16:18:01+01:00, mattiasj@witty. +0 -2
    Bug#35306: parts.partition_basic_symlink test failures
    Enable the test again since the have been fixed

  mysql-test/suite/parts/t/partition_basic_innodb.test@1.5, 2008-03-17 16:18:01+01:00, mattiasj@witty. +2 -2
    Added check for table files.

  mysql-test/suite/parts/t/partition_basic_myisam.test@1.6, 2008-03-17 16:18:01+01:00, mattiasj@witty. +0 -3
    removing dependency of symlink
    (test exists now in parts.partition_basic_symlink_myisam)

  mysql-test/suite/parts/t/partition_basic_symlink_innodb.test@1.2, 2008-03-17 16:18:01+01:00, mattiasj@witty. +79 -0
    Bug#35306: partition_basic_symlink test failures
    
    Removed old test (since DATA/INDEX DIRECTORY is not supported in InnoDB)
    and replaced it with a simple test that altering a partitioned innodb
    with DATA/INDEX DIR to MyISAM, would use the DATA/INDEX DIR.

ChangeSet@1.2542.26.9, 2008-03-17 16:11:26+01:00, mattiasj@witty. +9 -0
  Bug#35305: partition_symlink test failures
  
  Updated the test due to bug 32167
  
  Corrected spelling of error message

  mysql-test/r/partition_not_windows.result@1.4.1.2, 2008-03-17 16:11:23+01:00, mattiasj@witty. +29 -11
    Updated test result due to test case changes and corrected spelling error

  mysql-test/r/partition_symlink.result@1.2.1.2, 2008-03-17 16:11:23+01:00, mattiasj@witty. +7 -0
    Bug#35305: partition_symlink test failure
    
    Updated test result due to test case changes

  mysql-test/r/symlink.result@1.41.1.2, 2008-03-17 16:11:23+01:00, mattiasj@witty. +15 -3
    Updated test result due to test case changes and corrected spelling error

  mysql-test/t/disabled.def@1.294.1.5, 2008-03-17 16:11:23+01:00, mattiasj@witty. +0 -1
    Bug#35305: partition_symlink test failure
    
    Enable the test after it has been fixed

  mysql-test/t/partition_not_windows.test@1.7, 2008-03-17 16:11:23+01:00, mattiasj@witty. +66 -20
    Removed disable/enable_query_log for better result files

  mysql-test/t/partition_symlink.test@1.3.1.2, 2008-03-17 16:11:23+01:00, mattiasj@witty. +4 -10
    Bug#35305: partition_symlink test failure
    
    Changes due to bug 32167

  mysql-test/t/symlink.test@1.32.1.2, 2008-03-17 16:11:24+01:00, mattiasj@witty. +11 -16
    using replace_result instead of disable_query_log

  sql/partition_info.cc@1.46.1.2, 2008-03-17 16:11:24+01:00, mattiasj@witty. +2 -2
    corrected spelling

  sql/sql_parse.cc@1.718.1.2, 2008-03-17 16:11:24+01:00, mattiasj@witty. +2 -2
    corrected spelling

ChangeSet@1.2542.26.8, 2008-03-17 15:56:53+01:00, mattiasj@witty. +2 -0
  Valgrind warnings found after bug#32943 and after merge from -main
  into -engines tree.
  
  hander::table_share was not updated after changing table->s.

  sql/ha_partition.cc@1.117.1.3, 2008-03-17 15:56:51+01:00, mattiasj@witty. +9 -0
    Valgrind warning after merge -main -> -engines, after bug#32943
    
    change_table_ptr can happen in a middle of
    alter table rename/drop/... partition
    
    the newly created partitions must get the updated table_share too.

  sql/sql_base.cc@1.440, 2008-03-17 15:56:51+01:00, mattiasj@witty. +1 -0
    Bug#32943 was missing a call to change_table_ptr, this was found by valgrind
    after a merge from -main to -engines.

ChangeSet@1.1810.3663.6, 2008-03-17 11:16:37-03:00, davi@mysql.com +1 -0
  Post-merge fix for Bug 35103.

  sql/sql_prepare.cc@1.142.38.5, 2008-03-17 11:16:34-03:00, davi@mysql.com +1 -1
    Don't send unexpected error to the client.

ChangeSet@1.2542.11.14, 2008-03-17 14:26:00+03:00, anozdrin@quad. +3 -0
  Avoid races in connect.test.
  
  The problem was in a test case for Bug33507:
    - when the number of active connections reaches the limit,
      the server accepts only root connections. That's achieved by
      accepting a connection, negotiating with the client and
      checking user credentials. If it is not SUPER, the connection
      is dropped.
    - when the server accepts connection, it increases the counter;
    - when the server drops connection, it decreases the counter;
    - the race was in between of decreasing the counter and accepting
      new connection:
      - max_user_connections = 2;
      - 2 oridinary user connections accepted;
      - extra user connection is establishing;
      - server checked user credentials, and sent 'Too many connections'
        error;
      - the client receives the error and establishes extra SUPER user
        connection;
      - the server however didn't decrease the counter (the extra
        user connection still is "alive" in the server) -- so, the new
        SUPER-user connection, will be dropped, because it exceeds
        (max_user_connections + 1).
  
  The fix is to implement "safe connect", which makes several attempts
  to connect and use it in the test script.

  mysql-test/include/connect2.inc@1.1, 2008-03-17 14:25:58+03:00, anozdrin@quad. +56 -0
    Auxiliary routine to establish a connection reliably.

  mysql-test/include/connect2.inc@1.0, 2008-03-17 14:25:58+03:00, anozdrin@quad. +0 -0

  mysql-test/r/connect.result@1.31, 2008-03-17 14:25:58+03:00, anozdrin@quad. +20 -9
    Update test file.

  mysql-test/t/connect.test@1.24, 2008-03-17 14:25:58+03:00, anozdrin@quad. +34 -46
    Avoid races in connect.test.

ChangeSet@1.2542.11.13, 2008-03-17 13:39:56+03:00, anozdrin@quad. +1 -0
  A patch for Bug#35329: connect does not set mysql_errno variable.
  
  The problem was that 'connect' command didn't set mysql_errno
  variable, thus the script was unable to determine whether connection
  was opened or not.
  
  The fix is to set this variable.
  
  Test cases will be added in the scope of Bug33507
  into connect.test file.

  client/mysqltest.c@1.324.5.1, 2008-03-17 13:39:55+03:00, anozdrin@quad. +2 -0
    Set 'mysql_errno' variable.

ChangeSet@1.2542.26.7, 2008-03-15 01:08:35-07:00, antony@pcg5ppc.xiphis.org +2 -0
  make pushbuild green

  mysql-test/suite/parts/t/disabled.def@1.11, 2008-03-15 01:08:32-07:00, antony@pcg5ppc.xiphis.org +2 -0
    make pushbuild green

  mysql-test/t/disabled.def@1.294.1.4, 2008-03-15 01:08:33-07:00, antony@pcg5ppc.xiphis.org +0 -2
    make pushbuild green, entry added to wrong disabled.def file.

ChangeSet@1.2542.26.6, 2008-03-14 23:01:46-07:00, antony@pcg5ppc.xiphis.org +1 -0
  make pushbuild green

  mysql-test/t/disabled.def@1.294.1.3, 2008-03-14 23:01:43-07:00, antony@pcg5ppc.xiphis.org +3 -1
    make pushbuild green

ChangeSet@1.2542.26.5, 2008-03-14 18:45:50-07:00, antony@pcg5ppc.xiphis.org +2 -0
  fix results after merge

  mysql-test/r/partition_not_windows.result@1.4.1.1, 2008-03-14 18:45:45-07:00, antony@pcg5ppc.xiphis.org +3 -0
    fix results from merge

  mysql-test/t/disabled.def@1.294.1.2, 2008-03-14 18:45:45-07:00, antony@pcg5ppc.xiphis.org +1 -0
    disable test partition_symlink

ChangeSet@1.1810.3663.5, 2008-03-14 17:40:12-03:00, davi@mysql.com +4 -0
  Bug#35103 mysql_client_test::test_bug29948 causes sporadic failures
  
  The problem was that the COM_STMT_SEND_LONG_DATA was sending a response
  packet if the prepared statement wasn't found in the server (due to
  reconnection). The commands COM_STMT_SEND_LONG_DATA and COM_STMT_CLOSE
  should not send any packets, even error packets should not be sent since
  they are not expected by the client API.
  
  The solution is to clear generated during the execution of the aforementioned
  commands and to skip resend of prepared statement commands. Another fix is
  that if the connection breaks during the send of prepared statement command,
  the command is not sent again since the prepared statement is no longer in the
  server.

  libmysql/libmysql.c@1.233.29.1, 2008-03-14 17:40:10-03:00, davi@mysql.com +12 -5
    The mysql handle might be reset after a reconnection.
    Pass the now used stmt argument to cli_advanced_command.

  sql-common/client.c@1.83.20.1, 2008-03-14 17:40:10-03:00, davi@mysql.com +7 -3
    Don't resend command if the connection broke and it's a prepared
    statement command. If the session is broken, prepared statements
    on the server are gone, set the error accordanly.

  sql/sql_prepare.cc@1.142.38.4, 2008-03-14 17:40:10-03:00, davi@mysql.com +10 -6
    Clear any error set during the execution of the request
    command.

  tests/mysql_client_test.c@1.167.1.84, 2008-03-14 17:40:10-03:00, davi@mysql.com +1 -78
    Fix memory leak by freeing result associated with statement.
    Remove test case for Bug 29948 because it's not reliable in
    5.0 (fixed in 5.1) due to KILL queries sending two packets for
    a thread that kills itself.

ChangeSet@1.2542.18.11, 2008-03-14 21:37:19+01:00, istruewing@stella.local +3 -0
  Post-merge fixes

  mysql-test/r/merge.result@1.71.1.2, 2008-03-14 21:37:18+01:00, istruewing@stella.local +5 -5
    Post-merge fixes

  mysql-test/r/type_set.result@1.18, 2008-03-14 21:37:18+01:00, istruewing@stella.local +1 -0
    Post-merge fixes

  mysql-test/suite/rpl/r/rpl_row_create_table.result@1.20.1.1, 2008-03-14 21:37:18+01:00, istruewing@stella.local +4 -4
    Post-merge fixes

ChangeSet@1.2542.26.3, 2008-03-15 00:24:10+04:00, svoj@mysql.com +2 -0
  BUG#28248 - mysqldump results with MERGE ... UNION=() cannot be executed
  After merge fix.

  mysql-test/r/merge.result@1.73, 2008-03-15 00:24:06+04:00, svoj@mysql.com +5 -5
    BUG#28248 - mysqldump results with MERGE ... UNION=() cannot be executed
    After merge fix.

  mysql-test/suite/rpl/r/rpl_row_create_table.result@1.21, 2008-03-15 00:24:07+04:00, svoj@mysql.com +4 -4
    BUG#28248 - mysqldump results with MERGE ... UNION=() cannot be executed
    After merge fix.

ChangeSet@1.1810.3671.7, 2008-03-14 20:51:32+01:00, istruewing@stella.local +2 -0
  Post-merge fix

  mysql-test/r/type_set.result@1.13.1.3, 2008-03-14 20:51:31+01:00, istruewing@stella.local +1 -0
    Post-merge fix

  mysql-test/t/type_set.test@1.12.1.1, 2008-03-14 20:51:31+01:00, istruewing@stella.local +1 -1
    Post-merge fix

ChangeSet@1.1810.3669.2, 2008-03-14 23:11:59+04:00, gshchepa@host.loc +4 -0
  Fixed bug #34763.
  
  Queries like:
  
    SELECT ROW(1, 2) IN (SELECT t1.a, 2)
      FROM t1 GROUP BY t1.a
  
  or 
  
    SELECT ROW(1, 2) IN (SELECT t1.a, 2 FROM t2)
      FROM t1 GROUP BY t1.a
  
  lead to assertion failure in the
  Item_in_subselect::row_value_transformer method in debugging
  build, or to unexpected error message in release build:
  
    ERROR 1247 (42S22): Reference '<list ref>' not supported (forward
                        reference in item list)
  
  Unexpected error message and assertion failure have been
  eliminated.

  mysql-test/r/subselect3.result@1.1.1.12, 2008-03-14 22:55:55+04:00, gshchepa@host.loc +12 -1
    Added test case for bug #34763.

  mysql-test/t/subselect3.test@1.12.1.1, 2008-03-14 22:55:58+04:00, gshchepa@host.loc +18 -1
    Added test case for bug #34763.

  sql/item.cc@1.113.113.1, 2008-03-14 22:55:59+04:00, gshchepa@host.loc +9 -6
    Fixed bug #34763.
    The Item_ref::fix_fields method has been modified to silently
    ignore not fixed outer references: by the definition, those
    references should be fixed later by the call to the
    fix_inner_refs function.

  sql/item_subselect.cc@1.113.1.50, 2008-03-14 22:56:00+04:00, gshchepa@host.loc +10 -2
    Fixed bug #34763.
    The Item_in_subselect::row_value_transformer method has been
    modified to eliminate assertion failure on not fixed outer
    references: by the definition those references are allowed in
    this context and should be fixed later by the call to the
    fix_inner_refs function.

ChangeSet@1.2542.22.2, 2008-03-14 17:52:57+01:00, mkindahl@dl145h.mysql.com +8 -0
  Post-merge fixes.

  mysql-test/extra/rpl_tests/rpl_loaddata.test@1.11, 2008-03-14 17:52:51+01:00, mkindahl@dl145h.mysql.com +0 -7
    Removing SHOW MASTER STATUS that does not seem to make sense.

  mysql-test/extra/rpl_tests/rpl_log.test@1.50, 2008-03-14 17:52:51+01:00, mkindahl@dl145h.mysql.com +1 -1
    Correcting test case to sync slave with master.

  mysql-test/suite/binlog/r/binlog_unsafe.result@1.9.1.1, 2008-03-14 17:52:51+01:00, mkindahl@dl145h.mysql.com +0 -2
    Result change.

  mysql-test/suite/binlog/t/binlog_unsafe.test@1.6.1.1, 2008-03-14 17:52:51+01:00, mkindahl@dl145h.mysql.com +0 -1
    Removing unsafe variable from list of safe variables.

  mysql-test/suite/rpl/r/rpl_loaddata.result@1.50, 2008-03-14 17:52:51+01:00, mkindahl@dl145h.mysql.com +1 -5
    Result change.

  mysql-test/suite/rpl/r/rpl_skip_error.result@1.21, 2008-03-14 17:52:51+01:00, mkindahl@dl145h.mysql.com +59 -3
    Result change.

  mysql-test/suite/rpl/t/rpl_skip_error.test@1.20, 2008-03-14 17:52:51+01:00, mkindahl@dl145h.mysql.com +16 -5
    Correcting bad manual+automatic merge. Test is now only relevant for statement-
    based replication.

  sql/rpl_rli.cc@1.19.2.1, 2008-03-14 17:52:51+01:00, mkindahl@dl145h.mysql.com +1 -1
    Correcting automerge undoing previous change of return value.
    Relay_log_info::wait_for_pos() should return -2 when not initialized to work
    correctly.

ChangeSet@1.2542.18.8, 2008-03-14 17:45:14+01:00, istruewing@stella.local +5 -0
  Post-merge fixes

  mysql-test/r/partition_not_windows.result@1.5, 2008-03-14 17:45:12+01:00, istruewing@stella.local +3 -0
    Post-merge fixes
    New warnings

  mysql-test/r/symlink.result@1.44, 2008-03-14 17:45:12+01:00, istruewing@stella.local +4 -4
    Post-merge fixes
    Typo

  mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test@1.6, 2008-03-14 17:45:12+01:00, istruewing@stella.local +2 -2
    Post-merge fixes
    Defeated creation of a warnings file.

  mysql-test/t/partition_symlink.test@1.5, 2008-03-14 17:45:12+01:00, istruewing@stella.local +2 -2
    Post-merge fixes
    Fixed directory to an allowed one.

  mysql-test/t/type_set.test@1.13, 2008-03-14 17:45:12+01:00, istruewing@stella.local +1 -1
    Post-merge fixes
    Defeated creation of a warnings file.

ChangeSet@1.1810.3680.1, 2008-03-14 19:38:22+04:00, svoj@mysql.com +4 -0
  BUG#28248 - mysqldump results with MERGE ... UNION=() cannot be executed
  
  When there are no underlying tables specified for a merge table,
  SHOW CREATE TABLE outputs a statement that cannot be executed. The
  same is true for mysqldump (it generates dumps that cannot be
  executed).
  
  This happens because SQL parser does not accept empty UNION() clause.
  
  This patch changes the following:
  - it is now possible to execute CREATE/ALTER statement with
    empty UNION() clause.
  - the same as above, but still worth noting: it is now possible to
    remove underlying tables mapping using ALTER TABLE ... UNION=().
  - SHOW CREATE TABLE does not output UNION() clause if there are
    no underlying tables specified for a merge table. This makes
    mysqldump slightly smaller.

  mysql-test/r/merge.result@1.43.1.22, 2008-03-14 19:38:20+04:00, svoj@mysql.com +22 -0
    A test case for BUG#28248.

  mysql-test/t/merge.test@1.37.1.18, 2008-03-14 19:38:20+04:00, svoj@mysql.com +13 -0
    A test case for BUG#28248.

  sql/sql_yacc.yy@1.371.143.2, 2008-03-14 19:38:20+04:00, svoj@mysql.com +1 -1
    Make underlying table list for MERGE engine optional.
    
    As for MERGE engine empty underlying tables list is valid, it should
    be valid for the parser as well.
    
    This change is mostly needed to restore dumps made by earlier MySQL
    versions. Also with this fix it is possible to remove underlying
    tables mapping by using ALTER TABLE ... UNION=().

  sql/ha_myisammrg.cc@1.59.23.1, 2008-03-14 19:38:20+04:00, svoj@mysql.com +6 -0
    Do not output UNION clause in SHOW CREATE TABLE, when there are
    no underlying tables defined.

ChangeSet@1.1810.3679.1, 2008-03-14 17:17:03+04:00, svoj@mysql.com +2 -0
  BUG#13861 - START SLAVE UNTIL may stop 1 evnt too late if
              log-slave-updates and circul repl
  
  This is a test case fix for BUG#13861.

  mysql-test/r/rpl_dual_pos_advance.result@1.2.2.1, 2008-03-14 17:17:01+04:00, svoj@mysql.com +0 -3
    Fix for a test case for BUG#13861.

  mysql-test/t/rpl_dual_pos_advance.test@1.2.3.1, 2008-03-14 17:17:01+04:00, svoj@mysql.com +0 -6
    Fix for a test case for BUG#13861.
    
    master_pos_wait() requires slave sql thread running. But it is not
    guaranteed for this test case. As we use start slave until it may
    execute all events and shutdown before master_pos_wait() is started.
    
    On the other hand it is safe just to wait for slave to stop here,
    as start slave returns _after_ sql thread is started.

ChangeSet@1.2542.18.6, 2008-03-14 14:03:47+01:00, istruewing@stella.local +3 -0
  Post-merge fix. Moved the symlink handling from sql_parse.cc here.

  mysql-test/r/symlink.result@1.43, 2008-03-14 14:03:46+01:00, istruewing@stella.local +2 -2
    Post-merge fix

  mysql-test/t/symlink.test@1.34, 2008-03-14 14:03:46+01:00, istruewing@stella.local +5 -2
    Post-merge fix

  sql/sql_table.cc@1.466, 2008-03-14 14:03:46+01:00, istruewing@stella.local +19 -1
    Post-merge fix. Moved the symlink handling from sql_parse.cc here.

ChangeSet@1.2542.11.12, 2008-03-14 15:58:27+03:00, anozdrin@quad. +2 -0
  A fix for Bug#35289: Too many connections -- wrong SQL state
  in some case.
  
  ER_CON_COUNT_ERROR is defined with SQL state 08004. However, this SQL state is not always
  returned.
  
  This error can be thrown in two cases:
  
    1. when an ordinary user (a user w/o SUPER privilege) is connecting,
      and the number of active user connections is equal or greater than
      max_connections.
  
    2. when a user is connecting and the number of active user connections is
      already (max_connections + 1) -- that means that no more connections will
      be accepted regardless of the user credentials.
  
  In the 1-st case, SQL state is correct.
  
  The bug happens in the 2-nd case -- on UNIX the client gets 00000 SQL state, which is
  absolutely wrong (00000 means "not error SQL state); on Windows
  the client accidentally gets HY000 (which means "unknown SQL state).
  
  The cause of the problem is that the server rejects extra connection
  prior to read a packet with client capabilities. Thus, the server
  does not know if the client supports SQL states or not (if the client
  supports 4.1 protocol or not). So, the server supposes the worst and
  does not send SQL state at all.
  
  The difference in behavior on UNIX and Windows occurs because on Windows
  CLI_MYSQL_REAL_CONNECT() invokes create_shared_memory(), which returns
  an error (in default configuration, where shared memory is not configured).
  Then, the client does not reset this error, so when the connection is
  rejected, SQL state is HY000 (from the error from create_shared_memory()).
  
  The bug appeared after test case for Bug#33507 -- before that, this behavior
  just had not been tested.
  
  The fix is to 1) reset the error after create_shared_memory();
  2) set SQL state to 'unknown error' if it was not received from
  the server.
  
  A separate test case is not required, since the behavior is already
  tested in connect.test.
  
  Note for doc-team: the manual should be updated to say that under
  some circumstances, 'Too many connections' has HY000 SQL state.

  mysql-test/r/connect.result@1.30, 2008-03-14 15:58:26+03:00, anozdrin@quad. +1 -1
    Update result file.

  sql-common/client.c@1.153.1.1, 2008-03-14 15:58:26+03:00, anozdrin@quad. +17 -1
    1. Reset an error from create_shared_memory();
    2. Set SQL state to 'unknown error' if it was not received from
       the server.

ChangeSet@1.2542.21.8, 2008-03-14 14:12:39+04:00, gluh@mysql.com +3 -0
  Bug#35108 SELECT FROM REFERENTIAL_CONSTRAINTS crashes
  referenced_key_name field can be uninitialized in the case when
  referenced table is dropped.
  Added codition which allows to handle this situation.

  mysql-test/r/information_schema_inno.result@1.12, 2008-03-14 14:12:36+04:00, gluh@mysql.com +11 -0
    test result

  mysql-test/t/information_schema_inno.test@1.9, 2008-03-14 14:12:36+04:00, gluh@mysql.com +13 -0
    test result

  sql/sql_show.cc@1.450.4.2, 2008-03-14 14:12:36+04:00, gluh@mysql.com +10 -4
    referenced_key_name field can be uninitialized in the case when
    referenced table is dropped.
    Added codition which allows to handle this situation.

ChangeSet@1.2512.68.1, 2008-03-14 11:35:41+08:00, hezx@mail.hezx.com +10 -0
  BUG#33029 5.0 to 5.1 replication fails on dup key when inserting
  using a trig in SP
  
  For all 5.0 and up to 5.1.12 exclusive, when a stored routine or
  trigger caused an INSERT into an AUTO_INCREMENT column, the
  generated AUTO_INCREMENT value should not be written into the
  binary log, which means if a statement does not generate
  AUTO_INCREMENT value itself, there will be no Intvar event (SET
  INSERT_ID) associated with it even if one of the stored routine
  or trigger caused generation of such a value. And meanwhile, when
  executing a stored routine or trigger, it would ignore the
  INSERT_ID value even if there is a INSERT_ID value available set
  by a SET INSERT_ID statement.
  
  Starting from MySQL 5.1.12, the generated AUTO_INCREMENT value is
  written into the binary log, and the value will be used if
  available when executing the stored routine or trigger.
  
  Prior fix of this bug in MySQL 5.0 and prior MySQL 5.1.12
  (referenced as the buggy versions in the text below), when a
  statement that generates AUTO_INCREMENT value by the top
  statement was executed in the body of a SP, all statements in the
  SP after this statement would be treated as if they had generated
  AUTO_INCREMENT by the top statement.  When a statement that did
  not generate AUTO_INCREMENT value by the top statement but by a
  function/trigger called by it, an erroneous Intvar event would be
  associated with the statement, this erroneous INSERT_ID value
  wouldn't cause problem when replicating between masters and
  slaves of 5.0.x or prior 5.1.12, because the erroneous INSERT_ID
  value was not used when executing functions/triggers. But when
  replicating from buggy versions to 5.1.12 or newer, which will
  use the INSERT_ID value in functions/triggers, the erroneous
  value will be used, which would cause duplicate entry error and
  cause the slave to stop.
  
  The patch for 5.1 fixed it to ignore the SET INSERT_ID value when
  executing functions/triggers if it is replicating from a master
  of buggy versions, another patch for 5.0 fixed it not to generate
  the erroneous Intvar event.

  mysql-test/include/show_binlog_events.inc@1.9, 2008-03-14 11:35:35+08:00, hezx@mail.hezx.com +6 -1
    add $binlog_start parameter to show binlog events from a given position

  mysql-test/std_data/bug33029-slave-relay-bin.000001@1.1, 2008-03-14 11:35:36+08:00, hezx@mail.hezx.com +89 -0
    relay logs from a buggy 5.0 master for test case of BUG#33029

  mysql-test/std_data/bug33029-slave-relay-bin.000001@1.0, 2008-03-14 11:35:36+08:00, hezx@mail.hezx.com +0 -0

  mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result@1.1, 2008-03-14 11:35:36+08:00, hezx@mail.hezx.com +33 -0
    Test if the slave can process relay logs from a buggy master of BUG#33029

  mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result@1.0, 2008-03-14 11:35:36+08:00, hezx@mail.hezx.com +0 -0

  mysql-test/suite/binlog/t/binlog_auto_increment_bug33029-master.opt@1.1, 2008-03-14 11:35:36+08:00, hezx@mail.hezx.com +1 -0
    Test if the slave can process relay logs from a buggy master of BUG#33029

  mysql-test/suite/binlog/t/binlog_auto_increment_bug33029-master.opt@1.0, 2008-03-14 11:35:36+08:00, hezx@mail.hezx.com +0 -0

  mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test@1.1, 2008-03-14 11:35:36+08:00, hezx@mail.hezx.com +36 -0
    Test if the slave can process relay logs from a buggy master of BUG#33029

  mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test@1.0, 2008-03-14 11:35:36+08:00, hezx@mail.hezx.com +0 -0

  sql/slave.cc@1.337.1.3, 2008-03-14 11:35:35+08:00, hezx@mail.hezx.com +28 -2
    Add function to check for bug#33029

  sql/slave.h@1.114.2.1, 2008-03-14 11:35:35+08:00, hezx@mail.hezx.com +2 -1
    Add function to check for bug#33029

  sql/sql_class.cc@1.352.10.1, 2008-03-14 11:35:35+08:00, hezx@mail.hezx.com +41 -9
    if master has bug#33029, reset auto_inc_intervals_forced for sub statements
    
    add a new function Discrete_intervals_list::append that takes a Discrete_interval as argument

  sql/sql_class.h@1.418.1.2, 2008-03-14 11:35:36+08:00, hezx@mail.hezx.com +1 -0
    Add member to save and restore auto_inc_intervals_forced

  sql/structs.h@1.76, 2008-03-14 11:35:36+08:00, hezx@mail.hezx.com +21 -0
    add copy constructor and assignment operator for Discrete_intervals_list
    
    add a new function Discrete_intervals_list::append that takes a Discrete_interval as argument

ChangeSet@1.1810.3678.1, 2008-03-14 10:03:01+08:00, hezx@mail.hezx.com +4 -0
  BUG#33029 5.0 to 5.1 replication fails on dup key when inserting
  using a trig in SP
  
  For all 5.0 and up to 5.1.12 exclusive, when a stored routine or
  trigger caused an INSERT into an AUTO_INCREMENT column, the
  generated AUTO_INCREMENT value should not be written into the
  binary log, which means if a statement does not generate
  AUTO_INCREMENT value itself, there will be no Intvar event (SET
  INSERT_ID) associated with it even if one of the stored routine
  or trigger caused generation of such a value. And meanwhile, when
  executing a stored routine or trigger, it would ignore the
  INSERT_ID value even if there is a INSERT_ID value available set
  by a SET INSERT_ID statement.
  
  Starting from MySQL 5.1.12, the generated AUTO_INCREMENT value is
  written into the binary log, and the value will be used if
  available when executing the stored routine or trigger.
  
  Prior fix of this bug in MySQL 5.0 and prior MySQL 5.1.12
  (referenced as the buggy versions in the text below), when a
  statement that generates AUTO_INCREMENT value by the top
  statement was executed in the body of a SP, all statements in the
  SP after this statement would be treated as if they had generated
  AUTO_INCREMENT by the top statement.  When a statement that did
  not generate AUTO_INCREMENT value by the top statement but by a
  function/trigger called by it, an erroneous Intvar event would be
  associated with the statement, this erroneous INSERT_ID value
  wouldn't cause problem when replicating between masters and
  slaves of 5.0.x or prior 5.1.12, because the erroneous INSERT_ID
  value was not used when executing functions/triggers. But when
  replicating from buggy versions to 5.1.12 or newer, which will
  use the INSERT_ID value in functions/triggers, the erroneous
  value will be used, which would cause duplicate entry error and
  cause the slave to stop.
  
  The patch for 5.0 fixed it not to generate the erroneous Intvar
  event, another patch for 5.1 fixed it to ignore the SET INSERT_ID
  value when executing functions/triggers if it is replicating from
  a master of buggy versions.

  mysql-test/include/show_binlog_events.inc@1.1.1.1, 2008-03-14 10:02:59+08:00, hezx@mail.hezx.com +9 -3
    add $binlog_start parameter to set the start position when show binlog events, if not set a default value will be used.
    
    mask out column 2(Pos), 4(Server_id), table_id, and file_id

  mysql-test/r/rpl_auto_increment_bug33029.result@1.1, 2008-03-14 10:02:59+08:00, hezx@mail.hezx.com +167 -0
    Add test for bug33029, test if the master generate the erroneous event or not

  mysql-test/r/rpl_auto_increment_bug33029.result@1.0, 2008-03-14 10:02:59+08:00, hezx@mail.hezx.com +0 -0

  mysql-test/t/rpl_auto_increment_bug33029.test@1.1, 2008-03-14 10:02:59+08:00, hezx@mail.hezx.com +107 -0
    Add test for bug33029, test if the master generate the erroneous event or not

  mysql-test/t/rpl_auto_increment_bug33029.test@1.0, 2008-03-14 10:02:59+08:00, hezx@mail.hezx.com +0 -0

  sql/sql_class.cc@1.223.20.27, 2008-03-14 10:02:59+08:00, hezx@mail.hezx.com +7 -0
    Reset insert_id_used after each query in SP

ChangeSet@1.2542.25.1, 2008-03-13 14:54:29-03:00, davi@mysql.com +6 -0
  Bug#34891 sp_notembedded.test fails sporadically
  
  The problem is that since MyISAM's concurrent_insert is on by
  default some concurrent SELECT statements might not see changes
  made by INSERT statements in other connections, even if the
  INSERT statement has returned.
  
  The solution is to disable concurrent_insert so that INSERT
  statements returns after the data is actually visible to other
  statements.

  mysql-test/r/flush_read_lock_kill.result@1.4, 2008-03-13 14:54:26-03:00, davi@mysql.com +2 -0
    Restore old value of @@global.concurrent_insert

  mysql-test/r/kill.result@1.24, 2008-03-13 14:54:27-03:00, davi@mysql.com +2 -0
    Restore old value of @@global.concurrent_insert

  mysql-test/r/sp_notembedded.result@1.11, 2008-03-13 14:54:27-03:00, davi@mysql.com +31 -5
    Update test case result

  mysql-test/t/flush_read_lock_kill.test@1.7, 2008-03-13 14:54:27-03:00, davi@mysql.com +5 -0
    Restore old value of @@global.concurrent_insert so it
    doesn't affect other tests.

  mysql-test/t/kill.test@1.32, 2008-03-13 14:54:27-03:00, davi@mysql.com +7 -0
    Restore old value of @@global.concurrent_insert so it
    doesn't affect other tests.

  mysql-test/t/sp_notembedded.test@1.12, 2008-03-13 14:54:27-03:00, davi@mysql.com +77 -68
    Disable and restore concurrent_insert value at the end of the
    test case. The test case for Bug 29936 requires that the inserted
    rows need to be visible before a SELECT statement is queued in
    another connection.
    
    Remove sleep at the start of the test, it's not necessary to log
    the result of the processlist command, showing the warnings has
    the same end result.

ChangeSet@1.1810.3671.3, 2008-03-13 16:39:27+01:00, istruewing@stella.local +3 -0
  Bug#33756 - query cache with concurrent_insert=0 appears broken
  
  When concurrent inserts were disabled, statements after an INSERT
  were not put into the query cache. This happened because we do not
  save the current data file length at statement start when
  concurrent inserts are disabled. But we checked the always zero
  local length against the real file length anyway.
    
  Fixed by doing the check only if concurrent inserts are not diabled.

  mysql-test/r/query_cache.result@1.65.11.1, 2008-03-13 16:39:26+01:00, istruewing@stella.local +27 -0
    Bug#33756 - query cache with concurrent_insert=0 appears broken
    Added test result.

  mysql-test/t/query_cache.test@1.49.8.1, 2008-03-13 16:39:26+01:00, istruewing@stella.local +20 -0
    Bug#33756 - query cache with concurrent_insert=0 appears broken
    Added test.

  sql/ha_myisam.cc@1.147.37.1, 2008-03-13 16:39:26+01:00, istruewing@stella.local +40 -30
    Bug#33756 - query cache with concurrent_insert=0 appears broken
    Changed code so that file length check is done only when
    concurrent inserts are possible.

ChangeSet@1.1810.3676.4, 2008-03-13 12:14:14+03:00, kaa@kaamos.(none) +1 -0
  Bug#35103 mysql_client_test::test_bug29948 causes sporadic failures
    
  Disable test case for bug 29948, which is causing sporadically
  failures in other tests inside mysql_client_test.

  tests/mysql_client_test.c@1.167.43.3, 2008-03-13 12:14:13+03:00, kaa@kaamos.(none) +4 -1
    Disable test case.

ChangeSet@1.2542.24.1, 2008-03-13 12:02:12+03:00, anozdrin@quad. +3 -0
  Fix for Bug#35074: max_used_connections is not correct.
  
  The problem was that number of threads was used to calculate
  max_used_connections.
  
  The fix is to use number of active connections.

  mysql-test/r/connect.result@1.29, 2008-03-13 12:02:10+03:00, anozdrin@quad. +34 -0
    Update result file.

  mysql-test/t/connect.test@1.23, 2008-03-13 12:02:10+03:00, anozdrin@quad. +75 -0
    - Add a test case for Bug#35074: max_used_connections is not correct;
    - Make a test case for Bug#33507 more stable.

  sql/mysqld.cc@1.682.21.2, 2008-03-13 12:02:11+03:00, anozdrin@quad. +3 -3
    Use number of connections insetad of threads
    to calculate max_used_connections.

ChangeSet@1.1810.3677.1, 2008-03-12 17:03:50-04:00, cmiller@zippy.cornsilk.net +1 -0
  Bug#34192: mysqldump from mysql 5.0.51 silently fails on dumping \
  	databases from 4.0 server
  
  mysqldump treated a failure to set the results charset as a severe
  error.  
  
  Now, don't try to set the charset for the SHOW CREATE TABLE statement,
  if remote server's version is earlier than 4.1, which means it 
  doesn't support changing charsets.

  client/mysqldump.c@1.214.32.1, 2008-03-12 17:03:49-04:00, cmiller@zippy.cornsilk.net +24 -3
    Don't set the charset for receiving results if the server doesn't 
    support it.

ChangeSet@1.2542.11.9, 2008-03-12 23:07:10+03:00, anozdrin@quad. +1 -0
  Fix manual merge.

  sql/sql_delete.cc@1.237.1.5, 2008-03-12 23:07:09+03:00, anozdrin@quad. +9 -7
    Fix manual merge.

ChangeSet@1.2542.23.1, 2008-03-12 12:40:12-04:00, cmiller@zippy.cornsilk.net +3 -0
  Bug#26703: DROP DATABASE fails if database contains a #mysql50# \
  	table with backticks
  
  (Thanks to Lu Jingdong, though I did not take his patch directly, as
  it contained a significant flaw.)
  
  It wasn't a backtick/parsing problem.  We merely didn't anticipate
  and allocate enough space to handle the optional "#mysql50#" table-
  name prefix. 
  
  Now, allocate that extra space in case we need it when we look up 
  a legacy table to get its file's name.

  mysql-test/r/drop.result@1.38, 2008-03-12 12:40:09-04:00, cmiller@zippy.cornsilk.net +11 -0
    Verify that databases with old-style files can be removed.

  mysql-test/t/drop.test@1.27, 2008-03-12 12:40:09-04:00, cmiller@zippy.cornsilk.net +15 -0
    Verify that databases with old-style files can be removed.

  sql/sql_db.cc@1.169, 2008-03-12 12:40:09-04:00, cmiller@zippy.cornsilk.net +7 -2
    Extend the size of the memory that holds the table's name, so that
    the legacy "mysql50" prefix fits.

ChangeSet@1.2542.11.8, 2008-03-12 17:44:40+03:00, anozdrin@quad. +5 -0
  Fix for Bug#33507: Event scheduler creates more threads
  than max_connections -- which results in user lockout.
  
  The problem was that the variable thread_count that contains
  the number of active threads was interpreted as a number of
  active connections.
  
  The fix is to introduce a new counter for active connections.

  mysql-test/r/connect.result@1.28, 2008-03-12 17:44:39+03:00, anozdrin@quad. +58 -0
    A test case for Bug#33507: Event scheduler creates more threads
    than max_connections -- which results in user lockout.

  mysql-test/t/connect.test@1.22, 2008-03-12 17:44:39+03:00, anozdrin@quad. +126 -1
    A test case for Bug#33507: Event scheduler creates more threads
    than max_connections -- which results in user lockout.

  sql/mysql_priv.h@1.549.13.4, 2008-03-12 17:44:39+03:00, anozdrin@quad. +2 -3
    1. Polishing: login_connection() and end_connection() need not
       to be public.
    
    2. Introduce connection_count -- a variable to contain the number
       of active connections. It is protected by LOCK_connection_count. 

  sql/mysqld.cc@1.682.21.1, 2008-03-12 17:44:39+03:00, anozdrin@quad. +38 -4
    Use connection_count to count active connections.

  sql/sql_connect.cc@1.23, 2008-03-12 17:44:39+03:00, anozdrin@quad. +7 -6
    1. Use connection_count to count active connections.
    2. Make login_connection(), end_connection() private for the module
    as they had to be.

ChangeSet@1.1810.3671.2, 2008-03-12 15:38:57+01:00, istruewing@stella.local +1 -0
  Bug#35247 - rpl_transaction.test produces warnings files
  
  The test file tried to use a mysqltest command '--warning'
  but there is no such command.
  
  Changed '--warning' to '#--warning'.

  mysql-test/t/rpl_transaction.test@1.2.2.1, 2008-03-12 15:38:55+01:00, istruewing@stella.local +1 -1
    Bug#35247 - rpl_transaction.test produces warnings files
    Changed '--warning' to '#--warning'.

ChangeSet@1.2542.21.6, 2008-03-12 16:52:29+03:00, kaa@kaamos.(none) +2 -0
  Fixed test failures caused by insufficient cleanups in the tests for
  bug12713.

  mysql-test/include/commit.inc@1.2.1.1, 2008-03-12 16:52:28+03:00, kaa@kaamos.(none) +1 -1
    Fixed test failures caused by insufficient cleanups in the tests for
    bug12713.

  mysql-test/r/commit_1innodb.result@1.2.1.1, 2008-03-12 16:52:28+03:00, kaa@kaamos.(none) +1 -1
    Fixed test failures caused by insufficient cleanups in the tests for
    bug12713.

ChangeSet@1.2542.11.7, 2008-03-12 16:50:24+03:00, anozdrin@quad. +1 -0
  Fix manual merge.

  sql/sql_delete.cc@1.237.1.4, 2008-03-12 16:50:23+03:00, anozdrin@quad. +3 -3
    Fix manual merge.

ChangeSet@1.1810.3663.4, 2008-03-12 16:13:33+03:00, anozdrin@quad. +3 -0
  A fix for Bug#34643: TRUNCATE crash if trigger and foreign key.
    
  In cases when TRUNCATE was executed by invoking mysql_delete() rather
  than by table recreation (for example, when TRUNCATE was issued on
  InnoDB table with is referenced by foreign key) triggers were invoked.
  In debug builds this also led to crash because of an assertion, which
  assumes that some preliminary actions take place before trigger 
  invocation, which doesn't happen in case of TRUNCATE.
  
  The fix is not to execute triggers in mysql_delete() when this
  function is used by TRUNCATE.

  mysql-test/r/trigger-trans.result@1.4, 2008-03-12 16:13:32+03:00, anozdrin@quad. +19 -0
    Update result file.

  mysql-test/t/trigger-trans.test@1.3, 2008-03-12 16:13:32+03:00, anozdrin@quad. +32 -0
    A test case for Bug#34643: TRUNCATE crash if trigger and foreign key.

  sql/sql_delete.cc@1.144.28.1, 2008-03-12 16:13:32+03:00, anozdrin@quad. +10 -5
    Do not process triggers in TRUNCATE.

ChangeSet@1.2542.20.2, 2008-03-12 12:56:07+01:00, mleich@five.local.lan +31 -0
  Post merge fix for
     ChangeSet@1.2565, 2008-03-11 20:20:49+01:00
       Merge five.local.lan:/work/merge/mysql-5.0-funcs_1
       into  five.local.lan:/work/merge/mysql-5.1-funcs_1
       MERGE: 1.1810.3473.26
  
     ChangeSet@1.1810.3473.26, 2008-03-11 19:54:35+01:00
     Post fix for
     WL#4203 Reorganize and fix the data dictionary tests of
             testsuite funcs_1
  
  The final fix of
  Bug#34532 Some funcs_1 tests do not clean up at end of testing
     and some minor additional modifications are for
  happens here

  mysql-test/suite/funcs_1/r/innodb_trig_03e.result@1.4, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/is_columns_innodb.result@1.4, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/is_columns_memory.result@1.4, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/is_columns_myisam.result@1.4, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/is_tables_ndb.result@1.4, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/memory_trig_03e.result@1.4, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/myisam_trig_03e.result@1.4, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/ndb_bitdata.result@1.2, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +0 -64
    Updated results

  mysql-test/suite/funcs_1/r/ndb_cursors.result@1.6, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +0 -79
    Updated results

  mysql-test/suite/funcs_1/r/ndb_trig_0102.result@1.7, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/ndb_trig_03.result@1.7, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/ndb_trig_03e.result@1.5, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/ndb_trig_0407.result@1.6, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/ndb_trig_08.result@1.8, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/ndb_trig_09.result@1.7, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result@1.7, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/ndb_views.result@1.8, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +2 -2
    Updated results

  mysql-test/suite/funcs_1/t/innodb_trig_03e.test@1.3, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +2 -19
    Cleanup

  mysql-test/suite/funcs_1/t/memory_trig_03e.test@1.3, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +2 -20
    Cleanup

  mysql-test/suite/funcs_1/t/myisam_trig_03e.test@1.3, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +2 -21
    Cleanup

  mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test@1.7, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +0 -9
    Cleanup

  mysql-test/suite/funcs_1/t/ndb_bitdata.test@1.3, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +6 -18
    Cleanup

  mysql-test/suite/funcs_1/t/ndb_cursors.test@1.3, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +6 -17
    Cleanup

  mysql-test/suite/funcs_1/t/ndb_trig_0102.test@1.3, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +4 -18
    Cleanup

  mysql-test/suite/funcs_1/t/ndb_trig_03.test@1.3, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +4 -18
    Cleanup

  mysql-test/suite/funcs_1/t/ndb_trig_03e.test@1.3, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +2 -20
    Cleanup

  mysql-test/suite/funcs_1/t/ndb_trig_0407.test@1.3, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +4 -18
    Cleanup

  mysql-test/suite/funcs_1/t/ndb_trig_08.test@1.3, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +4 -18
    Cleanup

  mysql-test/suite/funcs_1/t/ndb_trig_09.test@1.3, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +4 -18
    Cleanup

  mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test@1.3, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +4 -18
    Cleanup

  mysql-test/suite/funcs_1/t/ndb_views.test@1.3, 2008-03-12 12:56:05+01:00, mleich@five.local.lan +12 -32
    Cleanup

ChangeSet@1.2542.21.3, 2008-03-12 13:22:58+03:00, kaa@kaamos.(none) +1 -0
  Post-merge fix.

  mysql-test/r/compare.result@1.15, 2008-03-12 13:22:57+03:00, kaa@kaamos.(none) +2 -2
    Post-merge fix.

ChangeSet@1.1810.3676.3, 2008-03-12 12:13:41+03:00, kaa@kaamos.(none) +1 -0
  Re-enabled the test for mysql_insert_id() after merging from main.

  tests/mysql_client_test.c@1.167.43.2, 2008-03-12 12:13:40+03:00, kaa@kaamos.(none) +1 -7
    Re-enabled the test for mysql_insert_id() after merging from main.

ChangeSet@1.1810.3675.1, 2008-03-11 19:54:35+01:00, mleich@five.local.lan +36 -0
  Post fix for
  WL#4203 Reorganize and fix the data dictionary tests of
          testsuite funcs_1
  because the goal to fix
  Bug#34532 Some funcs_1 tests do not clean up at end of testing
  was partially missed.
  Some minor additional modifications are for
     WL#4304 Cleanup in funcs_1 tests

  BitKeeper/deleted/.del-innodb_triggers.result@1.1.1.1, 2008-03-11 19:52:33+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/suite/funcs_1/r/innodb_triggers.result -> BitKeeper/deleted/.del-innodb_triggers.result

  BitKeeper/deleted/.del-memory_triggers.result@1.1.1.1, 2008-03-11 19:52:33+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/suite/funcs_1/r/memory_triggers.result -> BitKeeper/deleted/.del-memory_triggers.result

  BitKeeper/deleted/.del-myisam_triggers.result@1.1.1.1, 2008-03-11 19:52:33+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/suite/funcs_1/r/myisam_triggers.result -> BitKeeper/deleted/.del-myisam_triggers.result

  mysql-test/suite/funcs_1/cursors/cursors_master.test@1.1.1.1, 2008-03-11 19:54:33+01:00, mleich@five.local.lan +0 -1
    Backport of file in 5.1

  mysql-test/suite/funcs_1/datadict/datadict_load.inc@1.1.2.1, 2008-03-11 19:54:33+01:00, mleich@five.local.lan +33 -49
    Cleanup

  mysql-test/suite/funcs_1/r/innodb_storedproc_02.result@1.1.1.2, 2008-03-11 19:53:16+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/innodb_storedproc_03.result@1.1.1.2, 2008-03-11 19:53:16+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/innodb_storedproc_07.result@1.1.1.2, 2008-03-11 19:53:16+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/innodb_storedproc_08.result@1.1.1.2, 2008-03-11 19:53:16+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/innodb_storedproc_10.result@1.1.1.2, 2008-03-11 19:53:16+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/innodb_views.result@1.1.2.4, 2008-03-11 19:54:33+01:00, mleich@five.local.lan +11946 -502
    Updated results

  mysql-test/suite/funcs_1/r/is_columns_innodb.result@1.1.1.1, 2008-03-11 19:54:33+01:00, mleich@five.local.lan +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/is_columns_memory.result@1.1.1.1, 2008-03-11 19:54:33+01:00, mleich@five.local.lan +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/is_columns_myisam.result@1.1.1.1, 2008-03-11 19:54:33+01:00, mleich@five.local.lan +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/is_columns_ndb.result@1.2, 2008-03-11 19:54:33+01:00, mleich@five.local.lan +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/is_tables_innodb.result@1.2, 2008-03-11 19:54:33+01:00, mleich@five.local.lan +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/is_tables_memory.result@1.2, 2008-03-11 19:54:33+01:00, mleich@five.local.lan +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/is_tables_myisam.result@1.2, 2008-03-11 19:54:33+01:00, mleich@five.local.lan +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/is_tables_ndb.result@1.1.1.1, 2008-03-11 19:54:33+01:00, mleich@five.local.lan +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/memory_storedproc_02.result@1.1.1.2, 2008-03-11 19:53:17+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/memory_storedproc_03.result@1.1.1.2, 2008-03-11 19:53:17+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/memory_storedproc_07.result@1.1.1.2, 2008-03-11 19:53:17+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/memory_storedproc_08.result@1.1.1.2, 2008-03-11 19:53:17+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/memory_storedproc_10.result@1.1.1.2, 2008-03-11 19:53:17+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/memory_views.result@1.1.2.4, 2008-03-11 19:54:33+01:00, mleich@five.local.lan +11946 -502
    Updated results

  mysql-test/suite/funcs_1/r/myisam_storedproc_02.result@1.1.1.2, 2008-03-11 19:53:17+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/myisam_storedproc_03.result@1.1.1.2, 2008-03-11 19:53:17+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/myisam_storedproc_07.result@1.1.1.2, 2008-03-11 19:53:17+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/myisam_storedproc_08.result@1.1.1.2, 2008-03-11 19:53:17+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/myisam_storedproc_10.result@1.1.1.2, 2008-03-11 19:53:17+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/myisam_views.result@1.1.2.4, 2008-03-11 19:54:34+01:00, mleich@five.local.lan +12088 -9328
    Updated results

  mysql-test/suite/funcs_1/t/innodb_storedproc.test@1.1.1.1, 2008-03-11 19:54:34+01:00, mleich@five.local.lan +3 -0
    Backport of file in 5.1

  mysql-test/suite/funcs_1/t/memory_storedproc.test@1.1.1.1, 2008-03-11 19:54:34+01:00, mleich@five.local.lan +2 -0
    Backport of file in 5.1

  mysql-test/suite/funcs_1/t/myisam_storedproc.test@1.1.1.1, 2008-03-11 19:54:34+01:00, mleich@five.local.lan +2 -0
    Backport of file in 5.1

  mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test@1.1.1.2, 2008-03-11 19:54:34+01:00, mleich@five.local.lan +0 -9
    Cleanup

  mysql-test/suite/funcs_1/views/views_master.inc@1.1.2.2, 2008-03-11 19:54:34+01:00, mleich@five.local.lan +440 -409
    Backport of file in 5.1 which got many fixes for instabilities
    and other improvements

ChangeSet@1.2542.14.7, 2008-03-11 18:43:29+01:00, sven@riska.(none) +2 -0
  Removed pushbuild errors.
  Problem: rpl_variables_stm.test used a character set and a collation which
  are not included on all platforms.
  Fix: replace the character set and collation by ones that are included on
  all platforms. (rpl_variables_stm does not rely on which character set is
  used, the only important aspect is the fact that it changes.)

  mysql-test/suite/rpl/r/rpl_variables_stm.result@1.2, 2008-03-11 18:43:27+01:00, sven@riska.(none) +2 -2
    Updated result file.

  mysql-test/suite/rpl/t/rpl_variables_stm.test@1.2, 2008-03-11 18:43:27+01:00, sven@riska.(none) +2 -2
    Changed test to get rid of pushbuild errors.

ChangeSet@1.1810.3674.1, 2008-03-11 15:21:58+01:00, kent@mysql.com +1 -0
  make_win_bin_dist:
    Include .pdb files for tools and libraries (bug#35104)

  scripts/make_win_bin_dist@1.1.14.1, 2008-03-11 15:21:17+01:00, kent@mysql.com +27 -13
    Include .pdb files for tools and libraries (bug#35104)

ChangeSet@1.1810.3620.25, 2008-03-11 14:42:54+01:00, sven@riska.(none) +2 -0
  BUG#31024: STOP SLAVE does not stop attempted connect()s
  Problem: if the IO slave thread is attempting to connect,
  STOP SLAVE waits for the attempt to finish. 
  It may take a long time.
  Fix: don't wait, stop the slave immediately.

  sql/slave.cc@1.241.28.9, 2008-03-11 14:42:53+01:00, sven@riska.(none) +14 -1
    Send a SIGALRM signal to the slave thread when stopping it (using
    pthread_kill()). This breaks current socket(), connect(), poll() etc.
    calls, and makes the subsequent thd->awake() call effective.
    
    Also, move the definition of KICK_SLAVE to slave.cc.

  sql/sql_repl.h@1.37.1.5, 2008-03-11 14:42:53+01:00, sven@riska.(none) +0 -6
    Removed KICK_SLAVE and inlined it in slave.cc because:
     - it was only called once, so better to make it local to where it is used
     - it needed to include a preprocessor conditional in the middle

ChangeSet@1.2512.66.1, 2008-03-10 19:00:45+01:00, istruewing@stella.local +1 -0
  Bug#31331 - MyISAM or Merge Table upgrade incompatibility with 5.1
  Post-pushbuild fixes. Added purecov comments.

  storage/myisam/ha_myisam.cc@1.231.1.10, 2008-03-10 19:00:43+01:00, istruewing@stella.local +2 -2
    Bug#31331 - MyISAM or Merge Table upgrade incompatibility with 5.1
    Post-pushbuild fixes. Added purecov comments.

ChangeSet@1.2542.14.6, 2008-03-10 16:24:12+01:00, sven@riska.(none) +1 -0
  Problem: sporadic pushbuild errors in rpl_ndb_basic.
  The reason is that we are using a sleep to wait for slave to reach the
  slave_transaction_retries limit.
  Fix: wait for the slave to stop instead. This is what we want to do, since
  the slave stops when the limit is reached.

  mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test@1.19, 2008-03-10 16:22:08+01:00, sven@riska.(none) +12 -10
    Problem: sporadic pushbuild errors in rpl_ndb_basic.
    The reason is that we are using a sleep to wait for slave to reach the
    slave_transaction_retries limit.
    Fix: wait for the slave to stop instead. This is what we want to do, since
    the slave stops when the limit is reached.

ChangeSet@1.2542.14.5, 2008-03-10 15:26:21+01:00, sven@riska.(none) +2 -0
  Problem: Pushbuild errors because sql_mode is unsafe but test thinks it is
  safe.
  Fix: Move sql_mode: from the section of the test where safe variables are
  tested, to the section where unsafe variables are tested.

  mysql-test/suite/binlog/r/binlog_unsafe.result@1.10, 2008-03-10 15:26:19+01:00, sven@riska.(none) +16 -4
    Updated result file of modified test.

  mysql-test/suite/binlog/t/binlog_unsafe.test@1.7, 2008-03-10 15:26:19+01:00, sven@riska.(none) +9 -4
    Problem: Pushbuild errors because sql_mode is unsafe but test thinks it is
    safe.
    Fix: Move sql_mode: from the section of the test where safe variables are
    tested, to the section where unsafe variables are tested.

ChangeSet@1.1810.3673.1, 2008-03-10 11:12:12+01:00, tnurnberg@mysql.com +3 -0
  Bug#34731: highest possible value for INT erroneously filtered by WHERE
  
  WHERE f1 < n ignored row if f1 was indexed integer column and
  f1 = TYPE_MAX ^ n = TYPE_MAX+1. The latter value when treated
  as TYPE overflowed (obviously). This was not handled, it is now.

  mysql-test/r/range.result@1.44.4.1, 2008-03-10 11:12:09+01:00, tnurnberg@mysql.com +39 -0
    show that on an index int column, we no longer disregard
    a field val of TYPE_MAX in SELECT ... WHERE ... < TYPE_MAX+1

  mysql-test/t/range.test@1.37.3.1, 2008-03-10 11:12:10+01:00, tnurnberg@mysql.com +47 -0
    show that on an index int column, we no longer disregard
    a field val of TYPE_MAX in SELECT ... WHERE ... < TYPE_MAX+1

  sql/opt_range.cc@1.159.43.3, 2008-03-10 11:12:10+01:00, tnurnberg@mysql.com +54 -36
    Handle overflowing of int-types in range-optimizer.
    Unfortunately requires re-indentation of entire block.
    Overflow (err == 1) was handled, but only if
    field->cmp_type() != value->result_type(), which it
    just wasn't in our case.

ChangeSet@1.1810.3672.1, 2008-03-10 03:25:54-06:00, tsmith@ramayana.hindu.god +2 -0
  Bug #25486: mysqld_multi.server.sh missing from builds
  
  Make mysqld_multi.server executable, and allow it to be installed
  via chkconfig on LSB-compliant systems.

  scripts/make_binary_distribution.sh@1.101.1.31, 2008-03-10 03:25:51-06:00, tsmith@ramayana.hindu.god +2 -2
    Adjust permissions on some support-files/* scripts:  make mysqld_multi.server
    executable, and mysql-VERSION.spec not executable.

  support-files/mysqld_multi.server.sh@1.3, 2008-03-10 03:25:51-06:00, tsmith@ramayana.hindu.god +4 -0
    Add LSB comments for chkconfig to simplify installation for sysadmins.

ChangeSet@1.2512.61.4, 2008-03-08 01:14:56+04:00, bar@mysql.com +8 -0
  After merge fix

  mysql-test/r/ctype_cp1250_ch.result@1.11, 2008-03-08 01:14:54+04:00, bar@mysql.com +4 -4
    After merge fix

  mysql-test/r/ctype_euckr.result@1.7, 2008-03-08 01:14:54+04:00, bar@mysql.com +2 -2
    After merge fix

  mysql-test/r/ctype_gb2312.result@1.5.1.2, 2008-03-08 01:14:54+04:00, bar@mysql.com +2 -2
    After merge fix

  mysql-test/r/ctype_gbk.result@1.7.1.2, 2008-03-08 01:14:54+04:00, bar@mysql.com +2 -2
    After merge fix

  mysql-test/r/ctype_uca.result@1.25.1.2, 2008-03-08 01:14:54+04:00, bar@mysql.com +2 -2
    After merge fix

  mysql-test/r/ctype_ucs.result@1.68.1.2, 2008-03-08 01:14:54+04:00, bar@mysql.com +2 -2
    After merge fix

  mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result@1.10.1.1, 2008-03-08 01:14:54+04:00, bar@mysql.com +19 -0
    After merge fix

  mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result@1.18.1.2, 2008-03-08 01:14:54+04:00, bar@mysql.com +2 -2
    After merge fix

ChangeSet@1.1810.3670.1, 2008-03-07 15:45:40-05:00, iggy@amd64.(none) +1 -0
  Bug #27101 mysqlhotcopy --record_log_pos retrieves wrong slave parameters
  - Make sure mysqlhotcopy doesn't create unrestorable slaves.

  scripts/mysqlhotcopy.sh@1.56, 2008-03-07 15:45:38-05:00, iggy@amd64.(none) +5 -4
    Bug #27101 mysqlhotcopy --record_log_pos retrieves wrong slave parameters
    - Record what's been executed by the slave, not what's been delivered.

ChangeSet@1.2542.15.3, 2008-03-07 20:18:14+01:00, mleich@five.local.lan +100 -0
  Post merge fixes after
  ChangeSet@1.2561, 2008-03-07 17:44:03+01:00, mleich@five.local.lan +132 -0
    Merge five.local.lan:/work/merge/mysql-5.0-funcs_1
    into  five.local.lan:/work/merge/mysql-5.1-funcs_1
    MERGE: 1.1810.3473.24
  
  ChangeSet@1.1810.3473.24, 2008-03-07
    WL#4203 Reorganize and fix the data dictionary tests of
            testsuite funcs_1
  
    1. Adjustment of expected results to modified server properties
    2. Add some tests of information_schema views
    3. Minor corrections and improvements

  BitKeeper/deleted/.del-ndb__datadict.result@1.7, 2008-03-07 18:28:35+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/r/ndb__datadict.result

  BitKeeper/deleted/.del-ndb__datadict.test@1.3, 2008-03-07 18:28:43+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/t/ndb__datadict.test

  BitKeeper/deleted/.del-ndb__load.result@1.2, 2008-03-07 19:31:11+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/r/ndb__load.result

  BitKeeper/deleted/.del-ndb__load.test@1.3, 2008-03-07 19:31:03+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/t/ndb__load.test

  mysql-test/suite/funcs_1/datadict/processlist_priv.inc@1.3, 2008-03-07 20:18:05+01:00, mleich@five.local.lan +28 -28
    Make the results independend of amount of preceding tests.

  mysql-test/suite/funcs_1/datadict/processlist_val.inc@1.4, 2008-03-07 20:18:05+01:00, mleich@five.local.lan +1 -0
    Correct the cleanup

  mysql-test/suite/funcs_1/r/charset_collation_1.result@1.2, 2008-03-07 20:18:05+01:00, mleich@five.local.lan +3 -0
    Updated results

  mysql-test/suite/funcs_1/r/charset_collation_2.result@1.2, 2008-03-07 20:18:05+01:00, mleich@five.local.lan +3 -0
    Updated results

  mysql-test/suite/funcs_1/r/innodb_func_view.result@1.9, 2008-03-07 20:18:05+01:00, mleich@five.local.lan +4778 -4790
    Updated results

  mysql-test/suite/funcs_1/r/innodb_storedproc.result@1.7, 2008-03-07 20:18:07+01:00, mleich@five.local.lan +18135 -18142
    Updated results

  mysql-test/suite/funcs_1/r/innodb_storedproc_02.result@1.6, 2008-03-07 19:33:22+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/innodb_storedproc_03.result@1.5, 2008-03-07 19:33:22+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/innodb_storedproc_07.result@1.6, 2008-03-07 19:33:22+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/innodb_storedproc_08.result@1.6, 2008-03-07 19:33:22+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/innodb_storedproc_10.result@1.8, 2008-03-07 19:33:22+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/is_basics_mixed.result@1.2, 2008-03-07 20:18:07+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/is_character_sets.result@1.2, 2008-03-07 20:18:07+01:00, mleich@five.local.lan +4 -4
    Updated results

  mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result@1.2, 2008-03-07 20:18:07+01:00, mleich@five.local.lan +2 -2
    Updated results

  mysql-test/suite/funcs_1/r/is_collations.result@1.2, 2008-03-07 20:18:07+01:00, mleich@five.local.lan +6 -6
    Updated results

  mysql-test/suite/funcs_1/r/is_column_privileges.result@1.2, 2008-03-07 20:18:07+01:00, mleich@five.local.lan +9 -7
    Updated results

  mysql-test/suite/funcs_1/r/is_columns.result@1.2, 2008-03-07 20:18:07+01:00, mleich@five.local.lan +29 -29
    Updated results

  mysql-test/suite/funcs_1/r/is_columns_innodb.result@1.2, 2008-03-07 20:18:07+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/is_columns_is.result@1.2, 2008-03-07 20:18:07+01:00, mleich@five.local.lan +306 -30
    Updated results

  mysql-test/suite/funcs_1/r/is_columns_memory.result@1.2, 2008-03-07 20:18:07+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/is_columns_myisam.result@1.2, 2008-03-07 20:18:07+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/is_columns_mysql.result@1.2, 2008-03-07 20:18:07+01:00, mleich@five.local.lan +156 -18
    Updated results

  mysql-test/suite/funcs_1/r/is_engines.result@1.1, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +84 -0
    Expected results

  mysql-test/suite/funcs_1/r/is_engines.result@1.0, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_engines_archive.result@1.1, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +8 -0
    Expected results

  mysql-test/suite/funcs_1/r/is_engines_archive.result@1.0, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_engines_blackhole.result@1.1, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +8 -0
    Expected results

  mysql-test/suite/funcs_1/r/is_engines_blackhole.result@1.0, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_engines_csv.result@1.1, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +8 -0
    Expected results

  mysql-test/suite/funcs_1/r/is_engines_csv.result@1.0, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_engines_federated.result@1.1, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +8 -0
    Expected results

  mysql-test/suite/funcs_1/r/is_engines_federated.result@1.0, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_engines_innodb.result@1.1, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +8 -0
    Expected results

  mysql-test/suite/funcs_1/r/is_engines_innodb.result@1.0, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_engines_memory.result@1.1, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +8 -0
    Expected results

  mysql-test/suite/funcs_1/r/is_engines_memory.result@1.0, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_engines_merge.result@1.1, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +8 -0
    Expected results

  mysql-test/suite/funcs_1/r/is_engines_merge.result@1.0, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_engines_myisam.result@1.1, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +8 -0
    Expected results

  mysql-test/suite/funcs_1/r/is_engines_myisam.result@1.0, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_engines_ndb.result@1.1, 2008-03-07 20:18:13+01:00, mleich@five.local.lan +8 -0
    Expected results

  mysql-test/suite/funcs_1/r/is_engines_ndb.result@1.0, 2008-03-07 20:18:13+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_events.result@1.1, 2008-03-07 20:18:13+01:00, mleich@five.local.lan +148 -0
    Expected results

  mysql-test/suite/funcs_1/r/is_events.result@1.0, 2008-03-07 20:18:13+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_key_column_usage.result@1.2, 2008-03-07 20:18:07+01:00, mleich@five.local.lan +12 -12
    Updated results

  mysql-test/suite/funcs_1/r/is_routines.result@1.2, 2008-03-07 20:18:08+01:00, mleich@five.local.lan +57 -27
    Updated results

  mysql-test/suite/funcs_1/r/is_schema_privileges.result@1.2, 2008-03-07 20:18:08+01:00, mleich@five.local.lan +5 -5
    Updated results

  mysql-test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result@1.2, 2008-03-07 20:18:08+01:00, mleich@five.local.lan +2 -0
    Updated results

  mysql-test/suite/funcs_1/r/is_schemata.result@1.2, 2008-03-07 20:18:08+01:00, mleich@five.local.lan +5 -5
    Updated results

  mysql-test/suite/funcs_1/r/is_statistics.result@1.2, 2008-03-07 20:18:08+01:00, mleich@five.local.lan +15 -15
    Updated results

  mysql-test/suite/funcs_1/r/is_statistics_mysql.result@1.2, 2008-03-07 20:18:08+01:00, mleich@five.local.lan +5 -0
    Updated results

  mysql-test/suite/funcs_1/r/is_table_constraints.result@1.2, 2008-03-07 20:18:08+01:00, mleich@five.local.lan +6 -6
    Updated results

  mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result@1.2, 2008-03-07 20:18:08+01:00, mleich@five.local.lan +4 -0
    Updated results

  mysql-test/suite/funcs_1/r/is_table_privileges.result@1.2, 2008-03-07 20:18:08+01:00, mleich@five.local.lan +10 -6
    Updated results

  mysql-test/suite/funcs_1/r/is_tables.result@1.2, 2008-03-07 20:18:08+01:00, mleich@five.local.lan +39 -39
    Updated results

  mysql-test/suite/funcs_1/r/is_tables_is.result@1.2, 2008-03-07 20:18:08+01:00, mleich@five.local.lan +538 -32
    Updated results

  mysql-test/suite/funcs_1/r/is_tables_mysql.result@1.2, 2008-03-07 20:18:08+01:00, mleich@five.local.lan +138 -0
    Updated results

  mysql-test/suite/funcs_1/r/is_tables_ndb.result@1.2, 2008-03-07 20:18:08+01:00, mleich@five.local.lan +0 -23
    Updated results

  mysql-test/suite/funcs_1/r/is_triggers.result@1.2, 2008-03-07 20:18:08+01:00, mleich@five.local.lan +58 -42
    Updated results

  mysql-test/suite/funcs_1/r/is_user_privileges.result@1.2, 2008-03-07 20:18:08+01:00, mleich@five.local.lan +48 -48
    Updated results

  mysql-test/suite/funcs_1/r/is_views.result@1.2, 2008-03-07 20:18:08+01:00, mleich@five.local.lan +25 -21
    Updated results

  mysql-test/suite/funcs_1/r/memory_func_view.result@1.9, 2008-03-07 20:18:08+01:00, mleich@five.local.lan +4778 -4790
    Updated results

  mysql-test/suite/funcs_1/r/memory_storedproc.result@1.7, 2008-03-07 20:18:09+01:00, mleich@five.local.lan +18100 -18108
    Updated results

  mysql-test/suite/funcs_1/r/memory_storedproc_02.result@1.6, 2008-03-07 19:33:11+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/memory_storedproc_03.result@1.5, 2008-03-07 19:33:11+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/memory_storedproc_07.result@1.6, 2008-03-07 19:33:03+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/memory_storedproc_08.result@1.6, 2008-03-07 19:33:11+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/memory_storedproc_10.result@1.8, 2008-03-07 19:33:11+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/myisam_func_view.result@1.9, 2008-03-07 20:18:09+01:00, mleich@five.local.lan +4778 -4790
    Updated results

  mysql-test/suite/funcs_1/r/myisam_storedproc.result@1.7, 2008-03-07 20:18:10+01:00, mleich@five.local.lan +18135 -18142
    Updated results

  mysql-test/suite/funcs_1/r/myisam_storedproc_02.result@1.6, 2008-03-07 19:33:23+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/myisam_storedproc_03.result@1.5, 2008-03-07 19:33:23+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/myisam_storedproc_07.result@1.6, 2008-03-07 19:33:23+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/myisam_storedproc_08.result@1.6, 2008-03-07 19:33:23+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/myisam_storedproc_10.result@1.8, 2008-03-07 19:33:23+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/r/myisam_views.result@1.15, 2008-03-07 20:18:10+01:00, mleich@five.local.lan +11800 -11801
    Updated results

  mysql-test/suite/funcs_1/r/ndb_func_view.result@1.6, 2008-03-07 20:18:11+01:00, mleich@five.local.lan +4778 -4790
    Updated results

  mysql-test/suite/funcs_1/r/ndb_storedproc.result@1.4, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +18122 -18129
    Updated results

  mysql-test/suite/funcs_1/r/ndb_storedproc_02.result@1.2, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/ndb_storedproc_03.result@1.2, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/ndb_storedproc_07.result@1.4, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/ndb_storedproc_08.result@1.4, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/ndb_storedproc_10.result@1.4, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result@1.6, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +117 -117
    Updated results

  mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result@1.5, 2008-03-07 18:30:03+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result -> mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result

  mysql-test/suite/funcs_1/r/processlist_priv_ps.result@1.6, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +117 -117
    Updated results

  mysql-test/suite/funcs_1/r/processlist_priv_ps.result@1.5, 2008-03-07 18:31:48+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result -> mysql-test/suite/funcs_1/r/processlist_priv_ps.result

  mysql-test/suite/funcs_1/r/processlist_val_no_prot.result@1.6, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +1 -0
    Updated results

  mysql-test/suite/funcs_1/r/processlist_val_no_prot.result@1.5, 2008-03-07 18:32:32+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result -> mysql-test/suite/funcs_1/r/processlist_val_no_prot.result

  mysql-test/suite/funcs_1/r/processlist_val_ps.result@1.6, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +1 -0
    Updated results

  mysql-test/suite/funcs_1/r/processlist_val_ps.result@1.5, 2008-03-07 18:33:21+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/suite/funcs_1/r/b_processlist_val_ps.result -> mysql-test/suite/funcs_1/r/processlist_val_ps.result

  mysql-test/suite/funcs_1/storedproc/storedproc_master.inc@1.8, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +7 -7
    Set subtest checking a no more reserved keyword
    to comment.

  mysql-test/suite/funcs_1/t/disabled.def@1.8, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -1
    ndb__datadict is dropped. The checks are done in
    other scripts.

  mysql-test/suite/funcs_1/t/is_engines.test@1.1, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +126 -0
    Test of information_schema.engines

  mysql-test/suite/funcs_1/t/is_engines.test@1.0, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_engines_archive.test@1.1, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +15 -0
    Test of information_schema.engines
        Variant for ARCHIVE

  mysql-test/suite/funcs_1/t/is_engines_archive.test@1.0, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_engines_blackhole.test@1.1, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +15 -0
    Test of information_schema.engines
        Variant for BLACKHOLE

  mysql-test/suite/funcs_1/t/is_engines_blackhole.test@1.0, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_engines_csv.test@1.1, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +15 -0
    Test of information_schema.engines
        Variant for CSV

  mysql-test/suite/funcs_1/t/is_engines_csv.test@1.0, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_engines_federated.test@1.1, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +15 -0
    Test of information_schema.engines
        Variant for FEDERATED

  mysql-test/suite/funcs_1/t/is_engines_federated.test@1.0, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_engines_innodb.test@1.1, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +15 -0
    Test of information_schema.engines
        Variant for InnoDB

  mysql-test/suite/funcs_1/t/is_engines_innodb.test@1.0, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_engines_memory.test@1.1, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +14 -0
    Test of information_schema.engines
        Variant for MEMORY

  mysql-test/suite/funcs_1/t/is_engines_memory.test@1.0, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_engines_merge.test@1.1, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +14 -0
    Test of information_schema.engines
        Variant for MERGGE

  mysql-test/suite/funcs_1/t/is_engines_merge.test@1.0, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_engines_myisam.test@1.1, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +14 -0
    Test of information_schema.engines
        Variant for MyISAM

  mysql-test/suite/funcs_1/t/is_engines_myisam.test@1.0, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_engines_ndb.test@1.1, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +15 -0
    Test of information_schema.engines
        Variant for NDB

  mysql-test/suite/funcs_1/t/is_engines_ndb.test@1.0, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_events.test@1.1, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +169 -0
    Test for information_schema.events

  mysql-test/suite/funcs_1/t/is_events.test@1.0, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_routines.test@1.2, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +4 -0
    Correction of comment

  mysql-test/suite/funcs_1/t/is_triggers.test@1.2, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +11 -7
    Adjustment to changes in privilege system between
    MySQL 5.0 and 5.1.

  mysql-test/suite/funcs_1/t/is_views.test@1.2, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +3 -0
    Correction of comment.

  mysql-test/suite/funcs_1/t/processlist_priv_no_prot.test@1.3, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +1 -7
    Correction of comment.

  mysql-test/suite/funcs_1/t/processlist_priv_no_prot.test@1.2, 2008-03-07 18:34:18+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/suite/funcs_1/t/a_processlist_priv_no_prot.test -> mysql-test/suite/funcs_1/t/processlist_priv_no_prot.test

  mysql-test/suite/funcs_1/t/processlist_priv_ps.test@1.3, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +1 -7
    Correction of comment.

  mysql-test/suite/funcs_1/t/processlist_priv_ps.test@1.2, 2008-03-07 18:34:57+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/suite/funcs_1/t/b_processlist_priv_ps.test -> mysql-test/suite/funcs_1/t/processlist_priv_ps.test

  mysql-test/suite/funcs_1/t/processlist_val_no_prot.test@1.3, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +1 -7
    Correction of comment.

  mysql-test/suite/funcs_1/t/processlist_val_no_prot.test@1.2, 2008-03-07 19:37:57+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/suite/funcs_1/t/a_processlist_val_no_prot.test -> mysql-test/suite/funcs_1/t/processlist_val_no_prot.test

  mysql-test/suite/funcs_1/t/processlist_val_ps.test@1.3, 2008-03-07 20:18:12+01:00, mleich@five.local.lan +1 -7
    Correction of comment.

  mysql-test/suite/funcs_1/t/processlist_val_ps.test@1.2, 2008-03-07 19:38:50+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/suite/funcs_1/t/b_processlist_val_ps.test -> mysql-test/suite/funcs_1/t/processlist_val_ps.test

ChangeSet@1.1810.3620.24, 2008-03-07 21:14:28+02:00, aelkin@mysql1000.(none) +6 -0
  Bug #26622 MASTER_POS_WAIT does not work as documented
  
  Affected tests fixing. After the fix for st_relay_log_info::wait_for_pos() that
  handles widely used select('master-bin.xxxx',pos) invoked by mysqltest
  there appeared to be four tests that either tried synchronizing when
  the slave was stopped or used incorrect synchronization method like
  to call `sync_with_master' from the current connection being to the
  master itself.
  
  Fixed with correcting the current connection or/and using the correct
  synchronization macro when possible.

  mysql-test/r/rpl_loaddata.result@1.28.1.7, 2008-03-07 21:14:26+02:00, aelkin@mysql1000.(none) +2 -1
    results changed

  mysql-test/r/rpl_slave_status.result@1.5.1.3, 2008-03-07 21:14:26+02:00, aelkin@mysql1000.(none) +1 -0
    results changed

  mysql-test/t/rpl_loaddata.test@1.21.1.6, 2008-03-07 21:14:26+02:00, aelkin@mysql1000.(none) +11 -2
    fixing cleanup for two tests

  mysql-test/t/rpl_skip_error.test@1.7.1.4, 2008-03-07 21:14:26+02:00, aelkin@mysql1000.(none) +3 -2
    fixing cleanup for two tests

  mysql-test/t/rpl_slave_status.test@1.7.1.2, 2008-03-07 21:14:26+02:00, aelkin@mysql1000.(none) +5 -1
    fixing cleanup

  mysql-test/t/rpl_temporary.test@1.15.4.1, 2008-03-07 21:14:27+02:00, aelkin@mysql1000.(none) +3 -2
    fixing synchronizations to use the intended correct macro.

ChangeSet@1.2512.63.3, 2008-03-07 21:14:34+03:00, kaa@kaamos.(none) +6 -0
  Fix for bug #34650: Test suite without cluster fails on Mac OS X
                      Leopard.
  
  The change_user test failed because results of some statements
  depended on platform and server build flags.
  
  subselect_notembedded failure was a result of a bad merge from 5.0.
  
  Fixed the corresponding test cases.

  mysql-test/r/change_user.result@1.3.2.1, 2008-03-07 21:14:33+03:00, kaa@kaamos.(none) +2 -2
    Fixed the test case.

  mysql-test/r/subselect.result@1.212.1.3, 2008-03-07 21:14:33+03:00, kaa@kaamos.(none) +0 -35
    Fixed the test case.

  mysql-test/r/subselect_notembedded.result@1.4, 2008-03-07 21:14:33+03:00, kaa@kaamos.(none) +32 -97
    Fixed the test case.

  mysql-test/t/change_user.test@1.2.2.1, 2008-03-07 21:14:33+03:00, kaa@kaamos.(none) +7 -0
    Fixed the test case.

  mysql-test/t/subselect.test@1.170, 2008-03-07 21:14:33+03:00, kaa@kaamos.(none) +0 -46
    Fixed the test case.

  mysql-test/t/subselect_notembedded.test@1.4, 2008-03-07 21:14:33+03:00, kaa@kaamos.(none) +39 -87
    Fixed the test case.

ChangeSet@1.1810.3474.24, 2008-03-07 17:33:07+01:00, mleich@five.local.lan +226 -0
  WL#4203 Reorganize and fix the data dictionary tests of
          testsuite funcs_1
  1. Fix the following bugs
     Bug#30440 "datadict" tests (all engines) fail: Character sets depend on configuration
        Solution: Test variants charset_collation_* adjusted to different builds
     Bug#32603 "datadict" tests (all engines) fail in "community" tree: "PROFILING" table
        Solution: Excluding "PROFILING" table from queries
     Bug#33654 "slow log" is missing a line
        Solution: Unify the content of the fields TABLES.TABLE_ROWS and
                  STATISTICS.CARDINALITY within result sets
     Bug#34532 Some funcs_1 tests do not clean up at end of testing
        Solution: DROP objects/reset global server variables modified during testing
                  + let tests missing implementation end before loading of tables
     Bug#31421 funcs_1: ndb__datadict fails, discrepancy between scripts and expected results
        Solution: Cut <engine>__datadict tests into smaller tests + generate new results.
     Bug#33599 INFORMATION_SCHEMA.STATISTICS got a new column INDEX_COMMENT: tests fail (2)
        Generation of new results during post merge fix
     Bug#33600 CHARACTER_OCTET_LENGTH is now CHARACTER_MAXIMUM_LENGTH * 4
        Generation of new results during post merge fix
     Bug#33631 Platform-specific replace of CHARACTER_MAXIMUM_LENGTH broken by 4-byte encoding
        Generation of new results during post merge fix
        + removal of platform-specific replace routine (no more needed)
  2. Restructure the tests
     - Test not more than one INFORMATION_SCHEMA view per testscript
     - Separate tests of I_S view layout+functionality from content related to the
       all time existing databases "information_schema", "mysql" and "test"
     - Avoid storage engine related variants of tests which are not sensible to
       storage engines at all.
  3. Reimplement or add some subtests + cleanup
     There is a some probability that even the reviewed changeset
     - does not fix all bugs from above   or
     - contains new bugs which show up on some platforms <> Linux or on one of
       the various build types
  4. The changeset contains fixes according to
     - one code review
     - minor bugs within testing code found after code review (accepted by reviewer)
     - problems found during tests with 5.0.56 in build environment

  BitKeeper/deleted/.del-create_database.inc@1.1.1.1, 2008-03-07 16:47:09+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/include/create_database.inc

  BitKeeper/deleted/.del-create_user_lowest_priv.inc@1.1.1.1, 2008-03-07 16:47:09+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc

  BitKeeper/deleted/.del-create_user_no_super.inc@1.1.1.1, 2008-03-07 16:47:09+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/include/create_user_no_super.inc

  BitKeeper/deleted/.del-datadict_help_tables_build.result@1.2, 2008-03-07 16:47:51+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/r/datadict_help_tables_build.result

  BitKeeper/deleted/.del-datadict_help_tables_build.test@1.2, 2008-03-07 16:47:51+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/t/datadict_help_tables_build.test

  BitKeeper/deleted/.del-datadict_help_tables_dev.result@1.2, 2008-03-07 16:47:51+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/r/datadict_help_tables_dev.result

  BitKeeper/deleted/.del-datadict_help_tables_dev.test@1.2, 2008-03-07 16:47:51+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/t/datadict_help_tables_dev.test

  BitKeeper/deleted/.del-datadict_master.inc@1.1.2.4, 2008-03-07 16:47:51+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_master.inc

  BitKeeper/deleted/.del-datadict_show_schema.inc@1.1.2.2, 2008-03-07 16:48:46+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc

  BitKeeper/deleted/.del-datadict_show_table_design.inc@1.1.1.1, 2008-03-07 16:48:46+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc

  BitKeeper/deleted/.del-datadict_tables.inc@1.1.1.2, 2008-03-07 16:48:46+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_tables.inc

  BitKeeper/deleted/.del-datadict_tables_error.inc@1.1.1.1, 2008-03-07 16:48:46+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc

  BitKeeper/deleted/.del-datadict_tables_error_1.inc@1.1.1.1, 2008-03-07 16:48:46+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc

  BitKeeper/deleted/.del-datadict_tables_error_1044.inc@1.1.1.2, 2008-03-07 16:48:46+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc@1.1.1.1, 2008-03-07 16:29:40+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  BitKeeper/deleted/.del-datadict_tables_error_1049.inc@1.1.1.1, 2008-03-07 16:49:32+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc

  BitKeeper/deleted/.del-datadict_tables_error_1051.inc@1.1.1.1, 2008-03-07 16:49:32+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc

  BitKeeper/deleted/.del-datadict_tables_error_1146.inc@1.1.1.1, 2008-03-07 16:49:32+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc

  BitKeeper/deleted/.del-datadict_tables_error_1288.inc@1.1.1.1, 2008-03-07 16:49:32+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc

  BitKeeper/deleted/.del-innodb__datadict.result@1.1.2.5, 2008-03-07 16:49:32+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb__datadict.result

  BitKeeper/deleted/.del-innodb__datadict.test@1.1.1.2, 2008-03-07 16:49:32+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/t/innodb__datadict.test

  BitKeeper/deleted/.del-innodb__load.result@1.1.1.1, 2008-03-07 16:37:00+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/r/innodb__load.result

  BitKeeper/deleted/.del-innodb__load.test@1.1.1.1, 2008-03-07 16:36:51+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/t/innodb__load.test

  BitKeeper/deleted/.del-memory__datadict.result@1.1.2.5, 2008-03-07 16:50:27+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/r/memory__datadict.result

  BitKeeper/deleted/.del-memory__datadict.test@1.1.1.2, 2008-03-07 16:50:03+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/t/memory__datadict.test

  BitKeeper/deleted/.del-memory__load.result@1.1.1.1, 2008-03-07 16:37:36+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/r/memory__load.result

  BitKeeper/deleted/.del-memory__load.test@1.1.1.1, 2008-03-07 16:37:25+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/t/memory__load.test

  BitKeeper/deleted/.del-myisam__datadict.result@1.1.2.5, 2008-03-07 16:50:03+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/r/myisam__datadict.result

  BitKeeper/deleted/.del-myisam__datadict.test@1.1.1.2, 2008-03-07 16:50:03+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/t/myisam__datadict.test

  BitKeeper/deleted/.del-myisam__load.result@1.1.1.1, 2008-03-07 16:37:46+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/r/myisam__load.result

  BitKeeper/deleted/.del-myisam__load.test@1.1.1.1, 2008-03-07 16:37:16+01:00, mleich@five.local.lan +0 -0
    Delete: mysql-test/suite/funcs_1/t/myisam__load.test

  mysql-test/suite/funcs_1/README.txt@1.1.1.2, 2008-03-07 17:33:00+01:00, mleich@five.local.lan +44 -132
    Cleanup in description

  mysql-test/suite/funcs_1/datadict/basics_mixed1.inc@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +53 -0
    Auxiliary script

  mysql-test/suite/funcs_1/datadict/basics_mixed1.inc@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/datadict/basics_mixed2.inc@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +55 -0
    Auxiliary script

  mysql-test/suite/funcs_1/datadict/basics_mixed2.inc@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/datadict/basics_mixed3.inc@1.1, 2008-03-07 17:33:05+01:00, mleich@five.local.lan +42 -0
    Auxiliary script

  mysql-test/suite/funcs_1/datadict/basics_mixed3.inc@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/datadict/charset_collation.inc@1.1, 2008-03-07 17:33:05+01:00, mleich@five.local.lan +122 -0
    Auxiliary script

  mysql-test/suite/funcs_1/datadict/charset_collation.inc@1.0, 2008-03-07 17:33:05+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/datadict/columns.inc@1.1, 2008-03-07 17:33:05+01:00, mleich@five.local.lan +87 -0
    Auxiliary script

  mysql-test/suite/funcs_1/datadict/columns.inc@1.0, 2008-03-07 17:33:05+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/datadict/datadict.pre@1.1, 2008-03-07 17:33:05+01:00, mleich@five.local.lan +54 -0
    Auxiliary script

  mysql-test/suite/funcs_1/datadict/datadict.pre@1.0, 2008-03-07 17:33:05+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/datadict/is_table_query.inc@1.1, 2008-03-07 17:33:05+01:00, mleich@five.local.lan +42 -0
    Auxiliary script

  mysql-test/suite/funcs_1/datadict/is_table_query.inc@1.0, 2008-03-07 17:33:05+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/datadict/statistics.inc@1.1, 2008-03-07 17:33:05+01:00, mleich@five.local.lan +55 -0
    Auxiliary script

  mysql-test/suite/funcs_1/datadict/statistics.inc@1.0, 2008-03-07 17:33:05+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/datadict/table_constraints.inc@1.1, 2008-03-07 17:33:05+01:00, mleich@five.local.lan +45 -0
    Auxiliary script

  mysql-test/suite/funcs_1/datadict/table_constraints.inc@1.0, 2008-03-07 17:33:05+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/datadict/tables1.inc@1.1, 2008-03-07 17:33:05+01:00, mleich@five.local.lan +39 -0
    Auxiliary script

  mysql-test/suite/funcs_1/datadict/tables1.inc@1.0, 2008-03-07 17:33:05+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/datadict/tables2.inc@1.1, 2008-03-07 17:33:05+01:00, mleich@five.local.lan +47 -0
    Auxiliary script

  mysql-test/suite/funcs_1/datadict/tables2.inc@1.0, 2008-03-07 17:33:05+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/include/cleanup.inc@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +21 -0
    Auxiliary script

  mysql-test/suite/funcs_1/include/cleanup.inc@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/include/memory_tb1.inc@1.1.1.1, 2008-03-07 17:33:00+01:00, mleich@five.local.lan +0 -3
    Move setting of variables into the caller scripts

  mysql-test/suite/funcs_1/include/memory_tb2.inc@1.1.1.1, 2008-03-07 17:33:00+01:00, mleich@five.local.lan +0 -3
    Move setting of variables into the caller scripts

  mysql-test/suite/funcs_1/include/memory_tb3.inc@1.1.1.1, 2008-03-07 17:33:00+01:00, mleich@five.local.lan +0 -3
    Move setting of variables into the caller scripts

  mysql-test/suite/funcs_1/include/memory_tb4.inc@1.1.1.1, 2008-03-07 17:33:00+01:00, mleich@five.local.lan +0 -3
    Move setting of variables into the caller scripts

  mysql-test/suite/funcs_1/include/sp_tb.inc@1.1.1.1, 2008-03-07 17:33:00+01:00, mleich@five.local.lan +0 -4
    Remove outdated comment

  mysql-test/suite/funcs_1/r/charset_collation_1.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +309 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/charset_collation_1.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/charset_collation_2.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +311 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/charset_collation_2.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/charset_collation_3.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +309 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/charset_collation_3.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/innodb_bitdata.result@1.1.1.1, 2008-03-07 17:33:00+01:00, mleich@five.local.lan +0 -64
    Updated results

  mysql-test/suite/funcs_1/r/innodb_cursors.result@1.1.1.1, 2008-03-07 17:33:00+01:00, mleich@five.local.lan +0 -78
    Updated results

  mysql-test/suite/funcs_1/r/innodb_storedproc_02.result@1.1.1.1, 2008-03-07 17:33:00+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/innodb_storedproc_03.result@1.1.1.1, 2008-03-07 17:33:00+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/innodb_storedproc_06.result@1.1.1.1, 2008-03-07 17:33:00+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/innodb_storedproc_07.result@1.1.1.1, 2008-03-07 17:33:00+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/innodb_storedproc_08.result@1.1.1.1, 2008-03-07 17:33:00+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/innodb_storedproc_10.result@1.1.1.1, 2008-03-07 17:33:00+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/innodb_trig_0102.result@1.1.1.2, 2008-03-07 17:33:00+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/innodb_trig_03.result@1.1.1.1, 2008-03-07 17:33:00+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/innodb_trig_0407.result@1.1.1.1, 2008-03-07 17:33:00+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/innodb_trig_08.result@1.1.2.2, 2008-03-07 17:33:00+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/innodb_trig_09.result@1.1.1.2, 2008-03-07 17:33:00+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result@1.1.1.1, 2008-03-07 17:33:00+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/innodb_trig_frkey.result@1.1.1.1, 2008-03-07 17:33:00+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/innodb_views.result@1.1.2.3, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +2 -2
    Updated results

  mysql-test/suite/funcs_1/r/is_basics_mixed.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +602 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_basics_mixed.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_character_sets.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +78 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_character_sets.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +76 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_collations.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +90 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_collations.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_column_privileges.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +370 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_column_privileges.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_column_privileges_is_mysql_test.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +37 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_column_privileges_is_mysql_test.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_columns.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +486 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_columns.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_columns_innodb.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +1130 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_columns_innodb.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_columns_is.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +380 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_columns_is.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_columns_memory.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +1076 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_columns_memory.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_columns_myisam.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +1207 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_columns_myisam.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_columns_mysql.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +361 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_columns_mysql.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_columns_ndb.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +223 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_columns_ndb.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_key_column_usage.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +370 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_key_column_usage.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_routines.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +605 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_routines.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_schema_privileges.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +304 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_schema_privileges.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +51 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_schemata.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +181 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_schemata.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_schemata_is_mysql_test.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +42 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_schemata_is_mysql_test.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_statistics.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +352 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_statistics.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_statistics_is.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +17 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_statistics_is.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_statistics_mysql.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +60 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_statistics_mysql.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_table_constraints.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +310 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_table_constraints.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_table_constraints_is.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +17 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_table_constraints_is.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +37 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_table_privileges.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +332 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_table_privileges.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_tables.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +419 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_tables.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_tables_innodb.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +1063 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_tables_innodb.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_tables_is.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +771 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_tables_is.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_tables_memory.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +1052 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_tables_memory.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_tables_myisam.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +1092 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_tables_myisam.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_tables_mysql.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +424 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_tables_mysql.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_tables_ndb.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +560 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_tables_ndb.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_triggers.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +212 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_triggers.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_user_privileges.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +400 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_user_privileges.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/is_views.result@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +238 -0
    Expected result for new test

  mysql-test/suite/funcs_1/r/is_views.result@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/r/memory_bitdata.result@1.1.1.1, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +0 -65
    Updated results

  mysql-test/suite/funcs_1/r/memory_cursors.result@1.1.1.1, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +0 -75
    Updated results

  mysql-test/suite/funcs_1/r/memory_storedproc_02.result@1.1.1.1, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/memory_storedproc_03.result@1.1.1.1, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/memory_storedproc_06.result@1.1.1.1, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/memory_storedproc_07.result@1.1.1.1, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/memory_storedproc_08.result@1.1.1.1, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/memory_storedproc_10.result@1.1.1.1, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/memory_trig_0102.result@1.1.1.2, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +1 -3
    Updated results

  mysql-test/suite/funcs_1/r/memory_trig_03.result@1.1.1.1, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +1 -3
    Updated results

  mysql-test/suite/funcs_1/r/memory_trig_0407.result@1.1.1.1, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +1 -3
    Updated results

  mysql-test/suite/funcs_1/r/memory_trig_08.result@1.1.2.2, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +1 -3
    Updated results

  mysql-test/suite/funcs_1/r/memory_trig_09.result@1.1.1.2, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +1 -3
    Updated results

  mysql-test/suite/funcs_1/r/memory_trig_1011ext.result@1.1.1.1, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +1 -3
    Updated results

  mysql-test/suite/funcs_1/r/memory_views.result@1.1.2.3, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +2 -6
    Updated results

  mysql-test/suite/funcs_1/r/myisam_bitdata.result@1.1.1.1, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +0 -73
    Updated results

  mysql-test/suite/funcs_1/r/myisam_cursors.result@1.1.1.1, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +0 -81
    Updated results

  mysql-test/suite/funcs_1/r/myisam_storedproc_02.result@1.1.1.1, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/myisam_storedproc_03.result@1.1.1.1, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/myisam_storedproc_06.result@1.1.1.1, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/myisam_storedproc_07.result@1.1.1.1, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/myisam_storedproc_08.result@1.1.1.1, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/myisam_storedproc_10.result@1.1.1.1, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/myisam_trig_0102.result@1.1.1.2, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/myisam_trig_03.result@1.1.1.1, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/myisam_trig_0407.result@1.1.1.1, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/myisam_trig_08.result@1.1.2.2, 2008-03-07 17:33:01+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/myisam_trig_09.result@1.1.1.2, 2008-03-07 17:33:02+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result@1.1.1.1, 2008-03-07 17:33:02+01:00, mleich@five.local.lan +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/myisam_views.result@1.1.2.3, 2008-03-07 17:33:02+01:00, mleich@five.local.lan +9379 -9379
    Updated results

  mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc@1.1.1.1, 2008-03-07 17:33:02+01:00, mleich@five.local.lan +0 -3
    Move setting of variables into the caller scripts

  mysql-test/suite/funcs_1/storedproc/storedproc_02.inc@1.1.1.1, 2008-03-07 16:29:40+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/storedproc/storedproc_03.inc@1.1.1.1, 2008-03-07 16:29:40+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/storedproc/storedproc_06.inc@1.1.1.1, 2008-03-07 16:29:40+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/storedproc/storedproc_07.inc@1.1.1.1, 2008-03-07 16:29:40+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/storedproc/storedproc_08.inc@1.1.1.1, 2008-03-07 16:29:40+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc@1.1.1.1, 2008-03-07 16:29:40+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/storedproc/storedproc_10.inc@1.1.1.1, 2008-03-07 16:29:40+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/t/charset_collation_1.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +30 -0
    Check content of information_schema views
       character_sets, collations,
       collation_character_set_applicability
    Build variant 1

  mysql-test/suite/funcs_1/t/charset_collation_1.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/charset_collation_2.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +24 -0
    Check content of information_schema views
       character_sets, collations,
       collation_character_set_applicability
    Build variant 2

  mysql-test/suite/funcs_1/t/charset_collation_2.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/charset_collation_3.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +24 -0
    Check content of information_schema views
       character_sets, collations,
       collation_character_set_applicability
    Build variant 3

  mysql-test/suite/funcs_1/t/charset_collation_3.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/innodb_bitdata.test@1.1.1.1, 2008-03-07 17:33:02+01:00, mleich@five.local.lan +6 -23
    Cleanup

  mysql-test/suite/funcs_1/t/innodb_cursors.test@1.1.1.1, 2008-03-07 17:33:02+01:00, mleich@five.local.lan +6 -21
    Cleanup

  mysql-test/suite/funcs_1/t/innodb_storedproc_02.test@1.1.1.1, 2008-03-07 16:27:45+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/t/innodb_storedproc_03.test@1.1.1.1, 2008-03-07 16:27:45+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/t/innodb_storedproc_06.test@1.1.1.1, 2008-03-07 16:27:45+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/t/innodb_storedproc_07.test@1.1.1.1, 2008-03-07 16:27:45+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/t/innodb_storedproc_08.test@1.1.1.1, 2008-03-07 16:27:45+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/t/innodb_storedproc_10.test@1.1.1.1, 2008-03-07 16:27:45+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/t/innodb_trig_0102.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +4 -22
    Cleanup

  mysql-test/suite/funcs_1/t/innodb_trig_03.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +4 -22
    Cleanup

  mysql-test/suite/funcs_1/t/innodb_trig_0407.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +4 -22
    Cleanup

  mysql-test/suite/funcs_1/t/innodb_trig_08.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +4 -22
    Cleanup

  mysql-test/suite/funcs_1/t/innodb_trig_09.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +4 -22
    Cleanup

  mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +4 -22
    Cleanup

  mysql-test/suite/funcs_1/t/innodb_trig_frkey.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +4 -22
    Cleanup

  mysql-test/suite/funcs_1/t/innodb_views.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +12 -34
    Cleanup

  mysql-test/suite/funcs_1/t/is_basics_mixed.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +503 -0
    Test some basic properties which are independend of the storage
    engine used for the creation of tables.

  mysql-test/suite/funcs_1/t/is_basics_mixed.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_character_sets.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +107 -0
    Tests related to functionality of
    information_schema.character_sets

  mysql-test/suite/funcs_1/t/is_character_sets.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +108 -0
    Tests related to functionality of
    information_schema.collation_character_set_applicability

  mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_collations.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +114 -0
    Tests related to functionality of
    information_schema.collations

  mysql-test/suite/funcs_1/t/is_collations.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_column_privileges.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +351 -0
    Tests related to functionality of
    information_schema.column_privileges

  mysql-test/suite/funcs_1/t/is_column_privileges.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +58 -0
    Check content of information_schema.column_privileges about databases
    mysql and test

  mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_columns.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +444 -0
    Tests related to functionality of
    information_schema.columns

  mysql-test/suite/funcs_1/t/is_columns.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_columns_innodb.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +21 -0
    Check content of information_schema.columns when some
    tables are preloaded
    Variant for InnoDB

  mysql-test/suite/funcs_1/t/is_columns_innodb.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_columns_is.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +19 -0
    Check content of information_schema.columns about schema
    information_schema

  mysql-test/suite/funcs_1/t/is_columns_is.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_columns_memory.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +21 -0
    Check content of information_schema.columns when some
    tables are preloaded
    Variant for MEMORY

  mysql-test/suite/funcs_1/t/is_columns_memory.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_columns_myisam.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +21 -0
    Check content of information_schema.columns when some
    tables are preloaded
    Variant for MyISAM

  mysql-test/suite/funcs_1/t/is_columns_myisam.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_columns_mysql.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +13 -0
    Check content of information_schema.columns about schema
    mysql

  mysql-test/suite/funcs_1/t/is_columns_mysql.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_columns_ndb.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +33 -0
    Check content of information_schema.columns when some
    tables are preloaded
    Variant for NDB

  mysql-test/suite/funcs_1/t/is_columns_ndb.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_key_column_usage.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +344 -0
    Tests related to functionality of
    information_schema.key_column_usage

  mysql-test/suite/funcs_1/t/is_key_column_usage.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_routines.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +471 -0
    Tests related to functionality of
    information_schema.routines

  mysql-test/suite/funcs_1/t/is_routines.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_schema_privileges.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +336 -0
    Tests related to functionality of
    information_schema.schema_privileges

  mysql-test/suite/funcs_1/t/is_schema_privileges.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +58 -0
    Check content of information_schema.schema_privileges about schemas
    information_schema, mysql and test

  mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_schemata.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +246 -0
    Tests related to functionality of
    information_schema.schemata

  mysql-test/suite/funcs_1/t/is_schemata.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +58 -0
    Check content of information_schema.schemata about schemas
    information_schema, mysql and test

  mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_statistics.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +379 -0
    Tests related to functionality of
    information_schema.statistics

  mysql-test/suite/funcs_1/t/is_statistics.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_statistics_is.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +14 -0
    Check content of information_schema.statistics about schema
    information_schema

  mysql-test/suite/funcs_1/t/is_statistics_is.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_statistics_mysql.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +15 -0
    Check content of information_schema.statistics about schema
    mysql

  mysql-test/suite/funcs_1/t/is_statistics_mysql.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_table_constraints.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +331 -0
    Tests related to functionality of
    information_schema.table_constraints

  mysql-test/suite/funcs_1/t/is_table_constraints.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_table_constraints_is.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +14 -0
    Check content of information_schema.table_constraints about schema
    information_schema

  mysql-test/suite/funcs_1/t/is_table_constraints_is.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_table_constraints_mysql.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +14 -0
    Check content of information_schema.table_constraints about schema
    mysql

  mysql-test/suite/funcs_1/t/is_table_constraints_mysql.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_table_privileges.test@1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +349 -0
    Tests related to functionality of
    information_schema.table_privileges

  mysql-test/suite/funcs_1/t/is_table_privileges.test@1.0, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_tables.test@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +474 -0
    Tests related to functionality of
    information_schema.tables

  mysql-test/suite/funcs_1/t/is_tables.test@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_tables_innodb.test@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +22 -0
    Check content of information_schema.tables when some
    tables are preloaded
    Variant for InnoDB

  mysql-test/suite/funcs_1/t/is_tables_innodb.test@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_tables_is.test@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +18 -0
    Check content of information_schema.tables about schema
    information_schema

  mysql-test/suite/funcs_1/t/is_tables_is.test@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_tables_memory.test@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +22 -0
    Check content of information_schema.tables when some
    tables are preloaded
    Variant for MEMORY

  mysql-test/suite/funcs_1/t/is_tables_memory.test@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_tables_myisam.test@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +22 -0
    Check content of information_schema.tables when some
    tables are preloaded
    Variant for MyISAM

  mysql-test/suite/funcs_1/t/is_tables_myisam.test@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_tables_mysql.test@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +14 -0
    Check content of information_schema.tables about schema
    mysql

  mysql-test/suite/funcs_1/t/is_tables_mysql.test@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_tables_ndb.test@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +34 -0
    Check content of information_schema.tables when some
    tables are preloaded
    Variant for NDB

  mysql-test/suite/funcs_1/t/is_tables_ndb.test@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_triggers.test@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +253 -0
    Tests related to functionality of
    information_schema.triggers

  mysql-test/suite/funcs_1/t/is_triggers.test@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_user_privileges.test@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +347 -0
    Tests related to functionality of
    information_schema.user_privileges

  mysql-test/suite/funcs_1/t/is_user_privileges.test@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/is_views.test@1.1, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +305 -0
    Tests related to functionality of
    information_schema.views

  mysql-test/suite/funcs_1/t/is_views.test@1.0, 2008-03-07 17:33:04+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/funcs_1/t/memory_bitdata.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +7 -23
    Cleanup

  mysql-test/suite/funcs_1/t/memory_cursors.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +6 -21
    Cleanup

  mysql-test/suite/funcs_1/t/memory_storedproc_02.test@1.1.1.1, 2008-03-07 16:27:45+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/t/memory_storedproc_03.test@1.1.1.1, 2008-03-07 16:27:45+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/t/memory_storedproc_06.test@1.1.1.1, 2008-03-07 16:27:45+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/t/memory_storedproc_07.test@1.1.1.1, 2008-03-07 16:27:45+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/t/memory_storedproc_08.test@1.1.1.1, 2008-03-07 16:27:45+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/t/memory_storedproc_10.test@1.1.1.1, 2008-03-07 16:27:45+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/t/memory_trig_0102.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +4 -22
    Cleanup

  mysql-test/suite/funcs_1/t/memory_trig_03.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +4 -22
    Cleanup

  mysql-test/suite/funcs_1/t/memory_trig_0407.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +4 -22
    Cleanup

  mysql-test/suite/funcs_1/t/memory_trig_08.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +4 -22
    Cleanup

  mysql-test/suite/funcs_1/t/memory_trig_09.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +4 -22
    Cleanup

  mysql-test/suite/funcs_1/t/memory_trig_1011ext.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +4 -22
    Cleanup

  mysql-test/suite/funcs_1/t/memory_views.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +12 -34
    Cleanup

  mysql-test/suite/funcs_1/t/myisam_bitdata.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +7 -23
    Cleanup

  mysql-test/suite/funcs_1/t/myisam_cursors.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +6 -21
    Cleanup

  mysql-test/suite/funcs_1/t/myisam_storedproc_02.test@1.1.1.1, 2008-03-07 16:27:45+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/t/myisam_storedproc_03.test@1.1.1.1, 2008-03-07 16:27:45+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/t/myisam_storedproc_06.test@1.1.1.1, 2008-03-07 16:27:45+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/t/myisam_storedproc_07.test@1.1.1.1, 2008-03-07 16:27:45+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/t/myisam_storedproc_08.test@1.1.1.1, 2008-03-07 16:27:45+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/t/myisam_storedproc_10.test@1.1.1.1, 2008-03-07 16:27:45+01:00, mleich@five.local.lan +0 -0
    Change mode to -rw-rw-r--

  mysql-test/suite/funcs_1/t/myisam_trig_0102.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +4 -22
    Cleanup

  mysql-test/suite/funcs_1/t/myisam_trig_03.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +4 -22
    Cleanup

  mysql-test/suite/funcs_1/t/myisam_trig_0407.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +4 -22
    Cleanup

  mysql-test/suite/funcs_1/t/myisam_trig_08.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +4 -22
    Cleanup

  mysql-test/suite/funcs_1/t/myisam_trig_09.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +4 -22
    Cleanup

  mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +4 -13
    Cleanup

  mysql-test/suite/funcs_1/t/myisam_views.test@1.1.1.1, 2008-03-07 17:33:03+01:00, mleich@five.local.lan +12 -33
    Cleanup

ChangeSet@1.2512.65.1, 2008-03-07 18:41:50+04:00, svoj@mysql.com +4 -0
  BUG#34656 - KILL a query = Assertion failed: m_status == DA_ERROR ||
              m_status == DA_OK
  
  Reading from information_scema.tables or information_schema.columns
  may cause assertion failure in debug builds. This may happen under
  rare circumstances when information_schema fails to get information
  about a table (e.g. when a connection is killed).
  
  This happens because open_normal_and_derived_tables() can return an
  error without setting an error message in THD. But information_schema
  attempts to get an error message from THD unconditionally.
  
  With this fix information_schema attempts to get an error message
  from THD only in case error message is set in THD.

  mysql-test/r/information_schema.result@1.163.1.1, 2008-03-07 18:41:47+04:00, svoj@mysql.com +2 -0
    A test case for BUG#34656.

  mysql-test/t/information_schema.test@1.106.1.1, 2008-03-07 18:41:47+04:00, svoj@mysql.com +44 -0
    A test case for BUG#34656.

  sql/item_func.cc@1.424.1.2, 2008-03-07 18:41:47+04:00, svoj@mysql.com +2 -0
    Set proc info to "User sleep".

  sql/sql_show.cc@1.450.3.1, 2008-03-07 18:41:47+04:00, svoj@mysql.com +4 -3
    open_normal_and_derived_tables() can return an error without
    setting an error message in THD. That means we must access
    error message conditionally, only in case thd->is_error() is
    true.

ChangeSet@1.2542.14.4, 2008-03-07 13:59:36+01:00, sven@riska.(none) +27 -0
  BUG#31168: @@hostname does not replicate
  Problem: in mixed and statement mode, a query that refers to a
  system variable will use the slave's value when replayed on
  slave. So if the value of a system variable is inserted into a
  table, the slave will differ from the master.
  Fix: mark statements that refer to a system variable as "unsafe",
  meaning they will be replicated by row in mixed mode and produce a warning
  in statement mode. There are some exceptions: some variables are actually
  replicated. Those should *not* be marked as unsafe.
  BUG#34732: mysqlbinlog does not print default values for auto_increment variables
  Problem: mysqlbinlog does not print default values for some variables,
  including auto_increment_increment and others. So if a client executing
  the output of mysqlbinlog has different default values, replication will
  be wrong.
  Fix: Always print default values for all variables that are replicated.
  I need to fix the two bugs at the same time, because the test cases would
  fail if I only fixed one of them.

  include/m_ctype.h@1.141, 2008-03-07 13:59:32+01:00, sven@riska.(none) +1 -0
    Added definition of ILLEGAL_CHARSET_INFO_NUMBER. We just need a symbol
    for a number that will never be used by any charset. ~0U should be safe
    since charset numbers are sequential, starting from 0.

  mysql-test/include/commit.inc@1.3, 2008-03-07 13:59:32+01:00, sven@riska.(none) +9 -1
    Upated test to avoid making statements unsafe.

  mysql-test/include/diff_tables.inc@1.1, 2008-03-07 13:59:34+01:00, sven@riska.(none) +122 -0
    New auxiliary test file that tests whether two tables (possibly one on
    master and one on slave) differ.

  mysql-test/include/diff_tables.inc@1.0, 2008-03-07 13:59:34+01:00, sven@riska.(none) +0 -0

  mysql-test/r/commit_1innodb.result@1.3, 2008-03-07 13:59:32+01:00, sven@riska.(none) +2 -1
    Updated test needs updated result file.

  mysql-test/r/mysqlbinlog.result@1.46, 2008-03-07 13:59:32+01:00, sven@riska.(none) +40 -0
    Updated result file.

  mysql-test/r/mysqlbinlog2.result@1.20, 2008-03-07 13:59:32+01:00, sven@riska.(none) +140 -26
    Updated result file.

  mysql-test/r/user_var-binlog.result@1.15, 2008-03-07 13:59:32+01:00, sven@riska.(none) +4 -0
    Updated result file.

  mysql-test/suite/binlog/r/binlog_base64_flag.result@1.3, 2008-03-07 13:59:33+01:00, sven@riska.(none) +6 -3
    Updated result file.

  mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result@1.17.1.1, 2008-03-07 13:59:33+01:00, sven@riska.(none) +4 -0
    Updated result file.

  mysql-test/suite/binlog/r/binlog_unsafe.result@1.9, 2008-03-07 13:59:33+01:00, sven@riska.(none) +179 -11
    Modified test file needs modified result file.

  mysql-test/suite/binlog/t/binlog_base64_flag.test@1.4, 2008-03-07 13:59:33+01:00, sven@riska.(none) +1 -1
    Need to filter out pseudo_thread_id from result since it is
    nondeterministic.

  mysql-test/suite/binlog/t/binlog_unsafe.test@1.6, 2008-03-07 13:59:33+01:00, sven@riska.(none) +229 -14
    Add tests that using variables is unsafe. The 'CREATE VIEW' tests didn't
    make sense, so I removed them. SHOW WARNINGS is not necessary either,
    because we get warnings for each statement in the result file.

  mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result@1.9, 2008-03-07 13:59:33+01:00, sven@riska.(none) +16 -0
    Updated result file.

  mysql-test/suite/rpl/r/rpl_skip_error.result@1.20, 2008-03-07 13:59:33+01:00, sven@riska.(none) +15 -12
    Updated result file.

  mysql-test/suite/rpl/r/rpl_variables.result@1.1, 2008-03-07 13:59:34+01:00, sven@riska.(none) +584 -0
    New test case needs new result file.

  mysql-test/suite/rpl/r/rpl_variables.result@1.0, 2008-03-07 13:59:34+01:00, sven@riska.(none) +0 -0

  mysql-test/suite/rpl/r/rpl_variables_stm.result@1.1, 2008-03-07 13:59:34+01:00, sven@riska.(none) +526 -0
    New test file needs new result file.

  mysql-test/suite/rpl/r/rpl_variables_stm.result@1.0, 2008-03-07 13:59:34+01:00, sven@riska.(none) +0 -0

  mysql-test/suite/rpl/t/rpl_skip_error.test@1.18, 2008-03-07 13:59:33+01:00, sven@riska.(none) +42 -33
    The test used @@server_id, which is not safe to replicate, so it would
    have given a warning. The way it used @@server_id was hackish (issue a
    query on master that removes rows only on master), so I replaced it by a
    more robust way to do the same thing (connect to slave and insert the
    rows only there).
    Also clarified what the test case does.

  mysql-test/suite/rpl/t/rpl_variables.test@1.1, 2008-03-07 13:59:34+01:00, sven@riska.(none) +739 -0
    Test that INSERT of @@variables is replicated correctly (by switching to
    row-based mode).

  mysql-test/suite/rpl/t/rpl_variables.test@1.0, 2008-03-07 13:59:34+01:00, sven@riska.(none) +0 -0

  mysql-test/suite/rpl/t/rpl_variables_stm.test@1.1, 2008-03-07 13:59:34+01:00, sven@riska.(none) +636 -0
    Test that replication of @@variables which are replicated explicitly works
    as expected in statement mode (without giving warnings).

  mysql-test/suite/rpl/t/rpl_variables_stm.test@1.0, 2008-03-07 13:59:34+01:00, sven@riska.(none) +0 -0

  mysql-test/t/mysqlbinlog2.test@1.20, 2008-03-07 13:59:33+01:00, sven@riska.(none) +1 -2
    Use --short-form instead of manually filtering out nondeterministic stuff
    from mysqlbinlog (because we added the nondeterministic @@pseudo_thread_id
    to the output).

  sql/item_func.cc@1.424.3.3, 2008-03-07 13:59:33+01:00, sven@riska.(none) +6 -0
    Added method of Item_func_get_system_var that indicates whether the given
    system variable will be written to the binlog or not.

  sql/item_func.h@1.176.2.2, 2008-03-07 13:59:33+01:00, sven@riska.(none) +9 -0
    Added method of Item_func_get_system_var that indicates whether the given
    system variable will be written to the binlog or not.

  sql/log_event.cc@1.292, 2008-03-07 13:59:33+01:00, sven@riska.(none) +79 -45
     - auto_increment_offset was not written to the binlog if
    auto_increment_increment=1
     - mysqlbinlog did not output default values for some variables
    (BUG#34732). In st_print_event_info, we remember for each variable whether
    it has been printed or not. This is achieved in different ways for
    different variables:
        - For auto_increment_*, lc_time_names, charset_database_number,
          we set the default values in st_print_event_info to something
          illegal, so that it will look like they have changed the first time
          they are seen.
        - For charset, sql_mode, pseudo_thread_id, we add a flag to
          st_print_event_info which indicates whether the variable has been
          printed.
        - Since pseudo_thread_id is now printed more often, and its value is
          not guaranteed to be constant across different runs of the same
          test script, I replaced it by a constant if --short-form is used.
     - Moved st_print_event_info constructor from log_event.h to log_event.cc,
    since it now depends on ILLEGAL_CHARSET_NUMBER, which is defined in
    m_ctype.h, which is better to include from a .cc file than from a header
    file.

  sql/log_event.h@1.174, 2008-03-07 13:59:33+01:00, sven@riska.(none) +7 -22
    Added fields to st_print_event_info that indicate whether some of the
    variables have been written or not. Since the initialization of
    charset_database_number now depends on ILLEGAL_CHARSET_INFO_NUMBER, which
    is defined in a header file, which we'd better not include from this
    header file -- I moved the constructor from here to log_event.cc.

  sql/set_var.cc@1.267.1.7, 2008-03-07 13:59:33+01:00, sven@riska.(none) +94 -42
    System variables now have a flag binlog_status, which indicates if they
    are written to the binlog. If nothing is specified, all variables are
    marked as not written to the binlog (NOT_IN_BINLOG) when created. In this
    file, the variables that are written to the binlog are marked with
    SESSION_VARIABLE_IN_BINLOG.

  sql/set_var.h@1.117, 2008-03-07 13:59:34+01:00, sven@riska.(none) +91 -61
    Added flag binlog_status to class sys_var. Added a getter and a
    constructor parameter that sets it.
    Since I had to change sys_var_thd_enum constructor anyways, I simplified
    it to use default values of arguments instead of three copies of the
    constructor.

  sql/sql_yacc.yy@1.611.1.14, 2008-03-07 13:59:34+01:00, sven@riska.(none) +3 -0
    Mark statements that refer to a system variable as "unsafe",
    meaning they will be replicated by row in mixed mode. Added comment to
    explain strange piece of code just above.

ChangeSet@1.2512.64.1, 2008-03-07 13:56:15+01:00, mhansson@riffraff.(none) +2 -0
  Bug #34367: sql/sql_show.cc: create_schema_table should handle 
  MYSQL_TYPE_NEWDECIMAL
  
  Added support for the type MYSQL_TYPE_NEWDECIMAL. It now works like
  MYSQL_TYPE_DECIMAL. Unfortunately there cannot be a test case until
  we have a working information_schema plugin as part of the source
  distribution.

  sql/sql_show.cc@1.450.2.1, 2008-03-07 13:56:13+01:00, mhansson@riffraff.(none) +5 -3
    Bug#34367: The fix. Corrected wrong comments and a DBUG_ENTER with wrong 
    function name.

  sql/table.h@1.188.2.1, 2008-03-07 13:56:13+01:00, mhansson@riffraff.(none) +24 -0
    Bug#34367: Added comments to st_field_info.

ChangeSet@1.2542.14.3, 2008-03-07 14:39:37+02:00, aelkin@mysql1000.(none) +3 -0
  Bug #28780 report_host is not available through SELECT @@report_host
  
  merging and post-make-test changes.

  mysql-test/suite/rpl/r/rpl_report.result@1.2, 2008-03-07 14:39:35+02:00, aelkin@mysql1000.(none) +16 -10
    results changed

  mysql-test/suite/rpl/t/rpl_report.test@1.2, 2008-03-07 14:39:35+02:00, aelkin@mysql1000.(none) +8 -5
    correcting test because of non-deterministic select's result

  sql/set_var.cc@1.267.1.6, 2008-03-07 14:39:35+02:00, aelkin@mysql1000.(none) +3 -1
    compilation issue

ChangeSet@1.1810.3668.1, 2008-03-07 11:15:49+02:00, gkodinov@magare.gmz +4 -0
  Bug #34909: mysqldump returns a 0 status on error when using 
    --master-data
  
  No error code was returned by mysqldump if it detects that binary
  logging is not enabled on the server.
  Fixed by returning error code.

  client/mysqldump.c@1.214.1.62, 2008-03-07 11:15:49+02:00, gkodinov@magare.gmz +1 -0
    Bug #34909: add error code

  mysql-test/r/mysqldump-no-binlog.result@1.1, 2008-03-07 11:15:49+02:00, gkodinov@magare.gmz +1 -0
    Bug #34909: test case

  mysql-test/r/mysqldump-no-binlog.result@1.0, 2008-03-07 11:15:49+02:00, gkodinov@magare.gmz +0 -0

  mysql-test/t/mysqldump-no-binlog-master.opt@1.1, 2008-03-07 11:15:49+02:00, gkodinov@magare.gmz +1 -0
    Bug #34909: test case

  mysql-test/t/mysqldump-no-binlog-master.opt@1.0, 2008-03-07 11:15:49+02:00, gkodinov@magare.gmz +0 -0

  mysql-test/t/mysqldump-no-binlog.test@1.1, 2008-03-07 11:15:49+02:00, gkodinov@magare.gmz +6 -0
    Bug #34909: test case

  mysql-test/t/mysqldump-no-binlog.test@1.0, 2008-03-07 11:15:49+02:00, gkodinov@magare.gmz +0 -0

ChangeSet@1.2542.15.1, 2008-03-06 14:07:49-05:00, cmiller@zippy.cornsilk.net +2 -0
  Bug#28269: FEDERATED engine fails to quote reserved words for \
  	field names
  
  Add a test that proves the bug is fixed.  This doesn't add any
  new server code.

  mysql-test/r/federated.result@1.55.1.1, 2008-03-06 14:07:46-05:00, cmiller@zippy.cornsilk.net +27 -3
    Verifying that one can use federated with keyword and bizarre 
    column names.

  mysql-test/t/federated.test@1.45.1.1, 2008-03-06 14:07:46-05:00, cmiller@zippy.cornsilk.net +21 -0
    Verifying that one can use federated with keyword and bizarre 
    column names.
    
    Eval interprets one level of backslash escaping, so some of this 
    may look strange.

ChangeSet@1.2542.13.1, 2008-03-06 20:32:47+02:00, aelkin@mysql1000.(none) +5 -0
  Bug #22234 Extra Slave Col: Slave should stop on Error Field `d` of table
  
  There was a failure in that show slave status displayed a wrong message
  when slave stopped at processing a row event inserting to a default-less
  column.
  
  The problem seem to have ceased after recent fixes in rbr code.
  However, the test was not updated to carry testing of the case commented-out.
  
  Uncommenting and editing the test.
  Notice, Bug#23907 is most probably a duplicate of this one.

  mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test@1.7, 2008-03-06 20:32:45+02:00, aelkin@mysql1000.(none) +26 -33
    uncommenting the test that previously failed.

  mysql-test/suite/rpl/r/rpl_extraCol_innodb.result@1.16, 2008-03-06 20:32:45+02:00, aelkin@mysql1000.(none) +56 -0
    results changed due to the correct expected error message of an added test
    is displayed.

  mysql-test/suite/rpl/r/rpl_extraCol_myisam.result@1.16, 2008-03-06 20:32:45+02:00, aelkin@mysql1000.(none) +56 -0
    results changed to reflect the test changes

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result@1.17, 2008-03-06 20:32:45+02:00, aelkin@mysql1000.(none) +56 -0
    results changed to reflect the uncommented test

  sql/log_event.cc@1.288.1.1, 2008-03-06 20:32:45+02:00, aelkin@mysql1000.(none) +1 -1
    correcting of a merge with bug#12713 to use the correct object holding
    the error code.

ChangeSet@1.1810.3631.22, 2008-03-06 18:19:47+03:00, kaa@kaamos.(none) +3 -0
  Fix for bug #34512: CAST( AVG( double ) AS DECIMAL )
                      returns wrong results
  
  Casting AVG() to DECIMAL led to incorrect results when the arguments
  had a non-DECIMAL type, because in this case
  Item_sum_avg::val_decimal() performed the division by the number of
  arguments twice.
  
  Fixed by changing Item_sum_avg::val_decimal() to not rely on
  Item_sum_sum::val_decimal(), i.e. calculate sum and divide using
  DECIMAL arithmetics for DECIMAL arguments, and utilize val_real() with
  subsequent conversion to DECIMAL otherwise.

  mysql-test/r/func_group.result@1.49.1.17, 2008-03-06 18:19:47+03:00, kaa@kaamos.(none) +6 -0
    Added a test case for bug #34512.

  mysql-test/t/func_group.test@1.48.1.13, 2008-03-06 18:19:47+03:00, kaa@kaamos.(none) +10 -0
    Added a test case for bug #34512.

  sql/item_sum.cc@1.170.1.51, 2008-03-06 18:19:47+03:00, kaa@kaamos.(none) +9 -1
    Do not use Item_sum_sum::val_decimal() in Item_sum_avg::val_decimal()
    because the first one, depending on the arguments type, may return
    either the sum of the arguments, or the average calculated by the
    virtual val_real() method of Item_sum_avg. Instead, do our own
    calculation based on the arguments type.

ChangeSet@1.1810.3620.23, 2008-03-06 14:49:21+02:00, aelkin@mysql1000.(none) +3 -0
  Bug#26622  MASTER_POS_WAIT does not work as documented
  
  MASTER_POS_WAIT return values are different than expected when the server is not a slave. 
  It returns -1 instead of NULL.
  
  Fixed with correcting  st_relay_log_info::wait_for_pos() to return the proper
  value in the case of rli info is not inited.

  mysql-test/r/rpl_master_pos_wait.result@1.7.1.2, 2008-03-06 14:49:18+02:00, aelkin@mysql1000.(none) +6 -0
    results changed

  mysql-test/t/rpl_master_pos_wait.test@1.6.1.1, 2008-03-06 14:49:19+02:00, aelkin@mysql1000.(none) +11 -0
    the new test to check that select master_pos_wait() to a server does 
    not have master info returns NULL as specified.

  sql/slave.cc@1.241.28.8, 2008-03-06 14:49:19+02:00, aelkin@mysql1000.(none) +1 -1
    changing the return value to correspond the specification.

ChangeSet@1.1810.3663.3, 2008-03-06 09:16:53-03:00, davi@mysql.com +1 -0
  Bug#35103 mysql_client_test::test_bug29948 causes sporadic failures
  
  Disable test case for bug 29948, which is causing sporadically
  failures in other tests inside mysql_client_test.

  tests/mysql_client_test.c@1.167.1.83, 2008-03-06 09:16:52-03:00, davi@mysql.com +4 -1
    Disable test case.

ChangeSet@1.1810.3666.1, 2008-03-06 12:40:46+01:00, thek@adventure.(none) +3 -0
  Bug#25132 disabled query cache: Qcache_free_blocks = 1
  
  The initial value of free memory blocks in 0. When the query cache is enabled 
  a new memory block gets allocated and is assigned number 1. The free memory
  block is later split each time query cache memory is allocated for new blocks.
  This means that the free memory block counter won't be reduced to zero when
  the number of allocated blocks are zero, but rather one. To avoid confusion
  this patch changes this behavior so that the free memory block counter is
  reset to zero when the query cache is disabled.
  Note that when the query cache is enabled and resized the free memory block
  counter was still calculated correctly.

  mysql-test/r/query_cache.result@1.65.1.22, 2008-03-06 12:40:45+01:00, thek@adventure.(none) +10 -0
    test case

  mysql-test/t/query_cache.test@1.49.1.17, 2008-03-06 12:40:45+01:00, thek@adventure.(none) +9 -0
    test case

  sql/sql_cache.cc@1.76.10.13, 2008-03-06 12:40:45+01:00, thek@adventure.(none) +1 -0
    Restore the memory block count to 0 for consistency.

ChangeSet@1.1810.3662.3, 2008-03-06 09:58:49+04:00, bar@mysql.com +3 -0
  additional test fixes for bug 27580

  mysql-test/r/ctype_cp1250_ch.result@1.5.2.3, 2008-03-06 09:58:47+04:00, bar@mysql.com +34 -0
    additional test fixes for bug 27580

  mysql-test/r/ctype_ucs.result@1.39.8.2, 2008-03-06 09:58:47+04:00, bar@mysql.com +17 -0
    additional test fixes for bug 27580

  mysql-test/r/ctype_cp932.result@1.6.10.1, 2008-03-06 09:58:47+04:00, bar@mysql.com +19 -0
    additional test fixes for bug 27580

ChangeSet@1.2522.3.2, 2008-03-05 14:18:35-05:00, cmiller@zippy.cornsilk.net +4 -0
  Move test that has more to do with grants than DROP.  We shouldn't have
  grant warnings on embedded server.

  mysql-test/r/drop.result@1.37, 2008-03-05 14:18:32-05:00, cmiller@zippy.cornsilk.net +0 -39
    Move test that has more to do with grants than DROP.

  mysql-test/r/grant.result@1.89.1.1, 2008-03-05 14:18:32-05:00, cmiller@zippy.cornsilk.net +39 -0
    Move test that has more to do with grants than DROP.

  mysql-test/t/drop.test@1.26, 2008-03-05 14:18:32-05:00, cmiller@zippy.cornsilk.net +0 -62
    Move test that has more to do with grants than DROP.

  mysql-test/t/grant.test@1.68.1.1, 2008-03-05 14:18:32-05:00, cmiller@zippy.cornsilk.net +62 -0
    Move test that has more to do with grants than DROP.

ChangeSet@1.2522.4.1, 2008-03-05 11:23:58-05:00, cmiller@zippy.cornsilk.net +1 -0
  Bug#34726: open_tables() crashes server if running with --debug
  
  The DBUG code emits the current value of the proc_info member of THD,
  which may be set to NULL.  It was wrong to dereference that value
  with the format string %s without verifying that it was valid.
  
  Now, insert an inline test that substitutes the string "(null)" for
  NULL pointers.

  sql/sql_class.cc@1.352.9.1, 2008-03-05 11:23:55-05:00, cmiller@zippy.cornsilk.net +2 -1
    Dereferencing a NULL is illegal (though not fatal for %s on some 
    platforms), and we have no assurance that the caller didn't call us 
    with a valid string.

ChangeSet@1.2522.3.1, 2008-03-05 09:33:32-05:00, cmiller@zippy.cornsilk.net +3 -0
  Bug#33464: DROP FUNCTION caused a crash
  
  The cause of the crash is an assertion failure that we do not emit 
  an error message (grant not found) and then return "ok".  The 
  assertion is valid, and we were ignoring the buggy behavior prior 
  to the "Diagnostics" result-verification.
  
  Use an error handler to mutate innocuous missing-grant errors, when 
  removing routines, into warnings.

  mysql-test/r/drop.result@1.36, 2008-03-05 09:33:29-05:00, cmiller@zippy.cornsilk.net +39 -0
    Show that the crash disappears.  Also prepare for the larger bug to
    be fixed with only minor changes to this test.

  mysql-test/t/drop.test@1.25, 2008-03-05 09:33:29-05:00, cmiller@zippy.cornsilk.net +62 -0
    Show that the crash disappears.  Also prepare for the larger bug to
    be fixed with only minor changes to this test.

  sql/sql_acl.cc@1.258.1.1, 2008-03-05 09:33:29-05:00, cmiller@zippy.cornsilk.net +83 -22
    Disable a segment of code that makes a faulty assumption
    about the existence of a routine's defining user, until that 
    assumption becomes true.
    
    Push a new handler onto the error-handler stack, so that when 
    removing a routine, a missing ACL grant is now a warning
    instead of an error.  If any unexpected error is raised then tell
    the caller.

ChangeSet@1.2542.11.3, 2008-03-05 14:57:13+01:00, andrey@whirlpool.hristov.com +1 -0
  Fix for Bug #34786 Compiling ndb on Mac OS X 10.5.2 (Intel) fails

  storage/ndb/src/kernel/blocks/tsman.cpp@1.20, 2008-03-05 14:57:11+01:00, andrey@whirlpool.hristov.com +0 -1
    Fix build on Tiger and Leopard, incl. 10.5.2
    This is already in vm/ndb_malloc_impl.cpp

ChangeSet@1.2542.1.16, 2008-03-05 14:45:40+01:00, mkindahl@dl145h.mysql.com +2 -0
  Adding missing drop of view last in test.

  mysql-test/suite/binlog/r/binlog_unsafe.result@1.8, 2008-03-05 14:45:26+01:00, mkindahl@dl145h.mysql.com +1 -0
    Result change.

  mysql-test/suite/binlog/t/binlog_unsafe.test@1.5, 2008-03-05 14:45:31+01:00, mkindahl@dl145h.mysql.com +1 -1
    Dropping view created in test.

ChangeSet@1.1810.3664.2, 2008-03-05 14:03:05+01:00, joerg@trift2. +1 -0
  Include "mysql_upgrade_shell.pl" in a binary distribution on Windows.
  TAG: mysql-5.0.58

  scripts/make_win_bin_dist@1.1.13.11, 2008-03-05 14:03:02+01:00, joerg@trift2. +1 -0
    Include "mysql_upgrade_shell.pl" in a binary distribution on Windows.

ChangeSet@1.1810.3665.1, 2008-03-05 16:02:33+03:00, kaa@kaamos.(none) +2 -0
  Fix for bug #34889: mysql_client_test::test_mysql_insert_id test fails 
                      sporadically
  
  Under some circumstances, the mysql_insert_id() value after SELECT ...
  INSERT could return a wrong value. This could happen when the last
  SELECT ... INSERT did not involve an AUTO_INCREMENT column, but the
  value of mysql_insert_id() was changed by some previous statements.
  
  Fixed by checking the value of thd->insert_id_used in
  select_insert::send_eof() and returning 0 for mysql_insert_id() if it
  is not set.

  sql/sql_insert.cc@1.146.44.46, 2008-03-05 16:02:32+03:00, kaa@kaamos.(none) +2 -1
    Do not return thd->last_insert_id unconditionally in
    select_insert::send_eof(). First check if thd->insert_id_used is
    non-zero, and return 0 otherwise.

  tests/mysql_client_test.c@1.167.42.1, 2008-03-05 16:02:32+03:00, kaa@kaamos.(none) +16 -0
    Added a test case for bug #34889.

ChangeSet@1.2542.1.15, 2008-03-05 13:59:32+01:00, mkindahl@dl145h.mysql.com +1 -0
  Updating result file.

  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result@1.34, 2008-03-05 13:59:21+01:00, mkindahl@dl145h.mysql.com +1 -1
    Result file change.

ChangeSet@1.2512.35.2, 2008-03-05 12:25:55+02:00, aelkin@mysql1000.(none) +4 -0
  Bug #28780  report_host is not available through SELECT @@report_host
  
  There was no way to see if report-{host,port,user,password} were set up.
  
  Fixed with introducing new global variables.
  The variables are made read-only because of a possible need to change them
  most probably require the slave server restart.
  
  Todo: transform the startup options to be CHANGE master parameters - i.e
  to deprecate `report-' options, and to change the new vars 
  to be updatable at time of CHANGE master executes with new
  values.

  mysql-test/suite/rpl/r/rpl_report.result@1.1, 2008-03-05 12:25:53+02:00, aelkin@mysql1000.(none) +27 -0
    new results file

  mysql-test/suite/rpl/r/rpl_report.result@1.0, 2008-03-05 12:25:53+02:00, aelkin@mysql1000.(none) +0 -0

  mysql-test/suite/rpl/t/rpl_report-slave.opt@1.1, 2008-03-05 12:25:53+02:00, aelkin@mysql1000.(none) +2 -0
    options initialize the new global variables.

  mysql-test/suite/rpl/t/rpl_report-slave.opt@1.0, 2008-03-05 12:25:53+02:00, aelkin@mysql1000.(none) +0 -0

  mysql-test/suite/rpl/t/rpl_report.test@1.1, 2008-03-05 12:25:53+02:00, aelkin@mysql1000.(none) +18 -0
    The new test to check SHOW-ability and SELECT-ablity for the report
    global vars.

  mysql-test/suite/rpl/t/rpl_report.test@1.0, 2008-03-05 12:25:53+02:00, aelkin@mysql1000.(none) +0 -0

  sql/set_var.cc@1.267.5.1, 2008-03-05 12:25:53+02:00, aelkin@mysql1000.(none) +13 -0
    Adding associations of the server init arguments with the new global read-only
    variables.

ChangeSet@1.1810.3664.1, 2008-03-04 22:00:53+01:00, joerg@trift2. +1 -0
  scripts/CMakeLists.txt  :    Treat "mysql_upgrade_shell" the same way as all the other scripts.

  scripts/CMakeLists.txt@1.3.1.5, 2008-03-04 22:00:49+01:00, joerg@trift2. +3 -0
    Treat "mysql_upgrade_shell" the same way as all the other scripts.

ChangeSet@1.1810.3663.2, 2008-03-04 10:32:30-03:00, davi@mysql.com +1 -0
  Use the same name for mysql_client_test output file in all branches.

  mysql-test/t/mysql_client_test.test@1.15.1.7, 2008-03-04 10:32:28-03:00, davi@mysql.com +2 -2
    Rename mysql_client_test output file to mysql_client_test.out.log

ChangeSet@1.1810.3663.1, 2008-03-04 10:17:49-03:00, davi@mysql.com +1 -0
  Bug#35009 Results of mysql_client_test are discarded upon failure
  
  It's impossible to determine which test inside mysql_client_test
  failed if the log file is overwritten by mysqltest when dumping
  the test case results. Redirect mysql_client_test output to a
  separate file.

  mysql-test/t/mysql_client_test.test@1.15.1.6, 2008-03-04 10:17:48-03:00, davi@mysql.com +2 -2
    Redirect mysql_client_test output to a separate log file so
    it doesn't get overwritten by mysqltest.

ChangeSet@1.2542.3.4, 2008-03-04 13:21:15+01:00, mkindahl@dl145h.mysql.com +1 -0
  Adding code to ignore warning from error log.

  mysql-test/lib/mtr_report.pl@1.73.2.2, 2008-03-04 13:21:05+01:00, mkindahl@dl145h.mysql.com +6 -0
    Filtering out benign warning that can be generated during server shutdown.

ChangeSet@1.1810.3662.1, 2008-03-04 16:13:08+04:00, bar@mysql.com +5 -0
  Bug#23097 mysql can't insert korean on mysql prompt.
  Problem: libedit is a very pure-ASCII oriented library,
  and it is not aware of extended (0x80..0xFF) or even multi-byte
  characters. It considered such characters as non-printable
  and didn't allow to input them.
  Fix: make libedit think that all bytes >= 0x80 are printable.

  cmd-line-utils/libedit/el.h@1.6, 2008-03-04 16:13:06+04:00, bar@mysql.com +2 -0
    Defining macro, a locale's isprint() replacement.
    We'll consider all 8bit values as printable characters.

  cmd-line-utils/libedit/key.c@1.6, 2008-03-04 16:13:06+04:00, bar@mysql.com +2 -2
    Changing isprint() to el_isprint().

  cmd-line-utils/libedit/map.c@1.8, 2008-03-04 16:13:06+04:00, bar@mysql.com +1 -1
    Changing isprint() to el_isprint().

  cmd-line-utils/libedit/read.c@1.8, 2008-03-04 16:13:06+04:00, bar@mysql.com +1 -1
    Changing isprint() to el_isprint().

  cmd-line-utils/libedit/refresh.c@1.7, 2008-03-04 16:13:06+04:00, bar@mysql.com +3 -3
    Changing isprint() to el_isprint().

ChangeSet@1.1810.3620.21, 2008-03-03 21:19:58+01:00, joerg@trift2. +1 -0
  Raise the version number after cloning 5.0.58

  configure.in@1.245.110.5, 2008-03-03 21:19:53+01:00, joerg@trift2. +2 -2
    Raise the version number after cloning 5.0.58

ChangeSet@1.1810.3661.1, 2008-03-03 20:35:44+03:00, sergefp@mysql.com +3 -0
  BUG#34945: "ref_or_null queries that are null_rejecting and have a null value crash mysql"
  - Apply Eric Bergen's patch: in join_read_always_key(), move ha_index_init() call
    to before the late NULLs filtering code.
  - Backport function comments from 6.0.

  mysql-test/r/null_key.result@1.35.1.4, 2008-03-03 20:35:38+03:00, sergefp@mysql.com +18 -0
    BUG#34945: "ref_or_null queries that are null_rejecting and have a null value crash mysql"
    - Testcase

  mysql-test/t/null_key.test@1.16, 2008-03-03 20:35:38+03:00, sergefp@mysql.com +23 -0
    BUG#34945: "ref_or_null queries that are null_rejecting and have a null value crash mysql"
    - Testcase

  sql/sql_select.cc@1.312.1.246, 2008-03-03 20:35:38+03:00, sergefp@mysql.com +26 -3
    BUG#34945: "ref_or_null queries that are null_rejecting and have a null value crash mysql"
    - Apply Eric Bergen's patch: in join_read_always_key(), move ha_index_init() call
      to before the late NULLs filtering code.
    - Backport function comments from 6.0

ChangeSet@1.2512.34.29, 2008-03-03 20:29:58+04:00, gluh@mysql.com +4 -0
  fixed test case problem on win

  mysql-test/r/partition.result@1.79.4.3, 2008-03-03 20:29:57+04:00, gluh@mysql.com +0 -28
    the test is moved to 'partition_not_windows' test case

  mysql-test/r/partition_not_windows.result@1.4, 2008-03-03 20:29:57+04:00, gluh@mysql.com +28 -0
    the test is moved from 'partition' test case

  mysql-test/t/partition.test@1.72.4.3, 2008-03-03 20:29:57+04:00, gluh@mysql.com +0 -38
    the test is moved to 'partition_not_windows' test case

  mysql-test/t/partition_not_windows.test@1.6, 2008-03-03 20:29:57+04:00, gluh@mysql.com +38 -0
    the test is moved from 'partition' test case

ChangeSet@1.2542.2.6, 2008-03-03 15:58:56+01:00, hhunger@hh-nb.hungers +1 -0
  As result of WL#4204 all charset tests are now disabled. 

  mysql-test/suite/funcs_2/t/disabled.def@1.1, 2008-03-03 15:58:54+01:00, hhunger@hh-nb.hungers +6 -0
    As result of WL#4204 all charset tests are now disabled. 

  mysql-test/suite/funcs_2/t/disabled.def@1.0, 2008-03-03 15:58:54+01:00, hhunger@hh-nb.hungers +0 -0

ChangeSet@1.1810.3660.1, 2008-03-03 17:34:06+03:00, kaa@kaamos.(none) +1 -0
  Fix for bug #31781: multi-table UPDATE with temp-pool enabled fails 
                      with errno 17
  
  my_create() did not perform any checks for the case when a file is
  successfully created by a call to open(), but the call to
  my_register_filename() later fails because the number of open files
  has exceeded the my_open_files limit. This can happen on platforms 
  which do not have getrlimit(), and hence we do not know the real limit
  for open files. In such a case an error was returned to a caller
  although the file has actually been created. Since callers assume
  my_create() to return an error only when it failed to create a file,
  they did not perform any cleanups, leaving an 'orphaned' file on the
  file system.
  
  Fixed by adding a check for the above case to my_create() and ensuring
  the newly created file is deleted before returning an error.
  
  Creating a deterministic test case in the test suite is impossible,
  because the exact steps required to reproduce the above situation
  depend on the platform and/or environment (OS per-user limits, queries
  executed by previous tests, startup parameters). The patch was
  manually tested on Windows using examples posted in the bug report.

  mysys/my_create.c@1.13.2.2, 2008-03-03 17:34:05+03:00, kaa@kaamos.(none) +17 -3
    Ensure that, if the call to my_register_filename() in my_create()
    failed, but the previous open() called succeeded, the newly created
    file is deleted before returning an error. 

ChangeSet@1.2512.34.28, 2008-03-03 15:38:18+04:00, gluh@mysql.com +4 -0
  test case fix

  mysql-test/r/partition.result@1.79.4.2, 2008-03-03 15:38:14+04:00, gluh@mysql.com +0 -19
    the test is moved to 'partition_not_windows' test

  mysql-test/r/partition_not_windows.result@1.3, 2008-03-03 15:38:14+04:00, gluh@mysql.com +19 -0
    the test is moved from 'partition' test

  mysql-test/t/partition.test@1.72.4.2, 2008-03-03 15:38:14+04:00, gluh@mysql.com +0 -29
    the test is moved to 'partition_not_windows' test

  mysql-test/t/partition_not_windows.test@1.5, 2008-03-03 15:38:14+04:00, gluh@mysql.com +27 -0
    the test is moved from 'partition' test

ChangeSet@1.1810.3631.20, 2008-03-03 15:02:34+04:00, gluh@mysql.com +2 -0
  test case fix

  mysql-test/r/symlink.result@1.21.1.20, 2008-03-03 15:02:32+04:00, gluh@mysql.com +4 -4
    test case fix

  mysql-test/t/symlink.test@1.17.1.15, 2008-03-03 15:02:32+04:00, gluh@mysql.com +4 -4
    test case fix

ChangeSet@1.2512.62.1, 2008-03-03 12:16:43+04:00, holyfoot@mysql.com +1 -0
  Bug #32801 wait_timeout.test fails randomly
  
  wait_timeout test enabled

  mysql-test/t/disabled.def@1.290.3.1, 2008-03-03 12:16:41+04:00, holyfoot@mysql.com +0 -1
    Bug #32801 wait_timeout.test fails randomly
    
    wait_timeout enabled

ChangeSet@1.1810.3659.1, 2008-03-02 21:20:36+03:00, skozlov@mysql.com +2 -0
  Bug#22438

  mysql-test/r/mysqldump.result@1.83.1.50, 2008-03-02 21:20:30+03:00, skozlov@mysql.com +1 -1
    updated result

  mysql-test/t/mysqldump.test@1.76.1.49, 2008-03-02 21:20:30+03:00, skozlov@mysql.com +1 -0
    hide master_log_pos number

ChangeSet@1.2542.8.4, 2008-03-02 20:17:39+03:00, skozlov@mysql.com +1 -0
  WL#4091, fix for rpl_flushlog_loop for windows platforms

  mysql-test/suite/rpl/t/rpl_flushlog_loop.test@1.24, 2008-03-02 20:17:22+03:00, skozlov@mysql.com +2 -0
    added waiting for CREATE TABLE

ChangeSet@1.1616.3135.1, 2008-03-01 18:25:41+01:00, kent@mysql.com +1 -0
  mysql.spec.sh:
    - Aligned copyright headers and text with 5.0
    - Don't strip binaries on SuSE 9
    - Formatting alignment with spec file in 5.0
    - Run full test on "normal" binary, and less on "Max"
    - Let test runs on "Max" identify the runs with "max" and "max+ps"

  support-files/mysql.spec.sh@1.83.1.53, 2008-03-01 18:07:19+01:00, kent@mysql.com +60 -32
    - Aligned copyright headers and text with 5.0
    - Don't strip binaries on SuSE 9
    - Formatting alignment with spec file in 5.0
    - Run full test on "normal" binary, and less on "Max"
    - Let test runs on "Max" identify the runs with "max" and "max+ps"

ChangeSet@1.2542.8.3, 2008-03-01 00:05:23+03:00, skozlov@mysql.com +3 -0
  WL#4091, enable rpl_flushlog_loop.test and fix for rpl_drop_temp.test

  mysql-test/suite/rpl/t/disabled.def@1.24, 2008-03-01 00:05:01+03:00, skozlov@mysql.com +0 -1
    enable test

  mysql-test/suite/rpl/t/rpl_drop_temp.test@1.12, 2008-03-01 00:05:02+03:00, skozlov@mysql.com +1 -1
    added sync slave with master

  mysql-test/suite/rpl/t/rpl_flushlog_loop.test@1.23, 2008-03-01 00:05:02+03:00, skozlov@mysql.com +2 -0
    added sync slave with master

ChangeSet@1.2512.34.24, 2008-02-29 17:58:35+04:00, gluh@mysql.com +2 -0
  fixed problem with embedded server

  mysql-test/r/symlink.result@1.40.1.4, 2008-02-29 17:58:33+04:00, gluh@mysql.com +1 -1
    test result fix

  mysql-test/t/symlink.test@1.31.1.4, 2008-02-29 17:58:33+04:00, gluh@mysql.com +1 -1
    fixed problem with embedded server

ChangeSet@1.2512.61.1, 2008-02-29 17:56:50+04:00, bar@mysql.com +7 -0
  Bug#23924 general_log truncates queries with character set introducers.
  Problem: logging of utf8-incompatible binary strings didn't work
  Fix: hex-encoding of incompatible sequences.

  mysql-test/r/log_tables.result@1.31, 2008-02-29 17:56:48+04:00, bar@mysql.com +11 -0
    Adding test

  mysql-test/t/log_tables.test@1.27, 2008-02-29 17:56:48+04:00, bar@mysql.com +10 -0
    Adding test

  sql/field.cc@1.433, 2008-02-29 17:56:48+04:00, bar@mysql.com +11 -0
    Copying with hex escaping

  sql/field.h@1.259, 2008-02-29 17:56:48+04:00, bar@mysql.com +2 -0
    New field flag

  sql/log.cc@1.302.10.1, 2008-02-29 17:56:48+04:00, bar@mysql.com +1 -0
    Marking the column "general_log.argument" as hex-escaping field.

  sql/sql_string.cc@1.112, 2008-02-29 17:56:48+04:00, bar@mysql.com +62 -0
    New function to copy strings with hex-encoding of incompatible characters.

  sql/sql_string.h@1.69, 2008-02-29 17:56:48+04:00, bar@mysql.com +3 -0
    Prototype for the new function

ChangeSet@1.1810.3631.18, 2008-02-29 17:50:01+04:00, gluh@mysql.com +1 -0
  wrong merge fix

  sql/sql_parse.cc@1.426.173.2, 2008-02-29 17:49:59+04:00, gluh@mysql.com +0 -2
    wrong merge fix

ChangeSet@1.1616.3134.3, 2008-02-29 16:56:41+04:00, gluh@mysql.com +2 -0
  test fix

  mysql-test/r/symlink.result@1.11.1.19, 2008-02-29 16:56:40+04:00, gluh@mysql.com +4 -4
    result fix

  mysql-test/t/symlink.test@1.11.1.12, 2008-02-29 16:56:40+04:00, gluh@mysql.com +3 -0
    test fix

ChangeSet@1.1810.3658.1, 2008-02-29 15:11:11+04:00, gshchepa@host.loc +1 -0
  Fixed bug #34830: mixed table and field names in Item_ref
                    and Item_direct_ref constructor calls.
  
  Order of ref->field_name and ref->table_name arguments
  is of Item_ref and Item_direct_ref in the fix_inner_refs
  function is inverted.

  sql/sql_select.cc@1.312.1.245, 2008-02-29 15:02:47+04:00, gshchepa@host.loc +4 -4
    Fixed bug #34830: mixed table and field names in Item_ref
                      and Item_direct_ref constructor calls.
    
    Order of ref->field_name and ref->table_name arguments
    is of Item_ref and Item_direct_ref in the fix_inner_refs
    function is inverted. See definitions:
    
      Item_ref(Name_resolution_context *context_arg, Item **item,
               const char *table_name_arg, const char *field_name_arg,
               bool alias_name_used_arg= FALSE)
      and
    
      Item_direct_ref(Name_resolution_context *context_arg, Item **item,
                      const char *table_name_arg,
                      const char *field_name_arg,
                      bool alias_name_used_arg= FALSE)

ChangeSet@1.1810.3631.16, 2008-02-29 15:04:00+04:00, gluh@mysql.com +3 -0
  after merge fix

  mysql-test/r/symlink.result@1.21.1.18, 2008-02-29 15:03:58+04:00, gluh@mysql.com +23 -24
    after merge fix

  mysql-test/t/symlink.test@1.17.1.13, 2008-02-29 15:03:58+04:00, gluh@mysql.com +8 -30
    after merge fix

  sql/mysqld.cc@1.439.1.198, 2008-02-29 15:03:58+04:00, gluh@mysql.com +2 -8
    after merge fix

ChangeSet@1.1616.3134.2, 2008-02-29 13:55:00+04:00, gluh@mysql.com +5 -0
  Bug#32167 another privilege bypass with DATA/INDEX DIRECORY(ver 4.1,5.0)
  added new function test_if_data_home_dir() which checks that
  path does not contain mysql data home directory.
  Using of mysql data home directory in
  DATA DIRECTORY & INDEX DIRECTORY is disallowed.

  mysql-test/r/symlink.result@1.11.1.18, 2008-02-29 13:54:59+04:00, gluh@mysql.com +21 -17
    test result

  mysql-test/t/symlink.test@1.11.1.11, 2008-02-29 13:54:59+04:00, gluh@mysql.com +29 -19
    test case

  sql/mysql_priv.h@1.186.91.65, 2008-02-29 13:54:59+04:00, gluh@mysql.com +1 -0
    new variable mysql_unpacked_real_data_home

  sql/mysqld.cc@1.356.117.5, 2008-02-29 13:54:59+04:00, gluh@mysql.com +4 -0
    new variable mysql_unpacked_real_data_home

  sql/sql_parse.cc@1.271.135.1, 2008-02-29 13:54:59+04:00, gluh@mysql.com +60 -1
    added new function test_if_data_home_dir() which checks that
    path does not contain mysql data home directory.
    Using of mysql data home directory in
    DATA DIRECTORY & INDEX DIRECTORY is disallowed.

ChangeSet@1.2542.9.2, 2008-02-29 12:21:19+03:00, anozdrin@quad. +1 -0
  Fix for Bug#31947: Declare with a reserved word succeeded.
  
  READ_ONLY token was accidentally placed into wrong place
  ('ident' rule). The proper place is in the 'keyword_sp' rule.
  
  The manual should be re-generated after this patch, because
  the manual depends on the 'keyword_sp' rule.

  sql/sql_yacc.yy@1.611.1.13, 2008-02-29 12:21:18+03:00, anozdrin@quad. +1 -6
    Move READ_ONLY token to the 'keyword_sp' rule.

ChangeSet@1.2512.34.20, 2008-02-29 12:52:50+04:00, gluh@mysql.com +5 -0
  additional test fix for Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY

  mysql-test/suite/parts/inc/partition_basic.inc@1.5.1.1, 2008-02-29 12:52:48+04:00, gluh@mysql.com +4 -12
    additional test fix for Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY

  mysql-test/suite/parts/inc/partition_check_drop.inc@1.5, 2008-02-29 12:52:48+04:00, gluh@mysql.com +2 -4
    additional test fix for Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY

  mysql-test/suite/parts/inc/partition_layout_check1.inc@1.6, 2008-02-29 12:52:48+04:00, gluh@mysql.com +1 -2
    additional test fix for Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY

  mysql-test/suite/parts/r/partition_basic_innodb.result@1.5.2.1, 2008-02-29 12:52:48+04:00, gluh@mysql.com +31 -31
    additional test fix for Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY

  mysql-test/suite/parts/r/partition_basic_myisam.result@1.5.2.1, 2008-02-29 12:52:48+04:00, gluh@mysql.com +199 -199
    additional test fix for Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY

ChangeSet@1.1810.3474.22, 2008-02-28 23:53:01-05:00, iggy@alf.(none) +1 -0
  Bug #24992 Enabling Shared Memory support on Windows x64 causes client to fail
  - Mistaken macro defintions cause mysys to read packets in the wrong order.

  include/my_global.h@1.96.14.9, 2008-02-28 23:52:59-05:00, iggy@alf.(none) +2 -2
    Bug #24992 Enabling Shared Memory support on Windows x64 causes client to fail
    - Use low byte order optimizations for Windows.

ChangeSet@1.1810.3620.20, 2008-02-28 20:22:11-03:00, davi@mysql.com +1 -0
  Post-merge fix for Bug 33851. The initialization order of members
  must match the order which they were declared in the class definition. 
  TAG: clone-5.0.58-build

  sql/item.cc@1.113.111.2, 2008-02-28 20:22:08-03:00, davi@mysql.com +2 -2
    Fix initialization order, parameter was the last one declared.

ChangeSet@1.2542.8.2, 2008-02-29 00:50:15+03:00, skozlov@mysql.com +8 -0
  Bug#32663, Bug#33045, Bug#23533, WL#4091

  mysql-test/suite/binlog/r/binlog_multi_engine.result@1.13, 2008-02-29 00:50:05+03:00, skozlov@mysql.com +9 -13
    updated result

  mysql-test/suite/binlog/t/binlog_multi_engine.test@1.13, 2008-02-29 00:50:06+03:00, skozlov@mysql.com +20 -2
    fix for bug#32663

  mysql-test/suite/binlog/t/disabled.def@1.7, 2008-02-29 00:50:06+03:00, skozlov@mysql.com +0 -1
    updated

  mysql-test/suite/bugs/r/rpl_bug23533.result@1.1, 2008-02-29 00:50:07+03:00, skozlov@mysql.com +23 -0
    result file

  mysql-test/suite/bugs/r/rpl_bug23533.result@1.0, 2008-02-29 00:50:07+03:00, skozlov@mysql.com +0 -0

  mysql-test/suite/bugs/t/rpl_bug23533.test@1.1, 2008-02-29 00:50:07+03:00, skozlov@mysql.com +43 -0
    test case for bug#23533

  mysql-test/suite/bugs/t/rpl_bug23533.test@1.0, 2008-02-29 00:50:07+03:00, skozlov@mysql.com +0 -0

  mysql-test/suite/rpl/r/rpl_invoked_features.result@1.8, 2008-02-29 00:50:06+03:00, skozlov@mysql.com +8 -8
    updated result

  mysql-test/suite/rpl/t/disabled.def@1.23, 2008-02-29 00:50:07+03:00, skozlov@mysql.com +1 -0
    updated 

  mysql-test/suite/rpl/t/rpl_invoked_features.test@1.10, 2008-02-29 00:50:07+03:00, skozlov@mysql.com +18 -8
    fix for bug#33045

ChangeSet@1.1810.3657.1, 2008-02-28 22:53:31+04:00, gshchepa@host.loc +3 -0
  Fixed bug #34620: item_row.cc:50: Item_row::illegal_method_call(const char*):
                    Assertion `0' failed
  
  If ROW item is a part of an expression that also has
  aggregate function calls (COUNT/SUM/AVG...), a
  "splitting" with an Item::split_sum_func2 function
  is applied to that ROW item.
  Current implementation of Item::split_sum_func2
  replaces this Item_row with a newly created
  Item_aggregate_ref reference to it.
  Then the row cache tries to work with the
  Item_aggregate_ref object as with the Item_row object:
  row cache calls row-emulation methods such as cols and
  element_index. Item_aggregate_ref (like it's parent
  Item_ref) inherits dummy implementations of those
  methods from the hierarchy root Item, and call to
  them leads to failed assertions and wrong data
  output.
  
  Row-emulation virtual functions (cols, element_index, addr,
  check_cols, null_inside and bring_value) of Item_ref have
  been overloaded to forward calls to an underlying item
  reference.
  
  

  mysql-test/r/row.result@1.23.1.6, 2008-02-28 22:53:19+04:00, gshchepa@host.loc +9 -0
    Added test case for bug #34620.

  mysql-test/t/row.test@1.26, 2008-02-28 22:53:20+04:00, gshchepa@host.loc +13 -0
    Added test case for bug #34620.

  sql/item.h@1.183.1.67, 2008-02-28 22:53:21+04:00, gshchepa@host.loc +29 -0
    Fixed bug #34620.
    Row-emulation virtual functions (cols, element_index, addr,
    check_cols, null_inside and bring_value) of Item_ref have
    been overloaded to forward calls to an underlying item
    reference.

ChangeSet@1.2542.1.9, 2008-02-28 14:55:46-03:00, davi@mysql.com +12 -0
  Bug#34655 Compile error
  
  Rename client_last_error to last_error and client_last_errno to last_errno
  to not break connectors which use the internal net structure for error handling.

  include/mysql_com.h@1.129, 2008-02-28 14:55:42-03:00, davi@mysql.com +2 -2
    Rename client_last_error to last_error, client_last_errno to last_errno.

  include/mysql_h.ic@1.16, 2008-02-28 14:55:42-03:00, davi@mysql.com +42 -42
    Rename client_last_error to last_error, client_last_errno to last_errno.

  libmysql/libmysql.c@1.305.1.2, 2008-02-28 14:55:42-03:00, davi@mysql.com +18 -18
    Rename client_last_error to last_error, client_last_errno to last_errno.

  libmysql/manager.c@1.20, 2008-02-28 14:55:42-03:00, davi@mysql.com +1 -1
    Rename client_last_error to last_error, client_last_errno to last_errno.

  libmysqld/lib_sql.cc@1.147.1.1, 2008-02-28 14:55:42-03:00, davi@mysql.com +3 -3
    Rename client_last_error to last_error, client_last_errno to last_errno.

  libmysqld/libmysqld.c@1.77, 2008-02-28 14:55:42-03:00, davi@mysql.com +2 -2
    Rename client_last_error to last_error, client_last_errno to last_errno.

  server-tools/instance-manager/mysql_connection.cc@1.32, 2008-02-28 14:55:42-03:00, davi@mysql.com +1 -1
    Rename client_last_error to last_error, client_last_errno to last_errno.

  sql-common/client.c@1.153, 2008-02-28 14:55:43-03:00, davi@mysql.com +30 -30
    Rename client_last_error to last_error, client_last_errno to last_errno.

  sql/log_event.cc@1.290, 2008-02-28 14:55:42-03:00, davi@mysql.com +1 -1
    Rename client_last_error to last_error, client_last_errno to last_errno.

  sql/log_event_old.cc@1.18, 2008-02-28 14:55:43-03:00, davi@mysql.com +11 -11
    Rename client_last_error to last_error, client_last_errno to last_errno.

  sql/net_serv.cc@1.118, 2008-02-28 14:55:43-03:00, davi@mysql.com +12 -12
    Rename client_last_error to last_error, client_last_errno to last_errno.

  sql/repl_failsafe.cc@1.81.1.3, 2008-02-28 14:55:43-03:00, davi@mysql.com +1 -1
    Rename client_last_error to last_error, client_last_errno to last_errno.

ChangeSet@1.1810.3620.19, 2008-02-28 11:34:08-03:00, davi@mysql.com +11 -0
  Bug#33851 Passing UNSIGNED param to EXECUTE returns ERROR 1210
  
  The problem is that passing anything other than a integer to a limit
  clause in a prepared statement would fail. This limitation was introduced
  to avoid replication problems (e.g: replicating the statement with a
  string argument would cause a parse failure in the slave).
  
  The solution is to convert arguments to the limit clause to a integer
  value and use this converted value when persisting the query to the log.

  mysql-test/r/limit.result@1.13, 2008-02-28 11:34:04-03:00, davi@mysql.com +9 -0
    Update test case result.

  mysql-test/r/ps.result@1.56.1.44, 2008-02-28 11:34:04-03:00, davi@mysql.com +30 -0
    Add test case result for Bug#33851

  mysql-test/r/rpl_user_variables.result@1.14.1.6, 2008-02-28 11:34:04-03:00, davi@mysql.com +16 -0
    Test case result for replication of prepared statement with
    limit clause.

  mysql-test/t/rpl_user_variables.test@1.12.1.5, 2008-02-28 11:34:05-03:00, davi@mysql.com +17 -0
    Test replication of a parameter which value is converted.

  mysql-test/t/limit.test@1.13.1.2, 2008-02-28 11:34:04-03:00, davi@mysql.com +12 -5
    Test parameters to limit clause.

  mysql-test/t/ps.test@1.56.1.43, 2008-02-28 11:34:05-03:00, davi@mysql.com +19 -0
    Add test case for Bug#33851

  sql/item.cc@1.113.111.1, 2008-02-28 11:34:05-03:00, davi@mysql.com +8 -3
    Convert value to integer if it's a parameter to a limit clause.

  sql/item.h@1.183.44.2, 2008-02-28 11:34:05-03:00, davi@mysql.com +2 -7
    Flag signal that item is a parameter to a limit clause.

  sql/item_func.cc@1.270.94.1, 2008-02-28 11:34:06-03:00, davi@mysql.com +1 -1
    Const member functions, object is not mutated.

  sql/sql_class.h@1.230.55.39, 2008-02-28 11:34:06-03:00, davi@mysql.com +1 -1
    Const member functions, object is not mutated.

  sql/sql_yacc.yy@1.371.143.1, 2008-02-28 11:34:06-03:00, davi@mysql.com +1 -1
    Flag that item is a parameter to a limit clause.

ChangeSet@1.2512.60.2, 2008-02-28 16:29:14+02:00, gkodinov@magare.gmz +1 -0
  merge of bug 33266 to 5.1-opt

  mysql-test/r/subselect.result@1.212.1.2, 2008-02-28 16:29:13+02:00, gkodinov@magare.gmz +35 -0
    merge of bug 33266 to 5.1-opt

ChangeSet@1.2542.1.8, 2008-02-28 17:28:33+03:00, anozdrin@quad. +2 -0
  Disable test case due to Bug#34891: sp_notembedded.test fails
  sporadically.

  mysql-test/r/sp_notembedded.result@1.10, 2008-02-28 17:28:32+03:00, anozdrin@quad. +0 -23
    Disable test case.

  mysql-test/t/sp_notembedded.test@1.11, 2008-02-28 17:28:32+03:00, anozdrin@quad. +65 -62
    Disable test case.

ChangeSet@1.1810.3652.2, 2008-02-28 14:23:22+01:00, tnurnberg@mysql.com +7 -0
  Bug#34749: Server crash when using NAME_CONST() with an aggregate function
  
  NAME_CONST('whatever', -1) * MAX(whatever) bombed since -1 was
  not seen as constant, but as FUNCTION_UNARY_MINUS(constant)
  while we are at the same time pretending it was a basic const
  item. This confused the aggregate handlers in exciting ways.
  We now make NAME_CONST() behave more consistently.

  mysql-test/r/func_misc.result@1.21.4.5, 2008-02-28 14:23:21+01:00, tnurnberg@mysql.com +19 -0
    show that a combination of NAME_CONST('x', -y) and an aggregate
    no longer crashes the server.

  mysql-test/t/func_misc.test@1.21.4.5, 2008-02-28 14:23:21+01:00, tnurnberg@mysql.com +18 -0
    show that a combination of NAME_CONST('x', -y) and an aggregate
    no longer crashes the server.

  sql/ha_ndbcluster_cond.cc@1.4.1.3, 2008-02-28 14:23:21+01:00, tnurnberg@mysql.com +6 -3
    tell cluster about "new" function type NEG_FUNC.
    (this was previous identified as UNKNOWN_FUNC,
    so we just handle it the same way, that's all.)

  sql/ha_ndbcluster_cond.h@1.2.1.3, 2008-02-28 14:23:21+01:00, tnurnberg@mysql.com +1 -0
    tell cluster about "new" function type NEG_FUNC.
    (this was previous identified as UNKNOWN_FUNC,
    so we just handle it the same way, that's all.)

  sql/item.cc@1.113.110.1, 2008-02-28 14:23:21+01:00, tnurnberg@mysql.com +26 -1
    make NAME_CONST() transparent in that type() of
    -constant is that of constant, not that of unary
    minus (id est, FUNC_ITEM).

  sql/item.h@1.183.45.1, 2008-02-28 14:23:21+01:00, tnurnberg@mysql.com +1 -8
    Move constructor to item.cc

  sql/item_func.h@1.136.2.43, 2008-02-28 14:23:21+01:00, tnurnberg@mysql.com +3 -2
    Revert Bug#30832; we can apply the magic more narrowly
    (just for NAME_CONST() rather than all Item_func_neg).
    
    Introduce new function type "NEG_FUNC."

ChangeSet@1.2512.34.19, 2008-02-28 16:46:52+04:00, gluh@mysql.com +13 -0
  Bug#32167 another privilege bypass with DATA/INDEX DIRECORY(3rd version for 5.1)
  added new function test_if_data_home_dir() which checks that
  path does not contain mysql data home directory.
  Using of 'mysql data home'/'any db name' in
  DATA DIRECTORY & INDEX DIRECTORY is disallowed

  mysql-test/r/partition.result@1.79.4.1, 2008-02-28 16:46:49+04:00, gluh@mysql.com +28 -0
    test result

  mysql-test/r/partition_not_windows.result@1.2, 2008-02-28 16:46:50+04:00, gluh@mysql.com +3 -3
    result fix

  mysql-test/r/partition_symlink.result@1.1.1.1, 2008-02-28 16:46:50+04:00, gluh@mysql.com +16 -16
    result fix

  mysql-test/r/symlink.result@1.40.1.1, 2008-02-28 16:46:50+04:00, gluh@mysql.com +28 -37
    test result update

  mysql-test/t/partition.test@1.72.4.1, 2008-02-28 16:46:50+04:00, gluh@mysql.com +40 -2
    test case

  mysql-test/t/partition_not_windows.test@1.4, 2008-02-28 16:46:50+04:00, gluh@mysql.com +14 -18
    test case update

  mysql-test/t/partition_symlink.test@1.2.1.1, 2008-02-28 16:46:50+04:00, gluh@mysql.com +23 -17
    test case update

  mysql-test/t/symlink.test@1.31.1.1, 2008-02-28 16:46:50+04:00, gluh@mysql.com +44 -50
    test case

  sql/mysql_priv.h@1.549.10.6, 2008-02-28 16:46:50+04:00, gluh@mysql.com +3 -1
    new variable mysql_unpacked_real_data_home

  sql/mysqld.cc@1.682.1.10, 2008-02-28 16:46:50+04:00, gluh@mysql.com +4 -0
    new variable mysql_unpacked_real_data_home

  sql/partition_info.cc@1.43.2.1, 2008-02-28 16:46:50+04:00, gluh@mysql.com +56 -0
    new check_partition_dirs() which checks
    data directory and index directory for partition elements

  sql/partition_info.h@1.25.1.1, 2008-02-28 16:46:50+04:00, gluh@mysql.com +1 -0
    new check_partition_dirs() which checks
    data directory and index directory for partition elements

  sql/sql_parse.cc@1.713.11.2, 2008-02-28 16:46:50+04:00, gluh@mysql.com +65 -0
    added new function test_if_data_home_dir() which checks that
    path does not contain mysql data home directory.
    Using of 'mysql data home'/'any db name' in
    DATA DIRECTORY & INDEX DIRECTORY is disallowed

ChangeSet@1.2542.1.7, 2008-02-28 15:35:25+03:00, anozdrin@quad. +2 -0
  Fix for Bug#34852: SHOW OPEN TABLES output is not repeatable
  (show_check.test fails sporadically).
  
  Fix test case for Bug#12183 to make it stable.

  mysql-test/r/show_check.result@1.137, 2008-02-28 15:35:24+03:00, anozdrin@quad. +33 -42
    Fix result file.

  mysql-test/t/show_check.test@1.93, 2008-02-28 15:35:24+03:00, anozdrin@quad. +55 -17
    Make test case for Bug#12183 stable.

ChangeSet@1.2542.8.1, 2008-02-28 14:36:14+03:00, skozlov@mysql.com +9 -0
  WL#4091, replace sleeps

  mysql-test/include/wait_for_binlog_event.inc@1.1, 2008-02-28 14:36:07+03:00, skozlov@mysql.com +33 -0
    New primitive: waiting an event in binlog on master

  mysql-test/include/wait_for_binlog_event.inc@1.0, 2008-02-28 14:36:07+03:00, skozlov@mysql.com +0 -0

  mysql-test/suite/rpl/r/rpl_flushlog_loop.result@1.36, 2008-02-28 14:36:05+03:00, skozlov@mysql.com +3 -3
    updated result

  mysql-test/suite/rpl/r/rpl_row_view01.result@1.5, 2008-02-28 14:36:05+03:00, skozlov@mysql.com +3 -0
    updated result

  mysql-test/suite/rpl/t/rpl_change_master.test@1.24, 2008-02-28 14:36:05+03:00, skozlov@mysql.com +3 -1
    replace sleep

  mysql-test/suite/rpl/t/rpl_drop_temp.test@1.11, 2008-02-28 14:36:05+03:00, skozlov@mysql.com +9 -3
    replace sleep

  mysql-test/suite/rpl/t/rpl_flushlog_loop.test@1.22, 2008-02-28 14:36:06+03:00, skozlov@mysql.com +22 -3
    replace sleep

  mysql-test/suite/rpl/t/rpl_relayspace.test@1.9, 2008-02-28 14:36:06+03:00, skozlov@mysql.com +4 -17
    replace waiting of state to wait_for_slave_param.inc

  mysql-test/suite/rpl/t/rpl_row_view01.test@1.5, 2008-02-28 14:36:06+03:00, skozlov@mysql.com +12 -4
    replace sleep

  mysql-test/suite/rpl/t/rpl_trunc_temp.test@1.7, 2008-02-28 14:36:06+03:00, skozlov@mysql.com +6 -1
    replace sleep

ChangeSet@1.1810.3656.1, 2008-02-28 13:31:19+02:00, gkodinov@magare.gmz +3 -0
  Bug #34747: crash in debug assertion check after derived table
  
  Was a double-free of the Unique member of Item_func_group_concat.
  This was not causing a crash because the Unique is a descendent of
  Sql_alloc.
  Fixed to free the Unique only if it was allocated for the instance 
  of Item_func_group_concat it was referenced from

  mysql-test/r/func_gconcat.result@1.52.1.23, 2008-02-28 13:31:18+02:00, gkodinov@magare.gmz +15 -0
    Bug #34747: test case

  mysql-test/t/func_gconcat.test@1.44.1.18, 2008-02-28 13:31:18+02:00, gkodinov@magare.gmz +17 -0
    Bug #34747: test case

  sql/item_sum.cc@1.170.1.50, 2008-02-28 13:31:18+02:00, gkodinov@magare.gmz +1 -1
    Bug #34747: free the Unique only if it was allocated
    for this instance of Item_func_group_concat

ChangeSet@1.1810.3655.1, 2008-02-28 12:26:45+01:00, msvensson@pilot.mysql.com +1 -0
  Update $mysql_get_server_version variable with version
  of the currently connected server

  client/mysqltest.c@1.155.41.1, 2008-02-28 12:26:43+01:00, msvensson@pilot.mysql.com +22 -0
    Update $mysql_get_server_version variable with version
    of the currently connected server

ChangeSet@1.1810.3654.1, 2008-02-27 16:17:05-05:00, iggy@alf.(none) +3 -0
  Bug #23839 Multiple declarations of macros
  - Remove duplicate macro defintions.

  CMakeLists.txt@1.1.30.3, 2008-02-27 16:17:00-05:00, iggy@alf.(none) +8 -0
    Bug #23839 Multiple declarations of macros
    - Make sure _WIN64 is defined for proper Intellisense functionality.

  include/config-win.h@1.71.7.3, 2008-02-27 16:17:01-05:00, iggy@alf.(none) +0 -54
    Bug #23839 Multiple declarations of macros
    - Remove extra definitions.  Use the my_global.h defines instead.

  include/my_global.h@1.96.14.8, 2008-02-27 16:17:03-05:00, iggy@alf.(none) +5 -6
    Bug #23839 Multiple declarations of macros
    - Slight change to maintain current definitions for Windows.

ChangeSet@1.2542.5.1, 2008-02-27 18:08:29-03:00, davi@mysql.com +2 -0
  Fix for team tree failure. Synchronously wait for the query state
  to reach the desired value.

  mysql-test/r/flush_read_lock_kill.result@1.3, 2008-02-27 18:08:27-03:00, davi@mysql.com +1 -0
    Update test case result.

  mysql-test/t/flush_read_lock_kill.test@1.6, 2008-02-27 18:08:27-03:00, davi@mysql.com +12 -1
    Wait for the debug synchronization point to be reached.

ChangeSet@1.2542.1.4, 2008-02-27 22:53:54+03:00, anozdrin@quad. +2 -0
  Fix information_schema.test to be case-insensitive.

  mysql-test/r/information_schema.result@1.165, 2008-02-27 22:53:53+03:00, anozdrin@quad. +2 -2
    Fix information_schema.test to be case-insensitive.

  mysql-test/t/information_schema.test@1.107, 2008-02-27 22:53:53+03:00, anozdrin@quad. +1 -1
    Fix information_schema.test to be case-insensitive.

ChangeSet@1.1810.3620.18, 2008-02-27 22:29:58+03:00, anozdrin@quad. +1 -0
  Eliminate compilation warning.

  tests/mysql_client_test.c@1.167.1.82, 2008-02-27 22:29:56+03:00, anozdrin@quad. +5 -0
    Eliminate compilation warning.

ChangeSet@1.2512.1.19, 2008-02-27 21:46:06+04:00, svoj@mysql.com +6 -0
  BUG#13861 - START SLAVE UNTIL may stop 1 evnt too late if
              log-slave-updates and circul repl
  
  After merge fixes.

  mysql-test/include/wait_for_slave_sql_to_stop.inc@1.3, 2008-02-27 21:46:03+04:00, svoj@mysql.com +4 -1
    Do not change connection if it was requested by caller (needed for
    circular replication tests).

  mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt@1.2, 2008-02-27 21:39:45+04:00, svoj@mysql.com +0 -0
    Rename: mysql-test/t/rpl_dual_pos_advance-slave.opt -> mysql-test/suite/rpl/t/rpl_dual_pos_advance-slave.opt

  mysql-test/suite/rpl/t/rpl_dual_pos_advance.test@1.7, 2008-02-27 21:46:03+04:00, svoj@mysql.com +5 -4
    Let include/wait_for_slave_sql_to_stop.inc know that we do not want to
    change connection to slave.

  sql/rpl_rli.cc@1.19.1.1, 2008-02-27 21:46:03+04:00, svoj@mysql.com +7 -2
    After merge fix.

  sql/rpl_rli.h@1.27, 2008-02-27 21:46:03+04:00, svoj@mysql.com +1 -1
    After merge fix.

  sql/slave.cc@1.337.2.2, 2008-02-27 21:46:03+04:00, svoj@mysql.com +2 -2
    After merge fix.

ChangeSet@1.1810.3620.17, 2008-02-27 13:05:46-03:00, davi@mysql.com +1 -0
  Bug#34889 mysql_client_test::test_mysql_insert_id test fails sporadically
  
  Disable the test case.

  tests/mysql_client_test.c@1.167.1.81, 2008-02-27 13:05:41-03:00, davi@mysql.com +1 -1
    Disable test case.

ChangeSet@1.2542.1.3, 2008-02-27 18:38:17+03:00, kostja@dipika.(none) +2 -0
  Update Bug#12713 test results to take into account fixed bugs (29157, 33846)

  mysql-test/include/commit.inc@1.2, 2008-02-27 18:38:13+03:00, kostja@dipika.(none) +4 -9
    Update Bug#12713 test results to take into account fixed bugs (29157, 33846)

  mysql-test/r/commit_1innodb.result@1.2, 2008-02-27 18:38:13+03:00, kostja@dipika.(none) +4 -9
    Update Bug#12713 test results to take into account fixed bugs (29157, 33846)

ChangeSet@1.1810.3651.2, 2008-02-27 18:12:08+03:00, kaa@kaamos.(none) +1 -0
  Fixed test suite failures with --ps-protocol introduced in PB by
  the patch for bug #33834.

  mysql-test/t/func_time.test@1.41.1.34, 2008-02-27 18:12:07+03:00, kaa@kaamos.(none) +7 -1
    Fixed test suite failures with --ps-protocol introduced in PB by
    the patch for bug #33834.

ChangeSet@1.2542.3.2, 2008-02-27 15:18:27+01:00, sven@riska.(none) +3 -0
  Fix pushbuild errors.

  mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test@1.54, 2008-02-27 15:18:26+01:00, sven@riska.(none) +1 -1
    The test unnecessarily refused to run in non-debug mode. It can safely
    run in non-debug mode and produces the same result, so I removed the
    restriction.

  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result@1.30.1.1, 2008-02-27 15:18:26+01:00, sven@riska.(none) +1 -3
    Updated result file. It is a little unclear what the best thing to put in
    the binlog is, but the present results for this particular test are enough
    to replicate. Mats will figure out more as he fixes BUG#29020. After
    BUG#34768 has been fixed, these statements should be marked unsafe and
    not allowed in statement mode.

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.63, 2008-02-27 15:18:26+01:00, sven@riska.(none) +0 -4
    Updated result file. It is a little unclear what the best thing to put in
    the binlog is, but the present results for this particular test are enough
    to replicate. Mats will figure out more as he fixes BUG#29020. After
    BUG#34768 has been fixed, these statements should be marked unsafe and
    not allowed in statement mode.

ChangeSet@1.2476.849.2, 2008-02-27 13:30:49+04:00, holyfoot@mysql.com +1 -0
  merging

  libmysqld/lib_sql.cc@1.146.2.2, 2008-02-27 13:30:47+04:00, holyfoot@mysql.com +2 -1
    merging

ChangeSet@1.1810.3652.1, 2008-02-27 12:42:43+04:00, holyfoot@mysql.com +6 -0
  Bug #25097 mysql_server_init fails silently if no errmsg.sys is present.
  
  There was no way to return an error from the client library
  if no MYSQL connections was established.
  So here i added variables to store that king of errors and
  made functions like mysql_error(NULL) to return these.

  client/mysql.cc@1.199.35.1, 2008-02-27 12:42:41+04:00, holyfoot@mysql.com +1 -0
    Bug #25097 mysql_server_init fails silently if no errmsg.sys is present.
    
    Show the error message on std_error

  include/sql_common.h@1.19.1.1, 2008-02-27 12:42:41+04:00, holyfoot@mysql.com +1 -0
    Bug #25097 mysql_server_init fails silently if no errmsg.sys is present.
    
    cant_connect_sqlstate constant declared

  libmysql/libmysql.c@1.233.28.1, 2008-02-27 12:42:41+04:00, holyfoot@mysql.com +1 -1
    Bug #25097 mysql_server_init fails silently if no errmsg.sys is present.
    
    mysql_sqlstate(NULL) returns 'unknown_sqlstate'

  libmysqld/lib_sql.cc@1.107.10.1, 2008-02-27 12:42:41+04:00, holyfoot@mysql.com +10 -0
    Bug #25097 mysql_server_init fails silently if no errmsg.sys is present.
    
    EMBEDDED_SERVER version of the vprint_msg_to_log() implemented

  sql-common/client.c@1.83.1.37, 2008-02-27 12:42:41+04:00, holyfoot@mysql.com +21 -6
    Bug #25097 mysql_server_init fails silently if no errmsg.sys is present.
    
    mysql_server_last_errno and mysql_server_last_error introduced
    to store errors not related to particular connections.
    
    mysql_error(NULL) and mysql_errno(NULL) now returns these
    mysql_server_last_error and errno respectively

  sql/log.cc@1.158.26.1, 2008-02-27 12:42:41+04:00, holyfoot@mysql.com +1 -6
    Bug #25097 mysql_server_init fails silently if no errmsg.sys is present.
    
    EMBEDDED_LIBRARY implementation of the vprint_msg_to_log() moved
    to lib_sql.cc

ChangeSet@1.2542.2.2, 2008-02-26 18:43:48+01:00, kent@mysql.com +1 -0
  ha_ndbcluster.m4:
    Use MYSQL_NUMERIC_VERSION, to make sure NDB_VERSION_BUILD is numeric

  config/ac-macros/ha_ndbcluster.m4@1.30, 2008-02-26 18:43:37+01:00, kent@mysql.com +3 -3
    Use MYSQL_NUMERIC_VERSION, to make sure NDB_VERSION_BUILD is numeric

ChangeSet@1.1810.3474.20, 2008-02-26 18:36:06+01:00, kent@mysql.com +5 -0
  Makefile.am, Info.plist.sh:
    Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
  misc.m4, character_sets.m4, openssl.m4:
    Removed unneded semicolon

  config/ac-macros/openssl.m4@1.7.3.1, 2008-02-26 18:32:08+01:00, kent@mysql.com +2 -2
    Removed unneded semicolon

  config/ac-macros/character_sets.m4@1.10, 2008-02-26 18:32:08+01:00, kent@mysql.com +3 -3
    Removed unneded semicolon

  config/ac-macros/misc.m4@1.12.1.5, 2008-02-26 18:32:08+01:00, kent@mysql.com +1 -1
    Removed unneded semicolon

  support-files/MacOSX/Info.plist.sh@1.4, 2008-02-26 18:35:40+01:00, kent@mysql.com +1 -1
    Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot

  support-files/MacOSX/Makefile.am@1.12, 2008-02-26 18:35:40+01:00, kent@mysql.com +1 -1
    Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot

ChangeSet@1.1616.3095.27, 2008-02-26 18:18:03+01:00, kent@mysql.com +2 -0
  configure.in:
    Corrected calculation of version id, incorrect last two digits if < 10
    Keep "sp1" or "a" in MYSQL_NO_DASH_VERSION, to set correct version in
    RPM spec file
    Added MYSQL_NUMERIC_VERSION that is like MYSQL_NO_DASH_VERSION before
    Added clear doc how the different version variables differ
  SocketServer.cpp:
    Corrected typo in debug error message

  configure.in@1.201.64.32, 2008-02-26 18:16:05+01:00, kent@mysql.com +13 -3
    Corrected calculation of version id, incorrect last two digits if < 10
    Keep "sp1" or "a" in MYSQL_NO_DASH_VERSION, to set correct version in
    RPM spec file
    Added MYSQL_NUMERIC_VERSION that is like MYSQL_NO_DASH_VERSION before
    Added clear doc how the different version variables differ

  ndb/src/common/util/SocketServer.cpp@1.10.1.4, 2008-02-26 18:15:28+01:00, kent@mysql.com +1 -1
    Corrected typo in debug error message

ChangeSet@1.2512.15.18, 2008-02-26 18:44:04+02:00, jani@hynda.mysql.fi +2 -0
  Reverted wrong patch, fix for Windows 32bit build.

  mysys/my_getsystime.c@1.15, 2008-02-26 18:44:03+02:00, jani@hynda.mysql.fi +1 -1
    Added extra parenthesis to apply cast to the whole result.

  sql/mysqld.cc@1.690, 2008-02-26 18:44:03+02:00, jani@hynda.mysql.fi +5 -1
    Reversed a wrong patch. This should however be made
    better in the future in my_getopt.h, having own define
    for GET_HA_ROWS.

ChangeSet@1.2512.37.28, 2008-02-26 18:07:11+03:00, kostja@dipika.(none) +1 -0
  Fix the remaining memory leaks (mysql_client_test).

  tests/mysql_client_test.c@1.261.1.7, 2008-02-26 18:07:10+03:00, kostja@dipika.(none) +22 -22
    Fix the remaining memory leaks.

ChangeSet@1.2512.59.1, 2008-02-26 12:03:59-03:00, davi@mysql.com +7 -0
  Bug#34424 query_cache_debug.test leads to valgrind warnings
  Bug#34678 @@debug variable's incremental mode
  
  The problem is that the per-thread debugging settings stack wasn't
  being deallocated before the thread termination, leaking the stack
  memory. The chosen solution is to push a new state if the current
  is set to the initial settings and pop it (free) once the thread
  finishes.

  dbug/dbug.c@1.40, 2008-02-26 12:03:56-03:00, davi@mysql.com +35 -10
    Move dbug parser out of _db_set_ to a separate function and
    make _db_set_ push a new stack if the corrent one is set to
    the initial settings.

  dbug/user.r@1.9, 2008-02-26 12:03:56-03:00, davi@mysql.com +3 -2
    Update DBUG_SET description.

  mysql-test/r/variables_debug.result@1.1, 2008-02-26 12:03:57-03:00, davi@mysql.com +12 -0
    Add new test case result for Bug#34678

  mysql-test/r/variables_debug.result@1.0, 2008-02-26 12:03:57-03:00, davi@mysql.com +0 -0

  mysql-test/t/disabled.def@1.290.2.3, 2008-02-26 12:03:56-03:00, davi@mysql.com +0 -1
    Re-enable test case which triggered the leak.

  mysql-test/t/variables_debug.test@1.1, 2008-02-26 12:03:57-03:00, davi@mysql.com +12 -0
    Add new test case for Bug#34678

  mysql-test/t/variables_debug.test@1.0, 2008-02-26 12:03:57-03:00, davi@mysql.com +0 -0

  mysys/my_thr_init.c@1.59, 2008-02-26 12:03:56-03:00, davi@mysql.com +1 -0
    Pop a pushed state, nop if stack is empty.

  sql/set_var.cc@1.267.4.1, 2008-02-26 12:03:56-03:00, davi@mysql.com +2 -4
    Handle incremental debug settings.

ChangeSet@1.2512.37.27, 2008-02-26 17:25:21+03:00, kostja@dipika.(none) +1 -0
  Valgrind errors in mysql_client_test.

  tests/mysql_client_test.c@1.261.1.6, 2008-02-26 17:25:19+03:00, kostja@dipika.(none) +28 -0
    Fix a memory leak.
    Run the test for Bug#28386 only if logging to tables is enabled.

ChangeSet@1.2512.58.3, 2008-02-26 16:19:23+03:00, kostja@dipika.(none) +1 -0
  We never check the return value of mysql_frm_type for an error. Do
  not try to push an error into the error stack as it will be ignored anyway.

  sql/sql_view.cc@1.170, 2008-02-26 16:19:21+03:00, kostja@dipika.(none) +1 -1
    We never check the return value of mysql_frm_type for an error. Do
    not try to push an error into the error stack as it will be ignored anyway.

ChangeSet@1.1810.3646.6, 2008-02-26 15:27:46+03:00, kostja@dipika.(none) +1 -0
  Fix memory leaks (valgrind)

  tests/mysql_client_test.c@1.167.1.80, 2008-02-26 15:27:45+03:00, kostja@dipika.(none) +52 -38
    Fix memory leaks (valgrind)

ChangeSet@1.2512.58.1, 2008-02-26 13:55:46+03:00, kostja@dipika.(none) +1 -0
  Use an API instead of looking into stmt internals to fetch fields
  (Test for Bug#32265)

  tests/mysql_client_test.c@1.261.2.1, 2008-02-26 13:55:44+03:00, kostja@dipika.(none) +17 -5
    Use an API instead of looking into stmt internals to fetch fields.

ChangeSet@1.2512.1.17, 2008-02-26 07:58:46+01:00, mattiasj@witty. +1 -0
  Removed compiler warning
  
  (Missed a change of printf format)

  sql/sql_table.cc@1.464, 2008-02-26 07:58:45+01:00, mattiasj@witty. +1 -1
    wrong printf type

ChangeSet@1.2512.1.16, 2008-02-25 21:18:50+01:00, mattiasj@witty. +12 -0
  Post push fix
  
  Fixed a missed case in the patch for Bug#31931.
  Also makes Bug#33722 a duplicate of Bug#31931.
  Added tests for better coverage.
  Replaced some legacy function calls.

  mysql-test/r/partition.result@1.84, 2008-02-25 21:18:40+01:00, mattiasj@witty. +14 -0
    Added tests for better coverage

  mysql-test/r/partition_datatype.result@1.4, 2008-02-25 21:18:41+01:00, mattiasj@witty. +8 -0
    Added tests for better coverage

  mysql-test/r/partition_error.result@1.17, 2008-02-25 21:18:41+01:00, mattiasj@witty. +13 -0
    Added tests for better coverage

  mysql-test/suite/parts/inc/partition_engine.inc@1.7, 2008-02-25 21:18:41+01:00, mattiasj@witty. +54 -24
    Bug#31931: Mix of handlers error message
    
    Bug#33722 is fixed within this patch too

  mysql-test/suite/parts/r/partition_engine_innodb.result@1.8, 2008-02-25 21:18:42+01:00, mattiasj@witty. +1366 -12
    Bug#31931: Mix of handlers error message
    
    Bug#33722 is fixed within this patch too

  mysql-test/suite/parts/r/partition_engine_myisam.result@1.8, 2008-02-25 21:18:42+01:00, mattiasj@witty. +1408 -12
    Bug#31931: Mix of handlers error message
    
    Bug#33722 is fixed within this patch too

  mysql-test/t/partition.test@1.77, 2008-02-25 21:18:43+01:00, mattiasj@witty. +12 -2
    Added tests for better coverage

  mysql-test/t/partition_datatype.test@1.4, 2008-02-25 21:18:43+01:00, mattiasj@witty. +3 -0
    Added tests for better coverage

  mysql-test/t/partition_error.test@1.19, 2008-02-25 21:18:44+01:00, mattiasj@witty. +18 -0
    Added tests for Bug#31931

  sql/partition_info.cc@1.46, 2008-02-25 21:18:44+01:00, mattiasj@witty. +63 -36
    Bug#31931: Mix of handlers error message
    
    Fixed case where given info->db_type not matched
    thd->lex->create_info.db_type
    
    And the check for inconsistent subpartition engines-clauses.

  sql/sql_partition.cc@1.131, 2008-02-25 21:18:45+01:00, mattiasj@witty. +5 -5
    Changed ha_legacy_type to ha_resolve_storage_engine_name

  sql/sql_table.cc@1.463, 2008-02-25 21:18:45+01:00, mattiasj@witty. +4 -3
    Changed ha_legacy_type to ha_resolve_storage_engine_name

ChangeSet@1.2476.848.2, 2008-02-25 16:03:28+03:00, kaa@kaamos.(none) +2 -0
  Post-merge fixes for bug #33834.

  mysql-test/r/func_time.result@1.104.1.2, 2008-02-25 16:03:27+03:00, kaa@kaamos.(none) +5 -5
    Post-merge fixes for bug #33834.

  sql/sql_yacc.yy@1.611.7.3, 2008-02-25 16:03:27+03:00, kaa@kaamos.(none) +2 -2
    Post-merge fixes for bug #33834.

ChangeSet@1.2512.37.24, 2008-02-25 07:48:02-03:00, davi@mysql.com +3 -0
  Bug#28386 the general log is incomplete
  
  The problem is that the commands COM_STMT_CLOSE, COM_STMT_RESET,
  COM_STMT_SEND_LONG_DATA weren't being logged to the general log.
  
  The solution is to log the general log the aforementioned commands.

  mysql-test/t/mysql_client_test-master.opt@1.5, 2008-02-25 07:47:59-03:00, davi@mysql.com +1 -1
    Also log to table.

  sql/sql_prepare.cc@1.244, 2008-02-25 07:47:59-03:00, davi@mysql.com +6 -0
    Log COM_STMT_CLOSE, COM_STMT_RESET and COM_STMT_SEND_LONG_DATA.

  tests/mysql_client_test.c@1.261.1.4, 2008-02-25 07:48:00-03:00, davi@mysql.com +60 -0
    Add test case for Bug#28386

ChangeSet@1.1810.3651.1, 2008-02-25 13:25:57+03:00, kaa@kaamos.(none) +3 -0
  Fix for bug #33834: FRAC_SECOND: Applicability not clear in 
                      documentation
  
  While the manual mentions FRAC_SECOND only for the TIMESTAMPADD()
  function, it was also possible to use FRAC_SECOND with DATE_ADD(),
  DATE_SUB() and +/- INTERVAL.
  
  Fixed the parser to match the manual, i.e. using FRAC_SECOND for 
  anything other than TIMESTAMPADD()/TIMESTAMPDIFF() now produces a 
  syntax error.
  
  Additionally, the patch allows MICROSECOND to be used in TIMESTAMPADD/
  TIMESTAMPDIFF and marks FRAC_SECOND as deprecated.

  mysql-test/r/func_time.result@1.47.1.40, 2008-02-25 13:25:55+03:00, kaa@kaamos.(none) +23 -0
    Added a test case for bug #33834.

  mysql-test/t/func_time.test@1.41.1.33, 2008-02-25 13:25:55+03:00, kaa@kaamos.(none) +19 -0
    Added a test case for bug #33834.

  sql/sql_yacc.yy@1.371.142.2, 2008-02-25 13:25:55+03:00, kaa@kaamos.(none) +27 -6
    Reject FRAC_SECOND for anything other than TIMESTAMPADD() or
    TIMESTAMPDIFF().
    Allow MICROSECOND to be used with TIMESTAMPADD()/TIMESTAMPDIFF().
    Warn about FRAC_SECOND being a deprecated unit.

ChangeSet@1.1810.3649.2, 2008-02-25 07:50:55+01:00, tnurnberg@mysql.com +1 -0
  Bug#29645: Link failure when using the embedded server
  
  mysql_config --cflags gave a flag that forced the HP/UX
  C++ compiler into C-mode; as a result, C++ sources could
  not be compiled correctly.
  
  We now filter out the offending flag (like we do for Sun)
  so that --cflags will work for both C and C++.

  scripts/mysql_config.sh@1.29.2.1, 2008-02-25 07:50:54+01:00, tnurnberg@mysql.com +3 -1
    Add -AC99 (for HP/UX) to the list of flags we need to remove
    from "mysql_config --cflags" so they work for C and C++ both. 

ChangeSet@1.2512.1.15, 2008-02-24 19:13:18+01:00, mattiasj@witty. +6 -0
  Pre push fixes
  
  Test file fixes for bugs 20129, 31931 and 34225

  mysql-test/suite/parts/r/partition_basic_symlink_innodb.result@1.2, 2008-02-24 19:13:16+01:00, mattiasj@witty. +237 -237
    Manual merge, new test case to be modified for Bug#20129

  mysql-test/suite/parts/r/partition_basic_symlink_myisam.result@1.2, 2008-02-24 19:13:16+01:00, mattiasj@witty. +188 -188
    Manual merge, new test case to be modified for Bug#20129

  mysql-test/suite/parts/r/partition_engine_innodb.result@1.7, 2008-02-24 19:13:16+01:00, mattiasj@witty. +10 -0
    Manual merge, fix for bug#31931

  mysql-test/suite/parts/r/partition_engine_myisam.result@1.7, 2008-02-24 19:13:17+01:00, mattiasj@witty. +10 -0
    Manual merge, fix for bug#31931

  mysql-test/suite/parts/t/disabled.def@1.10, 2008-02-24 19:13:17+01:00, mattiasj@witty. +0 -7
    These should work now since Bug#34225 is fixed

  sql/ha_partition.cc@1.117.1.2, 2008-02-24 19:13:17+01:00, mattiasj@witty. +4 -2
    Bug#20129: partition maintenance command not working with crashed tables
    
    Fix for compiler warnings.

ChangeSet@1.2476.847.2, 2008-02-24 14:12:17+01:00, tnurnberg@mysql.com +6 -0
  Bug#32757: hang with sql_mode set when setting some global variables
  
  If setting a system-variable provided by a plug-in failed, no OK or
  error was sent in some cases, hanging the client. We now send an error
  in the case from the ticket (integer-argument out of range in STRICT
  mode). We also provide a semi-generic fallback message for possible
  future cases like this where an error is signalled, but no message is
  sent to the client. The error/warning handling is unified so it's the
  same again for variables provided by plugins and those in the server
  proper.

  mysql-test/r/plugin.result@1.5, 2008-02-24 14:12:14+01:00, tnurnberg@mysql.com +27 -0
    show that on out-of-range values, plugin interface throws errors
    in STRICT mode and warnings otherwise.

  mysql-test/t/plugin.test@1.4, 2008-02-24 14:12:14+01:00, tnurnberg@mysql.com +35 -0
    show that on out-of-range values, plugin interface throws errors
    in STRICT mode and warnings otherwise.

  sql/set_var.cc@1.262.4.1, 2008-02-24 14:12:14+01:00, tnurnberg@mysql.com +29 -12
    - handle signedness of values used in warnings
    - in STRICT mode, throw errors rather than warnings

  sql/sql_parse.cc@1.713.10.1, 2008-02-24 14:12:14+01:00, tnurnberg@mysql.com +12 -0
    If sql_set_variables() returns with an error but no message
    was sent to the client, send a semi-generic one so the session
    won't hang and we won't fail silently.

  sql/sql_plugin.cc@1.78.6.1, 2008-02-24 14:12:15+01:00, tnurnberg@mysql.com +8 -31
    throw a warning if more than just block-size was corrected
    (or an error in STRICT mode). use functions from set_var
    for uniform behaviour of server- and plug-in variables.

  storage/example/ha_example.cc@1.63, 2008-02-24 14:12:15+01:00, tnurnberg@mysql.com +14 -0
    Add a ULONG system variable to example plugin so
    we can test integers in the plugin-interface without
    having to depend on the presence of innobase.

ChangeSet@1.2476.847.1, 2008-02-24 13:58:07+01:00, tnurnberg@mysql.com +3 -0
  Bug#32753: PAD_CHAR_TO_FULL_LENGTH is not documented and interferes with grant tables
  
  SQL-mode PAD_CHAR_TO_FULL_LENGTH affected mysqld's user-table too. If
  enabled, user-name and host were space-padded and no longer matched
  the login-data of incoming connexions.
  
  Patch disregards pad-flag while loading privileges so ability to log
  in does not depend on SQL-mode.

  mysql-test/r/sql_mode.result@1.42, 2008-02-24 13:58:05+01:00, tnurnberg@mysql.com +10 -0
    show that SQL-mode 'PAD_CHAR_TO_FULL_LENGTH' does not affect
    loading of privileges (and by extension, ability to log in).

  mysql-test/t/sql_mode.test@1.21, 2008-02-24 13:58:05+01:00, tnurnberg@mysql.com +29 -0
    show that SQL-mode 'PAD_CHAR_TO_FULL_LENGTH' does not affect
    loading of privileges (and by extension, ability to log in).

  sql/sql_acl.cc@1.255.4.2, 2008-02-24 13:58:05+01:00, tnurnberg@mysql.com +12 -3
    temporarily disable SQL-mode 'PAD_CHAR_TO_FULL_LENGTH' while
    reloading privileges

ChangeSet@1.2476.846.2, 2008-02-24 01:31:54+01:00, tnurnberg@mysql.com +3 -0
  Bug#20752: BENCHMARK with many iterations returns too quickly
  
  In BENCHMARK(count, expr), count could overflow/wrap-around.
  Patch changes to a sufficiently large data-type. Adds a warning
  for negative count values.

  mysql-test/r/func_str.result@1.149.1.1, 2008-02-24 01:31:52+01:00, tnurnberg@mysql.com +5 -0
    show that a negative 'count' for BENCHMARK(count, expr)
    throws a warning and returns NULL.

  mysql-test/t/func_str.test@1.115, 2008-02-24 01:31:52+01:00, tnurnberg@mysql.com +7 -0
    show that a negative 'count' for BENCHMARK(count, expr)
    throws a warning and returns NULL.

  sql/item_func.cc@1.419.9.12, 2008-02-24 01:31:52+01:00, tnurnberg@mysql.com +14 -4
    use ulonglong rather than ulong in BENCHMARK(count, expr)
    throw warning on negative 'count'; return SQL-NULL.

ChangeSet@1.2541, 2008-02-22 16:56:34-07:00, tsmith@ramayana.hindu.god +3 -0
  Bug #34053: normal users can enable innodb_monitor logging
  
  The check_global_access() function was made available to InnoDB, but
  was not defined in the embedded server library.  InnoDB, as a plugin,
  is not recompiled when the embedded server is built.  This caused a
  link failure when compiling applications which use the embedded server.
  
  The fix here is to always define check_global_access() externally; in
  the embedded server case, it is defined to just return OK.
  
  Also, don't run the test case for this bug in embedded server.

  mysql-test/t/innodb_bug34053.test@1.2, 2008-02-22 16:56:14-07:00, tsmith@ramayana.hindu.god +1 -0
    Disable this test on embedded server - it tests privilege
    checks which are not in place there.

  sql/mysql_priv.h@1.549.13.2, 2008-02-22 16:56:14-07:00, tsmith@ramayana.hindu.god +0 -5
    Since check_global_access() may be used from some storage engine plugins
    (InnoDB, currently), and the plugins are not recompiled for the embedded
    server, it must be defined externally even for NO_EMBEDDED_ACCESS_CHECKS.

  sql/sql_parse.cc@1.713.8.3, 2008-02-22 16:56:14-07:00, tsmith@ramayana.hindu.god +33 -29
    Since check_global_access() may be used from some storage engine plugins
    (InnoDB, currently), and the plugins are not recompiled for the embedded
    server, it must be defined externally even for NO_EMBEDDED_ACCESS_CHECKS.

ChangeSet@1.2535.1.2, 2008-02-22 21:28:59+01:00, hhunger@hh-nb.hungers +2 -0
  Inserted changes from the review of bug#32664.

  mysql-test/t/events_1.test@1.3, 2008-02-22 21:28:56+01:00, hhunger@hh-nb.hungers +2 -1
    Inserted changes from the review of bug#32664.

  mysql-test/t/events_2.test@1.3, 2008-02-22 21:28:56+01:00, hhunger@hh-nb.hungers +2 -2
    Inserted changes from the review of bug#32664.

ChangeSet@1.2512.56.1, 2008-02-22 21:49:16+03:00, kostja@dipika.(none) +1 -0
  Update new test results after merge (Bug#12713)

  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result@1.32, 2008-02-22 21:49:14+03:00, kostja@dipika.(none) +1 -0
    Update new test results after merge (Bug#12713)

ChangeSet@1.2539, 2008-02-22 19:15:31+01:00, joerg@trift2. +1 -0
  mysql-test/mysql-test-run.pl
      Disable extra team trees.
      Temporary fix for entry 34761 in the bugs DB.
      (Patch by Magnus Svensson, 2008-02-22 17:40:14+01:00, msvensson@pilot.mysql.com +1 -0)

  mysql-test/mysql-test-run.pl@1.351, 2008-02-22 19:15:26+01:00, joerg@trift2. +1 -1
    Disable extra team trees.
    Temporary fix for entry 34761 in the bugs DB.
    (Patch by Magnus Svensson, 2008-02-22 17:40:14+01:00, msvensson@pilot.mysql.com +1 -0)

ChangeSet@1.2512.37.22, 2008-02-22 18:45:45+01:00, andrey@whirlpool.hristov.com +3 -0
  Fix for Bug#29605
  --local-infile=0 checks can be bypassed by sending a FETCH LOCAL FILE response
    
  Add a check for CLIENT_LOCAL_FILES before sending a local file.
  Beware, that all binary distributions enable sending of local files and it's up
  to the programs which use libmysql to disable it, if they don't use this functionality.
  Otherwise they are not safe.

  client/mysqltest.c@1.324.3.1, 2008-02-22 18:45:43+01:00, andrey@whirlpool.hristov.com +2 -0
    Enable LOAD DATA LOCAL INFILE for the test suite, like some rpl and ndb test.

  sql-common/client.c@1.152, 2008-02-22 18:45:43+01:00, andrey@whirlpool.hristov.com +9 -1
    Check if the client has LOAD DATA LOCAL INFILE disabled and
    don't serve such requests from the server. This is not 100% proof,
    as if the client has this enabled, in all binary builds for BC,
    the check won't work and the client can be tricked into sending a
    local file.

  tests/mysql_client_test.c@1.261.1.3, 2008-02-22 18:45:43+01:00, andrey@whirlpool.hristov.com +2 -0
    Switch on LOCAL INFILE in client test. If one day there
    is a test which uses it, then it will work out of the box.

ChangeSet@1.2512.54.1, 2008-02-22 17:40:14+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#34761 Mysql-test-run.pl script hangs on Windows

  mysql-test/mysql-test-run.pl@1.349.1.1, 2008-02-22 17:40:11+01:00, msvensson@pilot.mysql.com +1 -1
    Disable extra team trees

ChangeSet@1.2512.53.1, 2008-02-22 16:18:31+01:00, andrey@whirlpool.hristov.com +2 -0
  Fix for bug#22738 Events: After stop and start disabled events could reside in the queue
  
  Disabled events weren't removed from the memory queue after the scheduler has been
  re-enabled. After recalculation of next execution time of an event, it might get disabled.

  sql/event_queue.cc@1.42, 2008-02-22 16:18:29+01:00, andrey@whirlpool.hristov.com +36 -2
    Sort the event queue in a way that the disabled events will always be
    at the end. We will use this for cleaning it, starting from the end.
    
    After recalculating times in the queue, after the scheduler has been enabled
    after disabled state, the queue should be cleaned from DISABLED events.
    The queue is sorted in a way such that the disabled events are at the end.
    Thus, we can start from the end of the queue and remove all DISABLED till we
    find the first with different state.

  sql/events.cc@1.89.1.1, 2008-02-22 16:18:29+01:00, andrey@whirlpool.hristov.com +6 -1
    Add a comment about possible problem with replication of events,
    disabled events and server restarts.

ChangeSet@1.1810.3650.1, 2008-02-22 19:07:07+04:00, svoj@mysql.com +6 -0
  BUG#13861 - START SLAVE UNTIL may stop 1 evnt too late if
              log-slave-updates and circul repl
  
  Slave SQL thread may execute one extra event when there are events
  skipped by slave I/O thread (e.g. originated by the same server).
  Whereas it was requested not to do so by the UNTIL condition.
  
  This happens because we compare with the end position of previously
  executed event. This is fine when there are no skipped by slave I/O
  thread events, as end position of previous event equals to start
  position of to be executed event. Otherwise this position equals to
  start position of skipped event.
  
  This is fixed by:
  - reading the event to be executed before checking if the until condition
    is satisfied.
  - comparing the start position of the event to be executed. Since we do
    not have the start position available, we compute it by subtracting
    event length from end position (which is available).
  - if there are no events on the event queue at the slave sql starting
    time, that meet until condition, we stop immediately, as in this
    case we do not want to wait for next event.

  mysql-test/r/rpl_dual_pos_advance.result@1.2.1.1, 2008-02-22 19:07:06+04:00, svoj@mysql.com +42 -1
    A test case for BUG#13861.

  mysql-test/t/rpl_dual_pos_advance-slave.opt@1.1, 2008-02-22 19:07:06+04:00, svoj@mysql.com +1 -0
    New BitKeeper file ``mysql-test/t/rpl_dual_pos_advance-slave.opt''

  mysql-test/t/rpl_dual_pos_advance-slave.opt@1.0, 2008-02-22 19:07:06+04:00, svoj@mysql.com +0 -0

  mysql-test/t/rpl_dual_pos_advance.test@1.2.2.1, 2008-02-22 19:07:06+04:00, svoj@mysql.com +38 -18
    A test case for BUG#13861.

  sql/log_event.cc@1.174.27.9, 2008-02-22 19:07:06+04:00, svoj@mysql.com +2 -1
    Store length of event. This is needed for further calculation of
    the beginning of event.

  sql/slave.cc@1.241.31.1, 2008-02-22 19:07:06+04:00, svoj@mysql.com +44 -24
    Slave SQL thread may execute one extra event when there are events
    skipped by slave I/O thread (e.g. originated by the same server).
    Whereas it was requested not to do so by the UNTIL condition.
    
    This happens because we compare with the end position of previously
    executed event. This is fine when there are no skipped by slave I/O
    thread events, as end position of previous event equals to start
    position of to be executed event. Otherwise this position equals to
    start position of skipped event.
    
    This is fixed by:
    - reading the event to be executed before checking if the until condition
      is satisfied.
    - comparing the start position of the event to be executed. Since we do
      not have the start position available, we compute it by subtracting
      event length from end position (which is available).
    - if there are no events on the event queue at the slave sql starting
      time, that meet until condition, we stop immediately, as in this
      case we do not want to wait for next event.

  sql/slave.h@1.85.1.17, 2008-02-22 19:07:06+04:00, svoj@mysql.com +1 -1
    Added master_log_pos parametr to is_until_satisfied().

ChangeSet@1.2512.37.20, 2008-02-22 17:51:57+03:00, kostja@dipika.(none) +1 -0
  Update new tests after merge.

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.61.1.2, 2008-02-22 17:51:55+03:00, kostja@dipika.(none) +2 -0
    Update new tests after merge.

ChangeSet@1.2512.37.19, 2008-02-22 17:45:09+03:00, kostja@dipika.(none) +1 -0
  An unused variable (compile-time warning).

  sql/sql_view.cc@1.169, 2008-02-22 17:45:06+03:00, kostja@dipika.(none) +0 -1
    An unused variable.

ChangeSet@1.2512.34.12, 2008-02-22 16:27:02+02:00, gkodinov@magare.gmz +1 -0
  merged bug 30604 to 5.1-opt

  mysql-test/r/ctype_cp932_binlog_stm.result@1.12, 2008-02-22 16:27:00+02:00, gkodinov@magare.gmz +3 -3
    merged bug 30604 to 5.1-opt

ChangeSet@1.2512.37.18, 2008-02-22 12:26:08-02:00, davi@buzz.(none) +3 -0
  Disable concurrent inserts for the kill.test

  mysql-test/r/kill.result@1.23, 2008-02-22 12:26:05-02:00, davi@buzz.(none) +1 -0
    Update test case result.

  mysql-test/t/disabled.def@1.290.2.2, 2008-02-22 12:26:06-02:00, davi@buzz.(none) +0 -1
    Re-enable kill test, bug was closed.

  mysql-test/t/kill.test@1.31, 2008-02-22 12:26:06-02:00, davi@buzz.(none) +4 -0
    Disable concurrent inserts for the kill test.

ChangeSet@1.2530.2.2, 2008-02-22 13:54:49+01:00, hhunger@hh-nb.hungers +2 -0
  Replaced all --sleep by wait_condition (bug#32664).

  mysql-test/t/events_1.test@1.2, 2008-02-22 13:54:47+01:00, hhunger@hh-nb.hungers +9 -3
    Replaced all --sleep by wait_condition (bug#32664).

  mysql-test/t/events_2.test@1.2, 2008-02-22 13:54:47+01:00, hhunger@hh-nb.hungers +2 -0
    Replaced all --sleep by wait_condition (bug#32664).

ChangeSet@1.2512.52.1, 2008-02-22 10:35:08-02:00, davi@buzz.(none) +1 -0
  Fix lock_multi test case failure related to
  concurrent inserts.

  mysql-test/t/lock_multi.test@1.40, 2008-02-22 10:35:07-02:00, davi@buzz.(none) +3 -0
    Wait for the concurrent insert to finish.

ChangeSet@1.2512.51.1, 2008-02-22 13:30:33+03:00, anozdrin@quad. +39 -0
  Fix for Bug#30217: Views: changes in metadata behaviour
  between 5.0 and 5.1.
    
  The problem was that in the patch for Bug#11986 it was decided
  to store original query in UTF8 encoding for the INFORMATION_SCHEMA.
  This approach however turned out to be quite difficult to implement
  properly. The main problem is to preserve the same IS-output after
  dump/restore.
    
  So, the fix is to rollback to the previous functionality, but also
  to fix it to support multi-character-set-queries properly. The idea
  is to generate INFORMATION_SCHEMA-query from the item-tree after
  parsing view declaration. The IS-query should:
    - be completely in UTF8;
    - not contain character set introducers.
    
  For more information, see WL4052.

  mysql-test/include/ddl_i18n.check_views.inc@1.2, 2008-02-22 13:30:29+03:00, anozdrin@quad. +12 -0
    Add a test case for Bug#30217.

  mysql-test/r/ddl_i18n_koi8r.result@1.5, 2008-02-22 13:30:29+03:00, anozdrin@quad. +45 -7
    Update result file.

  mysql-test/r/ddl_i18n_utf8.result@1.5, 2008-02-22 13:30:29+03:00, anozdrin@quad. +45 -7
    Update result file.

  mysql-test/r/information_schema.result@1.164, 2008-02-22 13:30:29+03:00, anozdrin@quad. +10 -15
    Update result file.

  mysql-test/r/information_schema_db.result@1.25, 2008-02-22 13:30:29+03:00, anozdrin@quad. +1 -1
    Update result file.

  mysql-test/r/mysqldump.result@1.165, 2008-02-22 13:30:29+03:00, anozdrin@quad. +34 -0
    Update result file.

  mysql-test/r/show_check.result@1.136, 2008-02-22 13:30:29+03:00, anozdrin@quad. +2 -2
    Update result file.

  mysql-test/t/ddl_i18n_koi8r.test@1.4, 2008-02-22 13:30:29+03:00, anozdrin@quad. +7 -1
    Add a test case for Bug#30217.

  mysql-test/t/ddl_i18n_utf8.test@1.4, 2008-02-22 13:30:29+03:00, anozdrin@quad. +7 -1
    Add a test case for Bug#30217.

  mysql-test/t/mysqldump.test@1.152.1.1, 2008-02-22 13:30:29+03:00, anozdrin@quad. +55 -0
    Add a test case for Bug#30217.

  sql/ha_ndbcluster.cc@1.473.1.1, 2008-02-22 13:30:29+03:00, anozdrin@quad. +1 -1
    Add a parameter to print().

  sql/item.cc@1.304, 2008-02-22 13:30:30+03:00, anozdrin@quad. +62 -36
    1. Add a parameter to print().
    2. Item_string::print():
          - Do not append character set introducer to the text literal
            if we're building a query for INFORMATION_SCHEMA;
          - Convert text literal to UTF8 if we're building a query
            for INFORMATION_SCHEMA.

  sql/item.h@1.274.1.1, 2008-02-22 13:30:30+03:00, anozdrin@quad. +53 -35
    Add a parameter to print().

  sql/item_cmpfunc.cc@1.277.1.1, 2008-02-22 13:30:30+03:00, anozdrin@quad. +28 -28
    Add a parameter to print().

  sql/item_cmpfunc.h@1.176, 2008-02-22 13:30:30+03:00, anozdrin@quad. +37 -14
    Add a parameter to print().

  sql/item_func.cc@1.424.3.1, 2008-02-22 13:30:30+03:00, anozdrin@quad. +33 -32
    Add a parameter to print().

  sql/item_func.h@1.176.2.1, 2008-02-22 13:30:30+03:00, anozdrin@quad. +36 -18
    Add a parameter to print().

  sql/item_geofunc.h@1.19, 2008-02-22 13:30:30+03:00, anozdrin@quad. +7 -2
    Add a parameter to print().

  sql/item_row.cc@1.38, 2008-02-22 13:30:30+03:00, anozdrin@quad. +2 -2
    Add a parameter to print().

  sql/item_row.h@1.26, 2008-02-22 13:30:30+03:00, anozdrin@quad. +1 -1
    Add a parameter to print().

  sql/item_strfunc.cc@1.333, 2008-02-22 13:30:30+03:00, anozdrin@quad. +16 -16
    Add a parameter to print().

  sql/item_strfunc.h@1.140, 2008-02-22 13:30:30+03:00, anozdrin@quad. +6 -6
    Add a parameter to print().

  sql/item_subselect.cc@1.166, 2008-02-22 13:30:30+03:00, anozdrin@quad. +26 -23
    Add a parameter to print().

  sql/item_subselect.h@1.98, 2008-02-22 13:30:30+03:00, anozdrin@quad. +10 -10
    Add a parameter to print().

  sql/item_sum.cc@1.234, 2008-02-22 13:30:30+03:00, anozdrin@quad. +7 -7
    Add a parameter to print().

  sql/item_sum.h@1.122, 2008-02-22 13:30:30+03:00, anozdrin@quad. +3 -3
    Add a parameter to print().

  sql/item_timefunc.cc@1.186, 2008-02-22 13:30:30+03:00, anozdrin@quad. +16 -16
    Add a parameter to print().

  sql/item_timefunc.h@1.100, 2008-02-22 13:30:30+03:00, anozdrin@quad. +7 -7
    Add a parameter to print().

  sql/mysql_priv.h@1.549.14.1, 2008-02-22 13:30:30+03:00, anozdrin@quad. +14 -1
    Add a parameter to print().

  sql/sp_head.cc@1.306, 2008-02-22 13:30:30+03:00, anozdrin@quad. +6 -6
    Add a parameter to print().

  sql/sql_lex.cc@1.263, 2008-02-22 13:30:30+03:00, anozdrin@quad. +16 -11
    Add a parameter to print().

  sql/sql_lex.h@1.306, 2008-02-22 13:30:30+03:00, anozdrin@quad. +6 -6
    Add a parameter to print().

  sql/sql_parse.cc@1.713.9.1, 2008-02-22 13:30:30+03:00, anozdrin@quad. +1 -1
    Add a parameter to print().

  sql/sql_select.cc@1.583.2.1, 2008-02-22 13:30:30+03:00, anozdrin@quad. +47 -34
    Add a parameter to print().

  sql/sql_show.cc@1.450.1.2, 2008-02-22 13:30:31+03:00, anozdrin@quad. +1 -1
    Add a parameter to print().

  sql/sql_test.cc@1.55.1.1, 2008-02-22 13:30:31+03:00, anozdrin@quad. +3 -3
    Add a parameter to print().

  sql/sql_view.cc@1.165.1.1, 2008-02-22 13:30:31+03:00, anozdrin@quad. +44 -4
    Build INFORMATION_SCHEMA query from Item-tree.

  sql/sql_yacc.yy@1.611.1.11, 2008-02-22 13:30:31+03:00, anozdrin@quad. +1 -21
    Build INFORMATION_SCHEMA query from Item-tree.

  sql/table.h@1.188.1.1, 2008-02-22 13:30:31+03:00, anozdrin@quad. +1 -1
    Add a parameter to print().

ChangeSet@1.1810.3649.1, 2008-02-22 11:34:18+03:00, kaa@kaamos.(none) +3 -0
  Fix for bug #33049: Assert while running test-as3ap test(mysql-bench 
                      suite)
  
  Under some circumstances a combination of aggregate functions and
  GROUP BY in a SELECT query over a VIEW could lead to incorrect
  calculation of the result type of the aggregate function. This in
  turn could result in incorrect results, or assertion failures on debug
  builds.
  
  Fixed by changing the logic in Item_sum_hybrid::fix_fields() so that
  the argument's item is dereferenced before calling its type() method.

  mysql-test/r/view.result@1.138.40.3, 2008-02-22 11:34:17+03:00, kaa@kaamos.(none) +8 -0
    Added a test case for bug #33049.

  mysql-test/t/view.test@1.126.1.67, 2008-02-22 11:34:17+03:00, kaa@kaamos.(none) +13 -0
    Added a test case for bug #33049.

  sql/item_sum.cc@1.170.1.49, 2008-02-22 11:34:17+03:00, kaa@kaamos.(none) +1 -0
    When calculating the result type of an aggregate function, dereference
    the argument's item before calling its type() method.

ChangeSet@1.1810.3648.1, 2008-02-22 12:30:17+04:00, gluh@mysql.com +3 -0
  Bug#23588 SHOW COLUMNS on a temporary table causes locking issues
  skip lock_type update for temporary tables

  mysql-test/r/tablelock.result@1.6, 2008-02-22 12:30:16+04:00, gluh@mysql.com +9 -0
    test result

  mysql-test/t/tablelock.test@1.7, 2008-02-22 12:30:16+04:00, gluh@mysql.com +13 -0
    test case

  sql/sql_base.cc@1.235.79.39, 2008-02-22 12:30:16+04:00, gluh@mysql.com +6 -2
    skip lock_type update for temporary tables

ChangeSet@1.2512.37.15, 2008-02-21 23:58:45-02:00, davi@buzz.(none) +3 -0
  Post-merge fixes for bug 32890

  mysql-test/r/ps.result@1.127, 2008-02-21 23:58:44-02:00, davi@buzz.(none) +32 -32
    Update test case results

  sql/item.h@1.276, 2008-02-21 23:58:44-02:00, davi@buzz.(none) +0 -2
    Manual merge

  sql/sql_view.cc@1.167, 2008-02-21 23:58:44-02:00, davi@buzz.(none) +2 -2
    Manual merge

ChangeSet@1.1810.3646.5, 2008-02-21 19:28:25-02:00, davi@buzz.(none) +1 -0
  Post-merge fix to silence compiler warning.

  sql/sql_prepare.cc@1.142.38.3, 2008-02-21 19:28:21-02:00, davi@buzz.(none) +0 -1
    Removed unused variable.

ChangeSet@1.1810.3646.4, 2008-02-21 14:58:29-03:00, davi@mysql.com +6 -0
  Bug#32890 Crash after repeated create and drop of tables and views
  
  The problem is that CREATE VIEW statements inside prepared statements
  weren't being expanded during the prepare phase, which leads to objects
  not being allocated in the appropriate memory arenas.
  
  The solution is to perform the validation of CREATE VIEW statements
  during the prepare phase of a prepared statement. The validation
  during the prepare phase assures that transformations of the parsed
  tree will use the permanent arena of the prepared statement.

  mysql-test/r/ps.result@1.56.1.43, 2008-02-21 14:58:27-03:00, davi@mysql.com +152 -0
    Add test case result for Bug#32890

  mysql-test/t/ps.test@1.56.1.42, 2008-02-21 14:58:27-03:00, davi@mysql.com +123 -0
    Add test case for Bug#32890

  sql/item.h@1.183.44.1, 2008-02-21 14:58:27-03:00, davi@mysql.com +23 -20
    Restore original field name if name is auto generated.

  sql/sql_prepare.cc@1.142.38.2, 2008-02-21 14:58:27-03:00, davi@mysql.com +40 -0
    Validate and prepare a CREATE VIEW statement for execution.

  sql/sql_view.cc@1.78.1.44, 2008-02-21 14:58:27-03:00, davi@mysql.com +126 -87
    Move privileges check to it's own function.

  sql/sql_view.h@1.11.1.4, 2008-02-21 14:58:27-03:00, davi@mysql.com +3 -0
    Export function which check privileges of a CREATE VIEW statement.

ChangeSet@1.1810.3647.1, 2008-02-21 13:23:58+01:00, msvensson@pilot.mysql.com +3 -0
  Bug#32025 ndb_waiter does too many roundtrips to ndb_mgmd
   - fix test failures that was already there but now are
     more consistent when the 1 second sleep has been removed from
     ndb_waiter

  mysql-test/include/ndb_wait_connected.inc@1.1, 2008-02-21 13:23:56+01:00, msvensson@pilot.mysql.com +26 -0
    Wait until mysqld has reconnected to ndbd after ndbd has been restarted

  mysql-test/include/ndb_wait_connected.inc@1.0, 2008-02-21 13:23:56+01:00, msvensson@pilot.mysql.com +0 -0

  mysql-test/t/ndb_autodiscover.test@1.22.1.2, 2008-02-21 13:23:56+01:00, msvensson@pilot.mysql.com +1 -0
    Wait until mysqld has reconnected to ndbd after ndbd has been restarted

  mysql-test/t/ndb_autodiscover3.test@1.1.1.2, 2008-02-21 13:23:56+01:00, msvensson@pilot.mysql.com +9 -0
    Wait until mysqld has reconnected to ndbd after ndbd has been restarted

ChangeSet@1.2512.37.13, 2008-02-21 14:49:27+03:00, anozdrin@quad. +2 -0
  Fix for Bug#33065: Mysql not writing general query logs after
  sending SIGHUP.
  
  There were two problems:
    - after some recent fix, the server started to crash after
      receiving SIGHUP. That happened because LEX of new THD-object
      was not properly initialized.
    - user-specified log options were ignored when logs were reopened.
  
  The fix is to 1) initialize LEX and 2) take user-specified options
  into account.
  
  There is no test case in this CS, because our test suite does not
  support sending SIGHUP to the server.

  sql/mysqld.cc@1.682.19.1, 2008-02-21 14:49:26+03:00, anozdrin@quad. +12 -2
    Use proper logging after SIGHUP.

  sql/sql_parse.cc@1.713.5.5, 2008-02-21 14:49:26+03:00, anozdrin@quad. +1 -0
    Initialize LEX of new THD -- it is required to avoid crash
    in SIGHUP handling.

ChangeSet@1.2512.37.12, 2008-02-21 12:48:55+03:00, anozdrin@quad. +1 -0
  Fix merge (fix result file)

  mysql-test/r/view.result@1.246.2.6, 2008-02-21 12:48:54+03:00, anozdrin@quad. +17 -15
    Fix merge (fix result file)

ChangeSet@1.1810.3646.3, 2008-02-21 12:17:32+03:00, anozdrin@quad. +5 -0
  Fix for Bug#34337: Server crash when Altering a view using
  a table name.
    
  The problem was that fill_defined_view_parts() did not return
  an error if a table is going to be altered. That happened if
  the table was already in the table cache. In that case,
  open_table() returned non-NULL value (valid TABLE-instance from
  the cache).
    
  The fix is to ensure that an error is thrown even if the table
  is in the cache.
  
  (This is a backport of the original patch for 5.1)

  mysql-test/r/view.result@1.138.41.1, 2008-02-21 12:17:31+03:00, anozdrin@quad. +20 -1
    Fix result file.

  mysql-test/r/view_grant.result@1.8.1.20, 2008-02-21 12:17:32+03:00, anozdrin@quad. +1 -0
    Fix result file.

  mysql-test/t/view.test@1.126.32.1, 2008-02-21 12:17:32+03:00, anozdrin@quad. +35 -1
    Add a test case for Bug#34337: Server crash when Altering a view
    using a table name.

  mysql-test/t/view_grant.test@1.8.1.18, 2008-02-21 12:17:32+03:00, anozdrin@quad. +1 -0
    Fix order-dependency.

  sql/sql_view.cc@1.78.1.43, 2008-02-21 12:17:32+03:00, anozdrin@quad. +26 -3
    Report an error if we're going to work with a table.

ChangeSet@1.2512.50.1, 2008-02-21 06:29:35+01:00, mkindahl@dl145h.mysql.com +1 -0
  Fixing result after merge.

  mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result@1.11, 2008-02-21 06:29:19+01:00, mkindahl@dl145h.mysql.com +34 -0
    Result change.

ChangeSet@1.2512.37.10, 2008-02-20 23:30:29-02:00, davi@buzz.(none) +4 -0
  Post-merge fixes for bugs 34587 and 32265.

  mysql-test/r/view.result@1.246.2.4, 2008-02-20 23:30:26-02:00, davi@buzz.(none) +1 -0
    Drop created view.

  mysql-test/t/view.test@1.216, 2008-02-20 23:30:27-02:00, davi@buzz.(none) +1 -0
    Update test result.

  sql/sql_cursor.cc@1.16, 2008-02-20 23:30:27-02:00, davi@buzz.(none) +1 -1
    Fix compilation failure.

  tests/mysql_client_test.c@1.261.1.2, 2008-02-20 23:30:27-02:00, davi@buzz.(none) +1 -2
    Manual merge.

ChangeSet@1.1810.3646.2, 2008-02-20 22:11:06-03:00, davi@mysql.com +1 -0
  Post-merge fix to silence a compilation warning introduced
  by patch for bug 32265 .

  tests/mysql_client_test.c@1.167.1.79, 2008-02-20 22:11:03-03:00, davi@mysql.com +1 -1
    Removed unused variable.

ChangeSet@1.2512.49.1, 2008-02-20 23:18:01+02:00, aelkin@mysql1000.(none) +3 -0
  Bug #31316 Report server id clashes in SHOW SLAVE STATUS 
      "Server_IO_State" field
  
  Critical error messages from get_master_version_and_clock() were written
  only to the slave errorlog while Show slave status did not display any
  incident happened.
  
  Although the artifact was reported for a particular --replicate-same-server-id
  related issue the fix refines all critical error reporting with 
  deploying rli->report().
  
  The test for the bug covers only --replicate-same-server-id error reporting.

  mysql-test/suite/rpl/r/rpl_server_id1.result@1.20, 2008-02-20 23:17:59+02:00, aelkin@mysql1000.(none) +9 -14
    new results reflecting changes

  mysql-test/suite/rpl/t/rpl_server_id1.test@1.13, 2008-02-20 23:17:59+02:00, aelkin@mysql1000.(none) +8 -9
    Preserving the idea of the test unnecessary queries and the sleep are
    eliminated.
    In the end the slave must stop with the error displayable via $$$.

  sql/slave.cc@1.336.2.1, 2008-02-20 23:17:59+02:00, aelkin@mysql1000.(none) +36 -11
    improving get_master_version_and_clock() code to report a critical incident
    via rli->report() that takes care of bothe the error log and
    the slave's status info placeholders.
    
    A critical error that force the IO slave thread to terminate is handled
    immediately (goto err).

ChangeSet@1.2512.47.1, 2008-02-20 17:26:50-03:00, davi@mysql.com +5 -0
  Bug#34587 Creating a view inside a stored procedure leads to a server crash
  
  The problem is that when a stored procedure is being parsed for
  the first execution, the body is copied to a temporary buffer
  which is disregarded sometime after the statement is parsed.
  And during this parsing phase, the rule for CREATE VIEW was
  holding a reference to the string being parsed for use during
  the execution of the CREATE VIEW statement, leading to invalid
  memory access later.
  
  The solution is to allocate and copy the SELECT of a CREATE
  VIEW statement using the thread memory root, which is set to
  the permanent arena of the stored procedure. 

  mysql-test/r/view.result@1.246.3.1, 2008-02-20 17:26:43-03:00, davi@mysql.com +10 -0
    Add test case result for Bug#34587

  mysql-test/t/view.test@1.213.1.1, 2008-02-20 17:26:43-03:00, davi@mysql.com +20 -0
    Add test case for Bug#34587

  sql/sql_lex.h@1.305, 2008-02-20 17:26:43-03:00, davi@mysql.com +2 -4
    Remove start and end position variables. The SELECT of a
    CREATE VIEW is now allocated at parse time.

  sql/sql_view.cc@1.161.1.1, 2008-02-20 17:26:43-03:00, davi@mysql.com +2 -6
    Remove assertion that is not true when the statement is
    being re-executed. Use string that was trimmed of leading
    and trailing whitespace at parse time.

  sql/sql_yacc.yy@1.611.1.10, 2008-02-20 17:26:44-03:00, davi@mysql.com +6 -2
    Allocate the SELECT of a CREATE VIEW using the current thread
    memory root and remove any leading and trailing whitespace.

ChangeSet@1.1810.3646.1, 2008-02-20 16:45:24-03:00, davi@mysql.com +2 -0
  Bug#32265 Server returns different metadata if prepared statement is used
  
  Executing a prepared statement associated with a materialized
  cursor yields to the client a metadata packet with wrong table
  and database names. The problem was occurring because the server
  was sending the the name of the temporary table used by the cursor
  instead of the table name of the original table. The same problem
  occurs when selecting from views, in which case the table name was
  being sent and not the name of the view.
    
  The solution is to fill the list item from the temporary table but
  preserving the table and database names of the original fields. This
  is achieved by tweaking the Select_materialize to accept a pointer to
  the Materialized_cursor class which contains the item list to be filled.

  sql/sql_cursor.cc@1.4.1.5, 2008-02-20 16:45:23-03:00, davi@mysql.com +76 -22
    Fill the item list in the send_fields method and preserve
    the table and database name of the fields.

  tests/mysql_client_test.c@1.167.1.78, 2008-02-20 16:45:23-03:00, davi@mysql.com +82 -0
    Add test case for Bug#32265

ChangeSet@1.2512.37.7, 2008-02-20 22:23:39+03:00, anozdrin@quad. +3 -0
  Fix for Bug#34337: Server crash when Altering a view using
  a table name.
  
  The problem was that fill_defined_view_parts() did not return
  an error if a table is going to be altered. That happened if
  the table was already in the table cache. In that case,
  open_table() returned non-NULL value (valid TABLE-instance from
  the cache).
  
  The fix is to ensure that an error is thrown even if the table
  is in the cache.

  mysql-test/r/view.result@1.246.2.2, 2008-02-20 22:23:38+03:00, anozdrin@quad. +15 -0
    Fix result file.

  mysql-test/t/view.test@1.214, 2008-02-20 22:23:38+03:00, anozdrin@quad. +28 -0
    Add a test case for Bug#34337: Server crash when Altering a view
    using a table name.

  sql/sql_view.cc@1.163, 2008-02-20 22:23:38+03:00, anozdrin@quad. +26 -3
    Report an error if we're going to work with a table.

ChangeSet@1.2512.15.17, 2008-02-20 16:59:03+02:00, jani@hynda.mysql.fi +3 -0
  Fixed a test.

  mysql-test/r/change_user.result@1.3.1.1, 2008-02-20 16:59:01+02:00, jani@hynda.mysql.fi +2 -2
    Replaced value in result file, it was dependend on architecture.

  mysql-test/t/change_user.test@1.2.1.1, 2008-02-20 16:59:01+02:00, jani@hynda.mysql.fi +5 -0
    Replaced an architecture dependend value in test

  sql/mysqld.cc@1.689, 2008-02-20 16:59:01+02:00, jani@hynda.mysql.fi +1 -5
    Can be made shorter and without ifdefs.

ChangeSet@1.1810.3644.1, 2008-02-20 17:41:39+03:00, evgen@moonbone.local +2 -0
  Bug#33266: Incorrect test case for the bug#31048 failing on some platforms.
  
  The test case for the bug#31048 checks that there is no crash on stack
  overrun. But due to different stack sizes on different platforms it failed
  on some of them.
  
  The new test case check that a query with at least 4 level subquery nesting
  works without the stack overrun nesting and other levels of nesting doesn't
  cause a crash.

  mysql-test/r/subselect.result@1.134.1.72, 2008-02-20 17:40:52+03:00, evgen@moonbone.local +31 -97
    Corrected test case for the bug#31048.

  mysql-test/t/subselect.test@1.129.1.35, 2008-02-20 17:40:40+03:00, evgen@moonbone.local +38 -86
    Corrected test case for the bug#31048.

ChangeSet@1.2512.43.5, 2008-02-20 15:22:14+01:00, sven@riska.(none) +2 -0
  Removed the unused function int THD::binlog_flush_transaction_cache()

  sql/log.cc@1.302.8.1, 2008-02-20 15:22:13+01:00, sven@riska.(none) +0 -29
    Removed the unused function int THD::binlog_flush_transaction_cache()

  sql/sql_class.h@1.418.1.1, 2008-02-20 15:22:13+01:00, sven@riska.(none) +0 -1
    Removed the unused function int THD::binlog_flush_transaction_cache()

ChangeSet@1.2512.43.4, 2008-02-20 14:52:21+01:00, sven@riska.(none) +1 -0
  WL#4078: Document binary format of binlog entries
  Minor update with corrections and notes on the binlog format.
  This only affects comments, not code.

  sql/log_event.h@1.173, 2008-02-20 14:52:20+01:00, sven@riska.(none) +26 -20
    Fixes in documentation of binlog format.

ChangeSet@1.2530.2.1, 2008-02-20 14:40:46+01:00, hhunger@hh-nb.hungers +8 -0
  Patch for bug#32664: event.test has timeout randomly. File is split into event_1.test and event_2.test.

  BitKeeper/deleted/.del-events.result@1.57, 2008-02-20 10:42:31+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/r/events.result

  BitKeeper/deleted/.del-events.test@1.55, 2008-02-20 10:40:50+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/t/events.test

  BitKeeper/etc/ignore@1.300.1.11, 2008-02-20 14:40:43+01:00, hhunger@hh-nb.hungers +1 -0
    Added mysql-test/reg.log to the ignore list

  mysql-test/r/events_1.result@1.1, 2008-02-20 14:40:43+01:00, hhunger@hh-nb.hungers +428 -0
    Patch for bug#32664: event.test has timeout randomly. File is split into event_1.test and event_2.test.

  mysql-test/r/events_1.result@1.0, 2008-02-20 14:40:43+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/r/events_2.result@1.1, 2008-02-20 14:40:43+01:00, hhunger@hh-nb.hungers +321 -0
    Patch for bug#32664: event.test has timeout randomly. File is split into event_1.test and event_2.test.

  mysql-test/r/events_2.result@1.0, 2008-02-20 14:40:43+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/t/disabled.def@1.293, 2008-02-20 14:40:43+01:00, hhunger@hh-nb.hungers +0 -1
    Patch for bug#32664: event.test has timeout randomly. File is split into event_1.test and event_2.test.

  mysql-test/t/events_1.test@1.1, 2008-02-20 14:40:43+01:00, hhunger@hh-nb.hungers +412 -0
    Patch for bug#32664: event.test has timeout randomly. File is split into event_1.test and event_2.test.

  mysql-test/t/events_1.test@1.0, 2008-02-20 14:40:43+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/t/events_2.test@1.1, 2008-02-20 14:40:43+01:00, hhunger@hh-nb.hungers +409 -0
    Patch for bug#32664: event.test has timeout randomly. File is split into event_1.test and event_2.test.

  mysql-test/t/events_2.test@1.0, 2008-02-20 14:40:43+01:00, hhunger@hh-nb.hungers +0 -0

ChangeSet@1.2512.5.18, 2008-02-20 12:52:04+01:00, tomas@poseidon.ndb.mysql.com +1 -0
  Upon the sql command flush logs, we need to ensure that all outstanding
  ndb data to be logged has made it to the binary log to get a deterministic
  behavior on the rotation of the log.

  sql/ha_ndbcluster_binlog.cc@1.141.2.1, 2008-02-20 12:52:00+01:00, tomas@poseidon.ndb.mysql.com +13 -0
    Upon the sql command flush logs, we need to ensure that all outstanding
    ndb data to be logged has made it to the binary log to get a deterministic
    behavior on the rotation of the log.

ChangeSet@1.2512.46.2, 2008-02-19 13:46:54-08:00, acurtis@xiphis.org +2 -0
  backport valgrind cleanups from 6.0-engines

  mysql-test/valgrind.supp@1.19, 2008-02-19 13:46:50-08:00, acurtis@xiphis.org +13 -0
    silence valgrind warning of memory leak in dlopen

  strings/strmake.c@1.12, 2008-02-19 13:46:50-08:00, acurtis@xiphis.org +3 -3
    silence valgrind warning cause by strlen examining unset bytes.

ChangeSet@1.2476.845.1, 2008-02-20 00:33:43+03:00, kaa@kaamos.(none) +11 -0
  Fix for bug #31236: Inconsistent division by zero behavior for 
                      floating point numbers
  
  Some math functions did not check if the result is a valid number
  (i.e. neither of +-inf or nan).
  
  Fixed by validating the result where necessary and returning NULL in
  case of invalid result.

  BitKeeper/deleted/.del-matherr.c@1.8, 2008-02-20 00:16:05+03:00, kaa@kaamos.(none) +0 -0
    Rename: sql/matherr.c -> BitKeeper/deleted/.del-matherr.c

  configure.in@1.457.34.1, 2008-02-20 00:33:42+03:00, kaa@kaamos.(none) +2 -2
    Removed DONT_USE_FINITE, it is not used anywhere.

  include/my_global.h@1.179.2.1, 2008-02-20 00:33:42+03:00, kaa@kaamos.(none) +7 -6
    isfinite() is a C99 macro which absoletes finite(). First try to use
    it, then fall back to finite() if the target platform has it,
    otherwise use our own implementation.

  mysql-test/r/func_math.result@1.45, 2008-02-20 00:33:42+03:00, kaa@kaamos.(none) +19 -0
    Added a test case for bug #31236.

  mysql-test/r/strict.result@1.55.1.1, 2008-02-20 00:33:42+03:00, kaa@kaamos.(none) +2 -3
    Fixed a test case which relied on old behavior.

  mysql-test/t/func_math.test@1.34, 2008-02-20 00:33:42+03:00, kaa@kaamos.(none) +13 -1
    Added a test case for bug #31236.

  mysql-test/t/strict.test@1.37, 2008-02-20 00:33:42+03:00, kaa@kaamos.(none) +0 -1
    Fixed a test case which relied on old behavior.

  sql/field.cc@1.430.2.1, 2008-02-20 00:33:42+03:00, kaa@kaamos.(none) +1 -3
    No need to check if the finite() or its equivalent is available.

  sql/item_func.cc@1.419.15.1, 2008-02-20 00:33:42+03:00, kaa@kaamos.(none) +11 -11
    Use fix_result() wherever the result can be one of +-inf or nan, 
    assuming the function arguments are valid numbers.
    Removed fix_result() from functions that are defined for all possible
    input numbers.

  sql/item_func.h@1.176.1.1, 2008-02-20 00:33:42+03:00, kaa@kaamos.(none) +7 -12
    Moved fix_result() from Item_dec_func to Item_func which is a common
    ancestor for Item_dec_func and Item_num_op.

  sql/unireg.h@1.57.2.1, 2008-02-20 00:33:42+03:00, kaa@kaamos.(none) +0 -1
    Removed POSTFIX_ERROR because no code returns it.

ChangeSet@1.2512.45.1, 2008-02-19 12:55:13-08:00, acurtis@xiphis.org +2 -0
  Bug#34598
    "crash on hpita: Invalid address alignment"
    Replace dangerous pointer arithmetic - it may occurr where sizeof(int) is
    less than size of machine alignment requirement.

  include/mysql/plugin.h@1.41.1.1, 2008-02-19 12:54:58-08:00, acurtis@xiphis.org +1 -1
    bug34598
      change of update func prototype

  sql/sql_plugin.cc@1.78.5.1, 2008-02-19 12:54:58-08:00, acurtis@xiphis.org +41 -15
    bug34598
      Avoid dangerous pointer arithmetic which can cause unaligned word access.
      Change of update function prototype

ChangeSet@1.2512.44.1, 2008-02-19 23:47:15+03:00, kostja@dipika.(none) +1 -0
  Fix a compilation failure of the community tree.

  sql/sql_profile.cc@1.18, 2008-02-19 23:47:13+03:00, kostja@dipika.(none) +1 -1
    Fix a compilation failure of the community tree.

ChangeSet@1.2512.43.3, 2008-02-19 19:59:48+01:00, mkindahl@dl145h.mysql.com +4 -0
  Removing deliberately generated errors for rpl_bug33931 test
  and moving test to replication suite.

  mysql-test/lib/mtr_report.pl@1.73.2.1, 2008-02-19 19:59:34+01:00, mkindahl@dl145h.mysql.com +5 -0
    Removing deliberately generated errors for rpl_bug33931 test.

  mysql-test/suite/rpl/r/rpl_bug33931.result@1.3, 2008-02-19 19:55:21+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: mysql-test/r/rpl_bug33931.result -> mysql-test/suite/rpl/r/rpl_bug33931.result

  mysql-test/suite/rpl/t/rpl_bug33931-slave.opt@1.2, 2008-02-19 19:55:14+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: mysql-test/t/rpl_bug33931-slave.opt -> mysql-test/suite/rpl/t/rpl_bug33931-slave.opt

  mysql-test/suite/rpl/t/rpl_bug33931.test@1.2, 2008-02-19 19:55:14+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: mysql-test/t/rpl_bug33931.test -> mysql-test/suite/rpl/t/rpl_bug33931.test

ChangeSet@1.2532, 2008-02-19 18:45:11+01:00, guilhem@gbichot4.local +5 -0
  fixes for build failures due to my yesterday's changeset forbidding
  bool in C.

  client/get_password.c@1.13, 2008-02-19 18:45:06+01:00, guilhem@gbichot4.local +1 -1
    fix for build failure

  include/thr_alarm.h@1.26, 2008-02-19 18:45:06+01:00, guilhem@gbichot4.local +1 -1
    fix for build failure

  libmysql/dll.c@1.13, 2008-02-19 18:45:06+01:00, guilhem@gbichot4.local +1 -1
    fix for build failure

  libmysql/get_password.c@1.17, 2008-02-19 18:45:06+01:00, guilhem@gbichot4.local +1 -1
    fix for build failure

  mysys/thr_alarm.c@1.66, 2008-02-19 18:45:06+01:00, guilhem@gbichot4.local +1 -1
    fix for build failure

ChangeSet@1.2530.1.1, 2008-02-19 09:44:09-07:00, tsmith@ramayana.hindu.god +24 -0
  Applied InnoDB snapshot innodb-5.1-ss2298
  
  Fixes the following bugs:
  
  - Bug #33349: possible race condition revolving around data dictionary and repartitioning
    Introduce retry/sleep logic as a workaround for a transient bug
    where ::open fails for partitioned tables randomly if we are using
    one file per table.
  
  - Bug #34053: normal users can enable innodb_monitor logging
    In CREATE TABLE and DROP TABLE check whether the table in question is one
    of the magic innodb_monitor tables and whether the user has enough rights
    to mess with it before doing anything else.
  
  - Bug #22868: 'Thread thrashing' with > 50 concurrent conns under an upd-intensive workloadw
  - Bug #29560: InnoDB >= 5.0.30 hangs on adaptive hash rw-lock 'waiting for an X-lock'
    This is a combination of changes that forward port the scalability fix applied to 5.0
    through r1001.
    It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
    scalability fix of 5.0)
    Then it applies r1001 to 5.0 which is the original scalability fix.
    Finally it applies r2082 which fixes an issue with the original fix.
  
  - Bug #30930: Add auxiliary function to retrieve THD::thread_id
    Add thd_get_thread_id() function.  Also make check_global_access() function
    visible to InnoDB under INNODB_COMPATIBILITY_HOOKS #define.

  include/mysql/plugin.h@1.42, 2008-02-18 19:11:25-07:00, tsmith@ramayana.hindu.god +10 -0
    Add thd_get_thread_id() accessor function

  mysql-test/r/innodb.result@1.211, 2008-02-18 19:11:25-07:00, tsmith@ramayana.hindu.god +15 -2
    Applied InnoDB snapshot innodb-5.1-ss2298
    
    Revision r2261:
    branches/5.1: Merge a change from MySQL AB:
    
    ChangeSet@2007-10-13 15:49:42+03:00, aelkin@koti.dsl.inet.fi
    
    Bug #29136 erred multi-delete on trans table does not rollback the statement
    
    innodb.test, innodb.result: trans table specific test added

  mysql-test/r/innodb_bug34053.result@1.1, 2008-02-18 19:11:26-07:00, tsmith@ramayana.hindu.god +1 -0
    Applied InnoDB snapshot innodb-5.1-ss2298
    
    Revision r2282:
    branches/5.1:
    
    Fix Bug#34053:
    * In CREATE TABLE and DROP TABLE check whether the table in question is one
      of the magic innodb_monitor tables and whether the user has enough rights
      to mess with it before doing anything else.
    * Implement a mysql-test testcase.
    
    Approved by:	Heikki

  mysql-test/r/innodb_bug34053.result@1.0, 2008-02-18 19:11:26-07:00, tsmith@ramayana.hindu.god +0 -0

  mysql-test/t/innodb.test@1.176, 2008-02-18 19:11:25-07:00, tsmith@ramayana.hindu.god +32 -0
    Applied InnoDB snapshot innodb-5.1-ss2298

  mysql-test/t/innodb_bug34053.test@1.1, 2008-02-18 19:11:26-07:00, tsmith@ramayana.hindu.god +49 -0
    Applied InnoDB snapshot innodb-5.1-ss2298
    
    Revision r2282:
    branches/5.1:
    
    Fix Bug#34053:
    * In CREATE TABLE and DROP TABLE check whether the table in question is one
      of the magic innodb_monitor tables and whether the user has enough rights
      to mess with it before doing anything else.
    * Implement a mysql-test testcase.
    
    Approved by:	Heikki

  mysql-test/t/innodb_bug34053.test@1.0, 2008-02-18 19:11:26-07:00, tsmith@ramayana.hindu.god +0 -0

  sql/mysql_priv.h@1.549.13.1, 2008-02-18 19:11:25-07:00, tsmith@ramayana.hindu.god +9 -1
    Make check_global_access() declaration available if when
    INNODB_COMPATIBILITY_HOOKS is defined.

  sql/sql_class.cc@1.352.6.1, 2008-02-18 19:11:25-07:00, tsmith@ramayana.hindu.god +12 -0
    Add thd_get_thread_id() accessor function.
    
    Add 'extern "C"' to definition for thd_get_xid().  Not strictly
    needed, but in keeping with our coding style.

  storage/innobase/btr/btr0cur.c@1.57, 2008-02-18 19:11:25-07:00, tsmith@ramayana.hindu.god +1 -1
    Applied InnoDB snapshot innodb-5.1-ss2298
    
    Revision r2295:
    branches/5.1:
    
    Merge r2294 from branches/5.0:
    
    Fix typo and add comma in comment.

  storage/innobase/handler/ha_innodb.cc@1.372, 2008-02-18 19:11:25-07:00, tsmith@ramayana.hindu.god +53 -16
    Applied InnoDB snapshot innodb-5.1-ss2298
    
    - But remove the declaration of check_global_access() from ha_innodb.cc,
      because it is now visible in mysql_priv.h under INNODB_COMPATIBILITY_HOOKS
    
    Revision r2270:
    branches/5.1:
    
    Rename the user visible parameter innodb-use-adaptive-hash-indexes to
    innodb-adaptive-hash-index so that it is in sync with MySQL 5.0.
    
    Suggested by:	Heikki
    Approved by:	Heikki
    
    
    Revision r2236:
    branches/5.1: bug#33349
    
    Introduce retry/sleep logic as a workaround for a transient bug
    where ::open fails for partitioned tables randomly if we are using
    one file per table.
    
    
    Reviewed by: Heikki
    
    
    Revision r2282:
    branches/5.1:
    
    Fix Bug#34053:
    * In CREATE TABLE and DROP TABLE check whether the table in question is one
      of the magic innodb_monitor tables and whether the user has enough rights
      to mess with it before doing anything else.
    * Implement a mysql-test testcase.
    
    Approved by:	Heikki
    
    
    Revision r2246:
    branches/5.1:
    
    Fix formatting of the autoinc-lock-mode command line parameter.
    
    Old view (./mysqld --help --verbose):
    
      --innodb-autoinc-lock-mode=#
                          The AUTOINC lock modes supported by InnoDB:
      0 => Old
                          style AUTOINC locking (for backward compatibility)
      1 =>
                          New style AUTOINC locking
      2 => No AUTOINC locking
                          (unsafe for SBR)
    
    New view:
    
      --innodb-autoinc-lock-mode=#
                          The AUTOINC lock modes supported by InnoDB:
                          0 => Old style AUTOINC locking (for backward
                          compatibility)
                          1 => New style AUTOINC locking
                          2 => No AUTOINC locking (unsafe for SBR)
    
    Looks like these strings are "automatically" wrapped by MySQL in the
    following way:
    * newlines (\n) in the string are ignored
    * newline separator (\n) is inserted every 57 or so characters.
    * lots of white space is appended to each inserted new line.
    
    Approved by:	Heikki

  storage/innobase/include/os0sync.h@1.18, 2008-02-18 19:11:26-07:00, tsmith@ramayana.hindu.god +32 -6
    Applied InnoDB snapshot innodb-5.1-ss2298
    
    Revision r2268:
    branches/5.1: Port of r2267
    
    This is a combination of changes that forward port the scalability fix applied to 5.0
    through r1001.
    It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
    scalability fix of 5.0)
    Then it applies r1001 to 5.0 which is the original scalability fix.
    Finally it applies r2082 which fixes an issue with the original fix.
    
    Reviewed by: Heikki

  storage/innobase/include/read0read.h@1.8, 2008-02-18 19:11:26-07:00, tsmith@ramayana.hindu.god +0 -4
    Applied InnoDB snapshot innodb-5.1-ss2298
    
    Revision r2188:
    branches/5.1: Remove unused field can_be_too_old from read_view_struct.

  storage/innobase/include/row0mysql.h@1.55, 2008-02-18 19:11:26-07:00, tsmith@ramayana.hindu.god +11 -1
    Applied InnoDB snapshot innodb-5.1-ss2298
    
    Revision r2282:
    branches/5.1:
    
    Fix Bug#34053:
    * In CREATE TABLE and DROP TABLE check whether the table in question is one
      of the magic innodb_monitor tables and whether the user has enough rights
      to mess with it before doing anything else.
    * Implement a mysql-test testcase.
    
    Approved by:	Heikki
    
    
    Revision r2272:
    branches/5.1:
    
    Fix typo in comment.

  storage/innobase/include/sync0arr.h@1.15, 2008-02-18 19:11:26-07:00, tsmith@ramayana.hindu.god +8 -13
    Applied InnoDB snapshot innodb-5.1-ss2298
    
    Revision r2268:
    branches/5.1: Port of r2267
    
    This is a combination of changes that forward port the scalability fix applied to 5.0
    through r1001.
    It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
    scalability fix of 5.0)
    Then it applies r1001 to 5.0 which is the original scalability fix.
    Finally it applies r2082 which fixes an issue with the original fix.
    
    Reviewed by: Heikki

  storage/innobase/include/sync0rw.h@1.27, 2008-02-18 19:11:26-07:00, tsmith@ramayana.hindu.god +12 -0
    Applied InnoDB snapshot innodb-5.1-ss2298
    
    Revision r2268:
    branches/5.1: Port of r2267
    
    This is a combination of changes that forward port the scalability fix applied to 5.0
    through r1001.
    It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
    scalability fix of 5.0)
    Then it applies r1001 to 5.0 which is the original scalability fix.
    Finally it applies r2082 which fixes an issue with the original fix.
    
    Reviewed by: Heikki

  storage/innobase/include/sync0rw.ic@1.24, 2008-02-18 19:11:26-07:00, tsmith@ramayana.hindu.god +10 -2
    Applied InnoDB snapshot innodb-5.1-ss2298
    
    Revision r2268:
    branches/5.1: Port of r2267
    
    This is a combination of changes that forward port the scalability fix applied to 5.0
    through r1001.
    It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
    scalability fix of 5.0)
    Then it applies r1001 to 5.0 which is the original scalability fix.
    Finally it applies r2082 which fixes an issue with the original fix.
    
    Reviewed by: Heikki

  storage/innobase/include/sync0sync.h@1.37, 2008-02-18 19:11:26-07:00, tsmith@ramayana.hindu.god +1 -0
    Applied InnoDB snapshot innodb-5.1-ss2298
    
    Revision r2268:
    branches/5.1: Port of r2267
    
    This is a combination of changes that forward port the scalability fix applied to 5.0
    through r1001.
    It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
    scalability fix of 5.0)
    Then it applies r1001 to 5.0 which is the original scalability fix.
    Finally it applies r2082 which fixes an issue with the original fix.
    
    Reviewed by: Heikki

  storage/innobase/include/sync0sync.ic@1.27, 2008-02-18 19:11:26-07:00, tsmith@ramayana.hindu.god +1 -1
    Applied InnoDB snapshot innodb-5.1-ss2298
    
    Revision r2268:
    branches/5.1: Port of r2267
    
    This is a combination of changes that forward port the scalability fix applied to 5.0
    through r1001.
    It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
    scalability fix of 5.0)
    Then it applies r1001 to 5.0 which is the original scalability fix.
    Finally it applies r2082 which fixes an issue with the original fix.
    
    Reviewed by: Heikki

  storage/innobase/os/os0sync.c@1.38, 2008-02-18 19:11:26-07:00, tsmith@ramayana.hindu.god +100 -11
    Applied InnoDB snapshot innodb-5.1-ss2298
    
    Revision r2268:
    branches/5.1: Port of r2267
    
    This is a combination of changes that forward port the scalability fix applied to 5.0
    through r1001.
    It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
    scalability fix of 5.0)
    Then it applies r1001 to 5.0 which is the original scalability fix.
    Finally it applies r2082 which fixes an issue with the original fix.
    
    Reviewed by: Heikki

  storage/innobase/read/read0read.c@1.14, 2008-02-18 19:11:26-07:00, tsmith@ramayana.hindu.god +0 -5
    Applied InnoDB snapshot innodb-5.1-ss2298
    
    Revision r2188:
    branches/5.1: Remove unused field can_be_too_old from read_view_struct.

  storage/innobase/row/row0mysql.c@1.146, 2008-02-18 19:11:26-07:00, tsmith@ramayana.hindu.god +46 -16
    Applied InnoDB snapshot innodb-5.1-ss2298
    
    Revision r2282:
    branches/5.1:
    
    Fix Bug#34053:
    * In CREATE TABLE and DROP TABLE check whether the table in question is one
      of the magic innodb_monitor tables and whether the user has enough rights
      to mess with it before doing anything else.
    * Implement a mysql-test testcase.
    
    Approved by:	Heikki
    
    
    Revision r2272:
    branches/5.1:
    
    Fix typo in comment.

  storage/innobase/srv/srv0srv.c@1.112, 2008-02-18 19:11:26-07:00, tsmith@ramayana.hindu.god +8 -8
    Applied InnoDB snapshot innodb-5.1-ss2298
    
    Revision r2268:
    branches/5.1: Port of r2267
    
    This is a combination of changes that forward port the scalability fix applied to 5.0
    through r1001.
    It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
    scalability fix of 5.0)
    Then it applies r1001 to 5.0 which is the original scalability fix.
    Finally it applies r2082 which fixes an issue with the original fix.
    
    Reviewed by: Heikki

  storage/innobase/sync/sync0arr.c@1.34, 2008-02-18 19:11:26-07:00, tsmith@ramayana.hindu.god +157 -235
    Applied InnoDB snapshot innodb-5.1-ss2298
    
    Revision r2268:
    branches/5.1: Port of r2267
    
    This is a combination of changes that forward port the scalability fix applied to 5.0
    through r1001.
    It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
    scalability fix of 5.0)
    Then it applies r1001 to 5.0 which is the original scalability fix.
    Finally it applies r2082 which fixes an issue with the original fix.
    
    Reviewed by: Heikki

  storage/innobase/sync/sync0rw.c@1.39, 2008-02-18 19:11:26-07:00, tsmith@ramayana.hindu.god +19 -1
    Applied InnoDB snapshot innodb-5.1-ss2298
    
    Revision r2268:
    branches/5.1: Port of r2267
    
    This is a combination of changes that forward port the scalability fix applied to 5.0
    through r1001.
    It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
    scalability fix of 5.0)
    Then it applies r1001 to 5.0 which is the original scalability fix.
    Finally it applies r2082 which fixes an issue with the original fix.
    
    Reviewed by: Heikki

  storage/innobase/sync/sync0sync.c@1.55, 2008-02-18 19:11:26-07:00, tsmith@ramayana.hindu.god +42 -9
    Applied InnoDB snapshot innodb-5.1-ss2298
    
    Revision r2268:
    branches/5.1: Port of r2267
    
    This is a combination of changes that forward port the scalability fix applied to 5.0
    through r1001.
    It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
    scalability fix of 5.0)
    Then it applies r1001 to 5.0 which is the original scalability fix.
    Finally it applies r2082 which fixes an issue with the original fix.
    
    Reviewed by: Heikki

ChangeSet@1.1810.3631.7, 2008-02-19 17:27:18+02:00, gkodinov@magare.gmz +4 -0
  Bug #30604: different flagging of time_zone_used in normal 
    and ps-protocol
  Finding a routine should be a transparent operation as 
  far as the binary log is concerned.
  But it was influencing the binary log because of the TIMESTAMP
  column in the proc table.
  
  Fixed by preserving and restoring the time_zone usage flag when
  searching for a stored routine in the proc table.

  mysql-test/r/binlog_innodb.result@1.1.1.1, 2008-02-19 17:27:17+02:00, gkodinov@magare.gmz +16 -0
    Bug #30604: test case

  mysql-test/t/binlog_innodb.test@1.1.1.1, 2008-02-19 17:27:17+02:00, gkodinov@magare.gmz +25 -0
    Bug #30604: test case

  mysql-test/r/ctype_cp932_binlog.result@1.2.6.1, 2008-02-19 17:27:17+02:00, gkodinov@magare.gmz +3 -3
    Bug #30604: updated test results (a procedure call before that)

  sql/sp.cc@1.82.1.56, 2008-02-19 17:27:17+02:00, gkodinov@magare.gmz +6 -0
    Bug #30604: finding a routine should be a transparent operation as 
    far as the binary log is concerned.
    Fixed by preserving and restoring the time_zone usage flag.

ChangeSet@1.1810.3609.8, 2008-02-19 18:16:17+04:00, svoj@mysql.com +3 -0
  BUG#34289 - Incorrect NAME_CONST substitution in stored procedures
              breaks replication
  
  NAME_CONST() didn't replicate constant character set and collation
  correctly.
  
  With this fix NAME_CONST() inherits collation from the value argument.

  mysql-test/r/func_misc.result@1.21.1.11, 2008-02-19 18:16:15+04:00, svoj@mysql.com +3 -0
    A test case for BUG#34289.

  mysql-test/t/func_misc.test@1.21.2.5, 2008-02-19 18:16:15+04:00, svoj@mysql.com +6 -0
    A test case for BUG#34289.

  sql/item.cc@1.113.106.2, 2008-02-19 18:16:15+04:00, svoj@mysql.com +1 -0
    Inherit collation from value argument.

ChangeSet@1.2512.41.2, 2008-02-19 14:25:26+01:00, vvaintroub@wva. +2 -0
  Post-merge fix

  sql/sql_connect.cc@1.20.1.1, 2008-02-19 14:25:24+01:00, vvaintroub@wva. +2 -17
    Post-merge fix

  sql/stacktrace.c@1.31.1.2, 2008-02-19 14:25:24+01:00, vvaintroub@wva. +1 -1
    Post-merge fix

ChangeSet@1.2512.37.4, 2008-02-19 15:58:08+03:00, kostja@dipika.(none) +17 -0
  Rename send_eof() to my_eof() for consistency with my_ok() and my_error()

  sql/events.cc@1.90, 2008-02-19 15:57:57+03:00, kostja@dipika.(none) +1 -1
    Rename send_eof() to my_eof() for consistency with my_ok() and my_error()

  sql/handler.cc@1.333.5.2, 2008-02-19 15:57:57+03:00, kostja@dipika.(none) +2 -2
    Rename send_eof() to my_eof() for consistency with my_ok() and my_error()

  sql/repl_failsafe.cc@1.81.1.2, 2008-02-19 15:57:57+03:00, kostja@dipika.(none) +2 -2
    Rename send_eof() to my_eof() for consistency with my_ok() and my_error()

  sql/slave.cc@1.339, 2008-02-19 15:57:57+03:00, kostja@dipika.(none) +1 -1
    Rename send_eof() to my_eof() for consistency with my_ok() and my_error()

  sql/sp.cc@1.177, 2008-02-19 15:57:58+03:00, kostja@dipika.(none) +1 -1
    Rename send_eof() to my_eof() for consistency with my_ok() and my_error()

  sql/sp_head.cc@1.305, 2008-02-19 15:57:58+03:00, kostja@dipika.(none) +2 -2
    Rename send_eof() to my_eof() for consistency with my_ok() and my_error()

  sql/sql_acl.cc@1.259.1.2, 2008-02-19 15:57:59+03:00, kostja@dipika.(none) +1 -1
    Rename send_eof() to my_eof() for consistency with my_ok() and my_error()

  sql/sql_class.cc@1.352.1.11, 2008-02-19 15:57:59+03:00, kostja@dipika.(none) +1 -1
    Rename send_eof() to my_eof() for consistency with my_ok() and my_error()

  sql/sql_class.h@1.421, 2008-02-19 15:57:59+03:00, kostja@dipika.(none) +3 -3
    Rename send_eof() to my_eof() for consistency with my_ok() and my_error()

  sql/sql_error.cc@1.48, 2008-02-19 15:57:59+03:00, kostja@dipika.(none) +1 -1
    Rename send_eof() to my_eof() for consistency with my_ok() and my_error()

  sql/sql_handler.cc@1.108, 2008-02-19 15:57:59+03:00, kostja@dipika.(none) +1 -1
    Rename send_eof() to my_eof() for consistency with my_ok() and my_error()

  sql/sql_help.cc@1.63, 2008-02-19 15:57:59+03:00, kostja@dipika.(none) +1 -1
    Rename send_eof() to my_eof() for consistency with my_ok() and my_error()

  sql/sql_parse.cc@1.713.5.4, 2008-02-19 15:58:00+03:00, kostja@dipika.(none) +4 -4
    Rename send_eof() to my_eof() for consistency with my_ok() and my_error()

  sql/sql_prepare.cc@1.242, 2008-02-19 15:58:00+03:00, kostja@dipika.(none) +1 -1
    Rename send_eof() to my_eof() for consistency with my_ok() and my_error()

  sql/sql_repl.cc@1.181, 2008-02-19 15:58:00+03:00, kostja@dipika.(none) +4 -4
    Rename send_eof() to my_eof() for consistency with my_ok() and my_error()

  sql/sql_show.cc@1.450.1.1, 2008-02-19 15:58:01+03:00, kostja@dipika.(none) +9 -9
    Rename send_eof() to my_eof() for consistency with my_ok() and my_error()

  sql/sql_table.cc@1.457.8.4, 2008-02-19 15:58:01+03:00, kostja@dipika.(none) +2 -2
    Rename send_eof() to my_eof() for consistency with my_ok() and my_error()

ChangeSet@1.2512.37.3, 2008-02-19 15:45:21+03:00, kostja@dipika.(none) +22 -0
  Rename send_ok to my_ok. Similarly to my_error, it only records the status,
  does not send it to the client.

  sql/protocol.cc@1.140, 2008-02-19 15:45:16+03:00, kostja@dipika.(none) +3 -5
    Rename send_ok to my_ok. Similarly to my_error, it only records the status,
    does not send it to the client.

  sql/repl_failsafe.cc@1.81.1.1, 2008-02-19 15:45:16+03:00, kostja@dipika.(none) +1 -1
    Rename send_ok to my_ok. Similarly to my_error, it only records the status,
    does not send it to the client.

  sql/sql_acl.cc@1.259.1.1, 2008-02-19 15:45:16+03:00, kostja@dipika.(none) +3 -3
    Rename send_ok to my_ok. Similarly to my_error, it only records the status,
    does not send it to the client.

  sql/sql_binlog.cc@1.22, 2008-02-19 15:45:16+03:00, kostja@dipika.(none) +1 -1
    Rename send_ok to my_ok. Similarly to my_error, it only records the status,
    does not send it to the client.

  sql/sql_class.cc@1.352.1.10, 2008-02-19 15:45:16+03:00, kostja@dipika.(none) +2 -2
    Rename send_ok to my_ok. Similarly to my_error, it only records the status,
    does not send it to the client.

  sql/sql_class.h@1.420, 2008-02-19 15:45:16+03:00, kostja@dipika.(none) +2 -2
    Rename send_ok to my_ok. Similarly to my_error, it only records the status,
    does not send it to the client.

  sql/sql_connect.cc@1.21, 2008-02-19 15:45:16+03:00, kostja@dipika.(none) +2 -2
    Rename send_ok to my_ok. Similarly to my_error, it only records the status,
    does not send it to the client.

  sql/sql_db.cc@1.168, 2008-02-19 15:45:16+03:00, kostja@dipika.(none) +5 -5
    Rename send_ok to my_ok. Similarly to my_error, it only records the status,
    does not send it to the client.

  sql/sql_delete.cc@1.237.1.2, 2008-02-19 15:45:16+03:00, kostja@dipika.(none) +6 -6
    Rename send_ok to my_ok. Similarly to my_error, it only records the status,
    does not send it to the client.

  sql/sql_do.cc@1.16, 2008-02-19 15:45:16+03:00, kostja@dipika.(none) +1 -1
    Rename send_ok to my_ok. Similarly to my_error, it only records the status,
    does not send it to the client.

  sql/sql_handler.cc@1.107, 2008-02-19 15:45:16+03:00, kostja@dipika.(none) +2 -2
    Rename send_ok to my_ok. Similarly to my_error, it only records the status,
    does not send it to the client.

  sql/sql_insert.cc@1.307, 2008-02-19 15:45:16+03:00, kostja@dipika.(none) +3 -3
    Rename send_ok to my_ok. Similarly to my_error, it only records the status,
    does not send it to the client.

  sql/sql_load.cc@1.135, 2008-02-19 15:45:17+03:00, kostja@dipika.(none) +1 -1
    Rename send_ok to my_ok. Similarly to my_error, it only records the status,
    does not send it to the client.

  sql/sql_parse.cc@1.713.5.3, 2008-02-19 15:45:17+03:00, kostja@dipika.(none) +54 -54
    Rename send_ok to my_ok. Similarly to my_error, it only records the status,
    does not send it to the client.

  sql/sql_partition.cc@1.125.3.2, 2008-02-19 15:45:17+03:00, kostja@dipika.(none) +1 -1
    Rename send_ok to my_ok. Similarly to my_error, it only records the status,
    does not send it to the client.

  sql/sql_prepare.cc@1.241, 2008-02-19 15:45:17+03:00, kostja@dipika.(none) +3 -3
    Rename send_ok to my_ok. Similarly to my_error, it only records the status,
    does not send it to the client.

  sql/sql_rename.cc@1.50, 2008-02-19 15:45:17+03:00, kostja@dipika.(none) +1 -1
    Rename send_ok to my_ok. Similarly to my_error, it only records the status,
    does not send it to the client.

  sql/sql_repl.cc@1.180, 2008-02-19 15:45:17+03:00, kostja@dipika.(none) +6 -6
    Rename send_ok to my_ok. Similarly to my_error, it only records the status,
    does not send it to the client.

  sql/sql_table.cc@1.457.8.3, 2008-02-19 15:45:17+03:00, kostja@dipika.(none) +5 -5
    Rename send_ok to my_ok. Similarly to my_error, it only records the status,
    does not send it to the client.

  sql/sql_trigger.cc@1.109, 2008-02-19 15:45:17+03:00, kostja@dipika.(none) +1 -1
    Rename send_ok to my_ok. Similarly to my_error, it only records the status,
    does not send it to the client.

  sql/sql_update.cc@1.247.2.2, 2008-02-19 15:45:17+03:00, kostja@dipika.(none) +4 -4
    Rename send_ok to my_ok. Similarly to my_error, it only records the status,
    does not send it to the client.

  sql/sql_view.cc@1.162, 2008-02-19 15:45:17+03:00, kostja@dipika.(none) +2 -2
    Rename send_ok to my_ok. Similarly to my_error, it only records the status,
    does not send it to the client.

ChangeSet@1.2512.40.1, 2008-02-19 14:43:01+03:00, kostja@dipika.(none) +27 -0
  A fix and a test case for Bug#12713 "Error in a stored function called from 
  a SELECT doesn't cause ROLLBACK of statem".
  
  The idea of the fix is to ensure that we always commit the current
  statement at the end of dispatch_command(). In order to not issue
  redundant disc syncs, an optimization of the two-phase commit
  protocol is implemented to bypass the two phase commit if
  the transaction is read-only.

  mysql-test/include/commit.inc@1.1, 2008-02-19 14:42:59+03:00, kostja@dipika.(none) +742 -0
    New BitKeeper file ``mysql-test/include/commit.inc''

  mysql-test/include/commit.inc@1.0, 2008-02-19 14:42:59+03:00, kostja@dipika.(none) +0 -0

  mysql-test/r/commit_1innodb.result@1.1, 2008-02-19 14:42:59+03:00, kostja@dipika.(none) +888 -0
    New BitKeeper file ``mysql-test/r/commit_1innodb.result''

  mysql-test/r/commit_1innodb.result@1.0, 2008-02-19 14:42:59+03:00, kostja@dipika.(none) +0 -0

  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result@1.25.2.1, 2008-02-19 14:42:57+03:00, kostja@dipika.(none) +1 -2
    Update test results.

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.51.2.1, 2008-02-19 14:42:57+03:00, kostja@dipika.(none) +1 -3
    Update test results.

  mysql-test/suite/rpl_ndb/t/disabled.def@1.16.2.1, 2008-02-19 14:42:58+03:00, kostja@dipika.(none) +2 -0
    Disable the tests, for which this changeset reveals a bug:
    the injector thread does not always add 'statement commit' to the
    rows injected in circular replication set up.
    To be investigated separately.

  mysql-test/t/commit_1innodb.test@1.1, 2008-02-19 14:42:59+03:00, kostja@dipika.(none) +6 -0
    New BitKeeper file ``mysql-test/t/commit_1innodb.test''

  mysql-test/t/commit_1innodb.test@1.0, 2008-02-19 14:42:59+03:00, kostja@dipika.(none) +0 -0

  sql/ha_ndbcluster_binlog.cc@1.140.2.1, 2008-02-19 14:42:58+03:00, kostja@dipika.(none) +1 -0
    Add close_thread_tables() to run_query: this ensures
    that all tables are closed and there is no pending statement transaction.

  sql/handler.cc@1.333.5.1, 2008-02-19 14:42:58+03:00, kostja@dipika.(none) +553 -62
    Implement optimisation of read-only transactions.
    If a transaction consists only of DML statements that do not change
    data, we do not perform a two-phase commit for it 
    (run one phase commit only).

  sql/handler.h@1.277.1.6, 2008-02-19 14:42:58+03:00, kostja@dipika.(none) +113 -9
    Implement optimisation of read-only transactions.
    If a transaction consists only of DML statements that do not change
    data, we do not perform a two-phase commit for it 
    (run one phase commit only).

  sql/log.cc@1.302.7.1, 2008-02-19 14:42:58+03:00, kostja@dipika.(none) +10 -0
    Mark the binlog transaction read-write whenever it's started.
    We never read from binlog, so it's safe and least intrusive to add
    this mark up here.

  sql/log_event.cc@1.284.3.1, 2008-02-19 14:42:58+03:00, kostja@dipika.(none) +1 -1
    Update to the new layout of thd->transaction.

  sql/rpl_injector.cc@1.12, 2008-02-19 14:42:58+03:00, kostja@dipika.(none) +20 -0
    Always commit statement transaction before committing the global one.

  sql/sp.cc@1.173.2.1, 2008-02-19 14:42:58+03:00, kostja@dipika.(none) +17 -3
    Ad comments.

  sql/sp_head.cc@1.304, 2008-02-19 14:42:58+03:00, kostja@dipika.(none) +1 -0
    Add comments.

  sql/sql_base.cc@1.438, 2008-02-19 14:42:58+03:00, kostja@dipika.(none) +28 -30
    Commit transaction at the end of the statement. Always.

  sql/sql_class.cc@1.352.7.1, 2008-02-19 14:42:58+03:00, kostja@dipika.(none) +2 -2
    Update thd_ha_data to return the right pointer in the new layout.
    
    Fix select_dumpvar::send_data to properly return operation status.
    A test case from commit.inc would lead to an assertion failure in the 
    diagnostics area (double assignment). Not test otherwise by the test suite.

  sql/sql_class.h@1.417.1.1, 2008-02-19 14:42:58+03:00, kostja@dipika.(none) +30 -2
    Implement a new layout of storage engine transaction info in which 
    it is easy to access all members related to the handlerton only
    based on ht->slot.

  sql/sql_cursor.cc@1.14, 2008-02-19 14:42:58+03:00, kostja@dipika.(none) +3 -2
    Update to the new layout of thd->transaction.

  sql/sql_delete.cc@1.237.1.1, 2008-02-19 14:42:58+03:00, kostja@dipika.(none) +17 -21
    Remove wrong and now redundant calls to ha_autocommit_or_rollback.
    The transaction is committed in one place, at the end of the statement.
    Remove calls to mysql_unlock_tables, since some engines count locks
    and commit statement transaction in unlock_tables(), which essentially
    equates mysql_unlock_tables to ha_autocommit_or_rollback.
    Previously it was necessary to unlock tables soon because we wanted
    to avoid sending of 'ok' packet to the client under locked tables.
    This is no longer necessary, since OK packet is also sent from one place
    at the end of transaction.

  sql/sql_do.cc@1.15, 2008-02-19 14:42:58+03:00, kostja@dipika.(none) +11 -1
    Add DO always clears the error, we must rollback the current
    statement before this happens. Otherwise the statement will be committed,
    and not rolled back in the end.

  sql/sql_insert.cc@1.306, 2008-02-19 14:42:58+03:00, kostja@dipika.(none) +15 -27
    Remove wrong and now redundant calls to ha_autocommit_or_rollback.
    The transaction is committed in one place, at the end of the statement.
    Remove calls to mysql_unlock_tables, since some engines count locks
    and commit statement transaction in unlock_tables(), which essentially
    equates mysql_unlock_tables to ha_autocommit_or_rollback.
    Previously it was necessary to unlock tables soon because we wanted
    to avoid sending of 'ok' packet to the client under locked tables.
    This is no longer necessary, since OK packet is also sent from one place
    at the end of transaction.

  sql/sql_load.cc@1.134, 2008-02-19 14:42:58+03:00, kostja@dipika.(none) +0 -10
    Remove wrong and now redundant calls to ha_autocommit_or_rollback.
    The transaction is committed in one place, at the end of the statement.
    Remove calls to mysql_unlock_tables, since some engines count locks
    and commit statement transaction in unlock_tables(), which essentially
    equates mysql_unlock_tables to ha_autocommit_or_rollback.
    Previously it was necessary to unlock tables soon because we wanted
    to avoid sending of 'ok' packet to the client under locked tables.
    This is no longer necessary, since OK packet is also sent from one place
    at the end of transaction.

  sql/sql_parse.cc@1.713.6.1, 2008-02-19 14:42:59+03:00, kostja@dipika.(none) +10 -17
    Implement optimisation of read-only transactions: bypass 2-phase
    commit for them.
    Always commit statement transaction before commiting the global one.
    Fix an unrelated crash in check_table_access, when called from 
    information_schema.

  sql/sql_partition.cc@1.125.3.1, 2008-02-19 14:42:59+03:00, kostja@dipika.(none) +21 -17
    Partitions commit at the end of a DDL operation.
    Make sure that send_ok() is done only if the commit has succeeded.

  sql/sql_table.cc@1.457.9.1, 2008-02-19 14:42:59+03:00, kostja@dipika.(none) +12 -9
    Use ha_autocommit_or_rollback and end_active_trans everywhere.
    Add end_trans to mysql_admin_table, so that it leaves no pending
    transaction.

  sql/sql_udf.cc@1.85, 2008-02-19 14:42:59+03:00, kostja@dipika.(none) +8 -1
    Remvove a redundant call to close_thread_tables()

  sql/sql_update.cc@1.247.2.1, 2008-02-19 14:42:59+03:00, kostja@dipika.(none) +1 -28
    Remove wrong and now redundant calls to ha_autocommit_or_rollback.
    The transaction is committed in one place, at the end of the statement.
    Remove calls to mysql_unlock_tables, since some engines count locks
    and commit statement transaction in unlock_tables(), which essentially
    equates mysql_unlock_tables to ha_autocommit_or_rollback.
    Previously it was necessary to unlock tables soon because we wanted
    to avoid sending of 'ok' packet to the client under locked tables.
    This is no longer necessary, since OK packet is also sent from one place
    at the end of transaction.

ChangeSet@1.1810.3643.1, 2008-02-19 12:37:39+01:00, vvaintroub@wva. +5 -0
  Bug#31745 - crash handler does not work on Windows
  - Replace per-thread signal()'s with  SetUnhandledExceptionFilter(). 
    The only remaining signal() is for SIGABRT (default abort()
    handler in VS2005 is broken, i.e removes user exception filter)
  - remove MessageBox()'es  from error handling code
  - Windows port for print_stacktrace() and write_core() 
  - Cleanup, removed some unused functions

  sql/CMakeLists.txt@1.1.12.4, 2008-02-19 12:37:35+01:00, vvaintroub@wva. +1 -1
    Implement stack tracing on and generating crash dumps on Windows

  sql/mysqld.cc@1.439.146.1, 2008-02-19 12:37:35+01:00, vvaintroub@wva. +178 -47
    Correct signal handling on Windows. 
    - For console events, like CTRL-C use SetConsoleCtrlHandler
    - For exceptions like access violation, use SetUnhandledExceptionFilter
    - For SIGABRT generate exception via __debugbreak() intrinsic
      if built with VS2005 and later , since default SIGABRT handler 
      replaces unhandled exception filter specified by user
    - make provisions to debug exception filter, as it is not trivial 
    (should be compiled with /DDEBUG_UNHANDLED_EXCEPTION_FILTER)
    
     

  sql/sql_parse.cc@1.426.172.1, 2008-02-19 12:37:36+01:00, vvaintroub@wva. +2 -17
    Remove message box from windows signal handler.
    The only thread specific handler left is for SIGABRT,
    which is broken on VS2005 and later (user specified unhandled exception 
    filter gets overwritten)

  sql/stacktrace.c@1.18.1.7, 2008-02-19 12:37:37+01:00, vvaintroub@wva. +270 -5
    Stack tracing and generating crash dumps on Windows

  sql/stacktrace.h@1.4.1.4, 2008-02-19 12:37:37+01:00, vvaintroub@wva. +18 -5
    Implement print_stacktrace and write_core on Windows

ChangeSet@1.2512.39.1, 2008-02-18 23:29:39+01:00, guilhem@gbichot4.local +28 -0
  Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>
  value" error even though the value was correct): a C function in my_getopt.c
  was taking bool* in parameter and was called from C++ sql_plugin.cc,
  but on some Mac OS X sizeof(bool) is 1 in C and 4 in C++, giving funny
  mismatches. Fixed, all other occurences of bool in C are removed, future
  ones are blocked by a "C-bool-catcher" in my_global.h (use my_bool).

  client/mysqldump.c@1.302.1.1, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +1 -1
    my_bool for C

  client/mysqltest.c@1.320.8.1, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +4 -4
    my_bool for C

  extra/replace.c@1.26, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +1 -1
    my_bool for C

  include/my_getopt.h@1.27, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +3 -2
    my_bool for C

  include/my_global.h@1.179.1.3, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +4 -0
    Prevent people from using bool in C, it causes real bugs.

  include/my_sys.h@1.235.2.1, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +6 -6
    my_bool for C

  include/my_time.h@1.36, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +1 -1
    my_bool for C

  include/thr_lock.h@1.23, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +1 -1
    my_bool for C

  libmysql/libmysql.c@1.305.1.1, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +2 -2
    my_bool for C

  mysys/charset.c@1.159, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +6 -6
    my_bool for C

  mysys/my_getopt.c@1.81, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +4 -4
    my_bool for C

  mysys/queues.c@1.23, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +1 -1
    my_bool for C

  mysys/thr_lock.c@1.62.1.1, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +3 -3
    my_bool for C

  regex/reginit.c@1.10, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +1 -1
    my_bool for C

  sql/set_var.cc@1.267.2.1, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +6 -6
    C functions use my_bool so we must use my_bool too.

  sql/sql_plugin.cc@1.78.3.1, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +3 -4
    C functions use my_bool so we must use my_bool too.
    This fixes a real observed bug of Maria, because on some Mac OS X,
    sizeof(bool) is 1 in C and 4 in C++, so the bool* does wrong.
    Removing useless line.

  storage/heap/hp_update.c@1.16, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +1 -1
    my_bool for C

  storage/myisam/mi_check.c@1.163.1.9, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +1 -1
    my_bool for C

  storage/myisam/mi_dynrec.c@1.61.2.1, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +1 -1
    my_bool for C

  storage/myisam/mi_search.c@1.69, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +1 -1
    my_bool for C

  storage/myisam/mi_update.c@1.30, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +1 -1
    my_bool for C

  storage/myisam/mi_write.c@1.70.1.2, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +6 -6
    my_bool for C

  storage/myisam/myisamdef.h@1.102.1.1, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +1 -1
    my_bool for C

  storage/myisam/myisamlog.c@1.39, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +3 -3
    my_bool for C

  storage/myisam/myisampack.c@1.66.1.2, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +2 -2
    my_bool for C

  tests/mysql_client_test.c@1.262, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +5 -5
    my_bool for C

  unittest/mysys/bitmap-t.c@1.7, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +11 -11
    my_bool for C

  vio/viosslfactories.c@1.42, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +2 -2
    my_bool for C

ChangeSet@1.1810.3642.1, 2008-02-18 12:03:39-07:00, tsmith@ramayana.hindu.god +1 -0
  Bug #28555  Upgrading MySQL Fails to shut down old server and kills socket file
  
  Check for an existing MySQL server package from a different vendor or
  major MySQL version.  In such a case, refuse to install the server and
  recommend how to safely remove the old packages before installing the
  new ones.

  support-files/mysql.spec.sh@1.99.18.3, 2008-02-18 12:03:38-07:00, tsmith@ramayana.hindu.god +73 -1
    Add to the %pre server scriptlet checks to ensure that we're not
    upgrading from another vendor's package, or that this is not a
    major version upgrade.  If an automatic upgrade isn't safe, print
    basic instructions on how to do a manual upgrade, and bail out.

ChangeSet@1.1810.3641.1, 2008-02-18 11:48:33-07:00, tsmith@ramayana.hindu.god +1 -0
  Bug #28460  mysqlhotcopy silently skips a database with two alphanumerics name
  
  Remove code from mysqlhotcopy which deals with the so-called "RAID"
  feature of older MyISAM.

  scripts/mysqlhotcopy.sh@1.53.1.1, 2008-02-18 11:48:31-07:00, tsmith@ramayana.hindu.god +24 -75
    Remove code which tried to handle the so-called "RAID" files.
    
    The "RAID" feature has been dropped from MySQL builds, and this
    code caused mysqlhotcopy to skip (silently) over databases with
    two-character names (e.g., "ab").

ChangeSet@1.2512.15.16, 2008-02-18 18:29:07+02:00, jani@hynda.mysql.fi +1 -0
  Added a missing cast.

  mysys/my_getsystime.c@1.14, 2008-02-18 18:29:06+02:00, jani@hynda.mysql.fi +1 -1
    Added a missing cast.

ChangeSet@1.2512.38.1, 2008-02-18 18:21:14+02:00, gkodinov@magare.gmz +2 -0
  Fixed duplicate defition warning for bug 31887

  sql/item.cc@1.302.1.5, 2008-02-18 18:21:11+02:00, gkodinov@magare.gmz +1 -0
    Fixed duplicate defition warning for bug 31887

  sql/mysql_priv.h@1.549.10.5, 2008-02-18 18:21:12+02:00, gkodinov@magare.gmz +0 -1
    Fixed duplicate defition warning for bug 31887

ChangeSet@1.2512.35.1, 2008-02-18 15:48:17+01:00, sven@riska.(none) +1 -0
  Fixed broken result file.

  mysql-test/suite/bugs/r/rpl_bug31583.result@1.2, 2008-02-18 15:48:16+01:00, sven@riska.(none) +1 -0
    Fixed broken result file.

ChangeSet@1.2512.15.15, 2008-02-18 16:47:00+02:00, jani@hynda.mysql.fi +4 -0
  Fixed a previous patch.

  BitKeeper/etc/ignore@1.306, 2008-02-18 16:45:46+02:00, jani@hynda.mysql.fi +1 -0
    added libmysqld/sql_profile.cc

  client/mysqltest.c@1.326, 2008-02-18 16:46:59+02:00, jani@hynda.mysql.fi +1 -1
    Use my_micro_time() instead of my_getsystime() for
    faster execution.

  include/config-win.h@1.104, 2008-02-18 16:46:59+02:00, jani@hynda.mysql.fi +3 -1
    Moved a definition into a header file.

  mysys/my_getsystime.c@1.13, 2008-02-18 16:46:59+02:00, jani@hynda.mysql.fi +10 -24
    Use GetSystemTimeAsFileTime() instead of QueryPerformanceCounter()
    for faster execution.

ChangeSet@1.2512.25.6, 2008-02-18 15:16:39+01:00, mkindahl@dl145h.mysql.com +3 -0
  Updating result files.

  mysql-test/r/multi_update.result@1.56, 2008-02-18 15:16:22+01:00, mkindahl@dl145h.mysql.com +2 -2
    Result change.

  mysql-test/suite/ndb/r/ndb_binlog_format.result@1.4, 2008-02-18 15:16:28+01:00, mkindahl@dl145h.mysql.com +0 -2
    Result change.

  mysql-test/r/rpl_bug33931.result@1.2, 2008-02-18 15:16:28+01:00, mkindahl@dl145h.mysql.com +5 -0
    Result change.

ChangeSet@1.2512.30.2, 2008-02-18 14:46:47+01:00, kent@mysql.com +1 -0
  CMakeLists.txt:
    Missing "sql_profile.cc" was added

  libmysqld/CMakeLists.txt@1.19, 2008-02-18 14:46:28+01:00, kent@mysql.com +1 -1
    Missing "sql_profile.cc" was added

ChangeSet@1.2512.34.6, 2008-02-18 14:35:44+03:00, kaa@kaamos.(none) +1 -0
  Initialization order cleanups to get rid of warnings from the 
  -Wreorder option added by the patch for bug#31326.

  sql/rpl_rli.cc@1.20, 2008-02-18 14:35:42+03:00, kaa@kaamos.(none) +3 -3
    Initialization order cleanups to get rid of warnings from the 
    -Wreorder option added by the patch for bug#31326.

ChangeSet@1.2512.34.2, 2008-02-17 15:07:41+03:00, kaa@kaamos.(none) +1 -0
  Post-merge fix.

  mysql-test/t/sp.test@1.271, 2008-02-17 15:07:40+03:00, kaa@kaamos.(none) +19 -19
    Post-merge fix.

ChangeSet@1.1810.3640.1, 2008-02-17 15:48:17+04:00, holyfoot@mysql.com +3 -0
  Bug #32942 now() - interval '7200' second NOT pre-calculated, causing "full table scan"
  
  Problem is not about intervals and doesn't actually cause 'full table scan'.
  We have an optimization for DISTINCT when we have
  'DISTINCT field_from_first_join_table' we don't need to read all the
  rows from the JOIN-ed table if we found one conforming row.
  It stopped working in 5.0 as we return NESTED_LOOP_OK if we came upon
  that case in the evaluate_join_record() and that doesn't break the
  recordreading loop in sub_select().
  
  Fixed by returning NESTED_LOOP_NO_MORE_ROWS in this case.

  mysql-test/r/select.result@1.121.17.1, 2008-02-17 15:48:15+04:00, holyfoot@mysql.com +21 -0
    Bug #32942 now() - interval '7200' second is NOT pre-calculated, causing "full table scan".
    
    test result

  mysql-test/t/select.test@1.102.15.1, 2008-02-17 15:48:15+04:00, holyfoot@mysql.com +18 -0
    Bug #32942 now() - interval '7200' second is NOT pre-calculated, causing "full table scan"
    
    test case

  sql/sql_select.cc@1.312.194.1, 2008-02-17 15:48:15+04:00, holyfoot@mysql.com +1 -1
    Bug #32942 now() - interval '7200' second NOT pre-calculated, causing "full table scan"
    
    return NESTED_LOOP_NO_MORE_ROWS when we don't need to read rows from
    this table anymore

ChangeSet@1.2476.841.10, 2008-02-16 11:11:13+02:00, gkodinov@magare.gmz +1 -0
  merge of bug 31887 5.0-opt->5.1-opt

  mysql-test/r/compare.result@1.14, 2008-02-16 11:11:11+02:00, gkodinov@magare.gmz +5 -5
    merge of bug 31887 5.0-opt->5.1-opt

ChangeSet@1.1810.3533.2, 2008-02-15 15:47:32+02:00, gkodinov@magare.gmz +4 -0
  Bug #31887: DML Select statement not returning same results 
  when executed in version 5
  
  Zero fill is a field attribute only. So we can't always 
  propagate  constants for zerofill fields : the values and 
  expression results don't have that flag.
  
  Fixed by converting the const value to a string and 
  using that in const propagation when the context allows it. 
  Disable const propagation for fields with ZEROFILL flag in
  all the other cases.

  mysql-test/r/compare.result@1.13, 2008-02-15 15:47:31+02:00, gkodinov@magare.gmz +38 -0
    Bug #31887: test case

  mysql-test/t/compare.test@1.11, 2008-02-15 15:47:31+02:00, gkodinov@magare.gmz +31 -0
    Bug #31887: test case

  sql/item.cc@1.113.108.1, 2008-02-15 15:47:31+02:00, gkodinov@magare.gmz +31 -0
    Bug #31887: If the context allows conversion
    of an int constant to a zero-filled string constant
    put the string constant instead of the int constant
    when doing const propagation

  sql/mysql_priv.h@1.290.133.1, 2008-02-15 15:47:32+02:00, gkodinov@magare.gmz +1 -0
    Bug #31887: a macro to get all the Field_num
    descendant fields.

ChangeSet@1.2512.33.1, 2008-02-15 12:54:04+00:00, sven@riska.(none) +5 -0
  Problem: After I moved rpl/t/rpl_variables.test into t/variables.test,
  t/variables.test fails on embedded server. Moved out that part again, to
  a new test called t/variables-notembedded.test.

  mysql-test/r/variables-notembedded.result@1.2, 2008-02-15 12:54:02+00:00, sven@riska.(none) +1 -1
    Add -master.opt file to have a list of variables for slave_skip_errors.

  mysql-test/r/variables-notembedded.result@1.1, 2008-02-15 11:28:46+00:00, sven@riska.(none) +17 -0
    BitKeeper file /home/sven/bk/debug-max/5.1-new-rpl/mysql-test/r/variables-notembedded.result

  mysql-test/r/variables-notembedded.result@1.0, 2008-02-15 11:28:46+00:00, sven@riska.(none) +0 -0

  mysql-test/r/variables.result@1.110.1.2, 2008-02-15 12:54:02+00:00, sven@riska.(none) +0 -14
    Variable variables not available in embedded mode to a new test,
    variables-notembedded.test

  mysql-test/t/variables-notembedded-master.opt@1.5, 2008-02-15 12:54:02+00:00, sven@riska.(none) +1 -1
    Add --loose before --slave-skip-errors, so that it works if mtr is run
    with --embedded

  mysql-test/t/variables-notembedded-master.opt@1.4, 2008-02-15 11:45:21+00:00, sven@riska.(none) +0 -0
    Rename: mysql-test/t/variables-master.opt -> mysql-test/t/variables-notembedded-master.opt

  mysql-test/t/variables-notembedded.test@1.1, 2008-02-15 11:28:46+00:00, sven@riska.(none) +30 -0
    BitKeeper file /home/sven/bk/debug-max/5.1-new-rpl/mysql-test/t/variables-notembedded.test

  mysql-test/t/variables-notembedded.test@1.0, 2008-02-15 11:28:46+00:00, sven@riska.(none) +0 -0

  mysql-test/t/variables.test@1.88.1.2, 2008-02-15 12:54:02+00:00, sven@riska.(none) +0 -19
    Variable variables not available in embedded mode to a new test,
    variables-notembedded.test. Result file updated accordingly.

ChangeSet@1.2512.32.2, 2008-02-15 13:06:28+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Bug #34458  	Extreneous use of templates in server code
  
  Patch to remove white-space left over after removing anonymous
  namespace.

  sql/handler.cc@1.333.3.2, 2008-02-15 13:06:23+01:00, mats@kindahl-laptop.dnsalias.net +87 -86
    Removing indentation and whitespace.

ChangeSet@1.1810.3639.1, 2008-02-15 16:03:54+04:00, ramil@mysql.com +1 -0
  Fix for bug #33304: Test 'func_group' hangs on Mac OS X 10.4 PowerPC 64-bit
  
  Problem: SLEEP(0) never returns on 64-bit Mac OS X due to a bug in 
  pthread_cond_timedwait().
  
  Fix: when given a very short timeout just return immediately.

  sql/item_func.cc@1.270.93.1, 2008-02-15 16:03:53+04:00, ramil@mysql.com +12 -0
    Fix for bug #33304: Test 'func_group' hangs on Mac OS X 10.4 PowerPC 64-bit
    
    - if given a very short timeout (< 10 mcs) just return from SLEEP().

ChangeSet@1.2512.32.1, 2008-02-15 12:56:44+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Bug #34458  	Extreneous use of templates in server code
  
  Replacing a template function with a normal static function.
  The template parameter, which previously was the class to
  find a binlogging function in, is now passed as a pointer to
  the actual binlogging function instead.
  
  The patch requires change of indention, but that is submitted
  as a separate patch.

  sql/handler.cc@1.333.3.1, 2008-02-15 12:56:40+01:00, mats@kindahl-laptop.dnsalias.net +21 -41
    Replacing template function with a normal static function.

ChangeSet@1.2512.29.7, 2008-02-15 14:14:09+03:00, anozdrin@quad. +2 -0
  Add a test case for Bug#21704: Renaming column does not update
  FK definition.

  mysql-test/include/mix1.inc@1.64.1.1, 2008-02-15 14:14:07+03:00, anozdrin@quad. +29 -0
    Add a test case for Bug#21704: Renaming column does not update
    FK definition.

  mysql-test/r/innodb_mysql.result@1.70, 2008-02-15 14:14:07+03:00, anozdrin@quad. +13 -0
    Updated result file.

ChangeSet@1.2512.15.13, 2008-02-15 10:24:13+01:00, mkindahl@dl145h.mysql.com +1 -0
  Adding waits to events_scheduling to prevent the test from
  failing on heavily loaded systems.

  mysql-test/t/events_scheduling.test@1.19, 2008-02-15 10:24:02+01:00, mkindahl@dl145h.mysql.com +12 -1
    Adding waits before statements since the scheduler is unpredictable
    on loaded systems and might be delayed.

ChangeSet@1.2512.29.6, 2008-02-14 18:13:40+03:00, anozdrin@quad. +3 -0
  A patch for Bug#18834: ALTER TABLE ADD INDEX on table with
  two timestamp fields.
    
  The actual problem here was that CREATE TABLE allowed zero
  date as a default value for a TIMESTAMP column in NO_ZERO_DATE mode.
    
  The thing is that for TIMESTAMP date type specific rule is applied:
    column_name TIMESTAMP == column_name TIMESTAMP DEFAULT 0
  whever for any other date data type
    column_name TYPE == column_name TYPE DEFAULT NULL
    
  The fix is to raise an error when we're in NO_ZERO_DATE mode and
  there is TIMESTAMP column w/o default value.

  mysql-test/r/create.result@1.159.1.3, 2008-02-14 18:13:38+03:00, anozdrin@quad. +44 -0
    Update result file.

  mysql-test/t/create.test@1.109.1.3, 2008-02-14 18:13:38+03:00, anozdrin@quad. +64 -0
    Test case for Bug#18834: ALTER TABLE ADD INDEX on table with
    two timestamp fields.

  sql/sql_table.cc@1.457.8.1, 2008-02-14 18:13:38+03:00, anozdrin@quad. +31 -0
    Report an error if NO_ZERO_MODE is set and we have zero date
    as a default.

ChangeSet@1.1810.3638.1, 2008-02-14 16:28:32+02:00, aelkin@mysql1000.dsl.inet.fi +2 -0
  bug#33329 extraneous ROLLBACK in binlog on connection does not use trans tables
  
  changes for an assert and an updated results file.

  mysql-test/r/mix_innodb_myisam_binlog.result@1.24.16.1, 2008-02-14 16:28:30+02:00, aelkin@mysql1000.dsl.inet.fi +1 -1
    results file changed as there is no ROLLBACK query in binlog as it must be.

  sql/sql_update.cc@1.154.38.13, 2008-02-14 16:28:31+02:00, aelkin@mysql1000.dsl.inet.fi +1 -1
    refining assert as the initial value of transactional_tables has been
    changed to zero.

ChangeSet@1.2512.1.6, 2008-02-14 18:23:58+04:00, svoj@mysql.com +1 -0
  After merge fix.

  storage/federated/ha_federated.cc@1.116, 2008-02-14 18:23:55+04:00, svoj@mysql.com +3 -3
    After merge fix.

ChangeSet@1.2476.841.8, 2008-02-14 16:33:11+03:00, kaa@kaamos.(none) +1 -0
  Post-merge fix after merging the patch for bug#31590 to 5.1:
  suppress the "Out of sort memory" error in the error log.

  mysql-test/lib/mtr_report.pl@1.67.2.1, 2008-02-14 16:33:10+03:00, kaa@kaamos.(none) +4 -1
    Post-merge fix after merging the patch for bug#31590 to 5.1:
    suppress the "Out of sort memory" error in the error log.

ChangeSet@1.2522.2.1, 2008-02-14 08:17:47-05:00, pcrews@pcrews-mac-local.local +2 -0
  Bug#34468 - csv_not_null fails
  Altered test to expect error on UPDATE SET <not_null_col> = NULL instead
  of expecting warning and re-recorded .result file.

  mysql-test/r/csv_not_null.result@1.3, 2008-02-14 08:17:46-05:00, pcrews@pcrews-mac-local.local +2 -6
    Bug#34468 - csv_not_null fails
    Altered test to expect error on UPDATE SET <not_null_col> = NULL instead
    of expecting warning and re-recorded .result file.  New results file passes

  mysql-test/t/csv_not_null.test@1.3, 2008-02-14 08:17:46-05:00, pcrews@pcrews-mac-local.local +5 -9
    Bug#34468 - csv_not_null fails
    Altered test to expect error on UPDATE SET <not_null_col> = NULL instead
    of expecting warning and re-recorded .result file.  Also cleaned up comments

ChangeSet@1.1810.3634.2, 2008-02-14 16:27:01+04:00, svoj@mysql.com +3 -0
  BUG#33946 - Join on Federated tables with Unique index gives error 1430
              from storage engine
  
  Federated may crash a server, return wrong result set, return
  "ERROR 1030 (HY000): Got error 1430 from storage engine" message
  when local (engine=federated) table has a key against nullable
  column.
  
  The problem was wrong implementation of function that creates
  WHERE clause for remote query from key.

  mysql-test/r/federated.result@1.25.11.4, 2008-02-14 16:26:58+04:00, svoj@mysql.com +24 -0
    A test case for BUG#33946.

  mysql-test/t/federated.test@1.19.9.4, 2008-02-14 16:26:58+04:00, svoj@mysql.com +21 -0
    A test case for BUG#33946.

  sql/ha_federated.cc@1.24.33.1, 2008-02-14 16:26:58+04:00, svoj@mysql.com +19 -3
    Fixed that federated adds " IS NULL " condition to a remote query,
    whereas "IS NOT NULL" requested by original query.
    
    Fixed that federated didn't check for end of key buffer, didn't
    setup key buffer pointer and remaining lenght of key buffer,
    didn't add " AND " between conditions in case original query
    has IS [NOT] NULL condition against nullable column.
    
    Fixed that federated wrongly shifts key buffer pointer by extra
    one byte when key part may be null (was: store_length + 1,
    now: store_length).

ChangeSet@1.2512.15.12, 2008-02-14 10:53:12+01:00, mkindahl@dl145h.mysql.com +2 -0
  Fixing test rpl_events to not give false failures.

  mysql-test/suite/rpl/r/rpl_events.result@1.10, 2008-02-14 10:52:59+01:00, mkindahl@dl145h.mysql.com +3 -1
    Result change.

  mysql-test/suite/rpl/t/rpl_events.test@1.4, 2008-02-14 10:53:04+01:00, mkindahl@dl145h.mysql.com +9 -1
    Replacing table with varying contents with a fresh table to avoid
    test problems. The contents of the event is unimportant for this
    part of the test.

ChangeSet@1.2512.15.11, 2008-02-14 09:53:01+01:00, mkindahl@dl145h.mysql.com +1 -0
  Fixes to try to handle valgrind warnings identical to those in
  BUG#24387, which is closed since long.

  sql/mysqld.cc@1.682.1.8, 2008-02-14 09:52:52+01:00, mkindahl@dl145h.mysql.com +1 -1
    Moving my_thread_end() to before pthread_cond_broadcast() since
    it might cause other threads to start using resources that are
    about to be released, or tries to proceed assuming that the
    resources have already been released.

ChangeSet@1.1810.3623.3, 2008-02-14 01:05:25-07:00, tsmith@ramayana.hindu.god +1 -0
  Bug #21158 mysql_config doesn't include -lmygcc
  
  Add -lmygcc to mysql_config output for libs, libs_r, and embedded_libs.
  
  Required when linking against our static libs, if yassl is used, and gcc
  used to build library is significantly different from that which is using
  the library.

  scripts/mysql_config.sh@1.29.1.1, 2008-02-14 01:05:23-07:00, tsmith@ramayana.hindu.god +11 -0
    Add -lmygcc to --libs, --libs_r, and --embedded-libs output, if libmygcc.a
    is found in the pkglibdir.
    
    This works around a problem when linking against the static client
    libs which were built with a different GCC than the current compiler.
    In this case, without -lmygcc, several builtin functions (e.g.,
    __pure_virtual, __builtin_delete) are left undefined.  Currently it
    is yassl which pulls in these symbols.
    
    This isn't a problem when linking against shared libraries, or when
    using the same compiler version.
    
    Currently it shows up with libs built on build.mysql.com with gcc 2.95.3,
    when using them on more recent systems.
    
    
    Also strip the -mcpu, -mtune, and -march cflags.  The calling package can
    determine what optimization parameters to choose.

ChangeSet@1.2512.5.16, 2008-02-14 00:02:25+01:00, tomas@poseidon.bredbandsbolaget.se +3 -0
  correct merge error

  mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test@1.3, 2008-02-14 00:02:22+01:00, tomas@poseidon.bredbandsbolaget.se +1 -1
    correct merge error

  mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result@1.5, 2008-02-14 00:02:22+01:00, tomas@poseidon.bredbandsbolaget.se +1 -1
    correct merge error

  mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result@1.9, 2008-02-14 00:02:23+01:00, tomas@poseidon.bredbandsbolaget.se +1 -1
    correct merge error

ChangeSet@1.2512.5.15, 2008-02-13 23:10:47+01:00, tomas@poseidon.bredbandsbolaget.se +1 -0
  correct manual merge

  mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result@1.8, 2008-02-13 23:10:43+01:00, tomas@poseidon.bredbandsbolaget.se +15 -1
    correct manual merge

ChangeSet@1.2512.5.13, 2008-02-13 20:52:01+01:00, tomas@poseidon.bredbandsbolaget.se +4 -0
  correction of merge

  mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test@1.2, 2008-02-13 20:51:55+01:00, tomas@poseidon.bredbandsbolaget.se +17 -4
    correction of merge

  mysql-test/mysql-test-run.pl@1.349, 2008-02-13 20:51:55+01:00, tomas@poseidon.bredbandsbolaget.se +6 -3
    correction of merge

  mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result@1.6, 2008-02-13 20:51:56+01:00, tomas@poseidon.bredbandsbolaget.se +2 -6
    correction of merge

  mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result@1.4, 2008-02-13 20:51:56+01:00, tomas@poseidon.bredbandsbolaget.se +16 -2
    correction of merge

ChangeSet@1.2476.841.5, 2008-02-13 21:57:50+03:00, kaa@kaamos.(none) +2 -0
  Post-merge fixes.

  mysql-test/r/mix2_myisam.result@1.7, 2008-02-13 21:57:48+03:00, kaa@kaamos.(none) +1 -0
    Post-merge fixes.

  mysql-test/r/range.result@1.67, 2008-02-13 21:57:48+03:00, kaa@kaamos.(none) +13 -13
    Post-merge fixes.

ChangeSet@1.2512.26.3, 2008-02-13 17:39:23+01:00, sven@riska.(none) +2 -0
  BUG#32991: Races in mysqldump.test (or mysqldump.test fails sporadically)
  This is *not* a fix to the bug. I'm only disabling the failing part of
  mysqldump.test until the bug is fixed. Whoever fixes it, please re-enable
  the test.

  mysql-test/r/mysqldump.result@1.163.1.1, 2008-02-13 17:39:22+01:00, sven@riska.(none) +0 -175
    Disabling part of the test case until BUG#32991 is fixed. Result file
    updated accordingly.

  mysql-test/t/mysqldump.test@1.153, 2008-02-13 17:39:22+01:00, sven@riska.(none) +6 -0
    Disabling this part of the test case until BUG#32991 is fixed.

ChangeSet@1.1810.3615.4, 2008-02-13 19:34:12+04:00, gshchepa@host.loc +3 -0
  Fixed bug#31194: Privilege ordering does not order properly
                   for wildcard values.
  The server ignored escape character before wildcards during
  the calculation of priority values for sorting of a privilege
  list. (Actually the server counted an escape character as an
  ordinary wildcard like % or _). I.e. the table name template
  with a wildcard character like 'tbl_1' had higher priority in
  a privilege list than concrete table name without wildcards
  like 'tbl\_1', and some privileges of 'tbl\_1' was hidden
  by privileges for 'tbl_1'.
  
  The get_sort function has been modified to ignore escaped
  wildcards as usual.
  

  mysql-test/r/grant3.result@1.5, 2008-02-13 19:33:19+04:00, gshchepa@host.loc +17 -0
    Added test case for bug#31194.

  mysql-test/t/grant3.test@1.6, 2008-02-13 19:33:20+04:00, gshchepa@host.loc +26 -0
    Added test case for bug#31194.

  sql/sql_acl.cc@1.128.51.1, 2008-02-13 19:33:20+04:00, gshchepa@host.loc +3 -1
    Fixed bug#31194.
    The server used the wild_prefix escape character (usually \-character)
    like % and _ wildcards in the get_sort function for sorting weights
    calculation.
    
    The get_sort function has been modified to ignore escaped wildcards
    and alone escapes like in the wild_case_compare function.

ChangeSet@1.1810.3615.3, 2008-02-13 19:32:19+04:00, gshchepa@host.loc +3 -0
  Fixed bug#33764: Wrong result with IN(), CONCAT() and implicit
                   type conversion.
  
  Instead of copying of whole character string from a temporary
  buffer, the server copied a short-living pointer to that string
  into a long-living structure. That has been fixed.

  mysql-test/r/select.result@1.121.1.41, 2008-02-13 19:31:33+04:00, gshchepa@host.loc +6 -0
    Added test case for bug#33764.

  mysql-test/t/select.test@1.102.1.36, 2008-02-13 19:31:34+04:00, gshchepa@host.loc +11 -0
    Added test case for bug#33764.

  sql/item_cmpfunc.cc@1.187.56.1, 2008-02-13 19:31:35+04:00, gshchepa@host.loc +4 -1
    Fixed bug#33764.
    Copying of a pointer has been replaced with an optional copying of
    a whole array to a newly allocated memory space in case of a
    functional source item.

ChangeSet@1.1810.3637.1, 2008-02-13 14:09:41+02:00, aelkin@mysql1000.dsl.inet.fi +4 -0
  Bug #33931 assertion at write_ignored_events_info_to_relay_log if init_slave_thread() fails
  and
  bug#33932  assertion at handle_slave_sql if init_slave_thread() fails
  
  the asserts were caused by 
    bug33931: having thd deleted at time of executing err: code plus
              a missed initialization;
    bug33932: initialization of slave_is_running member was missed;
  
  fixed with relocating mi members initialization and removing delete thd
  It is safe to do as deletion happens later explicitly in the caller of
  init_slave_thread().
  
  Todo: at merging the test is better to be moved into suite/bugs for 5.x (when x>0).

  mysql-test/r/rpl_bug33931.result@1.1, 2008-02-13 14:09:40+02:00, aelkin@mysql1000.dsl.inet.fi +38 -0
    the new result file

  mysql-test/r/rpl_bug33931.result@1.0, 2008-02-13 14:09:40+02:00, aelkin@mysql1000.dsl.inet.fi +0 -0

  mysql-test/t/rpl_bug33931-slave.opt@1.1, 2008-02-13 14:09:40+02:00, aelkin@mysql1000.dsl.inet.fi +1 -0
    option to spark the simulation code

  mysql-test/t/rpl_bug33931-slave.opt@1.0, 2008-02-13 14:09:40+02:00, aelkin@mysql1000.dsl.inet.fi +0 -0

  mysql-test/t/rpl_bug33931.test@1.1, 2008-02-13 14:09:40+02:00, aelkin@mysql1000.dsl.inet.fi +37 -0
    tests check that slave does not crash as before.
    Slave threads must be in NO running state in the end.
    

  mysql-test/t/rpl_bug33931.test@1.0, 2008-02-13 14:09:40+02:00, aelkin@mysql1000.dsl.inet.fi +0 -0

  sql/slave.cc@1.241.30.1, 2008-02-13 14:09:40+02:00, aelkin@mysql1000.dsl.inet.fi +14 -4
    adding the bugs simulating code;
    relocating some assignments to satisfy the asserts;

ChangeSet@1.2512.15.10, 2008-02-13 12:41:54+01:00, mkindahl@dl145h.mysql.com +2 -0
  Removing non-deterministic tests from events_scheduling test.

  mysql-test/r/events_scheduling.result@1.14, 2008-02-13 12:41:40+01:00, mkindahl@dl145h.mysql.com +0 -5
    Result change.

  mysql-test/t/events_scheduling.test@1.18, 2008-02-13 12:41:45+01:00, mkindahl@dl145h.mysql.com +0 -4
    Removing a test that only confirms that event scheduling is
    inexact, hence causing sporadic failures on loaded machines.

ChangeSet@1.2512.15.9, 2008-02-13 11:37:06+01:00, mkindahl@dl145h.mysql.com +12 -0
  The test rpl_row_charset and it dependent rpl_ndb_charset is
  irrelevant to execute since the charset information does not
  affect replication for row-based replication. The row-based
  versions of the tests were removed, and the statement-based
  version of the test was made executable by all three modes.
  
  This involves removing any lines that causes the test to be
  dependent on the contents of the binary log, and instead we
  just check that the replication works as it should.

  BitKeeper/deleted/.del-rpl_ndb_charset.result@1.10.1.1, 2008-02-13 10:24:50+01:00, mkindahl@dl145h.mysql.com +0 -0
    Delete: mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result

  BitKeeper/deleted/.del-rpl_ndb_charset.test@1.6, 2008-02-13 10:24:44+01:00, mkindahl@dl145h.mysql.com +0 -0
    Delete: mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test

  BitKeeper/deleted/.del-rpl_row_charset.result@1.10.1.1, 2008-02-13 10:30:37+01:00, mkindahl@dl145h.mysql.com +0 -0
    Delete: mysql-test/suite/rpl/r/rpl_row_charset.result

  BitKeeper/deleted/.del-rpl_row_charset.test@1.8.1.1, 2008-02-13 10:26:08+01:00, mkindahl@dl145h.mysql.com +0 -0
    Delete: mysql-test/extra/rpl_tests/rpl_row_charset.test

  BitKeeper/deleted/.del-rpl_row_charset.test~739be9df1baaee3e@1.6, 2008-02-13 10:29:08+01:00, mkindahl@dl145h.mysql.com +0 -0
    Delete: mysql-test/suite/rpl/t/rpl_row_charset.test

  BitKeeper/deleted/.del-rpl_row_charset_innodb-master.opt@1.2, 2008-02-13 10:29:44+01:00, mkindahl@dl145h.mysql.com +0 -0
    Delete: mysql-test/suite/rpl/t/rpl_row_charset_innodb-master.opt

  BitKeeper/deleted/.del-rpl_row_charset_innodb-slave.opt@1.2, 2008-02-13 10:29:47+01:00, mkindahl@dl145h.mysql.com +0 -0
    Delete: mysql-test/suite/rpl/t/rpl_row_charset_innodb-slave.opt

  BitKeeper/deleted/.del-rpl_row_charset_innodb.result@1.3, 2008-02-13 10:30:36+01:00, mkindahl@dl145h.mysql.com +0 -0
    Delete: mysql-test/suite/rpl/r/rpl_row_charset_innodb.result

  BitKeeper/deleted/.del-rpl_row_charset_innodb.test@1.3, 2008-02-13 10:29:36+01:00, mkindahl@dl145h.mysql.com +0 -0
    Delete: mysql-test/suite/rpl/t/rpl_row_charset_innodb.test

  mysql-test/extra/rpl_tests/rpl_charset.test@1.26, 2008-02-13 11:36:38+01:00, mkindahl@dl145h.mysql.com +6 -26
    Test is not dependent on binlog format any more.
    Using --echo instead of "select" to print text.
    Removing lines causing the test to be dependent on binlog contents.

  mysql-test/extra/rpl_tests/rpl_charset.test@1.25, 2008-02-13 10:30:56+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: mysql-test/extra/rpl_tests/rpl_stm_charset.test -> mysql-test/extra/rpl_tests/rpl_charset.test

  mysql-test/suite/rpl/r/rpl_charset.result@1.33, 2008-02-13 11:36:43+01:00, mkindahl@dl145h.mysql.com +0 -149
    Result change.

  mysql-test/suite/rpl/r/rpl_charset.result@1.32, 2008-02-13 10:36:21+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: mysql-test/suite/rpl/r/rpl_stm_charset.result -> mysql-test/suite/rpl/r/rpl_charset.result

  mysql-test/suite/rpl/t/rpl_charset.test@1.4, 2008-02-13 11:36:43+01:00, mkindahl@dl145h.mysql.com +2 -1
    Using renamed version of test file.

  mysql-test/suite/rpl/t/rpl_charset.test@1.3, 2008-02-13 10:31:58+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: mysql-test/suite/rpl/t/rpl_stm_charset.test -> mysql-test/suite/rpl/t/rpl_charset.test

ChangeSet@1.2512.1.2, 2008-02-13 11:26:24+01:00, mikael@dator6.(none) +1 -0
  Added comments on why we do reopen
  Handle error case of not being able to reopen which
  requires us to remove table from thread's open list
  and table_cache.

  sql/sql_partition.cc@1.127, 2008-02-13 11:26:22+01:00, mikael@dator6.(none) +13 -3
    Added comments on why we do reopen
    Handle error case of not being able to reopen which
    requires us to remove table from thread's open list
    and table_cache.

ChangeSet@1.2512.29.5, 2008-02-13 13:00:24+03:00, anozdrin@quad. +5 -0
  Additional patch for Bug#31222: com_% global status counters
  behave randomly with mysql_change_user.
  
  The test case had to be moved into not_embedded_server.test file,
  because SHOW GLOBAL STATUS does not work properly in embedded
  server (see bug 34517).

  BitKeeper/deleted/.del-change_user-master.opt@1.2, 2008-02-13 12:57:39+03:00, anozdrin@quad. +0 -0
    Delete: mysql-test/t/change_user-master.opt

  mysql-test/r/change_user.result@1.5, 2008-02-13 13:00:23+03:00, anozdrin@quad. +0 -7
    Move test case for Bug#31222 to not_embedded_server.test.

  mysql-test/r/not_embedded_server.result@1.9, 2008-02-13 13:00:23+03:00, anozdrin@quad. +7 -0
    Move test case for Bug#31222 to not_embedded_server.test.

  mysql-test/t/change_user.test@1.4, 2008-02-13 13:00:23+03:00, anozdrin@quad. +6 -23
    Move test case for Bug#31222 to not_embedded_server.test.

  mysql-test/t/not_embedded_server.test@1.4, 2008-02-13 13:00:23+03:00, anozdrin@quad. +34 -0
    Move test case for Bug#31222 to not_embedded_server.test.

ChangeSet@1.2512.29.4, 2008-02-13 12:02:16+03:00, anozdrin@quad. +2 -0
  Additional patch for Bug#32538. Fix result files of windows test cases.

  mysql-test/r/named_pipe.result@1.4, 2008-02-13 12:02:15+03:00, anozdrin@quad. +1 -1
    Fix result file (windows-specific test).

  mysql-test/r/shm.result@1.7, 2008-02-13 12:02:15+03:00, anozdrin@quad. +1 -1
    Fix result file (windows-specific test).

ChangeSet@1.2512.29.3, 2008-02-12 22:09:16+03:00, anozdrin@quad. +37 -0
  Fix for Bug#32538: View definition picks up character set,
  but not collation.
  
  The problem here was that text literals in a view were always
  dumped with character set introducer. That lead to loosing
  collation information.
  
  The fix is to dump character set introducer only if it was
  in the original query. That is now possible because there 
  is no problem any more of loss of character set of string
  literals in views -- after WL#4052 the view is dumped 
  in the original character set.

  mysql-test/r/case.result@1.36, 2008-02-12 22:09:14+03:00, anozdrin@quad. +2 -2
    Update result file.

  mysql-test/r/compress.result@1.13, 2008-02-12 22:09:14+03:00, anozdrin@quad. +1 -1
    Update result file.

  mysql-test/r/ctype_collate.result@1.37, 2008-02-12 22:09:14+03:00, anozdrin@quad. +1 -1
    Update result file.

  mysql-test/r/date_formats.result@1.47, 2008-02-12 22:09:14+03:00, anozdrin@quad. +1 -1
    Update result file.

  mysql-test/r/ddl_i18n_koi8r.result@1.4, 2008-02-12 22:09:14+03:00, anozdrin@quad. +3 -3
    Update result file.

  mysql-test/r/ddl_i18n_utf8.result@1.4, 2008-02-12 22:09:14+03:00, anozdrin@quad. +3 -3
    Update result file.

  mysql-test/r/fulltext.result@1.99, 2008-02-12 22:09:14+03:00, anozdrin@quad. +2 -2
    Update result file.

  mysql-test/r/func_crypt.result@1.20, 2008-02-12 22:09:14+03:00, anozdrin@quad. +1 -1
    Update result file.

  mysql-test/r/func_encrypt.result@1.11, 2008-02-12 22:09:14+03:00, anozdrin@quad. +5 -5
    Update result file.

  mysql-test/r/func_if.result@1.26, 2008-02-12 22:09:14+03:00, anozdrin@quad. +1 -1
    Update result file.

  mysql-test/r/func_in.result@1.45, 2008-02-12 22:09:14+03:00, anozdrin@quad. +1 -1
    Update result file.

  mysql-test/r/func_like.result@1.19, 2008-02-12 22:09:14+03:00, anozdrin@quad. +2 -2
    Update result file.

  mysql-test/r/func_regexp.result@1.16, 2008-02-12 22:09:14+03:00, anozdrin@quad. +1 -1
    Update result file.

  mysql-test/r/func_set.result@1.18, 2008-02-12 22:09:14+03:00, anozdrin@quad. +1 -1
    Update result file.

  mysql-test/r/func_str.result@1.150, 2008-02-12 22:09:14+03:00, anozdrin@quad. +35 -35
    Update result file.

  mysql-test/r/func_time.result@1.105, 2008-02-12 22:09:14+03:00, anozdrin@quad. +2 -2
    Update result file.

  mysql-test/r/gis.result@1.60, 2008-02-12 22:09:14+03:00, anozdrin@quad. +3 -3
    Update result file.

  mysql-test/r/group_min_max.result@1.39, 2008-02-12 22:09:14+03:00, anozdrin@quad. +10 -10
    Update result file.

  mysql-test/r/mysqldump.result@1.164, 2008-02-12 22:09:14+03:00, anozdrin@quad. +2 -2
    Update result file.

  mysql-test/r/negation_elimination.result@1.8, 2008-02-12 22:09:14+03:00, anozdrin@quad. +1 -1
    Update result file.

  mysql-test/r/null.result@1.42, 2008-02-12 22:09:14+03:00, anozdrin@quad. +2 -2
    Update result file.

  mysql-test/r/select.result@1.178, 2008-02-12 22:09:14+03:00, anozdrin@quad. +1 -1
    Update result file.

  mysql-test/r/show_check.result@1.135, 2008-02-12 22:09:14+03:00, anozdrin@quad. +1 -1
    Update result file.

  mysql-test/r/sp-code.result@1.19, 2008-02-12 22:09:14+03:00, anozdrin@quad. +46 -46
    Update result file.

  mysql-test/r/ssl.result@1.11, 2008-02-12 22:09:14+03:00, anozdrin@quad. +1 -1
    Update result file.

  mysql-test/r/ssl_compress.result@1.11, 2008-02-12 22:09:14+03:00, anozdrin@quad. +1 -1
    Update result file.

  mysql-test/r/subselect.result@1.213, 2008-02-12 22:09:14+03:00, anozdrin@quad. +9 -9
    Update result file.

  mysql-test/r/temp_table.result@1.28, 2008-02-12 22:09:14+03:00, anozdrin@quad. +1 -1
    Update result file.

  mysql-test/r/type_blob.result@1.61, 2008-02-12 22:09:14+03:00, anozdrin@quad. +1 -1
    Update result file.

  mysql-test/r/view.result@1.246.2.1, 2008-02-12 22:09:14+03:00, anozdrin@quad. +49 -3
    Update result file.

  mysql-test/suite/binlog/r/binlog_stm_blackhole.result@1.27, 2008-02-12 22:09:14+03:00, anozdrin@quad. +1 -1
    Update result file.

  mysql-test/suite/rpl/r/rpl_get_lock.result@1.17, 2008-02-12 22:09:14+03:00, anozdrin@quad. +1 -1
    Update result file.

  mysql-test/suite/rpl/r/rpl_master_pos_wait.result@1.11, 2008-02-12 22:09:14+03:00, anozdrin@quad. +1 -1
    Update result file.

  mysql-test/t/view.test@1.213, 2008-02-12 22:09:14+03:00, anozdrin@quad. +67 -2
    Add a test case for Bug#32538.

  sql/item.cc@1.303, 2008-02-12 22:09:14+03:00, anozdrin@quad. +6 -2
    Do not dump character set introducer if it was not specified
    explicitly in the original query.

  sql/item.h@1.274, 2008-02-12 22:09:14+03:00, anozdrin@quad. +45 -0
    Add 'cs_specified' property to Item_string.

  sql/sql_yacc.yy@1.611.1.9, 2008-02-12 22:09:14+03:00, anozdrin@quad. +30 -13
    Set Item_string::cs_specified property to TRUE
    when character set introducer is explicitly specified.

ChangeSet@1.2512.29.2, 2008-02-12 21:42:15+03:00, anozdrin@quad. +1 -0
  Additional fix for Bug#31222.

  mysql-test/t/change_user-master.opt@1.1, 2008-02-12 21:42:14+03:00, anozdrin@quad. +1 -0
    Force mysqld restarting to reset global statistics (status info).

  mysql-test/t/change_user-master.opt@1.0, 2008-02-12 21:42:14+03:00, anozdrin@quad. +0 -0

ChangeSet@1.2512.30.1, 2008-02-12 19:08:04+01:00, kent@mysql.com +1 -0
  ha_ndbcluster.m4:
    If the third number in version is followed by a letter, include it
    in NDB_VERSION_STATUS, but not in numeric NDB_VERSION_BUILD

  config/ac-macros/ha_ndbcluster.m4@1.29, 2008-02-12 19:06:24+01:00, kent@mysql.com +4 -9
    If the third number in version is followed by a letter, include it
    in NDB_VERSION_STATUS, but not in numeric NDB_VERSION_BUILD

ChangeSet@1.2512.29.1, 2008-02-12 20:59:09+03:00, anozdrin@quad. +3 -0
  Fix for Bug#31222: com_% global status counters
  behave randomly with mysql_change_user.
    
  The problem was that global status variables were not updated
  in THD::check_user(), so thread statistics were lost after
  COM_CHANGE_USER.
    
  The fix is to update global status variables with the thread ones
  before preparing the thread for new user.

  mysql-test/r/change_user.result@1.4, 2008-02-12 20:59:08+03:00, anozdrin@quad. +7 -0
    Update result file.

  mysql-test/t/change_user.test@1.3, 2008-02-12 20:59:08+03:00, anozdrin@quad. +28 -0
    Add a test case for Bug#31222: com_% global status counters
    behave randomly with mysql_change_user.

  sql/sql_class.cc@1.352.5.1, 2008-02-12 20:59:08+03:00, anozdrin@quad. +4 -0
    Update global status variables when we're handling
    COM_CHANGE_USER for a thread.

ChangeSet@1.2512.15.8, 2008-02-12 18:21:17+01:00, mkindahl@dl145h.mysql.com +2 -0
  Various fixes to fix memory leaks after merging replication
  tree with main.

  sql/sql_binlog.cc@1.21, 2008-02-12 18:21:01+01:00, mkindahl@dl145h.mysql.com +1 -0
    Adding code to free memory after execution of BINLOG statement.
    It caused a memory leak in the case that the execution failed
    for any reason.

  sql/sql_class.cc@1.352.1.7, 2008-02-12 18:21:07+01:00, mkindahl@dl145h.mysql.com +3 -0
    Since rli_fake is checked for NULL at various occations to mean
    that no rli_fake is assigned, NULL is assigned to rli_fake after
    deleting the instance.

ChangeSet@1.2512.26.2, 2008-02-12 17:22:04+01:00, sven@riska.(none) +5 -0
  Moved mysql-test/suite/rpl/rpl_variables.test into
  mysql-test/t/variables.test, because:
   - mysql-test/suite/rpl/t/rpl_variables.test does not replicate anything,
  so should not be in the rpl suite.
   - mysql-test/t/variables.test is the place for testing variable-related
  problems and features.
   - I will soon commit a patch containing a test case that tests
  replication of variables. It would be good if I could call the test case
  mysql-test/suite/rpl/t/rpl_variables.test. I'm making place for that now.

  BitKeeper/deleted/.del-rpl_variables.result@1.7, 2008-02-12 17:04:41+01:00, sven@riska.(none) +0 -0
    Delete: mysql-test/suite/rpl/r/rpl_variables.result

  BitKeeper/deleted/.del-rpl_variables.test@1.8, 2008-02-12 17:04:36+01:00, sven@riska.(none) +0 -0
    Delete: mysql-test/suite/rpl/t/rpl_variables.test

  mysql-test/r/variables.result@1.110.1.1, 2008-02-12 17:22:01+01:00, sven@riska.(none) +14 -0
    Moved mysql-test/suite/rpl/t/rpl_variables.test into
    mysql-test/t/variables.test . Result file needs to be updated.

  mysql-test/t/variables-master.opt@1.3, 2008-02-12 17:04:09+01:00, sven@riska.(none) +0 -0
    Rename: mysql-test/suite/rpl/t/rpl_variables-master.opt -> mysql-test/t/variables-master.opt

  mysql-test/t/variables.test@1.88.1.1, 2008-02-12 17:22:01+01:00, sven@riska.(none) +19 -0
    Moved mysql-test/suite/rpl/t/rpl_variables.test into
    mysql-test/t/variables.test .

ChangeSet@1.2512.5.10, 2008-02-12 14:50:36+01:00, tomas@poseidon.ndb.mysql.com +1 -0
  corrected really strange test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test@1.9, 2008-02-12 14:50:34+01:00, tomas@poseidon.ndb.mysql.com +1 -4
    corrected really strange test

ChangeSet@1.2512.22.11, 2008-02-12 09:44:27-02:00, davi@mysql.com +3 -0
  Bug#23771 AFTER UPDATE trigger not invoked when there are no changes of the data
  
  The problem is that AFTER UPDATE triggers will fire only if the
  new data is different from the old data on the row. The trigger
  should fire regardless of whether there are changes to the data.
  
  The solution is to fire the trigger on UPDATE even if there are
  no changes to the value (because the value is the same).

  mysql-test/r/trigger.result@1.76, 2008-02-12 09:44:24-02:00, davi@mysql.com +38 -0
    Add test case result for Bug#23771

  mysql-test/t/trigger.test@1.86, 2008-02-12 09:44:24-02:00, davi@mysql.com +33 -0
    Add test case for Bug#23771

  sql/sql_update.cc@1.248, 2008-02-12 09:44:24-02:00, davi@mysql.com +17 -17
    Move the invocation of the after update trigger so that
    the trigger will fire even if the records are the same.

ChangeSet@1.1810.3634.1, 2008-02-12 15:12:45+04:00, ramil@mysql.com +1 -0
  Fix for bug #33758: Got query result when using ORDER BY ASC, but 
  empty result when using DESC
  
  Problem: fetching MyISAM keys we copy a key block pointer to the end of the key buffer.
  However, we don't take into account the pointer length calculatig the buffer size,
  that may leads to memory overwriting and in turn to unpredictable results.
  
  Fix: increase key buffer size by length of the key block pointer.
  
  Note: no simple test case.

  myisam/mi_open.c@1.90.33.1, 2008-02-12 15:12:44+04:00, ramil@mysql.com +3 -0
    Fix for bug #33758: Got query result when using ORDER BY ASC, but 
    empty result when using DESC
      - increase possible maximum key length by size of the key block pointer,
        as it's copied into the key buffer in the get_key() MyISAM functions.

ChangeSet@1.1810.3633.1, 2008-02-12 12:43:55+03:00, kaa@mbp. +3 -0
  Fix for bug #33389: Selecting from a view into a table from within SP
                      or trigger crashes server
  
  Under some circumstances a combination of VIEWs, subselects with outer
  references and PS/SP/triggers could lead to use of uninitialized memory
  and server crash as a result.
  
  Fixed by changing the code in Item_field::fix_fields() so that in cases
  when the field is a VIEW reference, we first check whether the field
  is also an outer reference, and mark it appropriately before returning.

  mysql-test/r/view.result@1.138.40.2, 2008-02-12 12:43:53+03:00, kaa@mbp. +16 -0
    Added a test case for bug #33389.

  mysql-test/t/view.test@1.126.1.66, 2008-02-12 12:43:53+03:00, kaa@mbp. +22 -0
    Added a test case for bug #33389.

  sql/item.cc@1.113.107.1, 2008-02-12 12:43:54+03:00, kaa@mbp. +12 -12
    In cases when in Item_field::fix_fields() from_field is a view reference,
    do not return too early, i.e. before marking the reference as an outer
    one when needed.

ChangeSet@1.2512.19.2, 2008-02-12 10:43:38+01:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -0
  Removed extra symbol during merge.

  sql/lex.h@1.179, 2008-02-12 10:43:31+01:00, jani@a88-113-38-195.elisa-laajakaista.fi +0 -1
    Removed extra symbol during merge.

ChangeSet@1.1810.3620.8, 2008-02-11 18:02:37+01:00, df@pippilotta.erinye.com +1 -0
  Make this build on Windows.

  extra/resolveip.c@1.24.1.4, 2008-02-11 18:02:33+01:00, df@pippilotta.erinye.com +8 -0
    Regrettably, Windows does not have inet_aton. We still don't want to use inet_addr on all platforms, because it is inaccurate and deprecated on many.

ChangeSet@1.2512.5.5, 2008-02-11 15:26:38+01:00, tomas@poseidon.ndb.mysql.com +6 -0
  default changed not to run idempotent, but test requires it because of how ndb logs updates as write

  mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result@1.5, 2008-02-11 15:26:33+01:00, tomas@poseidon.ndb.mysql.com +1 -0
    default changed not to run idempotent, but test requires it because of how ndb logs updates as write

  mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result@1.6, 2008-02-11 15:26:33+01:00, tomas@poseidon.ndb.mysql.com +1 -0
    default changed not to run idempotent, but test requires it because of how ndb logs updates as write

  mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result@1.3, 2008-02-11 15:26:33+01:00, tomas@poseidon.ndb.mysql.com +1 -0
    default changed not to run idempotent, but test requires it because of how ndb logs updates as write

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test@1.6, 2008-02-11 15:26:33+01:00, tomas@poseidon.ndb.mysql.com +1 -0
    default changed not to run idempotent, but test requires it because of how ndb logs updates as write

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test@1.6, 2008-02-11 15:26:33+01:00, tomas@poseidon.ndb.mysql.com +1 -0
    default changed not to run idempotent, but test requires it because of how ndb logs updates as write

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test@1.4, 2008-02-11 15:26:33+01:00, tomas@poseidon.ndb.mysql.com +1 -0
    default changed not to run idempotent, but test requires it because of how ndb logs updates as write

ChangeSet@1.2512.26.1, 2008-02-11 15:14:24+01:00, sven@riska.(none) +1 -0
  Problem: pushbuild has sporadic errors during startup of
  rpl_ndb_rep_ignore
  Reason: previous test, rpl_ndb_2multi_eng, does not sync slave with master
  after cleanup, so tables are sometimes left on slave
  Fix: sync_slave_with_master

  mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test@1.5, 2008-02-11 15:14:22+01:00, sven@riska.(none) +1 -0
    Wait until drop table is replicated to slave before terminating. (The
    extra table caused sporadic errors in the next test case, causing
    pushbuild to fail.)

ChangeSet@1.2512.5.4, 2008-02-11 15:06:07+01:00, tomas@poseidon.ndb.mysql.com +3 -0
  correcting wrong test case

  mysql-test/suite/rpl_ndb/r/rpl_ndb_2ndb.result@1.2, 2008-02-11 15:06:05+01:00, tomas@poseidon.ndb.mysql.com +12 -13
    correcting wrong test case

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb-slave.opt@1.2, 2008-02-11 15:06:05+01:00, tomas@poseidon.ndb.mysql.com +1 -1
    correcting wrong test case

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test@1.2, 2008-02-11 15:06:05+01:00, tomas@poseidon.ndb.mysql.com +0 -1
    correcting wrong test case

ChangeSet@1.2512.25.1, 2008-02-11 16:28:33+04:00, bar@mysql.com +10 -0
  Bug#27877 incorrect german order in utf8_general_ci
  Problem: incorrect sort order for "U+00DF SHARP S".
  Fix: changing sort order for U+00DF to be equal to 's',
  like the manual says.
  

  mysql-test/include/ctype_german.inc@1.1, 2008-02-11 16:28:30+04:00, bar@mysql.com +40 -0
    New BitKeeper file ``mysql-test/include/ctype_german.inc''

  mysql-test/include/ctype_german.inc@1.0, 2008-02-11 16:28:30+04:00, bar@mysql.com +0 -0

  mysql-test/r/ctype_latin1_de.result@1.26, 2008-02-11 16:28:30+04:00, bar@mysql.com +35 -0
    Adding test

  mysql-test/r/ctype_uca.result@1.26, 2008-02-11 16:28:30+04:00, bar@mysql.com +35 -0
    Adding test

  mysql-test/r/ctype_ucs.result@1.67.1.1, 2008-02-11 16:28:30+04:00, bar@mysql.com +35 -0
    Adding test

  mysql-test/r/ctype_utf8.result@1.125, 2008-02-11 16:28:30+04:00, bar@mysql.com +35 -0
    Adding test

  mysql-test/t/ctype_latin1_de.test@1.27, 2008-02-11 16:28:30+04:00, bar@mysql.com +1 -0
    Adding test

  mysql-test/t/ctype_uca.test@1.23, 2008-02-11 16:28:30+04:00, bar@mysql.com +1 -0
    Adding test

  mysql-test/t/ctype_ucs.test@1.64.1.1, 2008-02-11 16:28:30+04:00, bar@mysql.com +1 -0
    Adding test

  mysql-test/t/ctype_utf8.test@1.114, 2008-02-11 16:28:30+04:00, bar@mysql.com +1 -0
    Adding test

  strings/ctype-utf8.c@1.117, 2008-02-11 16:28:30+04:00, bar@mysql.com +1 -1
    Changing weight for "U+00DF SHARP S"

ChangeSet@1.2512.22.10, 2008-02-11 14:34:53+03:00, anozdrin@quad. +1 -0
  Disable sporadically failing test cases (Bug#34454).

  mysql-test/suite/rpl_ndb/t/disabled.def@1.17.1.1, 2008-02-11 14:34:52+03:00, anozdrin@quad. +5 -0
    Disable sporadically failing test cases.

ChangeSet@1.2512.22.9, 2008-02-11 14:05:27+03:00, anozdrin@quad. +1 -0
  Disabling declaration of debug variable for non-debug builds.
  
  (originally from Mats)

  sql/slave.cc@1.333.2.2, 2008-02-11 14:05:26+03:00, anozdrin@quad. +2 -0
    Disabling declaration in non-debug builds.

ChangeSet@1.2512.22.8, 2008-02-11 14:04:30+03:00, anozdrin@quad. +4 -0
  Patch to eliminate some valgrind warnings in debug printout code.
  
  (originally from Mats)

  sql/rpl_rli.cc@1.17.1.1, 2008-02-11 14:04:29+03:00, anozdrin@quad. +4 -1
    Adding variable to mark an instance of Relay_log_info as fake.

  sql/rpl_rli.h@1.24.1.1, 2008-02-11 14:04:29+03:00, anozdrin@quad. +4 -0
    Adding variable to mark an instance of Relay_log_info as fake.

  sql/slave.cc@1.333.2.1, 2008-02-11 14:04:29+03:00, anozdrin@quad. +14 -8
    Not printing debug information if we are working with a fake
    instance of Relay_log_info. This because the result of calling
    update is nonsense, and trying to print it generates valgrind
    warnings.

  sql/sql_binlog.cc@1.17.2.1, 2008-02-11 14:04:29+03:00, anozdrin@quad. +3 -0
    Marking newly created instance of Relay_log_info as a fake instance.

ChangeSet@1.2512.24.1, 2008-02-11 11:32:46+01:00, mattiasj@client-10-129-10-147.upp.off.mysql.com +14 -0
  Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
  
  Problem was that it did not work with corrupted/crashed tables.
  
  Solution is to disable these commands until WL#4176 is completed

  mysql-test/r/partition.result@1.79.3.1, 2008-02-11 11:32:40+01:00, mattiasj@client-10-129-10-147.upp.off.mysql.com +2 -4
    Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
    
    Test result

  mysql-test/suite/parts/inc/partition_alter4.inc@1.6, 2008-02-11 11:32:40+01:00, mattiasj@client-10-129-10-147.upp.off.mysql.com +8 -8
    Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
    
    copy-paste error, changed from REBUILT to REPAIR, as the heading says

  mysql-test/suite/parts/r/partition_alter1_innodb.result@1.5, 2008-02-11 11:32:41+01:00, mattiasj@client-10-129-10-147.upp.off.mysql.com +504 -504
    Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
    
    Test result

  mysql-test/suite/parts/r/partition_alter1_myisam.result@1.5, 2008-02-11 11:32:41+01:00, mattiasj@client-10-129-10-147.upp.off.mysql.com +256 -256
    Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
    
    Test result

  mysql-test/suite/parts/r/partition_alter2_innodb.result@1.5, 2008-02-11 11:32:41+01:00, mattiasj@client-10-129-10-147.upp.off.mysql.com +720 -720
    Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
    
    Test result

  mysql-test/suite/parts/r/partition_alter2_myisam.result@1.5, 2008-02-11 11:32:41+01:00, mattiasj@client-10-129-10-147.upp.off.mysql.com +576 -576
    Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
    
    Test result

  mysql-test/suite/parts/r/partition_basic_innodb.result@1.5.1.1, 2008-02-11 11:32:42+01:00, mattiasj@client-10-129-10-147.upp.off.mysql.com +237 -237
    Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
    
    Test result

  mysql-test/suite/parts/r/partition_basic_myisam.result@1.5.1.1, 2008-02-11 11:32:42+01:00, mattiasj@client-10-129-10-147.upp.off.mysql.com +188 -188
    Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
    
    Test result

  mysql-test/suite/parts/r/partition_engine_innodb.result@1.4.1.1, 2008-02-11 11:32:42+01:00, mattiasj@client-10-129-10-147.upp.off.mysql.com +42 -42
    Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
    
    Test result

  mysql-test/suite/parts/r/partition_engine_myisam.result@1.4.1.1, 2008-02-11 11:32:42+01:00, mattiasj@client-10-129-10-147.upp.off.mysql.com +56 -56
    Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
    
    Test result

  mysql-test/suite/parts/t/disabled.def@1.7.1.1, 2008-02-11 11:32:42+01:00, mattiasj@client-10-129-10-147.upp.off.mysql.com +2 -0
    Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
    
    Disabled test since the tested feature is not longer supported

  mysql-test/t/partition.test@1.72.3.1, 2008-02-11 11:32:42+01:00, mattiasj@client-10-129-10-147.upp.off.mysql.com +7 -5
    Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
    
    OPTIMIZE PARTITION is not longer supported, waiting for WL#4176

  sql/ha_partition.cc@1.117.1.1, 2008-02-11 11:32:43+01:00, mattiasj@client-10-129-10-147.upp.off.mysql.com +15 -0
    Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
    
    Problem was that it did not work with corrupted/crashed tables.
    
    Solution is to disable these commands until WL#4176 is completed
    (returning HA_ADMIN_NOT_IMPLEMENTED and
    #ifdef'ed the non-reachable code)

  sql/sql_partition.cc@1.125.2.1, 2008-02-11 11:32:43+01:00, mattiasj@client-10-129-10-147.upp.off.mysql.com +13 -1
    Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
    
    Problem was that it did not work with corrupted/crashed tables.
    
    Solution is to disable these commands until WL#4176 is completed

ChangeSet@1.1616.3133.1, 2008-02-10 23:41:57+04:00, holyfoot@mysql.com +2 -0
  Bug #33796 Memory leak for prepared statements in embedded server.
  
  Field data for a query was stored to the stmt->alloc that is emptied
  with mysql_stmt_close statement only. That means a lot of memory can
  be occupied without a reason if used doesn't call mysql_stmt_close often.

  libmysql/libmysql.c@1.156.27.1, 2008-02-10 23:38:47+04:00, holyfoot@mysql.com +5 -8
    Bug #33796 Memory leak for prepared statements in embedded server.
    
    Clean up result->alloc even if there's no 'data' created

  libmysqld/lib_sql.cc@1.75.1.66, 2008-02-10 23:38:47+04:00, holyfoot@mysql.com +1 -1
    Bug #33796 Memory leak for prepared statements in embedded server.
    
    alloc 'fields' in the 'result.alloc' as the 'mem_root' is only cleaned with
    mysql_stmt_close'

ChangeSet@1.2476.792.39, 2008-02-10 17:50:53+01:00, jonas@perch.ndb.mysql.com +1 -0
  Fix missing block-constructor

  storage/ndb/src/kernel/blocks/suma/SumaInit.cpp@1.17, 2008-02-10 17:50:51+01:00, jonas@perch.ndb.mysql.com +2 -0
    Fix missing block-constructor

ChangeSet@1.2512.15.4, 2008-02-09 19:43:32+01:00, sven@riska.(none) +1 -0
  Problem: pushbuild fails in embedded mode on test binlog_base64_flag
  because it uses BINLOG statement, which is not supported in embedded mode.
  Fix: disable the test in embedded mode.

  mysql-test/suite/binlog/t/binlog_base64_flag.test@1.3, 2008-02-09 19:43:31+01:00, sven@riska.(none) +4 -0
    Must disable this test when running embedded, since BINLOG statements
    don't work. This fixes the pushbuild problem on the debx86-b machine on
    https://intranet.mysql.com/secure/pushbuild/showpush.pl?dir=mysql-5.1-new-rpl&order=469

ChangeSet@1.2512.23.1, 2008-02-09 10:31:22+03:00, kostja@dipika.(none) +1 -0
  Fix a buffer overflow with strmake().

  sql/sql_class.cc@1.352.1.6, 2008-02-09 10:31:19+03:00, kostja@dipika.(none) +2 -2
    Fix a buffer overflow with strmake().

ChangeSet@1.2476.792.38, 2008-02-09 07:26:34+01:00, jonas@perch.ndb.mysql.com +1 -0
  remove mysql-test-run from autotest

  storage/ndb/test/run-test/daily-basic-tests.txt@1.118, 2008-02-09 07:26:32+01:00, jonas@perch.ndb.mysql.com +0 -4
    remove mysql-test-run from autotest

ChangeSet@1.2512.22.6, 2008-02-08 19:37:57-07:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  Fixed buffer overflow

  sql/log.cc@1.302.1.7, 2008-02-08 19:37:53-07:00, malff@lambda.hsd1.co.comcast.net. +1 -1
    Fixed buffer overflow

ChangeSet@1.1810.3614.11, 2008-02-08 21:03:10+02:00, aelkin@mysql1000.dsl.inet.fi +1 -0
  bug#34427 slave misses rendezvous in rpl_variables
  
  There was no instruction in the test that enforces the slave successfully connect
  to the master.
  The way the test was been written allowed the slave to had been late for rendezvous 
  so that about-connecting time queries to the master failed and are error-logged
  to had been seen in Warnings of pb.
  
  Fixed with adding a sychronization primitive to the test.
  No test case is possible, observe error logs on pb.
  
  Todo: revise need of rpl_report.pl's rules due to failing execution of
  queries from get_master_verion_and_clock().
  Any test should try to use a synchornization primitive like the current fix
  makes and do not let the slave to miss successful connecting.

  mysql-test/t/rpl_variables.test@1.4.1.2, 2008-02-08 21:03:09+02:00, aelkin@mysql1000.dsl.inet.fi +7 -0
    Completing the test's body with a synch macro to not let
    the slave to miss the successful connecting to the master.

ChangeSet@1.2512.15.3, 2008-02-08 18:17:00+01:00, sven@riska.(none) +5 -0
  BUG#33247: mysqlbinlog does not clean up after itself on abnormal termination
  Problem: mysqlbinlog does not free memory if an error happens.
  Fix: binlog-processing functions do not call exit() anymore. Instead, they
  print an error and return an error code. Error codes are propagated all
  the way back to main, and all allocated memory is freed on the way.

  client/mysqlbinlog.cc@1.167, 2008-02-08 18:16:56+01:00, sven@riska.(none) +651 -399
    - New error handling policy: functions processing binlogs don't just
      exit() anymore. Instead, they print a message and return an error
      status.
    - New policy for the global `mysql' and `glob_description_event': these
      are not passed as parameters anymore. The global pointer is used
      instead.
    - More error situations are detected and reported.
    - Better error messages: the program never terminates with exit status 1
      without explanation any more. Fixed spelling errors. Use consistent
      format of messages (a single line beginning with "ERROR: " or
      "WARNING: " and ending with "." is printed to stderr.)
    - New memory handling: memory is always freed on program termination.
    - Better comments: more functions are explained, doxygen is used, and
      more precise formulations in some existing comments.

  mysql-test/suite/binlog/r/binlog_base64_flag.result@1.2, 2008-02-08 18:16:56+01:00, sven@riska.(none) +6 -1
    Result file updated since output format of mysqlbinlog changed while the
    test was disabled.

  mysql-test/suite/binlog/t/binlog_killed.test@1.15, 2008-02-08 18:16:56+01:00, sven@riska.(none) +3 -3
    Mysqlbinlog now works as described when the binlog is open. Hence, the
    --force-if-open flag must be passed

  mysql-test/suite/binlog/t/binlog_killed_simulate.test@1.6, 2008-02-08 18:16:57+01:00, sven@riska.(none) +2 -2
    Mysqlbinlog now works as described when the binlog is open. Hence, the
    --force-if-open flag must be passed

  mysql-test/suite/binlog/t/disabled.def@1.6, 2008-02-08 18:16:57+01:00, sven@riska.(none) +0 -1
    Now that mysqlbinlog cleans up after itself on abnormal termination, we
    can enable this test again.

ChangeSet@1.2512.22.5, 2008-02-08 20:07:39+03:00, anozdrin@quad. +1 -0
  Bug#34424: query_cache_debug.test leads to valgrind warnings
  
  Disable the test case.

  mysql-test/t/disabled.def@1.290.2.1, 2008-02-08 20:07:38+03:00, anozdrin@quad. +1 -0
    Disable query_cache_debug.test.

ChangeSet@1.2512.22.4, 2008-02-08 20:06:05+03:00, anozdrin@quad. +2 -0
  Fix create.test: use latin1 instead ucs2.

  mysql-test/r/create.result@1.159.1.2, 2008-02-08 20:06:04+03:00, anozdrin@quad. +4 -4
    Fix create.test: use latin1 instead ucs2.

  mysql-test/t/create.test@1.109.1.2, 2008-02-08 20:06:04+03:00, anozdrin@quad. +1 -1
    Fix create.test: use latin1 instead ucs2.

ChangeSet@1.2512.22.3, 2008-02-08 19:33:24+03:00, kostja@dipika.(none) +1 -0
  Fix -ansi -pedantic compilation error

  sql/set_var.cc@1.267.1.2, 2008-02-08 19:33:19+03:00, kostja@dipika.(none) +1 -1
    Fix -ansi -pedantic compilation error

ChangeSet@1.2476.792.37, 2008-02-08 16:42:17+01:00, jonas@perch.ndb.mysql.com +2 -0
  ndb -
    fix failing autotest-test

  storage/ndb/test/ndbapi/testNodeRestart.cpp@1.64, 2008-02-08 16:42:15+01:00, jonas@perch.ndb.mysql.com +1 -1
    "fix" testprg

  storage/ndb/test/run-test/daily-basic-tests.txt@1.117, 2008-02-08 16:42:15+01:00, jonas@perch.ndb.mysql.com +1 -1
    increase allowed time

ChangeSet@1.2512.7.16, 2008-02-08 17:25:20+03:00, kostja@dipika.(none) +1 -0
  Don't complain about a failure to write a log message if we were
  simply killed.

  sql/log.cc@1.302.5.5, 2008-02-08 17:25:17+03:00, kostja@dipika.(none) +2 -2
    Don't complain if were simply killed.

ChangeSet@1.2476.792.36, 2008-02-08 15:17:45+01:00, jonas@perch.ndb.mysql.com +4 -0
  ndb - bug#34378
    Using more than 16g can cause record-pool ptr.i values to overflow
    Fix by splitting memory into 2 zones, lo(16g)/hi(rest)
    When record pools only use zone_lo, and datamemory, buffers etc...can use any

  storage/ndb/src/kernel/blocks/lgman.cpp@1.33, 2008-02-08 15:17:42+01:00, jonas@perch.ndb.mysql.com +2 -2
    adopt to changed interface for Ndbd_mem_manager

  storage/ndb/src/kernel/vm/Pool.cpp@1.4, 2008-02-08 15:17:42+01:00, jonas@perch.ndb.mysql.com +2 -1
    Always use ZONE_LO for record pools
      as they use ptr.i == 19 bit page id + 13 bit page index

  storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp@1.15, 2008-02-08 15:17:42+01:00, jonas@perch.ndb.mysql.com +311 -79
    Add zones to Ndbd_mem_manager
    ZONE_LO = lower 16g
    ZONE_HI = rest

  storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp@1.9, 2008-02-08 15:17:42+01:00, jonas@perch.ndb.mysql.com +20 -12
    Add zones to Ndbd_mem_manager
    ZONE_LO = lower 16g
    ZONE_HI = rest

ChangeSet@1.2512.21.1, 2008-02-08 15:53:57+03:00, kostja@dipika.(none) +1 -0
  Silence the slow log errors (they won't make it to the client anyway).

  sql/log.cc@1.302.5.4, 2008-02-08 15:53:54+03:00, kostja@dipika.(none) +6 -1
    Silence the slow log errors (they won't make it to the client anyway).

ChangeSet@1.2512.20.2, 2008-02-08 10:47:25-02:00, davi@mysql.com +4 -0
  Manual merge of Bug 33798

  mysql-test/extra/binlog_tests/binlog.test@1.33, 2008-02-08 10:47:22-02:00, davi@mysql.com +17 -0
    Manual merge of binlog test case for Bug#33798

  mysql-test/suite/binlog/r/binlog_row_binlog.result@1.21.2.1, 2008-02-08 10:47:22-02:00, davi@mysql.com +16 -0
    Add test case result for Bug#33798

  mysql-test/suite/binlog/r/binlog_stm_binlog.result@1.39, 2008-02-08 10:47:22-02:00, davi@mysql.com +15 -0
    Add test case result for Bug#33798

  sql/item.cc@1.302, 2008-02-08 10:47:22-02:00, davi@mysql.com +1 -4
    Use new method which accepts a unsigned flag.

ChangeSet@1.1810.3626.2, 2008-02-08 16:04:01+04:00, gshchepa@host.loc +3 -0
  Fixed bug#15409: Columns with 64-element SET may not be updated with integers.
  
  SET column storing procedure has been modified to be 64bit-clean.

  mysql-test/r/type_set.result@1.13.1.2, 2008-02-08 16:03:45+04:00, gshchepa@host.loc +8 -0
    Added test case for bug#15409.

  mysql-test/t/type_set.test@1.12, 2008-02-08 16:03:47+04:00, gshchepa@host.loc +20 -0
    Added test case for bug#15409.

  sql/field.cc@1.256.1.116, 2008-02-08 16:03:48+04:00, gshchepa@host.loc +3 -3
    Fixed bug#15409.
    The Field_set::store(longlong nr,...) method incompletely
    calculates a bit mask for the comparison with a given number:
    if that number is greater than 0x7F00 0000 0000 0000 (LONGLONG_MAX),
    it uses zero bit mask instead of 0xFFFF FFFF FFFF FFFF (ULONGLONG_MAX).
    
    Incomplete expression has been replaced with a set_bits macro call.

ChangeSet@1.1810.3628.3, 2008-02-08 08:55:55-02:00, davi@mysql.com +5 -0
  Bug#33798 prepared statements improperly handle large unsigned ints
  
  The unsignedness of large integer user variables was not being
  properly preserved when feeded to prepared statements. This was
  happening because the unsigned flags wasn't being updated when
  converting the user variable is converted to a parameter.
  
  The solution is to copy the unsigned flag when converting the
  user variable to a parameter and take the unsigned flag into
  account when converting the integer to a string.

  mysql-test/t/binlog.test@1.4.13.1, 2008-02-08 08:55:53-02:00, davi@mysql.com +17 -0
    Add test case for Bug#33798

  mysql-test/r/ps.result@1.56.1.42, 2008-02-08 08:55:53-02:00, davi@mysql.com +16 -0
    Add test case result for Bug#33798

  mysql-test/r/binlog.result@1.4.11.1, 2008-02-08 08:55:53-02:00, davi@mysql.com +15 -0
    Add test case result for Bug#33798

  mysql-test/t/ps.test@1.56.1.41, 2008-02-08 08:55:53-02:00, davi@mysql.com +17 -0
    Add test case for Bug#33798

  sql/item.cc@1.113.106.1, 2008-02-08 08:55:54-02:00, davi@mysql.com +5 -1
    Take the unsigned flag into account when converting the
    user variable.

ChangeSet@1.2512.18.1, 2008-02-08 13:35:11+03:00, kostja@dipika.(none) +1 -0
  Give a more informative message if we failed to write to mysql.general_log
  table.

  sql/log.cc@1.302.5.3, 2008-02-08 13:35:07+03:00, kostja@dipika.(none) +9 -3
    Give a more informative message if we failed to write to mysql.general_log
    table.

ChangeSet@1.1810.3629.1, 2008-02-08 13:35:00+03:00, evgen@sunlight.local +3 -0
  Bug#31590: Wrong error message on sort buffer being too small.
  
  The out of memory error was thrown when the sort buffer size were too small.
  This led to a user confusion.
  
  Now filesort throws the error message about sort buffer being too small.

  mysql-test/r/order_by.result@1.55.1.12, 2008-02-08 13:33:12+03:00, evgen@sunlight.local +12 -0
    Added a test case for the bug#31590: Wrong error message on sort buffer being too small.

  mysql-test/t/order_by.test@1.41.1.9, 2008-02-08 13:32:47+03:00, evgen@sunlight.local +12 -0
    Added a test case for the bug#31590: Wrong error message on sort buffer being too small.

  sql/filesort.cc@1.105.7.1, 2008-02-08 13:33:31+03:00, evgen@sunlight.local +1 -2
    Bug#31590: Wrong error message on sort buffer being too small.
    Now filesort throws the error message about sort buffer being too small
    instead of out of memory error.

ChangeSet@1.2512.2.3, 2008-02-08 00:12:34+01:00, mikael@dator6.(none) +2 -0
  WL#3834: New build script for system admins and developers
  especially for MySQL Cluster Carrier Grade Edition

  BUILD/build_mccge.sh@1.1, 2008-02-07 16:27:04+01:00, mikael@dator6.(none) +1516 -0
    BitKeeper file /home/mikael/mysql_clones/mysql-5.1-engines/BUILD/build_mccge.sh

  BUILD/build_mccge.sh@1.0, 2008-02-07 16:27:04+01:00, mikael@dator6.(none) +0 -0

  BUILD/check-cpu@1.30, 2008-02-08 00:12:33+01:00, mikael@dator6.(none) +63 -82
    Added comments
    Added support for Core 2 cpu's
    Fixed some bad styles for scripts
    Fixed some copy-paste bug
    Added support for i386 from Mac OS X
    Added support for Itanium
    Added support for Sparc
    Added support for GCC 4.2+
    Fixed some issues with later change of cpu_arg
    Removed some broken, unnecessarily complex parts
    to find native compiler flags

ChangeSet@1.2512.7.12, 2008-02-07 19:58:06-02:00, davi@mysql.com +4 -0
  Bug#31891 Meaningful stack trace
  
  On crashes generate a user-friendly resolved and demangled stack
  trace when libc provides the necessary functions (newer libc on i386,
  x86_64, powerpc, ia64, alpha and s390). Otherwise print a numeric
  stack trace as before, relying on resolve_stack_dump utility.

  configure.in@1.471.1.2, 2008-02-07 19:58:03-02:00, davi@mysql.com +18 -3
    Add check for backtrace headers, backtrace functions and if
    __cxa_demangle (libstdc++) is available at link time.

  sql/mysqld.cc@1.682.15.2, 2008-02-07 19:58:03-02:00, davi@mysql.com +29 -0
    Print the value of the THD::killed variable when dumping. In
    some circumstances knowing if the thread was killed makes
    debugging easier.

  sql/stacktrace.c@1.32, 2008-02-07 19:58:04-02:00, davi@mysql.com +64 -0
    Use the glibc backtrace function when available and demangle
    C++ function names if the __cxa_demangle function is available.

  sql/stacktrace.h@1.12, 2008-02-07 19:58:04-02:00, davi@mysql.com +8 -0
    Locally export and wrap in C linkage the C++ function __cxa_demangle
    if available.

ChangeSet@1.1810.3628.2, 2008-02-07 23:52:30+03:00, kostja@dipika.(none) +1 -0
  Fix compile warning about undefined rmdir() function.

  client/mysqltest.c@1.155.9.122, 2008-02-07 23:52:28+03:00, kostja@dipika.(none) +4 -0
    Fix compile warning about undefined rmdir() function.

ChangeSet@1.2512.7.10, 2008-02-07 12:00:48-07:00, malff@lambda.hsd1.co.comcast.net. +2 -0
  test update

  mysql-test/r/ps_ddl.result@1.2, 2008-02-07 12:00:45-07:00, malff@lambda.hsd1.co.comcast.net. +2338 -1060
    test update

  mysql-test/t/ps_ddl.test@1.2, 2008-02-07 12:00:45-07:00, malff@lambda.hsd1.co.comcast.net. +303 -315
    test update

ChangeSet@1.2512.15.2, 2008-02-07 19:21:23+01:00, sven@riska.(none) +1 -0
  WL#4078: Document binary format of binlog entries
  Documented Table_map_log_event and packed integer format. Improved
  other documentation. No change outside comments.

  sql/log_event.h@1.172, 2008-02-07 19:21:21+01:00, sven@riska.(none) +491 -124
    Documented Table_map_log_event and packed integer format. Improved
    other documentation. No change outside comments.

ChangeSet@1.2512.4.9, 2008-02-07 16:26:22+01:00, mattiasj@witty.ndb.mysql.com +3 -0
  Bug#34225: suite/parts test failure
  
  Pre push fix:
  added --sorted_result for consistent results

  mysql-test/suite/parts/inc/partition_bit.inc@1.6, 2008-02-07 16:26:20+01:00, mattiasj@witty.ndb.mysql.com +7 -0
    Bug#34225: suite/parts test failure
    
    added --sorted_result for consistent results

  mysql-test/suite/parts/r/partition_bit_innodb.result@1.4, 2008-02-07 16:26:20+01:00, mattiasj@witty.ndb.mysql.com +29 -29
    Bug#34225: suite/parts test failure
    
    added --sorted_result for consistent results

  mysql-test/suite/parts/r/partition_bit_myisam.result@1.5, 2008-02-07 16:26:21+01:00, mattiasj@witty.ndb.mysql.com +28 -28
    Bug#34225: suite/parts test failure
    
    added --sorted_result for consistent results

ChangeSet@1.2512.16.1, 2008-02-07 15:09:59+01:00, mattiasj@witty.ndb.mysql.com +3 -0
  Bug#34358: Cannot find specified bit row in partitioned table
  
  Problem was incorrect data length in the key_restore function
  resulting in overwriting the search key.
  
  Solution, remove one byte in length if uneven bits are used.

  mysql-test/r/partition_datatype.result@1.1.1.1, 2008-02-07 15:09:56+01:00, mattiasj@witty.ndb.mysql.com +49 -19
    Bug#34358: Cannot find specified bit row
    
    Updated result file

  mysql-test/t/partition_datatype.test@1.1.1.1, 2008-02-07 15:09:57+01:00, mattiasj@witty.ndb.mysql.com +29 -13
    Bug#34358: Cannot find specified bit row
    
    Updated test file
    (corrected a few errors and added a test case for the bug)

  sql/key.cc@1.57, 2008-02-07 15:09:57+01:00, mattiasj@witty.ndb.mysql.com +6 -1
    Bug34358: error in key_restore for bit fields with uneven bits
    
    When uneven bits exist, it has special treatment for the uneven bits
    but does use the same byte again when copying the rest of
    the key_part.

ChangeSet@1.2512.10.4, 2008-02-07 12:30:52+01:00, mkindahl@dl145h.mysql.com +8 -0
  Renaming some saved binary log files to avoid 99 characters
  limit for v7 tar.

  mysql-test/suite/binlog/std_data/bug32407.001@1.2, 2008-02-07 11:17:18+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: mysql-test/suite/binlog/std_data/binlog-bug32407.000001 -> mysql-test/suite/binlog/std_data/bug32407.001

  mysql-test/suite/binlog/std_data/ver_5_1-telco.001@1.2, 2008-02-07 11:16:24+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1-telco.000001 -> mysql-test/suite/binlog/std_data/ver_5_1-telco.001

  mysql-test/suite/binlog/std_data/ver_5_1-wl2325_r.001@1.2, 2008-02-07 11:16:49+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_row.000001 -> mysql-test/suite/binlog/std_data/ver_5_1-wl2325_r.001

  mysql-test/suite/binlog/std_data/ver_5_1-wl2325_s.001@1.2, 2008-02-07 11:16:55+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_stm.000001 -> mysql-test/suite/binlog/std_data/ver_5_1-wl2325_s.001

  mysql-test/suite/binlog/std_data/ver_5_1_17.001@1.2, 2008-02-07 11:16:04+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1_17.000001 -> mysql-test/suite/binlog/std_data/ver_5_1_17.001

  mysql-test/suite/binlog/std_data/ver_5_1_23.001@1.2, 2008-02-07 11:16:11+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1_23.000001 -> mysql-test/suite/binlog/std_data/ver_5_1_23.001

  mysql-test/suite/binlog/t/binlog_base64_flag.test@1.2, 2008-02-07 12:30:30+01:00, mkindahl@dl145h.mysql.com +3 -3
    Renaming some saved binary log files to avoid 99 characters
    limit for v7 tar.

  mysql-test/suite/binlog/t/binlog_old_versions.test@1.1.1.3, 2008-02-07 12:30:36+01:00, mkindahl@dl145h.mysql.com +5 -5
    Renaming some saved binary log files to avoid 99 characters
    limit for v7 tar.

ChangeSet@1.2512.14.1, 2008-02-07 12:28:38+01:00, mattiasj@witty.local +4 -0
  Bug#33379: valgrind error in parts/partition_bit_myisam
  
  Problem was that Field_bit used Field::hash() function that did not
  know about using null-byte for storing bits.
  Resulting in wrong length, which was caught by valgrind.
  
  Solution: created a Field_bit::hash() that uses Field_bit::val_int()
  and my_charset_bin-collation function hash_sort.
  Also use the store function for platform independs

  mysql-test/r/partition_datatype.result@1.2, 2008-02-07 12:28:36+01:00, mattiasj@witty.local +14 -0
    Bug#33379: valgrind error in parts/partition_bit_myisam
    
    result file
    
    enabled bit datatype test

  mysql-test/t/partition_datatype.test@1.2, 2008-02-07 12:28:36+01:00, mattiasj@witty.local +10 -10
    Bug#33379: valgrind error in parts/partition_bit_myisam
    
    test file
    
    enabled bit datatype test

  sql/field.cc@1.432, 2008-02-07 12:28:36+01:00, mattiasj@witty.local +17 -0
    Bug#33379: valgrind error in parts/partition_bit_myisam
    
    Problem was that Field_bit used Field::hash() function that did not
    know about using null-byte for storing bits.
    Resulting in wrong length.
    
    Solution: created a Field_bit::hash() that uses Field_bit::val_int()
    and my_charset_bin-collation function hash_sort.
    Also use the store function for platform independens.

  sql/field.h@1.258, 2008-02-07 12:28:36+01:00, mattiasj@witty.local +1 -0
    Bug#33379: valgrind error in parts/partition_bit_myisam
    
    Problem was that Field_bit used Field::hash() function that did not
    know about using null-byte for storing bits.
    Resulting in wrong length.
    
    Solution: created a Field_bit::hash().

ChangeSet@1.2512.13.1, 2008-02-07 12:04:19+01:00, istruewing@stella.local +2 -0
  Bug#34376 - merge-big test fails
  After changes to the bug fix for bug 26379 (Combination of FLUSH
  TABLE and REPAIR TABLE corrupts a MERGE table) the test case
  merge-big failed.
  Repaired the test case.
  Removed tests for INSERT ... SELECT, which is disabled for MERGE.
  Test case change only.

  mysql-test/r/merge-big.result@1.2, 2008-02-07 12:04:18+01:00, istruewing@stella.local +0 -51
    Bug#34376 - merge-big test fails
    Removed result for removed tests.

  mysql-test/t/merge-big.test@1.2, 2008-02-07 12:04:18+01:00, istruewing@stella.local +8 -76
    Bug#34376 - merge-big test fails
    Repaired the test case.
    Removed tests for INSERT ... SELECT, which is disabled for MERGE.

ChangeSet@1.2512.11.2, 2008-02-07 08:47:39-02:00, davi@mysql.com +13 -0
  Bug#32633 Can not create any routine if SQL_MODE=no_engine_substitution
  
  The problem is that one can not create a stored routine if sql_mode
  contains NO_ENGINE_SUBSTITUTION or PAD_CHAR_TO_FULL_LENGTH. Also when
  a event is created, the mode is silently lost if sql_mode contains one
  of the aforementioned.  This was happening because the table definitions
  which stored sql_mode values weren't being updated to accept new values
  of sql_mode.
  
  The solution is to update, in a backwards compatible manner, the various
  table definitions (columns) that store the sql_mode value to take into
  account the new possible values. One incompatible change is that if a event
  that is being created can't be stored to the mysql.event table, an error
  will be raised.
  
  The tests case also ensure that new SQL modes will be added to the mysql.proc
  and mysql.event tables, otherwise the tests will fail.

  mysql-test/r/events_bugs.result@1.46, 2008-02-07 08:47:37-02:00, davi@mysql.com +13 -0
    Add test case result for Bug#32633

  mysql-test/r/information_schema.result@1.163, 2008-02-07 08:47:37-02:00, davi@mysql.com +1 -1
    Update the sql_mode column definition.

  mysql-test/r/sp.result@1.310, 2008-02-07 08:47:37-02:00, davi@mysql.com +16 -0
    Add test case result for Bug#32633

  mysql-test/r/system_mysql_db.result@1.52, 2008-02-07 08:47:37-02:00, davi@mysql.com +2 -2
    Update the sql_mode column definition.

  mysql-test/t/events_bugs.test@1.38, 2008-02-07 08:47:37-02:00, davi@mysql.com +20 -0
    Add test case for Bug#32633

  mysql-test/t/sp.test@1.269, 2008-02-07 08:47:37-02:00, davi@mysql.com +23 -0
    Add test case for Bug#32633

  mysql-test/t/system_mysql_db_fix50117.test@1.2, 2008-02-07 08:47:37-02:00, davi@mysql.com +1 -1
    Update the sql_mode column definition.

  scripts/mysql_system_tables.sql@1.18, 2008-02-07 08:47:37-02:00, davi@mysql.com +2 -2
    Update the sql_mode column definition.

  scripts/mysql_system_tables_fix.sql@1.68, 2008-02-07 08:47:37-02:00, davi@mysql.com +6 -2
    Update the sql_mode column definition.

  sql-common/my_user.c@1.4, 2008-02-07 08:47:38-02:00, davi@mysql.com +7 -1
    Truncate length if user name or host name does not fit
    in the buffer.

  sql/event_db_repository.cc@1.39, 2008-02-07 08:47:37-02:00, davi@mysql.com +45 -24
    Reset and restore SQL modes when storing and loading a
    event from the data dictionary. Also throw out a error
    if a store fails.

  sql/mysqld.cc@1.682.15.1, 2008-02-07 08:47:37-02:00, davi@mysql.com +5 -0
    Add warning to avoid this problem in the future.

  sql/sp.cc@1.173.1.1, 2008-02-07 08:47:38-02:00, davi@mysql.com +11 -2
    SQL mode of the thread must not effect data dictionary operations.

ChangeSet@1.1810.3627.1, 2008-02-07 08:48:28+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#33050 5.0.50 fails many SSL testcases

  vio/viossl.c@1.34.2.11, 2008-02-07 08:48:27+01:00, msvensson@pilot.mysql.com +21 -14
    Bug#33050 5.0.50 fails many SSL testcases

ChangeSet@1.2512.10.3, 2008-02-07 08:41:32+01:00, mkindahl@dl145h.mysql.com +1 -0
  Disabling declaration of debug variable for non-debug builds.

  sql/slave.cc@1.334.1.1, 2008-02-07 08:41:21+01:00, mkindahl@dl145h.mysql.com +2 -0
    Disabling declaration in non-debug builds.

ChangeSet@1.1810.3624.2, 2008-02-07 11:12:49+04:00, gshchepa@host.loc +4 -0
  innodb_mysql.test, variables.result, variables.test, innodb_mysql.result:
    Minor post-fix for bug#34223.

  mysql-test/t/innodb_mysql.test@1.3.53.1, 2008-02-07 11:11:49+04:00, gshchepa@host.loc +14 -0
    Minor post-fix for bug#34223.

  mysql-test/r/innodb_mysql.result@1.3.22.8, 2008-02-07 11:11:31+04:00, gshchepa@host.loc +6 -0
    Minor post-fix for bug#34223.

  mysql-test/r/variables.result@1.76.10.2, 2008-02-07 11:11:44+04:00, gshchepa@host.loc +0 -6
    Minor post-fix for bug#34223.

  mysql-test/t/variables.test@1.51.14.2, 2008-02-07 11:11:51+04:00, gshchepa@host.loc +0 -13
    Minor post-fix for bug#34223.

ChangeSet@1.1810.3625.1, 2008-02-07 08:08:43+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#32025 ndb_waiter does too many roundtrips to ndb_mgmd

  ndb/tools/waiter.cpp@1.23.5.1, 2008-02-07 08:08:42+01:00, msvensson@pilot.mysql.com +43 -86
    - Only contact ndb_mgmd once per loop
    - Program only cares about ndbd nodes -> remove the api and mgm vectors
    - Program can not wait for "starting" -> remove that code
    - Remove unused includes
    - Protect against SIGPIPE(writing to a socket where the mgmsrv was
      gone, silently killed the program)
    - Don't sleep one second if if all nodes are in the wanted state  
    - Use 100 milliseconds sleep between each poll

ChangeSet@1.1810.3606.7, 2008-02-07 05:10:04+03:00, sergefp@mysql.com +1 -0
  BUG#27732 "Possible memory leak with index_merge"
  The bug was that handler::clone/handler::ha_open() call caused allocation of 
  cloned_copy->ref on the handler->table->mem_root. The allocated memory could not 
  be reclaimed until the table is flushed, so it was possible to exhaust memory by 
  repeatedly running index_merge queries without doing table flushes.  
  
  The fix:
  - make handler::clone() allocate new_handler->ref on the passed mem_root 
  - make handler::ha_open() not allocate this->ref if it has already been allocated
  There is no testcase as it is not possible to check small leaks from testsuite.

  sql/handler.cc@1.167.1.74, 2008-02-07 05:09:59+03:00, sergefp@mysql.com +10 -2
    BUG#27732 "Possible memory leak with index_merge"
    - make handler::clone() allocate new_handler->ref on the passed mem_root 
    - make handler::ha_open() not allocate this->ref if it has already been allocated

ChangeSet@1.1810.3606.5, 2008-02-07 04:54:58+04:00, gshchepa@host.loc +1 -0
  bdb.result:
    Minor post-fix for bug#30059.

  mysql-test/r/bdb.result@1.48.5.1, 2008-02-07 04:54:13+04:00, gshchepa@host.loc +1 -0
    Minor post-fix for bug#30059.

ChangeSet@1.1810.3624.1, 2008-02-07 04:14:50+04:00, gshchepa@host.loc +3 -0
  Fixed bug#34223: Failure on assignment to my_innodb_autoextend_increment
  and my_innodb_commit_concurrency global variables.
  
  Type of the my_innodb_autoextend_increment and the
  my_innodb_commit_concurrency variables has been changed to
  GET_ULONG.
  

  mysql-test/r/variables.result@1.76.10.1, 2008-02-07 04:10:08+04:00, gshchepa@host.loc +6 -0
    Added test case for bug#34223.

  mysql-test/t/variables.test@1.51.14.1, 2008-02-07 04:10:10+04:00, gshchepa@host.loc +13 -0
    Added test case for bug#34223.

  sql/mysqld.cc@1.439.1.195, 2008-02-07 04:10:10+04:00, gshchepa@host.loc +2 -2
    Fixed bug#34223.
    Last update of the getopt_ull_limit_value function introduced
    a sanity check for a variable type (only GET_UINT or GET_ULONG
    are valid types).
    However, my_innodb_autoextend_increment and
    my_innodb_commit_concurrency are declared as GET_LONG.
    Call stack is: 
            sys_var_long_ptr_global::update()
            fix_unsigned()
            getopt_ull_limit_value()
    
    Type of the my_innodb_autoextend_increment and the
    my_innodb_commit_concurrency variables has been changed to
    GET_ULONG.

ChangeSet@1.1810.3606.4, 2008-02-07 02:33:21+04:00, gshchepa@host.loc +9 -0
  Fixed bug#30059.
  Server handles truncation for assignment of too-long values
  into CHAR/VARCHAR/TEXT columns in a different ways when the
  truncated characters are spaces:
  1. CHAR(N) columns silently ignore end-space truncation;
  2. TEXT columns post a truncation warning/error in the
     non-strict/strict mode.
  3. VARCHAR columns always post a truncation note in
     any mode.
  
  Space truncation processing has been synchronised over
  CHAR/VARCHAR/TEXT columns: current behavior of VARCHAR
  columns has been propagated as standard.
  
  Binary-encoded string/BLOB columns are not affected.

  mysql-test/r/heap.result@1.42.1.9, 2008-02-07 02:32:57+04:00, gshchepa@host.loc +1 -0
    Updated test case for bug#30059.

  mysql-test/r/innodb.result@1.145.1.28, 2008-02-07 02:32:59+04:00, gshchepa@host.loc +1 -0
    Updated test case for bug#30059.

  mysql-test/r/myisam.result@1.71.17.1, 2008-02-07 02:32:59+04:00, gshchepa@host.loc +1 -0
    Updated test case for bug#30059.

  mysql-test/r/strict.result@1.25.8.4, 2008-02-07 02:33:00+04:00, gshchepa@host.loc +2 -0
    Updated test case for bug#30059.

  mysql-test/r/type_binary.result@1.3.1.2, 2008-02-07 02:33:00+04:00, gshchepa@host.loc +1 -0
    Updated test case for bug#30059.

  mysql-test/r/warnings.result@1.34.1.8, 2008-02-07 02:33:01+04:00, gshchepa@host.loc +38 -0
    Added test case for bug#30059.

  mysql-test/t/warnings.test@1.22.1.5, 2008-02-07 02:33:02+04:00, gshchepa@host.loc +33 -0
    Added test case for bug#30059.

  sql/field.cc@1.256.1.115, 2008-02-07 02:33:02+04:00, gshchepa@host.loc +31 -43
    Fixed bug#30059.
    The report_data_too_long function was replaced with the
    Field_longstr::report_if_important_data method.
    
    The Field_string::store and the Field_blob::store
    methods was synchronized with the Field_varstring::store
    method.
    Changes:
    1. to CHAR(N): posting of space truncation note has been added
       in both (strict and non-strict) modes;
    2. to BLOBs: a check for space truncation has been added,
       a warning in the non-strict mode and an error message in
       the strict mode have been replaced with a truncation note.
    
    Similar parts of Field_string::store, Field_blob::store and
    Field_varstring::store have been moved to the
    Field_longstr::report_if_important_data method.

  sql/field.h@1.153.27.15, 2008-02-07 02:33:03+04:00, gshchepa@host.loc +2 -0
    Fixed bug#30059.
    The Field_longstr::report_if_important_data method has been declared.

ChangeSet@1.2512.12.1, 2008-02-06 21:26:05+01:00, istruewing@stella.local +1 -0
  Bug#31331 - MyISAM or Merge Table upgrade incompatibility with 5.1
  
  A table with BLOB/TEXT prefix key part, created with version 4.1,
  could not be opened by a 5.1 server.
  
  The routine check at table open, if the frm file matches the MyISAM
  table, was too picky regarding old and new implementation of such
  keys.
  
  Added relaxed check for blob prefix key part.
  
  No test case. It requires to create a table in 4.1 and open it in
  5.1.

  storage/myisam/ha_myisam.cc@1.231.1.8, 2008-02-06 21:26:03+01:00, istruewing@stella.local +20 -1
    Bug#31331 - MyISAM or Merge Table upgrade incompatibility with 5.1
    Added relaxed check for blob prefix key part.

ChangeSet@1.1810.3614.10, 2008-02-06 20:55:12+01:00, sven@riska.(none) +1 -0
  Replace windows path separator backslash by unix path separator forward
  slash in filenames also for Create_file_log_event.

  client/mysqlbinlog.cc@1.123.1.19, 2008-02-06 20:55:11+01:00, sven@riska.(none) +31 -7
    BUG#34355: mysqlbinlog outputs backslash as path separator for 4.1 binlogs
    Problem: When the windows version of mysqlbinlog reads 4.1 binlogs
    containing LOAD DATA INFILE, it outputs backslashes as path separators in
    filenames. However, the output is typically piped to a client, and client
    expects forward slashes.
    Fix: Replace '\\' by '/' in filenames.

ChangeSet@1.2512.4.6, 2008-02-06 15:13:56+01:00, mattiasj@witty. +49 -0
  Bug#34225: test suit parts uses /tmp-dir
  
  Since it used /tmp-dir, it continues to fail on the same server
  until the /tmp-dir is cleaned. (Another problem was that it
  uses DATA/INDEX DIR without checking for symlink, which is needed)
  
  
  Solution:
  Moved all DATA/INDEX DIR test to a new partition_basic_symlink.inc file
  and use this for myisam and innodb, also requiring symlinks and
  not_windows.
  (i.e. removed DATA/INDEX DIR use from several tests)

  mysql-test/suite/parts/inc/partition_basic.inc@1.6, 2008-02-06 15:13:50+01:00, mattiasj@witty. +0 -45
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_basic_symlink.inc@1.1, 2008-02-06 15:13:52+01:00, mattiasj@witty. +159 -0
    Bug#34225: test suit parts uses /tmp-dir
    
    Added this test case for testing some DATA/INDEX DIRECTORY cases
    since I removed so much of it from all other tests.

  mysql-test/suite/parts/inc/partition_basic_symlink.inc@1.0, 2008-02-06 15:13:52+01:00, mattiasj@witty. +0 -0

  mysql-test/suite/parts/inc/partition_bigint.inc@1.4, 2008-02-06 15:13:50+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_binary.inc@1.5, 2008-02-06 15:13:50+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_bit.inc@1.5, 2008-02-06 15:13:50+01:00, mattiasj@witty. +6 -18
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_blob.inc@1.5, 2008-02-06 15:13:50+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_char.inc@1.5, 2008-02-06 15:13:50+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_date.inc@1.5, 2008-02-06 15:13:50+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_datetime.inc@1.5, 2008-02-06 15:13:50+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_decimal.inc@1.5, 2008-02-06 15:13:50+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_double.inc@1.5, 2008-02-06 15:13:50+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_enum.inc@1.6, 2008-02-06 15:13:50+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_float.inc@1.5, 2008-02-06 15:13:50+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_int.inc@1.4, 2008-02-06 15:13:51+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_key_16col.inc@1.4, 2008-02-06 15:13:51+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_key_32col.inc@1.4, 2008-02-06 15:13:51+01:00, mattiasj@witty. +8 -20
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_key_4col.inc@1.4, 2008-02-06 15:13:51+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_key_8col.inc@1.4, 2008-02-06 15:13:51+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_mediumint.inc@1.4, 2008-02-06 15:13:51+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_set.inc@1.6, 2008-02-06 15:13:51+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_smallint.inc@1.4, 2008-02-06 15:13:51+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_text.inc@1.5, 2008-02-06 15:13:51+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_time.inc@1.5, 2008-02-06 15:13:51+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_timestamp.inc@1.5, 2008-02-06 15:13:51+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_tinyint.inc@1.4, 2008-02-06 15:13:51+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_varbinary.inc@1.5, 2008-02-06 15:13:51+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_varchar.inc@1.5, 2008-02-06 15:13:51+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/inc/partition_year.inc@1.4, 2008-02-06 15:13:51+01:00, mattiasj@witty. +4 -16
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/r/partition_basic_innodb.result@1.6, 2008-02-06 15:13:51+01:00, mattiasj@witty. +18 -6687
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/r/partition_basic_myisam.result@1.6, 2008-02-06 15:13:51+01:00, mattiasj@witty. +6 -7125
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/r/partition_basic_symlink_innodb.result@1.1, 2008-02-06 15:13:52+01:00, mattiasj@witty. +37465 -0
    Bug#34225: test suit parts uses /tmp-dir
    
    Added this test case for testing some DATA/INDEX DIRECTORY cases
    since I removed so much of it from all other tests.

  mysql-test/suite/parts/r/partition_basic_symlink_innodb.result@1.0, 2008-02-06 15:13:52+01:00, mattiasj@witty. +0 -0

  mysql-test/suite/parts/r/partition_basic_symlink_myisam.result@1.1, 2008-02-06 15:13:52+01:00, mattiasj@witty. +22911 -0
    Bug#34225: test suit parts uses /tmp-dir
    
    Added this test case for testing some DATA/INDEX DIRECTORY cases
    since I removed so much of it from all other tests.

  mysql-test/suite/parts/r/partition_basic_symlink_myisam.result@1.0, 2008-02-06 15:13:52+01:00, mattiasj@witty. +0 -0

  mysql-test/suite/parts/r/partition_bit_innodb.result@1.3, 2008-02-06 15:13:52+01:00, mattiasj@witty. +8 -20
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/r/partition_bit_myisam.result@1.4, 2008-02-06 15:13:52+01:00, mattiasj@witty. +8 -20
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/r/partition_char_innodb.result@1.4, 2008-02-06 15:13:52+01:00, mattiasj@witty. +616 -677
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/r/partition_char_myisam.result@1.2, 2008-02-06 15:13:52+01:00, mattiasj@witty. +616 -677
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/r/partition_datetime_innodb.result@1.4, 2008-02-06 15:13:52+01:00, mattiasj@witty. +25 -65
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/r/partition_datetime_myisam.result@1.5, 2008-02-06 15:13:52+01:00, mattiasj@witty. +25 -65
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/r/partition_decimal_innodb.result@1.4, 2008-02-06 15:13:52+01:00, mattiasj@witty. +5 -13
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/r/partition_decimal_myisam.result@1.5, 2008-02-06 15:13:52+01:00, mattiasj@witty. +5 -13
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/r/partition_float_innodb.result@1.4, 2008-02-06 15:13:52+01:00, mattiasj@witty. +10 -26
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/r/partition_float_myisam.result@1.5, 2008-02-06 15:13:52+01:00, mattiasj@witty. +10 -26
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/r/partition_int_innodb.result@1.3, 2008-02-06 15:13:52+01:00, mattiasj@witty. +25 -65
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/r/partition_int_myisam.result@1.4, 2008-02-06 15:13:52+01:00, mattiasj@witty. +25 -65
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/r/partition_special_innodb.result@1.3, 2008-02-06 15:13:52+01:00, mattiasj@witty. +24 -64
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/r/partition_special_myisam.result@1.4, 2008-02-06 15:13:52+01:00, mattiasj@witty. +24 -64
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

  mysql-test/suite/parts/t/partition_basic_symlink_innodb.test@1.1, 2008-02-06 15:13:52+01:00, mattiasj@witty. +84 -0
    Bug#34225: test suit parts uses /tmp-dir
    
    Added this test case for testing some DATA/INDEX DIRECTORY cases
    since I removed so much of it from all other tests.

  mysql-test/suite/parts/t/partition_basic_symlink_innodb.test@1.0, 2008-02-06 15:13:52+01:00, mattiasj@witty. +0 -0

  mysql-test/suite/parts/t/partition_basic_symlink_myisam.test@1.1, 2008-02-06 15:13:52+01:00, mattiasj@witty. +86 -0
    Bug#34225: test suit parts uses /tmp-dir
    
    Added this test case for testing some DATA/INDEX DIRECTORY cases
    since I removed so much of it from all other tests.

  mysql-test/suite/parts/t/partition_basic_symlink_myisam.test@1.0, 2008-02-06 15:13:52+01:00, mattiasj@witty. +0 -0

  mysql-test/suite/parts/t/partition_sessions.test@1.3, 2008-02-06 15:13:52+01:00, mattiasj@witty. +5 -26
    Bug#34225: test suit parts uses /tmp-dir
    
    Removed the DATA/INDEX DIR, since the test is not dependent of it
    (adding "--source include/have_symlink.inc" would have disabled it
    on some platforms/configurations)

ChangeSet@1.1810.3496.37, 2008-02-06 15:08:45+01:00, mskold@mysql.com +1 -0
  Added random sleeps before retrying temporarly failed DICT signals, to avoid race conditions

  ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.74.38.1, 2008-02-06 15:08:36+01:00, mskold@mysql.com +18 -1
    Added random sleeps before retrying temporarly failed DICT signals, to avoid race conditions

ChangeSet@1.2512.10.2, 2008-02-06 14:44:47+01:00, mkindahl@dl145h.mysql.com +4 -0
  Patch to eliminate some valgrind warnings in debug printout code.

  sql/rpl_rli.cc@1.18, 2008-02-06 14:44:24+01:00, mkindahl@dl145h.mysql.com +4 -1
    Adding variable to mark an instance of Relay_log_info as fake.

  sql/rpl_rli.h@1.25, 2008-02-06 14:44:29+01:00, mkindahl@dl145h.mysql.com +4 -0
    Adding variable to mark an instance of Relay_log_info as fake.

  sql/slave.cc@1.334, 2008-02-06 14:44:34+01:00, mkindahl@dl145h.mysql.com +14 -8
    Not printing debug information if we are working with a fake
    instance of Relay_log_info. This because the result of calling
    update is nonsense, and trying to print it generates valgrind
    warnings.

  sql/sql_binlog.cc@1.17.1.1, 2008-02-06 14:44:34+01:00, mkindahl@dl145h.mysql.com +3 -0
    Marking newly created instance of Relay_log_info as a fake instance.

ChangeSet@1.2512.11.1, 2008-02-06 11:20:15-02:00, davi@mysql.com +3 -0
  Bug#32710: SHOW INNODB STATUS requires SUPER
  
  Changed "SHOW ENGINE ... STATUS" and "SHOW ENGINE ... MUTEX"
  to require the PROCESS privilege, instead of SUPER.
  
  Fixed by Damien Katz

  mysql-test/r/show_check.result@1.134, 2008-02-06 11:20:11-02:00, davi@mysql.com +5 -0
    Add test case result for Bug#32710

  mysql-test/t/show_check.test@1.92, 2008-02-06 11:20:12-02:00, davi@mysql.com +19 -0
    Add test case for Bug#32710

  sql/sql_parse.cc@1.713.4.2, 2008-02-06 11:20:12-02:00, davi@mysql.com +2 -2
    Require PROCESS privilege instead of SUPER.

ChangeSet@1.1810.3623.1, 2008-02-06 14:18:26+01:00, jperkin@mysql.com +1 -0
  Raise version number after cloning 5.0.56

  configure.in@1.245.112.1, 2008-02-06 14:18:12+01:00, jperkin@mysql.com +2 -2
    Raise version number after cloning 5.0.56

ChangeSet@1.2476.792.32, 2008-02-06 13:06:05+01:00, jonas@perch.ndb.mysql.com +5 -0
  ndb - bug#34216
    During TC-take-over (NF) the new-TC builds up a new transaction state
    And commits operation according to this state.
    However, in the new state that is build, the operations does not have to be in same order, as "real" state
    In the multi-update-case, this means that operations can be commit in "incorrect" order
  
    i.e update A, delete A, insert A is normally commited in same order as prepared
        but can be committed in any order
  
    This patch changes TUP handling of these out-order commits, and previous implementation
      could confuse the TUX triggers

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.80, 2008-02-06 13:06:03+01:00, jonas@perch.ndb.mysql.com +6 -1
    new method

  storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp@1.20, 2008-02-06 13:06:03+01:00, jonas@perch.ndb.mysql.com +35 -0
    move removeActiveOpList, cause it's now only used by DbtupAbort

  storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp@1.33, 2008-02-06 13:06:03+01:00, jonas@perch.ndb.mysql.com +94 -113
    - move tux-trigger execution *before* check of disk, since ops can be committed during a disk timeslice
    - allow out-of-order commits and use tuple_ptr->m_operation_ptr_i for determening "real" commit
      (instead of re-ordering operations on the fly, which confused tux-triggers)

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.78, 2008-02-06 13:06:03+01:00, jonas@perch.ndb.mysql.com +1 -1
    use constant instead of number

  storage/ndb/test/run-test/daily-basic-tests.txt@1.116, 2008-02-06 13:06:03+01:00, jonas@perch.ndb.mysql.com +1 -1
    "old-51" does not yet support --nologging

ChangeSet@1.2512.9.5, 2008-02-06 14:55:19+03:00, anozdrin@quad. +2 -0
  Add a test case for Bug#21380: DEFAULT definition not always
  transfered by CREATE TABLE/SELECT to the new table.

  mysql-test/r/create.result@1.159.1.1, 2008-02-06 14:55:18+03:00, anozdrin@quad. +46 -0
    Update result file.

  mysql-test/t/create.test@1.109.1.1, 2008-02-06 14:55:18+03:00, anozdrin@quad. +44 -0
    Add a test case for Bug#21380: DEFAULT definition not always
    transfered by CREATE TABLE/SELECT to the new table.

ChangeSet@1.2512.9.4, 2008-02-06 09:40:59-02:00, davi@mysql.com +2 -0
  Bug#34311 main.lock_multi.test fails
  
  Re-enable the test case for Bug 30331.

  mysql-test/r/lock_multi.result@1.36, 2008-02-06 09:40:56-02:00, davi@mysql.com +10 -0
    Update the test case result for Bug#30331

  mysql-test/t/lock_multi.test@1.39, 2008-02-06 09:40:57-02:00, davi@mysql.com +27 -32
    Re-enable the test case for Bug#30331

ChangeSet@1.2518.4.1, 2008-02-06 11:44:07+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#19911 ndb does not work on sol10 x86

  sql/ha_ndbcluster_binlog.cc@1.140.1.1, 2008-02-06 11:44:05+01:00, msvensson@pilot.mysql.com +1 -1
    Change 'assert' to 'DBUG_ASSERT' to avoid that the assert is triggered in the optimized version
    on solaris 10 for x86

ChangeSet@1.2476.792.31, 2008-02-06 11:28:43+01:00, jonas@perch.ndb.mysql.com +6 -0
  ndb - bug#34216 
    testcases

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.53, 2008-02-06 11:28:41+01:00, jonas@perch.ndb.mysql.com +7 -2
    new error codes

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.173, 2008-02-06 11:28:41+01:00, jonas@perch.ndb.mysql.com +6 -0
    new error codes

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.160, 2008-02-06 11:28:41+01:00, jonas@perch.ndb.mysql.com +4 -1
    new error codes

  storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp@1.32, 2008-02-06 11:28:41+01:00, jonas@perch.ndb.mysql.com +1 -1
    remove assert

  storage/ndb/test/ndbapi/testNodeRestart.cpp@1.63, 2008-02-06 11:28:41+01:00, jonas@perch.ndb.mysql.com +253 -9
    new testcase
    1) -n Bug34216
       Which tests node diying during multip-op commit
       Very controlled
    
    2) -n mixedmultiop
       Runs several threads "load" of same scenario...not very controlled
    

  storage/ndb/test/run-test/daily-basic-tests.txt@1.115, 2008-02-06 11:28:41+01:00, jonas@perch.ndb.mysql.com +8 -0
    new testcases

ChangeSet@1.2520, 2008-02-06 11:02:45+01:00, hhunger@hh-nb.hungers +4 -0
  Fixed differences in STATE in result file for bug#34190.

  BitKeeper/etc/ignore@1.300.1.10, 2008-02-06 11:02:43+01:00, hhunger@hh-nb.hungers +1 -0
    Added mysql-test/suite/funcs_1.tar.zip to the ignore list

  mysql-test/suite/funcs_1/datadict/processlist_val.inc@1.3, 2008-02-06 11:02:43+01:00, hhunger@hh-nb.hungers +27 -37
    Fixed differences in STATE in result file for bug#34190.

  mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result@1.4, 2008-02-06 11:02:43+01:00, hhunger@hh-nb.hungers +18 -40
    Fixed differences in STATE in result file for bug#34190.

  mysql-test/suite/funcs_1/r/b_processlist_val_ps.result@1.4, 2008-02-06 11:02:43+01:00, hhunger@hh-nb.hungers +18 -40
    Fixed differences in STATE in result file for bug#34190.

ChangeSet@1.1810.3620.4, 2008-02-05 23:16:52-07:00, tsmith@ramayana.hindu.god +1 -0
  Minor typo fix for mysql-test-run.pl

  mysql-test/mysql-test-run.pl@1.30.49.112, 2008-02-05 23:16:51-07:00, tsmith@ramayana.hindu.god +2 -3
    Fix typo (missing $prefix arg to mtr_add_arg(--user=root))

ChangeSet@1.2512.10.1, 2008-02-06 06:18:06+01:00, mkindahl@dl145h.mysql.com +1 -0
  Removing duplicate code from mysql-test-run.pl

  mysql-test/mysql-test-run.pl@1.345.1.2, 2008-02-06 06:17:56+01:00, mkindahl@dl145h.mysql.com +0 -8
    Removing duplicate code.

ChangeSet@1.1810.3621.1, 2008-02-06 04:33:27+01:00, mtaylor@solace.(none) +1 -0
  Strip comments from queries before explaining them. Fixes BUG#34339

  scripts/mysql_explain_log.sh@1.3.5.1, 2008-02-06 04:33:26+01:00, mtaylor@solace.(none) +4 -3
    Strip comments from queries before explaining them. Fixes BUG#34339

ChangeSet@1.2512.6.26, 2008-02-05 19:44:16+01:00, mkindahl@dl145h.mysql.com +1 -0
  Updating result file for rpl_loaddata_map.

  mysql-test/suite/rpl/r/rpl_loaddata_map.result@1.8, 2008-02-05 19:44:08+01:00, mkindahl@dl145h.mysql.com +5 -5
    Result change.

ChangeSet@1.2512.6.25, 2008-02-05 17:05:59+01:00, mkindahl@dl145h.mysql.com +1 -0
  Fixes to make tests pass on vanilla build.

  mysql-test/suite/binlog/t/binlog_old_versions.test@1.4, 2008-02-05 17:05:50+01:00, mkindahl@dl145h.mysql.com +1 -1
    Adding --local-load to 'mysqlbinlog' and --local-infile=1 to 'mysql'.

ChangeSet@1.1810.3614.9, 2008-02-05 17:36:26+02:00, aelkin@koti.dsl.inet.fi +2 -0
  Bug #34305 show slave status handling segfaults when slave io is about
      to leave
  
  The artifact was caused by
  a flaw in concurrent accessing the slave's io thd by
  the io itself and a handling show slave status thread.
  Namely, show_master_info did not acquire mi->run_lock mutex that is
  specified for mi->io_thd member.
  
  Fixed with deploying the mutex locking and unlocking. The mutex is kept
  short time and without interleaving with mi->data_lock mutex.
  
  Todo: to report and fix an issue with 
      sys_var_slave_skip_counter::{methods} 
  seem to acquire incorrectly
       active_mi->rli.run_lock
  instead of the specified
       active_mi->rli.data_lock
  
  A test case is difficult to compose, so rpl_packet should continue serving
  as the indicator.

  sql/slave.cc@1.241.28.6, 2008-02-05 17:36:17+02:00, aelkin@koti.dsl.inet.fi +6 -5
    implementing a TODO left at 4.1 time:
    mending access to mi->io_thd with the specified mutex;

  sql/slave.h@1.85.1.16, 2008-02-05 17:36:17+02:00, aelkin@koti.dsl.inet.fi +2 -2
    adding a member name to the list of that run_lock guards.

ChangeSet@1.2512.9.3, 2008-02-05 18:08:02+03:00, anozdrin@quad. +2 -0
  Disabling test case.
  Bug 34311: main.lock_multi.test fails.

  mysql-test/r/lock_multi.result@1.35, 2008-02-05 18:08:01+03:00, anozdrin@quad. +0 -10
    Update result file.

  mysql-test/t/lock_multi.test@1.38, 2008-02-05 18:08:01+03:00, anozdrin@quad. +32 -28
    Disabled test case for Bug#30331.

ChangeSet@1.2518.2.1, 2008-02-05 15:24:41+01:00, joerg@trift2. +1 -0
  ndb_version.h.in  :  Fix a syntax error (variable declaration came too late).

  storage/ndb/include/ndb_version.h.in@1.17, 2008-02-05 15:24:35+01:00, joerg@trift2. +3 -2
    C syntax requires variable declarations to be before executable statements.

ChangeSet@1.2512.6.23, 2008-02-05 13:31:57+01:00, mkindahl@dl145h.mysql.com +1 -0
  Adding some more filtering for tests that kills queries and
  cause sporadic, but benign, errors.

  mysql-test/lib/mtr_report.pl@1.73, 2008-02-05 13:31:48+01:00, mkindahl@dl145h.mysql.com +3 -2
    Filtering out sporadic but benign error in rpl_err_ignoredtable.

ChangeSet@1.1810.3593.2, 2008-02-05 12:56:49+01:00, tnurnberg@blasphemy.intern.azundris.com +1 -0
  Bug#21567: mysqld doesn't react to Ctrl-C when run under GDB even with the --gdb option
  
  Don't block SIGINT (Control-C) when --gdb is passed to mysqld.
  Was broken at least on OS X.
  
  (kudos to Mattias Jonsson)

  sql/mysqld.cc@1.439.145.1, 2008-02-05 12:56:43+01:00, tnurnberg@blasphemy.intern.azundris.com +3 -5
    Don't block SIGINT when TEST_SIGINT (--gdb) is used, even if
    thr_kill_signal is some other signal (SIGUSR2) and
    pthread_sigmask() in signal_hand() isn't good enough.

ChangeSet@1.1810.3619.1, 2008-02-05 12:44:57+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#31239 Test "ndb_views" returns NDB error 4259 "Invalid set of range scan bounds"

  ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp@1.27.8.1, 2008-02-05 12:44:55+01:00, msvensson@pilot.mysql.com +2 -1
    Move the increment to next line to avoid icc optimization problem that
    caused the "b" reference to be incremented

ChangeSet@1.2512.9.2, 2008-02-05 12:27:52+03:00, anozdrin@quad. +1 -0
  Fix merge: fix test.

  mysql-test/t/variables.test@1.91, 2008-02-05 12:27:51+03:00, anozdrin@quad. +2 -2
    Fix merge: fix test.

ChangeSet@1.2512.6.22, 2008-02-05 08:22:27+01:00, mkindahl@dl145h.mysql.com +3 -0
  Disabling test case binlog_old_version for embedded server.

  mysql-test/lib/mtr_report.pl@1.72, 2008-02-05 08:22:11+01:00, mkindahl@dl145h.mysql.com +2 -1
    Ignoring benign error message (killing query causes unpredictable
    error messages).

  mysql-test/suite/binlog/t/binlog_old_versions.test@1.1.1.2, 2008-02-05 08:22:16+01:00, mkindahl@dl145h.mysql.com +1 -0
    Disabling test case for embedded server.

  sql/rpl_rli.cc@1.17, 2008-02-05 08:22:17+01:00, mkindahl@dl145h.mysql.com +1 -0
    Inititializing uninitialized variable causing valgrind warning.

ChangeSet@1.2512.9.1, 2008-02-04 19:55:36+01:00, thek@adventure.(none) +2 -0
  Patch clean up.
  Fixed interference between tests: Users were added but not properly removed.
  This caused later tests to fail.

  mysql-test/r/grant.result@1.92, 2008-02-04 19:55:32+01:00, thek@adventure.(none) +3 -2
    Fixed interference between tests: Users were added but not properly removed.
    This caused later tests to fail.

  mysql-test/t/grant.test@1.70, 2008-02-04 19:55:32+01:00, thek@adventure.(none) +3 -2
    Fixed interference between tests: Users were added but not properly removed.
    This caused later tests to fail.

ChangeSet@1.2512.7.4, 2008-02-04 16:39:55-02:00, davi@mysql.com +3 -0
  Bug#21801 SQL exception handlers and warnings
  
  The problem is that deprecated syntax warnings were not being
  suppressed when the stored routine is being parsed for the first
  execution. It's doesn't make sense to print out deprecated
  syntax warnings when the routine is being executed because this
  kind of warning only matters when the routine is being created.
  
  The solution is to suppress deprecated syntax warnings when
  parsing the stored routine for loading into the cache (might
  mean that the routine is being executed for the first time).

  mysql-test/r/sp-error.result@1.137, 2008-02-04 16:39:50-02:00, davi@mysql.com +11 -0
    Add test case result for Bug#21801

  mysql-test/t/sp-error.test@1.132, 2008-02-04 16:39:50-02:00, davi@mysql.com +18 -0
    Add test case for Bug#21801

  sql/sp.cc@1.174, 2008-02-04 16:39:51-02:00, davi@mysql.com +29 -1
    Implement a internal error handler to catch deprecated
    syntax warnings when loading a stored procedure into the
    cache.

ChangeSet@1.2476.838.1, 2008-02-04 15:40:04+01:00, tomas@poseidon.ndb.mysql.com +2 -0
  Bug #34275 mysqld leak if doing multiple statements within same transaction (or wo/ trans)
  - in autocommit do not allocate statistics share, but instead use one directly on the handler

  sql/ha_ndbcluster.cc@1.469.1.12, 2008-02-04 15:40:00+01:00, tomas@poseidon.ndb.mysql.com +44 -39
    Bug #34275 mysqld leak if doing multiple statements within same transaction (or wo/ trans)
    - in autocommit do not allocate statistics share, but instead use one directly on the handler

  sql/ha_ndbcluster.h@1.190, 2008-02-04 15:40:00+01:00, tomas@poseidon.ndb.mysql.com +1 -7
    Bug #34275 mysqld leak if doing multiple statements within same transaction (or wo/ trans)
    - in autocommit do not allocate statistics share, but instead use one directly on the handler

ChangeSet@1.1810.3618.1, 2008-02-04 16:37:41+02:00, aelkin@koti.dsl.inet.fi +2 -0
  Bug#33329  extraneous ROLLBACK in binlog on connection 
              does not use trans tables
  
  There had been two issues.
  Rollback statement was recorded in binlog even though a multi-update
  had not modified any non-transactional table.
  The reason for this artifact was a false initial value of multi_update::transactional_tables.
  Yet another artifact that explained on the bug page is that 
  `ha_autocommit_or_rollback' works differently depending on whether
  a transaction engine has been compiled in. 
  
  Fixed: with setting multi_update::transactional_tables to zero at initialization
  time. Multi-update on non-trans table won't cause ROLLBACK in binlog with
  either compilation option.
  
  The 2nd mentioned artifact comprises a self-standing issue (to be reported
  separately).

  mysql-test/r/multi_update.result@1.44.1.5, 2008-02-04 16:37:38+02:00, aelkin@koti.dsl.inet.fi +2 -2
    results changed - there is no ROLLBACK in binlog anymore as it should be

  sql/sql_update.cc@1.154.38.12, 2008-02-04 16:37:38+02:00, aelkin@koti.dsl.inet.fi +1 -1
    A wrong assumption on that there were modified transactional table,
    which is nonsense at the very beginning of the query execution.

ChangeSet@1.1810.3617.1, 2008-02-04 16:35:41+02:00, aelkin@koti.dsl.inet.fi +1 -0
  Bug #32790 crash in trigger.test with InnoDB for a table
  
  the reason for the failure were incorrect asserts.
  
  Removing asserts altogether as there is no the implication does not hold
  (as explained in the comments for the file).

  sql/sql_delete.cc@1.144.22.15, 2008-02-04 16:35:38+02:00, aelkin@koti.dsl.inet.fi +0 -4
    removing two asserts because they can not hold basing on the definition
    of `normal_tables'. The one does not specify in a non-transactional table,
    which must be in the list of tables to be deleted, is modified indeed.
    So, it's possible to have normal_tables == true and deleted == true both
    but that would be yet a transactional table got modified (and then
    thd->transaction.stmt.modified_non_trans_table remains false default).

ChangeSet@1.2512.6.21, 2008-02-04 14:29:23+01:00, mkindahl@dl145h.mysql.com +1 -0
  Fixing result change after merge.

  mysql-test/suite/rpl/r/rpl_user.result@1.1.1.4, 2008-02-04 14:29:13+01:00, mkindahl@dl145h.mysql.com +0 -1
    Result change.

ChangeSet@1.1810.3496.36, 2008-02-04 13:46:35+01:00, pekka@sama.ndb.mysql.com +3 -0
  ndb - some warnings, debug errors

  ndb/src/common/debugger/SignalLoggerManager.cpp@1.6.5.1, 2008-02-04 13:46:04+01:00, pekka@sama.ndb.mysql.com +1 -1
    some warnings, debug errors

  ndb/src/common/debugger/signaldata/ScanTab.cpp@1.14.2.1, 2008-02-04 13:46:04+01:00, pekka@sama.ndb.mysql.com +1 -1
    some warnings, debug errors

  ndb/src/kernel/vm/pc.hpp@1.8.4.1, 2008-02-04 13:46:04+01:00, pekka@sama.ndb.mysql.com +3 -3
    some warnings, debug errors

ChangeSet@1.1810.3614.8, 2008-02-04 13:19:29+01:00, mkindahl@dl145h.mysql.com +1 -0
  Updating result file.

  mysql-test/r/rpl_user.result@1.1.2.1, 2008-02-04 13:19:20+01:00, mkindahl@dl145h.mysql.com +11 -8
    Result change.

ChangeSet@1.1810.3614.7, 2008-02-04 12:22:37+01:00, mkindahl@dl145h.mysql.com +1 -0
  Fixes to make rpl_user test pass in pushbuild.

  mysql-test/t/rpl_user.test@1.1.2.1, 2008-02-04 12:22:28+01:00, mkindahl@dl145h.mysql.com +9 -3
    Removing redundant reset master and deleting users from master
    and slave without using binary log.

ChangeSet@1.2512.6.18, 2008-02-04 12:12:03+01:00, mkindahl@dl145h.mysql.com +2 -0
  More fixes to remove test failures in pushbuild.

  mysql-test/suite/rpl/r/rpl_row_trig001.result@1.4, 2008-02-04 12:11:46+01:00, mkindahl@dl145h.mysql.com +2 -1
    Result change.

  mysql-test/suite/rpl/t/rpl_row_trig001.test@1.8, 2008-02-04 12:11:52+01:00, mkindahl@dl145h.mysql.com +12 -1
    Correcting a typo and trying to avoid a race condition when
    dumping the contents of the master and slave for comparison.

ChangeSet@1.1810.3496.35, 2008-02-04 09:23:56+01:00, pekka@sama.ndb.mysql.com +2 -0
  bug#34169 - fix pthread_t abuse

  ndb/src/ndbapi/Ndb.cpp@1.49.31.1, 2008-02-04 09:22:09+01:00, pekka@sama.ndb.mysql.com +1 -5
    fix pthread_t abuse

  ndb/test/ndbapi/testOIBasic.cpp@1.39.7.1, 2008-02-04 09:22:09+01:00, pekka@sama.ndb.mysql.com +4 -5
    fix pthread_t abuse

ChangeSet@1.2512.6.17, 2008-02-04 08:43:22+01:00, mkindahl@dl145h.mysql.com +1 -0
  Yet more changes to fix the merge clone.

  mysql-test/suite/rpl/t/rpl_idempotency.test@1.3, 2008-02-04 08:43:10+01:00, mkindahl@dl145h.mysql.com +4 -0
    Adding "have_innodb.inc" since the test reqires InnoDB.

ChangeSet@1.1810.3485.15, 2008-02-04 11:10:40+04:00, bar@mysql.com +26 -0
  Bug#32510 LIKE search fails with indexed 'eucjpms' and 'ujis' char column
  Problem: some collation handlers called incorrect version
  of my_like_range_xxx(), which led to wrong min_str and max_str,
  so like range optimizer threw away good records.
  Fix: changing the wrong handlers to call proper version of
  my_like_range_xxx().

  mysql-test/t/ctype_cp932.test@1.8.8.1, 2008-02-04 11:10:37+04:00, bar@mysql.com +2 -0
    Adding test

  mysql-test/include/ctype_like_range_f1f2.inc@1.1, 2008-02-04 11:10:38+04:00, bar@mysql.com +25 -0
    New BitKeeper file ``mysql-test/include/ctype_like_range_f1f2.inc''

  mysql-test/include/ctype_like_range_f1f2.inc@1.0, 2008-02-04 11:10:38+04:00, bar@mysql.com +0 -0

  mysql-test/r/ctype_big5.result@1.15.1.1, 2008-02-04 11:10:37+04:00, bar@mysql.com +34 -0
    Adding test

  mysql-test/r/ctype_eucjpms.result@1.7, 2008-02-04 11:10:37+04:00, bar@mysql.com +34 -0
    Adding test

  mysql-test/r/ctype_euckr.result@1.3.4.1, 2008-02-04 11:10:37+04:00, bar@mysql.com +34 -0
    Adding test

  mysql-test/r/ctype_gb2312.result@1.4.1.1, 2008-02-04 11:10:37+04:00, bar@mysql.com +34 -0
    Adding test

  mysql-test/r/ctype_gbk.result@1.6.1.1, 2008-02-04 11:10:37+04:00, bar@mysql.com +34 -0
    Adding test

  mysql-test/r/ctype_sjis.result@1.8.1.3, 2008-02-04 11:10:37+04:00, bar@mysql.com +34 -0
    Adding test

  mysql-test/r/ctype_uca.result@1.22.2.1, 2008-02-04 11:10:37+04:00, bar@mysql.com +17 -0
    Adding test

  mysql-test/r/ctype_ucs.result@1.39.7.1, 2008-02-04 11:10:37+04:00, bar@mysql.com +34 -0
    Adding test

  mysql-test/r/ctype_ujis.result@1.16.1.3, 2008-02-04 11:10:37+04:00, bar@mysql.com +34 -0
    Adding test

  mysql-test/r/ctype_cp932.result@1.6.8.1, 2008-02-04 11:10:37+04:00, bar@mysql.com +34 -0
    Adding test

  mysql-test/t/ctype_big5.test@1.14, 2008-02-04 11:10:37+04:00, bar@mysql.com +2 -0
    Adding test

  mysql-test/t/ctype_eucjpms.test@1.10, 2008-02-04 11:10:37+04:00, bar@mysql.com +2 -1
    Adding test

  mysql-test/t/ctype_euckr.test@1.3, 2008-02-04 11:10:37+04:00, bar@mysql.com +2 -0
    Adding test

  mysql-test/t/ctype_gb2312.test@1.2, 2008-02-04 11:10:37+04:00, bar@mysql.com +2 -0
    Adding test

  mysql-test/t/ctype_gbk.test@1.6, 2008-02-04 11:10:37+04:00, bar@mysql.com +2 -0
    Adding test

  mysql-test/t/ctype_sjis.test@1.10.1.2, 2008-02-04 11:10:37+04:00, bar@mysql.com +2 -0
    Adding test

  mysql-test/t/ctype_uca.test@1.17.4.1, 2008-02-04 11:10:37+04:00, bar@mysql.com +2 -1
    Adding test

  mysql-test/t/ctype_ucs.test@1.36.8.1, 2008-02-04 11:10:37+04:00, bar@mysql.com +2 -0
    Adding test

  mysql-test/t/ctype_ujis.test@1.17.1.2, 2008-02-04 11:10:37+04:00, bar@mysql.com +2 -0
    Adding test

  strings/ctype-euc_kr.c@1.65.1.7, 2008-02-04 11:10:38+04:00, bar@mysql.com +1 -1
    Changing like_range function

  strings/ctype-eucjpms.c@1.12.1.6, 2008-02-04 11:10:38+04:00, bar@mysql.com +1 -1
    Changing like_range function

  strings/ctype-gb2312.c@1.62.1.6, 2008-02-04 11:10:38+04:00, bar@mysql.com +1 -1
    Changing like_range function

  strings/ctype-ucs2.c@1.50.2.1, 2008-02-04 11:10:38+04:00, bar@mysql.com +1 -1
    Changing like_range function

  strings/ctype-ujis.c@1.69.1.6, 2008-02-04 11:10:38+04:00, bar@mysql.com +1 -1
    Changing like_range function

ChangeSet@1.2512.6.16, 2008-02-04 07:15:14+01:00, mkindahl@dl145h.mysql.com +2 -0
  Masking out some more errors and warnings that are benign.

  mysql-test/include/delete_anonymous_users.inc@1.2, 2008-02-04 07:14:58+01:00, mkindahl@dl145h.mysql.com +2 -0
    Disabling warnings.

  mysql-test/lib/mtr_report.pl@1.71, 2008-02-04 07:15:03+01:00, mkindahl@dl145h.mysql.com +10 -3
    Masking out benign errors and warnings from var/log/warnings file.

ChangeSet@1.2512.6.15, 2008-02-04 06:49:15+01:00, mkindahl@dl145h.mysql.com +1 -0
  Minor fix to make rpl_loaddata_map pass without warnings.

  mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt@1.1.1.2, 2008-02-04 06:49:04+01:00, mkindahl@dl145h.mysql.com +1 -1
    Correcting read_buffer_size to be a multiple of 4KiB since a
    warning is generated otherwise. 

ChangeSet@1.2476.792.27, 2008-02-03 21:24:59+01:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - bug#33619
    make sure to alloc logspace and set bits
    if doing delete after previous update wo/ touching DD part

  mysql-test/suite/ndb/r/ndb_dd_basic.result@1.27, 2008-02-03 21:24:57+01:00, jonas@perch.ndb.mysql.com +10 -0
    testcase

  mysql-test/suite/ndb/t/ndb_dd_basic.test@1.19, 2008-02-03 21:24:57+01:00, jonas@perch.ndb.mysql.com +10 -0
    testcase

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.77, 2008-02-03 21:24:57+01:00, jonas@perch.ndb.mysql.com +17 -25
    ndb - bug#33619
      make sure to alloc logspace and set bits
      if doing delete after previous update wo/ touching DD part

ChangeSet@1.2512.6.14, 2008-02-03 18:43:05+01:00, mkindahl@dl145h.mysql.com +1 -0
  Removing expected errors from slave from the warnings file.

  mysql-test/lib/mtr_report.pl@1.70, 2008-02-03 18:42:57+01:00, mkindahl@dl145h.mysql.com +12 -2
    Removing some expected warnings and errors from the slave for
    tests rpl_idempotency and rpl_skip_error.

ChangeSet@1.2403.18.105, 2008-02-03 14:01:31+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#34260
    remove incorrect ndbrequire

  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@1.81.1.4, 2008-02-03 14:01:29+01:00, jonas@perch.ndb.mysql.com +0 -1
    ndb - bug#34260
      remove incorrect ndbrequire

ChangeSet@1.2512.6.13, 2008-02-03 11:48:45+01:00, mkindahl@dl145h.mysql.com +4 -0
  Bug #34244 Test ndb_binlog_log_bin fails for 'drop table if
             exists t1,t2,t3'
  Bug #34245 Test ndb_binlog_multi fails for 'CREATE TABLE'
  Bug #34246 Test rpl_ndb_transaction fails with 'Failed to create
             'mysql/ndb_apply_status'
  
  Tests cases didn't wait for cluster to come up due to a typo
  in have_multi_ndb.inc.

  mysql-test/include/have_multi_ndb.inc@1.14, 2008-02-03 11:48:21+01:00, mkindahl@dl145h.mysql.com +2 -2
    SHOW TABLES is case-sensitive in the pattern to LIKE.

  mysql-test/suite/ndb/t/disabled.def@1.12, 2008-02-03 11:48:27+01:00, mkindahl@dl145h.mysql.com +0 -3
    Enabling tests.

  mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test@1.5, 2008-02-03 11:48:32+01:00, mkindahl@dl145h.mysql.com +1 -0
    Adding include of have_debug since test requires that.

  sql/sql_repl.cc@1.179, 2008-02-03 11:48:32+01:00, mkindahl@dl145h.mysql.com +1 -1
    Replacing 'return' with 'DBUG_RETURN' in debug-traced function.

ChangeSet@1.2512.6.12, 2008-02-02 08:15:36+01:00, mkindahl@dl145h.mysql.com +2 -0
  Disabling various tests and reporting bugs for them.

  mysql-test/suite/ndb/t/disabled.def@1.11, 2008-02-02 08:15:22+01:00, mkindahl@dl145h.mysql.com +3 -0
    Disabling tests ndb_binlog_lob_bin, ndb_binlog_multi,
    and rpl_ndb_transaction.

  mysql-test/suite/parts/t/disabled.def@1.8, 2008-02-02 08:15:27+01:00, mkindahl@dl145h.mysql.com +14 -7
    Disabling various partition tests.

ChangeSet@1.2476.837.1, 2008-02-01 13:51:04-06:00, jmiller@mysql.com +1 -0
  NdbRepStress.cpp:
    Updated with new support function from Magnus push to dbutil

  storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp@1.4, 2008-02-01 13:39:53-06:00, jmiller@mysql.com +29 -51
    Updated with new support function from Magnus push to dbutil

ChangeSet@1.2512.6.10, 2008-02-01 20:26:39+01:00, mkindahl@dl145h.mysql.com +2 -0
  Fixes to make tests pass in pushbuild.

  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result@1.30, 2008-02-01 20:26:26+01:00, mkindahl@dl145h.mysql.com +4 -2
    Result change.

  mysql-test/suite/binlog/t/binlog_start_comment.test@1.11, 2008-02-01 20:26:31+01:00, mkindahl@dl145h.mysql.com +1 -1
    Removing --short-form since that cause test to fail.

ChangeSet@1.1810.3616.1, 2008-02-01 13:11:03-05:00, cbell@mysql_cab_desk. +1 -0
  BUG#32205 : Replaying statements from mysqlbinlog fails with a syntax error, replicates fine
  
  This patch adds code to convert the path for LOAD DATA INFILE 
  events to a Unix path which is needed for running mysql client
  on Windows. 

  client/mysqlbinlog.cc@1.123.1.18, 2008-02-01 13:10:54-05:00, cbell@mysql_cab_desk. +7 -0
    BUG#32205 : Replaying statements from mysqlbinlog fails with a syntax error, replicates fine
    
    This patch adds code to convert the path for LOAD DATA INFILE 
    events to a Unix path which is needed for running mysql client
    on Windows. 
    
    The 'd:\x\y\z' path becomes 'd:xyz' when run in the client.

ChangeSet@1.1810.3614.5, 2008-02-01 17:26:28+01:00, mkindahl@dl145h.mysql.com +2 -0
  Again blanking out some numbers in file names that is dependent
  on the context.

  mysql-test/r/mysqlbinlog.result@1.25.1.15, 2008-02-01 17:26:16+01:00, mkindahl@dl145h.mysql.com +8 -8
    Result file change.

  mysql-test/t/mysqlbinlog.test@1.21.1.32, 2008-02-01 17:26:21+01:00, mkindahl@dl145h.mysql.com +11 -0
    Blanking out yet some numbers in file names.

ChangeSet@1.1810.3614.4, 2008-02-01 15:34:34+01:00, mkindahl@dl145h.mysql.com +2 -0
  Fixes to make tests pass in pushbuild.

  mysql-test/r/mysqlbinlog.result@1.25.1.14, 2008-02-01 15:34:22+01:00, mkindahl@dl145h.mysql.com +4 -4
    Result file change.

  mysql-test/t/mysqlbinlog.test@1.21.1.31, 2008-02-01 15:34:27+01:00, mkindahl@dl145h.mysql.com +1 -0
    Fixing test to not be dependent on the sequence numbers
    for file names generated by mysqlbinlog. 

ChangeSet@1.2512.7.2, 2008-02-01 17:23:46+03:00, anozdrin@quad. +1 -0
  Fix merge.

  mysql-test/t/variables.test@1.90, 2008-02-01 17:23:45+03:00, anozdrin@quad. +1 -1
    Fix merge.

ChangeSet@1.2476.836.2, 2008-02-01 14:33:36+01:00, thek@adventure.(none) +1 -0
  * Manual merge fix.

  mysql-test/r/grant.result@1.91, 2008-02-01 14:33:34+01:00, thek@adventure.(none) +23 -23
    - Manual merge step 2: Verify test cases and record new result set.

ChangeSet@1.2512.6.7, 2008-02-01 14:27:23+01:00, mkindahl@dl145h.mysql.com +1 -0
  Fixes to makes tests pass on Windows and vanilla build.

  mysql-test/suite/binlog/t/binlog_old_versions.test@1.1.1.1, 2008-02-01 14:27:15+01:00, mkindahl@dl145h.mysql.com +5 -5
    MYSQL_BINLOG was missing --local-load option.
    MYSQL was missing --local-infile=1 option.

ChangeSet@1.1810.3591.8, 2008-02-01 14:10:46+01:00, thek@adventure.(none) +3 -0
  Bug#33201 Crash occurs when granting update privilege on one column of a view
  
  When issuing a column level grant on a table which require pre-locking the 
  server crashed.
  
  The reason behind the crash was that data structures used by the lock api
  wasn't properly reinitialized in the case of a column level grant.

  mysql-test/r/grant.result@1.37.15.2, 2008-02-01 14:10:44+01:00, thek@adventure.(none) +22 -0
    * Added test case

  mysql-test/t/grant.test@1.41.10.2, 2008-02-01 14:10:44+01:00, thek@adventure.(none) +22 -0
    * Added test case

  sql/sql_acl.cc@1.128.50.1, 2008-02-01 14:10:44+01:00, thek@adventure.(none) +7 -0
    * The lock api is dending on the thd->lex object and this variable needs to 
      be re-initialized when opened with a new set of tables than specified in the
      original statement.

ChangeSet@1.2512.6.6, 2008-02-01 13:49:28+01:00, mkindahl@dl145h.mysql.com +4 -0
  Re-creating binlog_start_comment.test to make sure that changes
  are propagated from earlier versions.

  BitKeeper/deleted/.del-binlog_start_comment.result@1.2, 2008-02-01 13:44:19+01:00, mkindahl@dl145h.mysql.com +0 -0
    Delete: mysql-test/suite/binlog/r/binlog_start_comment.result

  BitKeeper/deleted/.del-binlog_start_comment.test@1.2, 2008-02-01 13:44:43+01:00, mkindahl@dl145h.mysql.com +0 -0
    Delete: mysql-test/suite/binlog/t/binlog_start_comment.test

  mysql-test/suite/binlog/r/binlog_start_comment.result@1.8, 2008-02-01 13:44:20+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: mysql-test/suite/r/binlog_start_comment.result -> mysql-test/suite/binlog/r/binlog_start_comment.result

  mysql-test/suite/r/binlog_start_comment.result@1.7, 2008-02-01 13:41:26+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: BitKeeper/deleted/.del-binlog_start_comment.result -> mysql-test/suite/r/binlog_start_comment.result

  mysql-test/suite/binlog/t/binlog_start_comment.test@1.10, 2008-02-01 13:44:44+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: mysql-test/suite/t/binlog_start_comment.test -> mysql-test/suite/binlog/t/binlog_start_comment.test

  mysql-test/suite/t/binlog_start_comment.test@1.9, 2008-02-01 13:41:05+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: BitKeeper/deleted/.del-binlog_start_comment.test -> mysql-test/suite/t/binlog_start_comment.test

ChangeSet@1.1810.3614.3, 2008-02-01 13:18:27+01:00, mkindahl@dl145h.mysql.com +3 -0
  Various fixes to make tests pass on Windows.

  mysql-test/t/mix_innodb_myisam_binlog.test@1.20.17.1, 2008-02-01 13:18:20+01:00, mkindahl@dl145h.mysql.com +2 -1
    Extending LIKE pattern to use either \n or \r\n in order to work
    on Windows.

  mysql-test/r/mix_innodb_myisam_binlog.result@1.24.15.1, 2008-02-01 13:18:09+01:00, mkindahl@dl145h.mysql.com +4 -2
    Result change

  mysql-test/t/binlog_start_comment.test@1.2.3.1, 2008-02-01 13:18:15+01:00, mkindahl@dl145h.mysql.com +1 -1
    Adding --local-load to mysqlbinlog to prevent it from failing
    on Windows. Also adding --short-form.

ChangeSet@1.2512.8.2, 2008-02-01 12:07:17+01:00, mkindahl@dl145h.mysql.com +1 -0
  Committing premature delete (the file will be deleted in a soon-to-come cset).
  
  .del-strict_autoinc_4bdb.result:
    Delete: mysql-test/r/strict_autoinc_4bdb.result
  strict_autoinc_4bdb.result:
    Rename: BitKeeper/deleted/.del-strict_autoinc_4bdb.result -> mysql-test/r/strict_autoinc_4bdb.result

  BitKeeper/deleted/.del-strict_autoinc_4bdb.result@1.6, 2008-02-01 11:57:50+01:00, mkindahl@dl145h.mysql.com +0 -0
    Delete: mysql-test/r/strict_autoinc_4bdb.result

  mysql-test/r/strict_autoinc_4bdb.result@1.5, 2008-02-01 11:49:51+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: BitKeeper/deleted/.del-strict_autoinc_4bdb.result -> mysql-test/r/strict_autoinc_4bdb.result

  BitKeeper/deleted/.del-strict_autoinc_4bdb.result@1.4, 2008-02-01 11:38:16+01:00, mkindahl@dl145h.mysql.com +0 -0
    Delete: mysql-test/r/strict_autoinc_4bdb.result

ChangeSet@1.2512.8.1, 2008-02-01 12:00:28+01:00, mkindahl@dl145h.mysql.com +2 -0
  Fixing result files to make tests pass in pushbuild.

  BitKeeper/deleted/.del-bdb_notembedded.result@1.3, 2008-02-01 11:34:29+01:00, mkindahl@dl145h.mysql.com +0 -0
    Delete: mysql-test/r/bdb_notembedded.result

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.60, 2008-02-01 12:00:18+01:00, mkindahl@dl145h.mysql.com +8 -10
    Result file held binlog for row-based replication,
    but test is for statement-based replication.

ChangeSet@1.2512.6.2, 2008-02-01 11:47:56+01:00, mkindahl@bk-internal.mysql.com +3 -0
  Deleting Berkeley DB test files since BDB is not distributed with 5.1.
  
  .del-bdb_notembedded.test:
    Delete: mysql-test/t/bdb_notembedded.test
  .del-strict_autoinc_4bdb.result:
    Delete: mysql-test/r/strict_autoinc_4bdb.result
  .del-bdb_notembedded.result:
    Delete: mysql-test/r/bdb_notembedded.result

  BitKeeper/deleted/.del-bdb_notembedded.result@1.2.1.1, 2008-02-01 11:46:36+01:00, mkindahl@bk-internal.mysql.com +0 -0
    Delete: mysql-test/r/bdb_notembedded.result

  BitKeeper/deleted/.del-bdb_notembedded.test@1.2, 2008-02-01 11:46:25+01:00, mkindahl@bk-internal.mysql.com +0 -0
    Delete: mysql-test/t/bdb_notembedded.test

  BitKeeper/deleted/.del-strict_autoinc_4bdb.result@1.3.1.1, 2008-02-01 11:46:46+01:00, mkindahl@bk-internal.mysql.com +0 -0
    Delete: mysql-test/r/strict_autoinc_4bdb.result

ChangeSet@1.2476.801.20, 2008-02-01 13:47:11+03:00, anozdrin@quad. +1 -0
  Fix merge.

  mysql-test/t/variables.test@1.86.1.2, 2008-02-01 13:47:09+03:00, anozdrin@quad. +3 -3
    Fix merge.

ChangeSet@1.1810.3614.2, 2008-02-01 10:46:02+01:00, mkindahl@dl145h.mysql.com +1 -0
  Changes to make tests pass on vanilla build.

  mysql-test/t/binlog_start_comment.test@1.2.2.1, 2008-02-01 10:45:52+01:00, mkindahl@dl145h.mysql.com +1 -1
    Adding --local-infile=1 to enable local infile for mysql client.

ChangeSet@1.1810.3615.1, 2008-02-01 13:00:40+05:00, kaa@mbp.local +3 -0
  Fix for bug #25162: Backing up DB from 5.1 adds 'USING BTREE' to KEYs 
                      on table creates
  
  The problem was in incompatible syntax for key definition in CREATE
  TABLE.
  
  5.0 supports only the following syntax for key definition (see "CREATE
  TABLE syntax" in the manual):
  
  {INDEX|KEY} [index_name] [index_type] (index_col_name,...)
  
  While 5.1 parser supports the above syntax, the "preferred" syntax was
  changed to:
  
  {INDEX|KEY} [index_name] (index_col_name,...) [index_type]
  
  The above syntax is used in 5.1 for the SHOW CREATE TABLE output, which
  led to dumps generated by 5.1 being incompatible with 5.0.
  
  Fixed by changing the parser in 5.0 to support both 5.0 and 5.1 syntax
  for key definition.

  mysql-test/r/create.result@1.107.1.30, 2008-02-01 13:00:39+05:00, kaa@mbp.local +14 -0
    Added a test case for bug #25162.

  mysql-test/t/create.test@1.71.7.1, 2008-02-01 13:00:39+05:00, kaa@mbp.local +24 -0
    Added a test case for bug #25162.

  sql/sql_yacc.yy@1.371.142.1, 2008-02-01 13:00:39+05:00, kaa@mbp.local +3 -3
    Changed the parser to support both 5.0 and 5.1 syntax for index type
    specification in CREATE TABLE.

ChangeSet@1.2476.792.23, 2008-02-01 00:07:15+01:00, pekka@sama.ndb.mysql.com +2 -0
  ndb - bug#34107 - post-merge

  storage/ndb/src/ndbapi/ndberror.c@1.99, 2008-01-31 15:23:18+01:00, pekka@sama.ndb.mysql.com +1 -0
    post-merge

  storage/ndb/test/run-test/daily-basic-tests.txt@1.114, 2008-01-31 23:49:22+01:00, pekka@sama.ndb.mysql.com +4 -4
    enable testInterpreter

ChangeSet@1.1810.3496.34, 2008-01-31 23:15:07+01:00, pekka@sama.ndb.mysql.com +2 -0
  ndb - bug#34107 - ndb api test case

  ndb/test/ndbapi/testInterpreter.cpp@1.3.4.1, 2008-01-31 23:14:21+01:00, pekka@sama.ndb.mysql.com +89 -0
    bug#34107 testInterpreter test case

  ndb/test/run-test/daily-basic-tests.txt@1.27.52.1, 2008-01-31 23:14:21+01:00, pekka@sama.ndb.mysql.com +4 -4
    bug#34107 testInterpreter test case

ChangeSet@1.1810.3606.2, 2008-01-31 23:46:26+03:00, evgen@moonbone.local +3 -0
  Bug#30787: Stored function ignores user defined alias.
  
  Simple subselects are pulled into upper selects. This operation substitutes the
  pulled subselect for the first item from the select list of the subselect.
  If an alias is defined for a subselect it is inherited by the replacement item.
  As this is done after fix_fields phase this alias isn't showed if the
  replacement item is a stored function. This happens because the Item_func_sp::make_field
  function makes send field from its result_field and ignores the defined alias.
  
  Now when an alias is defined the Item_func_sp::make_field function sets it for
  the returned field.

  mysql-test/r/sp.result@1.170.52.1, 2008-01-31 23:45:40+03:00, evgen@moonbone.local +17 -0
    Added a test case for the bug#30787: Stored function ignores user defined alias.

  mysql-test/t/sp.test@1.174.52.1, 2008-01-31 23:45:38+03:00, evgen@moonbone.local +19 -0
    Added a test case for the bug#30787: Stored function ignores user defined alias.

  sql/item_func.cc@1.270.1.95, 2008-01-31 23:45:51+03:00, evgen@moonbone.local +2 -0
    Bug#30787: Stored function ignores user defined alias.
    Now when an alias is defined the Item_func_sp::make_field function sets it for
    the returned field.

ChangeSet@1.2518.1.2, 2008-01-31 20:55:58+01:00, kent@mysql.com +3 -0
  Makefile.am, CMakeLists.txt, make_win_bin_dist:
    Removed references to deleted "mysql_explain_log" and "mysql_tableinfo"

  scripts/CMakeLists.txt@1.9, 2008-01-31 20:55:51+01:00, kent@mysql.com +0 -6
    Removed references to deleted "mysql_explain_log" and "mysql_tableinfo"

  scripts/Makefile.am@1.77.1.3, 2008-01-31 20:55:51+01:00, kent@mysql.com +0 -1
    Removed references to deleted "mysql_explain_log" and "mysql_tableinfo"

  scripts/make_win_bin_dist@1.28, 2008-01-31 20:55:51+01:00, kent@mysql.com +0 -2
    Removed references to deleted "mysql_explain_log" and "mysql_tableinfo"

ChangeSet@1.2476.833.4, 2008-01-31 18:26:04+02:00, aelkin@mysql1000.(none) +1 -0
  failure in 5.1 tree for rpl_server_id caused by the wrong offset in
  the include file.
  
  fixed with correcting the offset.

  mysql-test/include/show_binlog_events2.inc@1.1.2.1, 2008-01-31 18:26:02+02:00, aelkin@mysql1000.(none) +1 -1
    correcting 5.1 specific offset (which appeared to 5.0's)

ChangeSet@1.2476.833.3, 2008-01-31 18:12:58+02:00, aelkin@mysql1000.(none) +2 -0
  bug#32971 manual merge of two tests results

  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result@1.28.1.3, 2008-01-31 18:12:56+02:00, aelkin@mysql1000.(none) +8 -8
    manual merge

  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result@1.25.1.4, 2008-01-31 18:12:57+02:00, aelkin@mysql1000.(none) +8 -8
    manual merge

ChangeSet@1.2519, 2008-01-31 16:12:54+01:00, hhunger@hh-nb.hungers +18 -0
  fixes for bug#34190.

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.16, 2008-01-31 16:12:49+01:00, hhunger@hh-nb.hungers +178 -4
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.16, 2008-01-31 16:12:49+01:00, hhunger@hh-nb.hungers +178 -4
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.16, 2008-01-31 16:12:50+01:00, hhunger@hh-nb.hungers +178 -4
    fixes for bug#34190.

  BitKeeper/etc/ignore@1.300.1.9, 2008-01-31 16:12:51+01:00, hhunger@hh-nb.hungers +1 -0
    Added libmysqld/sql_profile.cc to the ignore list

  mysql-test/suite/funcs_1/r/innodb_storedproc.result@1.6, 2008-01-31 16:12:49+01:00, hhunger@hh-nb.hungers +7 -7
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/innodb_trig_09.result@1.6, 2008-01-31 16:12:49+01:00, hhunger@hh-nb.hungers +3 -2
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/memory_storedproc.result@1.6, 2008-01-31 16:12:50+01:00, hhunger@hh-nb.hungers +6 -6
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/memory_trig_09.result@1.6, 2008-01-31 16:12:50+01:00, hhunger@hh-nb.hungers +3 -2
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/myisam_storedproc.result@1.6, 2008-01-31 16:12:50+01:00, hhunger@hh-nb.hungers +7 -7
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/myisam_trig_09.result@1.6, 2008-01-31 16:12:50+01:00, hhunger@hh-nb.hungers +3 -2
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/ndb_storedproc.result@1.3, 2008-01-31 16:12:51+01:00, hhunger@hh-nb.hungers +7 -7
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/ndb_trig_09.result@1.6, 2008-01-31 16:12:51+01:00, hhunger@hh-nb.hungers +3 -2
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result@1.4, 2008-01-31 16:12:48+01:00, hhunger@hh-nb.hungers +15 -15
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result@1.4, 2008-01-31 16:12:48+01:00, hhunger@hh-nb.hungers +15 -15
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result@1.3, 2008-01-31 16:12:48+01:00, hhunger@hh-nb.hungers +19 -17
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/b_processlist_val_ps.result@1.3, 2008-01-31 16:12:49+01:00, hhunger@hh-nb.hungers +19 -17
    fixes for bug#34190.

  mysql-test/suite/funcs_1/storedproc/storedproc_master.inc@1.7, 2008-01-31 16:12:51+01:00, hhunger@hh-nb.hungers +1 -0
    fixes for bug#34190.

  mysql-test/suite/funcs_1/triggers/triggers_09.inc@1.5, 2008-01-31 16:12:51+01:00, hhunger@hh-nb.hungers +4 -0
    fixes for bug#34190.

ChangeSet@1.2476.834.1, 2008-01-31 16:00:06+01:00, mskold@mysql.com +1 -0
  Fixed support for specifying explicit database

  storage/ndb/test/tools/hugoPkUpdate.cpp@1.13, 2008-01-31 16:00:01+01:00, mskold@mysql.com +1 -1
    Fixed support for specifying explicit database

ChangeSet@1.2476.779.16, 2008-01-31 15:53:47+01:00, mkindahl@dl145h.mysql.com +7 -0
  Fixes to make tests pass on pushbuild.

  mysql-test/include/show_binlog_events2.inc@1.1.1.1, 2008-01-31 15:53:14+01:00, mkindahl@dl145h.mysql.com +1 -1
    Binlog position change.

  mysql-test/suite/rpl/r/rpl_loaddata_map.result@1.6, 2008-01-31 15:53:20+01:00, mkindahl@dl145h.mysql.com +6 -6
    Result change.

  mysql-test/suite/rpl/r/rpl_loaddata_map.result@1.5, 2008-01-31 13:44:05+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: mysql-test/r/rpl_loaddata_map.result -> mysql-test/suite/rpl/r/rpl_loaddata_map.result

  mysql-test/suite/rpl/r/rpl_user.result@1.1.1.2, 2008-01-31 15:53:20+01:00, mkindahl@dl145h.mysql.com +12 -8
    Result change.

  mysql-test/suite/rpl/r/rpl_user.result@1.1.1.1, 2008-01-31 13:44:39+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: mysql-test/r/rpl_user.result -> mysql-test/suite/rpl/r/rpl_user.result

  mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt@1.1.1.1, 2008-01-31 13:43:52+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: mysql-test/t/rpl_loaddata_map-master.opt -> mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt

  mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt@1.1.1.1, 2008-01-31 13:43:52+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: mysql-test/t/rpl_loaddata_map-slave.opt -> mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt

  mysql-test/suite/rpl/t/rpl_loaddata_map.test@1.6, 2008-01-31 15:53:26+01:00, mkindahl@dl145h.mysql.com +2 -1
    Test is only sensible to execute for statement and mixed mode.

  mysql-test/suite/rpl/t/rpl_loaddata_map.test@1.5, 2008-01-31 13:43:52+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: mysql-test/t/rpl_loaddata_map.test -> mysql-test/suite/rpl/t/rpl_loaddata_map.test

  mysql-test/suite/rpl/t/rpl_user.test@1.1.1.2, 2008-01-31 15:53:31+01:00, mkindahl@dl145h.mysql.com +6 -1
    Test assumed that binary log is identical for row- and statement-
    based logging, which it was not. Deleting users individually
    on master and slave respectively, without involving binary
    log.

  mysql-test/suite/rpl/t/rpl_user.test@1.1.1.1, 2008-01-31 13:44:26+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: mysql-test/t/rpl_user.test -> mysql-test/suite/rpl/t/rpl_user.test

ChangeSet@1.1810.3609.2, 2008-01-31 18:51:20+04:00, svoj@mysql.com +1 -0
  BUG#22989 - START SLAVE causes Error on COM_REGISTER_SLAVE: 1105
              'Wrong parameters to functi
  
  START SLAVE reports vague error when it fails to register on master:
  "Wrong parameters to function register_slave".
  
  If master failed to register slave because of too long
  'report-host'/'report-user'/'report-password', return better error
  messages:
  "Failed to register slave: too long 'report-host'"
  "Failed to register slave: too long 'report-user'"
  "Failed to register slave; too long 'report-password'"
  
  No test case for this fix.

  sql/repl_failsafe.cc@1.53.6.2, 2008-01-31 18:51:18+04:00, svoj@mysql.com +9 -6
    Report descriptive error when master fails to register slave.

ChangeSet@1.2476.833.1, 2008-01-31 16:23:27+03:00, skozlov@mysql.com +3 -0
  Test case for bug#12691

  mysql-test/suite/bugs/data/rpl_bug12691.dat@1.1, 2008-01-31 16:23:24+03:00, skozlov@mysql.com +3 -0
    Data file for test case

  mysql-test/suite/bugs/data/rpl_bug12691.dat@1.0, 2008-01-31 16:23:24+03:00, skozlov@mysql.com +0 -0

  mysql-test/suite/bugs/r/rpl_bug12691.result@1.1, 2008-01-31 16:23:24+03:00, skozlov@mysql.com +34 -0
    Result file

  mysql-test/suite/bugs/r/rpl_bug12691.result@1.0, 2008-01-31 16:23:24+03:00, skozlov@mysql.com +0 -0

  mysql-test/suite/bugs/t/rpl_bug12691.test@1.1, 2008-01-31 16:23:24+03:00, skozlov@mysql.com +53 -0
    Test case for bug#12691

  mysql-test/suite/bugs/t/rpl_bug12691.test@1.0, 2008-01-31 16:23:24+03:00, skozlov@mysql.com +0 -0

ChangeSet@1.1810.3613.2, 2008-01-31 13:58:29+01:00, pekka@sama.ndb.mysql.com +3 -0
  ndb - bug#34107 patch 2, ndb api

  mysql-test/r/ndb_condition_pushdown.result@1.15.3.1, 2008-01-31 13:57:37+01:00, pekka@sama.ndb.mysql.com +6 -0
    bug#34107 lower scanfilter max size to not hit TUP limit

  mysql-test/t/ndb_condition_pushdown.test@1.16.2.1, 2008-01-31 13:57:37+01:00, pekka@sama.ndb.mysql.com +12 -739
    bug#34107 lower scanfilter max size to not hit TUP limit

  ndb/include/ndbapi/ndbapi_limits.h@1.7.4.1, 2008-01-31 13:57:37+01:00, pekka@sama.ndb.mysql.com +2 -1
    bug#34107 lower scanfilter max size to not hit TUP limit

ChangeSet@1.1810.3613.1, 2008-01-31 13:56:12+01:00, pekka@sama.ndb.mysql.com +4 -0
  ndb - bug#34107 patch 1, kernel

  ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.22.14.1, 2008-01-31 13:54:29+01:00, pekka@sama.ndb.mysql.com +3 -1
    bug#34107 check stored proc overflow

  ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.19.14.1, 2008-01-31 13:54:29+01:00, pekka@sama.ndb.mysql.com +8 -0
    bug#34107 check stored proc overflow

  ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp@1.1.2.1, 2008-01-31 13:54:29+01:00, pekka@sama.ndb.mysql.com +11 -5
    bug#34107 check stored proc overflow

  ndb/src/ndbapi/ndberror.c@1.30.43.1, 2008-01-31 13:55:02+01:00, pekka@sama.ndb.mysql.com +1 -0
    bug#34107 check stored proc overflow

ChangeSet@1.2476.832.1, 2008-01-31 14:54:03+02:00, aelkin@koti.dsl.inet.fi +10 -0
  Bug #32971 No user level error message from slave sql thread when ER_NO_DEFAULT_FOR_FIELD
  
  The error message due to lack of the default value for an extra field
  was not as informative as it should be.
  
  Fixed with improving the scheme of gathering, propagating and reporting
  errors in applying rows events. 
  The scheme is in the following.
  Any kind of error of processing of a row event incidents are to be 
  registered with my_error().
  In the end Rows_log_event::do_apply_event() invokes rli->report() with the 
  message to display consisting of all the errors.
  This mimics `show warnings' displaying.
  A simple test checks three errors in processing an event.
  Two hunks - a user level error and pushing it into the list - 
  have been devoted to already fixed Bug@31702.
  
  Some open issues relating to this artifact listed on BUG@21842 page and
  on WL@3679.
  Todo: to synchronize the statement in the tests comments on Update and Delete
  events may not stop when an extra field does not have a default with wl@3228 spec.

  include/my_base.h@1.107.4.1, 2008-01-31 14:53:58+02:00, aelkin@koti.dsl.inet.fi +3 -1
    A new handler level error code that is supposed to be mapped to a set of more
    specific ER_ user level errors.

  mysql-test/extra/rpl_tests/rpl_row_tabledefs.test@1.12.1.1, 2008-01-31 14:53:58+02:00, aelkin@koti.dsl.inet.fi +3 -3
    Adding yet another extra fields to see more than one error in show
    slave status' report.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result@1.28.2.1, 2008-01-31 14:53:58+02:00, aelkin@koti.dsl.inet.fi +10 -10
    results changed (the error message etc)

  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result@1.25.3.1, 2008-01-31 14:53:58+02:00, aelkin@koti.dsl.inet.fi +10 -10
    results changed

  sql/log_event.cc@1.277.52.1, 2008-01-31 14:53:58+02:00, aelkin@koti.dsl.inet.fi +40 -12
    Refining slave_rows_error_report to iterate on the list of gathered errors;
    Simplifying signature of prepare_record as the function does not call
    rli->report to leave that duty to the event's top level code.

  sql/log_event.h@1.168.1.1, 2008-01-31 14:53:59+02:00, aelkin@koti.dsl.inet.fi +2 -0
    adding a corrupt event error pushing. The error will be seen with
    show slave status.

  sql/log_event_old.cc@1.14.1.1, 2008-01-31 14:53:59+02:00, aelkin@koti.dsl.inet.fi +2 -2
    similar to log_event.cc changes

  sql/rpl_record.cc@1.16.1.1, 2008-01-31 14:54:00+02:00, aelkin@koti.dsl.inet.fi +4 -11
    prepare_record only pushes an error to the list

  sql/rpl_record.h@1.6, 2008-01-31 14:54:00+02:00, aelkin@koti.dsl.inet.fi +1 -2
    signature changed

  sql/share/errmsg.txt@1.173, 2008-01-31 14:54:00+02:00, aelkin@koti.dsl.inet.fi +2 -0
    The user level error code that corresponds to HA_ERR_CORRUPT_EVENT.
    The error will be reported in show slave status if such a failure happens.

ChangeSet@1.2476.831.1, 2008-01-31 15:56:02+04:00, holyfoot@mysql.com +2 -0
  Bug #25426 Prefix index on DECIMAL column causes warning.
  
  Error message modified to be consistent with the manual.

  mysql-test/r/alter_table.result@1.88, 2008-01-31 15:56:00+04:00, holyfoot@mysql.com +4 -4
    Bug #25426 Prefix index on DECIMAL column causes warning.
    
    test result fixed

  sql/share/errmsg.txt@1.170.1.1, 2008-01-31 15:56:01+04:00, holyfoot@mysql.com +3 -3
    Bug #25426 Prefix index on DECIMAL column causes warning.
    
    error messages modified

ChangeSet@1.1810.3573.7, 2008-01-31 12:17:40+01:00, mkindahl@dl145h.mysql.com +4 -0
  Changes to fix tests in pushbuild.

  mysql-test/include/have_local_infile.inc@1.1, 2008-01-31 12:15:03+01:00, mkindahl@dl145h.mysql.com +4 -0
    BitKeeper file /data0/mkindahl/mysql-5.0-rpl-merge/mysql-test/include/have_local_infile.inc

  mysql-test/include/have_local_infile.inc@1.0, 2008-01-31 12:15:03+01:00, mkindahl@dl145h.mysql.com +0 -0

  mysql-test/r/have_local_infile.require@1.1, 2008-01-31 12:15:04+01:00, mkindahl@dl145h.mysql.com +2 -0
    BitKeeper file /data0/mkindahl/mysql-5.0-rpl-merge/mysql-test/r/have_local_infile.require

  mysql-test/r/have_local_infile.require@1.0, 2008-01-31 12:15:04+01:00, mkindahl@dl145h.mysql.com +0 -0

  mysql-test/t/binlog_start_comment.test@1.2.1.1, 2008-01-31 12:17:19+01:00, mkindahl@dl145h.mysql.com +4 -2
    Test requires that local_infile is on, so added require for that.

  mysql-test/t/rpl_sp.test@1.9.2.8, 2008-01-31 12:17:25+01:00, mkindahl@dl145h.mysql.com +1 -1
    Adding missing sync_slave_with_master causing following tests to fail.

ChangeSet@1.2476.729.30, 2008-01-31 16:51:55+08:00, hezx@mail.hezx.com +7 -0
  Post merge fix

  mysql-test/include/show_binlog_events2.inc@1.2, 2008-01-31 16:51:52+08:00, hezx@mail.hezx.com +1 -1
    Post merge fix

  mysql-test/suite/rpl/r/rpl_loaddata_map.result@1.3.1.2, 2008-01-31 16:51:52+08:00, hezx@mail.hezx.com +8 -8
    Post merge fix

  mysql-test/suite/rpl/r/rpl_loaddata_map.result@1.3.1.1, 2008-01-31 16:51:03+08:00, hezx@mail.hezx.com +0 -0
    Rename: mysql-test/r/rpl_loaddata_map.result -> mysql-test/suite/rpl/r/rpl_loaddata_map.result

  mysql-test/suite/rpl/r/rpl_user.result@1.3, 2008-01-31 16:51:52+08:00, hezx@mail.hezx.com +10 -8
    Post merge fix

  mysql-test/suite/rpl/r/rpl_user.result@1.2, 2008-01-31 16:51:03+08:00, hezx@mail.hezx.com +0 -0
    Rename: mysql-test/r/rpl_user.result -> mysql-test/suite/rpl/r/rpl_user.result

  mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt@1.2, 2008-01-31 16:51:03+08:00, hezx@mail.hezx.com +0 -0
    Rename: mysql-test/t/rpl_loaddata_map-master.opt -> mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt

  mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt@1.2, 2008-01-31 16:51:03+08:00, hezx@mail.hezx.com +0 -0
    Rename: mysql-test/t/rpl_loaddata_map-slave.opt -> mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt

  mysql-test/suite/rpl/t/rpl_loaddata_map.test@1.3.1.2, 2008-01-31 16:51:52+08:00, hezx@mail.hezx.com +5 -4
    Post merge fix

  mysql-test/suite/rpl/t/rpl_loaddata_map.test@1.3.1.1, 2008-01-31 16:51:03+08:00, hezx@mail.hezx.com +0 -0
    Rename: mysql-test/t/rpl_loaddata_map.test -> mysql-test/suite/rpl/t/rpl_loaddata_map.test

  mysql-test/suite/rpl/t/rpl_user.test@1.3, 2008-01-31 16:51:52+08:00, hezx@mail.hezx.com +4 -1
    Post merge fix

  mysql-test/suite/rpl/t/rpl_user.test@1.2, 2008-01-31 16:51:03+08:00, hezx@mail.hezx.com +0 -0
    Rename: mysql-test/t/rpl_user.test -> mysql-test/suite/rpl/t/rpl_user.test

ChangeSet@1.1810.3573.6, 2008-01-31 07:19:29+01:00, mkindahl@dl145h.mysql.com +1 -0
  Fixes to make code compile on Windows.

  sql/sql_repl.cc@1.133.7.12, 2008-01-31 07:19:20+01:00, mkindahl@dl145h.mysql.com +1 -1
    Adding cast to remove compile error on Windows platform.

ChangeSet@1.1810.3612.1, 2008-01-30 19:00:20-07:00, tsmith@ramayana.hindu.god +1 -0
  Bug #32149  Long semaphore wait for adaptive hash latch
  
  Fix by calling ha_release_temporary_latches() before ::filesort().

  sql/filesort.cc@1.105.1.22, 2008-01-30 19:00:19-07:00, tsmith@ramayana.hindu.god +7 -0
    Call ha_release_temporary_latches() before performing
    a (possibly long) ::filesort().

ChangeSet@1.1810.3474.14, 2008-01-30 16:51:39-05:00, cmiller@zippy.cornsilk.net +1 -0
  Bug#24624: MySQL client ignores its own completion table
  
  Nothing was in the command-line dictionary, because of the wrong 
  order of instructions when populating it.
  
  This is a smaller, less optimistic patch that both fixes a bug and
  refreshes the list of keywords that the command-line library (e.g., 
  readline) can use to expand typed commands.  Now, read from the 
  command list /after/ we free the list, not before.
  
  The best way is to read the keywords from the lexer code, but that
  doesn't work everywhere yet.  Grr.

  client/mysql.cc@1.199.1.49, 2008-01-30 16:51:37-05:00, cmiller@zippy.cornsilk.net +718 -13
    Order the instructions for clearing and populating the keyword list,
    to be in that order.
    
    Additionally, add more keywords.

ChangeSet@1.2476.801.18, 2008-01-30 23:04:55+03:00, kostja@dipika.(none) +1 -0
  Fix a build failure (embedded server).

  sql/sql_show.cc@1.441.6.5, 2008-01-30 23:04:53+03:00, kostja@dipika.(none) +0 -2
    Fix a build failure (embedded server).

ChangeSet@1.1810.3573.5, 2008-01-30 18:24:28+01:00, mkindahl@dl145h.mysql.com +1 -0
  Disabling rpl_transaction test for non-debug builds.

  mysql-test/t/rpl_transaction.test@1.2.1.1, 2008-01-30 18:24:21+01:00, mkindahl@dl145h.mysql.com +1 -0
    Test only works for debug build.

ChangeSet@1.2476.829.3, 2008-01-30 17:35:25+01:00, mkindahl@dl145h.mysql.com +2 -0
  Fixing return value.

  sql/item_cmpfunc.cc@1.267.17.2, 2008-01-30 17:34:56+01:00, mkindahl@dl145h.mysql.com +1 -1
    Minor fix to return correct value in case of error.

  sql/rpl_utility.cc@1.21, 2008-01-30 17:35:06+01:00, mkindahl@dl145h.mysql.com +1 -1
    Minor fix to return correct value in case of error.

ChangeSet@1.2512.4.3, 2008-01-30 20:14:35+04:00, svoj@mysql.com +1 -0
  BUG#33871 - Duplicate "would" in Fulltext Stopwords
  
  Code cleanup: removed duplicate stopword.

  storage/myisam/ft_static.c@1.38, 2008-01-30 20:13:44+04:00, svoj@april.(none) +0 -1
    Code cleanup: removed duplicate stopword.

ChangeSet@1.2476.801.17, 2008-01-30 18:27:41+03:00, kostja@dipika.(none) +13 -0
  A fix and a test case for Bug#34166 Server crash in SHOW OPEN TABLES and
  pre-locking.
  
  The crash was caused by an implicit assumption in check_table_access() that
  table_list parameter is always a part of lex->query_tables.
  
  When iterating over the passed list of tables, check_table_access() used
  to stop only when lex->query_tables_last_not_own was reached. 
  In case of pre-locking, lex->query_tables_last_own is not NULL and points
  to some element of lex->query_tables. When the parameter
  of check_table_access() was not part of lex->query_tables, loop invariant
  could never be violated and a crash would happen when the current table
  pointer would point beyond the end of the provided list.
  
  The fix is to change the signature of check_table_access() to also accept
  a numeric limit of loop iterations, similarly to check_grant(), and 
  supply this limit in all places when we want to check access of tables
  that are outside lex->query_tables, or just want to check access to one table.

  mysql-test/r/information_schema.result@1.151.1.25, 2008-01-30 18:27:38+03:00, kostja@dipika.(none) +15 -0
    Update test results (Bug#34166).

  mysql-test/t/information_schema.test@1.98.1.21, 2008-01-30 18:27:38+03:00, kostja@dipika.(none) +22 -0
    Add a test case for Bug#34166.

  sql/mysql_priv.h@1.549.9.1, 2008-01-30 18:27:38+03:00, kostja@dipika.(none) +2 -2
    Change signature of check_table_access() to accept a numeric limit
    of tables to check.

  sql/sp_head.cc@1.299.1.3, 2008-01-30 18:27:38+03:00, kostja@dipika.(none) +2 -2
    Update to the new signature of check_table_access().

  sql/sql_acl.cc@1.255.2.1, 2008-01-30 18:27:38+03:00, kostja@dipika.(none) +1 -1
    Improve code clarity: if there is a numeric limit, we should not need
    to look at first_not_own_table.

  sql/sql_base.cc@1.435.1.1, 2008-01-30 18:27:38+03:00, kostja@dipika.(none) +1 -1
    Update to the new signature of check_table_access().

  sql/sql_cache.cc@1.129.1.3, 2008-01-30 18:27:39+03:00, kostja@dipika.(none) +1 -1
    Update to the new signature of check_table_access().

  sql/sql_parse.cc@1.713.3.1, 2008-01-30 18:27:39+03:00, kostja@dipika.(none) +40 -34
    Update to the new signature of check_table_access().
    Change check_table_access() to accept an optional numeric limit of tables
    to check. A crash would happen when check_table_access() was
    passed a list of tables that is not part of lex->query_tables and
    lex->query_tables_last_own was not NULL.

  sql/sql_plugin.cc@1.78.1.1, 2008-01-30 18:27:39+03:00, kostja@dipika.(none) +1 -1
    Update to the new signature of check_table_access().

  sql/sql_prepare.cc@1.234.1.4, 2008-01-30 18:27:39+03:00, kostja@dipika.(none) +3 -3
    Update to the new signature of check_table_access().

  sql/sql_show.cc@1.441.6.4, 2008-01-30 18:27:39+03:00, kostja@dipika.(none) +2 -4
    Update to the new signature of check_table_access().
    Ensure that check_table_access() only checks access to the first
    table in the table list when called from list_open_tables().
    list_open_tables() supplies a table list that is created on stack,
    whereas check_table_access() used to assume that the supplied list is a part
    of thd->lex.

  sql/sql_trigger.cc@1.105.1.4, 2008-01-30 18:27:39+03:00, kostja@dipika.(none) +1 -1
    Update to the new signature of check_table_access().

  sql/sql_view.cc@1.155.3.1, 2008-01-30 18:27:40+03:00, kostja@dipika.(none) +3 -3
    Update to the new signature of check_table_access().

ChangeSet@1.2476.779.11, 2008-01-30 16:11:39+01:00, mkindahl@dl145h.mysql.com +1 -0
  .del-show_binlog_events2.inc:
    Delete: mysql-test/include/show_binlog_events2.inc

  BitKeeper/deleted/.del-show_binlog_events2.inc@1.1.1.1, 2008-01-30 12:32:37+01:00, mkindahl@dl145h.mysql.com +0 -0
    Delete: mysql-test/include/show_binlog_events2.inc

ChangeSet@1.2476.829.2, 2008-01-30 16:03:00+01:00, mkindahl@dl145h.mysql.com +9 -0
  Post-merge changes.

  BitKeeper/deleted/.del-show_binlog_events2.inc@1.2, 2008-01-30 11:34:43+01:00, mkindahl@dl145h.mysql.com +0 -0
    Delete: mysql-test/include/show_binlog_events2.inc

  client/mysqlbinlog.cc@1.164, 2008-01-30 16:02:19+01:00, mkindahl@dl145h.mysql.com +2 -2
    char -> uchar for raw memory.

  sql-common/client.c@1.146.2.1, 2008-01-30 16:02:45+01:00, mkindahl@dl145h.mysql.com +2 -2
    char -> uchar for raw memory.

  sql/item_cmpfunc.cc@1.267.17.1, 2008-01-30 16:02:24+01:00, mkindahl@dl145h.mysql.com +1 -1
    Adding cast to remove warning when converting negative integer
    to unsigned type.

  sql/log_event.cc@1.277.51.1, 2008-01-30 16:02:29+01:00, mkindahl@dl145h.mysql.com +5 -5
    char -> uchar for raw memory.

  sql/log_event.h@1.169.1.1, 2008-01-30 16:02:30+01:00, mkindahl@dl145h.mysql.com +5 -5
    char -> uchar for raw memory.

  sql/rpl_utility.cc@1.20, 2008-01-30 16:02:35+01:00, mkindahl@dl145h.mysql.com +1 -1
    Adding cast to remove warning when converting negative integer
    to unsigned type.

  sql/slave.cc@1.326.1.3, 2008-01-30 16:02:35+01:00, mkindahl@dl145h.mysql.com +2 -2
    char -> uchar for raw memory.

  sql/sql_repl.cc@1.176.1.2, 2008-01-30 16:02:40+01:00, mkindahl@dl145h.mysql.com +1 -1
    char -> uchar for raw memory.

ChangeSet@1.1810.3573.4, 2008-01-30 15:58:35+01:00, mkindahl@dl145h.mysql.com +3 -0
  Changes to make tests pass in pushbuild.

  mysql-test/r/bdb_notembedded.result@1.2, 2008-01-30 15:58:17+01:00, mkindahl@dl145h.mysql.com +6 -0
    Result change.

  mysql-test/r/rpl_loaddata_map.result@1.4, 2008-01-30 15:58:22+01:00, mkindahl@dl145h.mysql.com +4 -6
    Result change.

  mysql-test/t/rpl_loaddata_map.test@1.4, 2008-01-30 15:58:27+01:00, mkindahl@dl145h.mysql.com +1 -1
    Blanking out file id as well.

ChangeSet@1.2476.830.1, 2008-01-30 14:12:40+01:00, sven@riska.(none) +6 -0
  BUG#34141: mysqlbinlog cannot read 4.1 binlogs containing load data infile
  Main problem: mysql 5.1 cannot read binlogs from 4.1.
  Subproblem 1: There is a mistake in sql_ex_info::init. The read_str()
  function updates its first argument to point to the next character to
  read. However, it is applied only to a copy of the buffer pointer, so the
  real buffer pointer is not updated.
  Fix 1: do not take a copy of the buffer pointer. The copy was needed
  because sql_ex_info::init does not use the const attribute on some of its
  arguments. So we add the const attribute, too.
  Subproblem 2: The first BINLOG statement is asserted to be a
  FORMAT_DESCRIPTION_LOG_EVENT, but 4.1 binlogs begin with START_EVENT_V3.
  Fix 2: allow START_EVENT_V3 too.

  mysql-test/suite/binlog/r/binlog_old_versions.result@1.2, 2008-01-30 14:12:31+01:00, sven@riska.(none) +10 -0
    Updated result file.

  mysql-test/suite/binlog/std_data/binlog_old_version_4_1.000001@1.1, 2008-01-30 14:06:40+01:00, sven@riska.(none) +3322 -0
    New BitKeeper file ``mysql-test/suite/binlog/std_data/binlog_old_version_4_1.000001''

  mysql-test/suite/binlog/std_data/binlog_old_version_4_1.000001@1.0, 2008-01-30 14:06:40+01:00, sven@riska.(none) +0 -0

  mysql-test/suite/binlog/t/binlog_old_versions.test@1.2, 2008-01-30 14:12:31+01:00, sven@riska.(none) +15 -0
    Added a test reading an old 4.1 binlog.

  sql/log_event.cc@1.277.50.1, 2008-01-30 14:12:32+01:00, sven@riska.(none) +12 -12
    1. Added const keyword at the following places:
     - input buffer for pretty_print_str
     - input buffer for write_str
     - input buffer, end pointer, and return value from sql_ex_info::init
    2. Fixed the bug by not taking a copy of buf before calling read_str in
    sql_ex_info::init().

  sql/log_event.h@1.170, 2008-01-30 14:12:34+01:00, sven@riska.(none) +6 -6
    Added const keyword to fields of the sql_ex_info struct.
    Added const keyword to arguments and return value of sql_ex_info::init

  sql/sql_binlog.cc@1.15.1.2, 2008-01-30 14:12:35+01:00, sven@riska.(none) +3 -4
    The first BINLOG statement must describe the format for future BINLOG
    statements. Otherwise, we do not know how to read the BINLOG statement.
    Problem: only FORMAT_DESCRIPTION_EVENT is currently allowed as the first
    event. Binlogs from 4.1 begin with a START_EVENT_V3, which serves the
    same purpose.
    Fix: We now allow the first BINLOG statement to be a START_EVENT_V3, as
    well as a FORMAT_DESCRIPTION_EVENT.

ChangeSet@1.1810.3496.32, 2008-01-30 11:58:10+01:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#34160
    make sure release of not added ptr does not corrupt hashtable

  ndb/src/kernel/vm/DLHashTable.hpp@1.3.2.1, 2008-01-30 11:58:09+01:00, jonas@perch.ndb.mysql.com +18 -4
    ndb - bug#34160
      make sure release of not added ptr does not corrupt hashtable

  ndb/src/kernel/vm/DLHashTable2.hpp@1.3.3.1, 2008-01-30 11:58:09+01:00, jonas@perch.ndb.mysql.com +18 -4
    ndb - bug#34160
      make sure release of not added ptr does not corrupt hashtable

ChangeSet@1.1810.3610.1, 2008-01-30 08:09:56+01:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#30172
    Backup can assert with "big" table definitions
    Correct condition before fetching next meta-table
    Increase meta-buffer, to cope with atleast 2 tables

  ndb/src/kernel/blocks/backup/Backup.cpp@1.15.28.1, 2008-01-30 08:09:54+01:00, jonas@perch.ndb.mysql.com +8 -6
    Correct condition, before fetching new meta-table

  ndb/src/kernel/blocks/backup/Backup.hpp@1.7.9.1, 2008-01-30 08:09:54+01:00, jonas@perch.ndb.mysql.com +1 -1
    Make sure atleast 2 tables can fix

ChangeSet@1.2476.828.1, 2008-01-29 21:58:57-05:00, iggy@alf.(none) +12 -0
  Bug#31929 Windows build fails with >=4 Parallel build threads.
  - Add GenError Dependency to storage engines that include 
  mysqld_error.h

  extra/yassl/CMakeLists.txt@1.7, 2008-01-29 21:58:55-05:00, iggy@alf.(none) +1 -0
    Bug#31929 Windows build fails with >=4 Parallel build threads.
    - Add GenError Dependency.

  sql/CMakeLists.txt@1.7.1.15, 2008-01-29 21:58:55-05:00, iggy@alf.(none) +1 -1
    Bug#31929 Windows build fails with >=4 Parallel build threads.
    - Add GenError Dependency.

  storage/archive/CMakeLists.txt@1.9, 2008-01-29 21:58:55-05:00, iggy@alf.(none) +1 -0
    Bug#31929 Windows build fails with >=4 Parallel build threads.
    - Add GenError Dependency.

  storage/blackhole/CMakeLists.txt@1.8, 2008-01-29 21:58:55-05:00, iggy@alf.(none) +1 -0
    Bug#31929 Windows build fails with >=4 Parallel build threads.
    - Add GenError Dependency.

  storage/csv/CMakeLists.txt@1.9, 2008-01-29 21:58:55-05:00, iggy@alf.(none) +1 -0
    Bug#31929 Windows build fails with >=4 Parallel build threads.
    - Add GenError Dependency.

  storage/example/CMakeLists.txt@1.7, 2008-01-29 21:58:55-05:00, iggy@alf.(none) +1 -0
    Bug#31929 Windows build fails with >=4 Parallel build threads.
    - Add GenError Dependency.

  storage/federated/CMakeLists.txt@1.6, 2008-01-29 21:58:55-05:00, iggy@alf.(none) +1 -0
    Bug#31929 Windows build fails with >=4 Parallel build threads.
    - Add GenError Dependency.

  storage/heap/CMakeLists.txt@1.7, 2008-01-29 21:58:55-05:00, iggy@alf.(none) +1 -0
    Bug#31929 Windows build fails with >=4 Parallel build threads.
    - Add GenError Dependency.

  storage/innobase/CMakeLists.txt@1.11, 2008-01-29 21:58:55-05:00, iggy@alf.(none) +1 -0
    Bug#31929 Windows build fails with >=4 Parallel build threads.
    - Add GenError Dependency.

  storage/myisam/CMakeLists.txt@1.8.1.1, 2008-01-29 21:58:55-05:00, iggy@alf.(none) +1 -0
    Bug#31929 Windows build fails with >=4 Parallel build threads.
    - Add GenError Dependency.

  storage/myisammrg/CMakeLists.txt@1.7, 2008-01-29 21:58:55-05:00, iggy@alf.(none) +1 -0
    Bug#31929 Windows build fails with >=4 Parallel build threads.
    - Add GenError Dependency.

  vio/CMakeLists.txt@1.6, 2008-01-29 21:58:55-05:00, iggy@alf.(none) +1 -0
    Bug#31929 Windows build fails with >=4 Parallel build threads.
    - Add GenError Dependency.

ChangeSet@1.2476.826.1, 2008-01-29 15:25:27+01:00, pekka@sama.ndb.mysql.com +5 -0
  ndb - bug#34118 - hash index trigger vs. disk

  mysql-test/suite/ndb/r/ndb_dd_basic.result@1.26, 2008-01-29 15:24:26+01:00, pekka@sama.ndb.mysql.com +12 -0
    bug#34118 hash index trigger disk flag

  mysql-test/suite/ndb/t/ndb_dd_basic.test@1.18, 2008-01-29 15:24:27+01:00, pekka@sama.ndb.mysql.com +15 -0
    bug#34118 hash index trigger disk flag

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.78, 2008-01-29 15:24:27+01:00, pekka@sama.ndb.mysql.com +11 -6
    bug#34118 hash index trigger disk flag

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.75, 2008-01-29 15:24:27+01:00, pekka@sama.ndb.mysql.com +6 -3
    bug#34118 hash index trigger disk flag

  storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp@1.31, 2008-01-29 15:24:27+01:00, pekka@sama.ndb.mysql.com +22 -11
    bug#34118 hash index trigger disk flag

ChangeSet@1.2476.792.18, 2008-01-29 15:02:03+01:00, pekka@sama.ndb.mysql.com +2 -0
  ndb - bug#31477 - in 5.1 move ndb_bug31477.test to suite/ndb

  mysql-test/suite/ndb/r/ndb_bug31477.result@1.2, 2008-01-29 14:12:31+01:00, pekka@sama.ndb.mysql.com +0 -0
    Rename: mysql-test/r/ndb_bug31477.result -> mysql-test/suite/ndb/r/ndb_bug31477.result

  mysql-test/suite/ndb/t/ndb_bug31477.test@1.2, 2008-01-29 14:12:03+01:00, pekka@sama.ndb.mysql.com +0 -0
    Rename: mysql-test/t/ndb_bug31477.test -> mysql-test/suite/ndb/t/ndb_bug31477.test

ChangeSet@1.2476.729.28, 2008-01-29 14:47:26+01:00, sven@riska.(none) +1 -0
  BUG#32434: Replication doesn't work between 5.2.1-a_drop6p9-log and 5.1.22-ndb-6.3.6-telco
  Problem: When slave reads format_description_log_event, it checks if the
  master is a version that uses an old binlog format. See also BUG#27779.
  Not all possible server_versions were listed.
  Fix: Check for all server_versions which use the old binlog_format.

  sql/log_event.cc@1.277.47.3, 2008-01-29 14:47:25+01:00, sven@riska.(none) +55 -10
    In the place where we check if server_version indicates that master is
    the alcatel branch, we now check all currently possible alcatel versions,
    not just a subset. Added comment to explain which clones are affected.

ChangeSet@1.2476.779.9, 2008-01-29 14:43:41+01:00, mkindahl@dl145h.mysql.com +7 -0
  Test changes to fix failures in pushbuild.

  mysql-test/include/show_binlog_events.inc@1.8, 2008-01-29 14:43:03+01:00, mkindahl@dl145h.mysql.com +1 -1
    Replacing file_id=N with file_id=# to avoid result mismatches

  mysql-test/suite/binlog/r/binlog_killed_simulate.result@1.2, 2008-01-29 14:43:08+01:00, mkindahl@dl145h.mysql.com +2 -2
    Result change

  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result@1.28, 2008-01-29 14:43:09+01:00, mkindahl@dl145h.mysql.com +2 -2
    Result change

  mysql-test/suite/binlog/r/binlog_stm_blackhole.result@1.24, 2008-01-29 14:43:14+01:00, mkindahl@dl145h.mysql.com +2 -2
    Result change

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.58, 2008-01-29 14:43:20+01:00, mkindahl@dl145h.mysql.com +4 -4
    Result change

  mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test@1.20, 2008-01-29 14:43:20+01:00, mkindahl@dl145h.mysql.com +1 -1
    Binlog positions differ between mixed and statement based replication.

  mysql-test/suite/rpl/r/rpl_stm_log.result@1.86, 2008-01-29 14:43:25+01:00, mkindahl@dl145h.mysql.com +2 -2
    Result change

ChangeSet@1.2476.825.1, 2008-01-29 10:37:44-02:00, davi@mysql.com +2 -0
  Fix test case of Bug 30331

  mysql-test/r/lock_multi.result@1.34, 2008-01-29 10:37:42-02:00, davi@mysql.com +4 -6
    Update test case result.

  mysql-test/t/lock_multi.test@1.37, 2008-01-29 10:37:42-02:00, davi@mysql.com +8 -2
    Don't print the value of Table_lock_waited, check the
    precedence instead. Unlock the table before dropping.

ChangeSet@1.1810.3485.13, 2008-01-29 19:21:21+08:00, hezx@mail.hezx.com +1 -0
  update test result

  mysql-test/r/rpl_grant.result@1.2.1.1, 2008-01-29 19:21:19+08:00, hezx@mail.hezx.com +2 -2
    update result

ChangeSet@1.2476.801.15, 2008-01-29 14:14:34+03:00, kostja@dipika.(none) +1 -0
  Fix Bug#27812 "an ampersand is missed in sql/sql_bitmap.h, line 68"

  sql/sql_bitmap.h@1.19, 2008-01-29 14:14:33+03:00, kostja@dipika.(none) +1 -1
    Fix Bug#27812 "an ampersand is missed in sql/sql_bitmap.h, line 68"

ChangeSet@1.1810.3608.1, 2008-01-29 11:56:48+08:00, hezx@mail.hezx.com +1 -0
  BUG#26489 Corruption in relay logs
  
  Here is the scenario that causes the failure.(by Mats)
  
  1. The to-be corrupt log event (let's call it X), is split into two
     packets B and C on the network level (net_write_buff()). The parts
     are X = (x',x''). The part x' ends up in packet B and part x''
     ends up in packet C. Prior to the corrupt event X, the event Y has
     been written successfully, but has been split into two packets as
     well, which we call (y',y'').
  2. The master sends packet A = (y'',x') to the slave, increases the
     packet sequence number, the slave receives the packet, but fails
     to reply before the master gets a timeout.
  3. Since the master got a timeout, it reports failure, and aborts
     sending the binary log by exiting mysql_binlog_send(). However, it
     leaves the buffer intact, still holding y'' (but not x', since the
     write_pos is not increased).
  4. After exiting mysql_binlog_send(), the master does a
     disconnection of the client thread, which involves sending an
     error message e to the client (i.e., the slave).
  5. In this case, net_write_buff() is used again, but this time the
     old contents of the packet is used so that the new packet is
     D = (y'',e). Note that this will use a new packet sequence number,
     since the packet number was increased in step 2.
  6. The slave receives the tail y'' of the Y log event, concatenates
     this with x' (which it already received), and writes the event
     (x',y'') it to the relay log since it hasn't noticed anything is
     amiss.
  7. It then tries to read more bytes, which is either e (if the length
     given for X just happened to match the length given for Y, or just
     plain garbage because the slave is out of sync with what is
     actually sent.
  8. After a while, the SQL thread tries to execute the event (x',y''),
     which is very likely to be just nonsense.
  
  The problem can be fixed by not resetting net->error after the call of 
  mysql_binlog_send, so the error message will not be sent and the connection
  will be closed.

  sql/sql_parse.cc@1.426.171.1, 2008-01-29 11:56:46+08:00, hezx@mail.hezx.com +0 -1
    Do not reset net->error, if net->error == 2, we should not try to use the connection again

ChangeSet@1.2512.3.1, 2008-01-28 22:05:25+01:00, mikael@dator6.(none) +3 -0
  BUG#33182: Disallow division due to div_precision_increment problems

  mysql-test/r/partition.result@1.79.2.1, 2008-01-28 22:05:22+01:00, mikael@dator6.(none) +3 -0
    New test case to validate that '/' is no longer allowed,
    only integer division is allowed

  mysql-test/t/partition.test@1.72.2.1, 2008-01-28 22:05:22+01:00, mikael@dator6.(none) +4 -0
    New test case to validate that '/' is no longer allowed,
    only integer division is allowed

  sql/item_func.h@1.177, 2008-01-28 22:05:22+01:00, mikael@dator6.(none) +3 -1
    +,-,*, mod is allowed
    / is disallowed

ChangeSet@1.2512.2.1, 2008-01-28 16:11:43+01:00, mikael@dator6.(none) +3 -0
  BUG#33429: No check for maxvalue before adding partition

  mysql-test/r/partition_range.result@1.24.1.1, 2008-01-28 16:11:40+01:00, mikael@dator6.(none) +11 -0
    Added new test cases

  mysql-test/t/partition_range.test@1.20.1.1, 2008-01-28 16:11:40+01:00, mikael@dator6.(none) +11 -0
    Added new test cases

  sql/sql_partition.cc@1.125.1.1, 2008-01-28 16:11:40+01:00, mikael@dator6.(none) +6 -1
    Added check that last partition hasn't got maxvalue defined when
    executing ADD PARTITION

ChangeSet@1.2512.1.1, 2008-01-28 15:20:55+01:00, mikael@dator6.(none) +5 -0
  BUG#32943: Fixed buggy lock handling of ALTER TABLE for partitioning

  mysql-test/r/partition_range.result@1.25, 2008-01-28 15:20:52+01:00, mikael@dator6.(none) +22 -0
    Added new test cases for lock tables and ALTER TABLE for
    partitions, also added a test case with a trigger.

  mysql-test/t/partition_range.test@1.21, 2008-01-28 15:20:52+01:00, mikael@dator6.(none) +35 -0
    Added new test cases for lock tables and ALTER TABLE for
    partitions, also added a test case with a trigger.

  sql/mysql_priv.h@1.549.1.4, 2008-01-28 15:20:52+01:00, mikael@dator6.(none) +1 -0
    Added WFRM_KEEP_SHARE for use of code not to be used otherwise

  sql/sql_partition.cc@1.126, 2008-01-28 15:20:52+01:00, mikael@dator6.(none) +44 -70
    Removed get_name_lock and release_name_lock, use
    close_data_files_and_morph_locks which leaves an
    exclusive name lock after completing.
    Reopen table after completing if under lock tables
    Updated comments

  sql/sql_table.cc@1.457.1.5, 2008-01-28 15:20:52+01:00, mikael@dator6.(none) +7 -3
    Ensure that code to set partition syntax isn't used other than
    when specifically asked to do it.

ChangeSet@1.2476.792.17, 2008-01-28 14:48:09+01:00, pekka@sama.ndb.mysql.com +3 -0
  ndb - bug#34046 - rename Ndbd_mem_manager::log2 to ndb_log2

  storage/ndb/src/kernel/vm/NdbdSuperPool.cpp@1.3, 2008-01-28 14:46:11+01:00, pekka@sama.ndb.mysql.com +1 -1
    rename Ndbd_mem_manager::log2 to ndb_log2

  storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp@1.14, 2008-01-28 14:46:11+01:00, pekka@sama.ndb.mysql.com +4 -4
    rename Ndbd_mem_manager::log2 to ndb_log2

  storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp@1.8, 2008-01-28 14:46:11+01:00, pekka@sama.ndb.mysql.com +1 -1
    rename Ndbd_mem_manager::log2 to ndb_log2

ChangeSet@1.2476.801.14, 2008-01-28 11:21:39-02:00, davi@mysql.com +1 -0
  Remove spurious commented out test line.

  mysql-test/t/lock_multi.test@1.36, 2008-01-28 11:21:38-02:00, davi@mysql.com +0 -1
    Remove spurious test line.

ChangeSet@1.2476.801.13, 2008-01-28 10:52:41-02:00, davi@mysql.com +3 -0
  Bug#30331 Table_locks_waited shows inaccurate values
  
  The problem is that the Table_locks_waited was incremented only
  when the lock request succeed. If a thread waiting for the lock
  gets killed or the lock request is aborted, the variable would
  not be incremented, leading to inaccurate values in the variable.
  
  The solution is to increment the Table_locks_waited whenever the
  lock request is queued. This reflects better the intended behavior
  of the variable -- show how many times a lock was waited.

  mysql-test/r/lock_multi.result@1.33, 2008-01-28 10:52:34-02:00, davi@mysql.com +12 -0
    Add test case result for Bug#30331

  mysql-test/t/lock_multi.test@1.35, 2008-01-28 10:52:34-02:00, davi@mysql.com +26 -0
    Add test case for Bug#30331

  mysys/thr_lock.c@1.63, 2008-01-28 10:52:34-02:00, davi@mysql.com +2 -1
    Increment locks_waited whenever the thread is supposed
    to wait for the lock.

ChangeSet@1.2476.792.16, 2008-01-28 13:03:27+01:00, pekka@sama.ndb.mysql.com +3 -0
  ndb - bug#31477 post-merge fixes in 5.1

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.77, 2008-01-28 13:02:17+01:00, pekka@sama.ndb.mysql.com +4 -5
    bug#31477 post-merge fixes in 5.1

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.74, 2008-01-28 13:02:17+01:00, pekka@sama.ndb.mysql.com +1 -15
    bug#31477 post-merge fixes in 5.1

  storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp@1.27, 2008-01-28 13:02:18+01:00, pekka@sama.ndb.mysql.com +40 -22
    bug#31477 post-merge fixes in 5.1

ChangeSet@1.1810.3474.10, 2008-01-27 14:28:50-07:00, tsmith@ramayana.hindu.god +2 -0
  Fix test case for Bug #25347 so that it actually tests the code fix,
  and so that it works correctly on Windows.

  mysql-test/r/mysqlcheck.result@1.1.2.3, 2008-01-27 14:28:49-07:00, tsmith@ramayana.hindu.god +1 -0
    Flush tables before monkeying around with underlying MyISAM data files

  mysql-test/t/mysqlcheck.test@1.1.2.4, 2008-01-27 14:28:49-07:00, tsmith@ramayana.hindu.god +2 -1
    Fix the test case for bug #25347 so that it actually does test the behavior.
    Also, this makes it work on Windows by ensuring that mysqld doesn't hold the
    underlying MyISAM files open while we try to corrupt them on disk.
    
    Flush tables before monkeying around with underlying MyISAM data files;
    --use-frm, so that mysqlcheck will succeed.

ChangeSet@1.1810.3607.1, 2008-01-27 16:41:29+01:00, pekka@sama.ndb.mysql.com +7 -0
  ndb - bug#31477 - 5.0

  mysql-test/r/ndb_bug31477.result@1.1, 2008-01-27 14:58:43+01:00, pekka@sama.ndb.mysql.com +98 -0
    BitKeeper file /export/space/pekka/ndb/version/my50-bug31477/mysql-test/r/ndb_bug31477.result

  mysql-test/r/ndb_bug31477.result@1.0, 2008-01-27 14:58:43+01:00, pekka@sama.ndb.mysql.com +0 -0

  mysql-test/t/ndb_bug31477.test@1.1, 2008-01-27 14:58:43+01:00, pekka@sama.ndb.mysql.com +109 -0
    BitKeeper file /export/space/pekka/ndb/version/my50-bug31477/mysql-test/t/ndb_bug31477.test

  mysql-test/t/ndb_bug31477.test@1.0, 2008-01-27 14:58:43+01:00, pekka@sama.ndb.mysql.com +0 -0

  ndb/src/common/util/NdbOut.cpp@1.5.2.1, 2008-01-27 15:00:46+01:00, pekka@sama.ndb.mysql.com +1 -1
    missing comma, causing weird Uint64 printout

  ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.22.13.1, 2008-01-27 16:37:49+01:00, pekka@sama.ndb.mysql.com +21 -1
    bug#31477 - explicit rewrite of tuxQueryTh
    if active op then non-dirty scan enters lock queue via TUX
    instead of skipping the tuple

  ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp@1.13.3.1, 2008-01-27 16:37:49+01:00, pekka@sama.ndb.mysql.com +73 -23
    bug#31477 - explicit rewrite of tuxQueryTh
    if active op then non-dirty scan enters lock queue via TUX
    instead of skipping the tuple

  ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp@1.27.7.1, 2008-01-27 16:37:49+01:00, pekka@sama.ndb.mysql.com +4 -2
    bug#31477 - explicit rewrite of tuxQueryTh
    if active op then non-dirty scan enters lock queue via TUX
    instead of skipping the tuple

  ndb/test/ndbapi/testOIBasic.cpp@1.39.6.4, 2008-01-27 15:01:36+01:00, pekka@sama.ndb.mysql.com +16 -11
    adjust params

  ndb/test/ndbapi/testOIBasic.cpp@1.39.6.3, 2008-01-27 14:27:33+01:00, pekka@sama.ndb.mysql.com +466 -4
    savepoint tests
    new -case i only testing dirty/latest locking bug#31477
    new -case j for insert into t.. select from t via index

  ndb/test/ndbapi/testOIBasic.cpp@1.39.6.2, 2008-01-27 14:23:40+01:00, pekka@sama.ndb.mysql.com +944 -870
    rewrites etc (needs more)
     - add option -cont to continue on error
     - Thr: remove stop(), rename stopped() to stop() (NDBT_Thread 5.1)
     - simplify out extra batch blocks
     - generalize catch err (deadlock etc)
     - factor out common routines from Row ops
     - full Row versioning

  ndb/test/ndbapi/testOIBasic.cpp@1.39.6.1, 2008-01-27 14:20:34+01:00, pekka@sama.ndb.mysql.com +433 -433
    style changes before rewrites

ChangeSet@1.1810.3606.1, 2008-01-26 21:45:35-08:00, igor@olga.mysql.com +5 -0
  Fixed bug #33833.
  Two disjuncts containing equalities of the form key=const1 and key=const2 can
  be merged into one if const1 is equal to const2. To check it the common 
  collation of the constants were used rather than the collation of the field key.
  For example when the default collation of the constants was cases insensitive
  while the collation of the field was case sensitive, then two or-ed equality 
  predicates key='b' and key='B' incorrectly were merged into one f='b'. As a 
  result ref access was used instead of range access and wrong result sets were 
  returned in many cases. 
  Fixed the problem by comparing constant in the or-ed predicate with collation of
  the key field.

  mysql-test/r/range.result@1.44.1.16, 2008-01-26 21:45:30-08:00, igor@olga.mysql.com +13 -0
    Added a test case for bug #33833.

  mysql-test/t/range.test@1.37.1.13, 2008-01-26 21:45:30-08:00, igor@olga.mysql.com +17 -0
    Added a test case for bug #33833.

  sql/item.cc@1.113.1.185, 2008-01-26 21:45:30-08:00, igor@olga.mysql.com +43 -0
    Fixed bug #33833.
    Added the method eq_by_collation that compares two items almost as 
    the method Item::eq, but it rather enforces a given collation for
    the comparison.

  sql/item.h@1.183.1.66, 2008-01-26 21:45:30-08:00, igor@olga.mysql.com +1 -0
    Fixed bug #33833.
    Added the method eq_by_collation that compares two items almost as 
    the method Item::eq, but it rather enforces a given collation for
    the comparison.

  sql/sql_select.cc@1.312.190.8, 2008-01-26 21:45:30-08:00, igor@olga.mysql.com +3 -1
    Fixed bug #33833.
    Two disjuncts containing equalities of the form key=const1 and key=const2 can
    be merged into one if const1 is equal to const2. To check it the common 
    collation of the constants were used rather than the collation of the field key.
    For example when the default collation of the constants was cases insensitive
    while the collation of the field was case sensitive, then two or-ed equality 
    predicates key='b' and key='B' incorrectly were merged into one f='b'. As a 
    result ref access was used instead of range access and wrong result sets were 
    returned in many cases. 
    Fixed the problem by comparing constant in the or-ed predicate with collation of
    the key field.

ChangeSet@1.2476.824.2, 2008-01-26 02:13:35-08:00, acurtis@xiphis.org +2 -0
  fixes to make pushbuild tests green

  mysql-test/t/plugin_load-master.opt@1.2, 2008-01-26 02:13:31-08:00, acurtis@xiphis.org +1 -1
    add '--loose' modifier to allow test to be skipped if plugin is not available.

  sql/sql_plugin.cc@1.80, 2008-01-26 02:13:31-08:00, acurtis@xiphis.org +2 -3
    Failure to load a plugin from command line option made non-fatal as plugin
    load failures from plugin table is already non-fatal.

ChangeSet@1.2476.824.1, 2008-01-25 16:05:15-08:00, acurtis@xiphis.org +4 -0
  Bug#33358
    "Plugin enum variables can't be set from command line"
    fix crash of LOCK_plugins mutex when loading plug-ins from command line.
    fix off-by-one bug when loading multiple plug-ins from the command line.
    initialize command line handling for ENUM and SET plugin variable types.

  mysql-test/r/plugin_load.result@1.1, 2008-01-25 16:04:59-08:00, acurtis@xiphis.org +3 -0
    New BitKeeper file ``mysql-test/r/plugin_load.result''

  mysql-test/r/plugin_load.result@1.0, 2008-01-25 16:04:59-08:00, acurtis@xiphis.org +0 -0

  mysql-test/t/plugin_load-master.opt@1.1, 2008-01-25 16:04:59-08:00, acurtis@xiphis.org +3 -0
    New BitKeeper file ``mysql-test/t/plugin_load-master.opt''

  mysql-test/t/plugin_load-master.opt@1.0, 2008-01-25 16:04:59-08:00, acurtis@xiphis.org +0 -0

  mysql-test/t/plugin_load.test@1.1, 2008-01-25 16:04:59-08:00, acurtis@xiphis.org +3 -0
    New BitKeeper file ``mysql-test/t/plugin_load.test''

  mysql-test/t/plugin_load.test@1.0, 2008-01-25 16:04:59-08:00, acurtis@xiphis.org +0 -0

  sql/sql_plugin.cc@1.79, 2008-01-25 16:04:59-08:00, acurtis@xiphis.org +48 -18
    Bug33358
      fix crash of LOCK_plugins mutex when loading plug-ins from command line.
      fix off-by-one bug when loading multiple plug-ins from the command line.
      initialize command line handling for ENUM and SET plugin variable types.

ChangeSet@1.1810.3474.9, 2008-01-25 16:00:15-07:00, tsmith@ramayana.hindu.god +1 -0
  Un-break test case on Windows, for bug #25347

  mysql-test/t/mysqlcheck.test@1.1.2.3, 2008-01-25 16:00:11-07:00, tsmith@ramayana.hindu.god +3 -2
    Use --remove_file and --write_file instead of --exec rm and --exec touch.

ChangeSet@1.2476.823.1, 2008-01-25 17:56:44+02:00, gkodinov@magare.gmz +4 -0
  Bug #31524: One table one row select on NDB cause optimizer to 
    require SQL_BIG_SELECTS=1
  
  There was a previous test that leaves a non-default (small) max_join_size.
  Fixed by re-setting the max_join_size to default when the test is over.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result@1.11, 2008-01-25 17:56:41+02:00, gkodinov@magare.gmz +1 -1
    Bug #31524: side effects of previous testsuites fixed

  mysql-test/suite/rpl/r/rpl_row_charset.result@1.11, 2008-01-25 17:56:41+02:00, gkodinov@magare.gmz +1 -1
    Bug #31524: side effects of previous testsuites fixed

  mysql-test/extra/rpl_tests/rpl_row_charset.test@1.9, 2008-01-25 17:56:41+02:00, gkodinov@magare.gmz +1 -1
    Bug #31524: side effects of previous testsuites fixed

  mysql-test/suite/rpl/r/rpl_row_charset_innodb.result@1.1.1.1, 2008-01-25 17:56:41+02:00, gkodinov@magare.gmz +1 -1
    Bug #31524: side effects of previous testsuites fixed

ChangeSet@1.1616.3132.2, 2008-01-25 10:53:21-05:00, cmiller@zippy.cornsilk.net +1 -0
  Bug#33841: mysql client crashes when returning results for long-\
  	running queries
  
  Bug#33976: buffer overflow of variable time_buff in function com_go()
  
  An internal buffer was too short.  Overextending could smash the 
  stack on some architectures and cause SEGVs.  This is not a problem
  that could be exploited to run arbitrary code.
  
  To fix, I expanded one buffer to cover all the size that could be
  written to (we know the abolute max).

  client/mysql.cc@1.121.21.1, 2008-01-25 10:53:21-05:00, cmiller@zippy.cornsilk.net +15 -4
    Bump up the max size of the time-elapsed buffer displayed at the end
    of queries.

ChangeSet@1.2476.817.4, 2008-01-25 10:43:30+01:00, mskold@mysql.com +4 -0
  ndb_restore.result, ndb_restore.test:
    Changed to use information_schema to check auto_increment
  Ndb.cpp:
    Bug #33534   Bad performance of INSERT's in auto_incremented tables: Saving highest seen value when setting auto_increment fields
  ndb_auto_increment.result:
    Regenerated result

  mysql-test/suite/ndb/r/ndb_auto_increment.result@1.5, 2008-01-25 10:34:28+01:00, mskold@mysql.com +3 -3
    Regenerated result

  mysql-test/suite/ndb/r/ndb_restore.result@1.31, 2008-01-25 10:35:18+01:00, mskold@mysql.com +236 -32
    Changed to use information_schema to check auto_increment

  mysql-test/suite/ndb/t/ndb_restore.test@1.34, 2008-01-25 10:35:18+01:00, mskold@mysql.com +161 -9
    Changed to use information_schema to check auto_increment

  storage/ndb/src/ndbapi/Ndb.cpp@1.102, 2008-01-25 10:43:13+01:00, mskold@mysql.com +5 -5
    Bug #33534   Bad performance of INSERT's in auto_incremented tables: Saving highest seen value when setting auto_increment fields

ChangeSet@1.1810.3485.12, 2008-01-25 15:02:26+08:00, hezx@mail.hezx.com +3 -0
  BUG#33862 completely failed DROP USER statement gets replicated
  
  The problem is when create/rename/drop users, the statement was logged regardless of error, even if no data has been changed, the statement was logged.
  
  After this patch, create/rename/drop users don't write the binlog if the statement makes no changes, if the statement does make any changes, log the statement with possible error code.
  
  This patch is based on the patch for BUG#29749, which is not pushed

  mysql-test/r/rpl_user.result@1.1, 2008-01-25 15:02:24+08:00, hezx@mail.hezx.com +42 -0
    New BitKeeper file ``mysql-test/r/rpl_user.result''

  mysql-test/r/rpl_user.result@1.0, 2008-01-25 15:02:24+08:00, hezx@mail.hezx.com +0 -0

  mysql-test/t/rpl_user.test@1.1, 2008-01-25 15:02:24+08:00, hezx@mail.hezx.com +56 -0
    New BitKeeper file ``mysql-test/t/rpl_user.test''

  mysql-test/t/rpl_user.test@1.0, 2008-01-25 15:02:24+08:00, hezx@mail.hezx.com +0 -0

  sql/sql_acl.cc@1.128.47.3, 2008-01-25 15:02:24+08:00, hezx@mail.hezx.com +17 -7
    when create/rename/drop users, don't write the binlog if the statement make no changes

ChangeSet@1.2476.819.2, 2008-01-24 19:04:48+01:00, jmiller@mysql.com +1 -0
  Makefile.am:
    Needed to add the new sample configuration files to the CLEANFILES section

  support-files/Makefile.am@1.41, 2008-01-24 19:04:35+01:00, jmiller@mysql.com +3 -0
    Needed to add the new sample configuration files to the CLEANFILES section

ChangeSet@1.2476.822.1, 2008-01-24 18:56:42+01:00, istruewing@stella.local +3 -0
  Bug#29182 - MyISAMCHK reports wrong character set
  
  myisamchk did always show Character set: latin1_swedish_ci (8),
  regardless what DEFAULT CHARSET the table had.
  
  When the server created a MyISAM table, it did not copy the
  characterset number into the MyISAM create info structure.
  
  Added assignment of charset number to MI_CREATE_INFO.

  mysql-test/r/myisam.result@1.124, 2008-01-24 18:56:41+01:00, istruewing@stella.local +19 -0
    Bug#29182 - MyISAMCHK reports wrong character set
    Added test result.

  mysql-test/t/myisam.test@1.98, 2008-01-24 18:56:41+01:00, istruewing@stella.local +14 -0
    Bug#29182 - MyISAMCHK reports wrong character set
    Added test.

  storage/myisam/ha_myisam.cc@1.231.2.8, 2008-01-24 18:56:41+01:00, istruewing@stella.local +1 -0
    Bug#29182 - MyISAMCHK reports wrong character set
    Added assignment of charset number to MI_CREATE_INFO.

ChangeSet@1.2403.18.104, 2008-01-24 15:10:46+01:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - jamify (better) DbtupDiskAlloc

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.55.2.12, 2008-01-24 15:10:44+01:00, jonas@perch.ndb.mysql.com +1 -0
    jamify DbtupDiskAlloc

  storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp@1.21.2.6, 2008-01-24 15:10:44+01:00, jonas@perch.ndb.mysql.com +50 -9
    jamify DbtupDiskAlloc

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp@1.21.2.4, 2008-01-24 15:10:44+01:00, jonas@perch.ndb.mysql.com +97 -58
    jamify DbtupDiskAlloc

ChangeSet@1.2403.18.103, 2008-01-24 14:21:52+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#34033
    remove LCP-snapshot from MM-tables,
    removing possibility of spurious 899 on MM-tables

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@1.18.1.8, 2008-01-24 14:21:50+01:00, jonas@perch.ndb.mysql.com +61 -54
    dont run LCP-snapshot on pure MM-tables,
    this is implemented by not setting frag.m_lcp_scan_op
    which will make TUP_COMMIT do nothing

ChangeSet@1.2476.792.10, 2008-01-24 12:08:04+01:00, tomas@whalegate.ndb.mysql.com +3 -0
  Bug#33814 - yassl problems
  (recommit)

  extra/yassl/src/handshake.cpp@1.16.2.1, 2008-01-24 12:08:01+01:00, tomas@whalegate.ndb.mysql.com +5 -0
    Bug#33814 - yassl problems
    (recommit)

  extra/yassl/src/template_instnt.cpp@1.15.2.1, 2008-01-24 12:08:01+01:00, tomas@whalegate.ndb.mysql.com +1 -0
    new template instantiation (recommit)

  extra/yassl/src/yassl_imp.cpp@1.14.2.1, 2008-01-24 12:08:01+01:00, tomas@whalegate.ndb.mysql.com +10 -1
    Bug#33814 - yassl problems
    (recommit)

ChangeSet@1.2476.792.9, 2008-01-24 12:06:40+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug#30366 (recommit) NDB fails to start on OS X, PPC, 64 bit
  - The errno variable should only be used when the previous socket
    write failed, it should be regarded as undefined at other times

  storage/ndb/src/common/util/OutputStream.cpp@1.10.2.1, 2008-01-24 12:06:37+01:00, tomas@whalegate.ndb.mysql.com +2 -2
    Bug#30366 (recommit) NDB fails to start on OS X, PPC, 64 bit
    - The errno variable should only be used when the previous socket
      write failed, it should be regarded as undefined at other times

ChangeSet@1.1810.3599.7, 2008-01-24 00:31:47-07:00, tsmith@ramayana.hindu.god +1 -0
  Fix bug in BK trigger for sending changes to InnoDB devs.

  BitKeeper/triggers/triggers-lib.pl@1.1.1.1, 2008-01-24 00:31:46-07:00, tsmith@ramayana.hindu.god +2 -2
    Fix bug in innodb_send_changes_mail() that always displayed
    details for the most recent changeset (-r+) instead of the
    $cset function argument.

ChangeSet@1.1810.3604.1, 2008-01-23 18:20:04-07:00, tsmith@ramayana.hindu.god +1 -0
  Applied innodb-5.0-ss2223 snapshot
  
  Fixes:
  
  Bug #32083: server crashes on show status when InnoDB is not initialized
    innodb_export_status(): Check that InnoDB has been initialized
    before invoking srv_export_innodb_status().  (Bug #32083)
    This bug does not exist in MySQL/InnoDB 5.1.

  sql/ha_innodb.cc@1.202.56.1, 2008-01-23 18:15:54-07:00, tsmith@ramayana.hindu.god +3 -1
    Applied innodb-5.0-ss2223 snapshot
    
    Revision r2223:
    branches/5.0: innodb_export_status(): Check that InnoDB has been initialized
    before invoking srv_export_innodb_status().  (Bug #32083)
    
    This bug does not exist in MySQL/InnoDB 5.1.

ChangeSet@1.2476.820.2, 2008-01-23 16:32:19-07:00, tsmith@ramayana.hindu.god +1 -0
  Update triggers lib for version MySQL 5.1

  BitKeeper/triggers/triggers-lib.pl@1.2, 2008-01-23 16:32:18-07:00, tsmith@ramayana.hindu.god +4 -8
    Update triggers lib for version MySQL 5.1

ChangeSet@1.2476.815.6, 2008-01-23 16:21:09-07:00, malff@lambda.hsd1.co.comcast.net. +5 -0
  Manual merge

  mysql-test/r/sp-error.result@1.136, 2008-01-23 16:21:04-07:00, malff@lambda.hsd1.co.comcast.net. +48 -0
    Manual merge

  mysql-test/r/sp.result@1.309, 2008-01-23 16:21:04-07:00, malff@lambda.hsd1.co.comcast.net. +35 -0
    Manual merge

  mysql-test/t/sp-error.test@1.131, 2008-01-23 16:21:04-07:00, malff@lambda.hsd1.co.comcast.net. +63 -0
    Manual merge

  mysql-test/t/sp.test@1.268, 2008-01-23 16:21:04-07:00, malff@lambda.hsd1.co.comcast.net. +52 -0
    Manual merge

  sql/sql_yacc.yy@1.611.1.7, 2008-01-23 16:21:04-07:00, malff@lambda.hsd1.co.comcast.net. +99 -17
    Manual merge

ChangeSet@1.1810.3603.1, 2008-01-23 16:18:23-07:00, tsmith@ramayana.hindu.god +4 -0
  Add triggers to notify InnoDB developers when MySQL developers change files
  that they control.

  BitKeeper/triggers/post-commit.innodb.pl@1.1, 2008-01-23 16:17:22-07:00, tsmith@ramayana.hindu.god +22 -0
    Trigger to notify InnoDB developers about changes in InnoDB
    files.

  BitKeeper/triggers/post-commit.innodb.pl@1.0, 2008-01-23 16:17:22-07:00, tsmith@ramayana.hindu.god +0 -0

  BitKeeper/triggers/post-incoming.innodb.pl@1.1, 2008-01-23 16:17:22-07:00, tsmith@ramayana.hindu.god +30 -0
    Trigger to notify InnoDB developers about changes in InnoDB
    files.

  BitKeeper/triggers/post-incoming.innodb.pl@1.0, 2008-01-23 16:17:22-07:00, tsmith@ramayana.hindu.god +0 -0

  BitKeeper/triggers/pre-commit.innodb.pl@1.1, 2008-01-23 16:17:22-07:00, tsmith@ramayana.hindu.god +21 -0
    Trigger to warn MySQL developers that they have changed InnoDB files,
    and that their changes will be sent to the InnoDB developers if they
    choose to commit.

  BitKeeper/triggers/pre-commit.innodb.pl@1.0, 2008-01-23 16:17:22-07:00, tsmith@ramayana.hindu.god +0 -0

  BitKeeper/triggers/triggers-lib.pl@1.1, 2008-01-23 16:17:22-07:00, tsmith@ramayana.hindu.god +360 -0
    Utility functions for BK triggers written in Perl.

  BitKeeper/triggers/triggers-lib.pl@1.0, 2008-01-23 16:17:22-07:00, tsmith@ramayana.hindu.god +0 -0

ChangeSet@1.1810.3598.3, 2008-01-23 14:52:40-07:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  manual merge

  mysql-test/r/sp.result@1.170.28.33, 2008-01-23 14:52:38-07:00, malff@lambda.hsd1.co.comcast.net. +16 -0
    manual merge

ChangeSet@1.1810.3496.28, 2008-01-23 21:51:01+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  correct result to be the same as in 5.0

  mysql-test/r/view.result@1.138.1.73, 2008-01-23 21:50:59+01:00, tomas@whalegate.ndb.mysql.com +4 -4
    correct result to be the same as in 5.0

ChangeSet@1.1810.3602.1, 2008-01-23 13:26:41-07:00, malff@lambda.hsd1.co.comcast.net. +11 -0
  Bug#33618 (Crash in sp_rcontext)
  Bug 33983 (Stored Procedures: wrong end <label> syntax is accepted)
  
  The server used to crash when REPEAT or another control instruction
  was used in conjunction with labels and a LEAVE instruction.
  
  The crash was caused by a missing "pop" of handlers or cursors in the
  code representing the stored program. When executing the code in a loop,
  this missing "pop" would result in a stack overflow, corrupting memory.
  
  Code generation has been fixed to produce the missing h_pop/c_pop
  instructions.
  
  Also, the logic checking that labels at the beginning and the end of a
  statement are matched was incorrect, causing Bug 33983.
  End labels, when used, must match the label used at the beginning of a block.

  mysql-test/r/sp-code.result@1.5.1.7, 2008-01-23 13:26:38-07:00, malff@lambda.hsd1.co.comcast.net. +109 -0
    Bug#33618 (Crash in sp_rcontext)

  mysql-test/r/sp-error.result@1.102.1.15, 2008-01-23 13:26:38-07:00, malff@lambda.hsd1.co.comcast.net. +48 -0
    Bug 33983 (Stored Procedures: wrong end <label> syntax is accepted)

  mysql-test/r/sp.result@1.170.51.1, 2008-01-23 13:26:38-07:00, malff@lambda.hsd1.co.comcast.net. +35 -0
    Bug#33618 (Crash in sp_rcontext)

  mysql-test/t/sp-code.test@1.6.1.3, 2008-01-23 13:26:38-07:00, malff@lambda.hsd1.co.comcast.net. +77 -0
    Bug#33618 (Crash in sp_rcontext)

  mysql-test/t/sp-error.test@1.100.1.18, 2008-01-23 13:26:38-07:00, malff@lambda.hsd1.co.comcast.net. +63 -0
    Bug 33983 (Stored Procedures: wrong end <label> syntax is accepted)

  mysql-test/t/sp.test@1.174.51.1, 2008-01-23 13:26:38-07:00, malff@lambda.hsd1.co.comcast.net. +51 -0
    Bug#33618 (Crash in sp_rcontext)

  sql/sp_head.cc@1.200.33.1, 2008-01-23 13:26:38-07:00, malff@lambda.hsd1.co.comcast.net. +6 -0
    Bug#33618 (Crash in sp_rcontext)

  sql/sp_head.h@1.79.1.23, 2008-01-23 13:26:38-07:00, malff@lambda.hsd1.co.comcast.net. +3 -2
    Bug#33618 (Crash in sp_rcontext)

  sql/sp_rcontext.cc@1.44.1.3, 2008-01-23 13:26:39-07:00, malff@lambda.hsd1.co.comcast.net. +75 -1
    Bug#33618 (Crash in sp_rcontext)

  sql/sp_rcontext.h@1.37, 2008-01-23 13:26:39-07:00, malff@lambda.hsd1.co.comcast.net. +6 -34
    Bug#33618 (Crash in sp_rcontext)

  sql/sql_yacc.yy@1.371.141.1, 2008-01-23 13:26:39-07:00, malff@lambda.hsd1.co.comcast.net. +76 -13
    Bug#33618 (Crash in sp_rcontext)

ChangeSet@1.2476.819.1, 2008-01-23 20:45:46+01:00, jmiller@mysql.com +4 -0
  config.medium.ini.sh, config.small.ini.sh, config.huge.ini.sh:
    Sample cluster configuration files for 5.1
  Makefile.am:
    Updated for new files

  support-files/Makefile.am@1.40, 2008-01-23 20:45:36+01:00, jmiller@mysql.com +6 -0
    Updated for new files

  support-files/config.huge.ini.sh@1.1, 2008-01-23 20:45:07+01:00, jmiller@mysql.com +212 -0
    Sample cluster configuration files for 5.1

  support-files/config.huge.ini.sh@1.0, 2008-01-23 20:45:07+01:00, jmiller@mysql.com +0 -0

  support-files/config.medium.ini.sh@1.1, 2008-01-23 20:45:07+01:00, jmiller@mysql.com +124 -0
    Sample cluster configuration files for 5.1

  support-files/config.medium.ini.sh@1.0, 2008-01-23 20:45:07+01:00, jmiller@mysql.com +0 -0

  support-files/config.small.ini.sh@1.1, 2008-01-23 20:45:07+01:00, jmiller@mysql.com +65 -0
    Sample cluster configuration files for 5.1

  support-files/config.small.ini.sh@1.0, 2008-01-23 20:45:07+01:00, jmiller@mysql.com +0 -0

ChangeSet@1.1810.3474.6, 2008-01-23 11:37:46-05:00, cmiller@zippy.cornsilk.net +3 -0
  Patch contributed by Jocelyn Fournier.  CLA received 2007-02-27.
  
  Bug#25347: mysqlcheck -A -r doesn't repair table marked as crashed
  
  mysqlcheck tests nullness of the engine type to know whether the
  "table" is a view or not.  That also falsely catches tables that 
  are severly damaged.
  
  Instead, use SHOW FULL TABLES to test whether a "table" is a view
  or not.
  
  (Don't add new function.  Instead, get original data a smarter way.)
  
  Make it safe for use against databases before when views appeared.

  client/mysqlcheck.c@1.55.2.3, 2008-01-23 11:37:44-05:00, cmiller@zippy.cornsilk.net +12 -7
    Use SHOW FULL TABLES to test better whether a name in the table
    list is one of a view.  Checking that the engine is NULL is 
    insufficient.
    
    Implemented suggestion from jimw that involved removing most of 
    original patch and getting data a better way

  mysql-test/r/mysqlcheck.result@1.1.2.2, 2008-01-23 11:37:44-05:00, cmiller@zippy.cornsilk.net +10 -0
    Verify that tables that have NULL/unreadable engine types are 
    processed and not interpreted as views.

  mysql-test/t/mysqlcheck.test@1.1.2.2, 2008-01-23 11:37:44-05:00, cmiller@zippy.cornsilk.net +16 -0
    Verify that tables that have NULL/unreadable engine types are 
    processed and not interpreted as views.

ChangeSet@1.1810.3474.5, 2008-01-23 11:34:08-05:00, cmiller@zippy.cornsilk.net +2 -0
  Bug#27427: resolveip fails on hostnames with a leading digit
  
  Patch by Kasper Dupont.  No CLA required for this size of patch.
  
  "resolveip" program produces incorrect result if given a hostname
  starting with a digit.  Someone seems to have thought that names 
  can not have digits at the beginning.
  
  Instead, use the resolver library to work out the rules of hostnames, 
  as it will undoubtedly be better at it than we are.

  configure.in@1.245.111.1, 2008-01-23 11:34:07-05:00, cmiller@zippy.cornsilk.net +2 -0
    See if we need to a library for address lookups.

  extra/resolveip.c@1.24.2.1, 2008-01-23 11:34:07-05:00, cmiller@zippy.cornsilk.net +4 -2
    Don't use silly heuristic to know whether a string is a dotted
    quad.  Instead, pass the whole thing into the resolver and let
    its smarts do all the work.

ChangeSet@1.1810.3600.2, 2008-01-23 12:56:27+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#34005
    make sure whole send buffer is flushed, even when wrapping around end

  ndb/src/common/transporter/TCP_Transporter.cpp@1.9.7.1, 2008-01-23 12:56:26+01:00, jonas@perch.ndb.mysql.com +16 -6
    ndb - bug#34005
      make sure whole send buffer is flush, even when wrapping around end

ChangeSet@1.1810.3217.31, 2008-01-23 11:41:45+01:00, mskold@mysql.com +1 -0
  Ndb.hpp:
    Changed function attribute names to match implementation

  ndb/include/ndbapi/Ndb.hpp@1.39.18.1, 2008-01-23 11:41:37+01:00, mskold@mysql.com +7 -7
    Changed function attribute names to match implementation

ChangeSet@1.2476.817.2, 2008-01-23 11:40:06+01:00, mskold@mysql.com +4 -0
  Ndb.hpp, Ndb.cpp, ha_ndbcluster.cc:
    Add a check if setting an auto_increment field will change it's next value before retrieving tuple_id_range lock. This avoids hitting locks when updating auto_increment values to a lower value than the current maximum. This is useful in loading a table with auto_increment where one loads the highest numbered pk's first and then proceeds backwards to the first. This can then be achieved with the same performance as a normal insert without auto_increment.
  ndb_restore.result:
    Updated result file

  mysql-test/suite/ndb/r/ndb_restore.result@1.30, 2008-01-23 11:35:00+01:00, mskold@mysql.com +67 -251
    Updated result file

  sql/ha_ndbcluster.cc@1.469.6.1, 2008-01-23 11:39:57+01:00, mskold@mysql.com +7 -4
    Add a check if setting an auto_increment field will change it's next value before retrieving tuple_id_range lock. This avoids hitting locks when updating auto_increment values to a lower value than the current maximum. This is useful in loading a table with auto_increment where one loads the highest numbered pk's first and then proceeds backwards to the first. This can then be achieved with the same performance as a normal insert without auto_increment.

  storage/ndb/include/ndbapi/Ndb.hpp@1.72, 2008-01-23 11:39:57+01:00, mskold@mysql.com +14 -9
    Add a check if setting an auto_increment field will change it's next value before retrieving tuple_id_range lock. This avoids hitting locks when updating auto_increment values to a lower value than the current maximum. This is useful in loading a table with auto_increment where one loads the highest numbered pk's first and then proceeds backwards to the first. This can then be achieved with the same performance as a normal insert without auto_increment.

  storage/ndb/src/ndbapi/Ndb.cpp@1.100, 2008-01-23 11:39:57+01:00, mskold@mysql.com +91 -34
    Add a check if setting an auto_increment field will change it's next value before retrieving tuple_id_range lock. This avoids hitting locks when updating auto_increment values to a lower value than the current maximum. This is useful in loading a table with auto_increment where one loads the highest numbered pk's first and then proceeds backwards to the first. This can then be achieved with the same performance as a normal insert without auto_increment.

ChangeSet@1.1810.3600.1, 2008-01-23 09:59:06+01:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - bug#33750
      make sure that getField does not write after supplied buffer
      (recommit to correct clone, for easy merging)

  ndb/include/util/Bitmask.hpp@1.16.3.1, 2008-01-23 09:59:04+01:00, jonas@perch.ndb.mysql.com +9 -1
    ndb- bug#33750
          make sure that getField does not write after supplied buffer

  ndb/src/common/util/Bitmask.cpp@1.8.4.1, 2008-01-23 09:59:05+01:00, jonas@perch.ndb.mysql.com +52 -301
    ndb- bug#33750
          make sure that getField does not write after supplied buffer

  ndb/test/ndbapi/testBitfield.cpp@1.9.3.1, 2008-01-23 09:59:05+01:00, jonas@perch.ndb.mysql.com +403 -4
    move test from Bitmask.cpp into testBitfield
          for automatic testing

ChangeSet@1.1810.3217.30, 2008-01-22 15:04:56+01:00, mskold@mysql.com +1 -0
  Fixed incorrect signature comment

  ndb/src/ndbapi/Ndb.cpp@1.49.30.1, 2008-01-22 15:04:45+01:00, mskold@mysql.com +2 -4
    Fixed incorrect signature comment

ChangeSet@1.1810.3217.29, 2008-01-22 14:18:47+01:00, mskold@mysql.com +7 -0
  DictCache.hpp, Ndb.hpp:
    Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node
  ndb_restore.result, ndb_restore.test:
    Changed test to use information_schema to check auto_increment
  DictCache.cpp, Ndb.cpp:
    Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node. When setting the auto_increment value we'll also read up the new value, this is useful if we use the table the first time in this MySQL Server and haven't yet seen the NEXTID value. The kernel will avoid updating since it already has the value but will also read up the NEXTID value to ensure we don't need to do this any more time.
  ndb_auto_increment.result:
    Updated result file since it was incorrect

  mysql-test/r/ndb_auto_increment.result@1.1.1.1, 2008-01-22 14:18:25+01:00, mskold@mysql.com +3 -3
    Updated result file since it was incorrect

  mysql-test/r/ndb_restore.result@1.4.1.6, 2008-01-22 14:17:48+01:00, mskold@mysql.com +35 -15
    Changed test to use information_schema to check auto_increment

  mysql-test/t/ndb_restore.test@1.9.1.6, 2008-01-22 14:17:48+01:00, mskold@mysql.com +15 -10
    Changed test to use information_schema to check auto_increment

  ndb/include/ndbapi/Ndb.hpp@1.39.17.1, 2008-01-22 14:14:09+01:00, mskold@mysql.com +5 -3
    Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node

  ndb/src/ndbapi/DictCache.cpp@1.12.14.1, 2008-01-22 14:16:37+01:00, mskold@mysql.com +1 -0
    Add new variable m_highest_seen when only peeking at auto_increment NEXTID
    and not retrieving to cache. Add new method to check tupleId before calling
    data node. When setting the auto_increment value we'll also read up the new
    value, this is useful if we use the table the first time in this MySQL Server
    and haven't yet seen the NEXTID value. The kernel will avoid updating since it
    already has the value but will also read up the NEXTID value to ensure we
    don't need to do this any more time.

  ndb/src/ndbapi/DictCache.hpp@1.6.11.1, 2008-01-22 14:14:09+01:00, mskold@mysql.com +1 -0
    Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node

  ndb/src/ndbapi/Ndb.cpp@1.49.29.1, 2008-01-22 14:16:37+01:00, mskold@mysql.com +89 -36
    Add new variable m_highest_seen when only peeking at auto_increment NEXTID
    and not retrieving to cache. Add new method to check tupleId before calling
    data node. When setting the auto_increment value we'll also read up the new
    value, this is useful if we use the table the first time in this MySQL Server
    and haven't yet seen the NEXTID value. The kernel will avoid updating since
    it already has the value but will also read up the NEXTID value to ensure we
    don't need to do this any more time.

ChangeSet@1.2476.793.6, 2008-01-21 22:28:43-05:00, pcrews@pcrews-mac-local.local +2 -0
  Fix of .test and .result file for Bug#33558 - stress.ddl_csv requires nullable columns which CSV does not support

  mysql-test/r/csv_not_null.result@1.2, 2008-01-21 22:28:42-05:00, pcrews@pcrews-mac-local.local +0 -2
    Fix of .test and .result file for Bug#33558 - stress.ddl_csv requires nullable columns which CSV does not support

  mysql-test/t/csv_not_null.test@1.2, 2008-01-21 22:28:42-05:00, pcrews@pcrews-mac-local.local +0 -2
    Fix of .test and .result file for Bug#33558 - stress.ddl_csv requires nullable columns which CSV does not support

ChangeSet@1.2476.729.27, 2008-01-22 09:55:23+08:00, hezx@mail.hezx.com +3 -0
  fix test failure

  mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test@1.50.1.1, 2008-01-22 09:55:20+08:00, hezx@mail.hezx.com +11 -17
    Remove unnecessary show master status, and replace the rest with show binlog events for checking

  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result@1.26.1.1, 2008-01-22 09:55:20+08:00, hezx@mail.hezx.com +81 -60
    update result

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.56.1.2, 2008-01-22 09:55:20+08:00, hezx@mail.hezx.com +72 -53
    update result

ChangeSet@1.2476.793.4, 2008-01-21 13:49:03-05:00, pcrews@pcrews-mac-local.local +12 -0
  New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
  Added new tests and corrected existing tests

  BitKeeper/etc/ignore@1.300.1.8, 2008-01-21 13:49:02-05:00, pcrews@pcrews-mac-local.local +2 -0
    Added mysql-test/.DS_Store .DS_Store to the ignore list

  mysql-test/r/csv_not_null.result@1.1, 2008-01-21 13:49:02-05:00, pcrews@pcrews-mac-local.local +59 -0
    New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
    
    

  mysql-test/r/csv_not_null.result@1.0, 2008-01-21 13:49:02-05:00, pcrews@pcrews-mac-local.local +0 -0

  mysql-test/suite/stress/include/ddl3.inc@1.2, 2008-01-21 13:49:01-05:00, pcrews@pcrews-mac-local.local +1 -1
    New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
    
    Had to change CREATE TABLE statements to include NOT NULL due to CSV engine constraints

  mysql-test/suite/stress/r/ddl_archive.result@1.2, 2008-01-21 13:49:01-05:00, pcrews@pcrews-mac-local.local +8 -8
    New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
    
    Reproduced .result files due to changes in ddl3.inc

  mysql-test/suite/stress/r/ddl_csv.result@1.2, 2008-01-21 13:49:01-05:00, pcrews@pcrews-mac-local.local +8 -8
    New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
    
    Reproduced .result files due to changes in ddl3.inc

  mysql-test/suite/stress/r/ddl_innodb.result@1.2, 2008-01-21 13:49:01-05:00, pcrews@pcrews-mac-local.local +8 -8
    New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
    
    Reproduced .result files due to changes in ddl3.inc

  mysql-test/suite/stress/r/ddl_memory.result@1.2, 2008-01-21 13:49:01-05:00, pcrews@pcrews-mac-local.local +8 -8
    New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
    
    Reproduced .result files due to changes in ddl3.inc

  mysql-test/suite/stress/r/ddl_myisam.result@1.2, 2008-01-21 13:49:01-05:00, pcrews@pcrews-mac-local.local +8 -8
    New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
    
    Reproduced .result files due to changes in ddl3.inc

  mysql-test/suite/stress/r/ddl_ndb.result@1.2, 2008-01-21 13:49:01-05:00, pcrews@pcrews-mac-local.local +8 -8
    New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
    
    Reproduced .result files due to changes in ddl3.inc

  mysql-test/t/csv_alter_table.test@1.1, 2008-01-21 13:49:02-05:00, pcrews@pcrews-mac-local.local +56 -0
    New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
    
    Designed to test fixes for Bug#33696 - CSV Engine allows nullable columns via ALTER TABLE statements
    

  mysql-test/t/csv_alter_table.test@1.0, 2008-01-21 13:49:02-05:00, pcrews@pcrews-mac-local.local +0 -0

  mysql-test/t/csv_not_null.test@1.1, 2008-01-21 13:49:02-05:00, pcrews@pcrews-mac-local.local +106 -0
    New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
    
    

  mysql-test/t/csv_not_null.test@1.0, 2008-01-21 13:49:02-05:00, pcrews@pcrews-mac-local.local +0 -0

  mysql-test/t/disabled.def@1.287.3.1, 2008-01-21 13:49:02-05:00, pcrews@pcrews-mac-local.local +1 -0
    Disabled new test - csv_alter_table.test file due to Bug#33696.
    
    Cannot generate a .result file due to the Bug.  These tests can be enabled to test the bug fix without needing new tests unless the developer feels the need to add more.

ChangeSet@1.2476.729.26, 2008-01-21 22:31:31+08:00, hezx@mail.hezx.com +4 -0
  fix failed tests

  mysql-test/extra/binlog_tests/blackhole.test@1.22.1.2, 2008-01-21 22:31:26+08:00, hezx@mail.hezx.com +13 -2
    mask out file_id

  mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test@1.3, 2008-01-21 22:31:26+08:00, hezx@mail.hezx.com +0 -4
    remove unnecessary show master status

  mysql-test/suite/binlog/r/binlog_stm_blackhole.result@1.21.1.3, 2008-01-21 22:31:26+08:00, hezx@mail.hezx.com +6 -4
    mask out file_id

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.56.1.1, 2008-01-21 22:31:26+08:00, hezx@mail.hezx.com +0 -12
    remove unnecessary show master status

ChangeSet@1.1810.3591.6, 2008-01-20 13:46:55+03:00, kaa@kaamos.(none) +2 -0
  Fixed a PushBuild failure of the system_mysql_db test caused by the lack 
  of cleanups in the test case for bug33794.

  mysql-test/r/subselect.result@1.134.1.71, 2008-01-20 13:46:54+03:00, kaa@kaamos.(none) +1 -1
    Fixed a PushBuild failure of the system_mysql_db test caused by the lack 
    of cleanups in the test case for bug33794.

  mysql-test/t/subselect.test@1.129.1.34, 2008-01-20 13:46:54+03:00, kaa@kaamos.(none) +2 -1
    Fixed a PushBuild failure of the system_mysql_db test caused by the lack 
    of cleanups in the test case for bug33794.

ChangeSet@1.2476.815.4, 2008-01-20 00:59:24+03:00, anozdrin@ibm. +1 -0
  Fix merge.

  mysql-test/r/sp.result@1.307, 2008-01-20 00:59:21+03:00, anozdrin@ibm. +21 -2
    Fix merge.

ChangeSet@1.2476.801.8, 2008-01-19 22:13:42+03:00, kaa@kaamos.(none) +2 -0
  Post-merge fixes.

  mysql-test/r/group_by.result@1.95, 2008-01-19 22:13:40+03:00, kaa@kaamos.(none) +0 -36
    Post-merge fix after merging 5.0-opt to 5.1-opt.

  mysql-test/t/disabled.def@1.287.1.3, 2008-01-19 22:13:40+03:00, kaa@kaamos.(none) +1 -0
    Disabled innodb_mysql back, bug #32724 is still not fixed.

ChangeSet@1.2476.815.1, 2008-01-19 12:39:49+01:00, dfischer@mysql.com +1 -0
  Raise version number after cloning 5.1.23-rc

  configure.in@1.457.33.1, 2008-01-19 12:39:41+01:00, dfischer@mysql.com +1 -1
    Raise version number after cloning 5.1.23-rc

ChangeSet@1.2476.802.6, 2008-01-18 22:55:02+01:00, msvensson@shellback.(none) +7 -0
  Add SqlResultSet

  storage/ndb/test/include/AtrtClient.hpp@1.1, 2008-01-18 22:55:00+01:00, msvensson@shellback.(none) +56 -0
    New BitKeeper file ``storage/ndb/test/include/AtrtClient.hpp''

  storage/ndb/test/include/AtrtClient.hpp@1.0, 2008-01-18 22:55:00+01:00, msvensson@shellback.(none) +0 -0

  storage/ndb/test/include/DbUtil.hpp@1.8, 2008-01-18 22:55:00+01:00, msvensson@shellback.(none) +71 -21
    Add support for SqlResultSet

  storage/ndb/test/ndbapi/Makefile.am@1.37, 2008-01-18 22:55:00+01:00, msvensson@shellback.(none) +3 -0
    Add testNDBT

  storage/ndb/test/ndbapi/testNDBT.cpp@1.1, 2008-01-18 22:55:00+01:00, msvensson@shellback.(none) +173 -0
    New BitKeeper file ``storage/ndb/test/ndbapi/testNDBT.cpp''

  storage/ndb/test/ndbapi/testNDBT.cpp@1.0, 2008-01-18 22:55:00+01:00, msvensson@shellback.(none) +0 -0

  storage/ndb/test/src/AtrtClient.cpp@1.1, 2008-01-18 22:55:00+01:00, msvensson@shellback.(none) +215 -0
    New BitKeeper file ``storage/ndb/test/src/AtrtClient.cpp''

  storage/ndb/test/src/AtrtClient.cpp@1.0, 2008-01-18 22:55:00+01:00, msvensson@shellback.(none) +0 -0

  storage/ndb/test/src/DbUtil.cpp@1.7, 2008-01-18 22:55:00+01:00, msvensson@shellback.(none) +443 -103
    Add support for SqlResultSet

  storage/ndb/test/src/Makefile.am@1.16, 2008-01-18 22:55:00+01:00, msvensson@shellback.(none) +1 -1
    Build AtrtClient

ChangeSet@1.1810.3597.1, 2008-01-18 22:50:36+03:00, sergefp@mysql.com +3 -0
  BUG#33794 "MySQL crashes executing specific query":
  The problem occurred when one had a subquery that had an equality X=Y where 
  Y referred to a named select list expression from the parent select. MySQL 
  crashed when trying to use the X=Y equality for ref-based access. 
  
  Fixed by allowing non-Item_field items in the described case.

  mysql-test/r/subselect.result@1.134.1.70, 2008-01-18 22:50:30+03:00, sergefp@mysql.com +48 -0
    BUG#33794 "MySQL crashes executing specific query"
    - Testcase

  mysql-test/t/subselect.test@1.129.1.33, 2008-01-18 22:50:30+03:00, sergefp@mysql.com +55 -0
    BUG#33794 "MySQL crashes executing specific query"
    - Testcase

  sql/sql_select.cc@1.312.190.7, 2008-01-18 22:50:30+03:00, sergefp@mysql.com +2 -1
    BUG#33794 "MySQL crashes executing specific query"
    get_store_key() assumed that if it got a reference
      t.key=Item_outer_ref(Item_direct_ref(x)) 
    then x was an Item_field object, which is not the case when one refers to a
    named select list expression out ot subquery.

ChangeSet@1.2476.811.6, 2008-01-17 15:37:18-08:00, acurtis@xiphis.org +4 -0
  Bug#33067
    "Update of CSV row incorrect for some BLOBs"
    when reading in rows, move blob columns into temporary storage not
    allocated by Field_blob class or else row update operation will
    alter original row and make mysql think that nothing has been changed.
  fix incrementing wrong statistic values.

  mysql-test/r/csv.result@1.26, 2008-01-17 15:37:15-08:00, acurtis@xiphis.org +9 -0
    test for bug33067

  mysql-test/t/csv.test@1.31, 2008-01-17 15:37:15-08:00, acurtis@xiphis.org +11 -0
    test for bug33067

  storage/csv/ha_tina.cc@1.88, 2008-01-17 15:37:15-08:00, acurtis@xiphis.org +41 -6
    bug33067
      when reading in rows, move blob columns into temporary storage not
      allocated by Field_blob class or else row update operation will
      alter original row and make mysql think that nothing has been changed.
    fix incrementing wrong statistic values.

  storage/csv/ha_tina.h@1.34, 2008-01-17 15:37:15-08:00, acurtis@xiphis.org +1 -0
    bug33067
      new memroot attribute for blobs

ChangeSet@1.2476.802.5, 2008-01-17 15:47:55+01:00, msvensson@shellback.(none) +2 -0
  DBU_TRUE and DBU_FALSE => TRUE/FALSE

  storage/ndb/test/include/DbUtil.hpp@1.7, 2008-01-17 15:47:52+01:00, msvensson@shellback.(none) +0 -2
    DBU_TRUE and DBU_FALSE => TRUE/FALSE

  storage/ndb/test/src/DbUtil.cpp@1.6, 2008-01-17 15:47:52+01:00, msvensson@shellback.(none) +3 -3
    DBU_TRUE and DBU_FALSE => TRUE/FALSE

ChangeSet@1.2476.802.4, 2008-01-17 15:42:50+01:00, msvensson@shellback.(none) +1 -0
  Remove "#pragma once" it's already done by "#ifndef DBUTIL_HPP" 

  storage/ndb/test/include/DbUtil.hpp@1.6, 2008-01-17 15:42:46+01:00, msvensson@shellback.(none) +0 -3
    Remove "#pragma once" it's already done by "#ifndef DBUTIL_HPP" 

ChangeSet@1.2476.811.5, 2008-01-16 15:38:40+01:00, istruewing@stella.local +1 -0
  Bug#32705 - myisam corruption: Key in wrong position
              at page 1024 with ucs2_bin
  Post merge fix

  mysql-test/r/myisam.result@1.123, 2008-01-16 15:38:39+01:00, istruewing@stella.local +0 -10
    Bug#32705 - myisam corruption: Key in wrong position
                at page 1024 with ucs2_bin
    Post merge fix

ChangeSet@1.2476.748.24, 2008-01-16 16:44:07+03:00, kostja@dipika.(none) +1 -0
  A minor cleanup.

  sql/sql_insert.cc@1.299.1.12, 2008-01-16 16:44:04+03:00, kostja@dipika.(none) +0 -1
    Remove a redundant call to my_error() -- in case of out of memory, the error
    is reported already by operator new (Delayed_inserts inherits from ilink).

ChangeSet@1.1810.3571.2, 2008-01-16 11:48:04+01:00, istruewing@stella.local +4 -0
  Bug#32705 - myisam corruption: Key in wrong position
              at page 1024 with ucs2_bin
  Post-pushbuild fix.
  Moved test from myisam.test to ctype_ucs2_def.test.
  UCS2 is not always available.

  mysql-test/r/ctype_ucs2_def.result@1.3.1.3, 2008-01-16 11:48:03+01:00, istruewing@stella.local +10 -0
    Bug#32705 - myisam corruption: Key in wrong position
                at page 1024 with ucs2_bin
    Moved test result from myisam.result to here.

  mysql-test/r/myisam.result@1.71.16.2, 2008-01-16 11:48:03+01:00, istruewing@stella.local +0 -10
    Bug#32705 - myisam corruption: Key in wrong position
                at page 1024 with ucs2_bin
    Moved test result from here to ctype_ucs2_def.result.

  mysql-test/t/ctype_ucs2_def.test@1.3.1.4, 2008-01-16 11:48:03+01:00, istruewing@stella.local +13 -0
    Bug#32705 - myisam corruption: Key in wrong position
                at page 1024 with ucs2_bin
    Moved test from myisam.test to here.
    UCS2 is not always available.

  mysql-test/t/myisam.test@1.55.15.2, 2008-01-16 11:48:03+01:00, istruewing@stella.local +0 -13
    Bug#32705 - myisam corruption: Key in wrong position
                at page 1024 with ucs2_bin
    Moved test from here to ctype_ucs2_def.test.
    UCS2 is not always available.

ChangeSet@1.2476.812.1, 2008-01-15 16:23:14+04:00, svoj@mysql.com +1 -0
  BUG#28884 - maybe a problem with malloc into base64.c
  
  Fixed that return value of malloc was not checked.
  Fixed wrong argument count (compilation failure) to base64_decode()
  function.
  
  Note:
  - there is no test case for this fix as this code is never compiled
    into mysql clients/server;
  - as this code is used for internal testing purposes only, no changelog
    entry needed.

  mysys/base64.c@1.20, 2008-01-15 16:23:12+04:00, svoj@mysql.com +4 -1
    Fixed that return value of malloc was not checked.
    Fixed wrong argument count to base64_decode function.

ChangeSet@1.2476.810.1, 2008-01-14 22:55:50-07:00, tsmith@ramayana.hindu.god +7 -0
  Apply innodb-5.1-ss2146 and innodb-5.1-ss2178 snapshots.
  
  Fixes:
  
  Bug #18942: DROP DATABASE does not drop an orphan FOREIGN KEY constraint
    Fix Bug#18942 by dropping all foreign key constraints at the end of
    DROP DATABASE. Usually, by then, there are no foreign constraints
    left because all of them are dropped when the relevant tables are
    dropped. This code is to ensure that any orphaned FKs are wiped too.
  
  Bug #29157: UPDATE, changed rows incorrect
    Return HA_ERR_RECORD_IS_THE_SAME from ha_innobase::update_row() if no
    columns were updated.
  
  Bug #32440: InnoDB free space info does not appear in SHOW TABLE STATUS or I_S
    Put information about the free space in a tablespace in
    INFORMATION_SCHEMA.TABLES.DATA_FREE. This information was previously
    available in INFORMATION_SCHEMA.TABLES.TABLE_COMMENT, but MySQL has
    removed it from there recently.
    The stored value is in kilobytes.
    This can be considered as a permanent workaround to
    http://bugs.mysql.com/32440. "Workaround" becasue that bug is about the
    data missing from TABLE_COMMENT and this is actually not solved.

  mysql-test/r/innodb.result@1.210, 2008-01-14 22:49:28-07:00, tsmith@ramayana.hindu.god +13 -0
    New tests for bugs fixed as part of snapshots innodb-5.1-ss2146 and innodb-5.1-ss2178

  mysql-test/r/partition_innodb.result@1.10.1.1, 2008-01-14 22:49:28-07:00, tsmith@ramayana.hindu.god +6 -6
    Update results - InnoDB now sets Data_length (show table status)

  mysql-test/t/innodb.test@1.175, 2008-01-14 22:49:28-07:00, tsmith@ramayana.hindu.god +21 -0
    New tests for bugs fixed as part of snapshots innodb-5.1-ss2146 and innodb-5.1-ss2178

  mysql-test/t/partition_innodb.test@1.9.1.1, 2008-01-14 22:49:28-07:00, tsmith@ramayana.hindu.god +18 -0
    Mask out Data_Free in show table status, because it varies depending on
    which tests have been run.

  storage/innobase/handler/ha_innodb.cc@1.370, 2008-01-14 22:49:28-07:00, tsmith@ramayana.hindu.god +24 -5
    Apply innodb-5.1-ss2146 and innodb-5.1-ss2178 snapshots.
    
    
    Revision r2178:
    branches/5.1:
    
    Merge r2177 from trunk/:
    
    Fix Bug#29157 "UPDATE, changed rows incorrect":
    
    Return HA_ERR_RECORD_IS_THE_SAME from ha_innobase::update_row() if no
    columns were updated.
    
    
    Revision r2169:
    branches/5.1:
    
    Bug#32440:
    
    Put information about the free space in a tablespace in
    INFORMATION_SCHEMA.TABLES.DATA_FREE. This information was previously
    available in INFORMATION_SCHEMA.TABLES.TABLE_COMMENT, but MySQL has
    removed it from there recently.
    
    The stored value is in kilobytes.
    
    This can be considered as a permanent workaround to
    http://bugs.mysql.com/32440. "Workaround" becasue that bug is about the
    data missing from TABLE_COMMENT and this is actually not solved.

  storage/innobase/row/row0mysql.c@1.145, 2008-01-14 22:49:29-07:00, tsmith@ramayana.hindu.god +73 -0
    Apply innodb-5.1-ss2146 and innodb-5.1-ss2178 snapshots.
    
    
    Revision r2161:
    branches/5.1:
    
    Merge r2160 from trunk/:
    
    Fix Bug#18942 by dropping all foreign key constraints at the end of
    DROP DATABASE. Usually, by then, there are no foreign constraints
    left because all of them are dropped when the relevant tables are
    dropped. This code is to ensure that any orphaned FKs are wiped too.

  storage/innobase/trx/trx0trx.c@1.78, 2008-01-14 22:49:29-07:00, tsmith@ramayana.hindu.god +1 -0
    Apply innodb-5.1-ss2146 and innodb-5.1-ss2178 snapshots.

ChangeSet@1.2476.765.3, 2008-01-14 17:59:45+01:00, istruewing@stella.local +3 -0
  Bug#33222 - myisam-table drops rows when column is added
             and a char-field > 128 exists
  
  CHECK TABLE (non-QUICK) and any form of repair table did wrongly rate
  records as corrupted under the following conditions:
  1. The table has dynamic row format and
  2. it has a CHAR like column > 127 bytes (but not VARCHAR)
     (for multi-byte character sets this could be less than 127
     characters) and
  3. it has records with > 127 bytes significant length in that column
     (a byte beyond byte position 127 must be non-space).
  Affected were the statements CHECK TABLE, REPAIR TABLE, OPTIMIZE TABLE,
  ALTER TABLE. CHECK TABLE reported and marked the table as crashed if any
  record was present that fulfilled condition 3. The other statements
  deleted these records.
  
  The problem was a signed/unsigned compare in MyISAM code. A
  char to uchar change became necessary after the big byte to uchar
  change.

  mysql-test/r/myisam.result@1.117.1.1, 2008-01-14 17:59:44+01:00, istruewing@stella.local +162 -0
    Bug#33222 - myisam-table drops rows when column is added
               and a char-field > 128 exists
    Added test result.

  mysql-test/t/myisam.test@1.92.1.1, 2008-01-14 17:59:44+01:00, istruewing@stella.local +170 -0
    Bug#33222 - myisam-table drops rows when column is added
               and a char-field > 128 exists
    Added test.

  storage/myisam/mi_dynrec.c@1.61.1.2, 2008-01-14 17:59:44+01:00, istruewing@stella.local +17 -15
    Bug#33222 - myisam-table drops rows when column is added
               and a char-field > 128 exists
    char -> uchar became necessary after big byte -> uchar change.
    Fixed some small coding style violations near the changes.

ChangeSet@1.1810.3595.1, 2008-01-14 16:16:36+01:00, mhansson@linux-st28.site +4 -0
  Bug#33143: Incorrect ORDER BY for ROUND()/TRUNCATE() result
  
  The ROUND(X, D) function would change the Item::decimals field during
  execution to achieve the effect of a dynamic number of decimal digits.
  This caused a series of bugs:
  Bug #30617:Round() function not working under some circumstances in InnoDB
  Bug #33402:ROUND with decimal and non-constant cannot round to 0 decimal places
  Bug #30889:filesort and order by with float/numeric crashes server
  Fixed by never changing the number of shown digits for DECIMAL when
  used with a nonconstant number of decimal digits.

  mysql-test/r/type_decimal.result@1.38.3.1, 2008-01-14 16:16:00+01:00, mhansson@linux-st28.site +62 -1
    Bug#33143: Test result

  mysql-test/t/type_decimal.test@1.33.2.1, 2008-01-14 16:16:31+01:00, mhansson@linux-st28.site +43 -0
    Bug#33143: Test case

  sql/item_func.cc@1.270.84.3, 2008-01-14 16:16:32+01:00, mhansson@linux-st28.site +6 -6
    Bug#33143: 
    - Moved the DECIMAL_MAX_SCALE limitation to fix_length_and_dec.
    - Removed resetting of Item::decimals field.
    - set the frac field of the output value to current scale.

  strings/decimal.c@1.65.1.17, 2008-01-14 16:16:32+01:00, mhansson@linux-st28.site +14 -2
    Bug#33143: It is necessary to set all digits in the buffer following the 
    rounded one to zero, as they may now be displayed.

ChangeSet@1.2476.808.2, 2008-01-14 17:54:23+08:00, hezx@mail.hezx.com +4 -0
  fix for versional test

  mysql-test/extra/rpl_tests/rpl_row_tabledefs.test@1.14, 2008-01-14 17:54:21+08:00, hezx@mail.hezx.com +6 -6
    Mask out error messages

  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result@1.28.1.1, 2008-01-14 17:54:21+08:00, hezx@mail.hezx.com +18 -18
    Mask out Error messages in reslut of show slave status

  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result@1.25.2.1, 2008-01-14 17:54:21+08:00, hezx@mail.hezx.com +18 -18
    Mask out Error messages in reslut of show slave status

  mysql-test/suite/rpl/t/rpl_temporary_errors.test@1.4, 2008-01-14 17:54:21+08:00, hezx@mail.hezx.com +1 -1
    mask out binlog position

ChangeSet@1.2476.808.1, 2008-01-14 15:38:02+08:00, hezx@mail.hezx.com +33 -0
  Fix for versional test
  
  Mask binlog positions, error, warning and other information that are not significant for the test

  mysql-test/extra/rpl_tests/rpl_max_relay_size.test@1.25, 2008-01-14 15:37:55+08:00, hezx@mail.hezx.com +7 -8
    Mask out binlog position and DBs in result of show master status

  mysql-test/extra/rpl_tests/rpl_reset_slave.test@1.14, 2008-01-14 15:37:55+08:00, hezx@mail.hezx.com +4 -4
    Mask out log positions in tests to make them version independent

  mysql-test/extra/rpl_tests/rpl_row_tabledefs.test@1.13, 2008-01-14 15:37:55+08:00, hezx@mail.hezx.com +6 -6
    Mask out Error messages in reslut of show slave status

  mysql-test/include/show_binary_logs.inc@1.1, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +5 -0
    Mask out log positions in tests to make them version independent

  mysql-test/include/show_binary_logs.inc@1.0, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +0 -0

  mysql-test/include/show_master_logs.inc@1.1, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +5 -0
    Mask out log positions in tests to make them version independent

  mysql-test/include/show_master_logs.inc@1.0, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +0 -0

  mysql-test/include/show_master_status.inc@1.1, 2008-01-14 15:37:57+08:00, hezx@mail.hezx.com +5 -0
    Mask out log positions in tests to make them version independent
    ---
    Mask out binlog position and DBs in result of show master status

  mysql-test/include/show_master_status.inc@1.0, 2008-01-14 15:37:57+08:00, hezx@mail.hezx.com +0 -0

  mysql-test/include/show_slave_status2.inc@1.1, 2008-01-14 15:37:57+08:00, hezx@mail.hezx.com +8 -0
    Mask out log positions in tests to make them version independent

  mysql-test/include/show_slave_status2.inc@1.0, 2008-01-14 15:37:57+08:00, hezx@mail.hezx.com +0 -0

  mysql-test/suite/rpl/r/rpl_000015.result@1.49.1.1, 2008-01-14 15:37:55+08:00, hezx@mail.hezx.com +7 -7
    Mask out log positions in tests to make them version independent
    ---
    Mask out binlog position and DBs in result of show master status

  mysql-test/suite/rpl/r/rpl_change_master.result@1.30, 2008-01-14 15:37:55+08:00, hezx@mail.hezx.com +2 -2
    Mask out log positions in tests to make them version independent

  mysql-test/suite/rpl/r/rpl_create_database.result@1.12.1.1, 2008-01-14 15:37:55+08:00, hezx@mail.hezx.com +8 -16
    fix for versional test

  mysql-test/suite/rpl/r/rpl_grant.result@1.5, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +17 -17
    fix for versional test

  mysql-test/suite/rpl/r/rpl_init_slave.result@1.6.1.1, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +1 -0
    fix for versional test

  mysql-test/suite/rpl/r/rpl_load_from_master.result@1.30.1.1, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +6 -12
    update result

  mysql-test/suite/rpl/r/rpl_log_pos.result@1.56, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +5 -5
    Mask out binlog position and DBs in result of show master status

  mysql-test/suite/rpl/r/rpl_rotate_logs.result@1.83, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +20 -19
    Mask out binlog position and DBs in result of show master status

  mysql-test/suite/rpl/r/rpl_row_max_relay_size.result@1.16, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +14 -16
    Mask out binlog position and DBs in result of show master status

  mysql-test/suite/rpl/r/rpl_row_reset_slave.result@1.10, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +8 -8
    Mask out log positions in tests to make them version independent

  mysql-test/suite/rpl/r/rpl_skip_error.result@1.19, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +39 -3
    Mask out log positions in tests to make them version independent

  mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result@1.35, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +14 -16
    Mask out log positions in tests to make them version independent
    ---
    Mask out binlog position and DBs in result of show master status

  mysql-test/suite/rpl/r/rpl_stm_reset_slave.result@1.23, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +8 -8
    Mask out log positions in tests to make them version independent

  mysql-test/suite/rpl/r/rpl_stm_until.result@1.35, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +8 -8
    Mask out log positions in tests to make them version independent

  mysql-test/suite/rpl/r/rpl_temporary_errors.result@1.4, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +2 -2
    Mask out binlog positions

  mysql-test/suite/rpl/t/rpl_000015.test@1.45.1.1, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +5 -5
    Mask out log positions in tests to make them version independent

  mysql-test/suite/rpl/t/rpl_change_master.test@1.23, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +2 -6
    Mask out log positions in tests to make them version independent

  mysql-test/suite/rpl/t/rpl_colSize.test@1.2, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +4 -0
    fix for versional test

  mysql-test/suite/rpl/t/rpl_create_database.test@1.7.1.1, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +4 -4
    fix for versional test

  mysql-test/suite/rpl/t/rpl_grant.test@1.4, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +9 -11
    fix for versional test

  mysql-test/suite/rpl/t/rpl_init_slave.test@1.7.1.1, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +2 -0
    fix for versional test

  mysql-test/suite/rpl/t/rpl_load_from_master.test@1.28.1.1, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +3 -3
    fix for versional test

  mysql-test/suite/rpl/t/rpl_log_pos.test@1.45, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +4 -6
    Mask out binlog position and DBs

  mysql-test/suite/rpl/t/rpl_rotate_logs.test@1.77, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +9 -9
    Mask out log positions in tests to make them version independent

  mysql-test/suite/rpl/t/rpl_skip_error.test@1.17, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +1 -3
    Mask out log positions in tests to make them version independent

  mysql-test/suite/rpl/t/rpl_stm_until.test@1.32, 2008-01-14 15:37:56+08:00, hezx@mail.hezx.com +4 -4
    Mask out log positions in tests to make them version independent

ChangeSet@1.2476.779.8, 2008-01-13 22:13:17+01:00, mkindahl@dl145h.mysql.com +2 -0
  Post-merge fixes to make tests pass.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result@1.5, 2008-01-13 22:13:01+01:00, mkindahl@dl145h.mysql.com +2 -6
    Result change

  mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test@1.4, 2008-01-13 22:13:06+01:00, mkindahl@dl145h.mysql.com +0 -4
    Removing duplicate DROP TABLE causing test to fail.

ChangeSet@1.2476.748.23, 2008-01-11 21:34:23-02:00, davi@mysql.com +1 -0
  Post merge fix for BUG 33728

  include/Makefile.am@1.86.1.1, 2008-01-11 21:34:21-02:00, davi@mysql.com +1 -1
    Include gcc_builtins.h header in the list.

ChangeSet@1.2476.807.1, 2008-01-11 20:34:36-02:00, davi@mysql.com +3 -0
  Bug#33728 Atomic builtins
  
  Use compiler provided atomic builtins as a 'backend' for
  MySQL's atomic primitives. The builtins are available on
  a handful of platforms and compilers.

  configure.in@1.457.32.1, 2008-01-11 20:34:29-02:00, davi@mysql.com +24 -0
    Check if the compiler provides atomic builtins and
    that __sync_lock_test_and_set stores the correct value.

  include/atomic/gcc_builtins.h@1.1, 2008-01-11 20:34:31-02:00, davi@mysql.com +33 -0
    Implement the atomic ADD, SWAP, CAS, STORE (or operation
    optimized away) and LOAD primitives using atomic builtins
    provided by the compiler.

  include/atomic/gcc_builtins.h@1.0, 2008-01-11 20:34:31-02:00, davi@mysql.com +0 -0

  include/atomic/nolock.h@1.5, 2008-01-11 20:34:30-02:00, davi@mysql.com +4 -2
    Use the atomic builtins if available.

ChangeSet@1.2476.804.1, 2008-01-11 10:05:34-08:00, igor@olga.mysql.com +4 -0
  Fixed bug #33697.
  When the function test_if_skip_sort_order prefers index backward scan 
  to ref access the corresponding access functions must be set accordingly.

  mysql-test/include/mix1.inc@1.64, 2008-01-11 10:05:31-08:00, igor@olga.mysql.com +41 -14
    Added a test case for bug #33697.
    Corrected one previous bad merge.

  mysql-test/r/innodb_mysql.result@1.67.1.1, 2008-01-11 10:05:31-08:00, igor@olga.mysql.com +26 -1
    Added a test case for bug #33697.

  mysql-test/t/disabled.def@1.287.2.1, 2008-01-11 10:05:31-08:00, igor@olga.mysql.com +0 -1
    Turned innodb_mysql test on.

  sql/sql_select.cc@1.574.4.1, 2008-01-11 10:05:32-08:00, igor@olga.mysql.com +2 -1
    Fixed bug #33697.
    When the function test_if_skip_sort_order prefers index backward scan 
    to ref access the corresponding access functions must be set accordingly.

ChangeSet@1.1810.3593.1, 2008-01-11 18:50:54+01:00, mhansson@linux-st28.site +3 -0
  Bug#31797: error while parsing subqueries -- WHERE is parsed as HAVING
  
  The name resolution for correlated subqueries and HAVING clauses
  failed to distinguish which of two was being performed when there 
  was a reference to an outer aliased field.
  Fixed by adding the condition that HAVING clause name resulotion
  is being performed.

  mysql-test/r/group_by.result@1.69.2.1, 2008-01-11 18:50:52+01:00, mhansson@linux-st28.site +36 -0
    Bug#31797: Test result

  mysql-test/t/group_by.test@1.59.2.1, 2008-01-11 18:50:52+01:00, mhansson@linux-st28.site +48 -0
    Bug#31797: Test case

  sql/item.cc@1.113.105.1, 2008-01-11 18:50:52+01:00, mhansson@linux-st28.site +2 -1
    Bug#31797: 
    Corrected function comment.
    The fix, raising the error is restricted to HAVING name resolution.

ChangeSet@1.1810.3591.2, 2008-01-11 20:10:54+03:00, evgen@moonbone.local +3 -0
  Bug#29477: Not all fields of the target table were checked to have a default
  value when inserting into a view.
  
  The mysql_prepare_insert function checks all fields of the target table that
  directly or indirectly (through a view) are specified in the INSERT
  statement to have a default value. This check can be skipped if the INSERT
  statement doesn't mention any insert fields. In case of a view this allows
  fields that aren't mentioned in the view to bypass the check.
  
  Now fields of the target table are always checked to have a default value
  when insert goes into a view.

  mysql-test/r/view.result@1.138.40.1, 2008-01-11 19:54:26+03:00, evgen@moonbone.local +16 -0
    Added a test case for the bug#29477: Not all fields of the target table were 
    checked to have a default value when inserting into a view.

  mysql-test/t/view.test@1.126.1.65, 2008-01-11 19:54:15+03:00, evgen@moonbone.local +14 -0
    Added a test case for the bug#29477: Not all fields of the target table were 
    checked to have a default value when inserting into a view.

  sql/sql_insert.cc@1.146.44.45, 2008-01-11 20:03:15+03:00, evgen@moonbone.local +2 -1
    Bug#29477: Not all fields of the target table were checked to have a default
    value when inserting into a view.
    Now fields of the target table are always checked to have a default value
    when insert goes into a view.

ChangeSet@1.2476.729.21, 2008-01-11 18:09:17+01:00, mkindahl@dl145h.mysql.com +2 -0
  Fixing failing test case.

  mysql-test/suite/rpl/r/rpl_init_slave.result@1.7, 2008-01-11 18:09:03+01:00, mkindahl@dl145h.mysql.com +2 -0
    Result change.

  mysql-test/suite/rpl/t/rpl_init_slave.test@1.8, 2008-01-11 18:09:09+01:00, mkindahl@dl145h.mysql.com +7 -0
    Starting and stopping slave to make sure that the init_slave
    variable is executed.

ChangeSet@1.2476.729.20, 2008-01-11 16:26:03+01:00, mkindahl@dl145h.mysql.com +7 -0
  Post-merge changes to make tests pass.

  BitKeeper/deleted/.del-binlog_start_comment.result@1.1.2.1, 2008-01-11 12:58:35+01:00, mkindahl@dl145h.mysql.com +0 -0
    Delete: mysql-test/r/binlog_start_comment.result

  mysql-test/suite/binlog/r/binlog_unsafe.result@1.7, 2008-01-11 13:27:13+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: mysql-test/r/binlog_unsafe.result -> mysql-test/suite/binlog/r/binlog_unsafe.result

  BitKeeper/deleted/.del-binlog_start_comment.test@1.1.2.1, 2008-01-11 12:58:27+01:00, mkindahl@dl145h.mysql.com +0 -0
    Delete: mysql-test/t/binlog_start_comment.test

  mysql-test/suite/binlog/t/binlog_unsafe.test@1.4, 2008-01-11 13:27:03+01:00, mkindahl@dl145h.mysql.com +0 -0
    Rename: mysql-test/t/binlog_unsafe.test -> mysql-test/suite/binlog/t/binlog_unsafe.test

  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result@1.25.1.1, 2008-01-11 16:25:45+01:00, mkindahl@dl145h.mysql.com +2 -2
    Result change.

  mysql-test/suite/rpl/r/rpl_timezone.result@1.26.1.1, 2008-01-11 16:25:50+01:00, mkindahl@dl145h.mysql.com +0 -38
    Result change.

  mysql-test/suite/rpl/t/rpl_row_sp005.test@1.6, 2008-01-11 16:25:50+01:00, mkindahl@dl145h.mysql.com +2 -0
    Adding missing sync with master causing test to fail.

ChangeSet@1.1810.3565.4, 2008-01-11 14:47:31+01:00, dfischer@mysql.com +1 -0
  configure.in:
    adjust version string
  TAG: mysql-5.0.54a

  configure.in@1.245.109.1, 2008-01-11 14:47:24+01:00, dfischer@mysql.com +1 -1
    adjust version string

ChangeSet@1.2476.748.21, 2008-01-11 14:16:46+01:00, thek@adventure.(none) +2 -0
  Fixed faulty test case caused by race condition.

  mysql-test/r/query_cache_debug.result@1.2, 2008-01-11 14:16:44+01:00, thek@adventure.(none) +2 -2
    Fixed faulty test case.

  mysql-test/t/query_cache_debug.test@1.2, 2008-01-11 14:16:44+01:00, thek@adventure.(none) +2 -1
    Fixed faulty test case caused by race condition.

ChangeSet@1.2476.779.4, 2008-01-11 13:25:26+01:00, mkindahl@dl145h.mysql.com +8 -0
  Post-merge fixes to make tests pass.

  mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test@1.49.1.1, 2008-01-11 13:24:45+01:00, mkindahl@dl145h.mysql.com +14 -4
    Fixing test file to use different positions depending
    on binlog format.

  mysql-test/suite/binlog/r/binlog_row_binlog.result@1.21.1.1, 2008-01-11 13:24:50+01:00, mkindahl@dl145h.mysql.com +4 -0
    Result change.

  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result@1.25.1.1, 2008-01-11 13:24:50+01:00, mkindahl@dl145h.mysql.com +237 -2
    Result change.

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.54.1.1, 2008-01-11 13:24:55+01:00, mkindahl@dl145h.mysql.com +230 -2
    Result change.

  mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test@1.15.1.1, 2008-01-11 13:25:00+01:00, mkindahl@dl145h.mysql.com +0 -20
    Removing part of test that does not work any more.

  mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test@1.17.1.1, 2008-01-11 13:25:01+01:00, mkindahl@dl145h.mysql.com +0 -20
    Removing part of test that does not work any more.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result@1.1.1.2, 2008-01-11 13:25:06+01:00, mkindahl@dl145h.mysql.com +2 -3
    Result change.

  mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test@1.1.1.2, 2008-01-11 13:25:11+01:00, mkindahl@dl145h.mysql.com +5 -4
    Dropping tables on both master and slave, and not only on slave.

ChangeSet@1.2476.729.19, 2008-01-11 12:35:35+01:00, mkindahl@dl145h.mysql.com +5 -0
  Post-merge fixes to make binlog test suite pass.

  mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test@1.50, 2008-01-11 12:35:10+01:00, mkindahl@dl145h.mysql.com +14 -4
    Fixing test to use different positions depending on binlog format.

  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result@1.26, 2008-01-11 12:35:15+01:00, mkindahl@dl145h.mysql.com +237 -2
    Result change.

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.56, 2008-01-11 12:35:16+01:00, mkindahl@dl145h.mysql.com +230 -2
    Result change.

  mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test@1.16, 2008-01-11 12:35:21+01:00, mkindahl@dl145h.mysql.com +0 -20
    Removing part of test that does not work any more.

  mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test@1.18, 2008-01-11 12:35:26+01:00, mkindahl@dl145h.mysql.com +0 -20
    Removing part of test that does not work any more.

ChangeSet@1.2403.18.100, 2008-01-11 09:20:16+01:00, jonas@perch.ndb.mysql.com +4 -0
  ndb - bug#33793
    dont assume that page is "all empty"
    only as gci is acked, as release_gci might not have processed it yet

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.32.1.10, 2008-01-11 09:20:14+01:00, jonas@perch.ndb.mysql.com +1 -1
    new error codes

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@1.53.2.8, 2008-01-11 09:20:14+01:00, jonas@perch.ndb.mysql.com +15 -1
    dont assume that page is "all empty"
    only as gci is acked, as release_gci might not have processed it yet
    

  storage/ndb/test/ndbapi/test_event.cpp@1.29, 2008-01-11 09:20:14+01:00, jonas@perch.ndb.mysql.com +61 -0
    testcase

  storage/ndb/test/run-test/daily-basic-tests.txt@1.63.2.13, 2008-01-11 09:20:14+01:00, jonas@perch.ndb.mysql.com +4 -0
    testcase

ChangeSet@1.2476.803.1, 2008-01-11 05:06:08+04:00, gshchepa@host.loc +18 -0
  Bug#33699: The UPDATE statement allows NULL as new value on a NOT NULL
  columns (default datatype value is assigned).
  
  The mysql_update function has been modified to generate
  an error when trying to set a NOT NULL field to NULL rather than a warning
  in the set_field_to_null_with_conversions function.
  

  mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@1.4.1.1, 2008-01-11 05:04:09+04:00, gshchepa@host.loc +1 -1
    Updated test case (for bug#33699).

  mysql-test/include/ps_modify.inc@1.9, 2008-01-11 05:04:16+04:00, gshchepa@host.loc +1 -0
    Updated test case (for bug#33699).

  mysql-test/r/auto_increment.result@1.49, 2008-01-11 05:04:18+04:00, gshchepa@host.loc +6 -6
    Updated test case (for bug#33699).

  mysql-test/r/null.result@1.41, 2008-01-11 05:04:19+04:00, gshchepa@host.loc +3 -5
    Updated test case (for bug#33699).

  mysql-test/r/ps_2myisam.result@1.69, 2008-01-11 05:04:19+04:00, gshchepa@host.loc +2 -3
    Updated test case (for bug#33699).

  mysql-test/r/ps_3innodb.result@1.72, 2008-01-11 05:04:20+04:00, gshchepa@host.loc +2 -3
    Updated test case (for bug#33699).

  mysql-test/r/ps_4heap.result@1.68, 2008-01-11 05:04:21+04:00, gshchepa@host.loc +2 -3
    Updated test case (for bug#33699).

  mysql-test/r/ps_5merge.result@1.69, 2008-01-11 05:04:21+04:00, gshchepa@host.loc +4 -6
    Updated test case (for bug#33699).

  mysql-test/r/warnings.result@1.60, 2008-01-11 05:04:22+04:00, gshchepa@host.loc +1 -2
    Updated test case (for bug#33699).

  mysql-test/suite/ndb/r/ps_7ndb.result@1.69, 2008-01-11 05:04:23+04:00, gshchepa@host.loc +2 -3
    Updated test case (for bug#33699).

  mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@1.6.1.1, 2008-01-11 05:04:23+04:00, gshchepa@host.loc +1770 -1774
    Updated test case (for bug#33699).

  mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@1.6.1.1, 2008-01-11 05:04:24+04:00, gshchepa@host.loc +1770 -1774
    Updated test case (for bug#33699).

  mysql-test/suite/rpl/t/rpl_err_ignoredtable.test@1.30.1.1, 2008-01-11 05:04:25+04:00, gshchepa@host.loc +1 -1
    Updated test case (for bug#33699).

  mysql-test/t/auto_increment.test@1.32, 2008-01-11 05:04:26+04:00, gshchepa@host.loc +2 -0
    Updated test case (for bug#33699).

  mysql-test/t/null.test@1.23, 2008-01-11 05:04:27+04:00, gshchepa@host.loc +2 -0
    Updated test case (for bug#33699).

  mysql-test/t/warnings.test@1.32, 2008-01-11 05:04:28+04:00, gshchepa@host.loc +1 -0
    Updated test case (for bug#33699).

  sql/sql_update.cc@1.239.14.1, 2008-01-11 05:04:28+04:00, gshchepa@host.loc +3 -1
    Bug#33699: The mysql_update function has been modified to generate
    an error when trying to set a NOT NULL field to NULL rather than
    a warning in the set_field_to_null_with_conversions function.

  tests/mysql_client_test.c@1.261, 2008-01-11 05:04:30+04:00, gshchepa@host.loc +1 -1
    Updated test case (for bug#33699).

ChangeSet@1.2476.802.2, 2008-01-10 19:07:24+01:00, jmiller@mysql.com +1 -0
  Makefile.am:
    Updated to build NdbRepStress

  storage/ndb/test/ndbapi/Makefile.am@1.36, 2008-01-10 19:07:08+01:00, jmiller@mysql.com +5 -1
    Updated to build NdbRepStress

ChangeSet@1.2476.802.1, 2008-01-10 18:59:44+01:00, jmiller@mysql.com +1 -0
  Makefile.am:
    Updated for name chance on dbutil

  storage/ndb/test/src/Makefile.am@1.15, 2008-01-10 18:59:09+01:00, jmiller@mysql.com +2 -2
    Updated for name chance on dbutil

ChangeSet@1.2476.800.1, 2008-01-10 16:39:44+01:00, sven@riska.(none) +9 -0
  BUG#27779: Slave cannot read old rows log events.
  Problem: Replication fails when master is mysql-5.1-wl2325-5.0-drop6 and
  slave is mysql-5.1-new-rpl. The reason is that, in
  mysql-5.1-wl2325-5.0-drop6, the event type id's were different than in
  mysql-5.1-new-rpl.
  Fix (in mysql-5.1-new-rpl):
   (1) detect that the server that generated the events uses the old
  format, by checking the server version of the format_description_log_event
  This patch recognizes mysql-5.1-wl2325-5.0-drop6p13-alpha,
  mysql-5.1-wl2325-5.0-drop6, mysql-5.1-wl2325-5.0, mysql-5.1-wl2325-no-dd.
   (2) if the generating server is old, map old event types to new event
  types using a permutation array.
  
  I've also added a test case which reads binlogs for four different
  versions.

  mysql-test/suite/binlog/r/binlog_old_versions.result@1.1, 2008-01-10 16:39:42+01:00, sven@riska.(none) +61 -0
    Result file for new test.

  mysql-test/suite/binlog/r/binlog_old_versions.result@1.0, 2008-01-10 16:39:42+01:00, sven@riska.(none) +0 -0

  mysql-test/suite/binlog/std_data/binlog_old_version_5_1-telco.000001@1.1, 2008-01-10 16:27:39+01:00, sven@riska.(none) +3343 -0
    BitKeeper file /home/sven/bk/b27779-old_row_events/5.1-new-rpl/mysql-test/suite/binlog/std_data/binlog_old_version_5_1-telco.000001

  mysql-test/suite/binlog/std_data/binlog_old_version_5_1-telco.000001@1.0, 2008-01-10 16:27:39+01:00, sven@riska.(none) +0 -0

  mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_row.000001@1.1, 2008-01-10 16:27:39+01:00, sven@riska.(none) +17 -0
    BitKeeper file /home/sven/bk/b27779-old_row_events/5.1-new-rpl/mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_row.000001

  mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_row.000001@1.0, 2008-01-10 16:27:39+01:00, sven@riska.(none) +0 -0

  mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_stm.000001@1.1, 2008-01-10 16:27:39+01:00, sven@riska.(none) +3330 -0
    BitKeeper file /home/sven/bk/b27779-old_row_events/5.1-new-rpl/mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_stm.000001

  mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_stm.000001@1.0, 2008-01-10 16:27:39+01:00, sven@riska.(none) +0 -0

  mysql-test/suite/binlog/std_data/binlog_old_version_5_1_17.000001@1.1, 2008-01-10 16:27:39+01:00, sven@riska.(none) +3343 -0
    BitKeeper file /home/sven/bk/b27779-old_row_events/5.1-new-rpl/mysql-test/suite/binlog/std_data/binlog_old_version_5_1_17.000001

  mysql-test/suite/binlog/std_data/binlog_old_version_5_1_17.000001@1.0, 2008-01-10 16:27:39+01:00, sven@riska.(none) +0 -0

  mysql-test/suite/binlog/std_data/binlog_old_version_5_1_23.000001@1.1, 2008-01-10 16:27:39+01:00, sven@riska.(none) +3344 -0
    BitKeeper file /home/sven/bk/b27779-old_row_events/5.1-new-rpl/mysql-test/suite/binlog/std_data/binlog_old_version_5_1_23.000001

  mysql-test/suite/binlog/std_data/binlog_old_version_5_1_23.000001@1.0, 2008-01-10 16:27:39+01:00, sven@riska.(none) +0 -0

  mysql-test/suite/binlog/t/binlog_old_versions.test@1.1, 2008-01-10 16:39:42+01:00, sven@riska.(none) +147 -0
    New test case that loads binlogs from several old versions.

  mysql-test/suite/binlog/t/binlog_old_versions.test@1.0, 2008-01-10 16:39:42+01:00, sven@riska.(none) +0 -0

  sql/log_event.cc@1.277.48.1, 2008-01-10 16:39:41+01:00, sven@riska.(none) +84 -2
    Added code to read events generated by
    mysql-5.1-wl2325-5.0-drop6p13-alpha, mysql-5.1-wl2325-5.0-drop6,
    mysql-5.1-wl2325-5.0, mysql-5.1-wl2325-no-dd.
    More precisely, the event type id's had different numbers in
    those versions. To fix, we add a permutation array which maps old_id to
    new_id when the format_description_log_event indicates that the
    originating server is of the old type. We also need to permute the
    post_header_len array accordingly.

  sql/log_event.h@1.169, 2008-01-10 16:39:42+01:00, sven@riska.(none) +5 -1
    sql/log_event.h@1.169, 2008-01-09 11:34:37+01:00, sven@riska.(none) +5 -1
    Added declaration needed in log_event.cc. Also, the destructor of
    Format_description_log_event is sometimes called when post_header_len is
    null, so we must pass the MY_ALLOW_ZERO_PTR flag to my_free.

ChangeSet@1.2476.798.1, 2008-01-10 17:39:50+08:00, gni@dev3-221.dev.cn.tlan +2 -0
  Shouldn't let the non-deterministic temperary filename output in result file for bug#30417 

  mysql-test/suite/ndb/r/ndb_autoinc.result@1.2, 2008-01-10 17:39:46+08:00, gni@dev3-221.dev.cn.tlan +0 -1
    Temperory table name shouldn't output in result file for its name is non-deterministic

  mysql-test/suite/ndb/t/ndb_autoinc.test@1.2, 2008-01-10 17:39:46+08:00, gni@dev3-221.dev.cn.tlan +2 -0
    don't output temperary file name 

ChangeSet@1.2476.783.5, 2008-01-09 19:01:31+01:00, jmiller@mysql.com +1 -0
  NdbRepStress.cpp:
    More code improvments

  storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp@1.3, 2008-01-09 19:01:18+01:00, jmiller@mysql.com +4 -6
    More code improvments

ChangeSet@1.2476.783.4, 2008-01-09 18:54:32+01:00, jmiller@mysql.com +3 -0
  DbUtil.hpp, DbUtil.cpp, NdbRepStress.cpp:
    More code improvments

  storage/ndb/test/include/DbUtil.hpp@1.5, 2008-01-09 18:53:34+01:00, jmiller@mysql.com +4 -3
    More code improvments

  storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp@1.2, 2008-01-09 18:54:05+01:00, jmiller@mysql.com +151 -158
    More code improvments

  storage/ndb/test/src/DbUtil.cpp@1.5, 2008-01-09 18:53:46+01:00, jmiller@mysql.com +22 -4
    More code improvments

ChangeSet@1.2476.793.3, 2008-01-09 15:50:36+01:00, hhunger@hh-nb.hungers +1 -0
  fixed sorting differences in results.

  mysql-test/suite/funcs_1/storedproc/storedproc_master.inc@1.6, 2008-01-09 15:50:34+01:00, hhunger@hh-nb.hungers +1 -0
    fixed sorting differences in results.

ChangeSet@1.2476.796.1, 2008-01-09 13:15:50+01:00, mattiasj@client-10-129-10-137.upp.off.mysql.com +14 -0
  Bug#31931 Partitions: unjustified 'mix of handlers' error message
  Problem was that the mix of handlers was not consistent between
  CREATE and ALTER
  
  changed so that it works like:
      - All partitions must use the same engine
        AND it must be the same as the table.
      - if one does NOT specify an engine on the table level
        then one must either NOT specify any engine on any
        partition/subpartition OR for ALL partitions/subpartitions
  
  Note: that after a table have been created, the storage engine
  is specified for all parts of the table (table/partition/subpartition)
  and so when using alter, one does not need to specify it (unless one
  wants to change the storage engine, then one have to specify it on the
  table level)

  mysql-test/r/partition.result@1.79.1.1, 2008-01-09 13:15:46+01:00, mattiasj@client-10-129-10-137.upp.off.mysql.com +0 -2
    Bug#31931 Partitions: unjustified 'mix of handlers' error message
    test result updated

  mysql-test/r/partition_innodb.result@1.11, 2008-01-09 13:15:46+01:00, mattiasj@client-10-129-10-137.upp.off.mysql.com +5 -4
    Bug#31931 Partitions: unjustified 'mix of handlers' error message
    test result updated

  mysql-test/suite/ndb/r/ndb_partition_key.result@1.8.1.1, 2008-01-09 13:15:46+01:00, mattiasj@client-10-129-10-137.upp.off.mysql.com +6 -1
    Bug#31931 Partitions: unjustified 'mix of handlers' error message
    test result updated

  mysql-test/suite/ndb/t/ndb_partition_key.test@1.7.1.1, 2008-01-09 13:15:47+01:00, mattiasj@client-10-129-10-137.upp.off.mysql.com +12 -1
    Bug#31931 Partitions: unjustified 'mix of handlers' error message
    test case update

  mysql-test/suite/parts/inc/partition_engine.inc@1.6, 2008-01-09 13:15:47+01:00, mattiasj@client-10-129-10-137.upp.off.mysql.com +26 -24
    Bug#31931 Partitions: unjustified 'mix of handlers' error message
    test case updated

  mysql-test/suite/parts/r/ndb_partition_key.result@1.5, 2008-01-09 13:15:47+01:00, mattiasj@client-10-129-10-137.upp.off.mysql.com +6 -1
    Bug#31931 Partitions: unjustified 'mix of handlers' error message
    test result updated

  mysql-test/suite/parts/r/partition_engine_innodb.result@1.5, 2008-01-09 13:15:47+01:00, mattiasj@client-10-129-10-137.upp.off.mysql.com +14 -2626
    Bug#31931 Partitions: unjustified 'mix of handlers' error message
    test result updated

  mysql-test/suite/parts/r/partition_engine_myisam.result@1.5, 2008-01-09 13:15:47+01:00, mattiasj@client-10-129-10-137.upp.off.mysql.com +14 -2702
    Bug#31931 Partitions: unjustified 'mix of handlers' error message
    test result updated

  mysql-test/suite/parts/t/ndb_partition_key.test@1.3, 2008-01-09 13:15:47+01:00, mattiasj@client-10-129-10-137.upp.off.mysql.com +11 -1
    Bug#31931 Partitions: unjustified 'mix of handlers' error message
    test case updated

  mysql-test/t/partition.test@1.72.1.1, 2008-01-09 13:15:47+01:00, mattiasj@client-10-129-10-137.upp.off.mysql.com +5 -2
    Bug#31931 Partitions: unjustified 'mix of handlers' error message
    test case updated

  mysql-test/t/partition_innodb.test@1.10, 2008-01-09 13:15:47+01:00, mattiasj@client-10-129-10-137.upp.off.mysql.com +5 -2
    Bug#31931 Partitions: unjustified 'mix of handlers' error message
    test case updated

  sql/partition_info.cc@1.43.1.1, 2008-01-09 13:15:47+01:00, mattiasj@client-10-129-10-137.upp.off.mysql.com +214 -33
    Bug#31931 Partitions: unjustified 'mix of handlers' error message
    moved the check_engine_condition here from sql_partition.cc
    created a new check_engine_mix from check_native_partitioned in
    sql_partition.cc

  sql/partition_info.h@1.26, 2008-01-09 13:15:47+01:00, mattiasj@client-10-129-10-137.upp.off.mysql.com +1 -1
    Bug#31931 Partitions: unjustified 'mix of handlers' error message
    non static function check_engine_mix (now used in sql_partition.cc)

  sql/sql_partition.cc@1.124.1.1, 2008-01-09 13:15:47+01:00, mattiasj@client-10-129-10-137.upp.off.mysql.com +38 -100
    Bug#31931 Partitions: unjustified 'mix of handlers' error message
    moved check_engine_condition to partition_info.cc and moved out some
    common code in check_native_partitioned to check_engine_mix in
    partition_info.cc

ChangeSet@1.2476.779.3, 2008-01-09 12:55:04+01:00, mats@capulet.kindahl.net +9 -0
  Post-merge fixes to make tests pass.

  mysql-test/r/binlog_start_comment.result@1.1.1.1, 2008-01-09 12:55:00+01:00, mats@capulet.kindahl.net +1 -0
    Result change.

  mysql-test/t/binlog_start_comment.test@1.1.1.1, 2008-01-09 12:55:00+01:00, mats@capulet.kindahl.net +2 -0
    Added missing drop table causing subsequent tests to fail.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result@1.30, 2008-01-09 12:55:00+01:00, mats@capulet.kindahl.net +2 -2
    Result change.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result@1.27, 2008-01-09 12:55:00+01:00, mats@capulet.kindahl.net +2 -2
    Result change.

  mysql-test/suite/rpl/r/rpl_timezone.result@1.27, 2008-01-09 12:55:00+01:00, mats@capulet.kindahl.net +0 -38
    Result change.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result@1.1.1.1, 2008-01-09 12:55:00+01:00, mats@capulet.kindahl.net +2 -2
    Result change.

  mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test@1.1.1.1, 2008-01-09 12:55:00+01:00, mats@capulet.kindahl.net +3 -2
    Masking out columns with binlog positions from slave status.

  sql/log_event.cc@1.277.1.43, 2008-01-09 12:55:00+01:00, mats@capulet.kindahl.net +3 -3
    Changing last_err* fields to client_last_err*

  sql/log_event_old.cc@1.16, 2008-01-09 12:55:00+01:00, mats@capulet.kindahl.net +17 -16
    Changing last_err* fields to client_last_err*

ChangeSet@1.2476.793.2, 2008-01-09 10:38:56+01:00, hhunger@hh-nb.hungers +2 -0
  Disabled storedproc_06 for all engines due to bug 33464.

  BitKeeper/etc/ignore@1.300.1.7, 2008-01-09 10:38:54+01:00, hhunger@hh-nb.hungers +2 -0
    Added mysql-test/funcs_1.tar mysql-test/suite/funcs_1.tar.gz to the ignore list

  mysql-test/suite/funcs_1/t/disabled.def@1.7, 2008-01-09 10:38:53+01:00, hhunger@hh-nb.hungers +4 -0
    Disabled storedproc_06 for all engines due to bug 33464.

ChangeSet@1.1810.3484.3, 2008-01-09 14:51:08+08:00, gni@dev3-221.dev.cn.tlan +1 -0
  Fix for view.test.
  the result should be added by 1 by the year(now()) function.

  mysql-test/r/view.result@1.138.39.1, 2008-01-09 14:51:06+08:00, gni@dev3-221.dev.cn.tlan +4 -4
    SELECT (year(now())-year(DOB)) AS Age FROM t1 HAVING Age < 75; 
    the above statement in test file has a year(now()) function, 
    the result should increase by 1 from 2007 year to 2008 year.

ChangeSet@1.2476.783.3, 2008-01-08 23:34:30+01:00, jmiller@mysql.com +3 -0
  NdbRepStress.cpp:
    Updated with suggestions from Magnus and other fixes and adjustments I found along the way
  DbUtil.hpp, DbUtil.cpp:
    fixes and adjustments I found along the way

  storage/ndb/test/include/DbUtil.hpp@1.4, 2008-01-08 23:34:16+01:00, jmiller@mysql.com +2 -1
    fixes and adjustments I found along the way

  storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp@1.1, 2008-01-08 23:33:29+01:00, jmiller@mysql.com +487 -0
    Updated with suggestions from Magnus and other fixes and adjustments I found along the way

  storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp@1.0, 2008-01-08 23:33:29+01:00, jmiller@mysql.com +0 -0

  storage/ndb/test/src/DbUtil.cpp@1.4, 2008-01-08 23:34:08+01:00, jmiller@mysql.com +38 -4
    fixes and adjustments I found along the way

ChangeSet@1.1810.3573.2, 2008-01-08 22:22:40+01:00, mats@unknown.kindahl.net +3 -0
  Post-merge fixes to make tests pass.

  mysql-test/t/blackhole.test@1.4.16.1, 2008-01-08 22:22:37+01:00, mats@unknown.kindahl.net +1 -0
    Fixing test to ignore file_id for exec_load_file events.

  mysql-test/r/mysqlbinlog2.result@1.10.2.1, 2008-01-08 22:22:37+01:00, mats@unknown.kindahl.net +226 -113
    Result change.

  mysql-test/r/blackhole.result@1.5.8.1, 2008-01-08 22:22:37+01:00, mats@unknown.kindahl.net +2 -2
    Result change.

ChangeSet@1.1810.3588.1, 2008-01-08 18:43:25-02:00, davi@mysql.com +2 -0
  Bug#29770 Two handlers are allowed to catch an error in an stored procedure.
  
  Add test case.

  mysql-test/r/sp.result@1.170.28.31, 2008-01-08 18:43:24-02:00, davi@mysql.com +16 -0
    Add test case result for Bug#29770

  mysql-test/t/sp.test@1.174.28.28, 2008-01-08 18:43:24-02:00, davi@mysql.com +24 -0
    Add test case for Bug#29770

ChangeSet@1.2476.793.1, 2008-01-08 13:56:01+01:00, hhunger@hh-nb.hungers +86 -0
  WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/innodb__load.test@1.4, 2008-01-08 13:55:52+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/memory__load.test@1.4, 2008-01-08 13:55:53+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/myisam__load.test@1.4, 2008-01-08 13:55:54+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/ndb__load.test@1.2, 2008-01-08 13:55:55+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  BitKeeper/etc/ignore@1.300.1.6, 2008-01-08 13:55:57+01:00, hhunger@hh-nb.hungers +1 -0
    Added mysql-test/funcs_1.log to the ignore list

  mysql-test/suite/funcs_1/r/innodb_func_view.result@1.8, 2008-01-08 13:55:41+01:00, hhunger@hh-nb.hungers +5013 -4927
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/innodb_storedproc.result@1.5, 2008-01-08 13:55:43+01:00, hhunger@hh-nb.hungers +18280 -17123
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/innodb_storedproc_10.result@1.6, 2008-01-08 13:55:43+01:00, hhunger@hh-nb.hungers +93 -18
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/innodb_trig_03.result@1.5, 2008-01-08 13:55:43+01:00, hhunger@hh-nb.hungers +31 -47
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/innodb_trig_08.result@1.7, 2008-01-08 13:55:43+01:00, hhunger@hh-nb.hungers +41 -12
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result@1.5, 2008-01-08 13:55:43+01:00, hhunger@hh-nb.hungers +2 -2
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/innodb_views.result@1.12, 2008-01-08 13:55:43+01:00, hhunger@hh-nb.hungers +11592 -190
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/memory_func_view.result@1.8, 2008-01-08 13:55:44+01:00, hhunger@hh-nb.hungers +5013 -4927
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/memory_storedproc.result@1.5, 2008-01-08 13:55:45+01:00, hhunger@hh-nb.hungers +18259 -17136
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/memory_storedproc_10.result@1.6, 2008-01-08 13:55:46+01:00, hhunger@hh-nb.hungers +93 -18
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/memory_trig_03.result@1.5, 2008-01-08 13:55:46+01:00, hhunger@hh-nb.hungers +31 -47
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/memory_trig_08.result@1.7, 2008-01-08 13:55:46+01:00, hhunger@hh-nb.hungers +41 -12
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/memory_trig_1011ext.result@1.5, 2008-01-08 13:55:46+01:00, hhunger@hh-nb.hungers +2 -2
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/memory_views.result@1.12, 2008-01-08 13:55:46+01:00, hhunger@hh-nb.hungers +11592 -190
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/myisam_func_view.result@1.8, 2008-01-08 13:55:46+01:00, hhunger@hh-nb.hungers +5013 -4927
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/myisam_storedproc.result@1.5, 2008-01-08 13:55:48+01:00, hhunger@hh-nb.hungers +18280 -17123
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/myisam_storedproc_10.result@1.6, 2008-01-08 13:55:48+01:00, hhunger@hh-nb.hungers +93 -18
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/myisam_trig_03.result@1.5, 2008-01-08 13:55:48+01:00, hhunger@hh-nb.hungers +31 -47
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/myisam_trig_08.result@1.7, 2008-01-08 13:55:48+01:00, hhunger@hh-nb.hungers +41 -12
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result@1.5, 2008-01-08 13:55:48+01:00, hhunger@hh-nb.hungers +2 -2
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/myisam_views.result@1.13, 2008-01-08 13:55:49+01:00, hhunger@hh-nb.hungers +11719 -9752
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/ndb_func_view.result@1.5, 2008-01-08 13:55:49+01:00, hhunger@hh-nb.hungers +5013 -4927
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/ndb_storedproc.result@1.2, 2008-01-08 13:55:51+01:00, hhunger@hh-nb.hungers +18105 -16946
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/ndb_storedproc_10.result@1.3, 2008-01-08 13:55:51+01:00, hhunger@hh-nb.hungers +97 -22
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/ndb_trig_03.result@1.6, 2008-01-08 13:55:51+01:00, hhunger@hh-nb.hungers +31 -47
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/ndb_trig_08.result@1.7, 2008-01-08 13:55:51+01:00, hhunger@hh-nb.hungers +41 -12
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result@1.6, 2008-01-08 13:55:51+01:00, hhunger@hh-nb.hungers +2 -2
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/r/ndb_views.result@1.7, 2008-01-08 13:55:52+01:00, hhunger@hh-nb.hungers +11592 -190
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/storedproc/storedproc_10.inc@1.6, 2008-01-08 13:55:52+01:00, hhunger@hh-nb.hungers +60 -27
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/storedproc/storedproc_master.inc@1.5, 2008-01-08 13:55:52+01:00, hhunger@hh-nb.hungers +2468 -2389
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/disabled.def@1.6, 2008-01-08 13:55:52+01:00, hhunger@hh-nb.hungers +0 -3
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/innodb_bitdata.test@1.4, 2008-01-08 13:55:52+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/innodb_cursors.test@1.4, 2008-01-08 13:55:52+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/innodb_storedproc.test@1.4, 2008-01-08 13:55:52+01:00, hhunger@hh-nb.hungers +3 -0
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/innodb_trig_0102.test@1.4, 2008-01-08 13:55:52+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/innodb_trig_03.test@1.4, 2008-01-08 13:55:53+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/innodb_trig_03e.test@1.2, 2008-01-08 13:55:53+01:00, hhunger@hh-nb.hungers +1 -4
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/innodb_trig_0407.test@1.4, 2008-01-08 13:55:53+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/innodb_trig_08.test@1.4, 2008-01-08 13:55:53+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/innodb_trig_09.test@1.4, 2008-01-08 13:55:53+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test@1.4, 2008-01-08 13:55:53+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/innodb_trig_frkey.test@1.4, 2008-01-08 13:55:53+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/innodb_views.test@1.4, 2008-01-08 13:55:53+01:00, hhunger@hh-nb.hungers +0 -2
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/memory_bitdata.test@1.4, 2008-01-08 13:55:53+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/memory_cursors.test@1.4, 2008-01-08 13:55:53+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/memory_storedproc.test@1.4, 2008-01-08 13:55:54+01:00, hhunger@hh-nb.hungers +2 -0
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/memory_trig_0102.test@1.4, 2008-01-08 13:55:54+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/memory_trig_03.test@1.4, 2008-01-08 13:55:54+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/memory_trig_03e.test@1.2, 2008-01-08 13:55:54+01:00, hhunger@hh-nb.hungers +1 -4
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/memory_trig_0407.test@1.4, 2008-01-08 13:55:54+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/memory_trig_08.test@1.4, 2008-01-08 13:55:54+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/memory_trig_09.test@1.4, 2008-01-08 13:55:54+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/memory_trig_1011ext.test@1.4, 2008-01-08 13:55:54+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/memory_views.test@1.4, 2008-01-08 13:55:54+01:00, hhunger@hh-nb.hungers +0 -2
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/myisam_bitdata.test@1.4, 2008-01-08 13:55:54+01:00, hhunger@hh-nb.hungers +2 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/myisam_cursors.test@1.4, 2008-01-08 13:55:55+01:00, hhunger@hh-nb.hungers +1 -2
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/myisam_storedproc.test@1.4, 2008-01-08 13:55:55+01:00, hhunger@hh-nb.hungers +2 -0
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/myisam_trig_0102.test@1.4, 2008-01-08 13:55:55+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/myisam_trig_03.test@1.4, 2008-01-08 13:55:55+01:00, hhunger@hh-nb.hungers +2 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/myisam_trig_03e.test@1.2, 2008-01-08 13:55:55+01:00, hhunger@hh-nb.hungers +1 -4
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/myisam_trig_0407.test@1.4, 2008-01-08 13:55:55+01:00, hhunger@hh-nb.hungers +2 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/myisam_trig_08.test@1.4, 2008-01-08 13:55:55+01:00, hhunger@hh-nb.hungers +2 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/myisam_trig_09.test@1.4, 2008-01-08 13:55:55+01:00, hhunger@hh-nb.hungers +2 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test@1.4, 2008-01-08 13:55:55+01:00, hhunger@hh-nb.hungers +2 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/myisam_views.test@1.4, 2008-01-08 13:55:55+01:00, hhunger@hh-nb.hungers +1 -2
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/ndb_bitdata.test@1.2, 2008-01-08 13:55:56+01:00, hhunger@hh-nb.hungers +2 -6
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/ndb_cursors.test@1.2, 2008-01-08 13:55:56+01:00, hhunger@hh-nb.hungers +2 -6
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/ndb_storedproc.test@1.1, 2008-01-08 13:55:57+01:00, hhunger@hh-nb.hungers +9 -0
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/ndb_storedproc.test@1.0, 2008-01-08 13:55:57+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/ndb_trig_0102.test@1.2, 2008-01-08 13:55:56+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/ndb_trig_03.test@1.2, 2008-01-08 13:55:56+01:00, hhunger@hh-nb.hungers +2 -6
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/ndb_trig_03e.test@1.2, 2008-01-08 13:55:56+01:00, hhunger@hh-nb.hungers +2 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/ndb_trig_0407.test@1.2, 2008-01-08 13:55:56+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/ndb_trig_08.test@1.2, 2008-01-08 13:55:56+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/ndb_trig_09.test@1.2, 2008-01-08 13:55:56+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test@1.2, 2008-01-08 13:55:56+01:00, hhunger@hh-nb.hungers +1 -5
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/t/ndb_views.test@1.2, 2008-01-08 13:55:56+01:00, hhunger@hh-nb.hungers +0 -2
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/triggers/triggers_03.inc@1.5, 2008-01-08 13:55:56+01:00, hhunger@hh-nb.hungers +19 -50
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/triggers/triggers_08.inc@1.5, 2008-01-08 13:55:56+01:00, hhunger@hh-nb.hungers +48 -33
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc@1.5, 2008-01-08 13:55:57+01:00, hhunger@hh-nb.hungers +4 -3
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/views/func_view.inc@1.6, 2008-01-08 13:55:57+01:00, hhunger@hh-nb.hungers +19 -43
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

  mysql-test/suite/funcs_1/views/views_master.inc@1.11, 2008-01-08 13:55:57+01:00, hhunger@hh-nb.hungers +76 -57
    WL#4084: Code changes due to enabled the disabled tests (including other improvements).

ChangeSet@1.2403.18.99, 2008-01-08 13:23:35+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#33739
    page need to refetched after timeslice

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@1.18.1.7, 2008-01-08 13:23:33+01:00, jonas@perch.ndb.mysql.com +18 -0
    ndb - bug#33739
      page need to refetched after timeslice

ChangeSet@1.2476.748.20, 2008-01-07 21:06:18+01:00, thek@adventure.(none) +4 -0
  Fixed test layout error.

  mysql-test/r/query_cache.result@1.109, 2008-01-07 21:06:14+01:00, thek@adventure.(none) +0 -24
    Moved test which requires debug binaries to a new file.

  mysql-test/r/query_cache_debug.result@1.1, 2008-01-07 21:06:14+01:00, thek@adventure.(none) +24 -0
    Moved test which requires debug binaries to a new file.

  mysql-test/r/query_cache_debug.result@1.0, 2008-01-07 21:06:14+01:00, thek@adventure.(none) +0 -0

  mysql-test/t/query_cache.test@1.90, 2008-01-07 21:06:14+01:00, thek@adventure.(none) +0 -42
    Moved test which requires debug binaries to a new file.

  mysql-test/t/query_cache_debug.test@1.1, 2008-01-07 21:06:14+01:00, thek@adventure.(none) +45 -0
    Moved test which requires debug binaries to a new file.

  mysql-test/t/query_cache_debug.test@1.0, 2008-01-07 21:06:14+01:00, thek@adventure.(none) +0 -0

ChangeSet@1.1810.3485.11, 2008-01-06 20:16:28+08:00, hezx@mail.hezx.com +1 -0
  Replace one overlooked return with DBUG_RETURN in function log_loaded_block

  sql/sql_repl.cc@1.133.7.11, 2008-01-06 20:16:25+08:00, hezx@mail.hezx.com +1 -1
    Replace one overlooked return with DBUG_RETURN in function log_loaded_block

ChangeSet@1.1810.3586.1, 2008-01-06 15:27:42+08:00, hezx@mail.hezx.com +5 -0
  Fixed some test case after push of BUG#32205

  mysql-test/t/blackhole.test@1.4.15.1, 2008-01-06 15:27:40+08:00, hezx@mail.hezx.com +1 -0
    Mask out file_id in show binlog events output

  mysql-test/r/case.result@1.24.3.1, 2008-01-06 15:27:40+08:00, hezx@mail.hezx.com +1 -1
    Drop table t2 too if it exists at the start of the test

  mysql-test/r/binlog_start_comment.result@1.3, 2008-01-06 15:27:40+08:00, hezx@mail.hezx.com +1 -0
    Drop tables used in the test case when done

  mysql-test/r/blackhole.result@1.5.7.1, 2008-01-06 15:27:40+08:00, hezx@mail.hezx.com +2 -2
    Mask out file_id in show binlog events output

  mysql-test/t/case.test@1.18.2.1, 2008-01-06 15:27:40+08:00, hezx@mail.hezx.com +1 -1
    Drop table t2 too if it exists at the start of the test

ChangeSet@1.1810.3585.1, 2008-01-06 15:17:47+08:00, hezx@mail.hezx.com +1 -0
  Add missing include test file for rpl_server_id test

  mysql-test/include/show_binlog_events2.inc@1.1, 2008-01-06 15:17:45+08:00, hezx@mail.hezx.com +5 -0
    New BitKeeper file ``mysql-test/include/show_binlog_events2.inc''

  mysql-test/include/show_binlog_events2.inc@1.0, 2008-01-06 15:17:45+08:00, hezx@mail.hezx.com +0 -0

ChangeSet@1.2476.790.3, 2008-01-04 16:49:39+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  correct result file

  mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result@1.5, 2008-01-04 16:49:36+01:00, tomas@whalegate.ndb.mysql.com +16 -16
    correct result file

ChangeSet@1.2476.791.1, 2008-01-04 15:33:01+01:00, tomas@whalegate.ndb.mysql.com +24 -0
  Bug#32648 Test failure between NDB Cluster and other engines

  mysql-test/lib/mtr_cases.pl@1.69.1.3, 2008-01-04 15:32:57+01:00, tomas@whalegate.ndb.mysql.com +1 -0
    Bug#32648 Test failure between NDB Cluster and other engines

  mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result@1.13.1.1, 2008-01-04 15:30:18+01:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result -> mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result

  mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result@1.4, 2008-01-04 15:28:29+01:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result -> mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result

  mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result@1.3, 2008-01-04 15:29:21+01:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_innodb.result -> mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result

  mysql-test/suite/ndb_team/t/disabled.def@1.2, 2008-01-04 15:32:57+01:00, tomas@whalegate.ndb.mysql.com +3 -0
    Bug#32648 Test failure between NDB Cluster and other engines

  mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test@1.17, 2008-01-04 15:30:09+01:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test -> mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test

  mysql-test/suite/ndb_team/t/rpl_ndb_extraColMaster.test@1.2, 2008-01-04 15:28:10+01:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/rpl_ndb/t/rpl_ndb_extraColMaster.test -> mysql-test/suite/ndb_team/t/rpl_ndb_extraColMaster.test

  mysql-test/suite/ndb_team/t/rpl_ndb_mix_innodb-master.opt@1.3, 2008-01-04 15:29:06+01:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb-master.opt -> mysql-test/suite/ndb_team/t/rpl_ndb_mix_innodb-master.opt

  mysql-test/suite/ndb_team/t/rpl_ndb_mix_innodb.test@1.4, 2008-01-04 15:29:11+01:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb.test -> mysql-test/suite/ndb_team/t/rpl_ndb_mix_innodb.test

  mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result@1.4, 2008-01-04 15:32:57+01:00, tomas@whalegate.ndb.mysql.com +34 -27
    Bug#32648 Test failure between NDB Cluster and other engines

  mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result@1.5, 2008-01-04 15:32:57+01:00, tomas@whalegate.ndb.mysql.com +32 -25
    Bug#32648 Test failure between NDB Cluster and other engines

  mysql-test/suite/rpl_ndb/r/rpl_ndb_2ndb.result@1.1, 2008-01-04 15:32:58+01:00, tomas@whalegate.ndb.mysql.com +401 -0
    Bug#32648 Test failure between NDB Cluster and other engines
    

  mysql-test/suite/rpl_ndb/r/rpl_ndb_2ndb.result@1.0, 2008-01-04 15:32:58+01:00, tomas@whalegate.ndb.mysql.com +0 -0

  mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result@1.2, 2008-01-04 15:32:58+01:00, tomas@whalegate.ndb.mysql.com +9 -394
    Bug#32648 Test failure between NDB Cluster and other engines

  mysql-test/suite/rpl_ndb/t/disabled.def@1.16.1.1, 2008-01-04 15:32:58+01:00, tomas@whalegate.ndb.mysql.com +0 -7
    Bug#32648 Test failure between NDB Cluster and other engines

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt@1.4, 2008-01-04 15:32:58+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug#32648 Test failure between NDB Cluster and other engines

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt@1.4, 2008-01-04 15:32:58+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug#32648 Test failure between NDB Cluster and other engines

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test@1.5, 2008-01-04 15:32:58+01:00, tomas@whalegate.ndb.mysql.com +14 -4
    Bug#32648 Test failure between NDB Cluster and other engines

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt@1.4, 2008-01-04 15:32:58+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug#32648 Test failure between NDB Cluster and other engines

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-slave.opt@1.4, 2008-01-04 15:32:58+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug#32648 Test failure between NDB Cluster and other engines

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test@1.5, 2008-01-04 15:32:58+01:00, tomas@whalegate.ndb.mysql.com +14 -2
    Bug#32648 Test failure between NDB Cluster and other engines

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb-slave.opt@1.1, 2008-01-04 15:32:58+01:00, tomas@whalegate.ndb.mysql.com +1 -0
    Bug#32648 Test failure between NDB Cluster and other engines
    

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb-slave.opt@1.0, 2008-01-04 15:32:58+01:00, tomas@whalegate.ndb.mysql.com +0 -0

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test@1.1, 2008-01-04 15:32:58+01:00, tomas@whalegate.ndb.mysql.com +19 -0
    Bug#32648 Test failure between NDB Cluster and other engines
    

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test@1.0, 2008-01-04 15:32:58+01:00, tomas@whalegate.ndb.mysql.com +0 -0

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt@1.2, 2008-01-04 15:32:58+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug#32648 Test failure between NDB Cluster and other engines

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test@1.3, 2008-01-04 15:32:58+01:00, tomas@whalegate.ndb.mysql.com +10 -6
    Bug#32648 Test failure between NDB Cluster and other engines

ChangeSet@1.2476.1.174, 2008-01-04 12:06:20+01:00, mattiasj@witty. +7 -0
  Bug#30459 Partitioning across disks failing on Windows
  
  Problem was that there are no support for symlinked files on Windows for
  mysqld. So we fail when trying to create them.
  
  Solution: Ignore the DATA/INDEX DIRECTORY clause for partitions and push
  a warning. (Just like a MyISAM table)

  mysql-test/r/partition.result@1.80, 2008-01-04 12:06:17+01:00, mattiasj@witty. +0 -28
    Bug#30459 Partitioning across disks failing on Windows
    Moved symlink specific tests to partition_symlink
    result file

  mysql-test/r/partition_symlink.result@1.2, 2008-01-04 12:06:17+01:00, mattiasj@witty. +31 -0
    Bug#30459 Partitioning across disks failing on Windows
    Moved symlink specific tests from partition.test
    result file

  mysql-test/r/partition_windows.result@1.2, 2008-01-04 12:06:17+01:00, mattiasj@witty. +28 -12
    Bug#30459 Partitioning across disks failing on Windows
    result file

  mysql-test/t/partition.test@1.73, 2008-01-04 12:06:17+01:00, mattiasj@witty. +0 -47
    Bug#30459 Partitioning across disks failing on Windows
    Moved symlink specific tests to partition_symlink
    test file

  mysql-test/t/partition_symlink.test@1.3, 2008-01-04 12:06:17+01:00, mattiasj@witty. +49 -1
    Bug#30459 Partitioning across disks failing on Windows
    Moved symlink specific tests from partition.test
    test file

  mysql-test/t/partition_windows.test@1.2, 2008-01-04 12:06:17+01:00, mattiasj@witty. +24 -13
    Bug#30459 Partitioning across disks failing on Windows
    test file

  sql/partition_info.cc@1.44, 2008-01-04 12:06:17+01:00, mattiasj@witty. +12 -2
    Bug#30459 Partitioning across disks failing on Windows
    
    Problem was that there are no support for symlinked files on Windows for
    mysqld. So we fail when trying to create them.
    
    Solution: Ignore the DATA/INDEX DIRECTORY clause for partitions and push
    a warning. (Just like a MyISAM table)

ChangeSet@1.2476.790.1, 2008-01-04 11:34:23+01:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - dict
    remove dead code

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.140, 2008-01-04 11:34:21+01:00, jonas@perch.ndb.mysql.com +0 -7
    remove dead code

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp@1.56, 2008-01-04 11:34:21+01:00, jonas@perch.ndb.mysql.com +0 -2
    remove dead code

ChangeSet@1.1346.895.5, 2008-01-03 21:38:05+01:00, kent@mysql.com +2 -0
  configure.in, acinclude.m4:
    Minor cleanup, removed semicolons not needed

  acinclude.m4@1.77.1.26, 2008-01-03 21:37:47+01:00, kent@mysql.com +2 -2
    Minor cleanup, removed semicolons not needed

  configure.in@1.191.1.154, 2008-01-03 21:37:47+01:00, kent@mysql.com +15 -15
    Minor cleanup, removed semicolons not needed

ChangeSet@1.2476.789.1, 2008-01-03 15:36:48+01:00, thek@adventure.(none) +3 -0
  Bug#30887 Server crashes on SET GLOBAL query_cache_size=0
  
  Reseting the query cache by issuing a SET GLOBAL query_cache_size=0 caused the server
  to crash if a the server concurrently was saving a new result set to the query cache. The
  reason for this was that the invalidation wasn't waiting on the result writers to
  release the block level locks on the query cache.

  mysql-test/r/query_cache.result@1.108, 2008-01-03 15:36:45+01:00, thek@adventure.(none) +24 -0
    Added test for verifying that 'SET query_cache_size= 0' while inserting new
    statements into the query cache won't cause the  server to crash. 

  mysql-test/t/query_cache.test@1.89, 2008-01-03 15:36:45+01:00, thek@adventure.(none) +41 -0
    Added test for verifying that 'SET query_cache_size= 0' while inserting new
    statements into the query cache won't cause the  server to crash.

  sql/sql_cache.cc@1.129.3.1, 2008-01-03 15:36:45+01:00, thek@adventure.(none) +57 -2
    - Applying a block level lock iteration of all query-type blocks prevents
     writers and readers from crashing when the query cache is removed. 

ChangeSet@1.1810.3577.2, 2008-01-03 14:26:41+01:00, df@pippilotta.erinye.com +35 -0
  use correct config_readline.h file

  cmd-line-utils/readline/bind.c@1.15.1.3, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/callback.c@1.10, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/compat.c@1.4, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/complete.c@1.16.1.3, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/display.c@1.16.1.3, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/funmap.c@1.11, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/histexpand.c@1.15, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/histfile.c@1.9.1.4, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/history.c@1.10, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/histsearch.c@1.10, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/input.c@1.16, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/isearch.c@1.13, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/keymaps.c@1.9, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/kill.c@1.12, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/macro.c@1.11, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/mbutil.c@1.10, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/misc.c@1.8, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/nls.c@1.10, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/parens.c@1.9, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/readline.c@1.13, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/rldefs.h@1.8, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/rltty.c@1.11.1.2, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/rlwinsize.h@1.5, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/savestring.c@1.4, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/search.c@1.12, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/shell.c@1.11, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/signals.c@1.9, 2008-01-03 14:26:38+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/tcap.h@1.8, 2008-01-03 14:26:39+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/terminal.c@1.18, 2008-01-03 14:26:39+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/text.c@1.10, 2008-01-03 14:26:39+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/tilde.c@1.13, 2008-01-03 14:26:39+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/undo.c@1.10.1.4, 2008-01-03 14:26:39+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/util.c@1.11, 2008-01-03 14:26:39+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/vi_mode.c@1.16, 2008-01-03 14:26:39+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

  cmd-line-utils/readline/xmalloc.c@1.8.1.3, 2008-01-03 14:26:39+01:00, df@pippilotta.erinye.com +1 -1
    use correct config_readline.h file

ChangeSet@1.2476.778.2, 2008-01-02 13:00:46+00:00, jperkin@chorlton.adsl.perkin.org.uk +11 -0
  Use pkglibdir to simplify pkgplugindir, and fix the path in a
  couple of Makefiles.  Continuation of the fix for bug#31736.

  libmysqld/Makefile.am@1.117.1.2, 2008-01-02 13:00:41+00:00, jperkin@chorlton.adsl.perkin.org.uk +1 -1
    Use pkglibdir

  plugin/daemon_example/Makefile.am@1.6, 2008-01-02 13:00:41+00:00, jperkin@chorlton.adsl.perkin.org.uk +1 -1
    Use pkglibdir

  plugin/fulltext/Makefile.am@1.12, 2008-01-02 13:00:42+00:00, jperkin@chorlton.adsl.perkin.org.uk +1 -1
    Use pkglibdir

  scripts/Makefile.am@1.79, 2008-01-02 13:00:42+00:00, jperkin@chorlton.adsl.perkin.org.uk +1 -1
    Use pkglibdir

  scripts/make_binary_distribution.sh@1.162.2.2, 2008-01-02 13:00:42+00:00, jperkin@chorlton.adsl.perkin.org.uk +1 -2
    Update comment

  sql/Makefile.am@1.195, 2008-01-02 13:00:42+00:00, jperkin@chorlton.adsl.perkin.org.uk +1 -1
    Use pkglibdir

  storage/archive/Makefile.am@1.13, 2008-01-02 13:00:42+00:00, jperkin@chorlton.adsl.perkin.org.uk +1 -1
    Use pkglibdir

  storage/blackhole/Makefile.am@1.9, 2008-01-02 13:00:42+00:00, jperkin@chorlton.adsl.perkin.org.uk +1 -1
    Use pkglibdir

  storage/example/Makefile.am@1.15, 2008-01-02 13:00:42+00:00, jperkin@chorlton.adsl.perkin.org.uk +1 -1
    Use pkglibdir, fix pkgplugindir

  storage/federated/Makefile.am@1.6, 2008-01-02 13:00:42+00:00, jperkin@chorlton.adsl.perkin.org.uk +1 -1
    Use pkglibdir

  storage/innobase/Makefile.am@1.32, 2008-01-02 13:00:42+00:00, jperkin@chorlton.adsl.perkin.org.uk +1 -1
    Use pkglibdir, fix pkgplugindir

ChangeSet@1.2476.729.17, 2007-12-31 17:30:17+03:00, skozlov@mysql.com +1 -0
  WL#4077 added support old versions of mysqld binaries

  mysql-test/include/have_multi_ndb.inc@1.7.1.2, 2007-12-31 17:30:08+03:00, skozlov@mysql.com +10 -2
    check that information_schema.engines table exists

ChangeSet@1.1810.3569.8, 2007-12-28 22:58:54+01:00, kent@mysql.com +4 -0
  Makefile.am, CMakeLists.txt, mysql_secure_installation.pl.in:
    Added Perl version of script "mysql_secure_installation"
  make_win_bin_dist:
    Corrected copy of SQL files to "share" directory

  scripts/CMakeLists.txt@1.3.1.4, 2007-12-28 22:56:34+01:00, kent@mysql.com +1 -1
    Added Perl version of script "mysql_secure_installation"

  scripts/Makefile.am@1.43.1.27, 2007-12-28 22:56:34+01:00, kent@mysql.com +1 -0
    Added Perl version of script "mysql_secure_installation"

  scripts/make_win_bin_dist@1.1.13.10, 2007-12-28 22:57:07+01:00, kent@mysql.com +2 -2
    Corrected copy of SQL files to "share" directory

  scripts/mysql_secure_installation.pl.in@1.1, 2007-12-28 22:50:50+01:00, kent@mysql.com +352 -0
    Added Perl version of script "mysql_secure_installation"

  scripts/mysql_secure_installation.pl.in@1.0, 2007-12-28 22:50:50+01:00, kent@mysql.com +0 -0

ChangeSet@1.1810.3569.6, 2007-12-28 01:02:28+01:00, kent@mysql.com +13 -0
  make_win_bin_dist CMakeLists.txt resolveip.c Makefile.am:
    Better Windows support in the scripts directory
  mysql_config.pl.in, mysql_install_db.pl.in:
    New Perl version of Unix shell script, mainly for Windows
  Many files in scripts directory:
    Use default Perl location "#!/usr/bin/perl" instead of the build host path

  scripts/mysql_explain_log.sh@1.3.4.1, 2007-12-27 22:03:19+01:00, kent@mysql.com +1 -1
    Use default Perl location "#!/usr/bin/perl" instead of the build host path

  scripts/mysql_tableinfo.sh@1.3.1.1, 2007-12-27 22:03:28+01:00, kent@mysql.com +1 -1
    Use default Perl location "#!/usr/bin/perl" instead of the build host path

  extra/CMakeLists.txt@1.1.7.2, 2007-12-27 21:51:21+01:00, kent@mysql.com +3 -0
    Added target for executable "resolveip"

  extra/resolveip.c@1.24.1.2, 2007-12-27 21:51:53+01:00, kent@mysql.com +8 -6
    Exclude Unix specific headers when compiling on Windows

  scripts/CMakeLists.txt@1.3.1.3, 2007-12-27 21:53:33+01:00, kent@mysql.com +41 -0
    On Windows, filter Perl scripts and change name from ".sh" to ".pl"
    
      mysql_convert_table_format.sh  mysql_explain_log.sh
      mysql_secure_installation.sh   mysql_tableinfo.sh
      mysqld_multi.sh                mysqldumpslow.sh
      mysqlhotcopy.sh
    
    Do the same for the new Windows specific Perl versions of shell scripts
    
      mysql_config.pl.in             mysql_install_db.pl.in
    
    In CMake, set reasonable values for 'CFLAGS', 'prefix', 'datadir' and so on.

  scripts/Makefile.am@1.43.1.26, 2007-12-27 21:59:31+01:00, kent@mysql.com +2 -0
    Include "mysql_config.pl.in" and "mysql_install_db.pl.in" in the source TAR

  scripts/make_win_bin_dist@1.1.13.9, 2007-12-27 22:00:51+01:00, kent@mysql.com +17 -18
    Only include explicitly listed scripts from the "scripts" directory

  scripts/mysql_config.pl.in@1.1, 2007-12-27 22:04:14+01:00, kent@mysql.com +285 -0
    New Perl version of Unix shell script, mainly for Windows

  scripts/mysql_config.pl.in@1.0, 2007-12-27 22:04:14+01:00, kent@mysql.com +0 -0

  scripts/mysql_convert_table_format.sh@1.6.1.2, 2007-12-27 22:03:12+01:00, kent@mysql.com +1 -1
    Use default Perl location "#!/usr/bin/perl" instead of the build host path

  scripts/mysql_install_db.pl.in@1.1, 2007-12-27 22:04:14+01:00, kent@mysql.com +612 -0
    New Perl version of Unix shell script, mainly for Windows

  scripts/mysql_install_db.pl.in@1.0, 2007-12-27 22:04:14+01:00, kent@mysql.com +0 -0

  scripts/mysqld_multi.sh@1.33.1.6, 2007-12-27 22:03:30+01:00, kent@mysql.com +1 -1
    Use default Perl location "#!/usr/bin/perl" instead of the build host path

  scripts/mysqldumpslow.sh@1.10, 2007-12-27 22:03:32+01:00, kent@mysql.com +1 -1
    Use default Perl location "#!/usr/bin/perl" instead of the build host path

  scripts/mysqlhotcopy.sh@1.54, 2007-12-27 22:03:35+01:00, kent@mysql.com +1 -1
    Use default Perl location "#!/usr/bin/perl" instead of the build host path

ChangeSet@1.2476.729.16, 2007-12-25 22:10:22+03:00, skozlov@mysql.com +4 -0
  WL#4077, added mask for SHOW DATABASES statement

  mysql-test/suite/rpl/r/rpl_create_database.result@1.13, 2007-12-25 22:10:12+03:00, skozlov@mysql.com +8 -16
    updated result file

  mysql-test/suite/rpl/r/rpl_load_from_master.result@1.31, 2007-12-25 22:10:12+03:00, skozlov@mysql.com +6 -12
    updated result file

  mysql-test/suite/rpl/t/rpl_create_database.test@1.8, 2007-12-25 22:10:12+03:00, skozlov@mysql.com +4 -4
    added the mask 'mysql%' for SHOW DATABASES

  mysql-test/suite/rpl/t/rpl_load_from_master.test@1.29, 2007-12-25 22:10:12+03:00, skozlov@mysql.com +3 -3
    added the mask 'mysql%' for SHOw DATABASES

ChangeSet@1.2476.729.15, 2007-12-24 15:04:22+08:00, hezx@mail.hezx.com +2 -0
  Remove test rpl_drop_view from main suite

  BitKeeper/deleted/.del-rpl_drop_view.result@1.2, 2007-12-24 15:01:54+08:00, hezx@mail.hezx.com +0 -0
    Delete: mysql-test/r/rpl_drop_view.result

  BitKeeper/deleted/.del-rpl_drop_view.test@1.2, 2007-12-24 15:01:48+08:00, hezx@mail.hezx.com +0 -0
    Delete: mysql-test/t/rpl_drop_view.test

ChangeSet@1.2476.729.14, 2007-12-24 15:03:23+08:00, hezx@mail.hezx.com +2 -0
  Move test rpl_server_id to suite rpl

  mysql-test/suite/rpl/r/rpl_server_id.result@1.2, 2007-12-24 15:00:37+08:00, hezx@mail.hezx.com +0 -0
    Rename: mysql-test/r/rpl_server_id.result -> mysql-test/suite/rpl/r/rpl_server_id.result

  mysql-test/suite/rpl/t/rpl_server_id.test@1.2, 2007-12-24 15:00:29+08:00, hezx@mail.hezx.com +0 -0
    Rename: mysql-test/t/rpl_server_id.test -> mysql-test/suite/rpl/t/rpl_server_id.test

ChangeSet@1.1810.3579.5, 2007-12-23 11:18:46+02:00, aelkin@koti.dsl.inet.fi +4 -0
  bug#30435
  
  changes due to non-determinism in value of read_buffer_size.

  mysql-test/std_data/bug30435_10k_items.txt@1.1, 2007-12-23 11:18:43+02:00, aelkin@koti.dsl.inet.fi +10000 -0
    data for bug#30435 regression testing

  mysql-test/std_data/bug30435_10k_items.txt@1.0, 2007-12-23 11:18:43+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/std_data/bug30435_5k.txt@1.1, 2007-12-23 11:18:43+02:00, aelkin@koti.dsl.inet.fi +5000 -0
    data for bug#30435 regression testing

  mysql-test/std_data/bug30435_5k.txt@1.0, 2007-12-23 11:18:43+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/r/rpl_loaddata_map.result@1.3, 2007-12-23 11:18:42+02:00, aelkin@koti.dsl.inet.fi +3 -6
    results changed

  mysql-test/t/rpl_loaddata_map.test@1.3, 2007-12-23 11:18:43+02:00, aelkin@koti.dsl.inet.fi +1 -2
    showing only the fact that the buffer size is larger than the packet size.

ChangeSet@1.1810.3579.4, 2007-12-22 19:59:47+02:00, aelkin@koti.dsl.inet.fi +2 -0
  bug#30435
  
  refining the test after it failed on pb.

  mysql-test/r/rpl_loaddata_map.result@1.2, 2007-12-22 19:59:39+02:00, aelkin@koti.dsl.inet.fi +2 -2
    results changed

  mysql-test/t/rpl_loaddata_map.test@1.2, 2007-12-22 19:59:39+02:00, aelkin@koti.dsl.inet.fi +2 -0
    refining the test

ChangeSet@1.1810.3582.1, 2007-12-21 22:34:43+02:00, aelkin@koti.dsl.inet.fi +6 -0
  BUG#30435 loading large LOAD DATA INFILE breaks slave with 
            read_buffer_size set on master
  BUG#33413 show binlog events fails if binlog has event size of close
            to max_allowed_packet
  
  
  The size of Append_block replication event was determined solely by
  read_buffer_size whereas the rest of replication code deals with
  max_allowed_packet.
  When the former parameter was set to larger than the latter there were
  two artifacts: the master could not read events from binlog;
  show master events did not show.
  
  Fixed with 
  - fragmenting the used io-cached buffer into pieces each size of less
    than max_allowed_packet (bug#30435)
  - incrementing show-binlog-events handling thread's max_allowed_packet
    with the max estimated for the replication header size

  include/my_sys.h@1.178.18.1, 2007-12-21 22:34:40+02:00, aelkin@koti.dsl.inet.fi +6 -0
    accessor-macros added in order not to mess with the io cache's implementation
    details in code that merely exploits the io-cache.

  mysql-test/r/rpl_loaddata_map.result@1.1, 2007-12-21 22:34:40+02:00, aelkin@koti.dsl.inet.fi +31 -0
    New BitKeeper file ``mysql-test/r/rpl_loaddata_map.result''

  mysql-test/r/rpl_loaddata_map.result@1.0, 2007-12-21 22:34:40+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/t/rpl_loaddata_map-master.opt@1.1, 2007-12-21 22:34:41+02:00, aelkin@koti.dsl.inet.fi +1 -0
    specific options to trigger  BUG#30435,  BUG#33413 situations

  mysql-test/t/rpl_loaddata_map-master.opt@1.0, 2007-12-21 22:34:41+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/t/rpl_loaddata_map-slave.opt@1.1, 2007-12-21 22:34:41+02:00, aelkin@koti.dsl.inet.fi +1 -0
    max_allowed_packet to be compatible with the master's version.

  mysql-test/t/rpl_loaddata_map-slave.opt@1.0, 2007-12-21 22:34:41+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/t/rpl_loaddata_map.test@1.1, 2007-12-21 22:34:41+02:00, aelkin@koti.dsl.inet.fi +51 -0
    regression tests for two bugs.

  mysql-test/t/rpl_loaddata_map.test@1.0, 2007-12-21 22:34:41+02:00, aelkin@koti.dsl.inet.fi +0 -0

  sql/sql_repl.cc@1.133.12.1, 2007-12-21 22:34:40+02:00, aelkin@koti.dsl.inet.fi +44 -25
    BUG#33413: incrementing thd->variables.max_allowed_packet with 
    the max estimation for the replication header size (from bug#19402);
    refactoring log_loaded_block() to fragment the io_cache buffer in case
     read_buffer_size > max_allowed_packet.

ChangeSet@1.2476.786.2, 2007-12-21 21:30:20+01:00, sven@riska.(none) +5 -0
  Undo previous merge.

  BitKeeper/deleted/.del-rpl_transaction-master.opt@1.2, 2007-12-21 21:27:11+01:00, sven@riska.(none) +0 -0
    Delete: mysql-test/t/rpl_transaction-master.opt

  BitKeeper/deleted/.del-rpl_transaction-slave.opt@1.2, 2007-12-21 21:27:11+01:00, sven@riska.(none) +0 -0
    Delete: mysql-test/t/rpl_transaction-slave.opt

  BitKeeper/deleted/.del-rpl_transaction.result@1.3, 2007-12-21 21:27:05+01:00, sven@riska.(none) +0 -0
    Delete: mysql-test/r/rpl_transaction.result

  BitKeeper/deleted/.del-rpl_transaction.test@1.3, 2007-12-21 21:27:11+01:00, sven@riska.(none) +0 -0
    Delete: mysql-test/t/rpl_transaction.test

  mysql-test/r/variables-big.result@1.4, 2007-12-21 21:30:19+01:00, sven@riska.(none) +4 -8
    Undo previous merge.

ChangeSet@1.1810.3581.1, 2007-12-21 20:30:23+01:00, sven@riska.(none) +10 -0
  BUG#26395: if crash during autocommit update to transactional table on master, slave fails
  Now, every transaction (including autocommit transactions) start with
  a BEGIN and end with a COMMIT/ROLLBACK in the binlog.
  Added a test case, and updated lots of test case result files.

  mysql-test/t/rpl_transaction-master.opt@1.1, 2007-12-21 20:25:03+01:00, sven@riska.(none) +1 -0
    BitKeeper file /home/sven/bk/b26395-autocommit-xa/5.0-rpl/mysql-test/t/rpl_transaction-master.opt

  mysql-test/t/rpl_transaction-master.opt@1.0, 2007-12-21 20:25:03+01:00, sven@riska.(none) +0 -0

  mysql-test/t/rpl_transaction-slave.opt@1.1, 2007-12-21 20:25:03+01:00, sven@riska.(none) +1 -0
    BitKeeper file /home/sven/bk/b26395-autocommit-xa/5.0-rpl/mysql-test/t/rpl_transaction-slave.opt

  mysql-test/t/rpl_transaction-slave.opt@1.0, 2007-12-21 20:25:03+01:00, sven@riska.(none) +0 -0

  mysql-test/r/rpl_transaction.result@1.2, 2007-12-21 20:30:22+01:00, sven@riska.(none) +4 -4
    New result file for new test case.

  mysql-test/r/rpl_transaction.result@1.1, 2007-12-21 20:07:12+01:00, sven@riska.(none) +95 -0
    BitKeeper file /home/sven/bk/b26395-autocommit-xa/5.0-rpl/mysql-test/r/rpl_transaction.result

  mysql-test/r/rpl_transaction.result@1.0, 2007-12-21 20:07:12+01:00, sven@riska.(none) +0 -0

  mysql-test/t/rpl_transaction.test@1.2, 2007-12-21 20:30:22+01:00, sven@riska.(none) +3 -1
    New test case.

  mysql-test/t/rpl_transaction.test@1.1, 2007-12-21 20:07:12+01:00, sven@riska.(none) +104 -0
    BitKeeper file /home/sven/bk/b26395-autocommit-xa/5.0-rpl/mysql-test/t/rpl_transaction.test

  mysql-test/t/rpl_transaction.test@1.0, 2007-12-21 20:07:12+01:00, sven@riska.(none) +0 -0

  mysql-test/r/sp_trans_log.result@1.1.2.1, 2007-12-21 20:30:22+01:00, sven@riska.(none) +1 -0
    Updated result file

  mysql-test/r/multi_update.result@1.44.1.4, 2007-12-21 20:30:22+01:00, sven@riska.(none) +2 -2
    Updated result file

  mysql-test/r/variables-big.result@1.1.1.1, 2007-12-21 20:30:22+01:00, sven@riska.(none) +9 -5
    Updated result file

  mysql-test/r/mix_innodb_myisam_binlog.result@1.24.14.1, 2007-12-21 20:30:22+01:00, sven@riska.(none) +44 -37
    Updated result file

  sql/log.cc@1.158.25.1, 2007-12-21 20:30:22+01:00, sven@riska.(none) +71 -29
     - Always write BEGIN and COMMIT around statements, even in autocommit
       mode.
     - Added comments for binlog_commit and binlog_rollback.

  sql/log_event.cc@1.174.27.8, 2007-12-21 20:30:22+01:00, sven@riska.(none) +1 -0
    Added debug trigger to avoid writing xid events to the binlog.

ChangeSet@1.2476.729.12, 2007-12-21 12:22:09+01:00, sven@riska.(none) +1 -0
  fixed broken result file

  mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result@1.3, 2007-12-21 12:22:08+01:00, sven@riska.(none) +2 -2
    fixed broken result file

ChangeSet@1.1810.3574.4, 2007-12-21 11:28:34+01:00, serg@janus.mylan +1 -0
  cast corrected

  sql/set_var.cc@1.125.44.3, 2007-12-21 11:28:31+01:00, serg@janus.mylan +2 -2
    typo :(

ChangeSet@1.1810.3574.3, 2007-12-21 10:31:47+01:00, serg@janus.mylan +1 -0
  warning on windows

  sql/set_var.cc@1.125.44.2, 2007-12-21 10:31:44+01:00, serg@janus.mylan +2 -2
    warning on windows

ChangeSet@1.1810.3580.1, 2007-12-21 10:13:54+02:00, aelkin@koti.dsl.inet.fi +1 -0
  Bug #31359  change_master sets group_master_log_pos twice, 
              ignores future_group_master_log_p
  
  There was a redundant assignement. However, that's the only artifact.
  Wrt to future_group_master_log_position, there is no issue.
  The counter is supposed to be set at Log_event::exec_event().
  It's used only by Innodb for recovery purposes.

  sql/sql_repl.cc@1.133.7.9, 2007-12-21 10:13:51+02:00, aelkin@koti.dsl.inet.fi +1 -3
    removing a redundant line which arrived with the revision 1.102.1.7.

ChangeSet@1.1810.3578.1, 2007-12-21 11:02:48+08:00, hezx@mail.hezx.com +3 -0
  BUG#28908 Replication: set global server_id is not setting the session server_id 
  
  When set the server-id dynamically, the server_id member of current thread is not updated.
  
  Update the server_id member of current thread after updated the global variable value.

  mysql-test/r/rpl_server_id.result@1.1, 2007-12-21 11:02:44+08:00, hezx@mail.hezx.com +34 -0
    Add test for BUG#28908

  mysql-test/r/rpl_server_id.result@1.0, 2007-12-21 11:02:44+08:00, hezx@mail.hezx.com +0 -0

  mysql-test/t/rpl_server_id.test@1.1, 2007-12-21 11:02:44+08:00, hezx@mail.hezx.com +29 -0
    Add test for BUG#28908

  mysql-test/t/rpl_server_id.test@1.0, 2007-12-21 11:02:44+08:00, hezx@mail.hezx.com +0 -0

  sql/set_var.cc@1.125.45.1, 2007-12-21 11:02:44+08:00, hezx@mail.hezx.com +1 -0
    Update server_id of current thread

ChangeSet@1.2498.1.2, 2007-12-21 00:01:07+01:00, serg@janus.mylan +2 -0
  variables.result, variables.test:
    test case fixed

  mysql-test/r/variables.result@1.110, 2007-12-21 00:00:53+01:00, serg@janus.mylan +1 -1
    test case fixed

  mysql-test/t/variables.test@1.88, 2007-12-21 00:00:57+01:00, serg@janus.mylan +1 -1
    test case fixed

ChangeSet@1.2498.1.1, 2007-12-21 00:00:28+01:00, serg@janus.mylan +1 -0
  after merge fix in mysqld.cc:
    added missing status variables (assert works! :)

  sql/mysqld.cc@1.682.1.4, 2007-12-20 23:59:47+01:00, serg@janus.mylan +2 -0
    added missing status variables (assert works! :)

ChangeSet@1.2499, 2007-12-20 23:58:09+01:00, serg@janus.mylan +1 -0
  my_atomic-t.c:
    gcc bug workaround

  unittest/mysys/my_atomic-t.c@1.12, 2007-12-20 23:57:51+01:00, serg@janus.mylan +9 -2
    gcc bug workaround

ChangeSet@1.2476.785.1, 2007-12-20 22:00:42+01:00, sven@riska.(none) +3 -0
  Fixed errors in pushbuild by updating test and result files.

  mysql-test/suite/binlog/r/binlog_row_binlog.result@1.22, 2007-12-20 22:00:40+01:00, sven@riska.(none) +4 -0
    updated result file.
    This part of the test was created in parallel with the fix to bug#26395,
    which modifies the output of mysqlbinlog and hence the output of many
    tests, including this one.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result@1.2, 2007-12-20 22:00:40+01:00, sven@riska.(none) +13 -39
    updated result file

  mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test@1.2, 2007-12-20 22:00:40+01:00, sven@riska.(none) +19 -7
    1. replaced include/show_slave_status.inc by more specific tests for the
    SQL error and IO error, as well as Slave_IO_State.
    2. drop all tables at the end of test.

ChangeSet@1.2476.729.10, 2007-12-20 23:57:06+03:00, skozlov@mysql.com +1 -0
  WL#4077 fix for innodb test that were skipped

  mysql-test/include/have_innodb.inc@1.6, 2007-12-20 23:57:00+03:00, skozlov@mysql.com +1 -1
    added new value 'ENABLED' for 'support' field

ChangeSet@1.2476.748.18, 2007-12-20 15:32:56-05:00, dkatz@damien-katzs-computer.local +1 -0
  Bug #29836	enable-pstack option appears even if --with-pstack is disabled
  
  Placed all pstack code inside of #ifdef's, so the options aren't displayed when not available.

  sql/mysqld.cc@1.682.2.14, 2007-12-20 15:32:51-05:00, dkatz@damien-katzs-computer.local +6 -1
    Bug #29836	enable-pstack option appears even if --with-pstack is disabled
    
    Placed all pstack code inside of #ifdef's, so the options aren't displayed when not available.

ChangeSet@1.2476.783.1, 2007-12-20 21:06:52+01:00, jmiller@mysql.com +2 -0
  DbUtil.cpp:
    Rename: storage/ndb/test/src/dbutil.cpp -> storage/ndb/test/src/DbUtil.cpp
  DbUtil.hpp, DbUtil.cpp:
    Many changes based off a review from Magnus
  DbUtil.hpp:
    Rename: storage/ndb/test/include/dbutil.hpp -> storage/ndb/test/include/DbUtil.hpp

  storage/ndb/test/include/DbUtil.hpp@1.3, 2007-12-20 21:06:41+01:00, jmiller@mysql.com +77 -45
    Many changes based off a review from Magnus

  storage/ndb/test/include/DbUtil.hpp@1.2, 2007-12-20 21:05:55+01:00, jmiller@mysql.com +0 -0
    Rename: storage/ndb/test/include/dbutil.hpp -> storage/ndb/test/include/DbUtil.hpp

  storage/ndb/test/src/DbUtil.cpp@1.3, 2007-12-20 21:06:26+01:00, jmiller@mysql.com +248 -139
    Many changes based off a review from Magnus

  storage/ndb/test/src/DbUtil.cpp@1.2, 2007-12-20 21:04:47+01:00, jmiller@mysql.com +0 -0
    Rename: storage/ndb/test/src/dbutil.cpp -> storage/ndb/test/src/DbUtil.cpp

ChangeSet@1.2476.748.17, 2007-12-20 21:16:55+03:00, kostja@bodhi.(none) +13 -0
  A pre-requisite for the fix for Bug#12713 "Error in a stored function 
  called from a SELECT doesn't cause ROLLBACK of state"
  Make private all class handler methods (PSEA API) that may modify
  data. Introduce and deploy public ha_* wrappers for these methods in 
  all sql/.
  This necessary to keep track of all data modifications in sql/,
  which is in turn necessary to be able to optimize two-phase
  commit of those transactions that do not modify data.

  sql/ha_partition.cc@1.117, 2007-12-20 21:16:51+03:00, kostja@bodhi.(none) +38 -35
    Class ha_partition is no longer a friend of class handler.
    Use the public handler interface (handler::ha_ methods) for partition
    operations.
    Remove unnecessary casts from char[] to const char *.ppзи выафвыаafa

  sql/handler.cc@1.332, 2007-12-20 21:16:51+03:00, kostja@bodhi.(none) +332 -5
    Function ha_create_table() is no longer a friend of class handler.
    Use public handler::change_table_ptr() to access private members.
    This fixes a subtle bug (no test case in the test suite) when a
    deletion error occurs inside one partition of a partitioned engine. 
    The old code would crash in handler::print_error() in this case.
    
    Implement the newly introduced public ha_* wrappers of the private
    virtual handler methods.

  sql/handler.h@1.277.1.5, 2007-12-20 21:16:51+03:00, kostja@bodhi.(none) +123 -89
    Introduce ha_* wrappers to all class handler methods that may
    modify data. This is necessary to be able to keep track of
    data modifying operations of class handler and optimize read-only
    transactions.

  sql/item_sum.cc@1.229.4.1, 2007-12-20 21:16:52+03:00, kostja@bodhi.(none) +1 -1
    delete_all_rows -> ha_delete_all_rows

  sql/sql_base.cc@1.434, 2007-12-20 21:16:52+03:00, kostja@bodhi.(none) +3 -3
    Use the new public wrappers.

  sql/sql_delete.cc@1.236, 2007-12-20 21:16:52+03:00, kostja@bodhi.(none) +2 -2
    delete_all_rows -> ha_delete_all_rows

  sql/sql_partition.cc@1.125, 2007-12-20 21:16:52+03:00, kostja@bodhi.(none) +9 -9
    Use the new public wrappers.

  sql/sql_select.cc@1.578, 2007-12-20 21:16:52+03:00, kostja@bodhi.(none) +6 -6
    delete_all_rows -> ha_delete_all_rows
    delete_table -> ha_delete_table
    disabe_indexes -> ha_disable_idnexes

  sql/sql_show.cc@1.441.6.2, 2007-12-20 21:16:52+03:00, kostja@bodhi.(none) +1 -1
    delete_all_rows -> ha_delete_all_rows

  sql/sql_table.cc@1.457.2.3, 2007-12-20 21:16:52+03:00, kostja@bodhi.(none) +25 -25
    Use the public wrappers for class handler DDL methods.
    All methods which may change handler data are now accessed via a public
    wrapper.

  sql/sql_union.cc@1.155, 2007-12-20 21:16:52+03:00, kostja@bodhi.(none) +3 -3
    delete_all_rows -> ha_delete_all_rows
    {enable,disable}_indexes -> ha_{enable,disable}_indexes

  sql/sql_update.cc@1.239.1.26, 2007-12-20 21:16:52+03:00, kostja@bodhi.(none) +3 -3
    bulk_update_row -> ha_bulk_update_row

  sql/unireg.cc@1.104.3.2, 2007-12-20 21:16:52+03:00, kostja@bodhi.(none) +2 -2
    create_handler_files -> ha_create_handler_files

ChangeSet@1.1810.3576.1, 2007-12-20 16:07:54+01:00, mats@capulet.kindahl.net +3 -0
  BUG#12691 (Exec_master_log_pos corrupted with SQL_SLAVE_SKIP_COUNTER):
  
  Complementary patch since LOAD DATA INFILE was not covered in
  the previous patch.
  
  This patch adds a check so that the slave skip counter is not
  decreased to zero if seeing a BEGIN_LOAD_QUERY_EVENT,
  APPEND_BLOCK_EVENT, or CREATE_FILE_EVENT since these cannot
  end a group. The group is terminated by an EXECUTE_LOAD_QUERY_
  EVENT or DELETE_FILE_EVENT.

  mysql-test/r/rpl_slave_skip.result@1.1.1.1, 2007-12-20 16:07:51+01:00, mats@capulet.kindahl.net +101 -3
    Result change.

  mysql-test/t/rpl_slave_skip.test@1.1.1.1, 2007-12-20 16:07:51+01:00, mats@capulet.kindahl.net +166 -3
    Adding tests to test that the first event of a LOAD DATA INFILE
    can be skipped safely for both transactional and non-transactional
    tables. Also include a case that will generate a DELETE_FILE event
    last in the group, and this should be properly skipped as well.

  sql/slave.cc@1.241.28.5, 2007-12-20 16:07:52+01:00, mats@capulet.kindahl.net +4 -1
    Not decrementing slave skip counter to zero when seeing a
    BEGIN_LOAD_QUERY_EVENT, APPEND_BLOCK_EVENT, or CREATE_FILE_EVENT
    since these cannot end a group.

ChangeSet@1.2476.781.1, 2007-12-19 20:59:57-02:00, davi@mysql.com +3 -0
  Bug#28317 Left Outer Join with {oj outer-join}
  
  Parser rejects ODBC's escape sequences for outer joins other
  than left outer join, yet the escape sequence BNF specifies
  that this syntax can be used for left, right, and full outer
  join syntax.
  
  The problem is that although the MySQL Connector/ODBC advertises
  "Outer Join Escape Sequence" capabilities, the parsing is done
  in the server and historically it only supported this syntax
  for left outer joins and applications such as Crystal Reports
  11 tries to use this syntax for inner joins.
  
  The chosen solution is to reorganize a couple of parser rules
  to ignore any kind of SQL escape sequence. Ignoring the escape
  sequences is harmless because the various SQL join clauses
  are supported by the server.

  mysql-test/r/parser.result@1.8, 2007-12-19 20:59:56-02:00, davi@mysql.com +20 -0
    Add test case result for Bug#28317

  mysql-test/t/parser.test@1.8, 2007-12-19 20:59:56-02:00, davi@mysql.com +20 -0
    Add test case for Bug#28317

  sql/sql_yacc.yy@1.611.3.1, 2007-12-19 20:59:56-02:00, davi@mysql.com +17 -24
    Reorganize rules in order to ignore SQL Escape Sequences

ChangeSet@1.1810.3574.1, 2007-12-19 21:31:04+01:00, serg@janus.mylan +3 -0
  correct invalid values in SET GLOBAL var=DEFAULT
  bug#33382

  mysql-test/r/variables.result@1.76.1.21, 2007-12-19 21:31:00+01:00, serg@janus.mylan +1 -1
    typo in a test case

  mysql-test/t/variables.test@1.51.1.24, 2007-12-19 21:31:01+01:00, serg@janus.mylan +1 -1
    typo in a test case

  sql/set_var.cc@1.125.44.1, 2007-12-19 21:31:01+01:00, serg@janus.mylan +19 -7
    correct invalid values in SET GLOBAL var=DEFAULT

ChangeSet@1.2476.776.4, 2007-12-19 22:15:02+03:00, kostja@bodhi.(none) +4 -0
  Make handler::{write,delete,update}_row private. It's critical
  that the entire server uses their public ha_* counterparts instead,
  since only then we can ensure proper tracing of these calls that
  is necessary for Bug#12713.
  A pre-requisite for Bug#12713 "Error in a stored function called from 
  a SELECT doesn't cause ROLLBACK of statem"

  sql/ha_partition.cc@1.116, 2007-12-19 22:14:59+03:00, kostja@bodhi.(none) +23 -6
    Use ha_write_row, ha_update_row, ha_delete_row instead of now-private
    write_row, update_row, delete_row. 
    In future ha_* calls will contain more than just a call to the binary
    log, so it's essential they are used consistently everywhere in the server.
    
    Disable the undesired effect of double binary logging of changes
    to partitioned tables with tmp_disable_binlog.

  sql/handler.h@1.277.1.4, 2007-12-19 22:14:59+03:00, kostja@bodhi.(none) +15 -16
    Make write_row, update_row, delete_row private. It's critical
    that the entire code base uses ha_write_row, ha_update_row, ha_delete_row
    instead -- in future, ha_* counterparts will have more common
    functionality than just a call to the binary log.

  sql/sql_select.cc@1.577, 2007-12-19 22:15:00+03:00, kostja@bodhi.(none) +15 -15
    Use ha_write_row, ha_update_row, ha_delete_row instead of
    write_row, update_row, delete_row respectively. 
    The change affects the join execution code that works with an
    intermediate internal temporary table. Do not disable binary logging,
    since it's unnecessary - temporary tables are not replicated
    by row level replication.

  sql/sql_table.cc@1.457.3.1, 2007-12-19 22:15:00+03:00, kostja@bodhi.(none) +1 -1
    Use ha_write_row in copy_data_between_tables - the function
    that writes data from the original table to a temporary copy
    when executing ALTER TABLE. Do not disable binary logging
    since temporary tables are not replicated by row level 
    replication anyway.

ChangeSet@1.2476.775.5, 2007-12-19 18:42:49+01:00, tomas@whalegate.ndb.mysql.com +2 -0
  Bug #33375  	all_set corrupted on table object
  - make sure to reset the read and write sets

  sql/handler.cc@1.330.1.1, 2007-12-19 18:42:46+01:00, tomas@whalegate.ndb.mysql.com +2 -0
    Bug #33375  	all_set corrupted on table object
    - make sure to reset the read and write sets

  sql/log_event.cc@1.277.43.2, 2007-12-19 18:42:46+01:00, tomas@whalegate.ndb.mysql.com +12 -8
    Bug #33375  	all_set corrupted on table object
    - make sure to reset the read and write sets

ChangeSet@1.2476.778.1, 2007-12-19 13:24:43+00:00, jperkin@chorlton.adsl.perkin.org.uk +14 -0
  Add new pkgplugindir handling to seperate plugins from libraries,
  and allow override for binary distributions.  Extend mysql_config
  to print compiled-in plugin location for third-party plugins to
  use.  Resolves bug#31736.

  libmysqld/Makefile.am@1.117.1.1, 2007-12-19 10:26:20+00:00, jperkin@chorlton.adsl.perkin.org.uk +2 -1
    Use pkgplugindir.

  plugin/daemon_example/Makefile.am@1.5, 2007-12-19 10:28:10+00:00, jperkin@chorlton.adsl.perkin.org.uk +3 -2
    Use pkgplugindir.

  plugin/fulltext/Makefile.am@1.11, 2007-12-19 10:29:28+00:00, jperkin@chorlton.adsl.perkin.org.uk +3 -3
    Use pkgplugindir.

  scripts/Makefile.am@1.78, 2007-12-19 10:30:32+00:00, jperkin@chorlton.adsl.perkin.org.uk +3 -0
    Add pkgplugindir.

  scripts/make_binary_distribution.sh@1.162.2.1, 2007-12-19 10:32:14+00:00, jperkin@chorlton.adsl.perkin.org.uk +3 -0
    Add pkgplugindir.

  scripts/mysql_config.sh@1.31, 2007-12-19 10:34:00+00:00, jperkin@chorlton.adsl.perkin.org.uk +4 -0
    Add pkgplugindir.

  sql/Makefile.am@1.194, 2007-12-19 10:34:56+00:00, jperkin@chorlton.adsl.perkin.org.uk +2 -1
    Use pkgplugindir.

  sql/mysqld.cc@1.682.13.1, 2007-12-19 10:35:30+00:00, jperkin@chorlton.adsl.perkin.org.uk +1 -1
    Use PLUGINDIR, derived from pkgplugindir, instead of
    LIBDIR for plugins.

  sql/unireg.h@1.57.1.1, 2007-12-19 10:36:46+00:00, jperkin@chorlton.adsl.perkin.org.uk +2 -2
    Use PLUGINDIR instead of LIBDIR, and define to be the
    default setting of pkgplugindir.

  storage/archive/Makefile.am@1.12, 2007-12-19 11:03:03+00:00, jperkin@chorlton.adsl.perkin.org.uk +3 -2
    Use pkgplugindir.

  storage/blackhole/Makefile.am@1.8, 2007-12-19 11:05:09+00:00, jperkin@chorlton.adsl.perkin.org.uk +3 -2
    Use pkgplugindir.

  storage/example/Makefile.am@1.14, 2007-12-19 11:07:59+00:00, jperkin@chorlton.adsl.perkin.org.uk +3 -2
    Use pkgplugindir.

  storage/federated/Makefile.am@1.5, 2007-12-19 11:09:33+00:00, jperkin@chorlton.adsl.perkin.org.uk +3 -2
    Use pkgplugindir.

  storage/innobase/Makefile.am@1.31, 2007-12-19 10:56:29+00:00, jperkin@chorlton.adsl.perkin.org.uk +2 -1
    Use pkgplugindir.

ChangeSet@1.2476.748.14, 2007-12-19 14:16:10+01:00, serg@janus.mylan +1 -0
  SHOW_VAR arrays are null-terminated :-[]

  sql/mysqld.cc@1.682.2.13, 2007-12-19 14:16:07+01:00, serg@janus.mylan +5 -3
    SHOW_VAR arrays are null-terminated :-[]

ChangeSet@1.1810.3572.1, 2007-12-19 12:58:56+01:00, msvensson@pilot.mysql.com +2 -0
  Improve error message when file fails to open

  client/mysqltest.c@1.155.40.1, 2007-12-19 12:58:54+01:00, msvensson@pilot.mysql.com +4 -4
    Improve error message when file fails to open

  mysql-test/r/mysqltest.result@1.24.12.1, 2007-12-19 12:58:54+01:00, msvensson@pilot.mysql.com +2 -2
    Improve error message when file fails to open

ChangeSet@1.2476.739.2, 2007-12-19 10:13:13+02:00, bell@desktop.sanja.is.com.ua +1 -0
  Mutex protection added for loading plugins. (BUG#33345)

  sql/sql_plugin.cc@1.75.4.1, 2007-12-19 10:13:11+02:00, bell@desktop.sanja.is.com.ua +3 -0
    Mutex protection added for loading plugins.

ChangeSet@1.2476.748.13, 2007-12-19 01:27:15+01:00, serg@janus.mylan +2 -0
  Followup for bug#30252.
  Ensure that all SQLCOM_ constants have corresponding Com_ variables.

  mysql-test/r/status.result@1.25, 2007-12-19 01:27:12+01:00, serg@janus.mylan +5 -3
    Tests updated.

  sql/mysqld.cc@1.682.2.12, 2007-12-19 01:27:12+01:00, serg@janus.mylan +177 -146
    Followup for bug#30252.
    Rename few variables to match SQL syntax.
    Ensure that all SQLCOM_ constants have corresponding Com_ variables.

ChangeSet@1.2476.776.3, 2007-12-19 00:36:20+03:00, kostja@bodhi.(none) +1 -0
  Sort class handler public declarations. 

  sql/handler.h@1.277.1.3, 2007-12-19 00:36:18+03:00, kostja@bodhi.(none) +115 -126
    Collect ha_* wrappers and their virtual counterparts into two
    symmetrical groups. Previously they were scattered all over class
    handler declaration. That should ease maintenance and addition
    of new ha_ wrappers.
    When a new ha_* wrapper is added, it should be added to the
    end of the ha_* group. Its virtual counterpart should become private
    and be moved to the end of the hander class. 

ChangeSet@1.2476.729.8, 2007-12-18 16:10:58+03:00, skozlov@mysql.com +1 -0
  WL#4077. Added new value 'ENABLED' for 'support' column of information_schema.engines

  mysql-test/include/have_multi_ndb.inc@1.7.1.1, 2007-12-18 16:10:50+03:00, skozlov@mysql.com +2 -2
    added new value 'ENABLED' for support column of information_schema.engines

ChangeSet@1.2476.776.1, 2007-12-18 15:47:22+03:00, kostja@vajra.(none) +1 -0
  Consistently use doxygen comments in class handler.

  sql/handler.h@1.277.1.2, 2007-12-18 15:47:19+03:00, kostja@vajra.(none) +92 -114
    Consistently use doxygen comments in class handler.

ChangeSet@1.2476.770.2, 2007-12-18 13:40:35+01:00, knielsen@ymer.(none) +5 -0
  Bug #33061: ORDER BY DESC becomes ASC in NDB partition pruning to one partition
  
  When partition pruning resulted in an ordered index scan spanning only
  one partition, any descending flag for the scan was wrongly discarded,
  turning ORDER BY DESC into ORDER BY ASC, and similar problems.
  
  Fixed by correctly passing descending flag in SCAN_TABREQ signal sent
  to data nodes.

  mysql-test/suite/ndb/r/ndb_partition_key.result@1.9, 2007-12-18 13:40:26+01:00, knielsen@ymer.(none) +17 -0
    Test case.

  mysql-test/suite/ndb/r/ndb_partition_range.result@1.7, 2007-12-18 13:40:26+01:00, knielsen@ymer.(none) +8 -0
    Test case.

  mysql-test/suite/ndb/t/ndb_partition_key.test@1.8, 2007-12-18 13:40:26+01:00, knielsen@ymer.(none) +4 -0
    Test case.

  mysql-test/suite/ndb/t/ndb_partition_range.test@1.7, 2007-12-18 13:40:27+01:00, knielsen@ymer.(none) +5 -0
    Test case.

  storage/ndb/src/ndbapi/NdbScanOperation.cpp@1.121, 2007-12-18 13:40:27+01:00, knielsen@ymer.(none) +27 -15
    Even if ordered scan not requested (no need to merge-sorts scans of
    each partition), we still need to honor the descending flag.

ChangeSet@1.1810.3571.1, 2007-12-18 12:29:50+01:00, istruewing@stella.local +3 -0
  Bug#32705 - myisam corruption: Key in wrong position
              at page 1024 with ucs2_bin
  
  Inserting strings with a common prefix into a table with
  characterset UCS2 corrupted the table.
  
  An efficient search method was used, which compares end space
  with ASCII blank. This doesn't work for character sets like UCS2,
  which do not encode blank like ASCII does.
  
  Use the less efficient search method _mi_seq_search()
  for charsets with mbminlen > 1.

  mysql-test/r/myisam.result@1.71.16.1, 2007-12-18 12:29:47+01:00, istruewing@stella.local +10 -0
    Bug#32705 - myisam corruption: Key in wrong position
                at page 1024 with ucs2_bin
    Added test result.

  mysql-test/t/myisam.test@1.55.15.1, 2007-12-18 12:29:47+01:00, istruewing@stella.local +13 -0
    Bug#32705 - myisam corruption: Key in wrong position
                at page 1024 with ucs2_bin
    Added test.

  myisam/mi_open.c@1.90.32.1, 2007-12-18 12:29:47+01:00, istruewing@stella.local +10 -1
    Bug#32705 - myisam corruption: Key in wrong position
                at page 1024 with ucs2_bin
    Use _mi_seq_search() for charsets with mbminlen > 1.

ChangeSet@1.2476.775.3, 2007-12-18 11:54:19+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  search for clone several step in the path name

  mysql-test/mysql-test-run.pl@1.340.3.1, 2007-12-18 11:54:16+01:00, tomas@whalegate.ndb.mysql.com +11 -4
    search for clone several step in the path name

ChangeSet@1.1810.3485.7, 2007-12-18 15:43:51+08:00, hezx@hezx.(none) +3 -0
  Fixed some test case for BUG#32205

  mysql-test/r/mysqlbinlog2.result@1.10.1.2, 2007-12-18 15:43:48+08:00, hezx@hezx.(none) +226 -113
    Update result for BUG#32205

  mysql-test/r/binlog_start_comment.result@1.2, 2007-12-18 15:43:48+08:00, hezx@hezx.(none) +1 -0
    update result

  mysql-test/t/binlog_start_comment.test@1.2, 2007-12-18 15:43:48+08:00, hezx@hezx.(none) +7 -1
    Reset master at the start of test, use a file instead of a pipe, do clean up

ChangeSet@1.2497, 2007-12-17 08:51:29-05:00, cmiller@zippy.cornsilk.net +3 -0
  Order results to be deterministic.
  
  Follow SergG's lead with mysqlcheck result.

  mysql-test/r/mysqlcheck.result@1.17, 2007-12-17 08:51:26-05:00, cmiller@zippy.cornsilk.net +2 -1
    Error changed lately.  This may not be a bug, despite Bug#29458.
    
    See SergG [22 Nov 11:45] comment for Bug#25347.

  mysql-test/suite/rpl/r/rpl_invoked_features.result@1.5.1.1, 2007-12-17 08:51:26-05:00, cmiller@zippy.cornsilk.net +12 -12
    Order so it is deterministic.

  mysql-test/suite/rpl/t/rpl_invoked_features.test@1.7.1.1, 2007-12-17 08:51:26-05:00, cmiller@zippy.cornsilk.net +8 -8
    Order so it is deterministic.

ChangeSet@1.2476.774.1, 2007-12-17 21:13:25+08:00, hezx@hezx.(none) +11 -0
  BUG#32205 Replaying statements from mysqlbinlog fails with a syntax error, replicates
  fine
  
  The reason of this bug is that when mysqlbinlog dumps a query, the query is written to
  output with a delimeter appended right after it, if the query string ends with a '--'
  comment, then the delimeter would be considered as part of the comment, if there are any
  statements after this query, then it will cause a syntax error.
  
  Start a newline before appending delimiter after a query string

  mysql-test/suite/binlog/r/binlog_start_comment.result@1.1, 2007-12-17 21:13:21+08:00, hezx@hezx.(none) +15 -0
    Add test for BUG#32205

  mysql-test/suite/binlog/r/binlog_start_comment.result@1.0, 2007-12-17 21:13:21+08:00, hezx@hezx.(none) +0 -0

  mysql-test/suite/binlog/t/binlog_start_comment.test@1.1, 2007-12-17 21:13:21+08:00, hezx@hezx.(none) +22 -0
    Add test for BUG#32205

  mysql-test/suite/binlog/t/binlog_start_comment.test@1.0, 2007-12-17 21:13:21+08:00, hezx@hezx.(none) +0 -0

  mysql-test/r/mysqlbinlog.result@1.42, 2007-12-17 21:13:20+08:00, hezx@hezx.(none) +72 -36
    Update result for BUG#32205

  mysql-test/r/mysqlbinlog2.result@1.15.1.1, 2007-12-17 21:13:20+08:00, hezx@hezx.(none) +226 -113
    Update result for BUG#32205

  mysql-test/r/user_var-binlog.result@1.13, 2007-12-17 21:13:20+08:00, hezx@hezx.(none) +4 -2
    Update result for BUG#32205

  mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result@1.17, 2007-12-17 21:13:20+08:00, hezx@hezx.(none) +2 -1
    Update result for BUG#32205

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.51.1.1, 2007-12-17 21:13:20+08:00, hezx@hezx.(none) +2 -2
    Update result for BUG#32205

  mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test@1.17, 2007-12-17 21:13:20+08:00, hezx@hezx.(none) +1 -1
    fix test for BUG#32205

  mysql-test/suite/rpl/r/rpl_stm_charset.result@1.30, 2007-12-17 21:13:20+08:00, hezx@hezx.(none) +46 -23
    Update result for BUG#32205

  mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result@1.6.1.1, 2007-12-17 21:13:20+08:00, hezx@hezx.(none) +20 -10
    Update result for BUG#32205

  sql/log_event.cc@1.277.45.1, 2007-12-17 21:13:20+08:00, hezx@hezx.(none) +3 -3
    Start a newline before appending delimiter after a query string

ChangeSet@1.1810.3485.6, 2007-12-15 19:50:23+08:00, hezx@hezx.(none) +10 -0
  BUG#32205 Replaying statements from mysqlbinlog fails with a syntax error, replicates fine
  
  The reason of this bug is that when mysqlbinlog dumps a query, the query is written to
  output with a delimeter appended right after it, if the query string ends with a '--'
  comment, then the delimeter would be considered as part of the comment, if there are any
  statements after this query, then it will cause a syntax error.
  
  Start a newline before appending delimiter after a query string

  mysql-test/r/ctype_ucs_binlog.result@1.4.4.1, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +2 -1
    Update test result for BUG#32205

  mysql-test/t/mix_innodb_myisam_binlog.test@1.20.16.1, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +1 -1
    Fixed for BUG#32205

  mysql-test/r/mysqlbinlog.result@1.25.1.13, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +72 -36
    Update test result for BUG#32205

  mysql-test/r/user_var-binlog.result@1.5.1.3, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +4 -2
    Update test result for BUG#32205

  mysql-test/r/binlog_start_comment.result@1.1, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +13 -0
    Add test for BUG#32205

  mysql-test/r/binlog_start_comment.result@1.0, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +0 -0

  mysql-test/r/mix_innodb_myisam_binlog.result@1.24.13.1, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +2 -2
    Update test result for BUG#32205

  mysql-test/t/binlog_start_comment.test@1.1, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +16 -0
    Add test for BUG#32205

  mysql-test/t/binlog_start_comment.test@1.0, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +0 -0

  mysql-test/r/rpl_charset.result@1.20.4.1, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +46 -23
    Update test result for BUG#32205

  mysql-test/r/rpl_timezone.result@1.12.3.1, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +12 -6
    Update test result for BUG#32205

  sql/log_event.cc@1.174.27.7, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +3 -3
    Start a newline before appending delimiter after a query string

ChangeSet@1.2476.769.1, 2007-12-14 18:27:40-05:00, dkatz@damien-katzs-computer.local +3 -0
  Bug #30252	Com_create_function is not incremented.
  
  Added Com_create_spfunction and all other commands previously missing to the global status variables.

  mysql-test/r/status.result@1.24, 2007-12-14 18:27:25-05:00, dkatz@damien-katzs-computer.local +19 -0
    Bug #30252	Com_create_function is not incremented.
    
    Added Com_create_spfunction and all other commands previously missing to the global status variables.

  mysql-test/t/status.test@1.32, 2007-12-14 18:27:25-05:00, dkatz@damien-katzs-computer.local +19 -0
    Bug #30252	Com_create_function is not incremented.
    
    Added Com_create_spfunction and all other commands previously missing to the global status variables.

  sql/mysqld.cc@1.682.12.1, 2007-12-14 18:27:25-05:00, dkatz@damien-katzs-computer.local +32 -0
    Bug #30252	Com_create_function is not incremented.
    
    Added Com_create_spfunction and all other commands previously missing to the global status variables.

ChangeSet@1.2496, 2007-12-14 14:52:33-05:00, cmiller@zippy.cornsilk.net +1 -0
  Recorded silly ephemeral test.

  mysql-test/r/information_schema.result@1.160, 2007-12-14 14:52:31-05:00, cmiller@zippy.cornsilk.net +1 -1
    Recorded silly ephemeral test.

ChangeSet@1.2476.768.1, 2007-12-14 19:02:02+01:00, sven@riska.(none) +17 -0
  BUG#32407: Impossible to do point-in-time recovery from older binlog
  
  Problem: it is unsafe to read base64-printed events without first
  reading the Format_description_log_event (FD).  Currently, mysqlbinlog
  cannot print the FD.
  
  As a side effect, another bug has also been fixed: When mysqlbinlog
  --start-position=X was specified, no ROLLBACK was printed. I changed
  this, so that ROLLBACK is always printed.
  
  This patch does several things:
  
   - Format_description_log_event (FD) now print themselves in base64
     format.
  
   - mysqlbinlog is now able to print FD events.  It has three modes:
      --base64-output=auto    Print row events in base64 output, and print
                              FD event.  The FD event is printed even if
                              it is outside the range specified with
                              --start-position, because it would not be
                              safe to read row events otherwise. This is
                              the default.
  
      --base64-output=always  Like --base64-output=auto, but also print
                              base64 output for query events.  This is
                              like the old --base64-output flag, which
                              is also a shorthand for
                              --base64-output=always
  
      --base64-output=never   Never print base64 output, generate error if
                              row events occur in binlog.  This is
                              useful to suppress the FD event in binlogs
                              known not to contain row events (e.g.,
                              because BINLOG statement is unsafe,
                              requires root privileges, is not SQL, etc)
  
   - the BINLOG statement now handles FD events correctly, by setting
     the thread's rli's relay log's description_event_for_exec to the
     loaded event.
  
     In fact, executing a BINLOG statement is almost the same as reading
     an event from a relay log.  Before my patch, the code for this was
     separated (exec_relay_log_event in slave.cc executes events from
     the relay log, mysql_client_binlog_statement in sql_binlog.cc
     executes BINLOG statements).  I needed to augment
     mysql_client_binlog_statement to do parts of what
     exec_relay_log_event does.  Hence, I did a small refactoring and
     moved parts of exec_relay_log_event to a new function, which I
     named apply_event_and_update_pos.  apply_event_and_update_pos is
     called both from exec_relay_log_event and from
     mysql_client_binlog_statement.
  
   - When a non-FD event is executed in a BINLOG statement, without
     previously executing a FD event in a BINLOG statement, it generates
     an error, because that's unsafe.  I took a new error code for that:
     ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENTS.
  
     In order to get a decent error message containing the name of the
     event, I added the class method char*
     Log_event::get_type_str(Log_event_type type), which returns a
     string name for the given Log_event_type.  This is just like the
     existing char* Log_event::get_type_str(), except it is a class
     method that takes the log event type as parameter.
  
     I also added PRE_GA_*_ROWS_LOG_EVENT to Log_event::get_type_str(),
     so that names of old rows event are properly printed.
  
   - When reading an event, I added a check that the event type is known
     by the current Format_description_log_event. Without this, it may
     crash on bad input (and I was struck by this several times).
  
   - I patched the following test cases, which all contain BINLOG
     statements for row events which must be preceded by BINLOG
     statements for FD events:
      - rpl_bug31076
  
  While I was here, I fixed some small things in log_event.cc:
  
   - replaced hard-coded 4 by EVENT_TYPE_OFFSET in 3 places
  
   - replaced return by DBUG_VOID_RETURN in one place
  
   - The name of the logfile can be '-' to indicate stdin.  Before my
     patch, the code just checked if the first character is '-'; now it
     does a full strcmp().  Probably, all arguments that begin with a -
     are already handled somewhere else as flags, but I still think it
     is better that the code reflects what it is supposed to do, with as
     little dependencies as possible on other parts of the code.  If we
     one day implement that all command line arguments after -- are
     files (as most unix tools do), then we need this.
  
  I also fixed the following in slave.cc:
  
   - next_event() was declared twice, and queue_event was not static but
     should be static (not used outside the file).

  client/client_priv.h@1.78, 2007-12-14 19:01:58+01:00, sven@riska.(none) +1 -1
    Declared the new option for base64 output.

  client/mysqlbinlog.cc@1.163, 2007-12-14 19:01:58+01:00, sven@riska.(none) +116 -22
     - Change from using the two-state command line option
      "default/--base64-output" to the three-state
      "--base64-output=[never|auto|always]"
     - Print the FD event even if it is outside the --start-position range.
     - Stop if a row event is about to be printed without a preceding FD
       event.
     - Minor fixes:
        * changed 4 to EVENT_TYPE_OFFSET in some places
        * Added comments
        * before, "mysqlbinlog -xyz" read from stdin; now it does not
          (only "mysqlbinlog -" reads stdin).

  mysql-test/r/mysqlbinlog2.result@1.16, 2007-12-14 19:01:59+01:00, sven@riska.(none) +3 -0
    Updated result file: mysqlbinlog now prints ROLLBACK always.

  mysql-test/suite/binlog/r/binlog_base64_flag.result@1.1, 2007-12-14 19:01:59+01:00, sven@riska.(none) +60 -0
    New test file needs new result file

  mysql-test/suite/binlog/r/binlog_base64_flag.result@1.0, 2007-12-14 19:01:59+01:00, sven@riska.(none) +0 -0

  mysql-test/suite/binlog/std_data/binlog-bug32407.000001@1.1, 2007-12-14 19:02:00+01:00, sven@riska.(none) +10 -0
    BitKeeper file /home/sven/bk/b32407-5.1-new-rpl-mysqlbinlog_base64/mysql-test/suite/binlog/std_data/binlog-bug32407.000001

  mysql-test/suite/binlog/std_data/binlog-bug32407.000001@1.0, 2007-12-14 19:02:00+01:00, sven@riska.(none) +0 -0

  mysql-test/suite/binlog/t/binlog_base64_flag.test@1.1, 2007-12-14 19:01:59+01:00, sven@riska.(none) +102 -0
    Added test case to verify that:
     - my patch fixes the bug
     - the new --base64-output flag works as expected
     - base64 events not preceded by an FD event give an error
     - an event of a type not known by the current FD event fails cleanly.

  mysql-test/suite/binlog/t/binlog_base64_flag.test@1.0, 2007-12-14 19:01:59+01:00, sven@riska.(none) +0 -0

  mysql-test/suite/binlog/t/disabled.def@1.3.1.1, 2007-12-14 19:01:59+01:00, sven@riska.(none) +1 -0
    The test must be disabled since it reveals another bug: see BUG#33247.

  mysql-test/suite/rpl/r/rpl_bug31076.result@1.5, 2007-12-14 19:01:59+01:00, sven@riska.(none) +4 -0
    Updated result file

  mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result@1.7, 2007-12-14 19:01:59+01:00, sven@riska.(none) +2 -0
    Updated result file

  mysql-test/suite/rpl/t/rpl_bug31076.test@1.5, 2007-12-14 19:01:59+01:00, sven@riska.(none) +18 -0
    Had to add explicit Format_description_log_event before other BINLOG
    statements

  mysql-test/t/mysqlbinlog2.test@1.19, 2007-12-14 19:01:59+01:00, sven@riska.(none) +1 -1
    we must suppress base64 output in result file because it contains a
    timestamp

  sql/log_event.cc@1.277.1.39, 2007-12-14 19:01:59+01:00, sven@riska.(none) +117 -87
     - Made FD events able to print themselves
     - Added check that the current FD event knows about the event type, when
       an event is about to be read. (Hint to reviewers: I had to re-indent
       a big block because of this; use diff -b)
        * To get a decent error message, I also added a class method
          const char* Log_event::get_type_str(Log_event_type)
          which converts number to event type string without having a
          Log_event object.
        * Made Log_event::get_type_str aware of PRE_GA_*_ROWS_LOG_EVENT.
     - Minor fixes:
        * Changed return to DBUG_VOID_RETURN

  sql/log_event.h@1.168, 2007-12-14 19:01:59+01:00, sven@riska.(none) +26 -3
     - Declared enum to describe the three base64_output modes
     - Use the enum instead of a flag
     - Declare the new class method get_type_str (see log_event.cc)

  sql/share/errmsg.txt@1.172, 2007-12-14 19:01:59+01:00, sven@riska.(none) +3 -0
    Added error msg.

  sql/slave.cc@1.326.1.1, 2007-12-14 19:01:59+01:00, sven@riska.(none) +198 -108
     - Factored out part of exec_relay_log_event to the new function
       apply_event_and_update_pos, because that code is needed when executing
       BINLOG statements. (this is be functionally equivalent to the
       previous code, except: (1) skipping events is now optional, controlled
       by a parameter to the new function (2) the return value of
       exec_relay_log_event has changed; see next item).
     - Changed returned error value to always be 1. Before, it would return
       the error value from apply_log_event, which was unnecessary. This
       change is safe because the exact return value of exec_relay_log_event
       is never examined; it is only tested to be ==0 or !=0.
     - Added comments describing exec_relay_log_event and
       apply_event_and_update_pos.
     - Minor fixes:
        * Removed duplicate declaration of next_event, made queue_event
          static.
        * Added doxygen code to include this file.

  sql/slave.h@1.113, 2007-12-14 19:01:59+01:00, sven@riska.(none) +2 -0
    Declared the new apply_event_and_update_pos

  sql/sql_binlog.cc@1.15.1.1, 2007-12-14 19:01:59+01:00, sven@riska.(none) +57 -17
     - Made mysql_binlog_statement set the current FD event when the given
       event is an FD event. This entails using the new function
       apply_event_and_update_pos from slave.cc instead of just calling the
       ev->apply method.
     - Made mysql_binlog_statement fail if the first BINLOG statement is not
       an FD event.

ChangeSet@1.2476.732.8, 2007-12-14 20:11:49+04:00, bar@mysql.com +1 -0
  NDB didn't like utf-8 in the last change  for some reasons
  Changing charset to latin1.

  sql/ha_ndbcluster_binlog.cc@1.133.4.2, 2007-12-14 20:11:47+04:00, bar@mysql.com +2 -2
    NDB didn't like utf-8 in the last change  for some reasons
    Changing charset to latin1.

ChangeSet@1.2494, 2007-12-14 09:39:57-05:00, cmiller@zippy.cornsilk.net +1 -0
  Add profiling support for embedded server.

  libmysqld/lib_sql.cc@1.141.3.1, 2007-12-14 09:39:53-05:00, cmiller@zippy.cornsilk.net +7 -0
    Start and finish profiling for a query in an embedded server.

ChangeSet@1.2493, 2007-12-14 08:57:37-05:00, cmiller@zippy.cornsilk.net +3 -0
  Correct complaints of reviewers and clean up test.

  mysql-test/r/profiling.result@1.10, 2007-12-14 08:57:32-05:00, cmiller@zippy.cornsilk.net +21 -80
    Remove unnecessary verbosity.
    
    Remove section of test that is impossible to test with PS protocol.

  mysql-test/t/profiling.test@1.9, 2007-12-14 08:57:32-05:00, cmiller@zippy.cornsilk.net +28 -9
    Remove unnecessary verbosity.
    
    Remove section of test that is impossible to test with PS protocol.

  sql/sql_profile.h@1.11, 2007-12-14 08:57:32-05:00, cmiller@zippy.cornsilk.net +10 -10
    Make bit flags unsigned ints.

ChangeSet@1.2476.729.4, 2007-12-14 14:40:45+01:00, sven@riska.(none) +21 -0
  BUG#26395: if crash during autocommit update to transactional table on master, slave fails
  Now, every transaction (including autocommit transactions) starts with
  a BEGIN and ends with a COMMIT/ROLLBACK in the binlog.
  Added a test case, and updated lots of test case result files.

  mysql-test/suite/rpl/r/rpl_row_charset_innodb.result@1.2, 2007-12-14 14:40:43+01:00, sven@riska.(none) +12 -0
    Updated result file

  mysql-test/r/multi_update.result@1.53, 2007-12-14 14:40:43+01:00, sven@riska.(none) +2 -2
    Updated result file

  mysql-test/r/sp_trans_log.result@1.3, 2007-12-14 14:40:43+01:00, sven@riska.(none) +1 -0
    Updated result file

  mysql-test/suite/binlog/r/binlog_innodb.result@1.7, 2007-12-14 14:40:43+01:00, sven@riska.(none) +1 -0
    Updated result file

  mysql-test/suite/binlog/r/binlog_multi_engine.result@1.12, 2007-12-14 14:40:43+01:00, sven@riska.(none) +8 -0
    Updated result file

  mysql-test/suite/binlog/r/binlog_stm_blackhole.result@1.21.1.1, 2007-12-14 14:40:43+01:00, sven@riska.(none) +16 -0
    Updated result file

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.52, 2007-12-14 14:40:43+01:00, sven@riska.(none) +15 -0
    Updated result file

  mysql-test/suite/ndb/r/ndb_binlog_format.result@1.3, 2007-12-14 14:40:43+01:00, sven@riska.(none) +4 -0
    Updated result file

  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result@1.9, 2007-12-14 14:40:43+01:00, sven@riska.(none) +71 -0
    Updated result file

  mysql-test/suite/rpl/r/rpl_row_create_table.result@1.20, 2007-12-14 14:40:43+01:00, sven@riska.(none) +20 -19
    Updated result file

  mysql-test/suite/rpl/r/rpl_row_log_innodb.result@1.25, 2007-12-14 14:40:43+01:00, sven@riska.(none) +16 -8
    Updated result file

  mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result@1.26, 2007-12-14 14:40:43+01:00, sven@riska.(none) +12 -0
    Updated result file

  mysql-test/suite/rpl/r/rpl_truncate_3innodb.result@1.9, 2007-12-14 14:40:43+01:00, sven@riska.(none) +12 -0
    Updated result file

  mysql-test/suite/rpl/t/rpl_row_create_table.test@1.17, 2007-12-14 14:40:43+01:00, sven@riska.(none) +4 -4
    Updated result file

  mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result@1.7, 2007-12-14 14:40:43+01:00, sven@riska.(none) +2 -2
    Updated result file

  mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result@1.1, 2007-12-14 14:40:44+01:00, sven@riska.(none) +140 -0
    Results for new test case

  mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result@1.0, 2007-12-14 14:40:44+01:00, sven@riska.(none) +0 -0

  mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction-master.opt@1.1, 2007-12-14 14:40:44+01:00, sven@riska.(none) +1 -0
    Options for new test case

  mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction-master.opt@1.0, 2007-12-14 14:40:44+01:00, sven@riska.(none) +0 -0

  mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction-slave.opt@1.1, 2007-12-14 14:40:44+01:00, sven@riska.(none) +1 -0
    Options for new test case

  mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction-slave.opt@1.0, 2007-12-14 14:40:44+01:00, sven@riska.(none) +0 -0

  mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test@1.1, 2007-12-14 14:40:44+01:00, sven@riska.(none) +122 -0
    Added new test case.

  mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test@1.0, 2007-12-14 14:40:44+01:00, sven@riska.(none) +0 -0

  sql/log.cc@1.302.2.1, 2007-12-14 14:40:44+01:00, sven@riska.(none) +81 -29
     - Always write BEGIN and COMMIT around statements, even in autocommit
       mode.
     - Added comments for binlog_commit and binlog_rollback.

  sql/log_event.cc@1.277.1.38, 2007-12-14 14:40:44+01:00, sven@riska.(none) +1 -0
    Added debug trigger to avoid writing xid events to the binlog.

ChangeSet@1.2476.766.1, 2007-12-14 15:21:37+02:00, gkodinov@macbook.gmz +5 -0
  Bug #31326: No compile check of order of initializations
   fixed -Wreorder warnings

  BUILD/SETUP.sh@1.78, 2007-12-14 15:21:33+02:00, gkodinov@macbook.gmz +4 -2
    Bug #31326: enabled the -Wreorder warnings

  sql/rpl_mi.cc@1.7, 2007-12-14 15:21:33+02:00, gkodinov@macbook.gmz +2 -2
    Bug #31326: fixed -Wreorder warnings

  storage/heap/ha_heap.cc@1.121, 2007-12-14 15:21:34+02:00, gkodinov@macbook.gmz +2 -2
    Bug #31326: fixed -Wreorder warnings

  storage/ndb/src/kernel/blocks/backup/Backup.hpp@1.29, 2007-12-14 15:21:34+02:00, gkodinov@macbook.gmz +2 -1
    Bug #31326: fixed -Wreorder warnings

  storage/ndb/src/kernel/blocks/pgman.cpp@1.31, 2007-12-14 15:21:34+02:00, gkodinov@macbook.gmz +2 -2
    Bug #31326: fixed -Wreorder warnings

ChangeSet@1.2476.764.1, 2007-12-14 17:05:27+04:00, svoj@mysql.com +1 -0
  BUG#22708 - Error message doesn't refer to storage engine unsupported
  
  When openning a table with unsupported (disabled or not compiled)
  storage engine, confusing error message is returned.
  
  Return better error message when we're attempting to open a table
  that uses unsupported engine.

  sql/table.cc@1.307.11.1, 2007-12-14 17:05:25+04:00, svoj@mysql.com +24 -17
    Return better error message when we're attempting to open a table
    that uses unsupported engine.

ChangeSet@1.1810.3562.2, 2007-12-14 13:43:48+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #33237 NDB_MGM 'eat' 99% cpu utilization

  ndb/src/mgmclient/CommandInterpreter.cpp@1.49.46.1, 2007-12-14 13:43:46+01:00, tomas@whalegate.ndb.mysql.com +11 -6
    Bug #33237 NDB_MGM 'eat' 99% cpu utilization

ChangeSet@1.2476.753.3, 2007-12-13 09:32:23+01:00, aelkin@dl145j.mysql.com +1 -0
  bug#31552 fixing a compilation issue in the debugless build.

  sql/log_event.cc@1.277.42.3, 2007-12-13 09:31:23+01:00, aelkin@dl145j.mysql.com +1 -1
    relaxing compilation condition as HA_ERR is started to be used for error
    reporting.

ChangeSet@1.2476.732.4, 2007-12-13 10:40:39+08:00, hezx@hezx.(none) +1 -0
  fix manual merge

  sql/sql_view.cc@1.155.1.4, 2007-12-13 10:40:31+08:00, hezx@hezx.(none) +0 -2
    fix manual merge

ChangeSet@1.2476.753.2, 2007-12-12 20:12:29+01:00, aelkin@dl145j.mysql.com +8 -0
  bug#31552 manual merge and post-make-test-run changes.

  mysql-test/extra/rpl_tests/rpl_row_basic.test@1.10, 2007-12-12 20:10:38+01:00, aelkin@dl145j.mysql.com +5 -0
    changes due to the strict mode gets default. This hunk is being added after merging
    with changes from another bug fixes.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result@1.15, 2007-12-12 20:10:39+01:00, aelkin@dl145j.mysql.com +0 -1
    results changed. They are being committed only now since there was another
    bug which fixes my working clone did not have.

  mysql-test/suite/rpl/r/rpl_ignore_table.result@1.8, 2007-12-12 20:10:38+01:00, aelkin@dl145j.mysql.com +2 -0
    results changed

  mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result@1.7, 2007-12-12 20:10:39+01:00, aelkin@dl145j.mysql.com +2 -0
    results changed

  mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result@1.7, 2007-12-12 20:10:39+01:00, aelkin@dl145j.mysql.com +2 -0
    results changed

  mysql-test/suite/rpl/t/rpl_ignore_table.test@1.9, 2007-12-12 20:10:39+01:00, aelkin@dl145j.mysql.com +11 -0
    two queries on mysql db tables are replicated according to binlog_format, ie
    in row-based when that is requested. Due to cancelling the idempotent default
    row based events that previously exectuted successfully now stop the slave sql
    thread.
    We have to explicitly request the idempotent slave execution mode.

  mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result@1.6.1.2, 2007-12-12 20:10:39+01:00, aelkin@dl145j.mysql.com +3 -1
    results changed

  sql/log_event.cc@1.277.42.2, 2007-12-12 20:10:39+01:00, aelkin@dl145j.mysql.com +0 -1
    typo in manual merge earlier

ChangeSet@1.2476.750.3, 2007-12-12 17:16:59+04:00, svoj@mysql.com +1 -0
  BUG#26978 - s->z_err not assigned a value?
  
  azio didn't handle situation when my_read() returns error.
  
  Added handling of situation when my_read() returns error.
  
  No test case for this fix.

  storage/archive/azio.c@1.24, 2007-12-12 17:16:57+04:00, svoj@mysql.com +8 -2
    Added handling of situation when my_read() returns error.

ChangeSet@1.2476.752.1, 2007-12-12 12:14:59+02:00, aelkin@koti.dsl.inet.fi +30 -0
  Bug#31552 Replication breaks when deleting rows from out-of-sync table
      without PK
  Bug#31609 Not all RBR slave errors reported as errors
  bug#32468 delete rows event on a table with foreign key constraint fails
  
  The first two bugs comprise idempotency issues.
  First, there was no error code reported under conditions of the bug
  description although the slave sql thread halted.
  Second, executions were different with and without presence of prim key in
  the table.
  Third, there was no way to instruct the slave whether to ignore an error
  and skip to the following event or to halt.
  Fourth, there are handler errors which might happen due to idempotent
  applying of binlog but those were not listed among the "idempotent" error
  list.
  
  All the named issues are addressed.
  Wrt to the 3rd, there is the new global system variable, changeble at run
  time, which controls the slave sql thread behaviour.
  The new variable allows further extensions to mimic the sql_mode
  session/global variable.
  To address the 4th, the new bug#32468 had to be fixed as it was staying
  in the way.

  include/my_bitmap.h@1.27, 2007-12-12 12:14:48+02:00, aelkin@koti.dsl.inet.fi +16 -0
    basic operations with bits of an integer type are added.

  mysql-test/extra/rpl_tests/rpl_foreign_key.test@1.8, 2007-12-12 12:14:49+02:00, aelkin@koti.dsl.inet.fi +31 -0
    regression test for bug#32468

  mysql-test/extra/rpl_tests/rpl_row_basic.test@1.7.1.1, 2007-12-12 12:14:49+02:00, aelkin@koti.dsl.inet.fi +14 -0
    changes due to bug#31552/31609 idempotency is not default any longer

  mysql-test/extra/rpl_tests/rpl_row_tabledefs.test@1.12, 2007-12-12 12:14:49+02:00, aelkin@koti.dsl.inet.fi +7 -0
    changes due to bug#31552/31609 idempotency is not default any longer

  mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result@1.14, 2007-12-12 12:14:51+02:00, aelkin@koti.dsl.inet.fi +1 -0
    results changed

  mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result@1.6, 2007-12-12 12:14:49+02:00, aelkin@koti.dsl.inet.fi +13 -0
    results changed

  mysql-test/suite/rpl/r/rpl_idempotency.result@1.2, 2007-12-12 12:14:49+02:00, aelkin@koti.dsl.inet.fi +155 -0
    results changed

  mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result@1.24, 2007-12-12 12:14:49+02:00, aelkin@koti.dsl.inet.fi +2 -0
    results changed

  mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result@1.4.1.1, 2007-12-12 12:14:50+02:00, aelkin@koti.dsl.inet.fi +4 -0
    results changed

  mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result@1.4.1.1, 2007-12-12 12:14:50+02:00, aelkin@koti.dsl.inet.fi +4 -0
    results changed

  mysql-test/suite/rpl/r/rpl_row_mystery22.result@1.3, 2007-12-12 12:14:50+02:00, aelkin@koti.dsl.inet.fi +2 -0
    results changed

  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result@1.26.1.1, 2007-12-12 12:14:50+02:00, aelkin@koti.dsl.inet.fi +4 -2
    results changed

  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result@1.23.1.1, 2007-12-12 12:14:50+02:00, aelkin@koti.dsl.inet.fi +4 -2
    results changed

  mysql-test/suite/rpl/r/rpl_temporary_errors.result@1.3, 2007-12-12 12:14:50+02:00, aelkin@koti.dsl.inet.fi +2 -0
    results changed

  mysql-test/suite/rpl/t/rpl_idempotency-master.opt@1.1, 2007-12-12 12:14:54+02:00, aelkin@koti.dsl.inet.fi +2 -0
    innodb is necessary

  mysql-test/suite/rpl/t/rpl_idempotency-master.opt@1.0, 2007-12-12 12:14:54+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/suite/rpl/t/rpl_idempotency-slave.opt@1.1, 2007-12-12 12:14:54+02:00, aelkin@koti.dsl.inet.fi +2 -0
    innodb is necessary, as well as the tests start with non-default
    IDEMPOTENT slave execution mode.
    

  mysql-test/suite/rpl/t/rpl_idempotency-slave.opt@1.0, 2007-12-12 12:14:54+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/suite/rpl/t/rpl_idempotency.test@1.2, 2007-12-12 12:14:51+02:00, aelkin@koti.dsl.inet.fi +332 -0
    extenstions to the test providing testing of complements to the
    idempotent error set and checking how slave halts when it faces an error
    from the list when the mode is STRICT.

  mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test@1.22, 2007-12-12 12:14:51+02:00, aelkin@koti.dsl.inet.fi +5 -0
    changes due to bug#31552/31609 idempotency is not default any longer.

  mysql-test/suite/rpl/t/rpl_row_mystery22.test@1.3, 2007-12-12 12:14:51+02:00, aelkin@koti.dsl.inet.fi +7 -0
    changes due to bug#31552/31609 idempotency is not default any longer

  mysql-test/suite/rpl/t/rpl_temporary_errors.test@1.3, 2007-12-12 12:14:51+02:00, aelkin@koti.dsl.inet.fi +4 -0
    changes due to bug#31552/31609 idempotency is not default any longer

  mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result@1.5.2.1, 2007-12-12 12:14:51+02:00, aelkin@koti.dsl.inet.fi +4 -0
    results changed

  sql/log_event.cc@1.277.41.1, 2007-12-12 12:14:52+02:00, aelkin@koti.dsl.inet.fi +146 -91
    the fix for bug#32468 delete rows event on a table with foreign key constraint fails
    ensures the flags are set at proper time so that their values will be caught
    by innodb.
    reseting the flags is done along the common error and errorless execution
    path.
    The list of idempotent error is extended with foreign keys related items.
    NDB engine write events are designed with the replace sematics in mind.
    Therefore the corrsponding ndb handler's flag are (re)set regardless of
    the slave's execution mode.
    Rows_log_event::write_row() starts using the bool replace argument as its
    caller sets it depending on the event's execution mode.

  sql/log_event.h@1.167, 2007-12-12 12:14:52+02:00, aelkin@koti.dsl.inet.fi +6 -0
    adding a new member to hold the slave's mode during execution of the event.

  sql/mysql_priv.h@1.544.4.1, 2007-12-12 12:14:52+02:00, aelkin@koti.dsl.inet.fi +1 -0
    changes to link the command line option with the new global sys var.

  sql/mysqld.cc@1.679.3.3, 2007-12-12 12:14:53+02:00, aelkin@koti.dsl.inet.fi +17 -2
    introduction of the new command line option.
    providing its initialization to a default.
    changes to link the command line option with the new global sys var.

  sql/rpl_rli.cc@1.15, 2007-12-12 12:14:53+02:00, aelkin@koti.dsl.inet.fi +5 -0
    rli post-event-execution cleanup restores the default bits.

  sql/set_var.cc@1.252.9.1, 2007-12-12 12:14:53+02:00, aelkin@koti.dsl.inet.fi +99 -0
    The new "standard" sys_var_set class' and the new global system var related
    declarations and definitions.
    fix_slave_exec_mode() is used as with the update method of a new class so
    as at time of the command line arguments parsing.

  sql/set_var.h@1.110.4.1, 2007-12-12 12:14:53+02:00, aelkin@koti.dsl.inet.fi +39 -1
    new declarations. The class for the new global sys var is based on
    yet another new "standard" one.

  sql/share/errmsg.txt@1.168.2.1, 2007-12-12 12:14:54+02:00, aelkin@koti.dsl.inet.fi +2 -0
    slave_exec_mode setting error;
    slave inconsistency error which may be not an error when the intention
    is "idempotent". I.e consisting of row-based events binlog is being
    applied for the 2nd (more) time.

  sql/sql_class.h@1.405.1.1, 2007-12-12 12:14:54+02:00, aelkin@koti.dsl.inet.fi +3 -0
    The names for the bits of the new sever slave_exec_mode_options.

ChangeSet@1.2476.737.1, 2007-12-07 17:40:42+04:00, svoj@mysql.com +4 -0
  BUG#25677 - With --skip-symbolic-links option on, DATA DIRECTORY
              clause is silently ignored
  
  When symbolic links are disabled by command line option or
  NO_DIR_IN_CREATE sql mode, CREATE TABLE silently ignores
  DATA/INDEX DIRECTORY options.
  
  With this fix a warning is issued when symbolic links are disabled.

  mysql-test/r/symlink.result@1.41, 2007-12-07 17:40:39+04:00, svoj@mysql.com +8 -0
    A test case for BUG#25677.

  mysql-test/t/symlink.test@1.32, 2007-12-07 17:40:39+04:00, svoj@mysql.com +12 -0
    A test case for BUG#25677.

  sql/sql_parse.cc@1.700.21.1, 2007-12-07 17:40:40+04:00, svoj@mysql.com +1 -9
    Moved handling of situation when mysqld is compiled without
    HAVE_READLINK to mysql_create_table_no_lock().

  sql/sql_table.cc@1.446.18.1, 2007-12-07 17:40:40+04:00, svoj@mysql.com +11 -1
    Issue a warning in case DATA/INDEX DIRECTORY is specified and:
    - server is compiled without HAVE_READLINK;
    - using symbolic links is disabled by command line option;
    - using symbolic links is disabled by NO_DIR_IN_CREATE sql mode.

ChangeSet@1.2476.732.1, 2007-12-06 18:27:10+03:00, skozlov@mysql.com +15 -0
  WL#4091, part1. replace --sleep by include/wait_condition.inc

  mysql-test/suite/rpl/r/rpl_start_stop_slave.result@1.10, 2007-12-06 18:26:58+03:00, skozlov@mysql.com +1 -1
    updated result

  mysql-test/suite/rpl/t/rpl_critical_errors.test@1.4, 2007-12-06 18:26:58+03:00, skozlov@mysql.com +2 -1
    replace --sleep

  mysql-test/suite/rpl/t/rpl_err_ignoredtable.test@1.31, 2007-12-06 18:26:58+03:00, skozlov@mysql.com +2 -1
    replace --sleep

  mysql-test/suite/rpl/t/rpl_init_slave.test@1.7, 2007-12-06 18:26:58+03:00, skozlov@mysql.com +0 -1
    remove --sleep

  mysql-test/suite/rpl/t/rpl_insert.test@1.8, 2007-12-06 18:26:58+03:00, skozlov@mysql.com +2 -12
    replace --sleep

  mysql-test/suite/rpl/t/rpl_loadfile.test@1.7, 2007-12-06 18:26:59+03:00, skozlov@mysql.com +4 -3
    replace --sleep

  mysql-test/suite/rpl/t/rpl_row_sp001.test@1.8, 2007-12-06 18:26:59+03:00, skozlov@mysql.com +5 -1
    replace --sleep

  mysql-test/suite/rpl/t/rpl_row_sp005.test@1.5, 2007-12-06 18:26:59+03:00, skozlov@mysql.com +2 -1
    replace --sleep

  mysql-test/suite/rpl/t/rpl_row_stop_middle.test@1.4, 2007-12-06 18:26:59+03:00, skozlov@mysql.com +2 -1
    replace --sleep

  mysql-test/suite/rpl/t/rpl_row_trig001.test@1.7, 2007-12-06 18:26:59+03:00, skozlov@mysql.com +5 -1
    replace --sleep

  mysql-test/suite/rpl/t/rpl_row_trig003.test@1.5, 2007-12-06 18:26:59+03:00, skozlov@mysql.com +5 -3
    replace --sleep

  mysql-test/suite/rpl/t/rpl_ssl1.test@1.32, 2007-12-06 18:26:59+03:00, skozlov@mysql.com +2 -1
    replace --sleep

  mysql-test/suite/rpl/t/rpl_start_stop_slave.test@1.6, 2007-12-06 18:26:59+03:00, skozlov@mysql.com +5 -4
    replace --sleep

  mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test@1.20, 2007-12-06 18:26:59+03:00, skozlov@mysql.com +2 -1
    replace --sleep

  mysql-test/suite/rpl/t/rpl_temporary.test@1.34, 2007-12-06 18:26:59+03:00, skozlov@mysql.com +6 -5
    replace --sleep

ChangeSet@1.2476.729.2, 2007-12-05 20:49:50+01:00, mats@kindahl-laptop.dnsalias.net +3 -0
  BUG#31582 (5.1-telco-6.1 -> 5.1.22. Slave crashes when reading UPDATE for VARCHAR):
  
  Just adding testcase. This bug was fixed by patch for BUG#31583.

  mysql-test/suite/bugs/r/rpl_bug31582.result@1.1, 2007-12-05 20:49:46+01:00, mats@kindahl-laptop.dnsalias.net +16 -0
    New BitKeeper file ``mysql-test/suite/bugs/r/rpl_bug31582.result''

  mysql-test/suite/bugs/r/rpl_bug31582.result@1.0, 2007-12-05 20:49:46+01:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/bugs/t/rpl_bug31582.test@1.1, 2007-12-05 20:49:46+01:00, mats@kindahl-laptop.dnsalias.net +25 -0
    New BitKeeper file ``mysql-test/suite/bugs/t/rpl_bug31582.test''

  mysql-test/suite/bugs/t/rpl_bug31582.test@1.0, 2007-12-05 20:49:46+01:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/bugs/t/rpl_bug31583.test@1.2, 2007-12-05 20:49:46+01:00, mats@kindahl-laptop.dnsalias.net +4 -0
    Dropping tables to clean up after the test.

ChangeSet@1.2476.729.1, 2007-12-05 20:00:14+01:00, mats@kindahl-laptop.dnsalias.net +5 -0
  BUG#31583 (5.1-telco-6.1 -> 5.1.22. Slave returns Error in unknown event):
  
  In the patch for BUG#21842, the code for handling old rows events were
  refactored.  There were a bug in the refactored code (possibly introduced
  after the patch for BUG#21842) that caused caused the refactored old events
  to read a columns bitmap after image even though there is no such bitmap
  for old events. As a result, the reading got out of sync, and started reading
  invalid data.
  
  This patch removes all trace of the after image column bitmap from the refactored
  old events and removes functions that are no longer needed because they are empty. 

  mysql-test/suite/bugs/r/rpl_bug31583.result@1.1, 2007-12-05 20:00:06+01:00, mats@kindahl-laptop.dnsalias.net +15 -0
    New BitKeeper file ``mysql-test/suite/bugs/r/rpl_bug31583.result''

  mysql-test/suite/bugs/r/rpl_bug31583.result@1.0, 2007-12-05 20:00:06+01:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/bugs/t/rpl_bug31583.test@1.1, 2007-12-05 20:00:06+01:00, mats@kindahl-laptop.dnsalias.net +21 -0
    New BitKeeper file ``mysql-test/suite/bugs/t/rpl_bug31583.test''

  mysql-test/suite/bugs/t/rpl_bug31583.test@1.0, 2007-12-05 20:00:06+01:00, mats@kindahl-laptop.dnsalias.net +0 -0

  sql/log_event.cc@1.277.1.36, 2007-12-05 20:00:06+01:00, mats@kindahl-laptop.dnsalias.net +5 -0
    Adding debug printouts and adding old rows events names to output
    so that they are not printed as unknown events. 

  sql/log_event_old.cc@1.14, 2007-12-05 20:00:06+01:00, mats@kindahl-laptop.dnsalias.net +3 -73
    Adding debug printouts to see how the old events are partitioned
    when being decoded.  Removing all traces of the column bitmap for
    the after image in the old events since there is none.
    
    Removing the following functions since they are no longer needed:
    - Update_rows_log_event_old::init()
    - Update_rows_log_event_old::~Update_rows_log_event_old()
    
    Removing unused local variable.

  sql/log_event_old.h@1.10, 2007-12-05 20:00:06+01:00, mats@kindahl-laptop.dnsalias.net +0 -17
    Removing all traces of the column bitmap for the after image in
    the old events since there is none.
    
    Removing the following functions since they are no longer needed:
    - Update_rows_log_event_old::init()
    - Update_rows_log_event_old::is_valid()
    - Update_rows_log_event_old::~Update_rows_log_event_old()
    
    Removing unused local variable.

ChangeSet@1.2476.707.3, 2007-12-05 16:43:44+01:00, msvensson@pilot.mysql.com +1 -0
  Remove disabling of ctype_big5, bug#26711 has nothing to do with it

  mysql-test/t/disabled.def@1.281.4.1, 2007-12-05 16:43:42+01:00, msvensson@pilot.mysql.com +0 -2
    Remove disabling of ctype_big5, bug#26711 has nothing to do with it

ChangeSet@1.1810.3546.1, 2007-12-05 12:26:21+04:00, bar@mysql.com +1 -0
  sql_string.cc:
    Fixing a wrong comment.

  sql/sql_string.cc@1.91.6.1, 2007-12-05 12:26:10+04:00, bar@mysql.com +2 -2
    Fixing a wrong comment.

ChangeSet@1.2476.722.1, 2007-12-03 16:54:44+08:00, hezx@hezx.(none) +3 -0
  Bug#30998 Drop View breaks replication if view does not exist
  
  When executing drop view statement on the master, the statement is not written into bin-log if any error occurs, this could cause master slave inconsistence if any view has been dropped. 
  
  If some error occured and no view has been dropped, don't bin-log the statement, if at least one view has been dropped the query is bin-logged possible with an error.

  mysql-test/suite/rpl/r/rpl_drop_view.result@1.1, 2007-12-03 16:54:39+08:00, hezx@hezx.(none) +27 -0
    Add test result for bug#30998

  mysql-test/suite/rpl/r/rpl_drop_view.result@1.0, 2007-12-03 16:54:39+08:00, hezx@hezx.(none) +0 -0

  mysql-test/suite/rpl/t/rpl_drop_view.test@1.1, 2007-12-03 16:54:39+08:00, hezx@hezx.(none) +31 -0
    Add test case for bug#30998

  mysql-test/suite/rpl/t/rpl_drop_view.test@1.0, 2007-12-03 16:54:39+08:00, hezx@hezx.(none) +0 -0

  sql/sql_view.cc@1.155.1.2, 2007-12-03 16:54:39+08:00, hezx@hezx.(none) +18 -11
    If at least one view has been dropped the query is bin-logged possible with an error.

ChangeSet@1.1810.3485.4, 2007-12-03 13:11:40+08:00, hezx@hezx.(none) +3 -0
  Bug#30998 Drop View breaks replication if view does not exist
    
  When executing drop view statement on the master, the statement is written
  into bin-log without checking for possible errors, so the statement would 
  always be bin-logged with error code cleared even if some error might occur, 
  for example, some of the views being dropped does not exist. This would cause 
  failure on the slave.
  
  Writing bin-log after check for errors, if at least one view has been dropped
  the query is bin-logged possible with an error.

  mysql-test/r/rpl_drop_view.result@1.1, 2007-12-03 13:11:31+08:00, hezx@hezx.(none) +27 -0
    Add test result for bug#30998

  mysql-test/r/rpl_drop_view.result@1.0, 2007-12-03 13:11:31+08:00, hezx@hezx.(none) +0 -0

  mysql-test/t/rpl_drop_view.test@1.1, 2007-12-03 13:11:31+08:00, hezx@hezx.(none) +31 -0
    Add test for bug#30998

  mysql-test/t/rpl_drop_view.test@1.0, 2007-12-03 13:11:31+08:00, hezx@hezx.(none) +0 -0

  sql/sql_view.cc@1.78.1.42, 2007-12-03 13:11:31+08:00, hezx@hezx.(none) +19 -13
    Writing bin-log after check for errors, if at least one view has been dropped
    the query is bin-logged possible with an error.

ChangeSet@1.2476.711.1, 2007-11-30 09:56:04+08:00, gni@dev3-221.dev.cn.tlan +1 -0
  BUG#31245 Stress test fails on NDB:"Unknow prepared statement handler"

  mysql-test/suite/stress/t/ddl_ndb.test@1.2, 2007-11-30 09:55:59+08:00, gni@dev3-221.dev.cn.tlan +2 -0
    The default connection should be "default connection".
    If there is no this statement added, the default connection is server1.  

ChangeSet@1.2476.707.2, 2007-11-29 12:23:18+01:00, msvensson@pilot.mysql.com +1 -0
  Revert bad merge, should have used local code

  mysql-test/lib/mtr_cases.pl@1.80, 2007-11-29 12:23:16+01:00, msvensson@pilot.mysql.com +64 -63
    Revert bad merge, should have used local code

ChangeSet@1.2476.426.4, 2007-11-29 19:19:55+08:00, gni@dev3-221.dev.cn.tlan +3 -0
  BUG#30417 Cluster misbehaves on auto-inc w/o PK.

  mysql-test/suite/ndb/r/ndb_autoinc.result@1.1, 2007-11-29 19:19:53+08:00, gni@dev3-221.dev.cn.tlan +38 -0
    Adding test case for auto_increment isn't the default primary key columns

  mysql-test/suite/ndb/r/ndb_autoinc.result@1.0, 2007-11-29 19:19:53+08:00, gni@dev3-221.dev.cn.tlan +0 -0

  mysql-test/suite/ndb/t/ndb_autoinc.test@1.1, 2007-11-29 19:19:53+08:00, gni@dev3-221.dev.cn.tlan +43 -0
    Adding test case for auto_increment isn't the default primary key columns

  mysql-test/suite/ndb/t/ndb_autoinc.test@1.0, 2007-11-29 19:19:53+08:00, gni@dev3-221.dev.cn.tlan +0 -0

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.176, 2007-11-29 19:19:52+08:00, gni@dev3-221.dev.cn.tlan +16 -15
    The check that how many auto_increment columns in table are there should be preceded creating the table.
    If there are more than one auto_increment columns, the table shouldn't be created.

ChangeSet@1.2476.669.19, 2007-11-28 15:35:25+04:00, bar@mysql.com +4 -0
  bug#29562 default collation of ucs2_unicode_ci crashes slave
  Problem: some pieces of code relied on the default character
  set settings, which didn't work in case of default character set
  ucs2.
  Fix: Specifying character set explicitly, not to depend on
  the default settings.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result@1.3, 2007-11-28 15:35:22+04:00, bar@mysql.com +19 -1
    Recording correct test result

  mysql-test/suite/rpl_ndb/t/disabled.def@1.13.1.1, 2007-11-28 15:35:22+04:00, bar@mysql.com +0 -1
    Enabling test

  sql/ha_ndbcluster_binlog.cc@1.133.3.1, 2007-11-28 15:35:22+04:00, bar@mysql.com +3 -2
    Character set of the NDB helper tables should
    not rely of the default settings, to avoid creating
    tables in different character sets on master and slave.
    Adding explicit character set. UTF8 should be fine.
    
    character_set_client should not rely on the default
    character set settings, which can be ucs2. Helper SQL queries
    sent by NDB are all in pure ASCII. Setting client_character_set
    to latin1.

  sql/log_event.cc@1.277.40.2, 2007-11-28 15:35:22+04:00, bar@mysql.com +1 -0
    Adding assert to make sure that binary log does not have 
    queries in character set which parser does not understand
    (e.g. ucs2).

ChangeSet@1.2476.669.18, 2007-11-27 10:56:46+01:00, msvensson@pilot.mysql.com +1 -0
  Increase the slave_net_timeout to double of what the master
  uses for connect_timeout

  mysql-test/mysql-test-run.pl@1.335.4.8, 2007-11-27 10:56:44+01:00, msvensson@pilot.mysql.com +1 -1
    Increase the slave_net_timeout to double of what the master
    uses for connect_timeout

ChangeSet@1.2476.669.17, 2007-11-26 15:43:47+01:00, msvensson@pilot.mysql.com +1 -0
  Remove lib/* from EXTRA_DIST and pointout exactly which subdir
  of lib/ that should be included

  mysql-test/Makefile.am@1.122, 2007-11-26 15:43:45+01:00, msvensson@pilot.mysql.com +7 -3
    Remove lib/* from EXTRA_DIST and pointout exactly which subdir
    of lib/ that should be included

ChangeSet@1.2476.669.16, 2007-11-26 10:53:21+01:00, msvensson@pilot.mysql.com +1 -0
  Remove superfluous check for "skip", it's already done previous in the loop

  mysql-test/lib/mtr_cases.pl@1.78, 2007-11-26 10:53:19+01:00, msvensson@pilot.mysql.com +2 -3
    Remove superfluous check for "skip", it's already done previous in the loop

ChangeSet@1.2476.669.15, 2007-11-24 20:34:30+03:00, skozlov@mysql.com +1 -0
  WL#3949, Added the optimization of rpl tests if mtr started w/o a combination and --mysqld=--binlog-format=XXX

  mysql-test/lib/mtr_cases.pl@1.77, 2007-11-24 20:34:17+03:00, skozlov@mysql.com +11 -0
    Added the optimization of rpl tests

ChangeSet@1.2476.669.14, 2007-11-23 18:12:14+01:00, msvensson@shellback.(none) +2 -0
  Add mysql-test/lib/*.sql to dists*

  mysql-test/Makefile.am@1.121, 2007-11-23 18:12:10+01:00, msvensson@shellback.(none) +2 -0
    Add mysql-test/include/*.sql to dist

  scripts/make_binary_distribution.sh@1.163, 2007-11-23 18:12:10+01:00, msvensson@shellback.(none) +1 -0
    Add mysql-test/include/*.sql to bindist

ChangeSet@1.2476.669.13, 2007-11-23 16:19:42+01:00, msvensson@shellback.(none) +1 -0
  Remove printout

  mysql-test/lib/mtr_cases.pl@1.76, 2007-11-23 16:19:38+01:00, msvensson@shellback.(none) +1 -1
    Remove printout

ChangeSet@1.2476.669.12, 2007-11-23 16:14:56+01:00, msvensson@shellback.(none) +1 -0
  - Don't process already skipped testcases one more time
  in optimization phase
  - Don't check specified binlog format if hasn't been assigned one

  mysql-test/lib/mtr_cases.pl@1.75, 2007-11-23 16:14:52+01:00, msvensson@shellback.(none) +4 -0
    - Don't process already skipped testcases one more time
    in optimization phase
    - Don't check specified binlog format if hasn't been assigned one

ChangeSet@1.2476.669.11, 2007-11-23 15:59:50+01:00, msvensson@shellback.(none) +1 -0
  Add lib to extra dist

  mysql-test/Makefile.am@1.120, 2007-11-23 15:59:46+01:00, msvensson@shellback.(none) +1 -1
    Add lib to extra dist

ChangeSet@1.2476.669.10, 2007-11-23 15:54:11+01:00, msvensson@shellback.(none) +1 -0
  Apply patch for BUG#30630 

  mysql-test/mysql-test-run.pl@1.335.4.7, 2007-11-23 15:54:05+01:00, msvensson@shellback.(none) +5 -4
    Apply patch for BUG#30630 

ChangeSet@1.2476.691.1, 2007-11-23 15:02:50+01:00, msvensson@shellback.(none) +2 -0
  Move the "use lib"  directive to mtr.pl

  mysql-test/lib/mtr_cases.pl@1.74, 2007-11-23 15:02:46+01:00, msvensson@shellback.(none) +0 -1
    Move the "use lib"  directive to mtr.pl

  mysql-test/mysql-test-run.pl@1.335.4.6, 2007-11-23 15:02:46+01:00, msvensson@shellback.(none) +3 -0
    Move the "use lib"  directive to mtr.pl

ChangeSet@1.2476.689.1, 2007-11-23 14:41:41+01:00, mats@kindahl-laptop.dnsalias.net +3 -0
  BUG#32580 (mysqlbinlog cannot read binlog event generated by user variable usage):
  
  The client program 'mysqlbinlog' crashed when trying to print a User_var_log_event holding
  a floating-point value since the format specifier for my_b_printf() does not support
  floating-point format specifiers.
  
  This patch prints the floating-point number to an internal buffer, and then writes
  that buffer to the output instead.

  mysql-test/r/mysqlbinlog.result@1.39.1.1, 2007-11-23 14:41:36+01:00, mats@kindahl-laptop.dnsalias.net +25 -0
    Result file change.

  mysql-test/t/mysqlbinlog.test@1.53.1.1, 2007-11-23 14:41:36+01:00, mats@kindahl-laptop.dnsalias.net +27 -0
    Adding test that mysqlbinlog can write and read back User_var_log_event
    for real, decimal, integer, and string. These are the only types supported
    for user variables.

  sql/log_event.cc@1.277.40.1, 2007-11-23 14:41:37+01:00, mats@kindahl-laptop.dnsalias.net +13 -1
    Using my_sprintf() to print floating-point value of User_var_log_event value to a
    character buffer and then to the real output, since my_b_printf() does not
    support floating-point format. Also adding macro to give buffer size needed 
    for printing floating-point numbers in %g format.

ChangeSet@1.2476.669.7, 2007-11-23 13:29:31+01:00, msvensson@shellback.(none) +8 -0
  WL#3949 Test should set binlog format dnamically
  - Reorganize collect a little to make it easier to apply optimizations
    and settings to collected test cases.
  - Add suite/rpl/combination file
  - Rename include/set_binlog_format_x.inc to .sql since thay are run by "mysql"
   

  mysql-test/include/set_binlog_format_mixed.sql@1.2, 2007-11-23 13:29:07+01:00, msvensson@shellback.(none) +0 -0
    Rename: mysql-test/include/set_binlog_format_mixed.inc -> mysql-test/include/set_binlog_format_mixed.sql

  mysql-test/include/set_binlog_format_row.sql@1.2, 2007-11-23 13:29:07+01:00, msvensson@shellback.(none) +0 -0
    Rename: mysql-test/include/set_binlog_format_row.inc -> mysql-test/include/set_binlog_format_row.sql

  mysql-test/include/set_binlog_format_statement.sql@1.2, 2007-11-23 13:29:08+01:00, msvensson@shellback.(none) +0 -0
    Rename: mysql-test/include/set_binlog_format_statement.inc -> mysql-test/include/set_binlog_format_statement.sql

  mysql-test/lib/My/Config.pm@1.1, 2007-11-23 13:29:28+01:00, msvensson@shellback.(none) +422 -0
    New BitKeeper file ``mysql-test/lib/My/Config.pm''

  mysql-test/lib/My/Config.pm@1.0, 2007-11-23 13:29:28+01:00, msvensson@shellback.(none) +0 -0

  mysql-test/lib/mtr_cases.pl@1.73, 2007-11-23 13:29:28+01:00, msvensson@shellback.(none) +176 -157
    Reorganize code to
     - collect a suite
     - multiply the tests in the suite with any combinations the suite has
     - optimize the suite by skipping test not supported with current settings
    Use My::Config to read combinations file in my.cnf file format, this
    allowas a "short name" to be used for the combination instead of
    the full name wich is set to the extra arguments the combination applies
    Add function 'print_testcase' that can be used to print the testcases
    during different stages of the collect phase

  mysql-test/lib/mtr_report.pl@1.62.4.1, 2007-11-23 13:29:28+01:00, msvensson@shellback.(none) +6 -2
    Print <testname> '<combination>' if combination is set

  mysql-test/mysql-test-run.pl@1.335.4.5, 2007-11-23 13:29:28+01:00, msvensson@shellback.(none) +25 -19
    Add comments, fix indentation
    Rename .in to .sql files
    Only set binlog format dynamicall for master, slav is always restarted

  mysql-test/suite/rpl/combinations@1.1, 2007-11-23 13:29:28+01:00, msvensson@shellback.(none) +8 -0
    New BitKeeper file ``mysql-test/suite/rpl/combinations''

  mysql-test/suite/rpl/combinations@1.0, 2007-11-23 13:29:28+01:00, msvensson@shellback.(none) +0 -0

ChangeSet@1.2476.677.1, 2007-11-21 23:44:31+03:00, skozlov@mysql.com +3 -0
  WL#3949, added skip combinations for some conditions

  mysql-test/include/have_binlog_format_row_or_statement.inc@1.1, 2007-11-21 23:44:23+03:00, skozlov@mysql.com +7 -0
    include file

  mysql-test/include/have_binlog_format_row_or_statement.inc@1.0, 2007-11-21 23:44:23+03:00, skozlov@mysql.com +0 -0

  mysql-test/lib/mtr_cases.pl@1.72, 2007-11-21 23:44:23+03:00, skozlov@mysql.com +16 -13
    skip combination code for some conditions

  mysql-test/mysql-test-run.pl@1.335.4.4, 2007-11-21 23:44:22+03:00, skozlov@mysql.com +3 -0
    added --skip-combination option

ChangeSet@1.2476.669.5, 2007-11-21 16:53:46+01:00, sven@riska.(none) +1 -0
  BUG#31581: 5.1-telco-6.1 -> 5.1.22. Slave crashes during starting
  The patch I previously pushed for this bug did not compile because
  a field in class THD had been renamed.
  This patch renames thd->query_error to thd->is_slave_error in
  log_event_old.cc by applying the same patch to log_event_old.cc as
  was previously applied to log_event.cc.
  TAG: version_where_test_case_for_bug_31581_works

  sql/log_event_old.cc@1.13, 2007-11-21 16:53:44+01:00, sven@riska.(none) +8 -8
    Renames thd->query_error to thd->is_slave_error in
    log_event_old.cc by applying the same patch to log_event_old.cc as
    was previously applied to log_event.cc.

ChangeSet@1.2476.669.3, 2007-11-21 13:25:14+03:00, skozlov@mysql.com +1 -0
  WL#3949, fixed path to combination file

  mysql-test/lib/mtr_cases.pl@1.71, 2007-11-21 13:25:05+03:00, skozlov@mysql.com +1 -2
    fixed path to combination file

ChangeSet@1.2476.669.2, 2007-11-21 00:39:55+03:00, skozlov@mysql.com +4 -0
  WL#3949, fix for 2nd part

  mysql-test/include/set_binlog_format_mixed.inc@1.1, 2007-11-21 00:39:47+03:00, skozlov@mysql.com +2 -0
    set mixed binlog format

  mysql-test/include/set_binlog_format_mixed.inc@1.0, 2007-11-21 00:39:47+03:00, skozlov@mysql.com +0 -0

  mysql-test/include/set_binlog_format_row.inc@1.1, 2007-11-21 00:39:47+03:00, skozlov@mysql.com +2 -0
    set row binlog format

  mysql-test/include/set_binlog_format_row.inc@1.0, 2007-11-21 00:39:47+03:00, skozlov@mysql.com +0 -0

  mysql-test/include/set_binlog_format_statement.inc@1.1, 2007-11-21 00:39:47+03:00, skozlov@mysql.com +2 -0
    set statement binlog format

  mysql-test/include/set_binlog_format_statement.inc@1.0, 2007-11-21 00:39:47+03:00, skozlov@mysql.com +0 -0

  mysql-test/mysql-test-run.pl@1.335.4.3, 2007-11-21 00:39:46+03:00, skozlov@mysql.com +1 -1
    updated mtr

ChangeSet@1.2476.569.19, 2007-11-20 19:49:35+01:00, sven@riska.(none) +2 -0
  BUG#31581: 5.1-telco-6.1 -> 5.1.22. Slave crashes during starting
  This patch has two purposes:
  (1) To refactor the code so that
     {Write|Update|Delete}_rows_log_event_old does not use code from
     {Write|Update|Delete}_rows_log_event. Before refactoring there
     was the following problem: whenever we modifed the code for new
     events, it affected the old events. This is bad, as it makes
     maintainance difficult. After refactoring, we can safely edit the
     new code without affecting old events. So, if we for instance
     modify the binary format of new events, we no longer need to worry
     about how the new code reads old events.
  (2) To fix BUG#31581.
  
  These two objectives are reached by the following changes:
   - Merged Rows_log_event into Old_rows_log_event and
     {Write|Update|Delete}_rows_log_event into
     {Write|Update|Delete}_rows_log_event_old.
   - Fixed the bug by replacing {WRITE|UPDATE|DELETE}_ROWS_EVENT by
     PRE_GA_{WRITE|UPDATE|DELETE}_ROWS_EVENT.
   - Added comments to log_event_old.h
  
  (This patch is identical to the previously committed patch which was
  a collapse of three changesets, except that it adds assert(0) to
  constructors for old types of row log events that should never be
  called.)

  sql/log_event_old.cc@1.10.1.1, 2007-11-20 19:49:34+01:00, sven@riska.(none) +1770 -11
    Merged Rows_log_event into Old_rows_log_event and
    {Write|Update|Delete}_rows_log_event into
    {Write|Update|Delete}_rows_log_event_old. Also fixed the bug by
    replacing {WRITE|UPDATE|DELETE}_ROWS_EVENT by
    PRE_GA_{WRITE|UPDATE|DELETE}_ROWS_EVENT.

  sql/log_event_old.h@1.9, 2007-11-20 19:49:34+01:00, sven@riska.(none) +406 -61
    Merged Rows_log_event into Old_rows_log_event and
    {Write|Update|Delete}_rows_log_event into
    {Write|Update|Delete}_rows_log_event_old. Also added comment
    explaining what the file contains and what the classes do.

ChangeSet@1.2476.669.1, 2007-11-20 19:55:51+03:00, skozlov@mysql.com +7 -0
  WL#3949, second part. Added soft switching of the binlog format (w/o restart a server)

  mysql-test/lib/mtr_cases.pl@1.70, 2007-11-20 19:55:42+03:00, skozlov@mysql.com +63 -18
    updated the code for combination 

  mysql-test/lib/mtr_misc.pl@1.30, 2007-11-20 19:55:43+03:00, skozlov@mysql.com +29 -0
    added new sub mtr_diff_opts

  mysql-test/mysql-test-run.pl@1.335.4.2, 2007-11-20 19:55:42+03:00, skozlov@mysql.com +43 -10
    added soft switching of binlog format

  mysql-test/suite/rpl/r/rpl_invoked_features.result@1.6, 2007-11-20 19:55:43+03:00, skozlov@mysql.com +12 -12
    updated result

  mysql-test/suite/rpl/t/rpl_invoked_features.test@1.8, 2007-11-20 19:55:43+03:00, skozlov@mysql.com +8 -8
    updated test

  mysql-test/suite/rpl/t/rpl_misc_functions.test@1.15, 2007-11-20 19:55:43+03:00, skozlov@mysql.com +1 -0
    updated test

  mysql-test/suite/rpl/t/rpl_session_var.test@1.9, 2007-11-20 19:55:43+03:00, skozlov@mysql.com +2 -1
    updated test

ChangeSet@1.2476.625.4, 2007-11-14 17:10:01+02:00, jani@hynda.mysql.fi +1 -0
  Fixed a wrong regexp in mysql-test-run.

  mysql-test/lib/mtr_report.pl@1.62.1.1, 2007-11-14 17:10:00+02:00, jani@hynda.mysql.fi +3 -3
    Fixed a wrong regexp in mysql-test-run.

ChangeSet@1.2492, 2007-11-13 09:46:17-05:00, cmiller@zippy.cornsilk.net +4 -0
  Insert profiling instructions into s-p code to make each statement
  be profiled separately.
  
  Expand the time formats in i_s.profiling to wide enough for larger
  numbers.

  mysql-test/r/profiling.result@1.9, 2007-11-13 09:46:15-05:00, cmiller@zippy.cornsilk.net +94 -0
    Show that each query inside a procedure is profiled separately.

  mysql-test/t/profiling.test@1.8, 2007-11-13 09:46:15-05:00, cmiller@zippy.cornsilk.net +41 -1
    Show that each query inside a procedure is profiled separately.

  sql/sp_head.cc@1.292.1.9, 2007-11-13 09:46:15-05:00, cmiller@zippy.cornsilk.net +30 -0
    Poke profiling into stored-procedure code.  For statement parts only
    of routines, process them as profilable discrete queries.

  sql/sql_profile.cc@1.17, 2007-11-13 09:46:15-05:00, cmiller@zippy.cornsilk.net +3 -1
    Encode decimal size correctly.

ChangeSet@1.2476.640.1, 2007-11-12 14:53:25+00:00, lzhou@dev3-63.(none) +7 -0
  BUG#29186 Return error to client in the following condition:
            1: Create a log file which is larger than 4G in 32-bit host.
            2: Create a data file (tablespace) which is larger than 4G in 32-bit host.

  storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp@1.5, 2007-11-12 14:53:18+00:00, lzhou@dev3-63.(none) +2 -1
    Add error code for log file too large

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.45.1.1, 2007-11-12 14:53:18+00:00, lzhou@dev3-63.(none) +10 -0
    Add error insert code in lgman and tsman

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.125.1.1, 2007-11-12 14:53:18+00:00, lzhou@dev3-63.(none) +6 -0
    Add error code definination of lgman and tsman

  storage/ndb/src/kernel/blocks/lgman.cpp@1.30.1.1, 2007-11-12 14:53:18+00:00, lzhou@dev3-63.(none) +16 -0
    Return REF when log file more than 4G in 32-bits host

  storage/ndb/src/kernel/blocks/tsman.cpp@1.17.1.1, 2007-11-12 14:53:18+00:00, lzhou@dev3-63.(none) +16 -0
    return FER when data file larger than 4G in 32-bits host

  storage/ndb/src/ndbapi/ndberror.c@1.94.2.1, 2007-11-12 14:53:18+00:00, lzhou@dev3-63.(none) +1 -0
    Add describe of new errorCode

  storage/ndb/test/ndbapi/testDict.cpp@1.37.1.1, 2007-11-12 14:53:18+00:00, lzhou@dev3-63.(none) +166 -0
    Add test case for bug29186

ChangeSet@1.1810.3448.5, 2007-11-10 11:03:07+01:00, mats@capulet.net +4 -0
  Adding build scripts for Solaris 10 on AMD64.

  BUILD/compile-solaris-amd64-debug@1.1, 2007-11-10 11:03:04+01:00, mats@capulet.net +10 -0
    Adding build script for Solaris 10 on AMD64.

  BUILD/compile-solaris-amd64-debug@1.0, 2007-11-10 11:03:04+01:00, mats@capulet.net +0 -0

  BUILD/compile-solaris-amd64-forte@1.1, 2007-11-10 11:03:04+01:00, mats@capulet.net +52 -0
    Adding build script for Solaris 10 on AMD64.

  BUILD/compile-solaris-amd64-forte@1.0, 2007-11-10 11:03:04+01:00, mats@capulet.net +0 -0

  BUILD/compile-solaris-amd64-forte-debug@1.1, 2007-11-10 11:03:04+01:00, mats@capulet.net +54 -0
    Adding build script for Solaris 10 on AMD64.

  BUILD/compile-solaris-amd64-forte-debug@1.0, 2007-11-10 11:03:04+01:00, mats@capulet.net +0 -0

  BUILD/compile-solaris-amd64@1.2, 2007-11-10 11:03:04+01:00, mats@capulet.net +8 -53
    Changing build script to be in line with the other build scripts
    using GCC.

ChangeSet@1.2491, 2007-11-09 20:29:02-05:00, cmiller@zippy.cornsilk.net +2 -0
  Don't start profiling too soon.  Begin timing when the packet is 
  read.
  
  Do not store profiling information when there is no query text.  We
  don't wish to capture non-COM_QUERY packets.

  sql/sql_parse.cc@1.700.4.10, 2007-11-09 20:28:59-05:00, cmiller@zippy.cornsilk.net +6 -4
    Start profiling immediately after a command packet is read from 
    the network.

  sql/sql_profile.cc@1.16, 2007-11-09 20:29:00-05:00, cmiller@zippy.cornsilk.net +1 -0
    Do not store items for which there is no query, i.e., protocol API 
    calls (non-COM_QUERY) and such.

ChangeSet@1.2490, 2007-11-09 18:21:22-05:00, cmiller@zippy.cornsilk.net +2 -0
  Starting state renamed.

  mysql-test/r/profiling.result@1.8, 2007-11-09 18:21:19-05:00, cmiller@zippy.cornsilk.net +1 -1
    Starting state renamed.

  mysql-test/t/profiling.test@1.7, 2007-11-09 18:21:19-05:00, cmiller@zippy.cornsilk.net +1 -1
    Starting state renamed.

ChangeSet@1.2488, 2007-11-09 14:45:44-05:00, cmiller@zippy.cornsilk.net +6 -0
  Rewrite profiler code to be easier to maintain and less buggy.
  
  Between 5.0 and 5.1, the step of incrementing the global query id
  changed, which broke how the profiler noticed when a new query had
  started.  That reset the state list and caused all but the last 
  five (or so) states to be thrown away.
  
  Now, don't watch for query_id changes in the lower level.
  
  Add a bogus state change at the end of profiling so that the last 
  real state change is timed.
  
  Emit source reference for the start of the span of time instead of
  the end of it.

  mysql-test/r/profiling.result@1.7, 2007-11-09 14:45:41-05:00, cmiller@zippy.cornsilk.net +12 -0
    Add a test that shows continuation of execution with multi-statement
    packets.

  mysql-test/t/profiling.test@1.6, 2007-11-09 14:45:41-05:00, cmiller@zippy.cornsilk.net +5 -0
    Add a test that shows continuation of execution with multi-statement
    packets.

  sql/sql_parse.cc@1.700.4.8, 2007-11-09 14:45:41-05:00, cmiller@zippy.cornsilk.net +46 -19
    Insert profiling calls at beginnings and ends of each query.
    
    Remove the old way of keeping or discarding profiles, and flipping 
    to new query profiles.

  sql/sql_profile.cc@1.15, 2007-11-09 14:45:41-05:00, cmiller@zippy.cornsilk.net +209 -202
    No longer use the thread's query_id to determine when we flip
    to a new statement.
    
    Some status statements are set to be NULL in the server.  We don't
    log those, as it doesn't fit this style of profiling yet.
    
    Rewrite the parser code to be more active and legible.  
    
    Relying on passive/lazy discovery of new queries was buggy.
    
    Add a bogus status change before ending a profile, so that the 
    previous real status has a endpoint.
    
    Emit source reference of the start of the span-of-time instead of
    the end of it.

  sql/sql_profile.h@1.10, 2007-11-09 14:45:41-05:00, cmiller@zippy.cornsilk.net +18 -45
    Store the server_query_id at instantiation time for a new query.
    
    Rewrite the parser code to be more active.  Relying on passive/lazy
    discovery of new queries was buggy.
    
    Name first state to more honestly describe the state.  We don't 
    really know of initialization that will follow.

  sql/sql_show.cc@1.445, 2007-11-09 14:45:41-05:00, cmiller@zippy.cornsilk.net +14 -7
    Update comment to note the decidedly weird field_length behavior
    on Decimal types in information_schema.

ChangeSet@1.2476.623.2, 2007-11-08 13:25:26+02:00, jani@hynda.mysql.fi +1 -0
  Fixed problem in my_micro_time_and_time().

  mysys/my_getsystime.c@1.12, 2007-11-08 13:25:23+02:00, jani@hynda.mysql.fi +9 -2
    Fixed problem in my_micro_time_and_time().

ChangeSet@1.2486, 2007-11-02 11:41:58-04:00, cmiller@zippy.cornsilk.net +5 -0
  Fix several merge problems.  There are many changes in 5.1 from 5.0
  that affect profiling.

  mysql-test/r/information_schema.result@1.158, 2007-11-02 11:41:54-04:00, cmiller@zippy.cornsilk.net +0 -7
    Merge fixed.  This result moved to a new file.

  sql/sql_parse.cc@1.700.4.7, 2007-11-02 11:41:54-04:00, cmiller@zippy.cornsilk.net +3 -0
    Include profiling in statistics.
    
    Add hook for SHOW_PROFILE in execution.

  sql/sql_profile.cc@1.14, 2007-11-02 11:41:54-04:00, cmiller@zippy.cornsilk.net +20 -19
    Move/add the FEATURE_DISABLED warning to the I_S filling func.
    
    Fix merge, where a new member was added to ST_FIELD_INFO.
    
    orig_sql_command method was removed from Lex structure.

  sql/sql_show.cc@1.444, 2007-11-02 11:41:54-04:00, cmiller@zippy.cornsilk.net +3 -1
    Fix merge problem.

  sql/sql_yacc.yy@1.601.7.3, 2007-11-02 11:41:54-04:00, cmiller@zippy.cornsilk.net +1 -2
    orig_sql_command member removed from Lex structure in 5.1 .

ChangeSet@1.2476.606.1, 2007-11-02 13:07:14+01:00, msvensson@shellback.(none) +3 -0
  Bug#28170 replicate-ignore-db=mysql should not ignore mysql.ndb_apply_status
   - Add test case
  ---
  Bug#28170 replicate-ignore-db=mysql should not ignore mysql.ndb_apply_status
   - Add test case

  mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result@1.1, 2007-11-02 13:07:11+01:00, msvensson@shellback.(none) +20 -0
    New BitKeeper file ``mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result''

  mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result@1.0, 2007-11-02 13:07:11+01:00, msvensson@shellback.(none) +0 -0

  mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status-master.opt@1.1, 2007-11-02 13:07:11+01:00, msvensson@shellback.(none) +1 -0
    New BitKeeper file ``mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status-master.opt''

  mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status-master.opt@1.0, 2007-11-02 13:07:11+01:00, msvensson@shellback.(none) +0 -0

  mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test@1.1, 2007-11-02 13:07:11+01:00, msvensson@shellback.(none) +26 -0
    New BitKeeper file ``mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test''

  mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test@1.0, 2007-11-02 13:07:11+01:00, msvensson@shellback.(none) +0 -0

ChangeSet@1.2476.600.1, 2007-11-02 09:27:38+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#32044 some of the tests (backup, drop, query_cache, etc) will timeout on Windows

  libmysqld/examples/CMakeLists.txt@1.8, 2007-11-02 09:27:36+01:00, msvensson@pilot.mysql.com +3 -0
    Add definition -DEMBEDDED_LIBRARY to all executables in libmysqld/examples

ChangeSet@1.2476.594.2, 2007-11-01 17:09:49+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#31004 mysqltest needs a --mkdir command

  mysql-test/t/upgrade.test@1.8, 2007-11-01 17:09:44+01:00, msvensson@pilot.mysql.com +1 -6
    Remove kludge in upgrade.test

ChangeSet@1.1810.3424.3, 2007-11-01 15:42:19+01:00, msvensson@pilot.mysql.com +4 -0
  Bug#31004 mysqltest needs a --mkdir command
   - Add new mysqltest command "mkdir" and "rmdir"

  client/CMakeLists.txt@1.1.14.1, 2007-11-01 15:42:18+01:00, msvensson@pilot.mysql.com +2 -1
    Build mysys/my_mkdir.c with mysqltest 

  client/Makefile.am@1.52.1.14, 2007-11-01 15:42:18+01:00, msvensson@pilot.mysql.com +2 -1
    Build mysys/my_mkdir.c with mysqltest 

  client/mysqltest.c@1.155.9.120, 2007-11-01 15:42:18+01:00, msvensson@pilot.mysql.com +67 -1
    Add new mysqltest commands "mkdir" and "rmdir"

  mysql-test/t/mysqltest.test@1.24.1.47, 2007-11-01 15:42:18+01:00, msvensson@pilot.mysql.com +22 -0
    Add tests for "mkdir" and ""rmdir"

ChangeSet@1.2484, 2007-10-31 16:39:59-04:00, cmiller@zippy.cornsilk.net +6 -0
  Sundry changes to fix merge problems.  Most of these are duplicated
  in 5.0-community, but pulling to merge was very hard.

  sql/mysql_priv.h@1.544.2.2, 2007-10-31 16:39:56-04:00, cmiller@zippy.cornsilk.net +2 -1
    Add new extern "C" qualification to set_thd_proc_info().
    
    Fix typo in merge.

  sql/mysqld.cc@1.679.2.2, 2007-10-31 16:39:56-04:00, cmiller@zippy.cornsilk.net +2 -3
    Replace obselete gptr with uchar* .
    
    Add missing #endif from merge problem.

  sql/set_var.cc@1.252.4.2, 2007-10-31 16:39:56-04:00, cmiller@zippy.cornsilk.net +3 -6
    Include new parameter to user variable contruction.

  sql/sql_cache.cc@1.128.1.2, 2007-10-31 16:39:56-04:00, cmiller@zippy.cornsilk.net +0 -1
    Remove duplicate line from merge problem.

  sql/sql_profile.cc@1.12, 2007-10-31 16:39:56-04:00, cmiller@zippy.cornsilk.net +22 -22
    struct st_table_list is now typedef'd to a new name.
    
    ST_FIELD_INFO now includes a new member, a pointer to an open_table
    function.

  sql/sql_profile.h@1.8, 2007-10-31 16:39:56-04:00, cmiller@zippy.cornsilk.net +2 -2
    struct st_table_list is now typedef'd to a new name.

ChangeSet@1.1810.3424.2, 2007-10-31 18:44:31+01:00, msvensson@pilot.mysql.com +3 -0
  Backport mysqltests "change_user" command

  client/mysqltest.c@1.155.9.119, 2007-10-31 18:44:27+01:00, msvensson@pilot.mysql.com +66 -1
    Backport mysqltests "change_user" command

  mysql-test/r/mysqltest.result@1.24.1.33, 2007-10-31 18:44:28+01:00, msvensson@pilot.mysql.com +3 -0
    Backport mysqltests "change_user" command

  mysql-test/t/mysqltest.test@1.24.1.46, 2007-10-31 18:44:28+01:00, msvensson@pilot.mysql.com +19 -0
    Backport mysqltests "change_user" command

ChangeSet@1.1810.3392.2, 2007-10-31 12:29:32-04:00, cmiller@zippy.cornsilk.net +1 -0
  Push history-limiting code until after the code that adds new 
  history entries.  Lazy deletion isn't smart or useful here.

  sql/sql_profile.cc@1.9.1.4, 2007-10-31 12:29:29-04:00, cmiller@zippy.cornsilk.net +3 -3
    Push history-limiting code until after the code that adds new 
    history entries.  Lazy deletion isn't smart or useful here.

ChangeSet@1.2476.483.6, 2007-10-30 11:40:08+02:00, jani@hynda.mysql.fi +1 -0
  Fixed a typo.

  mysys/my_getsystime.c@1.11, 2007-10-30 11:40:05+02:00, jani@hynda.mysql.fi +2 -2
    Fixed a typo.

ChangeSet@1.2476.571.1, 2007-10-29 21:33:30+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#30366 NDB fails to start on OS X, PPC, 64 bit
   - The errno variable should only be used when the previous socket
     write failed, it should be regarded as undefined at other times

  storage/ndb/src/common/util/OutputStream.cpp@1.11, 2007-10-29 21:33:27+01:00, msvensson@pilot.mysql.com +2 -2
    Only use "errno" after the attempt to write to the socket has failed

ChangeSet@1.2483, 2007-10-29 12:48:48-04:00, cmiller@zippy.cornsilk.net +1 -0
  Remove easily-changed and prominent variable that toggled
  community-server features.
  
  Community server features should be fully integrated into 5.1, but
  disabled by default.  We never toggle that they're disabled based
  on the version number, in the 5.1 line and later.

  configure.in@1.464, 2007-10-29 12:48:46-04:00, cmiller@zippy.cornsilk.net +1 -2
    Remove easily-changed and prominent variable that toggled
    community-server features.

ChangeSet@1.2476.483.5, 2007-10-29 18:18:49+02:00, jani@hynda.mysql.fi +1 -0
  Fix for counting query time for Windows.

  mysys/my_getsystime.c@1.10, 2007-10-29 18:18:45+02:00, jani@hynda.mysql.fi +23 -17
    Fix for counting query time for Windows. Added parenthesis just
    to make reading code easier. Fixed some comments.

ChangeSet@1.2480, 2007-10-17 13:03:08-04:00, cmiller@zippy.cornsilk.net +2 -0
  Further clean-up.

  configure.in@1.461, 2007-10-17 13:03:04-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change description of profiling option.

  mysql-test/r/information_schema.result@1.154, 2007-10-17 13:03:04-04:00, cmiller@zippy.cornsilk.net +0 -7
    Remove community-server-only feature test.  It's already in 
    "variables+c" test.

ChangeSet@1.2476.494.5, 2007-10-16 16:11:50-04:00, cmiller@zippy.cornsilk.net +16 -0
  Doxygenize comments.

  sql/my_decimal.h@1.20, 2007-10-16 16:11:47-04:00, cmiller@zippy.cornsilk.net +17 -10
    Doxygenize comments.

  sql/mysql_priv.h@1.538.1.2, 2007-10-16 16:11:47-04:00, cmiller@zippy.cornsilk.net +44 -46
    Doxygenize comments.

  sql/mysqld_suffix.h@1.4, 2007-10-16 16:11:47-04:00, cmiller@zippy.cornsilk.net +5 -2
    Doxygenize comments.

  sql/nt_servc.h@1.7, 2007-10-16 16:11:47-04:00, cmiller@zippy.cornsilk.net +10 -6
    Doxygenize comments.

  sql/parse_file.h@1.17, 2007-10-16 16:11:47-04:00, cmiller@zippy.cornsilk.net +12 -12
    Doxygenize comments.

  sql/procedure.h@1.25, 2007-10-16 16:11:47-04:00, cmiller@zippy.cornsilk.net +2 -2
    Doxygenize comments.

  sql/protocol.h@1.43, 2007-10-16 16:11:47-04:00, cmiller@zippy.cornsilk.net +1 -1
    Doxygenize comments.

  sql/sp_head.h@1.115, 2007-10-16 16:11:47-04:00, cmiller@zippy.cornsilk.net +114 -103
    Doxygenize comments.

  sql/sql_cache.h@1.43, 2007-10-16 16:11:47-04:00, cmiller@zippy.cornsilk.net +2 -2
    Doxygenize comments.

  sql/sql_class.h@1.399.3.1, 2007-10-16 16:11:47-04:00, cmiller@zippy.cornsilk.net +9 -6
    Doxygenize comments.

  sql/sql_cursor.h@1.4, 2007-10-16 16:11:47-04:00, cmiller@zippy.cornsilk.net +6 -5
    Doxygenize comments.

  sql/sql_select.h@1.129, 2007-10-16 16:11:47-04:00, cmiller@zippy.cornsilk.net +69 -64
    Doxygenize comments.

  sql/sql_trigger.h@1.34, 2007-10-16 16:11:47-04:00, cmiller@zippy.cornsilk.net +10 -10
    Doxygenize comments.

  sql/structs.h@1.73, 2007-10-16 16:11:47-04:00, cmiller@zippy.cornsilk.net +1 -1
    Doxygenize comments.

  sql/tztime.h@1.25, 2007-10-16 16:11:47-04:00, cmiller@zippy.cornsilk.net +6 -6
    Doxygenize comments.

  sql/unireg.h@1.56.1.1, 2007-10-16 16:11:47-04:00, cmiller@zippy.cornsilk.net +5 -5
    Doxygenize comments.

ChangeSet@1.2476.494.4, 2007-10-16 15:37:31-04:00, cmiller@zippy.cornsilk.net +10 -0
  Doxygenized comments.

  sql/sql_base.cc@1.421.11.1, 2007-10-16 15:37:25-04:00, cmiller@zippy.cornsilk.net +15 -15
    Doxygenized comments.

  sql/sql_cache.cc@1.127.1.1, 2007-10-16 15:37:25-04:00, cmiller@zippy.cornsilk.net +11 -11
    Doxygenized comments.

  sql/sql_class.cc@1.347.4.1, 2007-10-16 15:37:25-04:00, cmiller@zippy.cornsilk.net +1 -1
    Doxygenized comments.

  sql/sql_cursor.cc@1.13, 2007-10-16 15:37:25-04:00, cmiller@zippy.cornsilk.net +41 -37
    Doxygenized comments.

  sql/sql_parse.cc@1.700.7.1, 2007-10-16 15:37:25-04:00, cmiller@zippy.cornsilk.net +383 -429
    Doxygenized comments.

  sql/sql_prepare.cc@1.231.1.1, 2007-10-16 15:37:26-04:00, cmiller@zippy.cornsilk.net +292 -316
    Doxygenized comments.

  sql/sql_select.cc@1.564.1.1, 2007-10-16 15:37:26-04:00, cmiller@zippy.cornsilk.net +1225 -1165
    Doxygenized comments.

  sql/sql_trigger.cc@1.106, 2007-10-16 15:37:26-04:00, cmiller@zippy.cornsilk.net +178 -177
    Doxygenized comments.

  sql/sql_update.cc@1.239.9.2, 2007-10-16 15:37:26-04:00, cmiller@zippy.cornsilk.net +1 -1
    Doxygenized comments.

  sql/sql_view.cc@1.149.1.1, 2007-10-16 15:37:26-04:00, cmiller@zippy.cornsilk.net +1 -1
    Doxygenized comments.

ChangeSet@1.2476.523.1, 2007-10-16 17:59:16+03:00, jani@hynda.mysql.fi +3 -0
  Fixes to merge between 5.1-main and 5.1-marvel

  include/my_atomic.h@1.6.1.1, 2007-10-16 17:59:14+03:00, jani@hynda.mysql.fi +5 -5
    To avoid compiler problems on some platforms, static inline
    should be a macro here.

  include/my_bit.h@1.1.1.1, 2007-10-16 17:59:14+03:00, jani@hynda.mysql.fi +4 -2
    To avoid compiler problems on windows and solaris

  libmysql/CMakeLists.txt@1.14, 2007-10-16 17:59:14+03:00, jani@hynda.mysql.fi +1 -1
    Added missing library on Windows.

ChangeSet@1.2476.483.3, 2007-10-15 18:22:19+03:00, jani@hynda.mysql.fi +4 -0
  Fixes to merge between 5.1-main and 5.1-marvel

  include/my_atomic.h@1.7, 2007-10-15 18:22:16+03:00, jani@hynda.mysql.fi +5 -5
    To avoid compiler problems on some platforms, static inline
    should be a macro here.

  include/my_bit.h@1.2, 2007-10-15 18:22:16+03:00, jani@hynda.mysql.fi +4 -2
    To avoid compiler problems on windows and solaris

  mysys/my_create.c@1.20, 2007-10-15 18:22:16+03:00, jani@hynda.mysql.fi +1 -0
    To avoid compiler problems on windows.

  mysys/my_delete.c@1.9, 2007-10-15 18:22:16+03:00, jani@hynda.mysql.fi +1 -0
    To avoid compiler problems on windows.

ChangeSet@1.2476.494.3, 2007-10-11 14:37:45-04:00, cmiller@zippy.cornsilk.net +11 -0
  Doxygenized comments.

  sql/net_serv.cc@1.115, 2007-10-11 14:37:42-04:00, cmiller@zippy.cornsilk.net +69 -70
    Doxygenized comments.

  sql/nt_servc.cc@1.17, 2007-10-11 14:37:42-04:00, cmiller@zippy.cornsilk.net +44 -34
    Doxygenized comments.

  sql/opt_sum.cc@1.65, 2007-10-11 14:37:42-04:00, cmiller@zippy.cornsilk.net +83 -82
    Doxygenized comments.

  sql/parse_file.cc@1.31, 2007-10-11 14:37:42-04:00, cmiller@zippy.cornsilk.net +150 -154
    Doxygenized comments.

  sql/procedure.cc@1.14, 2007-10-11 14:37:42-04:00, cmiller@zippy.cornsilk.net +7 -4
    Doxygenized comments.

  sql/protocol.cc@1.129.1.1, 2007-10-11 14:37:42-04:00, cmiller@zippy.cornsilk.net +112 -114
    Doxygenized comments.

  sql/records.cc@1.51, 2007-10-11 14:37:42-04:00, cmiller@zippy.cornsilk.net +64 -71
    Doxygenized comments.

  sql/repl_failsafe.cc@1.76.1.3, 2007-10-11 14:37:42-04:00, cmiller@zippy.cornsilk.net +41 -22
    Doxygenized comments.

  sql/set_var.cc@1.250.1.1, 2007-10-11 14:37:42-04:00, cmiller@zippy.cornsilk.net +103 -93
    Doxygenized comments.

  sql/sp.cc@1.171, 2007-10-11 14:37:42-04:00, cmiller@zippy.cornsilk.net +176 -187
    Doxygenized comments.

  sql/sp_head.cc@1.292.2.1, 2007-10-11 14:37:42-04:00, cmiller@zippy.cornsilk.net +208 -191
    Doxygenized comments.

ChangeSet@1.2476.494.2, 2007-10-11 13:29:09-04:00, cmiller@zippy.cornsilk.net +25 -0
  Doxygenization of comments.

  sql/field_conv.cc@1.76, 2007-10-11 13:29:04-04:00, cmiller@zippy.cornsilk.net +30 -27
    Doxygenization of comments.

  sql/filesort.cc@1.135, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +155 -151
    Doxygenization of comments.

  sql/gen_lex_hash.cc@1.77.1.1, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +11 -6
    Doxygenization of comments.

  sql/ha_ndbcluster.cc@1.470, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +246 -223
    Doxygenization of comments.

  sql/handler.cc@1.322.11.1, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +234 -237
    Doxygenization of comments.

  sql/hostname.cc@1.39, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +8 -3
    Doxygenization of comments.

  sql/init.cc@1.22, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +6 -1
    Doxygenization of comments.

  sql/item.cc@1.288.1.1, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +493 -517
    Doxygenization of comments.

  sql/item_buff.cc@1.23, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +13 -6
    Doxygenization of comments.

  sql/item_cmpfunc.cc@1.267.10.1, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +227 -245
    Doxygenization of comments.

  sql/item_create.cc@1.93, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +6 -1
    Doxygenization of comments.

  sql/item_func.cc@1.420, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +144 -155
    Doxygenization of comments.

  sql/item_geofunc.cc@1.35, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +11 -2
    Doxygenization of comments.

  sql/item_row.cc@1.37, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +6 -1
    Doxygenization of comments.

  sql/item_strfunc.cc@1.329.1.1, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +57 -42
    Doxygenization of comments.

  sql/item_subselect.cc@1.163, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +58 -54
    Doxygenization of comments.

  sql/item_sum.cc@1.230, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +83 -70
    Doxygenization of comments.

  sql/item_timefunc.cc@1.173.1.1, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +93 -77
    Doxygenization of comments.

  sql/key.cc@1.55, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +35 -51
    Doxygenization of comments.

  sql/lock.cc@1.106.10.6, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +103 -116
    Doxygenization of comments.

  sql/log.cc@1.297.2.1, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +227 -219
    Doxygenization of comments.

  sql/log_event.cc@1.277.34.1, 2007-10-11 13:29:06-04:00, cmiller@zippy.cornsilk.net +154 -143
    Doxygenization of comments.

  sql/mf_iocache.cc@1.31, 2007-10-11 13:29:06-04:00, cmiller@zippy.cornsilk.net +14 -7
    Doxygenization of comments.

  sql/my_decimal.cc@1.20, 2007-10-11 13:29:06-04:00, cmiller@zippy.cornsilk.net +5 -7
    Doxygenization of comments.

  sql/mysqld.cc@1.675.1.1, 2007-10-11 13:29:06-04:00, cmiller@zippy.cornsilk.net +113 -133
    Doxygenization of comments.

ChangeSet@1.2476.483.2, 2007-10-11 18:07:40+03:00, monty@mysql.com +78 -0
  Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1
  - Reserver namespace and place in frm for TABLE_CHECKSUM and PAGE_CHECKSUM create options
  - Added syncing of directory when creating .frm files
  - Portability fixes
  - Added missing cast that could cause bugs
  - Code cleanups
  - Made some bit functions inline
  - Moved things out of myisam.h to my_handler.h to make them more accessable
  - Renamed some myisam variables and defines to make them more globaly usable (as they are used outside of MyISAM)
  - Fixed bugs in error conditions
  - Use compiler time asserts instead of run time
  - Fixed indentation
  HA_EXTRA_PREPARE_FOR_DELETE -> HA_EXTRA_PREPARE_FOR_DROP as the old name was wrong
  (Added a define for old value to ensure we don't break any old code)
  Added HA_EXTRA_PREPARE_FOR_RENAME as a signal for rename (before we used a DROP signal which is wrong)
  - Initialize error messages early to get better errors when mysqld or an engine fails to start
  - Fix windows bug that query_performance_frequency was not initialized if registry code failed
  - thread_stack -> my_thread_stack_size

  BitKeeper/etc/ignore@1.302, 2007-10-11 17:55:39+03:00, monty@mysql.com +3 -0
    added libmysqld/scheduler.cc libmysqld/sql_connect.cc libmysqld/sql_tablespace.cc

  BitKeeper/etc/ignore@1.301, 2007-10-11 17:54:58+03:00, monty@mysql.com +1 -0
    added libmysql_r/client_settings.h

  include/Makefile.am@1.87, 2007-10-11 18:07:33+03:00, monty@mysql.com +1 -1
    Added my_bit.h

  include/m_string.h@1.50, 2007-10-11 18:07:33+03:00, monty@mysql.com +5 -2
    Added bzero_if_purify() to simplify code

  include/my_base.h@1.108, 2007-10-11 18:07:33+03:00, monty@mysql.com +44 -25
    Reserve options for the future
    Added HA_OPTION_NULL_FIELDS, HA_OPTION_PAGE_CHECKSUM, HA_CREATE_PAGE_CHECKSUM
    Added new error message HA_ERR_NEW_FILE
    Added optional new row type BLOCK_RECORD
    Renamed HA_EXTRA_PREPARE_FOR_DELETE to HA_EXTRA_PREPARE_FOR_DROP
    Added HA_EXTRA_PREARE_FOR_RENAME to inform handler we will do a rename
    (Added define to make things compatible until 6.0)
    Moved invalidator_by_filename form myisam.h

  include/my_bit.h@1.1, 2007-10-11 18:07:37+03:00, monty@mysql.com +107 -0
    New BitKeeper file ``include/my_bit.h''

  include/my_bit.h@1.0, 2007-10-11 18:07:37+03:00, monty@mysql.com +0 -0

  include/my_dbug.h@1.27.1.2, 2007-10-11 18:07:33+03:00, monty@mysql.com +1 -1
    Poirtablity fix

  include/my_global.h@1.175.1.2, 2007-10-11 18:07:33+03:00, monty@mysql.com +12 -0
    Added helper macros STATIC_INLINE and MY_ERRPTR
    Added NEED_EXPLICIT_SYNC_DIR

  include/my_handler.h@1.14, 2007-10-11 18:07:33+03:00, monty@mysql.com +43 -13
    Added missing casts
    Moved some constants and macros out from myisam.h to make these generally available
    Renamed mi_compare_text() to ha_compare_text() as this function is not myisam specific
    Renamed mi_portable_sizeof_char_ptr to portable_sizeof_char_ptr
    Added registering of handler messages for better error reporting during startup

  include/my_sys.h@1.227.1.1, 2007-10-11 18:07:33+03:00, monty@mysql.com +17 -8
    Added my_sync_dir() and my_sync_dir_by_file()
    More comments
    Some indentation fixes
    Moved bit functions to my_bit.h
    Added prototype for crc32()

  include/myisam.h@1.85, 2007-10-11 18:07:33+03:00, monty@mysql.com +8 -18
    Moved things from here to my_handler.h to make them more accessable

  libmysql/Makefile.shared@1.73, 2007-10-11 18:07:33+03:00, monty@mysql.com +1 -1
    Added my_sync

  mysys/array.c@1.21, 2007-10-11 18:07:33+03:00, monty@mysql.com +59 -31
    Fixed indentation and spelling errors
    Split set_dynamic() to two functions
    Added allocate_dynamic() as a new visiable function
    (no new code, only refactoring)

  mysys/mf_iocache.c@1.71, 2007-10-11 18:07:33+03:00, monty@mysql.com +1 -0
    More DBUG

  mysys/mf_keycache.c@1.74.1.1, 2007-10-11 18:07:33+03:00, monty@mysql.com +14 -13
    More explicite ASSERT
    Removed some casts
    Fixed indentation

  mysys/mf_tempfile.c@1.30, 2007-10-11 18:07:33+03:00, monty@mysql.com +1 -0
    Fixed bug with possible dangling file descriptor

  mysys/my_atomic.c@1.4, 2007-10-11 18:07:33+03:00, monty@mysql.com +4 -5
    Use compile time asserts instead of run time

  mysys/my_bit.c@1.7, 2007-10-11 18:07:33+03:00, monty@mysql.com +32 -68
    Make most bit functions inline

  mysys/my_bitmap.c@1.46, 2007-10-11 18:07:33+03:00, monty@mysql.com +1 -0
    Added my_bit.h

  mysys/my_compress.c@1.20, 2007-10-11 18:07:33+03:00, monty@mysql.com +2 -1
    Fixed indentation

  mysys/my_create.c@1.19, 2007-10-11 18:07:33+03:00, monty@mysql.com +7 -0
    Added my_sync_by_dir()

  mysys/my_delete.c@1.8, 2007-10-11 18:07:33+03:00, monty@mysql.com +3 -0
    Added my_sync_by_dir()

  mysys/my_error.c@1.27, 2007-10-11 18:07:34+03:00, monty@mysql.com +0 -5
    init_glob_errs() is now done in my_init()

  mysys/my_handler.c@1.32, 2007-10-11 18:07:34+03:00, monty@mysql.com +81 -9
    mi_compare_text() -> ha_compare_text() as this is not MyISAM specific
    Added functions to initialize handler error messages
    Fixed indentation
    More clear usage of include files

  mysys/my_init.c@1.62.2.1, 2007-10-11 18:07:34+03:00, monty@mysql.com +26 -21
    Added my_thread_stack_size to be used by other programs
    Ensure that global error messages are always initialized
    Fix windows bug that query_performance_frequency was not initialized if registry code failed

  mysys/my_open.c@1.35, 2007-10-11 18:07:34+03:00, monty@mysql.com +40 -34
    More comments
    Removed duplicate code
    

  mysys/my_pread.c@1.22, 2007-10-11 18:07:34+03:00, monty@mysql.com +3 -3
    Ensure that my_errno is set even if errno is 0

  mysys/my_realloc.c@1.13, 2007-10-11 18:07:34+03:00, monty@mysql.com +11 -0
    Added comment

  mysys/my_rename.c@1.10, 2007-10-11 18:07:34+03:00, monty@mysql.com +16 -1
    Added syncing of directories

  mysys/my_symlink.c@1.11, 2007-10-11 18:07:34+03:00, monty@mysql.com +2 -0
    Added my_sync_by_dir()

  mysys/my_sync.c@1.6, 2007-10-11 18:07:34+03:00, monty@mysql.com +80 -0
    Added my_sync_dir()
     
    On recent Mac OS X, fcntl(F_FULLFSYNC) is recommended over fsync()
    (see "man fsync" on Mac OS X 10.3).
    my_sync_dir(): to sync a directory after a file creation/deletion/
    renaming; can be called directly or via MY_SYNC_DIR in my_create/
    my_delete/my_rename(). No-op except on Linux (see "man fsync" on Linux).
    my_sync_dir_from_file(): same as above, just more practical when the
    caller has a file name but no directory name ready.
    Should the #warning even be a #error? I mean do we want to release
    binaries which don't guarantee any durability?

  mysys/safemalloc.c@1.34.1.1, 2007-10-11 18:07:34+03:00, monty@mysql.com +23 -0
    Added sf_malloc_report_allocated() (Debugging aid)

  sql/gen_lex_hash.cc@1.78, 2007-10-11 18:07:34+03:00, monty@mysql.com +2 -2
    Remove inline for big function

  sql/ha_partition.cc@1.104.2.1, 2007-10-11 18:07:34+03:00, monty@mysql.com +12 -8
    HA_EXTRA_PREPARE_FOR_DELETE -> HA_EXTRA_PREPARE_FOR_DROP
    prepare_for_delete -> prepare_for_rename() as this is the the time this function is called

  sql/ha_partition.h@1.45, 2007-10-11 18:07:34+03:00, monty@mysql.com +1 -1
    prepare_for_delete -> prepare_for_rename() as this is the the time this function is called

  sql/handler.cc@1.322.9.2, 2007-10-11 18:07:34+03:00, monty@mysql.com +3 -6
    ha_init_errors() is now called at startup before plugins
    This allows us to get better error messages
    

  sql/handler.h@1.278, 2007-10-11 18:07:34+03:00, monty@mysql.com +5 -0
    Reserve enum value for Maria
    Add future proof enum for page checksums

  sql/item_func.cc@1.418.4.1, 2007-10-11 18:07:34+03:00, monty@mysql.com +1 -0
    Include my_bit.h

  sql/lex.h@1.174.1.1, 2007-10-11 18:07:34+03:00, monty@mysql.com +5 -1
    Added future proof CREATE table options

  sql/log.cc@1.297.1.1, 2007-10-11 18:07:34+03:00, monty@mysql.com +5 -0
    Added comment

  sql/mysql_priv.h@1.538.3.1, 2007-10-11 18:07:34+03:00, monty@mysql.com +1 -1
    thread_stack moved to mysys

  sql/mysqld.cc@1.669.3.1, 2007-10-11 18:07:34+03:00, monty@mysql.com +35 -28
    thread_stack moved to mysys
    thread_stack -> my_thread_stack_size
    Initialize myisam key caches before plugins starts
    Initialize error to allow storage engine to give better error messages if init failes.
    Fixed indentation
    Group all MyISAM options together
    Added new status variable 'Opened_table_definitions' to allow one to monitor if table definition cache is too small
    Clarified some option help messages

  sql/opt_range.cc@1.283.1.1, 2007-10-11 18:07:34+03:00, monty@mysql.com +0 -4
    Removed wrong usage of SAFE_MODE (this disabled key usage for UPDATES, which was never the intention)
    Removed print if total cost in a place where it didn't have any usable value

  sql/set_var.cc@1.249.3.1, 2007-10-11 18:07:34+03:00, monty@mysql.com +1 -1
    thread_stack -> my_thread_stack

  sql/sql_class.cc@1.347.3.1, 2007-10-11 18:07:35+03:00, monty@mysql.com +1 -0
    Intialize transaction object properly

  sql/sql_parse.cc@1.700.6.1, 2007-10-11 18:07:35+03:00, monty@mysql.com +2 -2
    thread_stack -> my_thread_stack

  sql/sql_select.cc@1.562.6.1, 2007-10-11 18:07:35+03:00, monty@mysql.com +3 -2
    Include my_bit.h
    mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  sql/sql_show.cc@1.438.1.1, 2007-10-11 18:07:35+03:00, monty@mysql.com +21 -3
    Simplify handling of ha_choice variables
    Added future safe PAGE_CHECKSUM option
    Addid missing 'transactional=#' in information schema

  sql/sql_table.cc@1.446.6.1, 2007-10-11 18:07:35+03:00, monty@mysql.com +5 -5
    HA_EXTRA_PREPARE_FOR_DELETE -> HA_EXTRA_FORCE_REOPEN when doing reopen
    HA_EXTRA_PREPARE_FOR_DELETE -> HA_EXTRA_PREPARE_FOR_RENAME when doing rename
    Removed not needed initialization

  sql/sql_test.cc@1.56, 2007-10-11 18:07:35+03:00, monty@mysql.com +2 -2
    thread_stack -> my_thread_stack

  sql/sql_yacc.yy@1.601.4.1, 2007-10-11 18:07:35+03:00, monty@mysql.com +24 -4
    Simplify handling of ha_choice variables
    Added future proof create table options TABLE_CHECKSUM=# & PAGE_CHECKSUM=#

  sql/table.cc@1.307.4.1, 2007-10-11 18:07:35+03:00, monty@mysql.com +7 -3
    Save page_checksum in .frm

  sql/table.h@1.179.5.1, 2007-10-11 18:07:36+03:00, monty@mysql.com +1 -0
    Added variable to hold create table option PAGE_CHECKSUM

  sql/unireg.cc@1.105, 2007-10-11 18:07:36+03:00, monty@mysql.com +4 -2
    Added syncing of directories

  storage/myisam/ft_boolean_search.c@1.114, 2007-10-11 18:07:36+03:00, monty@mysql.com +4 -4
    mi_compare_text() -> ha_compare_text()

  storage/myisam/ft_eval.c@1.22, 2007-10-11 18:07:36+03:00, monty@mysql.com +1 -1
    mi_compare_text() -> ha_compare_text()

  storage/myisam/ft_nlq_search.c@1.50, 2007-10-11 18:07:36+03:00, monty@mysql.com +1 -1
    mi_compare_text() -> ha_compare_text()

  storage/myisam/ft_parser.c@1.63, 2007-10-11 18:07:36+03:00, monty@mysql.com +1 -1
    mi_compare_text() -> ha_compare_text()

  storage/myisam/ft_stopwords.c@1.29, 2007-10-11 18:07:36+03:00, monty@mysql.com +1 -1
    mi_compare_text() -> ha_compare_text()

  storage/myisam/ft_test1.c@1.24, 2007-10-11 18:07:36+03:00, monty@mysql.com +2 -2
    mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr 

  storage/myisam/ft_update.c@1.48, 2007-10-11 18:07:36+03:00, monty@mysql.com +2 -2
    mi_compare_text() -> ha_compare_text()

  storage/myisam/ha_myisam.cc@1.232, 2007-10-11 18:07:36+03:00, monty@mysql.com +1 -0
    Include my_bit.h

  storage/myisam/mi_check.c@1.164, 2007-10-11 18:07:36+03:00, monty@mysql.com +12 -6
    MI_MAX_POSSIBLE_KEY_BUFF -> HA_MAX_POSSIBLE_KEY_BUFF
    mi_compare_text() -> ha_compare_text()
    Added BLOCK_RECORD to avoid compiler warnings

  storage/myisam/mi_checksum.c@1.13, 2007-10-11 18:07:36+03:00, monty@mysql.com +2 -2
    mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
     

  storage/myisam/mi_create.c@1.73, 2007-10-11 18:07:36+03:00, monty@mysql.com +4 -3
    MI_MAX_POSSIBLE_KEY -> HA_MAX_POSSIBLE_KEY
    MI_MAX_KEY_BLOCK_SIZE -> HA_MAX_KEY_BLOCK_SIZE
    mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/myisam/mi_dynrec.c@1.62, 2007-10-11 18:07:36+03:00, monty@mysql.com +4 -4
    mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/myisam/mi_extra.c@1.58, 2007-10-11 18:07:36+03:00, monty@mysql.com +1 -1
    HA_EXTRA_PREPARE_FOR_DELETE -> HA_EXTRA_PREPARE_FOR_DROP

  storage/myisam/mi_open.c@1.124.1.4, 2007-10-11 18:07:36+03:00, monty@mysql.com +3 -3
    MI_MAX_POSSIBLE_KEY -> HA_MAX_POSSIBLE_KEY
    mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/myisam/mi_packrec.c@1.50, 2007-10-11 18:07:36+03:00, monty@mysql.com +1 -1
    mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/myisam/mi_range.c@1.26, 2007-10-11 18:07:36+03:00, monty@mysql.com +1 -1
    mi_compare_text -> ha_compare_text

  storage/myisam/mi_test1.c@1.38, 2007-10-11 18:07:36+03:00, monty@mysql.com +2 -2
    mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/myisam/mi_test2.c@1.39, 2007-10-11 18:07:36+03:00, monty@mysql.com +2 -1
    mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/myisam/mi_unique.c@1.34, 2007-10-11 18:07:36+03:00, monty@mysql.com +1 -1
    mi_compare_text() -> ha_compare_text()

  storage/myisam/mi_write.c@1.71, 2007-10-11 18:07:36+03:00, monty@mysql.com +1 -1
    mi_compare_text() -> ha_compare_text()

  storage/myisam/myisamchk.c@1.130, 2007-10-11 18:07:36+03:00, monty@mysql.com +1 -0
    Include my_bit.h

  storage/myisam/myisamdef.h@1.103, 2007-10-11 18:07:36+03:00, monty@mysql.com +0 -7
    Moved store_key_length_inc to handler.h

  storage/myisam/myisampack.c@1.67, 2007-10-11 18:07:36+03:00, monty@mysql.com +3 -3
    mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/myisam/sp_test.c@1.17, 2007-10-11 18:07:36+03:00, monty@mysql.com +1 -1
    mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/myisammrg/ha_myisammrg.cc@1.125, 2007-10-11 18:07:36+03:00, monty@mysql.com +1 -1
    HA_EXTRA_PREPARE_FOR_DELETE -> HA_EXTRA_PREPARE_FOR_DROP

ChangeSet@1.1810.3324.3, 2007-10-10 08:19:01-04:00, cmiller@zippy.cornsilk.net +1 -0
  Bug#27433: Parser error for MySQL 5.0.37 with Bison 1.75 for \
  	sql_yacc.yy
  
  Yacc rules lacked semicolons to terminate rules, which is illegal in
  old versions of bison.
  
  Added semicolons.

  sql/sql_yacc.yy@1.371.1.164, 2007-10-10 08:19:00-04:00, cmiller@zippy.cornsilk.net +2 -2
    Add semicolons to terminate rules.

ChangeSet@1.2476.494.1, 2007-10-09 17:56:32-04:00, cmiller@zippy.cornsilk.net +4 -0
  Doxygenize comments, a*.cc - field.cc .

  sql/derror.cc@1.26, 2007-10-09 17:56:29-04:00, cmiller@zippy.cornsilk.net +24 -13
    Doxygenize comments.

  sql/des_key_file.cc@1.16, 2007-10-09 17:56:29-04:00, cmiller@zippy.cornsilk.net +9 -8
    Doxygenize comments.

  sql/discover.cc@1.9, 2007-10-09 17:56:29-04:00, cmiller@zippy.cornsilk.net +30 -28
    Doxygenize comments.

  sql/field.cc@1.416.1.1, 2007-10-09 17:56:29-04:00, cmiller@zippy.cornsilk.net +251 -268
    Doxygenize comments.

ChangeSet@1.1810.3354.10, 2007-10-08 12:46:38+05:00, bar@mysql.com +11 -0
  Bug#27580 SPACE() function collation bug?
  Problem: when character_set_connection=utf8,
  mixing SPACE() with a non-Unicode column (e.g. for concat)
  produced "illegal mix of collations" error.
  Fix: Item_string() corresponding to space character
  is now created using "ASCII" repertoire. Previously
  it was incorrectly created using "UNICODE" repertoure, which
  didn't allow to convert results of SPACE() to a non-Unicode
  character set.

  mysql-test/include/ctype_common.inc@1.2.1.1, 2007-10-08 12:46:36+05:00, bar@mysql.com +16 -0
    - Adding test for bug#27580
    - Restoring previous values of character_set_client and character_set_results,
    because ctype_common.inc now changes them when doing "set names utf8"
    in the test for bug#27580
    

  mysql-test/r/ctype_big5.result@1.13.1.1, 2007-10-08 12:46:36+05:00, bar@mysql.com +19 -0
    Adding test

  mysql-test/r/ctype_cp1250_ch.result@1.5.2.2, 2007-10-08 12:46:36+05:00, bar@mysql.com +152 -0
    Adding test

  mysql-test/r/ctype_euckr.result@1.4, 2007-10-08 12:46:36+05:00, bar@mysql.com +19 -0
    Adding test

  mysql-test/r/ctype_gb2312.result@1.2.1.1, 2007-10-08 12:46:36+05:00, bar@mysql.com +19 -0
    Adding test

  mysql-test/r/ctype_gbk.result@1.4.1.1, 2007-10-08 12:46:36+05:00, bar@mysql.com +19 -0
    Adding test

  mysql-test/r/ctype_uca.result@1.19.2.1, 2007-10-08 12:46:37+05:00, bar@mysql.com +19 -0
    Adding test

  mysql-test/r/ctype_ucs.result@1.39.3.1, 2007-10-08 12:46:37+05:00, bar@mysql.com +76 -0
    Adding test

  mysql-test/t/ctype_cp1250_ch.test@1.5.2.2, 2007-10-08 12:46:37+05:00, bar@mysql.com +10 -0
    Adding test

  mysql-test/t/ctype_ucs.test@1.36.4.1, 2007-10-08 12:46:37+05:00, bar@mysql.com +4 -0
    Adding test

  sql/item_create.cc@1.58.1.10, 2007-10-08 12:46:37+05:00, bar@mysql.com +2 -2
    Item for SQL function SPACE() is now created with ASCII repertoire,
    to allow automatic conversion from UTF8 to column's character
    set e.g. for CONCAT().

ChangeSet@1.1810.3324.2, 2007-10-04 10:35:09-04:00, cmiller@zippy.cornsilk.net +2 -0
  Track typedef'd struct.  Name changed in Enterprise tree, but
  community-exclusive file also referred to struct.

  sql/sql_profile.cc@1.9.1.3, 2007-10-04 10:35:07-04:00, cmiller@zippy.cornsilk.net +2 -2
    Track typedef'd struct.

  sql/sql_profile.h@1.5.1.2, 2007-10-04 10:35:07-04:00, cmiller@zippy.cornsilk.net +2 -2
    Track typedef'd struct.

ChangeSet@1.2476.460.1, 2007-10-01 15:32:07+03:00, monty@mysql.com +8 -0
  Removed extra spaces
  Added extra debug

  client/mysql_upgrade.c@1.39.1.2, 2007-10-01 15:32:05+03:00, monty@mysql.com +1 -1
    Removed extra space

  client/mysqlcheck.c@1.63.4.1, 2007-10-01 15:32:05+03:00, monty@mysql.com +1 -1
    Removed extra space

  client/mysqldump.c@1.291.5.1, 2007-10-01 15:32:05+03:00, monty@mysql.com +1 -1
    Removed extra space

  client/mysqlimport.c@1.85.1.1, 2007-10-01 15:32:05+03:00, monty@mysql.com +1 -1
    Removed extra space

  client/mysqlshow.c@1.56.1.1, 2007-10-01 15:32:05+03:00, monty@mysql.com +1 -1
    Removed extra space

  client/mysqlslap.c@1.61.1.1, 2007-10-01 15:32:05+03:00, monty@mysql.com +1 -1
    Removed extra space

  client/mysqltest.c@1.307.1.2, 2007-10-01 15:32:05+03:00, monty@mysql.com +1 -1
    Removed extra space

  sql/handler.cc@1.322.8.1, 2007-10-01 15:32:06+03:00, monty@mysql.com +2 -1
    Added extra debug

ChangeSet@1.1810.3349.1, 2007-09-28 09:49:16+08:00, gni@dev3-221.dev.cn.tlan +2 -0
  BUG#28298 Node Id larger than MAX_NDB_NODES in config file doesn't generate error

  ndb/include/kernel/ndb_limits.h@1.14.6.1, 2007-09-28 09:49:14+08:00, gni@dev3-221.dev.cn.tlan +11 -0
    1) define a macro MAX_DATA_NODE_ID to set the max ID of data nodes to be MAX_NDB_NODES - 1
    2) define a macro MAX_NODES_ID to set the max ID of API and MGM to be MAX_NODES -1

  ndb/src/mgmsrv/ConfigInfo.cpp@1.60.36.1, 2007-09-28 09:49:14+08:00, gni@dev3-221.dev.cn.tlan +6 -6
    1) replace MAX_NODES with MAX_DATA_NODE_ID (= MAX_NDB_NODES - 1)  when the NodeId represents data nodes.
    2) replace MAX_NODES with MAX_NODES_ID (= MAX_NODES -1) when the NodeId represents API or MGM nodes.

ChangeSet@1.1810.3282.3, 2007-09-28 09:16:41+08:00, gni@dev3-221.dev.cn.tlan +3 -0
  BUG#29851 TRUNCATE causes error 4350 from cluster in INSERT... ON DUPLICATE KEY UPDATE

  mysql-test/r/ndb_alter_table2.result@1.1.1.1, 2007-09-28 09:16:39+08:00, gni@dev3-221.dev.cn.tlan +19 -0
    Add test case for BUG#29851

  mysql-test/t/ndb_alter_table2.test@1.1.1.1, 2007-09-28 09:16:39+08:00, gni@dev3-221.dev.cn.tlan +31 -0
    Add test case for BUG#29851

  sql/ha_ndbcluster.cc@1.175.91.1, 2007-09-28 09:16:39+08:00, gni@dev3-221.dev.cn.tlan +9 -1
    Indexes are dropped also when dropping table in GlobalDictCache

ChangeSet@1.2476.426.1, 2007-09-14 22:18:20+08:00, lzhou@zhl.ndb.mysql.com +3 -0
  BUG#28647 Stop backup if disk full

  storage/ndb/src/kernel/blocks/backup/Backup.cpp@1.68, 2007-09-14 22:18:15+08:00, lzhou@zhl.ndb.mysql.com +57 -2
    Close files when disk full

  storage/ndb/src/ndbapi/ndberror.c@1.95, 2007-09-14 22:18:15+08:00, lzhou@zhl.ndb.mysql.com +2 -0
    Add error messages for backup failure

  storage/ndb/test/src/NdbBackup.cpp@1.29, 2007-09-14 22:18:15+08:00, lzhou@zhl.ndb.mysql.com +2 -1
    Add test case for disk full

ChangeSet@1.1810.3271.2, 2007-08-17 14:32:39+08:00, gni@dev3-221.dev.cn.tlan +2 -0
  BUG#30271 NDB_LE_MemoryUsage.page_size_kb actually returns page size in bytes, not kilobyte

  ndb/include/mgmapi/ndb_logevent.h@1.3.5.1, 2007-08-17 14:32:37+08:00, gni@dev3-221.dev.cn.tlan +7 -1
    Add page_size_bytes member variable for MemoryUsage. And don't remove page_size_kb member variable at present for the compatibility backward. 

  ndb/src/mgmapi/ndb_logevent.cpp@1.3.7.1, 2007-08-17 14:32:37+08:00, gni@dev3-221.dev.cn.tlan +1 -1
    change the page_size_kb member variable of MemoryUsage to page_size_bytes

ChangeSet@1.1810.3099.6, 2007-07-03 12:20:19-04:00, cmiller@zippy.cornsilk.net +2 -0
  In 5.0, Field_double::val_str uses "%g" to render floating point
  numbers, which uses "X.YeZ" notation when the exponent Z would be
  less than -4. That behavior at -4 is not exactly what we want, and
  our Decimal type offers smarter number representation.  By changing
  profiling to use Decimal types, we get more readable output.
  TAG: mysql-5.0.45
  TAG: clone-5.0.45-build

  sql/sql_profile.cc@1.9.1.2, 2007-07-03 12:20:17-04:00, cmiller@zippy.cornsilk.net +25 -10
    Change the DOUBLE I_S types to DECIMAL, so we get a smarter
    floating-point number renderer.

  sql/sql_show.cc@1.253.58.5, 2007-07-03 12:20:17-04:00, cmiller@zippy.cornsilk.net +9 -2
    Add MYSQL_TYPE_DECIMAL as a string-ish type that INFORMATION_SCHEMA
    tables may use.

ChangeSet@1.1810.3099.5, 2007-07-03 11:25:32-04:00, cmiller@zippy.cornsilk.net +1 -0
  Avoid a warning on windows about a missing case enum.

  sql/sql_parse.cc@1.426.155.4, 2007-07-03 11:25:30-04:00, cmiller@zippy.cornsilk.net +1 -0
    Avoid a warning on windows.

ChangeSet@1.1810.3099.4, 2007-07-02 12:29:07-04:00, cmiller@zippy.cornsilk.net +3 -0
  Merge fix-up.

  BitKeeper/deleted/.del-create_manifest.js@1.2, 2007-07-02 10:23:39-04:00, cmiller@zippy.cornsilk.net +0 -0
    Delete: win/create_manifest.js

  BitKeeper/deleted/.del-mysql_manifest.cmake@1.2, 2007-07-02 10:28:17-04:00, cmiller@zippy.cornsilk.net +0 -0
    Delete: win/mysql_manifest.cmake

  mysql-test/r/information_schema.result@1.87.5.3, 2007-07-02 12:29:04-04:00, cmiller@zippy.cornsilk.net +7 -7
    Move the test down.

ChangeSet@1.1810.3142.1, 2007-07-02 07:27:39-04:00, cmiller@zippy.cornsilk.net +8 -0
  Unify profiling SHOW code and INFORMATION_SCHEMA code for
  profiling.  Also,
  
  Bug#26938: profiling client hang if used before enabled
  
  In the SHOW command, not sending header data because we had no 
  rows to send was a protocol violation.  Porting the SHOW PROFILE
  command to use the Information Schema table avoids that problem.

  mysql-test/r/profiling.result@1.6, 2007-07-02 07:27:23-04:00, cmiller@zippy.cornsilk.net +4 -0
    Add headers of pre-profile SHOW test.

  mysql-test/t/profiling.test@1.2.1.1, 2007-07-02 07:27:23-04:00, cmiller@zippy.cornsilk.net +5 -0
    Verify that the protocol isn't violated if we ask for profiling 
    info before profiling has recorded anything.

  sql/sql_parse.cc@1.426.155.2, 2007-07-02 07:27:23-04:00, cmiller@zippy.cornsilk.net +9 -17
    Remove SQLCOM_SHOW_PROFILE and add a I_S schema table entry.

  sql/sql_profile.cc@1.9.1.1, 2007-07-02 07:27:23-04:00, cmiller@zippy.cornsilk.net +95 -253
    Add SHOW column-names and a new function that takes profile options
    set in the parser and packs a list of selected fields from the 
    I_S table implementation.

  sql/sql_profile.h@1.5.1.1, 2007-07-02 07:27:23-04:00, cmiller@zippy.cornsilk.net +1 -6
    Remove unused functions and add a new function.

  sql/sql_show.cc@1.253.55.2, 2007-07-02 07:27:24-04:00, cmiller@zippy.cornsilk.net +2 -1
    Add a pointer to the function that selects fields from I_S table
    for SHOW command.

  sql/sql_yacc.yy@1.371.109.2, 2007-07-02 07:27:24-04:00, cmiller@zippy.cornsilk.net +7 -1
    Prepare an I_S table for SHOW PROFILE.

  sql/table.h@1.102.18.2, 2007-07-02 07:27:24-04:00, cmiller@zippy.cornsilk.net +1 -1
    Rename to match the intention.

ChangeSet@1.1810.2811.52, 2007-05-07 19:48:11+02:00, df@pippilotta.erinye.com +1 -0
  raise version number

  configure.in@1.245.88.2, 2007-05-07 19:48:10+02:00, df@pippilotta.erinye.com +2 -2
    raise version number

ChangeSet@1.1810.2811.51, 2007-05-07 08:25:47+02:00, df@pippilotta.erinye.com +1 -0
  specfile fixes
  TAG: mysql-5.0.41

  support-files/mysql.spec.sh@1.99.17.2, 2007-05-07 08:25:45+02:00, df@pippilotta.erinye.com +19 -14
    specfile fixes

ChangeSet@1.1810.2811.50, 2007-05-04 09:46:33+02:00, df@pippilotta.erinye.com +1 -0
  backport a manifest fix

  CMakeLists.txt@1.1.17.3, 2007-05-04 09:46:31+02:00, df@pippilotta.erinye.com +5 -0
    backported fix

ChangeSet@1.2478, 2007-05-02 14:13:33-04:00, cmiller@zippy.cornsilk.net +17 -0
  Fix up merge.  Some macros are now functions.  Some functions are
  renamed.  Some new THD proc_info states are new.  Directories must be
  encountered in make in a specific order, to have symlinks already set.
  Move community-server-specific tests into own tests, so that we can 
  exempt them from testing on enterprise servers.

  BitKeeper/deleted/.del-profiling.inc@1.2, 2007-05-02 13:08:55-04:00, cmiller@zippy.cornsilk.net +0 -0
    Delete: mysql-test/include/profiling.inc

  BitKeeper/deleted/.del-profiling.require@1.2, 2007-05-02 13:09:09-04:00, cmiller@zippy.cornsilk.net +0 -0
    Delete: mysql-test/r/profiling.require

  configure.in@1.459, 2007-05-02 14:13:30-04:00, cmiller@zippy.cornsilk.net +3 -2
    Set a new order of sql_client_dirs, so that the make directory traversal
    doesn't miss symlink dependencies.

  mysql-test/include/have_community_features.inc@1.1, 2007-05-02 14:13:30-04:00, cmiller@zippy.cornsilk.net +4 -0
    New BitKeeper file ``mysql-test/include/have_community_features.inc''

  mysql-test/include/have_community_features.inc@1.0, 2007-05-02 14:13:30-04:00, cmiller@zippy.cornsilk.net +0 -0

  mysql-test/r/have_community_features.require@1.1, 2007-05-02 14:13:30-04:00, cmiller@zippy.cornsilk.net +2 -0
    New BitKeeper file ``mysql-test/r/have_community_features.require''

  mysql-test/r/have_community_features.require@1.0, 2007-05-02 14:13:30-04:00, cmiller@zippy.cornsilk.net +0 -0

  mysql-test/r/not_embedded_server.result@1.8, 2007-05-02 14:13:30-04:00, cmiller@zippy.cornsilk.net +1 -1
    Account for new "executing" state.

  mysql-test/r/variables+c.result@1.1, 2007-05-02 14:13:30-04:00, cmiller@zippy.cornsilk.net +7 -0
    New BitKeeper file ``mysql-test/r/variables+c.result''

  mysql-test/r/variables+c.result@1.0, 2007-05-02 14:13:30-04:00, cmiller@zippy.cornsilk.net +0 -0

  mysql-test/t/information_schema.test@1.100, 2007-05-02 14:13:30-04:00, cmiller@zippy.cornsilk.net +0 -8
    Move community-feature test to another test file.

  mysql-test/t/profiling.test@1.4, 2007-05-02 14:13:30-04:00, cmiller@zippy.cornsilk.net +1 -1
    Make test more generic to community features.

  mysql-test/t/variables+c.test@1.1, 2007-05-02 14:13:30-04:00, cmiller@zippy.cornsilk.net +11 -0
    New BitKeeper file ``mysql-test/t/variables+c.test''

  mysql-test/t/variables+c.test@1.0, 2007-05-02 14:13:30-04:00, cmiller@zippy.cornsilk.net +0 -0

  sql/lex.h@1.176, 2007-05-02 14:13:30-04:00, cmiller@zippy.cornsilk.net +1 -0
    Add symbol lost in manual merge.

  sql/mysql_priv.h@1.501.1.2, 2007-05-02 14:13:30-04:00, cmiller@zippy.cornsilk.net +3 -0
    Insert a preprocessor layer between setting the caller and the function
    that sets the thread state, so we can get caller information.

  sql/mysqld.cc@1.636.1.2, 2007-05-02 14:13:30-04:00, cmiller@zippy.cornsilk.net +10 -0
    Add new server variable "have_community_features".

  sql/set_var.cc@1.229.1.2, 2007-05-02 14:13:30-04:00, cmiller@zippy.cornsilk.net +2 -0
    Add new server variable "have_community_features".

  sql/sql_class.cc@1.332.2.2, 2007-05-02 14:13:30-04:00, cmiller@zippy.cornsilk.net +8 -1
    Insert a preprocessor layer between setting the caller and the function
    that sets the thread state, so we can get caller information.

  sql/sql_profile.cc@1.11, 2007-05-02 14:13:30-04:00, cmiller@zippy.cornsilk.net +1 -1
    Function name change, my_strndup()

  sql/sql_profile.h@1.7, 2007-05-02 14:13:30-04:00, cmiller@zippy.cornsilk.net +1 -18
    Insert a preprocessor layer between setting the caller and the function
    that sets the thread state, so we can get caller information.

ChangeSet@1.1810.2811.48, 2007-04-30 14:22:38+02:00, dfischer@mysql.com +2 -0
  create_manifest.js, mysql_manifest.cmake:
    add files for patch

  win/create_manifest.js@1.1, 2007-04-30 14:22:13+02:00, dfischer@mysql.com +85 -0
    add files for patch

  win/create_manifest.js@1.0, 2007-04-30 14:22:13+02:00, dfischer@mysql.com +0 -0

  win/mysql_manifest.cmake@1.1, 2007-04-30 14:22:19+02:00, dfischer@mysql.com +20 -0
    add files for patch

  win/mysql_manifest.cmake@1.0, 2007-04-30 14:22:19+02:00, dfischer@mysql.com +0 -0

ChangeSet@1.1810.2811.47, 2007-04-30 13:30:58+02:00, dfischer@mysql.com +1 -0
  Makefile.am:
    fix typo

  win/Makefile.am@1.1.4.2, 2007-04-30 13:30:46+02:00, dfischer@mysql.com +1 -1
    fix typo

ChangeSet@1.1810.2811.46, 2007-04-30 11:41:19+02:00, dfischer@mysql.com +10 -0
  backport vista manifest patch

  win/Makefile.am@1.1.4.1, 2007-04-30 11:41:08+02:00, dfischer@mysql.com +2 -1
    backport vista manifest patch

  win/README@1.1.4.1, 2007-04-30 11:41:08+02:00, dfischer@mysql.com +2 -0
    backport vista manifest patch

  win/configure.js@1.1.6.1, 2007-04-30 11:41:08+02:00, dfischer@mysql.com +1 -0
    backport vista manifest patch

  CMakeLists.txt@1.1.17.1, 2007-04-30 11:41:04+02:00, dfischer@mysql.com +27 -0
    backport vista manifest patch

  client/CMakeLists.txt@1.1.7.1, 2007-04-30 11:41:04+02:00, dfischer@mysql.com +14 -0
    backport vista manifest patch

  extra/CMakeLists.txt@1.1.5.1, 2007-04-30 11:41:05+02:00, dfischer@mysql.com +7 -0
    backport vista manifest patch

  libmysql/CMakeLists.txt@1.1.3.1, 2007-04-30 11:41:05+02:00, dfischer@mysql.com +5 -0
    backport vista manifest patch

  server-tools/instance-manager/CMakeLists.txt@1.1.3.1, 2007-04-30 11:41:05+02:00, dfischer@mysql.com +5 -0
    backport vista manifest patch

  sql/CMakeLists.txt@1.1.7.1, 2007-04-30 11:41:08+02:00, dfischer@mysql.com +5 -0
    backport vista manifest patch

  myisam/CMakeLists.txt@1.1.3.1, 2007-04-30 11:41:05+02:00, dfischer@mysql.com +8 -0
    backport vista manifest patch

ChangeSet@1.1810.2899.1, 2007-04-24 18:11:55-04:00, cmiller@zippy.cornsilk.net +13 -0
  Wrap code specific to the comunity-server in additional CPP #ifdef .
  
  Add a new autoconf paremeter --{en,dis}able-community-features .  The
  default is disable for enterprise servers.
  
  Though this is a 5.0 tree, it is only to be merged into the 5.0-community
  tree and the global 5.1 tree, never to the 5.0-enterprise tree.

  mysql-test/include/profiling.inc@1.1, 2007-04-24 18:11:52-04:00, cmiller@zippy.cornsilk.net +4 -0
    Add testing for whether profiling is enabled or not.

  mysql-test/include/profiling.inc@1.0, 2007-04-24 18:11:52-04:00, cmiller@zippy.cornsilk.net +0 -0

  mysql-test/r/profiling.require@1.1, 2007-04-24 18:11:52-04:00, cmiller@zippy.cornsilk.net +2 -0
    Add testing for whether profiling is enabled or not.

  mysql-test/r/profiling.require@1.0, 2007-04-24 18:11:52-04:00, cmiller@zippy.cornsilk.net +0 -0

  configure.in@1.245.1.181, 2007-04-24 18:11:51-04:00, cmiller@zippy.cornsilk.net +29 -4
    Add a new configure parameter, --enable-community-features for community 
    features.

  mysql-test/t/profiling.test@1.3, 2007-04-24 18:11:51-04:00, cmiller@zippy.cornsilk.net +2 -0
    Add testing for whether profiling is enabled or not.

  sql/mysqld.cc@1.439.111.2, 2007-04-24 18:11:52-04:00, cmiller@zippy.cornsilk.net +3 -1
    Add additional "COMMUNITY_SERVER" cpp definition test.

  sql/set_var.cc@1.125.26.2, 2007-04-24 18:11:52-04:00, cmiller@zippy.cornsilk.net +3 -3
    Add additional "COMMUNITY_SERVER" cpp definition test.

  sql/sql_class.cc@1.223.1.38, 2007-04-24 18:11:52-04:00, cmiller@zippy.cornsilk.net +1 -1
    Add additional "COMMUNITY_SERVER" cpp definition test.

  sql/sql_class.h@1.230.1.89, 2007-04-24 18:11:52-04:00, cmiller@zippy.cornsilk.net +1 -1
    Add additional "COMMUNITY_SERVER" cpp definition test.

  sql/sql_parse.cc@1.426.1.173, 2007-04-24 18:11:52-04:00, cmiller@zippy.cornsilk.net +4 -4
    Add additional "COMMUNITY_SERVER" cpp definition test.

  sql/sql_prepare.cc@1.142.28.2, 2007-04-24 18:11:52-04:00, cmiller@zippy.cornsilk.net +1 -1
    Add additional "COMMUNITY_SERVER" cpp definition test.

  sql/sql_profile.cc@1.10, 2007-04-24 18:11:52-04:00, cmiller@zippy.cornsilk.net +2 -2
    Add additional "COMMUNITY_SERVER" cpp definition test.

  sql/sql_profile.h@1.6, 2007-04-24 18:11:52-04:00, cmiller@zippy.cornsilk.net +1 -1
    Add additional "COMMUNITY_SERVER" cpp definition test.

  sql/sql_show.cc@1.253.53.3, 2007-04-24 18:11:52-04:00, cmiller@zippy.cornsilk.net +2 -0
    Add "COMMUNITY_SERVER" cpp definition test.

ChangeSet@1.1810.2730.27, 2007-04-20 14:01:49+02:00, df@pippilotta.erinye.com +1 -0
  win32 build fix

  VC++Files/sql/mysqld.vcproj@1.3.7.3, 2007-04-20 14:01:48+02:00, df@pippilotta.erinye.com +3 -75
    win32 build fix

ChangeSet@1.1810.2730.26, 2007-04-16 15:00:16-04:00, cmiller@zippy.cornsilk.net +2 -0
  Bug#25347: mysqlcheck -A -r doesn't repair table marked as crashed
  
  Additional changes to test:  "flush tables" so that Windows releases
  the files.

  mysql-test/r/mysqlcheck.result@1.1.1.4, 2007-04-16 15:00:13-04:00, cmiller@zippy.cornsilk.net +26 -1
    Add "flush tables" to get windows to release the files, so that 
    we can test truncation properly.

  mysql-test/t/mysqlcheck.test@1.1.1.5, 2007-04-16 15:00:13-04:00, cmiller@zippy.cornsilk.net +8 -0
    Add "flush tables" to get windows to release the files, so that 
    we can test truncation properly.

ChangeSet@1.1810.2730.25, 2007-04-10 16:47:07-04:00, cmiller@zippy.cornsilk.net +1 -0
  Use platform-independent mysqltest language.

  mysql-test/t/mysqlcheck.test@1.1.1.4, 2007-04-10 16:47:06-04:00, cmiller@zippy.cornsilk.net +3 -2
    Use platform-independent mysqltest language.

ChangeSet@1.1810.2730.24, 2007-04-06 09:15:18-04:00, cmiller@zippy.cornsilk.net +3 -0
  Changing the state of whether we're recording profiling information
  halfway through a query (as happens in "SET SESSION PROFILING = ...")
  has a few side-effects, the worst of which is a memory leak for
  prepared statements, which poke directly from the parser into the 
  profiling code (we don't have the query text when we need it) and 
  that overwrites a pointer to heap-allocated memory when the previous
  statement turns on profiling.
  
  Instead, now set a flag when we begin a new statement that tracks 
  whether profiling is on _at the start_ of the query.  Use that to
  track whether we gather info.
  
  Additionally, use that AND use the state of the profiling variable
  after the end of a query to know whether to store information about 
  the query that just finished.

  mysql-test/r/profiling.result@1.5, 2007-04-06 09:15:16-04:00, cmiller@zippy.cornsilk.net +126 -127
    Testing whether profiling is on at the beginning of a query and at
    the end of a query makes "SET SESSION PROFILING = ..." statements
    disappear from the profiling.  They were never reliable before.

  sql/sql_profile.cc@1.9, 2007-04-06 09:15:16-04:00, cmiller@zippy.cornsilk.net +15 -3
    Check to see if profiling was enabled at the beginning of this query
    before trying to store query_source.  This avoids a memory leak for
    prepared statements, which get here by direct means.
    
    If profiling was toggled in this query, then don't store this query
    profile.

  sql/sql_profile.h@1.5, 2007-04-06 09:15:16-04:00, cmiller@zippy.cornsilk.net +1 -0
    Keep track of whether profiling is on.

ChangeSet@1.1810.2730.23, 2007-04-04 07:44:12-04:00, cmiller@zippy.cornsilk.net +1 -0
  Backport:
  
  B-g#27427: resolveip fails on hostnames with a leading digit
  
  We need inet_aton for the extra/resolveip tool.  Some OSes put this
  in nonstandard libraries.

  configure.in@1.245.1.180, 2007-04-04 07:44:10-04:00, cmiller@zippy.cornsilk.net +1 -0
    We need inet_aton for the extra/resolveip tool.

ChangeSet@1.1810.2730.22, 2007-04-03 19:52:24-04:00, cmiller@zippy.cornsilk.net +2 -0
  Unreported minor bug:  We start numbering query IDs at zero, which
  is a special case in "SHOW PROFILE FOR QUERY n".  No one can get
  the zero item (which is always the statement that turns on profiling),
  because zero represents the final item, internally.
  
  Now, order the queries starting at one.

  mysql-test/r/profiling.result@1.4, 2007-04-03 19:52:23-04:00, cmiller@zippy.cornsilk.net +127 -127
    Renumber the query IDs.

  sql/sql_profile.cc@1.8, 2007-04-03 19:52:23-04:00, cmiller@zippy.cornsilk.net +2 -2
    Start the profile_id_counter at 1, to overstep the special-case 
    value of zero.
    
    Unrelated, but looks similar: don't use -1 to initialize an unsigned 
    integer field.  That causes warnings in some environments.

ChangeSet@1.1810.2730.21, 2007-04-03 19:50:55-04:00, cmiller@zippy.cornsilk.net +2 -0
  Backport:
  
  B-g#27501: 5.0 significantly more sys ("kernel") time than 4.1 \
        due to getrusage() calls
  
  Even if profiling is turned off, the parser makes calls to reset 
  the state at the beginning of each query.  That would eventually 
  instantiate a PROFILE_ENTRY, which does indeed capture resource 
  usage.
  
  Instead, now check that profiling is active before progressing
  far into the storage/expiration of old entries in the history.
  This has the pleasant side-effect that queries to toggle profiling
  are not recorded in the history.

  mysql-test/r/profiling.result@1.3, 2007-04-03 19:50:53-04:00, cmiller@zippy.cornsilk.net +1 -1
    Now after we turn off profiling, the beginning of the next query 
    refuses to enter the profiling code and it discards the info.

  sql/sql_profile.cc@1.7, 2007-04-03 19:50:53-04:00, cmiller@zippy.cornsilk.net +11 -0
    Add the same condition twice:  Once to abort storing previous 
    query information and the other to abort initialization for this 
    query that is starting.
    
    We do this symmetrically, before and after expiring old history 
    entries, so that the counts are correct.

ChangeSet@1.1810.2730.20, 2007-04-03 19:47:19-04:00, cmiller@zippy.cornsilk.net +1 -0
  Backport:
  
  B-g#26600: table PROFILING in INFORMATION SCHEMA has wrong data type
  
  B-g#27047[partial]: INFORMATION_SCHEMA table cannot have BIGINT \
        fields
  
  No Information_schema table has ever needed floating-point data 
  before.  Transforming all floating point to a string and back to a
  number causes a real data problem on Windows, where the libc may 
  pad the exponent with more leading zeroes than we expect and the
  significant digits are truncated away.
  
  This also makes interpreting an unimplemented type as a string into
  a fatal error in debug builds.  Thus, we will catch problems when we
  try to use those types in new I_S tables.

  sql/sql_show.cc@1.253.53.2, 2007-04-03 19:47:17-04:00, cmiller@zippy.cornsilk.net +9 -0
    Add floating-point types to Information_schema output.

ChangeSet@1.1810.2730.19, 2007-04-03 19:45:28-04:00, cmiller@zippy.cornsilk.net +1 -0
  Backport:
  
  B-g#27060: SQL Profile utility may not be reporting right duration \
        for each step
  
  Whenever the profiler is reset at the beginning of a query, there's
  a "hidden" profiling entry that represents that point in time.  It 
  has no status description, as those are set by state changes and no
  such point has yet been encountered.  That profiling entry is not
  in the list of entries generated when we change states.
  
  The profiling code had the problem that each step of printing 
  profiling data subtracted the previous "step"'s data, but gave the
  label to that data of the current step, which is wrong.  The label/
  state refers to the period beginning with that profiling data, not
  ending with it.
  
  Now, give a label to the first profiling pseudo-entry, so that we 
  have a name to assign to the period that ends with the first state 
  change.  Now also use the state name of the previous step in showing 
  the delta values that end with this step.

  sql/sql_profile.cc@1.6, 2007-04-03 19:45:26-04:00, cmiller@zippy.cornsilk.net +61 -46
    Store a status of "initializing" whenever we construct the first
    profile entry -- the one that gets reset whenever we're starting 
    a new query, before the server sets a real status.
    
    Additionally, associate the previous status with the time period
    that ends with the current profile entry's stats.
    
    Since we need yet another piece of info from the previous profiling
    entry, take out the piecemeal ways we currently do it and make a
    general pointer to the whole thing.

ChangeSet@1.1810.2730.18, 2007-04-03 18:12:31-04:00, cmiller@zippy.cornsilk.net +3 -0
  Backport:
  
  Patch contributed by Jocelyn Fournier.  CLA received 2007-02-27.
    
  B-g#25347: mysqlcheck -A -r doesn't repair table marked as crashed
    
  mysqlcheck tests nullness of the engine type to know whether the
  "table" is a view or not.  That also falsely catches tables that 
  are severly damaged.
    
  Instead, use SHOW FULL TABLES to test whether a "table" is a view
  or not.
    
  (Don't add new function.  Instead, get original data a smarter way.)
  
  Make it safe for use against databases before when views appeared.

  client/mysqlcheck.c@1.55.1.4, 2007-04-03 18:12:29-04:00, cmiller@zippy.cornsilk.net +15 -12
    Use SHOW FULL TABLES to test better whether a name in the table
    list is one of a view.  Checking that the engine is NULL is 
    insufficient.
    
    Implemented suggestion from jimw that involved removing most of 
    original patch and getting data a better way

  mysql-test/r/mysqlcheck.result@1.1.1.3, 2007-04-03 18:12:29-04:00, cmiller@zippy.cornsilk.net +10 -0
    Verify that tables that have NULL/unreadable engine types are 
    processed and not interpreted as views.

  mysql-test/t/mysqlcheck.test@1.1.1.3, 2007-04-03 18:12:29-04:00, cmiller@zippy.cornsilk.net +16 -0
    Verify that tables that have NULL/unreadable engine types are 
    processed and not interpreted as views.

ChangeSet@1.1810.2730.17, 2007-04-03 17:59:52-04:00, cmiller@zippy.cornsilk.net +2 -0
  Backport:
  
  B-g#24795: SHOW PROFILE implementation
  
  Don't use memory roots to store profiling information, because
  memory roots make freeing the data a no-op, and thus long-running
  processes with profiling turned on the whole time could eventually 
  use all available memory.
  
  Instead, use regular heap allocation and deallocation calls to 
  manage profiling data.  Replace the leaky List usage with a similar-
  behaving structure named "Queue".

  sql/sql_profile.cc@1.5, 2007-04-03 17:59:50-04:00, cmiller@zippy.cornsilk.net +39 -72
    Don't use C++ iterators on our simple Queue implementation.  They're
    not implemented and we don't really need them.
    
    Rip out idea of swapping out the thd's mem_root.

  sql/sql_profile.h@1.4, 2007-04-03 17:59:50-04:00, cmiller@zippy.cornsilk.net +108 -3
    Rip out idea of needing a mem_root.
    
    Implement a Queue that looks and behaves very similarly to memroot-
    using List.

ChangeSet@1.1810.2730.16, 2007-04-03 14:08:09-04:00, cmiller@zippy.cornsilk.net +3 -0
  Backport of Igor's patch for Bug#27362, March 22 2007.
  
  Fixed bug #27362: crash at evaluation of IN predicate when one
  of its argument happened to be a decimal expression returning
  the NULL value.
  The crash was due to the fact the function in_decimal::set did
  not take into account that val_decimal() could return 0 if 
  the decimal expression had been evaluated to NULL.  

  mysql-test/r/func_in.result@1.28.4.1, 2007-04-03 14:08:07-04:00, cmiller@zippy.cornsilk.net +5 -0
    Added a test case for bug #27362.

  mysql-test/t/func_in.test@1.22.4.1, 2007-04-03 14:08:07-04:00, cmiller@zippy.cornsilk.net +11 -0
    Added a test case for bug #27362.

  sql/item_cmpfunc.cc@1.187.34.2, 2007-04-03 14:08:07-04:00, cmiller@zippy.cornsilk.net +2 -1
    Fixed bug #27362: crash at evaluation of IN predicate when one
    of its argument happened to be a decimal expression returning
    the NULL value.
    The crash was due to the fact the function in_decimal::set did
    not take into account that val_decimal() could return 0 if 
    the decimal expression had been evaluated to NULL.  

ChangeSet@1.1810.2730.15, 2007-04-03 14:05:00-04:00, cmiller@zippy.cornsilk.net +2 -0
  The test suite erroneously removes backslashes.

  mysql-test/r/profiling.result@1.2, 2007-04-03 14:04:58-04:00, cmiller@zippy.cornsilk.net +1 -1
    The test suite erroneously removes backslashes.

  mysql-test/t/profiling.test@1.2, 2007-04-03 14:04:58-04:00, cmiller@zippy.cornsilk.net +1 -1
    The test suite erroneously removes backslashes.

ChangeSet@1.1810.2730.14, 2007-04-03 13:26:19-04:00, cmiller@zippy.cornsilk.net +1 -0
  Listing all columns of a particular type tells us nothing at all.  
  The test fails, and it shouldn't.

  mysql-test/r/information_schema.result@1.87.1.36, 2007-04-03 13:26:17-04:00, cmiller@zippy.cornsilk.net +1 -1
    The query to generate this list is pretty bogus in any case.  Listing 
    all columns of a particular type tells us nothing at all.

ChangeSet@1.1810.2691.1, 2007-03-07 20:25:57+01:00, df@pippilotta.erinye.com +1 -0
  adjust version string in mysql-5.0-community commit trigger

  BitKeeper/triggers/post-commit@1.26.1.16, 2007-03-07 20:25:55+01:00, df@pippilotta.erinye.com +1 -1
    adjust version string in trigger

ChangeSet@1.1810.2652.7, 2007-03-05 16:10:42+01:00, df@pippilotta.erinye.com +1 -0
  add ad
  TAG: mysql-5.0.37

  support-files/mysql.spec.sh@1.99.14.1, 2007-03-05 16:10:41+01:00, df@pippilotta.erinye.com +5 -0
    add ad at %post

ChangeSet@1.1810.2676.1, 2007-03-02 09:14:33-05:00, cmiller@zippy.cornsilk.net +2 -0
  Patch to release clone.  Fixes two post-pushbuild discovered failures.
  
  Expand float size to avoid assert()ion failures.
  
  "_db_func_" isn't a known linked object on some platforms, possibly 
  because it is occasionaly shadowed by DBUG variables.  Avoid that
  confusion.

  sql/sql_profile.cc@1.4, 2007-03-02 09:14:31-05:00, cmiller@zippy.cornsilk.net +2 -2
    Expand float size to avoid assert()ion failures.
    
    "_db_func_" isn't a known linked object on some platforms, possibly 
    because it is occasionaly shadowed by DBUG variables.  Avoid that
    confusion.

  sql/sql_profile.h@1.3, 2007-03-02 09:14:31-05:00, cmiller@zippy.cornsilk.net +6 -6
    "_db_func_" isn't a known linked object on some platforms, possibly 
    because it is occasionaly shadowed by DBUG variables.  Avoid that
    confusion.

ChangeSet@1.1810.2652.5, 2007-03-01 21:56:51+01:00, df@pippilotta.erinye.com +1 -0
  add missing file to vs project

  VC++Files/sql/mysqld.vcproj@1.3.7.1, 2007-03-01 21:56:50+01:00, df@pippilotta.erinye.com +75 -0
    add sql_profile.cpp to mysqld project

ChangeSet@1.1810.2652.4, 2007-03-01 10:45:55+01:00, dfischer@mysql.com +1 -0
  File.cpp:
    fileno is a macro on some platforms

  ndb/src/common/util/File.cpp@1.8.17.1, 2007-03-01 10:45:41+01:00, dfischer@mysql.com +1 -1
    fileno is a macro on some platforms

ChangeSet@1.1810.2652.3, 2007-03-01 09:38:09+01:00, dfischer@mysql.com +1 -0
  mysqld.cc:
    fix profiling_history_size type

  sql/mysqld.cc@1.439.103.2, 2007-03-01 09:37:10+01:00, dfischer@mysql.com +1 -1
    fix profiling_history_size type

ChangeSet@1.1810.2652.2, 2007-02-27 20:04:58-05:00, cmiller@zippy.cornsilk.net +1 -0
  Update to I_S result that now contains PROFILING entry.
  TAG: clone-5.0.37-build

  mysql-test/r/information_schema.result@1.87.1.35, 2007-02-27 20:04:57-05:00, cmiller@zippy.cornsilk.net +1 -0
    Update to I_S result that now contains PROFILING entry.

ChangeSet@1.1810.2506.11, 2007-02-27 11:30:03-05:00, cmiller@calliope.local.cmiller +1 -0
  Updated column names of I_S table to conform to other I_S uppercase scheme.

  mysql-test/r/information_schema.result@1.87.1.33, 2007-02-27 11:28:40-05:00, cmiller@calliope.local.cmiller +2 -2
    Updated column names of I_S table to conform to other I_S uppercase scheme.

ChangeSet@1.1810.2506.10, 2007-02-26 13:11:36-05:00, cmiller@calliope.local.cmiller +7 -0
  Some changes suggested Serg, from message <20070223210659.GA24202@janus.mylan>

  configure.in@1.245.1.177, 2007-02-26 13:11:22-05:00, cmiller@calliope.local.cmiller +1 -1
    Use smarter autoconf help macro.

  sql/set_var.cc@1.125.21.4, 2007-02-26 13:11:23-05:00, cmiller@calliope.local.cmiller +1 -1
    Make a local variable static.

  sql/sql_lex.cc@1.142.30.6, 2007-02-26 13:11:23-05:00, cmiller@calliope.local.cmiller +0 -2
    Don't include CPP condition where it saves little time and decreases legibility.

  sql/sql_parse.cc@1.426.1.170, 2007-02-26 13:11:24-05:00, cmiller@calliope.local.cmiller +2 -2
    Use the name of the query in the error, instead of describing the feature.

  sql/sql_profile.cc@1.3, 2007-02-26 13:11:25-05:00, cmiller@calliope.local.cmiller +38 -52
    Update copyright.
    
    Make I_S schema table columns uppercase.

  sql/sql_profile.h@1.2, 2007-02-26 13:11:26-05:00, cmiller@calliope.local.cmiller +1 -2
    Update copyright.

  sql/sql_select.cc@1.312.124.3, 2007-02-26 13:11:26-05:00, cmiller@calliope.local.cmiller +2 -2
    Chagne tab indentation to spaces.

ChangeSet@1.1810.2506.9, 2007-02-22 16:25:47-05:00, cmiller@zippy.cornsilk.net +1 -0
  Disambiguate method call.  (Windows compiler error.)

  sql/sql_profile.cc@1.2, 2007-02-22 16:25:45-05:00, cmiller@zippy.cornsilk.net +1 -1
    Disambiguate method call.  (Windows compiler error.)

ChangeSet@1.1810.2506.8, 2007-02-22 13:17:02-05:00, cmiller@zippy.cornsilk.net +1 -0
  Use correct filename for profiling code.

  sql/CMakeLists.txt@1.1.5.2, 2007-02-22 13:17:01-05:00, cmiller@zippy.cornsilk.net +1 -1
    Use correct filename for profiling code.

ChangeSet@1.1810.2506.7, 2007-02-22 12:27:15-05:00, cmiller@zippy.cornsilk.net +1 -0
  Add profiling source file to cmake file.

  sql/CMakeLists.txt@1.1.5.1, 2007-02-22 12:27:14-05:00, cmiller@zippy.cornsilk.net +1 -0
    Add profiling source file to cmake file.

ChangeSet@1.1810.2506.6, 2007-02-22 11:48:56-05:00, cmiller@zippy.cornsilk.net +3 -0
  Enclose profiling in preprocessor conditions.

  BitKeeper/etc/collapsed@1.5.7.4, 2007-02-22 11:44:51-05:00, cmiller@zippy.cornsilk.net +2 -0

  include/config-win.h@1.71.3.2, 2007-02-22 11:48:55-05:00, cmiller@zippy.cornsilk.net +3 -0
    Make profiling compiled-in by default on Windows too.

  sql/sql_prepare.cc@1.142.26.2, 2007-02-22 11:48:55-05:00, cmiller@zippy.cornsilk.net +2 -0
    Enclose profiling in preprocessor conditions.

ChangeSet@1.1810.2506.5, 2007-02-22 10:03:08-05:00, cmiller@zippy.cornsilk.net +51 -0
  Prevent bugs by making DBUG_* expressions syntactically equivalent 
  to a single statement.
  ---
  Bug#24795: SHOW PROFILE
  
  Profiling is only partially functional on some architectures.  Where 
  there is no getrusage() system call, presently Null values are 
  returned where it would be required.  Notably, Windows needs some love 
  applied to make it as useful.
  
    Syntax this adds:
    
    SHOW PROFILES
    
    SHOW PROFILE [types] [FOR QUERY n] [OFFSET n] [LIMIT n]
     where "n" is an integer
     and "types" is zero or many (comma-separated) of
        "CPU"
        "MEMORY" (not presently supported)
        "BLOCK IO"
        "CONTEXT SWITCHES"
        "PAGE FAULTS"
        "IPC"
        "SWAPS"
        "SOURCE"
        "ALL"
  
  It also adds a session variable (boolean) "profiling", set to "no"
  by default, and (integer) profiling_history_size, set to 15 by 
  default.
  
  This patch abstracts setting THDs' "proc_info" behind a macro that 
  can be used as a hook into the profiling code when profiling 
  support is compiled in.  All future code in this line should use
  that mechanism for setting thd->proc_info.
  
  ---
  
  Tests are now set to omit the statistics.
  
  ---
  
  Adds an Information_schema table, "profiling" for access to 
  "show profile" data.
  ---
  Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community-3--bug24795
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
  ---
  Fix merge problems.
  ---
  Fixed one bug in the query_source being NULL.  
  
  Updated test results.
  ---
  Include more thorough profiling tests.
  
  Improve support for prepared statements.
  
  Use session-specific query IDs, starting at zero.
  ---
  Selecting from I_S.profiling is no longer quashed in profiling, as
  requested by Giuseppe.
  
  Limit the size of captured query text.
  
  No longer log queries that are zero length.

  sql/ha_berkeley.cc@1.151.9.1, 2007-02-22 10:03:02-05:00, cmiller@zippy.cornsilk.net +2 -2
    Include patch backported to 5.0-global.
    
    THD::options is a ulonglong, not ulong.

  BitKeeper/deleted/.del-profile.result@1.2, 2007-02-22 10:02:24-05:00, cmiller@zippy.cornsilk.net +0 -0
    Rename: mysql-test/r/profile.result -> BitKeeper/deleted/.del-profile.result

  BitKeeper/deleted/.del-profile.test@1.2, 2007-02-22 10:02:24-05:00, cmiller@zippy.cornsilk.net +0 -0
    Rename: mysql-test/t/profile.test -> BitKeeper/deleted/.del-profile.test

  BitKeeper/deleted/.del-profiling-master.opt@1.1, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +1 -0
    New BitKeeper file ``mysql-test/t/profiling-master.opt''

  BitKeeper/deleted/.del-profiling-master.opt@1.0, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +0 -0

  BitKeeper/deleted/.del-sql_profile.cc@1.2, 2007-02-22 10:02:25-05:00, cmiller@zippy.cornsilk.net +0 -0
    Rename: sql/sql_profile.cc -> BitKeeper/deleted/.del-sql_profile.cc

  BitKeeper/deleted/.del-sql_profile.h@1.2, 2007-02-22 10:02:26-05:00, cmiller@zippy.cornsilk.net +0 -0
    Rename: sql/sql_profile.h -> BitKeeper/deleted/.del-sql_profile.h

  BitKeeper/etc/collapsed@1.5.7.3, 2007-02-22 10:02:26-05:00, cmiller@zippy.cornsilk.net +9 -0

  configure.in@1.245.1.176, 2007-02-22 10:03:02-05:00, cmiller@zippy.cornsilk.net +14 -0
    Add a configure-time option to enable/disable query profiling.  The
    default is enabled.

  include/my_dbug.h@1.16.2.6, 2007-02-22 10:03:02-05:00, cmiller@zippy.cornsilk.net +6 -6
    
    
    DBUG_* statements should be syntactically equivalent to a single 
    statement.

  mysql-test/r/information_schema.result@1.87.1.32, 2007-02-22 10:03:02-05:00, cmiller@zippy.cornsilk.net +7 -4
    Updated (re-recorded) tests that I missed somehow.  I verified these
    for correctness.

  mysql-test/r/information_schema_db.result@1.1.1.9, 2007-02-22 10:03:02-05:00, cmiller@zippy.cornsilk.net +1 -0
    Updated test results I missed.

  mysql-test/r/mysqlshow.result@1.4.1.1, 2007-02-22 10:03:02-05:00, cmiller@zippy.cornsilk.net +2 -0
    Fix merge problems.

  mysql-test/r/profiling.result@1.1, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +365 -0
    New BitKeeper file ``mysql-test/r/profiling.result''
    ---
    Include more verbose that describes the queries so far.
    
    Include Giuseppe's tests.
    ---
    Selecting from I_S.profiling is no longer quashed in profiling, as
    requested by Giuseppe.

  mysql-test/r/profiling.result@1.0, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +0 -0

  mysql-test/t/profiling.test@1.1, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +195 -0
    New BitKeeper file ``mysql-test/t/profiling.test''
    ---
    Include more verbose that describes the queries so far.
    
    Include Giuseppe's tests.
    ---
    Selecting from I_S.profiling is no longer quashed in profiling, as
    requested by Giuseppe.

  mysql-test/t/profiling.test@1.0, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +0 -0

  sql/ha_ndbcluster.cc@1.175.70.1, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +2 -2
    DBUG_* statements should be syntactically equivalent to a single 
    statement.

  sql/item_cmpfunc.cc@1.187.28.1, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +1 -1
    DBUG_* statements should be syntactically equivalent to a single 
    statement.

  sql/item_func.cc@1.270.35.7, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +4 -4
    Abstract setting thread-info into a function or macro.
    ---
    Manual merge, undoing first patch.

  sql/lock.cc@1.64.3.4, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +4 -4
    Abstract setting thread-info into a function or macro.
    ---
    Manual merge, undoing first patch.

  sql/log_event.cc@1.174.15.3, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +4 -4
    Abstract setting thread-info into a function or macro.
    ---
    Manual merge, undoing first patch.

  sql/mysql_priv.h@1.290.82.5, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +40 -33
    Use 64-bit constants for the 64-bit bit field.
    
    Add a new option bit for whether profiling is active or not.

  sql/mysqld.cc@1.439.91.2, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +8 -1
    Add semicolon to DBUG statement.
    
    Add a new system variable and set it.
    ---
    Set the minimum, which is zero and not 50.

  sql/repl_failsafe.cc@1.53.2.4, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +5 -5
    Abstract setting thread-info into a function or macro.
    ---
    Manual merge, undoing first patch.

  sql/set_var.cc@1.125.21.3, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +16 -2
    Make a new system global variable and session variable, to determine
    behavior of profiling.	
    ---
    Include patch backported to 5.0-global.
    
    THD::options is a ulonglong, not ulong.

  sql/set_var.h@1.68.6.1, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +2 -2
    The THD::options bit field is ulonglong, not ulong.

  sql/slave.cc@1.241.13.3, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +20 -20
    Abstract setting thread-info into a function or macro.
    ---
    Manual merge, undoing first patch.
    ---
    Include patch backported to 5.0-global.
    
    THD::options is a ulonglong, not ulong.

  sql/sp_head.cc@1.200.11.4, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +2 -2
    Abstract setting thread-info into a function or macro.
    ---
    Manual merge, undoing first patch.

  sql/sql_base.cc@1.235.1.128, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +15 -15
    Abstract setting thread-info into a function or macro.
    ---
    Manual merge, undoing first patch.
    ---
    Include patch backported to 5.0-global.
    
    THD::options is a ulonglong, not ulong.

  sql/sql_cache.cc@1.76.1.23, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +11 -11
    DBUG_* statements should be syntactically equivalent to a single 
    statement.
    ---
    Fix merge problems.

  sql/sql_class.cc@1.223.1.35, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +2 -1
    Insert a pointer to the current thread in the profiling code.
    ---
    Manual merge, undoing first patch.
    ---
    Fix merge problems.

  sql/sql_class.h@1.230.1.86, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +6 -1
    Create a new system variable, profiling_history_size, and add a 
    member to THD to hold profiling information about this thread's 
    execution.
    ---
    Manual merge, undoing first patch.

  sql/sql_delete.cc@1.144.1.46, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +7 -7
    Abstract setting thread-info into a function or macro.
    ---
    Manual merge, undoing first patch.
    ---
    Include patch backported to 5.0-global.
    
    THD::options is a ulonglong, not ulong.

  sql/sql_insert.cc@1.146.1.67, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +19 -19
    Abstract setting thread-info into a function or macro.
    ---
    Manual merge, undoing first patch.
    ---
    Fix merge problems.

  sql/sql_lex.cc@1.142.30.5, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +2 -1
    Initialize profiling options to empty.
    ---
    Manual merge, undoing first patch.

  sql/sql_lex.h@1.175.31.5, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +7 -2
    Add info to the lexer object so that we can hold data that comes from
    parsing statements.
    
    Reuse memory addresses of uints that can't occur in the same state-
    ment.
    
    This is dangerous because it involves knowledge of what symbols are 
    never used together, which is information stored obliquely in another
    file.
    ---
    Manual merge, undoing first patch.

  sql/sql_parse.cc@1.426.1.169, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +47 -24
    Add hooks to the parser to jump to profiling code.
    
    If profiling is not present, then return an error message upon being
    used.
    ---
    Manual merge, undoing first patch.
    ---
    Fix merge problems.
    ---
    Include patch backported to 5.0-global.
    
    THD::options is a ulonglong, not ulong.

  sql/sql_prepare.cc@1.142.26.1, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +1 -0
    From prepared statement execution, set the query source in the 
    profiler, as we can't get it from  thd .
    ---
    Make it less expensive to limit the size of the queries.

  sql/sql_profile.cc@1.1, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +813 -0
    New BitKeeper file ``sql/sql_profile.cc''
    ---
    If query_source is NULL, as can sometimes happen, then don't try
    to copy that memory.
    ---
    Make each new session use its own numbering of query_ids, and not
    show the global-pool numbers to the user.
    
    Provide a way for prepared statements to set the query_source.
    ---
    Selecting from I_S.profiling is no longer quashed in profiling, as
    requested by Giuseppe.
    
    Limit the size of captured query text.
    
    No longer log queries that are zero length.

  sql/sql_profile.cc@1.0, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +0 -0

  sql/sql_profile.h@1.1, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +241 -0
    New BitKeeper file ``sql/sql_profile.h''
    ---
    Make each new session use its own numbering of query_ids, and not
    show the global-pool numbers to the user.
    
    Provide a way for prepared statements to set the query_source.
    ---
    Make it less expensive to limit the size of the queries.

  sql/sql_profile.h@1.0, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +0 -0

  sql/sql_repl.cc@1.133.1.24, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +9 -9
    Abstract setting thread-info into a function or macro.
    ---
    Manual merge, undoing first patch.

  sql/sql_select.cc@1.312.124.2, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +23 -24
    Abstract setting thread-info into a function or macro.
    ---
    Manual merge, undoing first patch.
    ---
    Fix merge problems.

  sql/sql_show.cc@1.253.45.4, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +5 -3
    Abstract setting thread-info into a function or macro.
    
    Also, remove "static" qualification on schema_table_store_record()
    so that external functions may use it.
    ---
    Manual merge, undoing first patch.

  sql/sql_table.cc@1.239.43.3, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +10 -10
    Abstract setting thread-info into a function or macro.
    ---
    Manual merge, undoing first patch.

  sql/sql_update.cc@1.154.27.4, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +7 -7
    Abstract setting thread-info into a function or macro.
    ---
    Manual merge, undoing first patch.

  sql/sql_view.cc@1.78.16.3, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +1 -1
    Abstract setting thread-info into a function or macro.
    ---
    Manual merge, undoing first patch.

  sql/sql_yacc.yy@1.371.91.4, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +48 -32
    Add new lexer symbols and insert new grammatical rules necessary to 
    retreive profiling information.
    ---
    Manual merge, undoing first patch.
    ---
    Fix merge problems.

  sql/table.h@1.102.14.1, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +1 -0
    Add enum item for query profiling.

  sql/ha_archive.cc@1.60.14.2, 2007-02-22 10:03:02-05:00, cmiller@zippy.cornsilk.net +2 -2
    Abstract setting thread-info into a function or macro.
    ---
    Manual merge, undoing first patch.

  sql/ha_myisam.cc@1.147.12.2, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +12 -12
    Abstract setting thread-info into a function or macro.
    ---
    Manual merge, undoing first patch.

  myisam/mi_open.c@1.90.22.1, 2007-02-22 10:03:02-05:00, cmiller@zippy.cornsilk.net +1 -1
    DBUG_* statements should be syntactically equivalent to a single 
    statement.

  sql/ha_myisammrg.cc@1.59.16.1, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +1 -1
    DBUG_* statements should be syntactically equivalent to a single 
    statement.

  ndb/src/ndbapi/DictCache.cpp@1.12.11.1, 2007-02-22 10:03:02-05:00, cmiller@zippy.cornsilk.net +1 -1
    DBUG_* statements should be syntactically equivalent to a single 
    statement.

ChangeSet@1.1810.2528.1, 2007-01-18 09:50:16-05:00, cmiller@zippy.cornsilk.net +7 -0
  Bug#24822: Patch: uptime_since_flush_status
  
  Provide the number of seconds since flush as a new status variable
  named "Uptime_since_flush_status".
  ---
  Override the post-flush value, as a second could pass between the two
  statements.

  BitKeeper/etc/collapsed@1.5.7.2, 2007-01-18 09:49:43-05:00, cmiller@zippy.cornsilk.net +2 -0

  mysql-test/r/information_schema.result@1.87.1.31, 2007-01-18 09:50:14-05:00, cmiller@zippy.cornsilk.net +7 -0
    Test new status variable.
    ---
    Override the post-flush value, as a second could pass between the two
    statements.

  mysql-test/t/information_schema.test@1.65.1.24, 2007-01-18 09:50:14-05:00, cmiller@zippy.cornsilk.net +10 -3
    Test new status variable.
    ---
    Override the post-flush value, as a second could pass between the two
    statements.

  sql/mysql_priv.h@1.290.87.1, 2007-01-18 09:50:14-05:00, cmiller@zippy.cornsilk.net +1 -1
    Add variable to hold previous flush time.

  sql/mysqld.cc@1.439.90.1, 2007-01-18 09:50:14-05:00, cmiller@zippy.cornsilk.net +4 -2
    Add variable to hold previous flush time.  Insert name for 
    referring to it, and initialize the value.

  sql/sql_show.cc@1.253.45.3, 2007-01-18 09:50:14-05:00, cmiller@zippy.cornsilk.net +4 -0
    Yield value of elapsed time since flush when asked.

  sql/structs.h@1.53.1.5, 2007-01-18 09:50:14-05:00, cmiller@zippy.cornsilk.net +1 -0
    Add new show-flush-time to SHOW types enumeration.

ChangeSet@1.1810.2480.7, 2007-01-09 14:42:56+01:00, df@kahlann.erinye.com +1 -0
  raise version number after cloning 5.0.33

  configure.in@1.245.1.174, 2007-01-09 14:42:54+01:00, df@kahlann.erinye.com +2 -2
    raise version number after cloning 5.0.33

ChangeSet@1.1810.2451.11, 2007-01-09 13:02:15+01:00, dfischer@mysql.com +1 -0
  configure.in:
    raise version to 5.0.33
  TAG: mysql-5.0.33

  configure.in@1.245.75.1, 2007-01-09 12:59:56+01:00, dfischer@mysql.com +2 -2
    raise version to 5.0.33

ChangeSet@1.1810.2474.3, 2007-01-08 15:57:03-05:00, cmiller@zippy.cornsilk.net +1 -0
  Community version numbering.

  configure.in@1.245.74.1, 2007-01-08 15:57:01-05:00, cmiller@zippy.cornsilk.net +1 -1
    Community version numbering.

ChangeSet@1.1810.2478.1, 2007-01-03 17:15:10-05:00, cmiller@zippy.cornsilk.net +33 -0
  Bug#24795: Add SHOW PROFILE
  
  Patch contributed by Jeremy Cole.  CLA received Oct 2006 by Kaj Arn
  
  Add rudimentary query profiling support.

  mysql-test/r/profile.result@1.1, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +30 -0
    Test profiling code.
    ---
    A not-very-useful result.

  mysql-test/r/profile.result@1.0, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +0 -0

  mysql-test/t/profile.test@1.1, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +39 -0
    Test profiling code.
    ---
    Test syntax, but not values of profiles code.

  mysql-test/t/profile.test@1.0, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +0 -0

  sql/sql_profile.cc@1.1, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +441 -0
    Add profiling code.
    ---
    Add wishlist comment.

  sql/sql_profile.cc@1.0, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +0 -0

  sql/sql_profile.h@1.1, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +187 -0
    Add profiling code.
    ---
    Changed the value of the macro so that it's syntactically equivalent to a
    single statement.

  sql/sql_profile.h@1.0, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +0 -0

  BitKeeper/etc/collapsed@1.5.4.2, 2007-01-03 17:13:00-05:00, cmiller@zippy.cornsilk.net +3 -0

  libmysqld/Makefile.am@1.55.5.1, 2007-01-03 17:15:06-05:00, cmiller@zippy.cornsilk.net +1 -0
    Add profile file to source list.

  sql/Makefile.am@1.103.6.1, 2007-01-03 17:15:06-05:00, cmiller@zippy.cornsilk.net +2 -0
    Add profiling files to source and header lists.

  sql/item_func.cc@1.270.36.1, 2007-01-03 17:15:06-05:00, cmiller@zippy.cornsilk.net +4 -4
    Macro-ized other discovered instances of setting proc_info.

  sql/lex.h@1.137.3.1, 2007-01-03 17:15:06-05:00, cmiller@zippy.cornsilk.net +13 -0
    Add lexer info for profiling.

  sql/lock.cc@1.64.4.1, 2007-01-03 17:15:06-05:00, cmiller@zippy.cornsilk.net +4 -4
    Macroize setting thread-state info

  sql/log_event.cc@1.174.16.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +4 -4
    Macro-ized other discovered instances of setting proc_info.

  sql/mysql_priv.h@1.290.83.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +4 -0
    Set constants for profiling.

  sql/repl_failsafe.cc@1.53.3.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +3 -3
    Macro-ized other discovered instances of setting proc_info.

  sql/slave.cc@1.241.14.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +3 -3
    Macro-ized other discovered instances of setting proc_info.

  sql/sp_head.cc@1.200.12.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +2 -2
    Macro-ized other discovered instances of setting proc_info.

  sql/sql_base.cc@1.235.77.3, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +12 -12
    Macroize setting thread-state info
    ---
    Macro-ized other discovered instances of setting proc_info.

  sql/sql_cache.cc@1.76.8.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +12 -0
    Macroize setting thread-state info

  sql/sql_class.cc@1.223.18.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +2 -0
    Integrate profiling.

  sql/sql_class.h@1.230.52.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +3 -0
    Instantiate profiling object.

  sql/sql_delete.cc@1.144.21.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +6 -6
    Macroize setting thread-state info

  sql/sql_insert.cc@1.146.43.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +19 -19
    Macroize setting thread-state info
    ---
    Macro-ized other discovered instances of setting proc_info.

  sql/sql_lex.cc@1.142.35.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +1 -0
    Initialize profiling.

  sql/sql_lex.h@1.175.32.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +3 -0
    Define lex tokens and allocate space for profiling options.

  sql/sql_parse.cc@1.426.136.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +28 -12
    Integrate profiling.
    ---
    Macro-ized other discovered instances of setting proc_info.

  sql/sql_repl.cc@1.133.6.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +1 -1
    Macro-ized other discovered instances of setting proc_info.

  sql/sql_select.cc@1.312.121.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +43 -30
    Macroize setting thread-state info.
    
    Clean up some lines.

  sql/sql_show.cc@1.253.46.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +1 -1
    Macro-ized other discovered instances of setting proc_info.
    ---
    Revert bad use of macro.

  sql/sql_table.cc@1.239.44.1, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +10 -10
    Macroize setting thread-state info

  sql/sql_update.cc@1.154.28.1, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +7 -7
    Macroize setting thread-state info

  sql/sql_view.cc@1.78.17.1, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +1 -1
    Macro-ized other discovered instances of setting proc_info.

  sql/sql_yacc.yy@1.371.92.1, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +73 -1
    Add parser info for profiling.
    ---
    Fix new YACC shift/reduce conflict.  (Now at 249.)

  sql/ha_archive.cc@1.60.13.1, 2007-01-03 17:15:06-05:00, cmiller@zippy.cornsilk.net +2 -2
    Macro-ized other discovered instances of setting proc_info.

  sql/ha_myisam.cc@1.147.11.1, 2007-01-03 17:15:06-05:00, cmiller@zippy.cornsilk.net +12 -12
    Macroize setting thread-state info

ChangeSet@1.1616.2866.2, 2006-11-10 12:13:52-07:00, tsmith@siva.hindu.god +13 -0
  Backport patch of bugfix for:
  - Bug #15815: Very poor performance with multiple queries running concurrently
  - Bug #22868: 'Thread thrashing' with > 50 concurrent conns under an upd-intensive workloadw
  
  This is a patch from an e-mail; it is not included (yet) in an InnoDB snapshot.

  innobase/buf/buf0buf.c@1.38.1.3, 2006-11-10 12:13:49-07:00, tsmith@siva.hindu.god +115 -56
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/buf/buf0flu.c@1.25.1.2, 2006-11-10 12:13:49-07:00, tsmith@siva.hindu.god +67 -29
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/buf/buf0lru.c@1.19.1.3, 2006-11-10 12:13:49-07:00, tsmith@siva.hindu.god +24 -1
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/include/buf0buf.h@1.23.1.1, 2006-11-10 12:13:50-07:00, tsmith@siva.hindu.god +28 -12
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/include/buf0buf.ic@1.17.7.1, 2006-11-10 12:13:50-07:00, tsmith@siva.hindu.god +12 -7
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/include/sync0arr.h@1.7.2.1, 2006-11-10 12:13:50-07:00, tsmith@siva.hindu.god +4 -9
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/include/sync0rw.h@1.8.1.1, 2006-11-10 12:13:50-07:00, tsmith@siva.hindu.god +1 -0
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/include/sync0rw.ic@1.9.4.1, 2006-11-10 12:13:50-07:00, tsmith@siva.hindu.god +4 -2
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/include/sync0sync.h@1.16.1.1, 2006-11-10 12:13:50-07:00, tsmith@siva.hindu.god +1 -0
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/os/os0sync.c@1.24.2.2, 2006-11-10 12:13:50-07:00, tsmith@siva.hindu.god +52 -3
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/sync/sync0arr.c@1.20.2.1, 2006-11-10 12:13:50-07:00, tsmith@siva.hindu.god +41 -78
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/sync/sync0rw.c@1.16.1.1, 2006-11-10 12:13:50-07:00, tsmith@siva.hindu.god +2 -0
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/sync/sync0sync.c@1.29.1.1, 2006-11-10 12:13:50-07:00, tsmith@siva.hindu.god +6 -2
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

