ChangeSet@1.2608, 2008-02-21 23:34:22+01:00, kent@mysql.com +1 -0
  mysql.spec.sh:
    Added --with-maria and maria support

  support-files/mysql.spec.sh@1.196, 2008-02-21 23:33:35+01:00, kent@mysql.com +30 -20
    Added --with-maria and maria support

ChangeSet@1.2605.1.3, 2008-02-21 23:15:37+01:00, guilhem@gbichot4.local +1 -0
  Fixes for ma_test_recovery.pl on OS X.

  storage/maria/unittest/ma_test_recovery.pl@1.8, 2008-02-21 23:15:35+01:00, guilhem@gbichot4.local +5 -1
    .exe is for win32, win64, cygwin but not darwin.
    Some OS X machines have md5 instead of md5sum.

ChangeSet@1.2605.1.2, 2008-02-21 23:05:27+01:00, guilhem@gbichot4.local +1 -0
  Make ma_test_all-t find its eggs on Darwin machines.

  storage/maria/unittest/ma_test_all-t@1.14, 2008-02-21 23:05:25+01:00, guilhem@gbichot4.local +1 -1
    .exe is for win32, win64, cygwin, but not darwin

ChangeSet@1.2605.1.1, 2008-02-21 22:43:00+01:00, guilhem@gbichot4.local +2 -0
  fix for bug in Solaris 10 Sparc 64 bit (misaligned buffer in the
  log handler).

  storage/maria/ma_loghandler.c@1.130, 2008-02-21 22:42:53+01:00, guilhem@gbichot4.local +24 -10
    Buffers on the stack must be properly aligned as pagecache_read()
    will use bmove512() on them. Fixes hang in maria-recovery.test
    on Solaris 10 Sparc 64 bit.

  storage/maria/ma_pagecache.c@1.87, 2008-02-21 22:42:53+01:00, guilhem@gbichot4.local +10 -0
    comment

ChangeSet@1.2606, 2008-02-21 02:47:53+01:00, kent@mysql.com +1 -0
  configure.in:
    Set back to 5.1.23a-maria-alpha

  configure.in@1.382, 2008-02-21 02:47:44+01:00, kent@mysql.com +1 -1
    Set back to 5.1.23a-maria-alpha

ChangeSet@1.2575.2.1, 2008-02-21 02:45:02+02:00, monty@mysql.com +16 -0
  Fixed problems with ma_test2 and mi_test2 on high-byte-first system
  Fixed bug in ma_test2 when last row in table is deleted
  Fixed that ma_test_recovery.pl works on Solaris (by using digest instead of md5sum)
  Fixed some compiler warnings generated by the Forte compiler

  BitKeeper/etc/ignore@1.271, 2008-02-21 02:44:41+02:00, monty@mysql.com +1 -0
    added storage/maria/unittest/tmp/*

  dbug/dbug.c@1.48.2.1, 2008-02-21 02:43:04+02:00, monty@mysql.com +1 -1
    Added cast to get rid of compiler warning

  mysys/lf_alloc-pin.c@1.15.1.1, 2008-02-21 02:43:04+02:00, monty@mysql.com +5 -3
    Added cast to get rid of compiler warning

  mysys/my_bitmap.c@1.45, 2008-02-21 02:43:04+02:00, monty@mysql.com +0 -4
    Removed impossible DBUG_ASSERT()'s to get rid of compiler warnings

  mysys/my_compress.c@1.22, 2008-02-21 02:43:04+02:00, monty@mysql.com +1 -1
    Removed wrong cast to get rid of compiler warning

  sql-bench/myisam.cnf@1.1, 2008-02-21 02:45:00+02:00, monty@mysql.com +3 -0
    New BitKeeper file ``sql-bench/myisam.cnf''

  sql-bench/myisam.cnf@1.0, 2008-02-21 02:45:00+02:00, monty@mysql.com +0 -0

  storage/maria/lockman.c@1.19.1.1, 2008-02-21 02:43:04+02:00, monty@mysql.com +1 -1
    Added cast to get rid of compiler warning

  storage/maria/ma_open.c@1.59.1.1, 2008-02-21 02:43:04+02:00, monty@mysql.com +2 -0
    Added fix from MyISAM to allocate space in key buffer for nod pointer

  storage/maria/ma_recovery.c@1.83.1.1, 2008-02-21 02:43:04+02:00, monty@mysql.com +1 -1
    Fixed initialization that caused compiler warning

  storage/maria/ma_rsame.c@1.5, 2008-02-21 02:43:04+02:00, monty@mysql.com +3 -0
    More DBUG_PRINT

  storage/maria/ma_scan.c@1.6, 2008-02-21 02:43:04+02:00, monty@mysql.com +4 -3
    Better comment

  storage/maria/ma_statrec.c@1.13, 2008-02-21 02:43:04+02:00, monty@mysql.com +17 -5
    More DBUG_PRINT and comments
    Fixed indentation

  storage/maria/ma_test2.c@1.38, 2008-02-21 02:45:00+02:00, monty@mysql.com +15 -2
    Fixed bug that caused maria_rsame() to fail if test removed last row
    Fixed wrong usage of longget();  Should be uint4korr()

  storage/maria/unittest/ma_test_recovery.pl@1.4.1.1, 2008-02-21 02:45:00+02:00, monty@mysql.com +34 -3
    Use md5sum or digest to calculate md5.
    This allows this script to be run on Linux and Solaris

  storage/myisam/mi_test2.c@1.46, 2008-02-21 02:45:00+02:00, monty@mysql.com +1 -1
    Fixed wrong usage of longget();  Should be uint4korr()

  strings/ctype.c@1.70, 2008-02-21 02:45:00+02:00, monty@mysql.com +3 -1
    Added casts to get rid of compiler warnings

ChangeSet@1.2604, 2008-02-20 21:37:03+01:00, guilhem@gbichot4.local +1 -0
  non-debug build should not cause ma_test_all-t to always fail:
  make ma_test_recovery.pl return 0 if it skips itself.

  storage/maria/unittest/ma_test_recovery.pl@1.6, 2008-02-20 21:37:01+01:00, guilhem@gbichot4.local +5 -1
    non-debug build should not cause ma_test_all-t to always fail

ChangeSet@1.2603, 2008-02-20 20:12:34+01:00, guilhem@gbichot4.local +1 -0
  Working around tar's 99-char limit in file names

  configure.in@1.381, 2008-02-20 20:12:32+01:00, guilhem@gbichot4.local +1 -1
    this tree has version 5.1.23, release clone has version 5.1.23a-maria-alpha;
    it mostly matters because it makes the file's name 1 byte shorter
    and thus below tar's 99-chars limit...

ChangeSet@1.2600.1.1, 2008-02-20 18:01:59+01:00, guilhem@gbichot4.local +1 -0
  need to include ma_test_all-t and ma_test_recovery.* into the source
  tarball, so that those tests are run on all platforms.

  storage/maria/unittest/Makefile.am@1.25, 2008-02-20 18:01:57+01:00, guilhem@gbichot4.local +2 -1
    need to include ma_test_all-t and ma_test_recovery.* into the source
    tarball, so that those tests are run on all platforms.

ChangeSet@1.2590.1.13, 2008-02-20 18:42:12+02:00, jani@hynda.mysql.fi +2 -0
  New version of ma_test_recovery.pl

  storage/maria/ma_test_recovery@1.25, 2008-02-20 18:42:10+02:00, jani@hynda.mysql.fi +2 -223
    Made the shell version empty to avoid modifying
    files in two places. Linked to the current one.

  storage/maria/unittest/ma_test_recovery.pl@1.5, 2008-02-20 18:42:10+02:00, jani@hynda.mysql.fi +250 -205
    New version of ma_test_recovery.pl
    Added --help and --version, made a function
    of the main part, removed all calls to unix
    mv and cp

ChangeSet@1.2600, 2008-02-20 16:58:43+01:00, guilhem@gbichot4.local +3 -0
  Fixes for bugs (my_atomic and Maria log handler) observed on
  Solaris 10 Sparc 64bit.

  include/my_atomic.h@1.17, 2008-02-20 16:58:38+01:00, guilhem@gbichot4.local +5 -5
    Prototypes in the non-inline (extern) case were wrong: they were
    missing "U_a" i.e. "volatile *". Caused a segfault in my_atomic-t
    on Solaris10 Sparc 64.

  storage/maria/ma_loghandler.c@1.129, 2008-02-20 16:58:38+01:00, guilhem@gbichot4.local +5 -2
    Move "buffer" array up in the struct, to get it aligned on long-boundary
    so that page cache can use bmove512() (it was not aligned and bmove512()
    was used, causing SIGBUS on Solaris10 Sparc 64).

  storage/maria/unittest/ma_pagecache_consist.c@1.28, 2008-02-20 16:58:38+01:00, guilhem@gbichot4.local +20 -13
    doing *(uint*)(charbuff)=something is not ok on sparc machines, we must
    use int4store/uint4korr. Fixes a SIGBUS on Solaris10 Sparc 64.

ChangeSet@1.2599, 2008-02-20 01:51:17+01:00, kent@mysql.com +1 -0
  ha_maria.cc:
    Adjust to match storage engine API, 'mysql_var_update_func' function
    prototype changed so that last argument now "void *save" with "const"

  storage/maria/ha_maria.cc@1.86, 2008-02-20 01:47:04+01:00, kent@mysql.com +4 -4
    Adjust to match storage engine API, 'mysql_var_update_func' function
    prototype changed so that last argument now "void *save" with "const"

ChangeSet@1.2502.7.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.2.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.2590.1.12, 2008-02-19 18:07:39+01:00, guilhem@gbichot4.local +1 -0
  Fix for build failure

  libmysql/get_password.c@1.17, 2008-02-19 18:07:37+01:00, guilhem@gbichot4.local +1 -1
    fix for build failure (no bool in C)

ChangeSet@1.2590.1.11, 2008-02-19 11:41:12+01:00, guilhem@mysqlwin32. +6 -0
  Fix for build failures. Putting back "#define bool BOOL" under Windows
  until Windows team confers.

  client/get_password.c@1.14, 2008-02-19 11:41:03+01:00, guilhem@mysqlwin32. +1 -1
    fix for build failure (HPUX etc): no bool in C

  dbug/dbug.c@1.51, 2008-02-19 11:41:04+01:00, guilhem@mysqlwin32. +0 -1
    typo

  include/config-win.h@1.106, 2008-02-19 11:41:05+01:00, guilhem@mysqlwin32. +1 -0
    putting back the infamous #define, because without it we have 650
    distinct compiler warnings "forcing value to bool 'true' or 'false'"
    (C4800), Windows team will confer on what to do.

  include/thr_alarm.h@1.26, 2008-02-19 11:41:05+01:00, guilhem@mysqlwin32. +1 -1
    fix for build failure on Windows

  libmysql/dll.c@1.13, 2008-02-19 11:41:06+01:00, guilhem@mysqlwin32. +1 -1
    fix for build failure on Windows

  mysys/thr_alarm.c@1.66, 2008-02-19 11:41:07+01:00, guilhem@mysqlwin32. +1 -1
    fix for build failure on HPUX

ChangeSet@1.2586.2.1, 2008-02-19 09:25:31+01:00, guilhem@mysqlwin32. +2 -0
  Fix for failure of ma_test_loghandler_long-t on Windows

  dbug/dbug.c@1.48.1.1, 2008-02-19 09:25:24+01:00, guilhem@mysqlwin32. +1 -6
    importing change from 6.0, which speeds up --debug on Windows (no sync)

  storage/maria/unittest/ma_test_loghandler-t.c@1.33, 2008-02-19 09:25:25+01:00, guilhem@mysqlwin32. +5 -0
    this test needs ~80 open files (logs)

ChangeSet@1.2590.1.9, 2008-02-19 00:00:58+01:00, guilhem@gbichot4.local +7 -0
  Merge from 5.1-build of the "my_bool for C" changeset.
  Removing "#define bool BOOL" as it's dangerous.

  include/config-win.h@1.105, 2008-02-19 00:00:54+01:00, guilhem@gbichot4.local +0 -1
    This #define was confusing: a) it changes the semantics of bool but
    only on Windows (C++ standard says that casting int to bool to int
    yields 0 or 1, but if using BOOL (which is int) this breaks, see
    old BUG 11567 "Variable 'foreign_key_checks', and other variables,
    differs binlog tests") b) it is not needed in C++ which has a bool type
    c) it is not needed in C where we must use my_bool as bool either does
    not exist or changes size between C and C++.

  storage/maria/ma_check.c@1.82, 2008-02-19 00:00:54+01:00, guilhem@gbichot4.local +2 -2
    my_bool for C

  storage/maria/ma_dynrec.c@1.25, 2008-02-19 00:00:54+01:00, guilhem@gbichot4.local +2 -1
    my_bool for C

  storage/maria/ma_search.c@1.19, 2008-02-19 00:00:55+01:00, guilhem@gbichot4.local +1 -1
    my_bool for C

  storage/maria/ma_write.c@1.35, 2008-02-19 00:00:55+01:00, guilhem@gbichot4.local +6 -6
    my_bool for C

  storage/maria/maria_def.h@1.72, 2008-02-19 00:00:55+01:00, guilhem@gbichot4.local +1 -1
    my_bool for C

  storage/maria/maria_pack.c@1.23, 2008-02-19 00:00:55+01:00, guilhem@gbichot4.local +2 -2
    my_bool for C

ChangeSet@1.2502.6.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.268.1.35, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +1 -1
    my_bool for C

  client/mysqltest.c@1.324.1.2, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +4 -4
    my_bool for C

  extra/replace.c@1.25.1.1, 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.138.1.44, 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.206.1.30, 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.80.1.1, 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.60.1.3, 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.240.1.28, 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.1.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.142.1.30, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +1 -1
    my_bool for C

  storage/myisam/mi_dynrec.c@1.42.1.21, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +1 -1
    my_bool for C

  storage/myisam/mi_search.c@1.61.1.8, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +1 -1
    my_bool for C

  storage/myisam/mi_update.c@1.21.1.9, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +1 -1
    my_bool for C

  storage/myisam/mi_write.c@1.57.1.15, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +6 -6
    my_bool for C

  storage/myisam/myisamdef.h@1.85.1.18, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +1 -1
    my_bool for C

  storage/myisam/myisamlog.c@1.33.1.6, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +3 -3
    my_bool for C

  storage/myisam/myisampack.c@1.52.1.16, 2008-02-18 23:29:35+01:00, guilhem@gbichot4.local +2 -2
    my_bool for C

  tests/mysql_client_test.c@1.261.1.1, 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.2502.5.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.18.1.1, 2008-02-18 14:46:28+01:00, kent@mysql.com +1 -1
    Missing "sql_profile.cc" was added

ChangeSet@1.2590.1.7, 2008-02-15 18:29:53+01:00, guilhem@gbichot4.local +4 -0
  Fix for maria.test failure in embedded server (test split)

  mysql-test/r/maria.result@1.41, 2008-02-15 18:29:51+01:00, guilhem@gbichot4.local +0 -24
    result update

  mysql-test/r/maria_notembedded.result@1.1, 2008-02-15 18:29:51+01:00, guilhem@gbichot4.local +25 -0
    result is ok

  mysql-test/r/maria_notembedded.result@1.0, 2008-02-15 18:29:51+01:00, guilhem@gbichot4.local +0 -0

  mysql-test/t/maria.test@1.36, 2008-02-15 18:29:51+01:00, guilhem@gbichot4.local +0 -18
    The embedded server translates INSERT DELAYED to plain INSERT
    so does not produce an error; moving this test to a new test
    which is not run for the embedded server.

  mysql-test/t/maria_notembedded.test@1.1, 2008-02-15 18:29:51+01:00, guilhem@gbichot4.local +33 -0
    New test for cases where embedded server is different.

  mysql-test/t/maria_notembedded.test@1.0, 2008-02-15 18:29:51+01:00, guilhem@gbichot4.local +0 -0

ChangeSet@1.2590.1.6, 2008-02-14 00:35:09+02:00, monty@mysql.com +1 -0
  Fixed compiler error on windows after PAGE_SIZE -> TEST_PAGE_SIZE change

  storage/maria/unittest/CMakeLists.txt@1.3, 2008-02-14 00:35:06+02:00, monty@mysql.com +11 -11
    Fixed compiler error on windows after PAGE_SIZE -> TEST_PAGE_SIZE change

ChangeSet@1.2590.2.1, 2008-02-13 20:29:29+01:00, serg@janus.mylan +3 -0
  skip dbug tests if DBUG_OFF

  dbug/tests-t.pl@1.3, 2008-02-13 20:29:23+01:00, serg@janus.mylan +5 -3
    skip dbug tests if DBUG_OFF

  dbug/tests.c@1.3, 2008-02-13 20:29:24+01:00, serg@janus.mylan +7 -5
    skip dbug tests if DBUG_OFF

  include/my_dbug.h@1.38, 2008-02-13 20:29:24+01:00, serg@janus.mylan +9 -9
    warnings

ChangeSet@1.2588.1.1, 2008-02-13 21:27:12+02:00, monty@mysql.com +44 -0
  Fixed compiler warnings in a lot of files
  Added IMPOSSIBLE_RESULT to avoid compiler warnings when using (Item_result) -1 as a dummy value
  Changed PAGE_SIZE to TEST_PAGE_SIZE to avoid compiler errors on systems where PAGE_SIZE is defined

  client/get_password.c@1.13, 2008-02-13 21:27:03+02:00, monty@mysql.com +2 -2
    Fixed compiler warning

  cmd-line-utils/readline/bind.c@1.19, 2008-02-13 21:27:03+02:00, monty@mysql.com +1 -1
    Fixed compiler warning

  cmd-line-utils/readline/chardefs.h@1.8, 2008-02-13 21:27:03+02:00, monty@mysql.com +1 -0
    Fixed compiler warning by adding marco to be used when largest_char is 255

  cmd-line-utils/readline/display.c@1.20, 2008-02-13 21:27:03+02:00, monty@mysql.com +4 -8
    Fixed compiler warnings by removing not accessed variables

  cmd-line-utils/readline/histexpand.c@1.15, 2008-02-13 21:27:03+02:00, monty@mysql.com +1 -2
    Fixed compiler warnings by removing not accessed variables

  cmd-line-utils/readline/history.c@1.10, 2008-02-13 21:27:03+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings by adding cast

  cmd-line-utils/readline/text.c@1.10, 2008-02-13 21:27:03+02:00, monty@mysql.com +5 -2
    Fixed compiler warnings by removing not accessed variables and adding casts

  dbug/dbug.c@1.49, 2008-02-13 21:27:03+02:00, monty@mysql.com +5 -5
    Fixed compiler warnings by changing types

  include/mysql_com.h@1.127, 2008-02-13 21:27:03+02:00, monty@mysql.com +7 -2
    Added IMPOSSIBLE_RESULT to avoid compiler warnings when using (Item_result) -1 as a dummy value

  libmysql/libmysql.c@1.306, 2008-02-13 21:27:03+02:00, monty@mysql.com +0 -1
    Fixed compiler warning

  mysql-test/t/query_cache_debug.test@1.3, 2008-02-13 21:27:03+02:00, monty@mysql.com +1 -0
    Mark test as BIG as it uses a lot of memory

  mysys/mf_iocache2.c@1.38, 2008-02-13 21:27:03+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings by adding cast

  sql/event_data_objects.cc@1.113, 2008-02-13 21:27:03+02:00, monty@mysql.com +0 -1
    Fixed compiler warnings by removing not used code

  sql/events.cc@1.90, 2008-02-13 21:27:03+02:00, monty@mysql.com +0 -1
    Fixed compiler warnings by removing not used code

  sql/field.cc@1.432, 2008-02-13 21:27:03+02:00, monty@mysql.com +4 -6
    Fixed compiler warnings by adding cast and removed not accessed variables

  sql/ha_partition.cc@1.109, 2008-02-13 21:27:04+02:00, monty@mysql.com +0 -1
    Fixed compiler warnings by removing not used code

  sql/item.cc@1.301, 2008-02-13 21:27:04+02:00, monty@mysql.com +3 -5
    Fixed compiler warnings by removing not accessed variables
    Use IMPOSSIBLE_RESULT instead of (Item_result)-1

  sql/item_cmpfunc.cc@1.277, 2008-02-13 21:27:04+02:00, monty@mysql.com +1 -2
    Fixed compiler warnings by removing not accessed variables

  sql/item_func.cc@1.417, 2008-02-13 21:27:04+02:00, monty@mysql.com +10 -7
    Fixed compiler warnings by removing not used code and not accessed variables
    Added IMPOSSIBLE_RESULT

  sql/item_subselect.cc@1.166, 2008-02-13 21:27:04+02:00, monty@mysql.com +6 -6
    Fixed compiler warnings by removing not accessed variables

  sql/item_xmlfunc.cc@1.35, 2008-02-13 21:27:04+02:00, monty@mysql.com +1 -1
    Fixed forgotten setting of xpath->error

  sql/log.cc@1.310, 2008-02-13 21:27:04+02:00, monty@mysql.com +4 -2
    Fixed compiler warnings by removing not accessed variables

  sql/log_event.cc@1.288, 2008-02-13 21:27:04+02:00, monty@mysql.com +7 -5
    Added IMPOSSIBLE_RESULT into switch
    Fixed wrong usage of DBUG_ASSERT(1)
    Removed always true DBUG_ASSERT()

  sql/mysqld.cc@1.625, 2008-02-13 21:27:05+02:00, monty@mysql.com +38 -32
    Fixed compiler warnings by adding casts for ULONG_MAX

  sql/opt_sum.cc@1.68, 2008-02-13 21:27:05+02:00, monty@mysql.com +3 -7
    Fixed compiler warnings by removing not used code
    Removed wrong DBUG_ASSERT()

  sql/partition_info.cc@1.44, 2008-02-13 21:27:05+02:00, monty@mysql.com +0 -2
    Fixed compiler warnings by removing not accessed variables

  sql/rpl_injector.h@1.13, 2008-02-13 21:27:05+02:00, monty@mysql.com +1 -1
    Removed always true part from DBUG_ASSERT() to remove compiler warning

  sql/spatial.cc@1.36, 2008-02-13 21:27:05+02:00, monty@mysql.com +0 -2
    Fixed compiler warnings by removing not accessed variables

  sql/sql_acl.cc@1.259, 2008-02-13 21:27:05+02:00, monty@mysql.com +0 -2
    Fixed compiler warnings by removing not accessed variables

  sql/sql_base.cc@1.437, 2008-02-13 21:27:05+02:00, monty@mysql.com +1 -7
    Fixed compiler warnings by removing not accessed variables

  sql/sql_cache.cc@1.134, 2008-02-13 21:27:06+02:00, monty@mysql.com +8 -2
    Fixed compiler warnings by removing not accessed variables

  sql/sql_class.cc@1.360, 2008-02-13 21:27:06+02:00, monty@mysql.com +3 -4
    Fixed compiler warnings by:
    - Removing always true part from DBUG_ASSERT()
    - Removing not used code
    - Added IMPOSSIBLE_RESULT into switch

  sql/sql_load.cc@1.134, 2008-02-13 21:27:06+02:00, monty@mysql.com +0 -5
    Fixed compiler warnings by removing not accessed variables

  sql/sql_parse.cc@1.694, 2008-02-13 21:27:06+02:00, monty@mysql.com +22 -19
    Fixed compiler warnings by:
    - Removing not accessed variables
    - Removing always true part from DBUG_ASSERT()
    - Removing not used code

  sql/sql_plugin.cc@1.82, 2008-02-13 21:27:06+02:00, monty@mysql.com +1 -1
    Added comment

  sql/sql_prepare.cc@1.240, 2008-02-13 21:27:06+02:00, monty@mysql.com +1 -2
    Fixed compiler warnings by removing not accessed variables

  sql/sql_show.cc@1.447, 2008-02-13 21:27:06+02:00, monty@mysql.com +3 -3
    Fixed compiler warnings by using correct cast

  sql/sql_table.cc@1.455, 2008-02-13 21:27:06+02:00, monty@mysql.com +0 -3
    Fixed compiler warnings by removing not used code and removing not accessed variables

  sql/table.cc@1.306, 2008-02-13 21:27:06+02:00, monty@mysql.com +1 -2
    Fixed compiler warnings by removing not accessed variables

  sql/time.cc@1.85, 2008-02-13 21:27:06+02:00, monty@mysql.com +1 -1
    Fixed wrong DBUG_ASSERT(1)

  storage/maria/unittest/Makefile.am@1.24, 2008-02-13 21:27:06+02:00, monty@mysql.com +11 -11
    Changed PAGE_SIZE to TEST_PAGE_SIZE to avoid compiler errors on systems where PAGE_SIZE is defined

  storage/maria/unittest/ma_pagecache_consist.c@1.27, 2008-02-13 21:27:06+02:00, monty@mysql.com +16 -16
    Changed PAGE_SIZE to TEST_PAGE_SIZE to avoid compiler errors on systems where PAGE_SIZE is defined

  storage/maria/unittest/ma_pagecache_single.c@1.28, 2008-02-13 21:27:07+02:00, monty@mysql.com +60 -60
    Changed PAGE_SIZE to TEST_PAGE_SIZE to avoid compiler errors on systems where PAGE_SIZE is defined

  tests/mysql_client_test.c@1.262, 2008-02-13 21:27:07+02:00, monty@mysql.com +8 -5
    Fixed compiler warnings by removing not accessed variables and changing types

ChangeSet@1.2590.1.3, 2008-02-13 19:41:33+01:00, serg@janus.mylan +1 -0
  compiler warning fixed

  storage/maria/ha_maria.cc@1.85, 2008-02-13 19:41:30+01:00, serg@janus.mylan +9 -13
    compiler warning fixed

ChangeSet@1.2590.1.2, 2008-02-13 18:25:56+01:00, serg@janus.mylan +6 -0
  build/test failures on different platforms

  include/atomic/rwlock.h@1.6, 2008-02-13 18:25:52+01:00, serg@janus.mylan +1 -0
    define MY_ATOMIC_MODE_RWLOCKS if this is the way we have to go

  mysys/lf_alloc-pin.c@1.16, 2008-02-13 18:25:52+01:00, serg@janus.mylan +1 -1
    no semicolon

  mysys/lf_hash.c@1.19, 2008-02-13 18:25:52+01:00, serg@janus.mylan +1 -1
    no semicolon

  storage/maria/lockman.c@1.20, 2008-02-13 18:25:52+01:00, serg@janus.mylan +1 -1
    no semicolon

  storage/maria/ma_loghandler.c@1.128, 2008-02-13 18:25:52+01:00, serg@janus.mylan +1 -1
    no semicolon

  unittest/mysys/my_atomic-t.c@1.22, 2008-02-13 18:25:52+01:00, serg@janus.mylan +1 -5
    powerpc is no better
    (condition could be a bit too broad, but hey, it's just a unit test)

ChangeSet@1.2590.1.1, 2008-02-13 16:38:16+01:00, serg@janus.mylan +1 -0
  fix for embedded build

  mysql-test/mysql-test-run.pl@1.329, 2008-02-13 16:38:14+01:00, serg@janus.mylan +1 -1
    fix for embedded build

ChangeSet@1.2502.5.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.2591, 2008-02-12 13:47:43+01:00, kent@mysql.com +1 -0
  configure.in:
    Set version to 5.1.23a-maria-alpha

  configure.in@1.380, 2008-02-12 13:47:21+01:00, kent@mysql.com +1 -1
    Set version to 5.1.23a-maria-alpha

ChangeSet@1.2587.2.1, 2008-02-11 22:53:41+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +1 -0
  Comparison between signed and unsigned fixed.

  storage/maria/ma_loghandler.c@1.127, 2008-02-11 22:53:26+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +2 -2
    Fixed comparison of signed and unsigned.

ChangeSet@1.2587.1.1, 2008-02-11 21:41:20+01:00, guilhem@gbichot4.local +1 -0
  fix for non-debug build

  storage/maria/maria_chk.c@1.50, 2008-02-11 21:41:17+01:00, guilhem@gbichot4.local +1 -1
    fix for non-debug build

ChangeSet@1.2584.3.1, 2008-02-11 20:55:04+02:00, monty@mysql.com +12 -0
  Add warning of TRANSACTIONAL=1 is used with handler that doesn't support it
  Added hton_name() and handler->engine_name() and use these when appropriate

  KNOWN_BUGS.txt@1.4, 2008-02-11 20:54:54+02:00, monty@mysql.com +8 -2
    Added some of the known bugs

  mysql-test/r/maria.result@1.40, 2008-02-11 20:54:54+02:00, monty@mysql.com +33 -0
    Added test for TRANSACTIONAL=1

  mysql-test/r/myisam.result@1.121, 2008-02-11 20:54:54+02:00, monty@mysql.com +10 -0
    Added test for TRANSACTIONAL=1

  mysql-test/t/maria.test@1.35, 2008-02-11 20:54:54+02:00, monty@mysql.com +19 -1
    Added test for TRANSACTIONAL=1

  mysql-test/t/myisam.test@1.91, 2008-02-11 20:54:55+02:00, monty@mysql.com +7 -0
    Added test for TRANSACTIONAL=1

  sql/handler.cc@1.331, 2008-02-11 20:54:55+02:00, monty@mysql.com +4 -5
    ha_resolve_storage_engine_name() -> hton_name()

  sql/handler.h@1.264, 2008-02-11 20:54:55+02:00, monty@mysql.com +10 -1
    Added hton_name() and handler->engine_name()

  sql/set_var.cc@1.254, 2008-02-11 20:54:55+02:00, monty@mysql.com +1 -1
    Use hton_name()

  sql/sql_table.cc@1.454, 2008-02-11 20:54:55+02:00, monty@mysql.com +20 -8
    Add warning of TRANSACTIONAL=1 is used with handler that doesn't support it
    Indentation fixes
    ha_resolve_storage_engine_name() -> hton_name()

  sql/sql_tablespace.cc@1.12, 2008-02-11 20:54:55+02:00, monty@mysql.com +7 -6
    ha_resolve_storage_engine_name() -> hton_name()
    Indentation fixes

  sql/sql_yacc.yy@1.621, 2008-02-11 20:54:55+02:00, monty@mysql.com +1 -1
    ha_resolve_storage_engine_name() -> hton_name()

  sql/unireg.cc@1.105, 2008-02-11 20:54:55+02:00, monty@mysql.com +1 -2
    ha_resolve_storage_engine_name() -> hton_name()
    Indentation fixes

ChangeSet@1.2584.2.1, 2008-02-11 16:36:34+01:00, guilhem@gbichot4.local +3 -0
  A new option for maria_chk: --zerofill-keep-lsn. This will be used
  by ma_test_recovery.pl when it happens that Recovery does not recreate
  pages exactly as they were at first run: this option will help us
  verify that the differences are in unimportant page pieces (those pieces
  will be zeroed by --zerofill-keep-lsn, but not the important LSNs).

  include/myisamchk.h@1.10, 2008-02-11 16:36:31+01:00, guilhem@gbichot4.local +1 -0
    new zerofill flag for maria_chk

  storage/maria/ma_check.c@1.81, 2008-02-11 16:36:31+01:00, guilhem@gbichot4.local +23 -11
    If T_ZEROFILL_KEEP_LSN, we don't zero out LSNs of data/index pages.
    Then the table is not movable. We still mark it zerofilled, it helps
    to know what was last done to the table.

  storage/maria/maria_chk.c@1.49, 2008-02-11 16:36:32+01:00, guilhem@gbichot4.local +22 -2
    New option --zerofill-keep-lsn

ChangeSet@1.2502.1.44, 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.2583.1.1, 2008-02-11 14:48:03+01:00, guilhem@mysqlwin32. +3 -0
  Fix for failures of ma_control_file-t, ma_test_loghandler_purge-t,
  ma_test_loghandler_pagecache-t on Windows.

  storage/maria/ma_control_file.c@1.28, 2008-02-11 14:47:56+01:00, guilhem@mysqlwin32. +8 -9
    stat() is unreliable on Windows (does not reflect process' own writes)

  storage/maria/ma_loghandler.c@1.126, 2008-02-11 14:47:56+01:00, guilhem@mysqlwin32. +12 -18
    translog_set_lsn_for_files() didn't close its file descriptor; it was
    a real problem as non-closed files could not be purged.
    Same for translog_truncate_log() in case of error.

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.29, 2008-02-11 14:47:57+01:00, guilhem@mysqlwin32. +13 -8
    stat() is unreliable on Windows (does not reflect process' own writes)

ChangeSet@1.2502.1.43, 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.2502.1.42, 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.2583, 2008-02-08 18:14:37+01:00, guilhem@gbichot4.local +1 -0
  Correcting assertion

  storage/maria/ha_maria.cc@1.84, 2008-02-08 18:14:35+01:00, guilhem@gbichot4.local +1 -1
    start_stmt() is passed thr_lock_type (TL_*), not int F_*.
    Though tt does not seem to matter here, F_UNLCK == TL_UNLOCK == 0
    at least on Linux and Windows.

ChangeSet@1.2577.2.1, 2008-02-08 17:51:41+01:00, guilhem@gbichot4.local +2 -0
  BUG#34089 "Maria crash on LOAD INDEX after FLUSH TABLES"
  a typo had not disable LOAD INDEX for Maria.
  BUG#34161 "freeing maria tmp table after fetching rows using prepared statements - crashes"
  running the testcase I was not able to repeat the same crash but
  found a misplaced assertion giving false positive, fixed here.

  storage/maria/ha_maria.cc@1.83, 2008-02-08 17:51:36+01:00, guilhem@gbichot4.local +1 -1
    important typo

  storage/maria/ma_pagecache.c@1.84.1.1, 2008-02-08 17:51:36+01:00, guilhem@gbichot4.local +20 -8
    The assertion on block's type should be after read_block(). Otherwise
    it can give false alarms.

ChangeSet@1.2577.1.1, 2008-02-08 15:35:02+01:00, guilhem@mysqlwin32. +3 -0
  Fix for bug in log handler observed when running maria-big
  and then maria-connect under Windows 32-bit Visual Studio 2003.
  Build of all Maria unit tests under Windows.

  storage/maria/ma_loghandler.c@1.125, 2008-02-08 15:34:54+01:00, guilhem@mysqlwin32. +6 -4
    Assertion contributed by Sanja. Working around my_stat() bug on Windows
    (st_size is long i.e. 32-bit signed, the file was slightly bigger than
    2GB, so st_size was negative, TRANSLOG_PAGE_SIZE was int, so the
    comparison was done using long, so st_size was still negative in
    the comparison, which was incorrect). Two fixes: cast st_size to uint32
    (belt) and make TRANSLOG_PAGE_SIZE unsigned (suspenders).
    Of course 'long' is not enough for files >=4GB, but all log files of
    Maria are <4GB. The general problem of my_stat() has been passed on to
    our Windows team.

  storage/maria/ma_loghandler.h@1.48, 2008-02-08 15:34:55+01:00, guilhem@mysqlwin32. +6 -6
    use unsigned ints for constants which represent sizes of pages, files...

  storage/maria/unittest/CMakeLists.txt@1.2, 2008-02-08 15:34:56+01:00, guilhem@mysqlwin32. +40 -42
    a few unit tests were not built under Windows

ChangeSet@1.2580, 2008-02-08 08:45:41+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +1 -0
  Postmerge mac compiler warnings fixed.

  storage/maria/unittest/ma_control_file-t.c@1.22, 2008-02-08 08:45:32+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +3 -2
    Postmerge mac compiler warnings fixed.

ChangeSet@1.2560.2.1, 2008-02-07 22:46:32+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +23 -0
  Mac compiler warnings fixed.

  include/maria.h@1.26, 2008-02-07 22:46:11+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +1 -1
    mac compiler warnings fixed.

  storage/maria/ma_bitmap.c@1.44, 2008-02-07 22:46:12+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +1 -1
    mac compiler warnings fixed.

  storage/maria/ma_blockrec.c@1.86.1.1, 2008-02-07 22:46:13+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +9 -9
    mac compiler warnings fixed.

  storage/maria/ma_check.c@1.78.1.1, 2008-02-07 22:46:13+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +10 -9
    mac compiler warnings fixed.

  storage/maria/ma_control_file.c@1.24.2.1, 2008-02-07 22:46:13+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +2 -2
    mac compiler warnings fixed.

  storage/maria/ma_create.c@1.51, 2008-02-07 22:46:14+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +2 -2
    mac compiler warnings fixed.

  storage/maria/ma_delete.c@1.27, 2008-02-07 22:46:14+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +2 -2
    mac compiler warnings fixed.

  storage/maria/ma_ft_boolean_search.c@1.10, 2008-02-07 22:46:14+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +16 -14
    mac compiler warnings fixed.

  storage/maria/ma_ft_nlq_search.c@1.8, 2008-02-07 22:46:14+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +2 -2
    Mac compiler warnings fixed.

  storage/maria/ma_ft_parser.c@1.7, 2008-02-07 22:46:14+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +10 -9
    Mac compiler warnings fixed.

  storage/maria/ma_key_recover.c@1.23.1.1, 2008-02-07 22:46:15+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +7 -7
    Mac compiler warnings fixed.

  storage/maria/ma_open.c@1.60, 2008-02-07 22:46:15+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +2 -2
    Mac compiler warnings fixed.

  storage/maria/ma_page.c@1.27.1.1, 2008-02-07 22:46:15+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +1 -1
    mac compiler warnings fixed.

  storage/maria/ma_pagecache.c@1.82.1.1, 2008-02-07 22:46:15+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +2 -2
    mac compiler warnings fixed.

  storage/maria/ma_recovery.c@1.82.1.1, 2008-02-07 22:46:16+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +1 -1
    mac compiler warning fixed.

  storage/maria/ma_rt_test.c@1.5, 2008-02-07 22:46:16+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +12 -12
    mac compiler warnings fixed.

  storage/maria/ma_search.c@1.18, 2008-02-07 22:46:16+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +4 -4
    mac compiler warning fixed.

  storage/maria/ma_write.c@1.34, 2008-02-07 22:46:16+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +5 -5
    mac compiler warnings fixed.

  storage/maria/unittest/ma_control_file-t.c@1.21, 2008-02-07 22:46:17+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +5 -5
    mac compiler warnings fixed.

  storage/maria/unittest/ma_pagecache_consist.c@1.26, 2008-02-07 22:46:17+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +5 -5
    mac compiler warnings fixed.

  storage/maria/unittest/ma_pagecache_single.c@1.27, 2008-02-07 22:46:17+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +21 -21
    mac compiler warnings fixed.

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.28, 2008-02-07 22:46:18+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +1 -1
    mac compiler warning fixed.

  storage/maria/unittest/test_file.c@1.9, 2008-02-07 22:46:18+02:00, bell@oleksandr-byelkins-powerbook-g4-15.local +1 -1
    mac compiler warning fixed.

ChangeSet@1.2578, 2008-02-07 19:51:50+01:00, serg@janus.mylan +2 -0
  missing DBUG_VOID_RETURN

  BUILD/SETUP.sh@1.74, 2008-02-07 19:51:46+01:00, serg@janus.mylan +3 -3
    no need to force stack direction anymore

  sql/rpl_filter.cc@1.10, 2008-02-07 19:51:47+01:00, serg@janus.mylan +2 -0
    missing DBUG_VOID_RETURN

ChangeSet@1.2502.1.41, 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.2575.1.1, 2008-02-07 16:54:13+01:00, guilhem@mysqlwin32. +3 -0
  Fixes for DBUG_ABORT()

  BitKeeper/deleted/.del-.tree-is-private@1.2, 2008-02-07 16:53:17+01:00, guilhem@mysqlwin32. +0 -0
    Delete: .tree-is-private

  include/my_dbug.h@1.37, 2008-02-07 16:54:08+01:00, guilhem@mysqlwin32. +13 -0
    To disable the popup of abort() we use _CrtReportMode/File()
    (thanks Wlad)

  mysys/my_thr_init.c@1.64, 2008-02-07 16:54:08+01:00, guilhem@mysqlwin32. +0 -15
    Visual Studio 2005 does not allow overloading library functions.

ChangeSet@1.2502.4.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.2576, 2008-02-07 09:42:37+01:00, serg@janus.mylan +1 -0
  midding DBUG_RETURN

  sql/set_var.cc@1.253, 2008-02-07 09:42:33+01:00, serg@janus.mylan +2 -1
    midding DBUG_RETURN

ChangeSet@1.2502.4.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.333.3.1, 2008-02-07 08:41:21+01:00, mkindahl@dl145h.mysql.com +2 -0
    Disabling declaration in non-debug builds.

ChangeSet@1.2575, 2008-02-06 23:13:45+01:00, serg@janus.mylan +1 -0
  _db_strict_keyword_ is no more

  sql/mysql_priv.h@1.537, 2008-02-06 23:13:41+01:00, serg@janus.mylan +1 -1
    _db_strict_keyword_ is no more

ChangeSet@1.2574, 2008-02-06 23:08:51+01:00, serg@janus.mylan +1 -0
  don't disable debug if there's nothing to disable

  mysql-test/mysql-test-run.pl@1.327, 2008-02-06 23:08:48+01:00, serg@janus.mylan +1 -1
    don't disable debug if there's nothing to disable

ChangeSet@1.2571.1.1, 2008-02-06 21:33:25+01:00, serg@janus.mylan +1 -0
  dbug/Makefile.am
      1. older automakes didn't have builddir, don't use it.
      2. destination can be read-only (think bk -r get)

  dbug/Makefile.am@1.22, 2008-02-06 21:33:22+01:00, serg@janus.mylan +1 -1
    1. older automakes didn't have builddir, don't use it.
    2. destination can be read-only (think bk -r get)

ChangeSet@1.2562.4.1, 2008-02-06 22:06:37+02:00, monty@mysql.com +1 -0
  Fixed bug in _ma_lock_key_del() when key link is locked and there is no freed pages

  storage/maria/ma_key_recover.c@1.24, 2008-02-06 22:06:34+02:00, monty@mysql.com +4 -1
    Fixed bug in _ma_lock_key_del() when key link is locked and there is no freed pages

ChangeSet@1.1810.3470.20, 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.2571, 2008-02-06 20:01:55+01:00, serg@janus.mylan +4 -0
  dbug/dbug.c
      dbug naming conventions
  dbug/user.r
      unification, documenting DBUG_ABORT()
  include/my_dbug.h
      DBUG_ABORT()
  sql/mysqld.cc
      remove redundant option (--enable-debug and --disable-debug should be
      used instead)

  dbug/dbug.c@1.48, 2008-02-06 20:01:51+01:00, serg@janus.mylan +10 -10
    dbug naming conventions

  dbug/user.r@1.10, 2008-02-06 20:01:51+01:00, serg@janus.mylan +11 -5
    unification, documenting DBUG_ABORT()

  include/my_dbug.h@1.36, 2008-02-06 20:01:51+01:00, serg@janus.mylan +2 -1
    DBUG_ABORT()

  sql/mysqld.cc@1.624, 2008-02-06 20:01:51+01:00, serg@janus.mylan +0 -5
    remove redundant option (--enable-debug and --disable-debug should be
    used instead)

ChangeSet@1.2557.2.1, 2008-02-06 18:02:05+01:00, guilhem@mysqlwin32. +12 -0
  Fixes for running maria-recovery*.test and maria-purge.test under
  Windows.

  include/my_dbug.h@1.30.1.1, 2008-02-06 18:01:53+01:00, guilhem@mysqlwin32. +2 -0
    a DBUG expression to force a flush of the trace file then an abort of the process

  mysql-test/include/wait_until_connected_again.inc@1.4.1.1, 2008-02-06 18:01:53+01:00, guilhem@mysqlwin32. +1 -1
    mysqladmin waits for pid file to be gone only under Unix; so
    maria_empty_logs.inc cannot wait for mysqld to be gone, so
    wait_until_connected_again.inc may send its "show status" to a 
    not-yet-dead server hence the 1053 error ("server shutdown in progress")

  mysys/my_thr_init.c@1.63, 2008-02-06 18:01:54+01:00, guilhem@mysqlwin32. +15 -0
    overload abort() under Windows, to not have an annoying CRT popup
    ("ignore/abort/retry" buttons) each time a test intentionally
    crashes mysqld

  sql/handler.cc@1.327.1.1, 2008-02-06 18:01:54+01:00, guilhem@mysqlwin32. +5 -5
    use new expression

  sql/log.cc@1.303.1.3, 2008-02-06 18:01:55+01:00, guilhem@mysqlwin32. +1 -1
    use new expression

  sql/mysql_priv.h@1.534.1.1, 2008-02-06 18:01:56+01:00, guilhem@mysqlwin32. +2 -2
    use new expression

  storage/maria/ha_maria.cc@1.79.1.1, 2008-02-06 18:01:57+01:00, guilhem@mysqlwin32. +1 -2
    use new expression

  storage/maria/ma_blockrec.c@1.85.1.1, 2008-02-06 18:01:57+01:00, guilhem@mysqlwin32. +1 -5
    use new expression

  storage/maria/ma_check.c@1.77.1.1, 2008-02-06 18:01:58+01:00, guilhem@mysqlwin32. +3 -6
    use new expression

  storage/maria/ma_checkpoint.c@1.41, 2008-02-06 18:01:59+01:00, guilhem@mysqlwin32. +1 -5
    use new expression

  storage/maria/ma_control_file.c@1.24.1.1, 2008-02-06 18:01:59+01:00, guilhem@mysqlwin32. +13 -1
    Can't yet lock control file under Windows (test suite problems,
    plus concerns about stray lock preventing a fast restart after crash).

  storage/maria/ma_loghandler.c@1.120.2.1, 2008-02-06 18:02:00+01:00, guilhem@mysqlwin32. +9 -2
    A file which should be closed, otherwise translog_purge() (the caller)
    cannot delete logs.

ChangeSet@1.2569, 2008-02-06 17:55:04+01:00, serg@janus.mylan +9 -0
  after-merge
  *correct* disabling of dbug in mysql-test-run

  include/atomic/gcc_builtins.h@1.2, 2008-02-06 17:54:58+01:00, serg@janus.mylan +3 -0
    after-merge

  mysql-test/lib/mtr_report.pl@1.69, 2008-02-06 17:54:58+01:00, serg@janus.mylan +1 -1
    after-merge

  mysql-test/mysql-test-run.pl@1.326, 2008-02-06 17:54:58+01:00, serg@janus.mylan +20 -8
    *correct* disabling of dbug in mysql-test-run

  mysql-test/r/ps_maria.result@1.10, 2008-02-06 17:54:58+01:00, serg@janus.mylan +2 -3
    after-merge

  mysql-test/t/crash_commit_before-master.opt@1.3, 2008-02-06 17:54:58+01:00, serg@janus.mylan +1 -1
    *correct* disabling of dbug in mysql-test-run

  mysql-test/t/maria-recovery-big-master.opt@1.2, 2008-02-06 17:54:59+01:00, serg@janus.mylan +1 -2
    *correct* disabling of dbug in mysql-test-run

  mysql-test/t/maria-recovery-bitmap-master.opt@1.3, 2008-02-06 17:54:59+01:00, serg@janus.mylan +1 -2
    *correct* disabling of dbug in mysql-test-run

  mysql-test/t/maria-recovery-master.opt@1.4, 2008-02-06 17:54:59+01:00, serg@janus.mylan +1 -2
    *correct* disabling of dbug in mysql-test-run

  sql/mysqld.cc@1.623, 2008-02-06 17:54:59+01:00, serg@janus.mylan +7 -0
    --disable-debug

ChangeSet@1.2562.1.5, 2008-02-06 17:28:54+01:00, guilhem@gbichot4.local +2 -0
  Lock control file also when we have created it in this run. Assertions.

  storage/maria/ma_control_file.c@1.25, 2008-02-06 17:28:50+01:00, guilhem@gbichot4.local +10 -2
    Even if the file is just created we have to lock it, otherwise some
    other Maria instance may write to it.

  storage/maria/ma_pagecache.c@1.84, 2008-02-06 17:28:50+01:00, guilhem@gbichot4.local +5 -0
    catch too big page numbers when they enter the pagecache; this helps
    debugging BUG#34250.

ChangeSet@1.2502.4.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.333.1.1, 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.2502.4.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.313.18.5, 2008-02-06 06:17:56+01:00, mkindahl@dl145h.mysql.com +0 -8
    Removing duplicate code.

ChangeSet@1.2502.1.36, 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.2502.1.35, 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.3470.19, 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.2567, 2008-02-05 14:19:53+01:00, serg@janus.mylan +5 -0
  cleanup

  dbug/dbug.c@1.47, 2008-02-05 14:19:47+01:00, serg@janus.mylan +1 -1
    dbug naming conventions

  include/my_dbug.h@1.34, 2008-02-05 14:19:47+01:00, serg@janus.mylan +0 -1
    unused function

  include/my_sys.h@1.230, 2008-02-05 14:19:47+01:00, serg@janus.mylan +1 -1
    cleanup

  mysys/checksum.c@1.13, 2008-02-05 14:19:47+01:00, serg@janus.mylan +0 -8
    cleanup

  sql/mysqld.cc@1.621, 2008-02-05 14:19:47+01:00, serg@janus.mylan +1 -3
    cleanup

ChangeSet@1.2502.1.33, 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.61.1.12, 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.2502.1.32, 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.61.1.11, 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.2562.2.1, 2008-02-04 22:12:57+01:00, guilhem@mysqlwin32. +3 -0
  Minor test fixes

  mysql-test/include/wait_until_connected_again.inc@1.5, 2008-02-04 22:12:52+01:00, guilhem@mysqlwin32. +1 -1
    On Windows, mysqladmin does not wait on pid file when it has shut down
    mysqld. Thus, in maria_empty_logs.inc, wait_until_connected_again.inc
    can run while mysqld is shutting down (has not finished) and so
    get "shutdown in progress" instead of "can't connect".

  mysql-test/t/maria-recovery-big.test@1.2, 2008-02-04 22:12:52+01:00, guilhem@mysqlwin32. +1 -0
    it is a big test

  storage/maria/unittest/ma_test_recovery.pl@1.1.1.1, 2008-02-04 22:12:53+01:00, guilhem@mysqlwin32. +4 -2
    We want to see the result of 'cmp', like in the shell version

ChangeSet@1.2502.1.31, 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.3470.18, 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.3470.17, 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.2502.1.28, 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.2502.1.27, 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.2502.1.26, 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.61.1.10, 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.2502.1.25, 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.2565, 2008-02-03 23:14:23+01:00, serg@janus.mylan +1 -0
  ignore:
    added dbug/tests

  BitKeeper/etc/ignore@1.270, 2008-02-03 23:04:06+01:00, serg@janus.mylan +1 -0
    added dbug/tests

ChangeSet@1.2564, 2008-02-03 20:58:47+01:00, serg@janus.mylan +5 -0
  dbug: function/ (a.k.a. SUBDIR) syntax 

  dbug/dbug.c@1.46, 2008-02-03 20:45:01+01:00, serg@janus.mylan +225 -82
    function/ (a.k.a. SUBDIR) syntax 

  dbug/dbug.c@1.45, 2008-02-02 14:09:31+01:00, serg@janus.mylan +97 -74
    preparing for function/ syntax: comments. SUBDIR flag, _set_ and
    _explain_ support, InList, merging everithing allocated on the
    caller's stack by DBUG_ENTER into a _db_stack_frame_ struct.
    Renaming "framep" to a more logical "prev"

  dbug/tests-t.pl@1.2, 2008-02-03 20:45:01+01:00, serg@janus.mylan +209 -97
    1. add support for test comments
    2. add test comments
    3. move tests around
    4. add SUBDIR tests

  dbug/tests.c@1.2, 2008-02-03 20:45:01+01:00, serg@janus.mylan +14 -2
    support code for SUBDIR testing

  dbug/user.r@1.9, 2008-02-03 20:58:42+01:00, serg@janus.mylan +16 -7
    negative lists and function/ syntax.

  include/my_dbug.h@1.33, 2008-02-03 20:45:01+01:00, serg@janus.mylan +6 -6
    comments. change in _db_set_ prototype

  include/my_dbug.h@1.32, 2008-02-02 14:09:31+01:00, serg@janus.mylan +28 -25
    preparing for function/ syntax: merging everithing allocated on the
    caller's stack by DBUG_ENTER into a _db_stack_frame_ struct.
    Renaming "framep" to a more logical "prev".
    retab.

ChangeSet@1.2502.1.24, 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.61.1.9, 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.2502.1.23, 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.2502.1.22, 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.2562.1.3, 2008-02-02 01:00:27+01:00, guilhem@gbichot4.local +1 -0
  compiler warning

  mysys/my_pread.c@1.28, 2008-02-02 01:00:25+01:00, guilhem@gbichot4.local +4 -1
    compiler warning

ChangeSet@1.2562.1.2, 2008-02-02 00:42:05+01:00, guilhem@gbichot4.local +1 -0
  fix for recovery unit test under Unix

  storage/maria/unittest/ma_test_recovery.pl@1.3, 2008-02-02 00:42:03+01:00, guilhem@gbichot4.local +3 -3
    Perl magic does something unexpected with $suffix is ""

  storage/maria/unittest/ma_test_recovery.pl@1.2, 2008-02-02 00:18:46+01:00, guilhem@gbichot4.local +0 -0
    Change mode to -rwxrwxrwx

ChangeSet@1.2562.1.1, 2008-02-02 00:01:31+01:00, guilhem@mysqlwin32. +8 -0
  Fix for Windows-specific bugs:
  - one which led REDO_INSERT_ROW_BLOBS to fail to apply
  - one excess close ("-1 file left open")
  Don't need maria-path option / environment variable.
  Fixes for ma_test_all-t to run under Windows.
  Port of ma_test_recovery to Perl, written by Jani.

  mysys/my_pread.c@1.27, 2008-02-02 00:01:23+01:00, guilhem@mysqlwin32. +8 -9
    Fix for Windows-specific bug (maria_read_log -a failed during
    ma_test_all-t): Windows does not have pread() so the branch setting
    HA_ERR_FILE_TOO_SHORT was not compiled in, broke applying of
    REDO_INSERT_ROW_BLOBS. After fixing that, it appeared that in my
    Windows machine, errno is not changed in case of EOF; as we read it
    we have to reset it at start.
    The changed to readbytes!=-1 is to detect EOF

  mysys/my_read.c@1.26, 2008-02-02 00:01:23+01:00, guilhem@mysqlwin32. +2 -2
    The change to readbytes!=-1 is to detect EOF

  storage/maria/ma_loghandler.c@1.123, 2008-02-02 00:01:24+01:00, guilhem@mysqlwin32. +3 -1
    Fix for Windows-specific bug: as we don't open the directory
    we should not close it.

  storage/maria/ma_page.c@1.29, 2008-02-02 00:01:24+01:00, guilhem@mysqlwin32. +4 -1
    This is C, cannot declare variable after instruction.

  storage/maria/ma_test_recovery@1.24, 2008-02-02 00:01:25+01:00, guilhem@mysqlwin32. +2 -2
    ma_test_recovery.expected moved

  storage/maria/unittest/ma_test_all-t@1.13, 2008-02-02 00:01:26+01:00, guilhem@mysqlwin32. +135 -129
    Can now safely guess maria_path so don't need the command-line option
    or environment variable. Port to Windows (.exe, different locations
    of executables); can guess suffix, don't need --suffix.

  storage/maria/unittest/ma_test_recovery.expected@1.21, 2008-02-01 22:20:23+01:00, guilhem@mysqlwin32. +0 -0
    Rename: storage/maria/ma_test_recovery.expected -> storage/maria/unittest/ma_test_recovery.expected

  storage/maria/unittest/ma_test_recovery.pl@1.1, 2008-02-02 00:01:26+01:00, guilhem@mysqlwin32. +326 -0
    Perl version of ma_test_recovery, written by Jani. Will deprecate the
    shell version.

  storage/maria/unittest/ma_test_recovery.pl@1.0, 2008-02-02 00:01:26+01:00, guilhem@mysqlwin32. +0 -0

ChangeSet@1.2502.1.20, 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.3591.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.2560.1.1, 2008-02-01 17:42:51+01:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -0
  Very minor changes in ma_test_recovery test suite.

  storage/maria/ma_test_recovery@1.23, 2008-02-01 17:42:46+01:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -1
    Removed a white space from a list of tests.

  storage/maria/ma_test_recovery.expected@1.20, 2008-02-01 17:42:46+01:00, jani@a88-113-38-195.elisa-laajakaista.fi +16 -16
    Removed a white space from a list of tests.
    
    This was originally unintentional and change makes it easier to
    port ma_test_recovery to Perl.

ChangeSet@1.1810.3470.15, 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.2555.3.2, 2008-02-01 16:21:44+01:00, serg@janus.mylan +6 -0
  negative lists in dbug (-#-d,info => everything but "info").
  unit tests for dbug

  dbug/Makefile.am@1.21, 2008-02-01 16:21:41+01:00, serg@janus.mylan +9 -4
    unit tests for dbug

  dbug/dbug.c@1.44, 2008-02-01 16:21:41+01:00, serg@janus.mylan +123 -154
    negative lists (-#-d,info => everything but "info")

  dbug/tests-t.pl@1.1, 2008-02-01 16:21:41+01:00, serg@janus.mylan +371 -0
    unit tests for dbug

  dbug/tests-t.pl@1.0, 2008-02-01 16:21:41+01:00, serg@janus.mylan +0 -0

  dbug/tests.c@1.1, 2008-02-01 16:21:41+01:00, serg@janus.mylan +73 -0
    unit tests for dbug

  dbug/tests.c@1.0, 2008-02-01 16:21:41+01:00, serg@janus.mylan +0 -0

  include/my_dbug.h@1.31, 2008-02-01 16:21:41+01:00, serg@janus.mylan +5 -6
    negative lists (-#-d,info => everything but "info")

  unittest/Makefile.am@1.17, 2008-02-01 16:21:41+01:00, serg@janus.mylan +1 -1
    unit tests for dbug

ChangeSet@1.1810.3470.14, 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.2502.1.17, 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.2502.1.16, 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.3470.13, 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.2502.3.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.2502.3.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.2502.1.12, 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.1810.3470.12, 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.2561, 2008-01-31 23:17:50+01:00, guilhem@gbichot4.local +12 -0
  Minor changes. New description in SHOW ENGINES for Maria.
  Test for BUG#34106 "auto_increment is reset to 1 when table is recovered from crash"
  (fixed by Monty yesterday)

  mysql-test/r/maria-recovery.result@1.16, 2008-01-31 23:17:45+01:00, guilhem@gbichot4.local +26 -0
    result, which is correct (before pulling Monty's fix for BUG#34106,
    we got a warning about auto_increment in CHECK TABLE (done in
    maria-verify-recovery.inc), no AUTO_INCREMENT clause in
    SHOW CREATE TABLE, and a failure of the last INSERT.

  mysql-test/r/maria.result@1.39, 2008-01-31 23:17:45+01:00, guilhem@gbichot4.local +3 -0
    result

  mysql-test/t/maria-recovery.test@1.17, 2008-01-31 23:17:45+01:00, guilhem@gbichot4.local +14 -0
    Test for BUG#34106

  mysql-test/t/maria.test@1.34, 2008-01-31 23:17:45+01:00, guilhem@gbichot4.local +2 -0
    look at what is reported in SHOW ENGINES

  mysys/my_pread.c@1.26, 2008-01-31 23:17:45+01:00, guilhem@gbichot4.local +8 -8
    changed my mind: if Count argument is >4GB, we'll surely see a segfault
    in the pread() call when it tries to read 4GB from memory, so no need
    to print it in ulonglong format (saves a function call).

  mysys/my_read.c@1.25, 2008-01-31 23:17:45+01:00, guilhem@gbichot4.local +2 -6
    changed my mind: if Count argument is >4GB, we'll surely see a segfault
    in the pread() call when it tries to read 4GB from memory, so no need
    to print it in ulonglong format (saves a function call).

  mysys/my_write.c@1.21, 2008-01-31 23:17:45+01:00, guilhem@gbichot4.local +2 -6
    changed my mind: if Count argument is >4GB, we'll surely see a segfault
    in the pread() call when it tries to read 4GB from memory, so no need
    to print it in ulonglong format (saves a function call).

  storage/maria/ha_maria.cc@1.81, 2008-01-31 23:17:45+01:00, guilhem@gbichot4.local +1 -1
    Description representing the current reality. This can be changed later

  storage/maria/ma_page.c@1.28, 2008-01-31 23:17:46+01:00, guilhem@gbichot4.local +9 -3
    When reading the new key_del from a page on disk, if there is a bug
    (like BUG#34062) this key_del could be wrong, we try to catch if it's
    out of the key file.

  storage/maria/ma_pagecache.c@1.83, 2008-01-31 23:17:46+01:00, guilhem@gbichot4.local +12 -6
    - no truncation of page's number in DBUG_PRINT (useful for BUG#34062)
    - page_korr instead of uint5korr

  storage/maria/ma_recovery.c@1.83, 2008-01-31 23:17:46+01:00, guilhem@gbichot4.local +2 -2
    page_korr instead of uint5korr

  storage/maria/plug.in@1.8, 2008-01-31 23:17:46+01:00, guilhem@gbichot4.local +1 -1
    Description representing the current reality. This can be changed later.

ChangeSet@1.2555.3.1, 2008-01-31 20:45:31+01:00, serg@janus.mylan +7 -0
  remove unused dbug files

  BitKeeper/deleted/.del-.cvsignore@1.5, 2008-01-31 20:36:33+01:00, serg@janus.mylan +0 -0
    Delete: dbug/.cvsignore

  BitKeeper/deleted/.del-doinstall.sh@1.3, 2008-01-31 20:35:15+01:00, serg@janus.mylan +0 -0
    Delete: dbug/doinstall.sh

  BitKeeper/deleted/.del-install.sh@1.3, 2008-01-31 20:36:20+01:00, serg@janus.mylan +0 -0
    Delete: dbug/install.sh

  BitKeeper/deleted/.del-mklintlib.sh@1.3, 2008-01-31 20:36:20+01:00, serg@janus.mylan +0 -0
    Delete: dbug/mklintlib.sh

  BitKeeper/deleted/.del-qmake.cmd@1.3, 2008-01-31 20:36:20+01:00, serg@janus.mylan +0 -0
    Delete: dbug/qmake.cmd

  BitKeeper/deleted/.del-vargs.h@1.3, 2008-01-31 20:37:57+01:00, serg@janus.mylan +0 -0
    Delete: dbug/vargs.h

  dbug/CMakeLists.txt@1.7, 2008-01-31 20:32:10+01:00, serg@janus.mylan +0 -0
    Change mode to -rw-rw-r--

ChangeSet@1.2476.828.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.828.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.2476.801.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.2476.828.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.2476.827.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.86.14.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.51.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.159.1.14, 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.1810.3565.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.2557.1.5, 2008-01-31 12:21:55+02:00, bell@desktop.sanja.is.com.ua +3 -0
  Small changes for unit tests.

  storage/maria/unittest/Makefile.am@1.23, 2008-01-31 12:21:51+02:00, bell@desktop.sanja.is.com.ua +33 -33
    fixed names of tests.

  storage/maria/unittest/ma_pagecache_consist.c@1.25, 2008-01-31 12:21:51+02:00, bell@desktop.sanja.is.com.ua +6 -2
    Some of pagecache multi-thread tests are not big.
    Fixed reporting of tests end (now under mutex protection).

  storage/maria/unittest/ma_test_loghandler-t.c@1.32, 2008-01-31 12:21:51+02:00, bell@desktop.sanja.is.com.ua +0 -2
    fixed layout to make blocks nof parameters more visible.

ChangeSet@1.2476.720.32, 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.2557.1.4, 2008-01-31 08:48:49+02:00, monty@mysql.com +2 -0
  Fixed portability issue with comparing thread id
  Fixed bug where return value 'error' was not set in case of error in pagecache
  Documented the open LOAD INDEX bug

  KNOWN_BUGS.txt@1.3, 2008-01-31 08:48:45+02:00, monty@mysql.com +3 -1
    Added the problem with LOAD INDEX as a known bugs. Will fix this bug later this week

  storage/maria/ma_pagecache.c@1.82, 2008-01-31 08:48:45+02:00, monty@mysql.com +9 -12
    Fixed portability issue with comparing thread id
    Fixed bug where return value 'error' was not set in case of error

ChangeSet@1.1810.3565.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.2551.2.1, 2008-01-31 03:06:04+02:00, monty@mysql.com +20 -0
  Fixed bug in restoring auto-increment value in case of duplicate key with insert or update
  Fixed bug when calculating max_key_length that caused some ALTER TABLE to fail if MAX_ROWS was used.
  Use maria_block_size instead of MARIA_MIN_KEY_BLOCK_LENGTH
  Fixed bug when scanning table with BLOCK format for repair; If table was > bitmap coverage one page block was read twice which caused a lot of duplicate key errors
  Could not repeat Bug#34106 "auto_increment is reset to 1 when table is recovered from crash" after this patch.
  
  NOTE: This is an incompatible change, so one must do maria_chk -r on ones old Maria tables!
  Sorry, but this was needed to fix the bug with max_key_length and to be able to handle bigger key files with smaller key references

  cmd-line-utils/readline/readline.c@1.13, 2008-01-31 03:01:06+02:00, monty@mysql.com +1 -14
    Fixed compiler warnings

  mysql-test/r/maria.result@1.38, 2008-01-31 03:01:07+02:00, monty@mysql.com +42 -0
    Added more test of auto-increment handling

  mysql-test/t/maria.test@1.33, 2008-01-31 03:01:07+02:00, monty@mysql.com +27 -0
    Added more test of auto-increment handling

  mysys/my_pread.c@1.23.1.1, 2008-01-31 03:01:07+02:00, monty@mysql.com +3 -2
    Fixed wrong test
    Removed not needed tests (error is always 1 if readbytes != Count)

  mysys/my_read.c@1.22.1.1, 2008-01-31 03:01:07+02:00, monty@mysql.com +2 -1
    Fixed wrong test

  storage/maria/ha_maria.cc@1.77.2.1, 2008-01-31 03:01:07+02:00, monty@mysql.com +2 -1
    Disable LOAD INDEX until I got Sanja's extension to pagecache interface

  storage/maria/ma_blockrec.c@1.84.1.1, 2008-01-31 03:01:07+02:00, monty@mysql.com +2 -0
    Ensure that info->last_auto_increment is reset properly

  storage/maria/ma_check.c@1.76.1.1, 2008-01-31 03:01:07+02:00, monty@mysql.com +38 -37
    Fixed wrong printing of row number in case of duplicate key for --safe-repair
    Safety fix in recreate table so that Column numbers are given to maria_create() in original order
    Added missing HA_OPEN_FOR_REPAIR to maria_open()
    Fixed bug when scanning table with BLOCK format for repair; If table was > bitmap coverage one page block was read twice which caused a lot of duplicate key errors

  storage/maria/ma_create.c@1.50, 2008-01-31 03:01:07+02:00, monty@mysql.com +21 -35
    Use correct value for how much free space there is on a key page
    Remember some missing table option when doing re-create.
    Removed optimization where last packed fields is unpacked; Caused problems for re-create.

  storage/maria/ma_delete.c@1.26, 2008-01-31 03:01:07+02:00, monty@mysql.com +7 -0
    Ensure that info->last_auto_increment is reset properly
    Fix for update to restore autoincrement value on duplicate key

  storage/maria/ma_key_recover.c@1.23, 2008-01-31 03:01:07+02:00, monty@mysql.com +27 -5
    Moved handling of restoring value of auto-increment in case of duplicate key from clr to undo
    This ensures the restoring works both for insert and update and also that this is symetrical to how the auto_increment value is stored

  storage/maria/ma_key_recover.h@1.6, 2008-01-31 03:01:07+02:00, monty@mysql.com +3 -0
    Added new prototype

  storage/maria/ma_loghandler.c@1.117.2.1, 2008-01-31 03:01:07+02:00, monty@mysql.com +2 -2
    Added hook to write_hook_for_undo_key_delete()

  storage/maria/ma_open.c@1.59, 2008-01-31 03:06:01+02:00, monty@mysql.com +1 -1
    Fixed wrong calculation of max_key_file_length

  storage/maria/ma_page.c@1.25.1.1, 2008-01-31 03:06:01+02:00, monty@mysql.com +2 -2
    Use maria_block_size instead of MARIA_MIN_KEY_BLOCK_LENGTH
    Increase internal buffer (safety fix)

  storage/maria/ma_search.c@1.17, 2008-01-31 03:06:01+02:00, monty@mysql.com +8 -8
    Use maria_block_size instead of MARIA_MIN_KEY_BLOCK_LENGTH
    Note that this is an incompatible change, so one must do maria_chk -r on ones old Maria tables (sorry)

  storage/maria/ma_update.c@1.20, 2008-01-31 03:06:01+02:00, monty@mysql.com +3 -0
    Ensure that info->last_auto_increment is reset properly

  storage/maria/ma_write.c@1.31.1.1, 2008-01-31 03:06:01+02:00, monty@mysql.com +3 -0
    Ensure that info->last_auto_increment is reset properly
    Fix for update to restore autoincrement value on duplicate key

  storage/maria/maria_chk.c@1.46.1.1, 2008-01-31 03:06:01+02:00, monty@mysql.com +3 -3
    Allow small page_buffer_size
    Fixed printing for --describe to better fit into 80 characters

  storage/maria/maria_def.h@1.69.1.1, 2008-01-31 03:06:01+02:00, monty@mysql.com +6 -2
    Added comments

ChangeSet@1.2557.1.2, 2008-01-30 22:22:20+02:00, bell@desktop.sanja.is.com.ua +1 -0
  The compiler warning fixed.

  storage/maria/ma_pagecache.c@1.81, 2008-01-30 22:22:18+02:00, bell@desktop.sanja.is.com.ua +8 -3
    The compiler warning fixed.

ChangeSet@1.2558, 2008-01-30 22:12:15+02:00, bell@desktop.sanja.is.com.ua +1 -0
  Fixed false assert which conrol sequental writing to disk in
   case of opening and closing loghandler without writing
   sometrhing in it.
  Fixed comment (sent_to_file was renamed to sent_to disk)
  Write log during shutdown in natural order.

  storage/maria/ma_loghandler.c@1.121, 2008-01-30 22:12:13+02:00, bell@desktop.sanja.is.com.ua +21 -7
    Fixed false assert which conrol sequental writing to disk in
     case of opening and closing loghandler without writing
     sometrhing in it.
    Fixed comment (sent_to_file was renamed to sent_to disk)
    Write log during shutdown in natural order.

ChangeSet@1.1810.3565.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.825.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.2476.801.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.825.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.1.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.50.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.3565.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.826.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.49.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.2555.2.1, 2008-01-30 14:33:36+02:00, bell@desktop.sanja.is.com.ua +3 -0
  Fixed thread specific ID.
  Added support for delete by link.
  Aded level ("hits") management functions.

  storage/maria/ma_pagecache.c@1.78.1.1, 2008-01-30 14:33:34+02:00, bell@desktop.sanja.is.com.ua +203 -85
    Fixed thread specific ID.
    Added support for delete by link.
    Aded level ("hits") management functions.

  storage/maria/ma_pagecache.h@1.40, 2008-01-30 14:33:34+02:00, bell@desktop.sanja.is.com.ua +7 -0
    Added support for delete by link.
    Aded level ("hits") management functions.

  storage/maria/unittest/ma_pagecache_single.c@1.26, 2008-01-30 14:33:34+02:00, bell@desktop.sanja.is.com.ua +9 -4
    Test of delete by link.

ChangeSet@1.2555.1.1, 2008-01-30 08:01:45+02:00, bell@desktop.sanja.is.com.ua +14 -0
  Compiler warnings fixed.

  storage/maria/ma_loghandler.c@1.118.1.1, 2008-01-30 08:01:43+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Compiler warning fixed.

  storage/maria/ma_test1.c@1.37, 2008-01-30 08:01:43+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Compiler warning fixed.

  storage/maria/ma_test2.c@1.37, 2008-01-30 08:01:43+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Compiler warning fixed.

  storage/maria/maria_chk.c@1.47, 2008-01-30 08:01:43+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Compiler warning fixed.

  storage/maria/unittest/ma_control_file-t.c@1.20, 2008-01-30 08:01:43+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Compiler warning fixed.

  storage/maria/unittest/ma_test_loghandler-t.c@1.31, 2008-01-30 08:01:43+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Compiler warning fixed.

  storage/maria/unittest/ma_test_loghandler_first_lsn-t.c@1.13, 2008-01-30 08:01:43+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Compiler warning fixed.

  storage/maria/unittest/ma_test_loghandler_max_lsn-t.c@1.13, 2008-01-30 08:01:43+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Compiler warning fixed.

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.27, 2008-01-30 08:01:43+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Compiler warning fixed.

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.29, 2008-01-30 08:01:43+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Compiler warning fixed.

  storage/maria/unittest/ma_test_loghandler_noflush-t.c@1.14, 2008-01-30 08:01:43+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Compiler warning fixed.

  storage/maria/unittest/ma_test_loghandler_nologs-t.c@1.4, 2008-01-30 08:01:43+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Compiler warning fixed.

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.27, 2008-01-30 08:01:43+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Compiler warning fixed.

  storage/maria/unittest/ma_test_loghandler_purge-t.c@1.11, 2008-01-30 08:01:43+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Compiler warning fixed.

ChangeSet@1.2552.2.1, 2008-01-29 22:20:59+01:00, guilhem@gbichot4.local +19 -0
  Fix for BUG#34114 "maria_chk reports false error when several tables on
  command-line" and BUG#34062 "Maria table corruption on master".
  Use 5 bytes (instead of 4) to store page's number in the checkpoint
  record, to allow bigger table (1PB with maria-block-size=1kB).
  Help pushbuild not run out of memory by moving the portion of
  maria-recovery.test which generates lots of data into a -big.test.

  mysql-test/r/maria-recovery-big.result@1.1, 2008-01-29 22:20:56+01:00, guilhem@gbichot4.local +81 -0
    result is correct

  mysql-test/r/maria-recovery-big.result@1.0, 2008-01-29 22:20:56+01:00, guilhem@gbichot4.local +0 -0

  mysql-test/r/maria-recovery.result@1.15, 2008-01-29 22:20:55+01:00, guilhem@gbichot4.local +0 -74
    result moved

  mysql-test/t/maria-recovery-big-master.opt@1.1, 2008-01-29 22:20:56+01:00, guilhem@gbichot4.local +2 -0
    usual options for recovery tests

  mysql-test/t/maria-recovery-big-master.opt@1.0, 2008-01-29 22:20:56+01:00, guilhem@gbichot4.local +0 -0

  mysql-test/t/maria-recovery-big.test@1.1, 2008-01-29 22:20:56+01:00, guilhem@gbichot4.local +68 -0
    Moving out the big blob test to a -big test (it exhausts memory when
    using /dev/shm on certain machines)

  mysql-test/t/maria-recovery-big.test@1.0, 2008-01-29 22:20:56+01:00, guilhem@gbichot4.local +0 -0

  mysql-test/t/maria-recovery.test@1.14.1.1, 2008-01-29 22:20:55+01:00, guilhem@gbichot4.local +0 -35
    piece which generates much data moved to maria-recovery-big.test

  mysys/my_pread.c@1.24, 2008-01-29 22:20:55+01:00, guilhem@gbichot4.local +13 -6
    To fix BUG#34062, where a 1.1TB file was generated due to a wrong
    pwrite offset, it was useful to not lose precision on 'offset' in
    DBUG_PRINT, so that the crazy value is visible.

  mysys/my_read.c@1.23, 2008-01-29 22:20:55+01:00, guilhem@gbichot4.local +6 -2
    To fix BUG#34062, where a 1.1TB file was generated due to a wrong
    pwrite offset, it was useful to not lose precision on 'offset' in
    DBUG_PRINT, so that the crazy value is visible.

  mysys/my_write.c@1.20, 2008-01-29 22:20:55+01:00, guilhem@gbichot4.local +6 -2
    To fix BUG#34062, where a 1.1TB file was generated due to a wrong
    pwrite offset, it was useful to not lose precision on 'offset' in
    DBUG_PRINT, so that the crazy value is visible.

  storage/maria/ha_maria.cc@1.77.1.1, 2008-01-29 22:20:55+01:00, guilhem@gbichot4.local +6 -10
    When starting a bulk insert, we throw away dirty index pages from the
    cache. Unique (non disabled) key insertions thus read out-of-date
    pages from the disk leading to BUG#34062 "Maria table corruption on
    master": a DELETE in procedure viewer_sp() had deleted all rows of
    viewer_tbl2 one by one, putting index page 1 into key_del; that page
    was thrown away at start of INSERT SELECT, then the INSERT SELECT
    needed a page to insert keys, looked at key_del, found 1, read page 1
    from disk, and its out-of-date content was used to set the new value of
    key_del (crazy value of 1TB), then a later insertion needed another
    index page, tried to read page at this crazy offset and failed, leading
    to corruption mark.
    The fix is to destroy out-of-date pages and make the state consistent
    with that, i.e. call maria_delete_all_rows().

  storage/maria/ma_blockrec.c@1.85, 2008-01-29 22:20:55+01:00, guilhem@gbichot4.local +17 -0
    Special hook for UNDO_BULK_INSERT

  storage/maria/ma_blockrec.h@1.31, 2008-01-29 22:20:56+01:00, guilhem@gbichot4.local +3 -0
    special hook for UNDO_BULK_INSERT

  storage/maria/ma_check.c@1.77, 2008-01-29 22:20:56+01:00, guilhem@gbichot4.local +2 -1
    Fix for BUG#34114 "maria_chk reports false error when several tables on
    command-line": if the Nth (on the command line) table was BLOCK_RECORD
    it would start checks by using the param->record_checksum computed by
    checks of table N-1.

  storage/maria/ma_delete_all.c@1.25, 2008-01-29 22:20:56+01:00, guilhem@gbichot4.local +4 -0
    comment

  storage/maria/ma_loghandler.c@1.117.1.1, 2008-01-29 22:20:56+01:00, guilhem@gbichot4.local +1 -1
    special hook for UNDO_BULK_INSERT

  storage/maria/ma_page.c@1.26, 2008-01-29 22:20:56+01:00, guilhem@gbichot4.local +4 -0
    comment

  storage/maria/ma_pagecache.c@1.77.1.1, 2008-01-29 22:20:56+01:00, guilhem@gbichot4.local +4 -5
    page number is 5 bytes in checkpoint record now (allows bigger tables)

  storage/maria/ma_recovery.c@1.82, 2008-01-29 22:20:56+01:00, guilhem@gbichot4.local +3 -3
    page number is 5 bytes in checkpoint record now

  storage/maria/ma_recovery_util.c@1.2, 2008-01-29 22:20:56+01:00, guilhem@gbichot4.local +3 -4
    page number is 5 bytes now

  storage/maria/ma_write.c@1.32, 2008-01-29 22:20:56+01:00, guilhem@gbichot4.local +1 -1
    typo

ChangeSet@1.2476.824.1, 2008-01-29 21:32:43+01:00, joerg@trift2. +1 -0
  Ensure that man pages for "embedded" are included in the source.tar.gz
  This fixes bug#34145.

  BUILD/compile-dist@1.18.1.2, 2008-01-29 21:32:38+01:00, joerg@trift2. +2 -0
    If the call to "configure" does not specify the "embedded" server,
    all man pages for "embedded" will be deleted:
    Re-add "--with-embedded-server".
    
    This fixes bug#34145.

ChangeSet@1.2553.1.2, 2008-01-29 19:58:52+01:00, serg@janus.mylan +1 -0
  ma_test_recovery is not big

  storage/maria/unittest/ma_test_all-t@1.12, 2008-01-29 19:58:49+01:00, serg@janus.mylan +1 -8
    Size doesn't matter or ma_test_recovery is not big

ChangeSet@1.2552.1.2, 2008-01-29 18:15:38+01:00, serg@janus.mylan +7 -0
  changes for big unit tests

  Makefile.am@1.125, 2008-01-29 18:15:33+01:00, serg@janus.mylan +5 -2
    make test-unit-big

  storage/maria/unittest/Makefile.am@1.22, 2008-01-29 18:15:34+01:00, serg@janus.mylan +33 -33
    support big unit tests

  storage/maria/unittest/ma_pagecache_consist.c@1.24, 2008-01-29 18:15:34+01:00, serg@janus.mylan +20 -20
    support big unit tests and other changes

  storage/maria/unittest/ma_pagecache_single.c@1.25, 2008-01-29 18:15:34+01:00, serg@janus.mylan +14 -4
    support big unit tests

  storage/maria/unittest/ma_test_all-t@1.11, 2008-01-29 18:15:34+01:00, serg@janus.mylan +32 -1
    support big unit tests and sub skip()

  storage/maria/unittest/ma_test_loghandler-t.c@1.30, 2008-01-29 18:15:34+01:00, serg@janus.mylan +8 -0
    support big unit tests

  unittest/unit.pl@1.10, 2008-01-29 18:15:34+01:00, serg@janus.mylan +3 -3
    don't ignore existing $MYTAP_CONFIG

ChangeSet@1.2552.1.1, 2008-01-29 15:26:04+01:00, serg@janus.mylan +3 -0
  storage/maria/unittest/ma_test_all-t
      1. reasonable defaults for maria_path
      2. reasonable TAP-compatible output in non-verbose mode
  unittest/Makefile.am
      remove maria_path hack
  BitKeeper/etc/ignore@1.269
      added maria_log.00000* ma_test_recovery.output test?.MA?

  BitKeeper/etc/ignore@1.269, 2008-01-29 15:13:58+01:00, serg@janus.mylan +3 -0
    added maria_log.00000* ma_test_recovery.output test?.MA?

  storage/maria/unittest/ma_test_all-t@1.10, 2008-01-29 15:26:00+01:00, serg@janus.mylan +8 -4
    1. reasonable defaults for maria_path
    2. reasonable TAP-compatible output in non-verbose mode

  unittest/Makefile.am@1.16, 2008-01-29 15:26:00+01:00, serg@janus.mylan +2 -2
    remove maria_path hack

ChangeSet@1.2476.720.30, 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.801.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.2554, 2008-01-29 14:22:50+02:00, bell@desktop.sanja.is.com.ua +1 -0
  Fixed unused branch of page write call.

  storage/maria/ma_pagecache.c@1.78, 2008-01-29 14:22:46+02:00, bell@desktop.sanja.is.com.ua +28 -1
    Fixed unused branch of page write call.

ChangeSet@1.1810.3480.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.1810.3590.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.1810.3470.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.2551.1.1, 2008-01-26 23:03:23+02:00, bell@desktop.sanja.is.com.ua +11 -0
  Support of moving logs in other directory then data root.
  Fixed typo in maria_read_log "help" output.
  Compilation warning on Mac OS fixed.

  mysql-test/include/maria_empty_logs.inc@1.5, 2008-01-26 23:03:22+02:00, bell@desktop.sanja.is.com.ua +21 -21
    Added support of moving maria log relatively
      to master data directory.

  mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc@1.2, 2008-01-26 23:03:22+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Added support of moving maria log relatively
      to master data directory.

  mysql-test/include/maria_verify_recovery.inc@1.5, 2008-01-26 23:03:22+02:00, bell@desktop.sanja.is.com.ua +2 -2
    Added support of moving maria log relatively
      to master data directory.

  mysql-test/t/maria-recovery-master.opt@1.3, 2008-01-26 23:03:22+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Check of recovery with logs in other place.

  mysql-test/t/maria-recovery.test@1.15, 2008-01-26 23:03:22+02:00, bell@desktop.sanja.is.com.ua +1 -0
    Check of recovery with logs in other place.

  storage/maria/ha_maria.cc@1.78, 2008-01-26 23:03:22+02:00, bell@desktop.sanja.is.com.ua +9 -1
    Support of moving logs in other directory then data root.

  storage/maria/ma_loghandler.c@1.118, 2008-01-26 23:03:22+02:00, bell@desktop.sanja.is.com.ua +4 -4
    Compilation warning on Mac OS fixed.

  storage/maria/ma_static.c@1.15, 2008-01-26 23:03:22+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Support of moving logs in other directory then data root.

  storage/maria/ma_test1.c@1.36, 2008-01-26 23:03:22+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Support of moving logs in other directory then data root.

  storage/maria/maria_def.h@1.70, 2008-01-26 23:03:22+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Support of moving logs in other directory then data root.

  storage/maria/maria_read_log.c@1.33, 2008-01-26 23:03:22+02:00, bell@desktop.sanja.is.com.ua +6 -2
    Support of moving logs in other directory then data root.
    Fixed typo in maria_read_log "help" output.

ChangeSet@1.1810.3470.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.2552, 2008-01-25 21:14:48+01:00, guilhem@gbichot4.local +1 -0
  Two bugs already fixed

  KNOWN_BUGS.txt@1.2, 2008-01-25 21:14:44+01:00, guilhem@gbichot4.local +0 -9
    Two bugs already fixed

ChangeSet@1.1810.3480.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.823.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.618, 2008-01-23 16:21:04-07:00, malff@lambda.hsd1.co.comcast.net. +99 -17
    Manual merge

ChangeSet@1.1810.3588.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.3589.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.1810.3470.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.3470.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.77.51, 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.1.2, 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.2551, 2008-01-23 05:00:17+02:00, monty@mysql.com +3 -0
  Fixed bug when using maria_chk --safe-recover with packed tables
  Fixed bug when using maria_chk --safe-recover and getting duplicated keys
  Fixed bug when using maria_pack --join

  storage/maria/ma_check.c@1.76, 2008-01-23 05:00:14+02:00, monty@mysql.com +4 -4
    Fixed bug when using --safe-recover with packed tables
    Fixed bug when using --safe-recover and getting duplicated keys

  storage/maria/maria_pack.c@1.22, 2008-01-23 05:00:14+02:00, monty@mysql.com +7 -0
    Fixed bug when using --join

  storage/maria/unittest/ma_test_all-t@1.9, 2008-01-23 05:00:14+02:00, monty@mysql.com +9 -1
    Added test to check maria_pack --join

ChangeSet@1.2550, 2008-01-22 19:49:05+02:00, monty@mysql.com +10 -0
  Fixes for the remaining 'not-yet-fixed' bugs found by Guilhem when running all tests with maria engine and one bug in maria_pack reported by Martin:
  - Fix that query cache works with Maria
  - Fixed wrong calculation if min_key_length which casued some tables to assert in insert if key contained NULL
  - Restore auto_increment value if insert statement fails
  - Fixed rare bug that caused crash in maria_pack if buffer was flushed at wrong point in time

  configure.in@1.378, 2008-01-22 19:49:00+02:00, monty@mysql.com +1 -1
    Added maria extension to distribution

  mysql-test/r/maria.result@1.37, 2008-01-22 19:49:00+02:00, monty@mysql.com +35 -0
    More test cases to cover bugs found by Guilhem

  mysql-test/t/maria.test@1.32, 2008-01-22 19:49:00+02:00, monty@mysql.com +30 -0
    More test cases to cover bugs found by Guilhem

  storage/maria/ha_maria.cc@1.77, 2008-01-22 19:49:00+02:00, monty@mysql.com +5 -3
    Fix that query cache works with Maria

  storage/maria/ma_blockrec.c@1.84, 2008-01-22 19:49:00+02:00, monty@mysql.com +0 -4
    Removed duplicate functionallity (already done in ma_pagecrc.c)

  storage/maria/ma_create.c@1.49, 2008-01-22 19:49:00+02:00, monty@mysql.com +4 -2
    Fixed wrong calculation if min_key_length which casued some tables to assert in insert if key contained NULL

  storage/maria/ma_key_recover.c@1.22, 2008-01-22 19:49:00+02:00, monty@mysql.com +31 -3
    Restore auto_increment value if insert statement fails

  storage/maria/maria_def.h@1.69, 2008-01-22 19:49:01+02:00, monty@mysql.com +2 -0
    Added variables to track auto_increment changes to be able to restore it in case of duplicate key

  storage/maria/maria_pack.c@1.21, 2008-01-22 19:49:01+02:00, monty@mysql.com +2 -1
    Fixed rare bug that caused crash if buffer was flushed at wrong point in time

  storage/maria/unittest/ma_test_all-t@1.8, 2008-01-22 19:49:01+02:00, monty@mysql.com +18 -13
    Added option --abort-on-error
    Ordered help message

ChangeSet@1.2476.720.29, 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.2541.1.1, 2008-01-21 22:03:24+02:00, monty@mysql.com +6 -0
  Allow index on 'CHAR(0) NULL' columns
  Fixed error in Maria when using table with only CHAR(0) fields
  Fixed valgrind warning

  BitKeeper/etc/ignore@1.268, 2008-01-21 22:02:25+02:00, monty@mysql.com +1 -0
    added storage/maria/maria_dump_log

  mysql-test/r/maria.result@1.34.1.1, 2008-01-21 22:03:22+02:00, monty@mysql.com +31 -0
    Testing of table with char(0)

  mysql-test/t/maria.test@1.29.1.1, 2008-01-21 22:03:22+02:00, monty@mysql.com +17 -0
    Testing of table with char(0)

  sql/sql_table.cc@1.449.1.1, 2008-01-21 22:03:22+02:00, monty@mysql.com +2 -2
    Allow index on 'CHAR(0) NULL' columns

  storage/maria/ma_create.c@1.46.1.1, 2008-01-21 22:03:22+02:00, monty@mysql.com +1 -1
    Allow creation of table with 0 record data (for example CHAR(0))

  storage/maria/ma_pagecrc.c@1.8.1.1, 2008-01-21 22:03:22+02:00, monty@mysql.com +4 -0
    Fixed valgrind warning

ChangeSet@1.2548, 2008-01-21 18:51:30+01:00, guilhem@gbichot4.local +1 -0
  fix for compiler warning

  sql/sql_table.cc@1.451, 2008-01-21 18:51:27+01:00, guilhem@gbichot4.local +1 -3
    initialize variables used in 'err:' before going to err.

ChangeSet@1.2476.720.28, 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.2547, 2008-01-21 11:56:37+01:00, guilhem@gbichot4.local +6 -0
  An assertion added (transaction must be re-enabled before end of
  top-level statement) and fixes for the bugs it finds.
  Fix for non-serious Valgrind warning.

  sql/sql_insert.cc@1.307, 2008-01-21 11:56:34+01:00, guilhem@gbichot4.local +3 -3
    When CREATE TABLE IF NOT EXISTS finds the table already exists,
    'table' is the existing table. So if that table is temporary we don't
    re-enable transactions which is a bug.

  sql/sql_parse.cc@1.692, 2008-01-21 11:56:35+01:00, guilhem@gbichot4.local +1 -0
    verify that at the end of each top-statement transactions have
    been re-enabled. Does not apply to substatements (consider
    CREATE TABLE t1 SELECT stored_func() : the substatements inside
    stored_func() run with transaction disabled).
    I am not putting the assertion into ha_external_lock(F_UNLCK) because
    performance schema tables get closed in the middle of a statement
    sometimes while transaction is disabled.

  sql/sql_table.cc@1.450, 2008-01-21 11:56:35+01:00, guilhem@gbichot4.local +22 -24
    copy_data_between_tables() forgot to clean-up several things in error
    conditions (ha_enable_transaction(), free-ing 'copy', etc) as found
    by the assertion added to sql_parse.cc.

  storage/maria/ha_maria.cc@1.76, 2008-01-21 11:56:35+01:00, guilhem@gbichot4.local +5 -0
    Comment

  storage/maria/ma_blockrec.c@1.83, 2008-01-21 11:56:35+01:00, guilhem@gbichot4.local +4 -0
    fix for Valgrind warning: a temporary table was created, a blob
    page of its was flushed to disk and had random bytes in the checksum
    area ("write of uninitialized bytes in pwrite")

  storage/maria/ma_pagecrc.c@1.9, 2008-01-21 11:56:35+01:00, guilhem@gbichot4.local +1 -1
    typo

ChangeSet@1.1810.3582.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.2546, 2008-01-20 05:25:26+01:00, guilhem@gbichot4.local +19 -0
  - fix for segfault in rpl_trigger/rpl_found_rows with default engine=maria
  (fix is keeping the real TRN through a disable_logging/reenable cycle)
  - fix for pagecache assertion failure in ps/type_ranges with default
  engine=maria (fix is in sql_insert.cc)
  - when reenabling logging we must either flush all dirty pages,
  or at least verify (in debug build) that there are none. For example
  a bulk insert with single UNDO_BULK_INSERT must flush them, no matter
  if it uses repair or not (bugfix)
  - UNDO_BULK_INSERT_WITH_REPAIR is also used with repair, changes name

  mysql-test/r/maria.result@1.35, 2008-01-20 05:25:24+01:00, guilhem@gbichot4.local +33 -0
    tests for bugs fixed

  mysql-test/suite/rpl/r/rpl_stm_maria.result@1.1, 2008-01-20 05:25:24+01:00, guilhem@gbichot4.local +51 -0
    result (it used to crash)

  mysql-test/suite/rpl/r/rpl_stm_maria.result@1.0, 2008-01-20 05:25:24+01:00, guilhem@gbichot4.local +0 -0

  mysql-test/suite/rpl/t/rpl_stm_maria.test@1.1, 2008-01-20 05:25:25+01:00, guilhem@gbichot4.local +51 -0
    Test of replication-specific Maria bug fixed

  mysql-test/suite/rpl/t/rpl_stm_maria.test@1.0, 2008-01-20 05:25:25+01:00, guilhem@gbichot4.local +0 -0

  mysql-test/t/maria.test@1.30, 2008-01-20 05:25:24+01:00, guilhem@gbichot4.local +22 -0
    tests for bugs fixed

  sql/sql_insert.cc@1.306, 2008-01-20 05:25:24+01:00, guilhem@gbichot4.local +1 -1
    Bugfix: even if select_create::prepare() failed to create the 'table' object
    we still have to re-enable logging.

  storage/maria/ha_maria.cc@1.75, 2008-01-20 05:25:24+01:00, guilhem@gbichot4.local +38 -11
    Bugfix: when a transactional table does a bulk insert without
    repair, it still sometimes skips logging of REDOs thus needs a full
    flush and sync at the end. Not if repair is done, as repair does
    it internally already (see end of maria_repair*()).

  storage/maria/ha_maria.h@1.22, 2008-01-20 05:25:24+01:00, guilhem@gbichot4.local +5 -2
    variable now can have 3 states not 2

  storage/maria/ma_bitmap.c@1.43, 2008-01-20 05:25:24+01:00, guilhem@gbichot4.local +1 -1
    name change

  storage/maria/ma_blockrec.c@1.82, 2008-01-20 05:25:24+01:00, guilhem@gbichot4.local +3 -4
    name change

  storage/maria/ma_blockrec.h@1.30, 2008-01-20 05:25:24+01:00, guilhem@gbichot4.local +1 -2
    name change

  storage/maria/ma_check.c@1.75, 2008-01-20 05:25:24+01:00, guilhem@gbichot4.local +29 -22
    * When maria_repair() re-enables logging it does not need to ask for
    a flush&sync as it did it by itself already a few lines before.
    * the log record of bulk insert can be used even without repair
    * disable logging in maria_zerofill(): without that, it puts LSN pages
    in the cache, so when it flushes them it flushes the log; the change
    makes auto-ha_maria::zerofill-if-moved faster (no log flush).

  storage/maria/ma_key_recover.c@1.21, 2008-01-20 05:25:24+01:00, guilhem@gbichot4.local +1 -1
    name change

  storage/maria/ma_loghandler.c@1.117, 2008-01-20 05:25:24+01:00, guilhem@gbichot4.local +4 -4
    name change

  storage/maria/ma_loghandler.h@1.47, 2008-01-20 05:25:24+01:00, guilhem@gbichot4.local +1 -1
    name change

  storage/maria/ma_pagecache.c@1.77, 2008-01-20 05:25:24+01:00, guilhem@gbichot4.local +21 -0
    A function, to check in debug builds that no dirty pages exist for a file.

  storage/maria/ma_pagecache.h@1.39, 2008-01-20 05:25:24+01:00, guilhem@gbichot4.local +5 -0
    new function (nothing in non-debug)

  storage/maria/ma_recovery.c@1.81, 2008-01-20 05:25:24+01:00, guilhem@gbichot4.local +69 -29
    _ma_tmp_disable_logging() sets info->trn to dummy_transaction_object
    when needed now. The changes done here about info->trn are to allow
    a table to retain its original, real TRN through a disable/reenable
    cycle (see replication scenario in _ma_reenable_logging_for_table()).
    When we reenable, we offer the caller to flush and sync the table;
    if the caller doesn't accept our offer, we verify that it's ok
    (no REDOs => no dirty pages are allowed to exist).

  storage/maria/maria_chk.c@1.46, 2008-01-20 05:25:24+01:00, guilhem@gbichot4.local +5 -2
    comment

  storage/maria/maria_def.h@1.68, 2008-01-20 05:25:24+01:00, guilhem@gbichot4.local +2 -2
    new names

ChangeSet@1.2476.823.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.813.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.266.25.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.823.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.355.83.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.2545, 2008-01-19 04:51:38+01:00, guilhem@gbichot4.local +7 -0
  - fix for bug when creating bitmaps
  - fix for bug seen when running test "type_datetime" with Maria
  (wrong data_file_length in maria_repair())
  - fix for bug seen when running test "repair" with Maria
  (myisam_sort_buffer_size was influencing Maria)

  sql/handler.cc@1.327, 2008-01-19 04:51:36+01:00, guilhem@gbichot4.local +0 -1
    Sounds illogical to store myisam_sort_buffer_size into a structure
    used by all engines. There are only MyISAM and Maria which used 
    sort_buffer_size: they can get their value from their respective
    system variable (myisam|maria_sort_buffer_size). Using MyISAM's value
    for all engines was wrong (myisam_sort_buffer_size influenced Maria).

  sql/handler.h@1.262, 2008-01-19 04:51:36+01:00, guilhem@gbichot4.local +0 -1
    not needed

  storage/maria/ha_maria.cc@1.74, 2008-01-19 04:51:36+01:00, guilhem@gbichot4.local +3 -3
    check_opt->sort_buffer_size was myisam_sort_buffer_size; Maria
    must use maria_sort_buffer_size instead.

  storage/maria/ma_bitmap.c@1.42, 2008-01-19 04:51:36+01:00, guilhem@gbichot4.local +17 -8
    don't use my_chsize() now that Monty re-explained the problem to me :)

  storage/maria/ma_check.c@1.74, 2008-01-19 04:51:36+01:00, guilhem@gbichot4.local +4 -4
    making maria_repair() work like maria_repair_by_sort(): sort_param.filepos
    must be set at start then possibly corrected by create_new_data_handle();
    in the opposite order, filepos is finally set to 0, and if the table
    has no records, it stays 0 and this causes state.data_file_length
    to be 0 which is incorrect for a BLOCK_RECORD table having always
    at least one bitmap page.

  storage/maria/ma_pagecache.c@1.76, 2008-01-19 04:51:36+01:00, guilhem@gbichot4.local +6 -1
    Comments

  storage/myisam/ha_myisam.cc@1.195, 2008-01-19 04:51:36+01:00, guilhem@gbichot4.local +2 -2
    check_opt->sort_buffer_size is gone

ChangeSet@1.1810.3587.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.2544, 2008-01-18 05:11:46+01:00, guilhem@gbichot4.local +2 -0
  compiler warnings

  storage/maria/ma_check.c@1.73, 2008-01-18 05:11:44+01:00, guilhem@gbichot4.local +3 -2
    fix for important compiler warning

  storage/maria/ma_recovery.c@1.80, 2008-01-18 05:11:44+01:00, guilhem@gbichot4.local +1 -0
    fix for compiler warning

ChangeSet@1.2543, 2008-01-17 23:59:32+01:00, guilhem@gbichot4.local +32 -0
  WL#3072 - Maria Recovery
  Bulk insert: don't log REDO/UNDO for rows, log one UNDO which will
  truncate files; this is an optimization and a bugfix (table was left
  half-repaired by crash).
  Repair: mark table crashed-on-repair at start, bump skip_redo_lsn at start,
  this is easier for recovery (tells it to skip old REDOs or even UNDO
  phase) and user (tells it to repair) in case of crash, sync files
  in the end.
  Recovery skips missing or corrupted table and moves to next record
  (in REDO or UNDO phase) to be more robust; warns if happens in UNDO phase.
  Bugfix for UNDO_KEY_DELETE_WITH_ROOT (tested in ma_test_recovery)
  and maria_enable_indexes().
  Create missing bitmaps when needed (there can be more than one to create,
  in rare cases), log a record for this.

  include/myisamchk.h@1.9, 2008-01-17 23:57:31+01:00, guilhem@gbichot4.local +2 -0
    new flag: bulk insert repair mustn't bump create_rename_lsn

  mysql-test/lib/mtr_report.pl@1.67, 2008-01-17 23:57:32+01:00, guilhem@gbichot4.local +3 -1
    skip normal warning in maria-recovery.test

  mysql-test/r/maria-recovery.result@1.14, 2008-01-17 23:57:32+01:00, guilhem@gbichot4.local +85 -3
    result: crash before bulk insert is committed, causes proper rollback,
    and crash right after OPTIMIZE replaces index file with new index file
    leads to table marked corrupted and recovery not failing.

  mysql-test/t/maria-recovery.test@1.14, 2008-01-17 23:57:32+01:00, guilhem@gbichot4.local +40 -2
    - can't check the table or it would commit the transaction,
    but check is made after recovery.
    - test of crash before bulk-insert-with-repair is committed
    (to see if it is rolled back), and of crash after OPTIMIZE has replaced
    index file but not finished all operations (to see if recovery fails -
    it used to assert when trying to execute an old REDO on the new
    index).

  storage/maria/CMakeLists.txt@1.6, 2008-01-17 23:57:32+01:00, guilhem@gbichot4.local +1 -1
    new file

  storage/maria/Makefile.am@1.27, 2008-01-17 23:57:32+01:00, guilhem@gbichot4.local +3 -2
    new file

  storage/maria/ha_maria.cc@1.73, 2008-01-17 23:57:32+01:00, guilhem@gbichot4.local +45 -12
    - If bulk insert on a transactional table using an index repair:
    table is initially empty, so don't log REDO/UNDO for data rows
    (optimization), just log an UNDO_BULK_INSERT_WITH_REPAIR
    which will, if executed, empty the data and index file. Re-enable
    logging in end_bulk_insert().
    - write log record for repair operation only after it's fully done,
    index sort including (maria_repair*() used to write the log record).
    - Adding back file->trn=NULL which was removed by mistake earlier.

  storage/maria/ha_maria.h@1.21, 2008-01-17 23:57:32+01:00, guilhem@gbichot4.local +2 -0
    new member (see ha_maria.cc)

  storage/maria/ma_bitmap.c@1.41, 2008-01-17 23:58:34+01:00, guilhem@gbichot4.local +222 -37
    Functions to create missing bitmaps:
    - one function which creates missing bitmaps in page cache, except
    the missing one with max offset which it does not put into page cache
    as it will be modified very soon.
    - one function which the one above calls, and creates bitmaps in page
    cache
    - one function to execute REDO_BITMAP_NEW_PAGE which uses the second
    one above.

  storage/maria/ma_blockrec.c@1.81, 2008-01-17 23:58:34+01:00, guilhem@gbichot4.local +49 -9
    - when logging REDO_DELETE_ALL, not only 'records' and 'checksum'
    has to be reset under log's mutex.
    - execution of REDO_INSERT_ROW_BLOBS now checks the dirty pages' list
    - execution of UNDO_BULK_INSERT_WITH_REPAIR

  storage/maria/ma_blockrec.h@1.29, 2008-01-17 23:58:34+01:00, guilhem@gbichot4.local +6 -2
    new functions

  storage/maria/ma_check.c@1.72, 2008-01-17 23:59:06+01:00, guilhem@gbichot4.local +141 -84
    - table-flush-before-repair is moved to a separate function reused
    by maria_sort_index(); syncing is added
    - maria_repair() is allowed to re-enable logging only if it is the one
    which disabled it.
    - "_ma_flush_table_files_after_repair" was a bad name, it's not after
    repair now, and it should not sync as we do more changes to the files
    shortly after (sync is postponed to when writing the log record)
    - REDO_REPAIR record should be written only after all repair
    operations (in particular after sorting index in ha_mara::repair())
    - close to the end of repair by sort, flushing of pages must happen
    also in the non-quick case, to prepare for the sync at end.
    - in parallel repair, some page flushes are not needed as done
    by initialize_variables_for_repair().

  storage/maria/ma_create.c@1.47, 2008-01-17 23:59:06+01:00, guilhem@gbichot4.local +35 -25
    Update skip_redo_lsn, create_rename_lsn optionally.

  storage/maria/ma_delete_all.c@1.24, 2008-01-17 23:59:06+01:00, guilhem@gbichot4.local +25 -14
    Need to sync files at end of maria_delete_all_rows(), if transactional.

  storage/maria/ma_extra.c@1.25, 2008-01-17 23:59:06+01:00, guilhem@gbichot4.local +3 -8
    During repair, we sometimes call _ma_flush_table_files() (via
    _ma_flush_table_files_before_swap()) while there is a WRITE_CACHE.

  storage/maria/ma_key_recover.c@1.20, 2008-01-17 23:59:06+01:00, guilhem@gbichot4.local +17 -5
    - when we see CLR_END for UNDO_BULK_INSERT_WITH_REPAIR, re-enable
    indices.
    - fixing bug: _ma_apply_undo_key_delete() parsed UNDO_KEY_DELETE_WITH_ROOT
    wrongly, leading to recovery failure

  storage/maria/ma_key_recover.h@1.5, 2008-01-17 23:59:06+01:00, guilhem@gbichot4.local +2 -1
    new prototype

  storage/maria/ma_locking.c@1.26, 2008-01-17 23:59:06+01:00, guilhem@gbichot4.local +1 -0
    DBUG_VOID_RETURN missing

  storage/maria/ma_loghandler.c@1.116, 2008-01-17 23:59:06+01:00, guilhem@gbichot4.local +18 -4
    UNDO for bulk insert with repair, and REDO for creating bitmaps.
    LOGREC_FIRST_FREE to not have to change the for() every time we
    add a new record type.

  storage/maria/ma_loghandler.h@1.46, 2008-01-17 23:59:06+01:00, guilhem@gbichot4.local +6 -3
    new UNDO and REDO

  storage/maria/ma_open.c@1.58, 2008-01-17 23:59:06+01:00, guilhem@gbichot4.local +14 -9
    Move share.kfile.file=kfile up a bit, so that _ma_update_state_lsns()
    can get its value, this fixes a bug where LSN_REPAIRED_BY_MARIA_CHK
    was not corrected on disk by maria_open().
    Store skip_redo_lsn in index' header.
    maria_enable_indexes() had a bug for BLOCK_RECORD, where an empty
    file has one page, not 0 bytes.

  storage/maria/ma_recovery.c@1.79, 2008-01-17 23:59:29+01:00, guilhem@gbichot4.local +286 -161
    - Skip a corrupted, missing, or repaired-with-maria_chk, table in
    recovery: don't fail, just go to next REDO or UNDO; but if an UNDO
    is skipped in UNDO phase we issue warnings.
    - Skip REDO|UNDO in REDO phase if <skip_redo_lsn.
    - If UNDO phase fails, delete transactions to not make trnman
    assert.
    - Update skip_redo_lsn when playing REDO_CREATE_TABLE
    - Don't record UNDOs for old transactions which we don't know (long_trid==0)
    - Bugfix for UNDO_KEY_DELETE_WITH_ROOT (see ma_key_recover.c)
    - Execution of UNDO_BULK_INSERT_WITH_REPAIR
    - Don't try to find a page number in REDO_DELETE_ALL
    - Pieces moved to ma_recovery_util.c

  storage/maria/ma_recovery_util.c@1.1, 2008-01-17 23:59:30+01:00, guilhem@gbichot4.local +139 -0
    _ma_redo_not_needed_for_page(), defined in ma_recovery.c, is needed
    by ma_blockrec.c; this causes link issues, resolved by putting
    _ma_redo_not_needed_for_page() into a new file (so that it is not
    in the same file as repair-related objects of ma_recovery.c).

  storage/maria/ma_recovery_util.c@1.0, 2008-01-17 23:59:30+01:00, guilhem@gbichot4.local +0 -0

  storage/maria/ma_recovery_util.h@1.1, 2008-01-17 23:59:30+01:00, guilhem@gbichot4.local +37 -0
    new file

  storage/maria/ma_recovery_util.h@1.0, 2008-01-17 23:59:30+01:00, guilhem@gbichot4.local +0 -0

  storage/maria/ma_rename.c@1.13, 2008-01-17 23:59:30+01:00, guilhem@gbichot4.local +1 -1
    name change

  storage/maria/ma_static.c@1.14, 2008-01-17 23:59:30+01:00, guilhem@gbichot4.local +1 -1
    I modified layout of the index' header (inserted skip_redo_lsn in its middle)

  storage/maria/ma_test2.c@1.36, 2008-01-17 23:59:30+01:00, guilhem@gbichot4.local +5 -0
    allow breaking the test towards the end, tests execution of
    UNDO_KEY_DELETE_WITH_ROOT

  storage/maria/ma_test_recovery@1.22, 2008-01-17 23:59:30+01:00, guilhem@gbichot4.local +1 -1
    Increase the amount of rollback work to do when testing recovery
    with ma_test2; this reproduces the UNDO_KEY_DELETE_WITH_ROOT bug.

  storage/maria/maria_chk.c@1.45, 2008-01-17 23:59:30+01:00, guilhem@gbichot4.local +37 -5
    skip_redo_lsn should be updated too, for consistency.
    Write a REDO_REPAIR after all operations (including sort-records)
    have been done.
    No reason to flush blocks after maria_chk_data_link() and
    maria_sort_records(), there is maria_close() in the end.
    write_log_record() is a function, to not clutter maria_chk().

  storage/maria/maria_def.h@1.67, 2008-01-17 23:59:30+01:00, guilhem@gbichot4.local +30 -7
    New member skip_redo_lsn in the state, and comments

  storage/maria/maria_pack.c@1.20, 2008-01-17 23:59:30+01:00, guilhem@gbichot4.local +1 -1
    skip_redo_lsn should be updated too, for consistency

  storage/maria/ma_test_recovery.expected@1.19, 2008-01-17 23:59:30+01:00, guilhem@gbichot4.local +16 -16
    6 as testflag instead of 4

ChangeSet@1.2476.766.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.2476.821.3, 2008-01-15 17:01:58+01:00, msvensson@pilot.mysql.com +2 -0
  Bug#33375 all_set corrupted on table object
   - make sure to reset the read and write sets
  
  
  handler.cc, log_event.cc:
    - make sure to reset the read and write sets
  TAG: clone-5.1.23-build

  sql/handler.cc@1.315.24.1, 2008-01-15 17:00:59+01:00, msvensson@pilot.mysql.com +2 -0
    - make sure to reset the read and write sets

  sql/log_event.cc@1.277.43.2, 2008-01-15 17:01:06+01:00, msvensson@pilot.mysql.com +13 -7
    - make sure to reset the read and write sets

ChangeSet@1.2476.821.2, 2008-01-15 15:01:21+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
  
  OutputStream.cpp:
    Only use "errno" after the attempt to write to the socket has failed

  storage/ndb/src/common/util/OutputStream.cpp@1.11, 2008-01-15 14:59:29+01:00, msvensson@pilot.mysql.com +2 -2
    Only use "errno" after the attempt to write to the socket has failed

ChangeSet@1.2541, 2008-01-15 00:02:49+02:00, monty@mysql.com +4 -0
  Moved variables to ma_static.c to avoid link error on MacOSX
  Added suppress rule for dlclose() in valgrind.supp

  mysql-test/valgrind.supp@1.19, 2008-01-15 00:02:40+02:00, monty@mysql.com +12 -12
    Removed duplication
    Added error in dlclose() noticed on pushbuild for x86_64

  storage/maria/ma_init.c@1.17, 2008-01-15 00:02:40+02:00, monty@mysql.com +0 -3
    Moved variables to ma_static.c to avoid link error on MacOSX

  storage/maria/ma_loghandler.c@1.115, 2008-01-15 00:02:41+02:00, monty@mysql.com +0 -3
    Moved variables to ma_static.c to avoid link error on MacOSX

  storage/maria/ma_static.c@1.13, 2008-01-15 00:02:43+02:00, monty@mysql.com +3 -0
    Moved variables to ma_static.c to avoid link error on MacOSX

ChangeSet@1.1810.3586.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.819.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.819.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.801.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.2532.3.1, 2008-01-13 00:30:38+02:00, monty@mysql.com +18 -0
  Fixed compiler warnings
  Fixed type that caused windows builds to fail

  include/my_alloc.h@1.8, 2008-01-13 00:30:36+02:00, monty@mysql.com +4 -4
    Use size_t for memory areas instead of uint

  mysys/mf_iocache.c@1.74, 2008-01-13 00:30:36+02:00, monty@mysql.com +4 -4
    Fixed compiler warnings by adding casts

  mysys/my_compress.c@1.21, 2008-01-13 00:30:36+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings by adding casts

  mysys/my_getsystime.c@1.9.1.1, 2008-01-13 00:30:36+02:00, monty@mysql.com +4 -5
    Fixed typo

  mysys/my_static.h@1.23, 2008-01-13 00:30:36+02:00, monty@mysql.com +1 -1
    Use size_t for memory areas

  mysys/safemalloc.c@1.38, 2008-01-13 00:30:36+02:00, monty@mysql.com +9 -6
    Use size_t for memory areas

  storage/maria/ma_bitmap.c@1.40, 2008-01-13 00:30:36+02:00, monty@mysql.com +4 -4
    Fixed compiler warnings by adding casts

  storage/maria/ma_blockrec.c@1.80, 2008-01-13 00:30:36+02:00, monty@mysql.com +11 -11
    Fixed compiler warnings by adding casts

  storage/maria/ma_cache.c@1.6, 2008-01-13 00:30:36+02:00, monty@mysql.com +3 -3
    Use size_t for memory areas

  storage/maria/ma_info.c@1.10, 2008-01-13 00:30:36+02:00, monty@mysql.com +2 -2
    Use size_t for memory areas

  storage/maria/ma_key.c@1.13, 2008-01-13 00:30:36+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings by adding casts

  storage/maria/ma_locking.c@1.25, 2008-01-13 00:30:36+02:00, monty@mysql.com +4 -4
    Fixed compiler warnings by adding casts

  storage/maria/ma_open.c@1.57, 2008-01-13 00:30:36+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings by adding casts

  storage/maria/ma_packrec.c@1.19, 2008-01-13 00:30:36+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings by fixing type for variable

  storage/maria/ma_statrec.c@1.12, 2008-01-13 00:30:36+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings by adding casts

  storage/maria/ma_write.c@1.31, 2008-01-13 00:30:36+02:00, monty@mysql.com +4 -3
    Fixed compiler warnings by adding casts

  storage/maria/maria_def.h@1.66, 2008-01-13 00:30:36+02:00, monty@mysql.com +3 -2
    Use size_t for memory areas

  storage/myisam/mi_search.c@1.67, 2008-01-13 00:30:36+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings by adding casts

ChangeSet@1.2539, 2008-01-12 21:59:20+01:00, serg@janus.mylan +2 -0
  plug.in:
    two MYSQL_PLUGIN_ACTIONS() merged
  my_getsystime.c:
    typos fixed

  mysys/my_getsystime.c@1.10, 2008-01-12 21:59:18+01:00, serg@janus.mylan +4 -4
    typos fixed

  storage/maria/plug.in@1.7, 2008-01-12 21:59:18+01:00, serg@janus.mylan +1 -2
    two MYSQL_PLUGIN_ACTIONS() merged

ChangeSet@1.2532.1.4, 2008-01-12 20:36:01+02:00, bell@desktop.sanja.is.com.ua +1 -0
  The unused (yet) variable removed.

  storage/maria/ma_loghandler.c@1.114, 2008-01-12 20:35:59+02:00, bell@desktop.sanja.is.com.ua +0 -1
    The unused (yet) variable removed.

ChangeSet@1.2532.1.3, 2008-01-12 18:25:20+02:00, bell@desktop.sanja.is.com.ua +2 -0
  maria_dump_log - log interpreter added.

  storage/maria/Makefile.am@1.26, 2008-01-12 18:25:14+02:00, bell@desktop.sanja.is.com.ua +10 -1
    maria_dump_log build.

  storage/maria/ma_loghandler.c@1.113, 2008-01-12 18:25:15+02:00, bell@desktop.sanja.is.com.ua +489 -29
    Fixed page size in the log header to be independent of #defines.
    maria_dump_log - log interpreter added.

ChangeSet@1.2532.2.1, 2008-01-12 13:16:55+02:00, monty@mysql.com +8 -0
  Fixes to bugs and compiler warnings detected by pushbuild
  Don't compare uuid's on maria_open() if table is not transactional
  Fixed that my_microtime() works on windows (patch added from 5.1)

  KNOWN_BUGS.txt@1.1, 2008-01-12 13:16:53+02:00, monty@mysql.com +79 -0
    New BitKeeper file ``KNOWN_BUGS.txt''

  KNOWN_BUGS.txt@1.0, 2008-01-12 13:16:53+02:00, monty@mysql.com +0 -0

  mysql-test/r/create.result@1.163, 2008-01-12 13:16:53+02:00, monty@mysql.com +1 -1
    Portability fix

  mysql-test/t/create.test@1.111, 2008-01-12 13:16:53+02:00, monty@mysql.com +1 -1
    Portability fix

  mysql-test/t/maria.test@1.29, 2008-01-12 13:16:53+02:00, monty@mysql.com +5 -0
    Remove warnings, to make test portable to windows

  mysys/my_getsystime.c@1.9, 2008-01-12 13:16:53+02:00, monty@mysql.com +27 -19
    Add missed merge from 5.1
    This fixes that timing works on windows and fixes that that failed becasuse slow_query_log didn't get any queries

  storage/maria/ma_check.c@1.69.1.1, 2008-01-12 13:16:53+02:00, monty@mysql.com +0 -1
    Removed not needed setting of variable

  storage/maria/ma_loghandler.c@1.110.1.1, 2008-01-12 13:16:53+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  storage/maria/ma_open.c@1.56, 2008-01-12 13:16:53+02:00, monty@mysql.com +2 -1
    Don't compare uuid's if table is not transactional

ChangeSet@1.2530.1.1, 2008-01-12 02:31:22+02:00, bell@desktop.sanja.is.com.ua +4 -0
  Multigroup record write fixed.
  Memory leak fixed.
  Some other small cahnges.

  mysql-test/include/wait_until_connected_again.inc@1.4, 2008-01-12 02:31:20+02:00, bell@desktop.sanja.is.com.ua +1 -1
    increased time for recovery (to be able use with --debug)

  mysql-test/r/maria-recovery.result@1.13, 2008-01-12 02:31:20+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Result fixed.

  storage/maria/ma_loghandler.c@1.108.1.1, 2008-01-12 02:31:20+02:00, bell@desktop.sanja.is.com.ua +135 -74
    Multigroup record write fixed.
    Function for skipping to the next page while filling buffer with
      unlocked handler added.
    Removed possible memory leaks.
    More debug.

  storage/maria/ma_recovery.c@1.74.1.1, 2008-01-12 02:31:20+02:00, bell@desktop.sanja.is.com.ua +11 -1
    Memory leak fixed.

ChangeSet@1.2476.766.23, 2008-01-11 21:34:23-02:00, davi@mysql.com +1 -0
  Post merge fix for BUG 33728

  include/Makefile.am@1.67.2.20, 2008-01-11 21:34:21-02:00, davi@mysql.com +1 -1
    Include gcc_builtins.h header in the list.

ChangeSet@1.2476.818.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.355.52.47, 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.3.1.2, 2008-01-11 20:34:30-02:00, davi@mysql.com +4 -2
    Use the atomic builtins if available.

ChangeSet@1.2531.1.1, 2008-01-11 22:48:54+01:00, guilhem@gbichot4.local +10 -0
  WL#3072 Maria Recovery
  All statements doing an implicit commit now also do one in Maria.
  This is useful because LOCK TABLES; REPAIR; crash; is not rollback-able,
  the implicit commit of REPAIR avoid that Recovery tries to rollback
  and fails.
  Fix for BUG#33827 "COMMIT AND CHAIN causes serious Valgrind error"
  (maybe not the definite one, depends on the assigned dev).

  mysql-test/t/maria-recovery.test@1.13, 2008-01-11 22:48:50+01:00, guilhem@gbichot4.local +23 -0
    test of REPAIR's implicit commit. I cannot commit the result file
    because maria-recovery fails in vanilla tree (seen in pushbuild) but
    its new section looks like:
    repair table t1;
    Table   Op      Msg_type        Msg_text
    mysqltest.t1    repair  status  OK
    insert into t1 values(2);
    select * from t1;
    a
    1
    2
    3
    SET SESSION debug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash";
    * crashing mysqld intentionally
    set global maria_checkpoint_interval=1;
    ERROR HY000: Lost connection to MySQL server during query
    * recovery happens
    check table t1 extended;
    Table   Op      Msg_type        Msg_text
    mysqltest.t1    check   status  OK
    * testing that checksum after recovery is as expected
    Checksum-check
    failure
    use mysqltest;
    select * from t1;
    a
    1
    3
    Which is as it should be.

  sql/rpl_injector.cc@1.12, 2008-01-11 22:48:50+01:00, guilhem@gbichot4.local +1 -0
    fix for BUG#33827

  sql/sql_parse.cc@1.691, 2008-01-11 22:48:50+01:00, guilhem@gbichot4.local +8 -0
    - All DDLs and mysql_admin_table() (REPAIR etc) use end_actrive_trans()
    to do an implicit commit so we add there an implicit commit of the
    Maria transaction.
    - Fix for BUG#33827

  storage/maria/ha_maria.cc@1.72, 2008-01-11 22:48:50+01:00, guilhem@gbichot4.local +54 -3
    - A method to do implicit commit in Maria
    - After an implicit commit, if it was under LOCK TABLES, the locked
    tables have a stale file->trn: update it.

  storage/maria/ha_maria.h@1.20, 2008-01-11 22:48:50+01:00, guilhem@gbichot4.local +2 -0
    new static method

  storage/maria/ma_check.c@1.70, 2008-01-11 22:48:50+01:00, guilhem@gbichot4.local +0 -1
    bugfix: this disabling of transactionality had the effect that if
    LOCK TABLES; REPAIR; INSERT then the INSERT ran non-transactional
    (so couldn't be undone in case of crash, if, by bad chance, its
    effect on pages went to disk).

  storage/maria/ma_checkpoint.c@1.38.1.1, 2008-01-11 22:48:51+01:00, guilhem@gbichot4.local +1 -1
    indentation

  storage/maria/ma_recovery.c@1.75.1.1, 2008-01-11 22:48:51+01:00, guilhem@gbichot4.local +5 -1
    dbug statements

  storage/maria/trnman.c@1.32, 2008-01-11 22:48:51+01:00, guilhem@gbichot4.local +4 -4
    When doing an implicit commit we need to know the number of locked
    tables of the committed transaction and copy it to the new transaction

  storage/maria/trnman_public.h@1.7, 2008-01-11 22:48:51+01:00, guilhem@gbichot4.local +2 -2
    prototype change

ChangeSet@1.2534, 2008-01-11 20:18:46+01:00, serg@janus.mylan +1 -0
  use AC_HELP_STRING() and MYSQL_PLUGIN_ACTIONS()

  storage/maria/plug.in@1.6, 2008-01-11 20:18:41+01:00, serg@janus.mylan +4 -1
    use AC_HELP_STRING() and MYSQL_PLUGIN_ACTIONS()

ChangeSet@1.2476.815.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.266.26.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.541.50.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.3584.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.2532, 2008-01-11 19:39:43+02:00, monty@mysql.com +17 -0
  Fixed compiler warnings by adding casts and changing variable types
  Fixed bug that caused change_user.test to fail
  Fixed bug that caused mysql_client_test to fail

  include/myisam.h@1.91, 2008-01-11 19:39:40+02:00, monty@mysql.com +2 -2
    Fixed prototypes

  mysql-test/r/create.result@1.162, 2008-01-11 19:39:40+02:00, monty@mysql.com +2 -2
    Fix that test works even if Maria is not used for temporary tables

  mysql-test/t/create.test@1.110, 2008-01-11 19:39:40+02:00, monty@mysql.com +2 -0
    Fix that test works even if Maria is not used for temporary tables

  sql/mysqld.cc@1.620, 2008-01-11 19:39:40+02:00, monty@mysql.com +1 -1
    Fixed that default value of max_join_size is set correctly; It needs to match usage in set_var.cc

  sql/set_var.cc@1.251, 2008-01-11 19:39:40+02:00, monty@mysql.com +1 -1
    Fixed test, now when max_join_size is initialized correctly

  sql/sql_select.cc@1.549, 2008-01-11 19:39:40+02:00, monty@mysql.com +1 -1
    Fixed that one can compile without -DUSE_MARIA_FOR_TMP_TABLES

  storage/maria/ma_blockrec.c@1.79, 2008-01-11 19:39:40+02:00, monty@mysql.com +7 -6
    Fixed compiler warnings by adding casts

  storage/maria/ma_checkpoint.c@1.39, 2008-01-11 19:39:40+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings by adding casts

  storage/maria/ma_create.c@1.46, 2008-01-11 19:39:40+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings by adding casts

  storage/maria/ma_delete_table.c@1.11, 2008-01-11 19:39:40+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings by adding casts

  storage/maria/ma_loghandler.c@1.110, 2008-01-11 19:39:41+02:00, monty@mysql.com +27 -24
    Fixed compiler warnings by adding casts and changing types for variables
    Changed translog_new_page_header to use changing integer instead of calling time() as time() is a slow call and will give same results when calling many times withing one second

  storage/maria/ma_pagecrc.c@1.8, 2008-01-11 19:39:41+02:00, monty@mysql.com +7 -7
    Fixed compiler warnings by adding casts

  storage/maria/ma_recovery.c@1.76, 2008-01-11 19:39:41+02:00, monty@mysql.com +2 -2
    Fixed indentation

  storage/myisam/ha_myisam.cc@1.194, 2008-01-11 19:39:41+02:00, monty@mysql.com +7 -7
    Fixed wrong types for variables
    Changed chk_data_link() and repair*() functions to take my_bool as argument

  storage/myisam/mi_check.c@1.156, 2008-01-11 19:39:41+02:00, monty@mysql.com +4 -4
    Fixes to handle that param.test_flag is now ulonglong

  storage/myisam/myisamchk.c@1.130, 2008-01-11 19:39:41+02:00, monty@mysql.com +4 -4
    Fixes to handle that param.test_flag is now ulonglong

  support-files/compiler_warnings.supp@1.17, 2008-01-11 19:39:41+02:00, monty@mysql.com +1 -1
    Fixed line numbers

ChangeSet@1.1810.3582.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.1.72, 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.720.23, 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.720.22, 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.6.1.1, 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.3.1.1, 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.2529.1.1, 2008-01-11 15:45:18+01:00, vvaintroub@vaio. +6 -0
  Fix windows warnings using correct datatypes if possible 
  and casts if not.
  Add optional WITH_MARIA_TMP_TABLES parameter to configure.js. This 
  parameter defaults to true, if  WITH_MARIA_STORAGE_ENGINE is present.

  CMakeLists.txt@1.37, 2008-01-11 15:44:50+01:00, vvaintroub@vaio. +3 -0
    Add WITH_MARIA_TMP_TABLES config parameter.

  storage/maria/ma_blockrec.c@1.78, 2008-01-11 15:44:53+01:00, vvaintroub@vaio. +1 -1
    Fix windows warning - use the correct datatype.

  storage/maria/ma_loghandler.c@1.107.1.1, 2008-01-11 15:44:55+01:00, vvaintroub@vaio. +9 -9
    Fix windows warnings by adding casts.

  storage/maria/ma_pagecache.c@1.75, 2008-01-11 15:44:58+01:00, vvaintroub@vaio. +1 -1
    Fix windows warning - use the correct datatype.

  storage/maria/ma_recovery.c@1.75, 2008-01-11 15:45:00+01:00, vvaintroub@vaio. +7 -2
    Fix windows warning by adding casts.

  win/configure.js@1.13, 2008-01-11 15:45:01+01:00, vvaintroub@vaio. +16 -1
    Add WITH_MARIA_TMP_TABLES. If WITH_MARIA_STORAGE_ENGINE is present,
    it defaults to TRUE. To unset, pass  WITH_MARIA_TMP_TABLES=FALSE to 
    configure.js

ChangeSet@1.2476.766.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.801.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.1810.3583.1, 2008-01-11 13:20:03+01:00, serg@janus.mylan +3 -0
  Bug#33814 - yassl problems

  extra/yassl/src/handshake.cpp@1.15.1.1, 2008-01-11 13:07:51+01:00, serg@janus.mylan +5 -0
    Bug#33814 - yassl problems

  extra/yassl/src/template_instnt.cpp@1.10.1.5, 2008-01-11 13:19:24+01:00, serg@janus.mylan +1 -0
    new template instantiation

  extra/yassl/src/yassl_imp.cpp@1.8.1.6, 2008-01-11 13:08:06+01:00, serg@janus.mylan +10 -1
    Bug#33814 - yassl problems

ChangeSet@1.2530, 2008-01-11 14:05:11+02:00, bell@desktop.sanja.is.com.ua +1 -0
  The assert fixed.

  storage/maria/ma_loghandler.c@1.108, 2008-01-11 14:05:07+02:00, bell@desktop.sanja.is.com.ua +6 -6
    The assert fixed.

ChangeSet@1.2476.720.21, 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.2476.814.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.62.1.7, 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.65.1.7, 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.61.1.7, 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.62.1.7, 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.62.1.7, 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.16.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.2529, 2008-01-11 01:47:52+02:00, monty@mysql.com +26 -0
  Added --loose-skip-maria to MYSQLD_BOOTSTRAP_CMD to get bootstrap.test to work
  Allow one to run bootstrap even if --skip-maria is used (needed for bootstrap.test)
  Fixed lots of compiler warnings
  
  NOTE:
  maria-big and maria-recover tests failes becasue of bugs in transaction log handling.
  Sanja knows about this and is working on it!

  mysql-test/mysql-test-run.pl@1.324, 2008-01-11 01:47:48+02:00, monty@mysql.com +9 -2
    Added --loose-skip-maria to MYSQLD_BOOTSTRAP_CMD to get bootstrap.test to work

  mysql-test/r/maria-recovery.result@1.12, 2008-01-11 01:47:48+02:00, monty@mysql.com +77 -0
    Updated results

  mysql-test/t/bootstrap.test@1.3, 2008-01-11 01:47:48+02:00, monty@mysql.com +0 -1
    Removed not needed empty line

  mysql-test/t/change_user.test@1.4, 2008-01-11 01:47:48+02:00, monty@mysql.com +5 -0
    Fixed results for 32 bit systems

  mysql-test/t/maria-big.test@1.5, 2008-01-11 01:47:48+02:00, monty@mysql.com +3 -1
    Only run this when you use --big

  mysql-test/t/maria-recovery.test@1.12, 2008-01-11 01:47:48+02:00, monty@mysql.com +36 -0
    Added test case for recovery with big blobs

  mysys/my_uuid.c@1.5, 2008-01-11 01:47:48+02:00, monty@mysql.com +1 -1
    Fixed compiler warning

  sql/mysqld.cc@1.619, 2008-01-11 01:47:48+02:00, monty@mysql.com +1 -1
    Allow one to run bootstrap even if --skip-maria is used (needed for bootstrap.test)

  sql/set_var.cc@1.250, 2008-01-11 01:47:48+02:00, monty@mysql.com +1 -1
    Compare max_join_size with ULONG_MAX instead of HA_POS_ERROR as we set max_join_size to ULONG_MAX by default

  storage/maria/ma_bitmap.c@1.39, 2008-01-11 01:47:48+02:00, monty@mysql.com +1 -1
    Added __attribute((unused)) to fix compiler warning

  storage/maria/ma_blockrec.c@1.77, 2008-01-11 01:47:48+02:00, monty@mysql.com +18 -7
    Added casts to remove compiler warnings
    Change variable types to avoid compiler warnings

  storage/maria/ma_check.c@1.69, 2008-01-11 01:47:48+02:00, monty@mysql.com +1 -1
    Added casts to remove compiler warnings

  storage/maria/ma_checkpoint.c@1.38, 2008-01-11 01:47:48+02:00, monty@mysql.com +1 -1
    Change variable types to avoid compiler warnings

  storage/maria/ma_create.c@1.45, 2008-01-11 01:47:48+02:00, monty@mysql.com +1 -1
    Change variable types to avoid compiler warnings

  storage/maria/ma_delete.c@1.25, 2008-01-11 01:47:48+02:00, monty@mysql.com +2 -0
    Added casts to remove compiler warnings

  storage/maria/ma_key_recover.c@1.19, 2008-01-11 01:47:48+02:00, monty@mysql.com +8 -4
    Added casts to remove compiler warnings

  storage/maria/ma_loghandler.c@1.107, 2008-01-11 01:47:48+02:00, monty@mysql.com +1 -1
    Moved initiazation of prev_buffer first as this could otherwise not be set in case of errors

  storage/maria/ma_page.c@1.25, 2008-01-11 01:47:48+02:00, monty@mysql.com +2 -1
    Added casts to remove compiler warnings

  storage/maria/ma_pagecache.c@1.74, 2008-01-11 01:47:48+02:00, monty@mysql.com +2 -1
    Added __attribute((unused)) to fix compiler warning

  storage/maria/ma_pagecrc.c@1.7, 2008-01-11 01:47:49+02:00, monty@mysql.com +2 -0
    Added #ifndef DBUG_OFF to remove compiler warning

  storage/maria/ma_recovery.c@1.74, 2008-01-11 01:47:49+02:00, monty@mysql.com +3 -2
    Added casts to remove compiler warnings

  storage/maria/ma_write.c@1.30, 2008-01-11 01:47:49+02:00, monty@mysql.com +11 -6
    Added casts to remove compiler warnings

  storage/maria/maria_chk.c@1.44, 2008-01-11 01:47:49+02:00, monty@mysql.com +4 -3
    Split long string into two to avoid compiler warnings

  storage/myisam/ft_boolean_search.c@1.108, 2008-01-11 01:47:49+02:00, monty@mysql.com +1 -0
    Added LINT_INIT() to remove compiler warning

  support-files/compiler_warnings.supp@1.16, 2008-01-11 01:47:49+02:00, monty@mysql.com +1 -0
    Suppress wrong compiler warning

  unittest/mytap/tap.c@1.14, 2008-01-11 01:47:49+02:00, monty@mysql.com +3 -3
    Fixed declaration to match prototypes to remove compiler warnings

ChangeSet@1.2521.1.1, 2008-01-10 21:21:36+02:00, monty@mysql.com +31 -0
  Added --with-maria-tmp-tables (default one) to allow on to configure if Maria should be used for internal temporary tables
  Abort mysqld if Maria engine didn't start and we are using Maria for temporary tables
  Fixed bug that caused update of big blobs to crash
  Use pagecache_page_no_t as type for pages (to get rid of compiler warnings)
  Added cast to get rid of compiler warning
  Fixed wrong types of variables and arguments that caused lost information
  Fixed wrong DBUG_ASSERT() that caused REDO of big blobs to fail
  Removed some historical ifdefs that caused problem with windows compilations

  BUILD/SETUP.sh@1.73, 2008-01-10 21:21:26+02:00, monty@mysql.com +1 -1
    Added --with-maria-tmp-tables

  include/maria.h@1.25, 2008-01-10 21:21:27+02:00, monty@mysql.com +6 -6
    Use pagecache_page_no_t as type for pages
    Use my_bool as parameter for 'rep_quick' option

  include/my_base.h@1.107, 2008-01-10 21:21:27+02:00, monty@mysql.com +4 -1
    Added comment

  mysql-test/r/maria-big.result@1.4, 2008-01-10 21:21:27+02:00, monty@mysql.com +162 -0
    Added test that uses big blobs

  mysql-test/t/maria-big.test@1.4, 2008-01-10 21:21:28+02:00, monty@mysql.com +33 -1
    Added test that uses big blobs

  sql/mysqld.cc@1.616.1.1, 2008-01-10 21:21:28+02:00, monty@mysql.com +7 -0
    Abort mysqld if Maria engine didn't start and we are using Maria for temporary tables

  sql/sql_class.h@1.417, 2008-01-10 21:21:28+02:00, monty@mysql.com +1 -1
    Don't use Maria for temporary tables if --with-maria-tmp-tables is not defined

  sql/sql_select.cc@1.548, 2008-01-10 21:21:28+02:00, monty@mysql.com +1 -1
    Don't use Maria for temporary tables if --with-maria-tmp-tables is not defined

  storage/maria/ha_maria.cc@1.69.1.1, 2008-01-10 21:21:29+02:00, monty@mysql.com +66 -63
    Fixed compiler warnings reported by MCC
    - Fixed usage of wrong types that caused data loss
    - Changed parameter for rep_quick to my_bool
    - Added safe casts
    
    Fixed indentation

  storage/maria/ma_bitmap.c@1.38, 2008-01-10 21:21:29+02:00, monty@mysql.com +35 -32
    Use pagecache_page_no_t as type for pages
    Fixed compiler warnings
    Fixed bug that caused update of big blobs to crash

  storage/maria/ma_blockrec.c@1.76, 2008-01-10 21:21:29+02:00, monty@mysql.com +28 -26
    Use pagecache_page_no_t as type for pages
    Use my_bool as parameter for 'rep_quick' option
    Fixed compiler warnings
    Fixed wrong DBUG_ASSERT()

  storage/maria/ma_blockrec.h@1.28, 2008-01-10 21:21:29+02:00, monty@mysql.com +15 -12
    Use pagecache_page_no_t as type for pages

  storage/maria/ma_check.c@1.66.1.1, 2008-01-10 21:21:29+02:00, monty@mysql.com +28 -24
    Fixed some wrong parameters where we didn't get all bits for test_flag
    Changed rep_quick to be of type my_bool
    Use pagecache_page_no_t as type for pages
    Added cast's to get rid of compiler warnings
    Changed type of record_pos to get rid of compiler warning

  storage/maria/ma_create.c@1.42.1.1, 2008-01-10 21:21:30+02:00, monty@mysql.com +4 -4
    Added safe cast's to get rid of compiler warnings

  storage/maria/ma_dynrec.c@1.24, 2008-01-10 21:21:30+02:00, monty@mysql.com +1 -1
    Fixed usage of wrong type

  storage/maria/ma_key.c@1.12, 2008-01-10 21:21:30+02:00, monty@mysql.com +4 -3
    Fixed compiler warning

  storage/maria/ma_key_recover.c@1.18, 2008-01-10 21:21:30+02:00, monty@mysql.com +6 -6
    Use pagecache_page_no_t as type for pages

  storage/maria/ma_loghandler_lsn.h@1.19, 2008-01-10 21:21:30+02:00, monty@mysql.com +2 -2
    Added cast's to get rid of compiler warnings

  storage/maria/ma_page.c@1.24, 2008-01-10 21:21:30+02:00, monty@mysql.com +27 -25
    Changed variable name from 'page' to 'pos' as it was an offset and not a page address
    Moved page_size inside block to get rid of compiler warning

  storage/maria/ma_pagecache.c@1.70.2.1, 2008-01-10 21:21:30+02:00, monty@mysql.com +8 -7
    Fixed compiler warnings
    Replaced compile time assert with TODO

  storage/maria/ma_pagecache.h@1.38, 2008-01-10 21:21:31+02:00, monty@mysql.com +3 -2
    Use pagecache_page_no_t as type for pages

  storage/maria/ma_pagecrc.c@1.6, 2008-01-10 21:21:31+02:00, monty@mysql.com +19 -1
    Allow bitmap pages that is all zero

  storage/maria/ma_preload.c@1.10, 2008-01-10 21:21:31+02:00, monty@mysql.com +2 -1
    Added cast to get rid of compiler warning

  storage/maria/ma_recovery.c@1.71.1.1, 2008-01-10 21:21:31+02:00, monty@mysql.com +16 -13
    Changed types to get rid of compiler warnings
    Use bool for quick_repair to get rid of compiler warning
    Fixed some variables that was wrongly declared (not enough precission)
    Added cast to get rid of compiler warning

  storage/maria/ma_test2.c@1.33.1.1, 2008-01-10 21:21:31+02:00, monty@mysql.com +0 -6
    Remove historical undefs

  storage/maria/maria_chk.c@1.43, 2008-01-10 21:21:31+02:00, monty@mysql.com +4 -3
    Changed rep_quick to bool
    Fixed wrong parameter to maria_chk_data_link()

  storage/maria/maria_def.h@1.63.1.1, 2008-01-10 21:21:31+02:00, monty@mysql.com +4 -4
    Use pagecache_page_no_t as type for pages

  storage/maria/maria_pack.c@1.17.1.1, 2008-01-10 21:21:31+02:00, monty@mysql.com +21 -21
    Renamed isam -> maria

  storage/maria/plug.in@1.5, 2008-01-10 21:21:31+02:00, monty@mysql.com +11 -0
    Added option --with-maria-tmp-tables

  storage/maria/trnman.c@1.31, 2008-01-10 21:21:32+02:00, monty@mysql.com +2 -1
    Added cast to get rid of compiler warning

  storage/myisam/mi_test2.c@1.43.1.1, 2008-01-10 21:21:32+02:00, monty@mysql.com +0 -6
    Remove historical undefs

ChangeSet@1.2525.1.1, 2008-01-10 19:07:17+01:00, vvaintroub@vaio. +1 -0
  Workaround internal compiler error in Visual Studio 2003.

  storage/maria/ma_create.c@1.43, 2008-01-10 19:07:13+01:00, vvaintroub@vaio. +12 -0
    Workaround internal compiler error in Visual Studio 2003.

ChangeSet@1.2524.1.1, 2008-01-10 19:37:10+02:00, bell@desktop.sanja.is.com.ua +3 -0
  Fixed syncronization of buffer flush.
  Debug asserts/prints from Monty.
  No check of mutex operations (by Monty).

  storage/maria/ma_control_file.c@1.24, 2008-01-10 19:37:07+02:00, bell@desktop.sanja.is.com.ua +1 -1
    New external function to check mutex ownership.

  storage/maria/ma_loghandler.c@1.104.1.1, 2008-01-10 19:37:07+02:00, bell@desktop.sanja.is.com.ua +254 -94
    Fixed syncronization of buffer flush.
    Debug asserts/prints from Monty.
    No check of mutex operations (by Monty).

  storage/maria/ma_loghandler.h@1.45, 2008-01-10 19:37:07+02:00, bell@desktop.sanja.is.com.ua +3 -3
    No check of mutex operations (by Monty).
    New external function to check mutex ownership.

ChangeSet@1.1810.3578.4, 2008-01-10 18:54:34+03:00, evgen@moonbone.local +1 -0
  filesort.cc:
    Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
    server crash.
    Free smaller buffer before allocating bigger one.

  sql/filesort.cc@1.105.1.21, 2008-01-10 18:52:24+03:00, evgen@moonbone.local +6 -2
    Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
    server crash.
    Free smaller buffer before allocating bigger one.

ChangeSet@1.2476.812.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.2525, 2008-01-10 13:21:53+01:00, vvaintroub@vaio. +53 -0
  Windows fixes
  -new option WITH_MARIA_STORAGE_ENGINE for config.js
  -correct build errors
  -build test executables
  -downport changes for atomic functions from 5.2
  -remove LOCK_uuid_generator from C++ files to avoid linker errors
  -new function my_uuid2str()

  BitKeeper/deleted/.del-x86-msvc.h@1.7, 2008-01-10 11:40:45+01:00, vvaintroub@vaio. +0 -0
    Delete: include/atomic/x86-msvc.h

  BitKeeper/etc/ignore@1.267, 2008-01-10 13:21:11+01:00, vvaintroub@vaio. +2 -0
    Added comments maria-win.patch to the ignore list

  BitKeeper/etc/ignore@1.266, 2008-01-10 13:19:41+01:00, vvaintroub@vaio. +3 -0
    added *.dll,*.ilk,*.exp

  CMakeLists.txt@1.36, 2008-01-10 13:19:39+01:00, vvaintroub@vaio. +11 -0
    Windows fixes:
    -New option WITH_MARIA_STORAGE_ENGINE
    -Add unit tests

  include/Makefile.am@1.79, 2008-01-10 13:19:43+01:00, vvaintroub@vaio. +1 -1
    replace x86-msvc.h with generic-msvc.h

  include/atomic/generic-msvc.h@1.1, 2008-01-10 13:21:10+01:00, vvaintroub@vaio. +108 -0
    Implement atomic operations with MSVC intrinsics

  include/atomic/generic-msvc.h@1.0, 2008-01-10 13:21:10+01:00, vvaintroub@vaio. +0 -0

  include/atomic/nolock.h@1.8, 2008-01-10 13:19:51+01:00, vvaintroub@vaio. +3 -4
    Downport my_atomic from 5.2 tree

  include/config-win.h@1.104, 2008-01-10 13:19:44+01:00, vvaintroub@vaio. +10 -0
    my_chmod() support

  include/my_atomic.h@1.16, 2008-01-10 13:19:46+01:00, vvaintroub@vaio. +33 -24
    Downport my_atomic from 5.2 tree

  include/my_bit.h@1.3, 2008-01-10 13:19:47+01:00, vvaintroub@vaio. +2 -0
    Correct unresolved symbol errors on Windows

  include/my_pthread.h@1.121, 2008-01-10 13:19:48+01:00, vvaintroub@vaio. +3 -1
    pthread_mutex_unlock now returns 0 (was void previously)
    defined PTHREAD_STACK_MIN

  include/my_sys.h@1.229, 2008-01-10 13:19:50+01:00, vvaintroub@vaio. +3 -0
    New function my_uuid2str()
    define MY_UUID_STRING_LENGTH

  libmysqld/CMakeLists.txt@1.19, 2008-01-10 13:19:52+01:00, vvaintroub@vaio. +7 -0
    New option WITH_MARIA_STORAGE_ENGINE

  mysys/CMakeLists.txt@1.15, 2008-01-10 13:19:54+01:00, vvaintroub@vaio. +6 -2
    Add missing files

  mysys/lf_dynarray.c@1.10, 2008-01-10 13:19:56+01:00, vvaintroub@vaio. +4 -4
    Fix compiler errors on Windows

  mysys/my_getncpus.c@1.3, 2008-01-10 13:19:57+01:00, vvaintroub@vaio. +13 -11
    Windows port

  mysys/my_uuid.c@1.4, 2008-01-10 13:20:00+01:00, vvaintroub@vaio. +27 -5
    Windows fixes: there is no random() on Windows, use ANSI rand()
    New function my_uuid2str()

  mysys/my_winthread.c@1.16, 2008-01-10 13:20:03+01:00, vvaintroub@vaio. +16 -6
    Downport from 5.2 tree
    -Call my_thread_end() before pthread_exit()
    -Avoid crash if pthread_create is called with NULL attributes

  sql/CMakeLists.txt@1.13, 2008-01-10 13:20:04+01:00, vvaintroub@vaio. +3 -0
    Link mysqld with Maria storage engine

  sql/item_func.cc@1.415, 2008-01-10 13:20:06+01:00, vvaintroub@vaio. +3 -2
    Remove LOCK_uuid_generator from C++ to avoid linker errors.
    Use dedicated mutex for short uuids

  sql/item_strfunc.cc@1.333, 2008-01-10 13:20:09+01:00, vvaintroub@vaio. +6 -104
    Use my_uuid() and my_uuid2str() functions from mysys.

  sql/item_strfunc.h@1.138, 2008-01-10 13:20:11+01:00, vvaintroub@vaio. +2 -2
    Define MY_UUID_STRING_LENGTH in my_sys.h

  sql/mysql_priv.h@1.534, 2008-01-10 13:20:13+01:00, vvaintroub@vaio. +1 -1
    LOCK_uuid_generator must be declared as extern "C"

  sql/mysqld.cc@1.617, 2008-01-10 13:20:14+01:00, vvaintroub@vaio. +2 -0
    Init and destroy LOCK_uuid_short mutex

  storage/maria/CMakeLists.txt@1.5, 2008-01-10 13:20:16+01:00, vvaintroub@vaio. +43 -20
    -Use the same source files as in Makefile.am
    -Build test binaries

  storage/maria/ha_maria.cc@1.70, 2008-01-10 13:20:18+01:00, vvaintroub@vaio. +2 -2
    snprintf->my_snprintf

  storage/maria/lockman.c@1.19, 2008-01-10 13:20:19+01:00, vvaintroub@vaio. +1 -2
    Fix compiler error on Windows

  storage/maria/ma_check.c@1.67, 2008-01-10 13:20:21+01:00, vvaintroub@vaio. +1 -1
    Fix compiler error on Windows

  storage/maria/ma_loghandler.c@1.105, 2008-01-10 13:20:23+01:00, vvaintroub@vaio. +24 -13
    Fix compile errors
    my_open()/my_sync() do not work for directories on Windows

  storage/maria/ma_recovery.c@1.72, 2008-01-10 13:20:25+01:00, vvaintroub@vaio. +2 -1
    Fix compile error on Windows

  storage/maria/ma_test2.c@1.34, 2008-01-10 13:20:26+01:00, vvaintroub@vaio. +12 -8
    Rename variable to avoid naming conflict with Microsoft C runtime 
    function

  storage/maria/ma_test3.c@1.12, 2008-01-10 13:20:28+01:00, vvaintroub@vaio. +5 -5
    Fix build errors on Windows

  storage/maria/tablockman.c@1.11, 2008-01-10 13:20:31+01:00, vvaintroub@vaio. +2 -4
    Fix build errors on Windows

  storage/maria/unittest/CMakeLists.txt@1.1, 2008-01-10 13:21:09+01:00, vvaintroub@vaio. +97 -0
    Add missing file

  storage/maria/unittest/CMakeLists.txt@1.0, 2008-01-10 13:21:09+01:00, vvaintroub@vaio. +0 -0

  storage/maria/unittest/Makefile.am@1.21, 2008-01-10 13:20:32+01:00, vvaintroub@vaio. +1 -1
    Add CMakeLists.txt

  storage/maria/unittest/ma_pagecache_consist.c@1.23, 2008-01-10 13:20:34+01:00, vvaintroub@vaio. +6 -10
    Fix build errors on Windows
    remove loop from get_len()

  storage/maria/unittest/ma_pagecache_single.c@1.24, 2008-01-10 13:20:36+01:00, vvaintroub@vaio. +4 -0
    Fix build errors on Windows

  storage/maria/unittest/ma_test_loghandler-t.c@1.29, 2008-01-10 13:20:38+01:00, vvaintroub@vaio. +18 -9
    Windows fixes
    -Avoid division by 0 in expressions like
    x/(RAND_MAX/y), where y is larger than RAND_MAX(==0x7fff on Windows)

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.26, 2008-01-10 13:20:41+01:00, vvaintroub@vaio. +4 -9
    Windows fixes
    -Avoid division by 0 in expressions like
    x/(RAND_MAX/y), where y is larger than RAND_MAX(==0x7fff on Windows)
    -remove loop in get_len()

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.28, 2008-01-10 13:20:43+01:00, vvaintroub@vaio. +5 -9
    Windows fixes
    -Avoid division by 0 in expressions like
    x/(RAND_MAX/y), where y is larger than RAND_MAX(==0x7fff on Windows)
    -remove loop in get_len()

  storage/maria/unittest/ma_test_loghandler_noflush-t.c@1.13, 2008-01-10 13:20:45+01:00, vvaintroub@vaio. +2 -1
    Fix build errors on Windows

  storage/maria/unittest/test_file.c@1.8, 2008-01-10 13:20:47+01:00, vvaintroub@vaio. +27 -1
    Correct the code to get file size on Windows. 
    stat() information can be outdated and thus cannot be trusted.
    On Vista,stat() returns file size=0 until the file is closed at the
    first time.

  storage/myisam/CMakeLists.txt@1.10, 2008-01-10 13:20:49+01:00, vvaintroub@vaio. +16 -0
    Fix compiler errors on Windows
    Build test executables

  storage/myisam/mi_test2.c@1.44, 2008-01-10 13:20:51+01:00, vvaintroub@vaio. +6 -6
    Rename variable to avoid naming conflict with Microsoft C runtime 
    function

  storage/myisam/mi_test3.c@1.25, 2008-01-10 13:20:53+01:00, vvaintroub@vaio. +5 -5
    Fix build errors on Windows

  strings/CMakeLists.txt@1.7, 2008-01-10 13:20:54+01:00, vvaintroub@vaio. +2 -1
    Add missing file

  unittest/mysys/CMakeLists.txt@1.1, 2008-01-10 13:21:07+01:00, vvaintroub@vaio. +28 -0
    Add missing file

  unittest/mysys/CMakeLists.txt@1.0, 2008-01-10 13:21:07+01:00, vvaintroub@vaio. +0 -0

  unittest/mysys/Makefile.am@1.15, 2008-01-10 13:20:56+01:00, vvaintroub@vaio. +2 -0
    Windows:
    downport unittest changes from 5.2 bk tree

  unittest/mysys/my_atomic-t.c@1.21, 2008-01-10 13:20:58+01:00, vvaintroub@vaio. +63 -23
    Windows:
    downport unittest changes from 5.2 bk tree

  unittest/mytap/CMakeLists.txt@1.1, 2008-01-10 13:21:05+01:00, vvaintroub@vaio. +20 -0
    Add missing file

  unittest/mytap/CMakeLists.txt@1.0, 2008-01-10 13:21:05+01:00, vvaintroub@vaio. +0 -0

  unittest/mytap/Makefile.am@1.6, 2008-01-10 13:21:00+01:00, vvaintroub@vaio. +2 -0
    Windows:
    downport unittest changes from 5.2 bk tree

  unittest/mytap/tap.c@1.13, 2008-01-10 13:21:02+01:00, vvaintroub@vaio. +17 -4
    Windows:
    downport unittest changes from 5.2 bk tree

  unittest/unit.pl@1.9, 2008-01-10 13:20:55+01:00, vvaintroub@vaio. +2 -2
    Windows:
    downport unittest changes from 5.2 bk tree

  win/configure.js@1.12, 2008-01-10 13:21:04+01:00, vvaintroub@vaio. +1 -0
    Add WITH_MARIA_STORAGE_ENGINE configure option

ChangeSet@1.2476.779.22, 2008-01-10 15:07:55+03:00, kaa@kaamos.(none) +1 -0
  Post-merge fix after merging 5.0 -> 5.1. Replaced 'byte' with 'uchar'.

  sql/filesort.cc@1.126.4.4, 2008-01-10 15:07:54+03:00, kaa@kaamos.(none) +6 -6
    Post-merge fix after merging 5.0 -> 5.1. Replaced 'byte' with 'uchar'.

ChangeSet@1.2519.3.1, 2008-01-09 18:51:05+01:00, serg@janus.mylan +5 -0
  ignore 'moved' state in maria_open() if requested

  storage/maria/ma_open.c@1.55, 2008-01-09 18:51:00+01:00, serg@janus.mylan +3 -1
    ignore 'moved' state if requested

  storage/maria/ma_pagecache.c@1.71, 2008-01-08 13:25:32+01:00, serg@janus.mylan +0 -0
    Change mode to -rw-rw-r--

  storage/maria/maria_def.h@1.64, 2008-01-09 18:51:01+01:00, serg@janus.mylan +3 -0
    ignore 'moved' state in maria_open() if requested

  storage/maria/maria_pack.c@1.18, 2008-01-09 18:51:01+01:00, serg@janus.mylan +1 -1
    ignore 'moved' state in maria_open()

  storage/maria/unittest/ma_test_all-t@1.5.1.1, 2008-01-09 18:51:01+01:00, serg@janus.mylan +1 -1
    avoid a warning if $output is undefined

ChangeSet@1.2476.779.19, 2008-01-09 18:00:12+02:00, gkodinov@macbook.gmz +1 -0
  merge of the fix for bug 33133 to 5.1-opt

  mysql-test/r/func_group.result@1.70, 2008-01-09 18:00:08+02:00, gkodinov@macbook.gmz +2 -2
    merge of the fix for bug 33133 to 5.1-opt

ChangeSet@1.1810.3580.1, 2008-01-09 16:49:13+02:00, gkodinov@macbook.gmz +3 -0
  Bug #33133: Views are not transparent
  
  When resolving references we need to take into consideration
  the view "fields" and allow qualified access to them.
  Fixed by extending the reference resolution to process view
  fields correctly.

  mysql-test/r/func_group.result@1.49.1.16, 2008-01-09 16:49:11+02:00, gkodinov@macbook.gmz +12 -0
    Bug #33133: test case

  mysql-test/t/func_group.test@1.48.1.12, 2008-01-09 16:49:11+02:00, gkodinov@macbook.gmz +15 -0
    Bug #33133: test case

  sql/sql_base.cc@1.235.119.1, 2008-01-09 16:49:11+02:00, gkodinov@macbook.gmz +30 -1
    Bug #33133: allow qualified alias refs to view fields

ChangeSet@1.2476.801.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.1810.3578.2, 2008-01-09 00:40:41+03:00, evgen@moonbone.local +3 -0
  Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
  server crash.
  
  The filesort implementation has an optimization for subquery execution which
  consists of reusing previously allocated buffers. In particular the call to
  the read_buffpek_from_file function might be skipped when a big enough buffer
  for buffer descriptors (buffpeks) is already allocated. Beside allocating
  memory for buffpeks this function fills allocated buffer with data read from
  disk. Skipping it might led to using an arbitrary memory as fields' data and
  finally to a crash.
  
  Now the read_buffpek_from_file function is always called. It allocates
  new buffer only when necessary, but always fill it with correct data.

  mysql-test/r/subselect.result@1.134.1.69, 2008-01-09 00:39:19+03:00, evgen@moonbone.local +9 -0
    Added a test case for the bug#33675: Usage of an uninitialized memory by
    filesort in a subquery caused server crash.

  mysql-test/t/subselect.test@1.129.1.32, 2008-01-09 00:39:53+03:00, evgen@moonbone.local +22 -0
    Added a test case for the bug#33675: Usage of an uninitialized memory by
    filesort in a subquery caused server crash.

  sql/filesort.cc@1.105.1.20, 2008-01-09 00:39:02+03:00, evgen@moonbone.local +13 -9
    Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
    server crash.Now the read_buffpek_from_file function is always called. It allocates
    new buffer only when necessary, but always fill it with correct data.

ChangeSet@1.1810.3565.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.3579.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.2519.2.1, 2008-01-08 22:21:28+02:00, jani@hynda.mysql.fi +2 -0
  New version of ma_test_all

  storage/maria/ma_test_all.sh@1.22, 2008-01-08 22:21:27+02:00, jani@hynda.mysql.fi +13 -1
    Added possibility to call ma_test_all-t directly with the old script.
    If any options were passed (such as --verbose) the script will
    be called directly.

  storage/maria/unittest/ma_test_all-t@1.6, 2008-01-08 22:21:27+02:00, jani@hynda.mysql.fi +87 -21
    Added new options --number-of-tests and --run-tests=...
    
    More verbose output

ChangeSet@1.2519.1.1, 2008-01-08 22:18:59+02:00, bell@desktop.sanja.is.com.ua +2 -0
  Added unlocking without unpinning to page cache.

  storage/maria/ma_pagecache.c@1.70.1.1, 2008-01-08 22:18:56+02:00, bell@desktop.sanja.is.com.ua +4 -0
    Support of unpinning unlocked file.

  storage/maria/unittest/ma_pagecache_single.c@1.23, 2008-01-08 22:18:56+02:00, bell@desktop.sanja.is.com.ua +119 -11
    Fixed layout.
    Added test of new schema of using pagecache:
      unlocking without unpinning.

ChangeSet@1.2521, 2008-01-08 20:44:21+02:00, monty@mysql.com +1 -0
  Removed wrong prototypes (Fixed compiler warning)

  storage/maria/ma_recovery.c@1.71, 2008-01-08 20:44:19+02:00, monty@mysql.com +0 -2
    Removed wrong prototypes (Fixed compiler warning)

ChangeSet@1.2518.1.1, 2008-01-08 20:17:05+02:00, monty@mysql.com +6 -0
  Use LOGREC_REDO_NEW_ROW_HEAD and LOGREC_REDO_NEW_ROW_TAIL when writing to a new page
  This makes REDO safer as we then know when it's safe to ignore HA_ERR_WRONG_CRC from page cache
  Removed not used logged data for LOGREC_UNDO_ROW_DELETE and LOGREC_UNDO_ROW_UPDATE

  storage/maria/ma_blockrec.c@1.75, 2008-01-08 20:17:02+02:00, monty@mysql.com +21 -9
    Use LOGREC_REDO_NEW_ROW_HEAD and LOGREC_REDO_NEW_ROW_TAIL when writing to a new page
    This makes REDO safer as we then know when it's safe to ignore HA_ERR_WRONG_CRC from page cache

  storage/maria/ma_blockrec.h@1.27, 2008-01-08 20:17:03+02:00, monty@mysql.com +1 -0
    Fixed prototype

  storage/maria/ma_key_recover.c@1.17, 2008-01-08 20:17:03+02:00, monty@mysql.com +0 -15
    Removed not used logged data for LOGREC_UNDO_ROW_DELETE and LOGREC_UNDO_ROW_UPDATE

  storage/maria/ma_loghandler.c@1.104, 2008-01-08 20:17:03+02:00, monty@mysql.com +15 -6
    Use LOGREC_REDO_NEW_ROW_HEAD and LOGREC_REDO_NEW_ROW_TAIL when writing to a new page

  storage/maria/ma_loghandler.h@1.44, 2008-01-08 20:17:03+02:00, monty@mysql.com +2 -1
    Added LOGREC_REDO_NEW_ROW_HEAD and LOGREC_REDO_NEW_ROW_TAIL

  storage/maria/ma_recovery.c@1.70, 2008-01-08 20:17:03+02:00, monty@mysql.com +24 -1
    Added support for LOGREC_REDO_NEW_ROW_HEAD and LOGREC_REDO_NEW_ROW_TAIL

ChangeSet@1.2476.779.17, 2008-01-08 12:27:15+02:00, gkodinov@macbook.gmz +1 -0
  merge of bug 33256 5.0-opt -> 5.1-opt

  sql/field.h@1.251.1.4, 2008-01-08 12:27:12+02:00, gkodinov@macbook.gmz +3 -3
    merge of bug 33256 5.0-opt -> 5.1-opt

ChangeSet@1.2517.1.2, 2008-01-07 22:19:21+01:00, serg@janus.mylan +2 -0
  cleanup

  dbug/dbug.c@1.41.1.1, 2008-01-07 22:19:18+01:00, serg@janus.mylan +0 -1
    cleanup

  include/my_dbug.h@1.28.1.1, 2008-01-07 22:19:18+01:00, serg@janus.mylan +10 -10
    formatting

ChangeSet@1.2517.1.1, 2008-01-07 22:18:16+01:00, serg@janus.mylan +5 -0
  auto-zerofill when a table is moved from another server

  storage/maria/ha_maria.cc@1.67.1.1, 2008-01-07 22:18:10+01:00, serg@janus.mylan +38 -2
    auto-zerofill when a table is moved from another server

  storage/maria/ha_maria.h@1.19, 2008-01-07 22:18:10+01:00, serg@janus.mylan +2 -2
    auto-zerofill when a table is moved from another server

  storage/maria/ma_check.c@1.64.1.1, 2008-01-07 22:18:10+01:00, serg@janus.mylan +2 -1
    auto-zerofill when a table is moved from another server

  storage/maria/ma_open.c@1.52.1.1, 2008-01-07 22:18:11+01:00, serg@janus.mylan +14 -0
    auto-zerofill when a table is moved from another server

  storage/maria/maria_def.h@1.61.1.1, 2008-01-07 22:18:11+01:00, serg@janus.mylan +1 -0
    auto-zerofill when a table is moved from another server

ChangeSet@1.2476.766.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.107.1.2, 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.88.1.2, 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.2516.1.1, 2008-01-07 18:54:41+02:00, monty@mysql.com +34 -0
  Bugs fixed:
  - If not in autocommit mode, delete rows one by one so that we can roll back if necessary
  - bitmap->used_size was not correctly set, which caused bitmap pages to be overwritten
  - Fixed bug in bitmap handling when allocation tail pages
  - Ensure we reserve place for directory entry when calculation place for head and tail pages
  - Fixed wrong value in bitmap->size[0]
  - Fixed wrong assert in flush_log_for_bitmap
  - Fixed bug in _ma_bitmap_release_unused() where tail blocks could be wrongly reset
  - Mark new pages as changed (Required to get repair() to work)
  - Fixed problem with advancing log horizon pointer within one page bounds
  - Fixed DBUG_ASSERT() when enable_indexes failes for end_bulk_insert()
  - Fixed bug in logging of rows with more than one big blob
  - Fixed DBUG_ASSERTS() in pagecache to allow change of WRITE_LOCK to READ_LOCK in unlock() calls
  - Flush pagecache when we change from logging to not logging (if not, pagecache code breaks)
  - Ensure my_errno is set on return from write/delete/update
  - Fixed bug when using FIELD_SKIP_PRESPACE
  
  New features:
  - mysql_fix_privilege_tables now first uses binaries and scripts from source distribution, then in installed distribution
  - Fix that optimize works for Maria tables
  - maria_check --zerofill now also clear freed blob pages
  - maria_check -di now prints more information about record page utilization
  
  Optimizations:
  - Use pagecache_unlock_by_link() instead of pagecache_write() if possible. (Avoids a memory copy and a find_block)
  - Simplify code to abort when we found optimal bit pattern
  - Skip also full head page bit patterns when searching for tail
  - Increase default repair buffer to 128M for maria_chk and maria_read_log
  - Increase default sort buffer for maria_chk to 64M
  - Increase size of sortbuffer and pagecache for mysqld to 64M
  - VARCHAR/CHAR fields are stored in increasing length order for BLOCK_RECORD tables
  
  Better reporting:
  - Fixed test of error condition for flush (for better error code)
  - More error messages to mysqld if Maria recovery fails
  - Always print warning if rows are deleted in repair
  - Added global function _db_force_flush() that is usable when doing debugging in gdb
  - Added call to my_debug_put_break_here() in case of some errors (for debugging)
  - Remove used testfiles in unittest as these was written in different directories depending on from where the test was started
  
  This should fix the bugs found when importing a big table with many varchars and one/many blobs to Maria

  dbug/dbug.c@1.42, 2008-01-07 18:54:33+02:00, monty@mysql.com +10 -0
    Added global function _db_force_flush() that is usable when doing debugging in gdbine
    

  extra/replace.c@1.26, 2008-01-07 18:54:34+02:00, monty@mysql.com +1 -0
    Fixed memory leak

  include/my_dbug.h@1.29, 2008-01-07 18:54:34+02:00, monty@mysql.com +1 -0
    Prototype for _db_force_flush()

  include/my_global.h@1.157, 2008-01-07 18:54:34+02:00, monty@mysql.com +1 -0
    Added stdarg.h as my_sys.h now depends on it.

  include/my_sys.h@1.228, 2008-01-07 18:54:34+02:00, monty@mysql.com +7 -0
    Make my_dbug_put_break_here() a NOP if not DBUG build
    Added my_printv_error()

  include/myisamchk.h@1.8, 2008-01-07 18:54:34+02:00, monty@mysql.com +1 -1
    Added entry 'lost' to be able to count space that is lost forever

  mysql-test/r/maria.result@1.34, 2008-01-07 18:54:35+02:00, monty@mysql.com +13 -0
    Updated results

  mysql-test/t/maria.test@1.28, 2008-01-07 18:54:35+02:00, monty@mysql.com +16 -0
    Reset autocommit after test
    New test to check if delete_all_rows is used (verified with --debug)

  mysys/my_error.c@1.29, 2008-01-07 18:54:35+02:00, monty@mysql.com +26 -2
    Added my_printv_error()

  scripts/mysql_fix_privilege_tables.sh@1.40.1.1, 2008-01-07 18:54:35+02:00, monty@mysql.com +4 -4
    First use binaries and scripts from source distribution, then in installed distribution
    This ensures that a development branch doesn't pick up wrong scripts)

  sql/mysqld.cc@1.616, 2008-01-07 18:54:35+02:00, monty@mysql.com +3 -4
    Fix that one can break maria recovery with ^C when debugging

  sql/sql_class.cc@1.358, 2008-01-07 18:54:36+02:00, monty@mysql.com +2 -7
    Removed #ifdef that has no effect
    (The preceeding DBUG_ASSERT() ensures that the following code will not be exectued)

  storage/maria/ha_maria.cc@1.68, 2008-01-07 18:54:36+02:00, monty@mysql.com +25 -19
    Increase size of sortbuffer and pagecache to 64M
    Fix that optimize works for Maria tables
    Fixed DBUG_ASSERT() when enable_indexes failes for end_bulk_insert()
    If not in autocommit mode, delete rows one by one so that we can roll back if necessary
    Fixed variable comments

  storage/maria/ma_bitmap.c@1.37, 2008-01-07 18:54:36+02:00, monty@mysql.com +45 -40
    More ASSERTS to detect overwrite of bitmap pages
    bitmap->used_size was not correctly set, which caused bitmap pages to be overwritten
    Ensure we reserve place for directory entry when calculation place for head and tail pages
    bitmap->size[0] should not include space for directory entry
    Simplify code to abort when we found optimal bit pattern
    Skip also full head page bit patterns when searching for tail (should speed up some common cases)
    Fixed bug in allocate_tail() when block->used was not aligned on 6 bytes
    Fixed wrong assert in flush_log_for_bitmap
    Fixed bug in _ma_bitmap_release_unused() where tail blocks could be wrongly reset

  storage/maria/ma_blockrec.c@1.74, 2008-01-07 18:54:36+02:00, monty@mysql.com +105 -74
    Ensure my_errno is set on return
    Fixed not optimal setting of row->min_length if we don't have variable length fields
    Use pagecache_unlock_by_link() instead of pagecache_write() if possible. (Avoids a memory copy and a find_block)
    Added DBUG_ASSERT() if we read or write wrong VARCHAR data
    Added DBUG_ASSERT() to find out if row sizes are calculated wrong
    Fixed bug in logging of rows with more than one big blob

  storage/maria/ma_check.c@1.65, 2008-01-07 18:54:36+02:00, monty@mysql.com +178 -142
    Disable logging while normal repair is done to avoid logging of index changes
    Fixed bug that caused CHECKSUM part of key page to be used
    Fixed that deleted of wrong records also works for BLOCK_RECORD
    Clear unallocated pages:
    - BLOB pages are not automaticly cleared on delete, so we need to use the bitmap to know if page is used or not
    Better error reporting
    More information about record page utilization
    Change printing of file position to printing of pages to make output more readable
    Always print warning if rows are deleted

  storage/maria/ma_create.c@1.42, 2008-01-07 18:54:36+02:00, monty@mysql.com +24 -9
    Calculate share.base_max_pack_length more accurately for BLOCK_RECORD pages (for future)
    Fixed that FIELD_SKIP_PRESPACE is recorded as FIELD_NORMAL; Fixed bug where fields could be used in wrong order
    Store FIELD_SKIP_ZERO fields before CHAR and VARCHAR fields (optimization)
    Store other fields in length order (to get better utilization of head block)

  storage/maria/ma_delete.c@1.24, 2008-01-07 18:54:36+02:00, monty@mysql.com +6 -4
    Ensure my_errno is set on return

  storage/maria/ma_dynrec.c@1.23, 2008-01-07 18:54:36+02:00, monty@mysql.com +2 -1
    Indentation fix

  storage/maria/ma_locking.c@1.24, 2008-01-07 18:54:37+02:00, monty@mysql.com +1 -0
    Set changed if open_count is counted down.
    (To avoid getting error "client is using or hasn't closed the table properly" with transactional tables

  storage/maria/ma_loghandler.c@1.103, 2008-01-07 18:54:37+02:00, monty@mysql.com +36 -21
    Fixed problem with advancing log horizon pointer within one page bounds (Patch from Sanja)
    Added more DBUG
    Indentation fixes

  storage/maria/ma_open.c@1.53, 2008-01-07 18:54:37+02:00, monty@mysql.com +2 -2
    Removed wrong casts

  storage/maria/ma_page.c@1.23, 2008-01-07 18:54:37+02:00, monty@mysql.com +8 -4
    Fixed usage of PAGECACHE_LOCK_WRITE_UNLOCK with _ma_new()
    Mark new pages as changed (Required to get repair() to work)

  storage/maria/ma_pagecache.c@1.70, 2008-01-07 18:54:37+02:00, monty@mysql.com +28 -10
    Fixed test of error condition for flush
    Fixed problem when using PAGECACHE_LOCK_WRITE_TO_READ with unlock()
    Added call to my_debug_put_break_here() in case of errors (for debugging)

  storage/maria/ma_pagecrc.c@1.5, 2008-01-07 18:54:37+02:00, monty@mysql.com +7 -8
    Ensure we get same crc for 32 and 64 bit systems by forcing argument to maria_page_crc to uint32

  storage/maria/ma_recovery.c@1.69, 2008-01-07 18:54:37+02:00, monty@mysql.com +58 -44
    Call my_printv_error() from eprint() to get critical errors to mysqld log
    Removed \n from error strings to eprint() to get nicer output in mysqld
    Added simple test in _ma_reenable_logging_for_table() to not do any work if not needed

  storage/maria/ma_update.c@1.19, 2008-01-07 18:54:37+02:00, monty@mysql.com +5 -1
    Ensure my_errno is set on return

  storage/maria/ma_write.c@1.29, 2008-01-07 18:54:37+02:00, monty@mysql.com +2 -0
    Ensure my_errno is set on return

  storage/maria/maria_chk.c@1.42, 2008-01-07 18:54:37+02:00, monty@mysql.com +23 -5
    Use DEBUGGER_OFF if --debug is not use (to get slightly faster execution for debug binaries)
    Added option --skip-safemalloc
    Don't write exponents for rec/key

  storage/maria/maria_def.h@1.62, 2008-01-07 18:54:37+02:00, monty@mysql.com +2 -2
    Increase default repair buffer to 128M for maria_chk and maria_read_log
    Increase default sort buffer for maria_chk to 64M

  storage/maria/unittest/Makefile.am@1.20, 2008-01-07 18:54:37+02:00, monty@mysql.com +2 -0
    Don't update files automaticly from bitkeeper

  storage/maria/unittest/ma_pagecache_consist.c@1.22, 2008-01-07 18:54:37+02:00, monty@mysql.com +1 -1
    Remove testfile at end

  storage/maria/unittest/ma_pagecache_single.c@1.22, 2008-01-07 18:54:37+02:00, monty@mysql.com +1 -1
    Remove testfile at end

  storage/maria/unittest/ma_test_all-t@1.3.1.1, 2008-01-07 18:54:37+02:00, monty@mysql.com +10 -8
    More tests
    Safer checking if test caused error

ChangeSet@1.1810.3480.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.3577.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.3576.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.2517, 2008-01-04 02:16:24+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +3 -0
  Bug fixes and new features to ma_test_all-t

  scripts/mysql_fix_privilege_tables.sh@1.41, 2008-01-04 02:16:20+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -1
    Fix a problem with events table not getting updated correctly.
    This happens when you run scripts/mysql_fix_privilege_tables and
    you have an old version of mysql_fix_privilege_tables.sql in
    the actual installation directory. This patch makes it look for
    the file inside the source dir first.

  storage/maria/unittest/ma_test_all-t@1.4, 2008-01-04 02:16:20+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +293 -184
    Added several new options for ma_test_all-t
    
    --verbose is handy, if you want to run the tests separately on the
    screen.
    
    Added functions for counting tests and a possibility to
    separate a group of tests inside an array of test.

  unittest/Makefile.am@1.15, 2008-01-04 02:16:20+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -2
    Fixed a problem with make test not executing
    ma_test_all-t properly from the top source dir.

ChangeSet@1.2476.810.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.107.1.1, 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.88.1.1, 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.2516, 2008-01-03 09:45:46+02:00, monty@mysql.com +17 -0
  Added wrapper for chmod(): my_chmod()
  Automaticly disable ma_test_recovery if not compiled with debugging. This fixes that make test works in Maria.
  Fixed wrong merge of ma_init.c from 5.1
  Portability fixes:
  - Use my_chmod() instead of my_chmod()
  - Use my_access() instead of my_stat() to test if file exists
  - Don't test result value of pthread_mutex_lock() and pthread_mutex_unlock() as this is not portable
  - No reason to test if file exists before we delete it
  

  include/my_sys.h@1.227, 2008-01-03 09:45:43+02:00, monty@mysql.com +1 -0
    Added my_chmod

  include/mysys_err.h@1.18, 2008-01-03 09:45:43+02:00, monty@mysql.com +2 -1
    Added error for my_chmod

  mysys/Makefile.am@1.96, 2008-01-03 09:45:43+02:00, monty@mysql.com +1 -1
    Added my_chmod

  mysys/errors.c@1.23, 2008-01-03 09:45:43+02:00, monty@mysql.com +3 -1
    Added error for my_chmod

  mysys/my_chmod.c@1.1, 2008-01-03 09:45:44+02:00, monty@mysql.com +48 -0
    Added wrapper for chmod()
    

  mysys/my_chmod.c@1.0, 2008-01-03 09:45:44+02:00, monty@mysql.com +0 -0

  mysys/my_init.c@1.62, 2008-01-03 09:45:43+02:00, monty@mysql.com +24 -21
    Syncronize with 5.1 to fix setting of QueryPerformanceFrequency()

  storage/maria/ma_test1.c@1.35, 2008-01-03 09:45:43+02:00, monty@mysql.com +2 -2
    Changed short option of --skip-delete and --skip-update to be more logical

  storage/maria/ma_test_recovery@1.21, 2008-01-03 09:45:43+02:00, monty@mysql.com +16 -12
    Abort test nicely if we are runnning without debugging
    Added more tests
    Changed temporary file names so that one can run maria_chk on them
    Removed some old comments

  storage/maria/maria_read_log.c@1.32, 2008-01-03 09:45:43+02:00, monty@mysql.com +6 -0
    Added note if maria_read_log will not be able to create byte-to-byte identical tables compared to normal execution

  storage/maria/unittest/ma_pagecache_consist.c@1.21, 2008-01-03 09:45:43+02:00, monty@mysql.com +4 -16
    Removed wrong setting of buff that caused memory overwrite
    Use my_chmod() instead of chmod()
    Don't test result value of pthread_mutex_lock() and pthread_mutex_unlock() as this is not portable

  storage/maria/unittest/ma_pagecache_single.c@1.21, 2008-01-03 09:45:43+02:00, monty@mysql.com +5 -17
    Use my_chmod() instead of chmod()
    Don't test result value of pthread_mutex_lock() and pthread_mutex_unlock() as this is not portable

  storage/maria/unittest/ma_test_loghandler_first_lsn-t.c@1.12, 2008-01-03 09:45:43+02:00, monty@mysql.com +2 -5
    No reason to test if file exists before we delete it

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.27, 2008-01-03 09:45:43+02:00, monty@mysql.com +3 -11
    Don't test result value of pthread_mutex_lock() and pthread_mutex_unlock() as this is not portable

  storage/maria/unittest/ma_test_loghandler_noflush-t.c@1.12, 2008-01-03 09:45:43+02:00, monty@mysql.com +2 -5
    No reason to test if file exists before we delete it

  storage/maria/unittest/ma_test_loghandler_nologs-t.c@1.3, 2008-01-03 09:45:43+02:00, monty@mysql.com +1 -2
    Use my_access() instead of my_stat() to test if file exists

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.26, 2008-01-03 09:45:43+02:00, monty@mysql.com +3 -9
    No reason to test if file exists before we delete it
    chmod -> my_chmod

  storage/maria/ma_test_recovery.expected@1.18, 2008-01-03 09:45:43+02:00, monty@mysql.com +5 -1
    Updated results after adding more tests

ChangeSet@1.2515, 2008-01-02 18:27:24+02:00, monty@mysql.com +14 -0
  Disable logging of index pages during repair
  Fixed failure in unittest/ma_test_loghandler_pagecache-t
  Initialize pagecache callbacks explictily, not with pagecache_init().
  This is to make things more readable and for the future to make more choices with callbacks

  storage/maria/ha_maria.cc@1.67, 2008-01-02 18:26:43+02:00, monty@mysql.com +5 -5
    Disable logging of index pages during repair

  storage/maria/ma_bitmap.c@1.36, 2008-01-02 18:26:43+02:00, monty@mysql.com +31 -18
    Initialize callbacks explictily, not with pagecache_init(), to make things more readable and for future to have more choices with callbacks
    Use new interface to flush logs from pagecache

  storage/maria/ma_check.c@1.64, 2008-01-02 18:26:43+02:00, monty@mysql.com +8 -11
    Fixed test for wrong keyblocks
    Use default functions to setup callbacks for pagecache

  storage/maria/ma_loghandler.c@1.102, 2008-01-02 18:26:43+02:00, monty@mysql.com +2 -1
    Use dummy functions for log flush callback (NULL doesn't work anymore)

  storage/maria/ma_open.c@1.52, 2008-01-02 18:27:22+02:00, monty@mysql.com +55 -33
    Initialize callbacks explictily, not with pagecache_init(), to make things more readable and for future to have more choices with callbacks
    Prefix external functions with _ma_
    

  storage/maria/ma_pagecache.c@1.69, 2008-01-02 18:27:22+02:00, monty@mysql.com +4 -16
    Use new simpler interface to flush logs if needed

  storage/maria/ma_pagecache.h@1.37, 2008-01-02 18:27:22+02:00, monty@mysql.com +4 -4
    Changed interface to a faster, simpler one to flush logs.
    Now we have a function that takes care of flushing logs, instead of a function to get lsn address

  storage/maria/ma_pagecrc.c@1.4, 2008-01-02 18:27:22+02:00, monty@mysql.com +41 -1
    Add functions for flushing logs

  storage/maria/ma_recovery.c@1.68, 2008-01-02 18:27:22+02:00, monty@mysql.com +4 -4
    Rename functions

  storage/maria/maria_chk.c@1.41, 2008-01-02 18:27:22+02:00, monty@mysql.com +3 -6
    Use default functions to setup callbacks for pagecache

  storage/maria/maria_def.h@1.61, 2008-01-02 18:27:22+02:00, monty@mysql.com +10 -5
    Prefixd global functions with _ma_

  storage/maria/unittest/ma_pagecache_consist.c@1.20, 2008-01-02 18:27:22+02:00, monty@mysql.com +1 -1
    Use dummy functions for log flush callback (NULL doesn't work anymore)

  storage/maria/unittest/ma_pagecache_single.c@1.20, 2008-01-02 18:27:22+02:00, monty@mysql.com +1 -1
    Use dummy functions for log flush callback (NULL doesn't work anymore)

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.25, 2008-01-02 18:27:23+02:00, monty@mysql.com +1 -1
    Use maria_flush_log_for_page to flush log pages. Fixes failure in unittest

ChangeSet@1.2514, 2008-01-01 22:30:49+01:00, guilhem@gbichot4.local +9 -0
  after-merge fixes and comments

  mysql-test/include/maria_empty_logs.inc@1.4, 2008-01-01 22:30:45+01:00, guilhem@gbichot4.local +1 -0
    At one moment in maria-recovery.test the first log has number 2,
    because log 1 was manually deleted.

  mysql-test/r/maria-recovery.result@1.11, 2008-01-01 22:30:45+01:00, guilhem@gbichot4.local +31 -7
    after-merge fix

  mysql-test/t/maria-recovery.test@1.11, 2008-01-01 22:30:45+01:00, guilhem@gbichot4.local +29 -0
    after-merge fix

  storage/maria/ma_bitmap.c@1.35, 2008-01-01 22:30:45+01:00, guilhem@gbichot4.local +9 -14
    after-merge fix. The todo is implemented now.

  storage/maria/ma_blockrec.c@1.73, 2008-01-01 22:30:45+01:00, guilhem@gbichot4.local +6 -0
    comment

  storage/maria/ma_open.c@1.51, 2008-01-01 22:30:45+01:00, guilhem@gbichot4.local +8 -4
    after-merge fix. Set write_fail also for index file or a write error
    would crash.

  storage/maria/ma_pagecache.c@1.68, 2008-01-01 22:30:45+01:00, guilhem@gbichot4.local +10 -0
    comment

  storage/maria/ma_pagecache.h@1.36, 2008-01-01 22:30:46+01:00, guilhem@gbichot4.local +1 -1
    I prefer to use NULL for 'no callback' instead of a dummy callback
    in the special case of get_log_address; indeed for non-transactional
    tables it uses an if(), while if using a dummy callback, it would
    use a function call plus an if() (the dummy callback would need to
    return a magic value to say "don't flush" and that value would be
    tested in if()).

  storage/maria/unittest/ma_test_all-t@1.3, 2008-01-01 22:30:46+01:00, guilhem@gbichot4.local +7 -7
    fix if running from outside storage/maria

ChangeSet@1.2509.1.2, 2007-12-31 17:13:22+02:00, monty@mysql.com +1 -0
  Fix results so that it works also if SAFEMALLOC is used
  (When SAFEMALLOC is used, the value of MALLOC_OVERHEAD is different, which affect variable values)

  mysql-test/t/maria.test@1.27, 2007-12-31 17:13:20+02:00, monty@mysql.com +2 -0
    Fix results so that it works also if SAFEMALLOC is used
    (When SAFEMALLOC is used, the value of MALLOC_OVERHEAD is different, which affect variable values)

ChangeSet@1.2476.720.19, 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.2509.1.1, 2007-12-31 15:05:54+02:00, monty@mysql.com +1 -0
  Updated results

  mysql-test/r/maria.result@1.33, 2007-12-31 15:05:52+02:00, monty@mysql.com +4 -4
    Updated results

ChangeSet@1.2509, 2007-12-31 11:55:46+02:00, monty@mysql.com +22 -0
  Added maria_zerofill()
  This is used to bzero all not used parts of the index pages and compact and bzero the not used parts of the data pages of block-record type
  Added --zerofill (-z) option to maria_chk (Mostly code from Jani)
  Added now table states ZEROFILLED and MOVEABLE
  Set state.changed with new states when things changes

  include/maria.h@1.24, 2007-12-31 11:55:43+02:00, monty@mysql.com +1 -0
    Added maria_zerofill

  include/myisamchk.h@1.7, 2007-12-31 11:55:44+02:00, monty@mysql.com +3 -1
    Added option for zerofill
    Extend testflag to be 64 to allow for more flags

  mysql-test/r/create.result@1.161, 2007-12-31 11:55:44+02:00, monty@mysql.com +1 -1
    Updated results after merge

  mysql-test/r/maria.result@1.32, 2007-12-31 11:55:44+02:00, monty@mysql.com +1 -1
    Updated results after merge

  mysys/my_getopt.c@1.85, 2007-12-31 11:55:44+02:00, monty@mysql.com +1 -1
    Removed not used variable

  sql/sql_show.cc@1.445, 2007-12-31 11:55:44+02:00, monty@mysql.com +1 -1
    Fixed wrong page type

  storage/maria/ma_blockrec.c@1.70.1.2, 2007-12-31 11:55:44+02:00, monty@mysql.com +31 -37
    Renamed compact_page() to ma_compact_block_page() and made it global
    Always zerofill half filled blob pages
    Set share.state.changed on REDO

  storage/maria/ma_blockrec.h@1.24.1.2, 2007-12-31 11:55:44+02:00, monty@mysql.com +2 -1
    Added _ma_compact_block_page()

  storage/maria/ma_check.c@1.62, 2007-12-31 11:55:44+02:00, monty@mysql.com +222 -16
    Added maria_zerofill()
    This is used to bzero all not used parts of the index pages and compact and bzero the not used parts of the data pages of block-record type
    This gives the following benefits:
    - Table is smaller if compressed
    - All LSN are removed for transactinal tables and this makes them movable between systems
    Dont set table states of we are using --quick
    Changed log entry for repair to use 8 bytes for flag

  storage/maria/ma_delete.c@1.23, 2007-12-31 11:55:44+02:00, monty@mysql.com +7 -4
    Simplify code
    Update state.changed

  storage/maria/ma_key_recover.c@1.15, 2007-12-31 11:55:44+02:00, monty@mysql.com +8 -5
    Update state.changed

  storage/maria/ma_locking.c@1.21.1.2, 2007-12-31 11:55:44+02:00, monty@mysql.com +69 -9
    Set uuid for file on first change if it's not set (table was cleared with zerofill)

  storage/maria/ma_loghandler.c@1.99, 2007-12-31 11:55:44+02:00, monty@mysql.com +1 -1
    Updated log entry for REDO_REPAIR_TABLE

  storage/maria/ma_recovery.c@1.65, 2007-12-31 11:55:44+02:00, monty@mysql.com +24 -16
    Updated log entry for REDO_REPAIR_TABLE (flag is now 8 bytes)
    Set new bits in state.changed

  storage/maria/ma_test_all.sh@1.21, 2007-12-31 11:55:44+02:00, monty@mysql.com +1 -1
    Nicer output

  storage/maria/ma_update.c@1.18, 2007-12-31 11:55:44+02:00, monty@mysql.com +1 -0
    Update state.changed

  storage/maria/ma_write.c@1.26.1.1, 2007-12-31 11:55:44+02:00, monty@mysql.com +13 -8
    Simplify code
    Set state.changed

  storage/maria/maria_chk.c@1.39, 2007-12-31 11:55:44+02:00, monty@mysql.com +49 -28
    Added option --zerofill
    Added printing of states for MOVABLE and ZEROFILLED
    MYD -> MAD
    MYI -> MAI

  storage/maria/maria_def.h@1.59, 2007-12-31 11:55:44+02:00, monty@mysql.com +10 -6
    Added states STATE_NOT_MOVABLE and STATE_NOT_ZEROFILLED
    Added prototype for new functions

  storage/maria/unittest/ma_test_all-t@1.2, 2007-12-31 11:55:44+02:00, monty@mysql.com +34 -8
    More tests, including tests for zerofill
    Removed some not needed 'print' statements

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.26, 2007-12-31 11:55:44+02:00, monty@mysql.com +1 -1
    Smaller buffer to not trash devlopment machines totally

  storage/maria/ma_test_recovery.expected@1.17, 2007-12-31 11:55:44+02:00, monty@mysql.com +96 -96
    Updated results (now states flags are visible)

ChangeSet@1.2507.1.2, 2007-12-31 00:04:17+01:00, guilhem@gbichot4.local +5 -0
  Maria: more log handler fixes for when logs manually deleted

  mysql-test/include/maria_empty_logs.inc@1.1.1.1, 2007-12-31 00:04:15+01:00, guilhem@gbichot4.local +6 -2
    can now ask that control file be preserved

  mysql-test/lib/mtr_report.pl@1.66, 2007-12-31 00:04:15+01:00, guilhem@gbichot4.local +4 -1
    expected warning (produced by translog_init() when log is missing)

  mysql-test/r/maria-recovery.result@1.7.1.1, 2007-12-31 00:04:15+01:00, guilhem@gbichot4.local +22 -0
    result update

  mysql-test/t/maria-recovery.test@1.7.1.1, 2007-12-31 00:04:15+01:00, guilhem@gbichot4.local +21 -0
    test of removing logs manually; recovery used to fail

  storage/maria/ma_loghandler.c@1.97.1.2, 2007-12-31 00:04:15+01:00, guilhem@gbichot4.local +2 -2
    The addition to maria-recovery.test uncovered a bug: log 1 was
    manually deleted, Maria restarted, created log 2, then crash
    before a checkpoint: logs_found is TRUE, last_checkpoint_lsn
    is LSN_IMPOSSIBLE, so sure_page assumes that log 1 exists;
    using last_logno instead (only the last log needs to be checked,
    as the 'else' branch checks only after last_checkpoint_lsn:
    creation of a log is as good a starting point as a checkpoint,
    for scanning the log).

ChangeSet@1.2507.1.1, 2007-12-30 23:16:18+01:00, guilhem@gbichot4.local +4 -0
  Maria: when logs have been manually deleted, last_logno and last_checkpoint_lsn
  must be updated correctly. And Recovery should not assume that
  log 1 is available but just use first available log.

  mysql-test/r/maria-purge.result@1.4, 2007-12-30 23:16:15+01:00, guilhem@gbichot4.local +1 -1
    result update

  mysql-test/t/maria-purge.test@1.4, 2007-12-30 23:16:15+01:00, guilhem@gbichot4.local +1 -1
    like in other Maria tests (4294967296 is too big, causes warning)

  storage/maria/ma_loghandler.c@1.97.1.1, 2007-12-30 23:16:15+01:00, guilhem@gbichot4.local +11 -12
    When log handler starts and discovers that logs are missing though
    control file says they should be there (they have been manually
    deleted), it decides to create a log
    with number last_logno+1. It needs to update control file with
    this new number, and also reset last_checkpoint_lsn to LSN_IMPOSSIBLE
    (last checkpoint went away when log was deleted).
    Fix for when translog_init() fails before allocating id_to_share
    (translog_destroy() tried to free NULL).

  storage/maria/ma_recovery.c@1.63.1.1, 2007-12-30 23:16:15+01:00, guilhem@gbichot4.local +2 -7
    When logs have been manually deleted, translog_first_theoretical_lsn()
    always fails (it looks for log number 1). Recovery now uses
    translog_first_lsn_in_log() which just picks the first available log.

ChangeSet@1.2476.809.1, 2007-12-30 22:40:03+02:00, monty@mysql.com +41 -0
  UNDO of rows now puts back all part of the row on their original pages and positions
  Added variable _dbug_on_ to speed up execution when DBUG is not going to be used
  Added --debug-on option to mysqld (to be able to turn of DBUG with --debug-on=0)
  Fixed some bugs with 'non_flushable' marking of bitmap pages
  Don't use 'non_flushable' marking of bitmap pages for not transactional tables
  SHOW CREATE TABLE now shows if table was created with page checksums
  Fixed a lot of bugs with BLOB handling in case of update/REDO and UNDO
  More tests (especially for blobs) and DBUG_ASSERTS()
  More readable output from maria_read_log and maria_chk
  Fixed wrong shift that caused Maria to crash on files > 4G
  Mark tables as crashed of REDO fails

  dbug/dbug.c@1.38.1.3, 2007-12-30 22:38:27+02:00, monty@mysql.com +48 -33
    Changed to use my_bool (allowed me to remove some windows specific code)
    Added variable _dbug_on_ to speed up execution when DBUG is not going to be used
    Removed initialization of variables if not needed

  include/my_dbug.h@1.26.1.1, 2007-12-30 22:38:27+02:00, monty@mysql.com +9 -4
    Use my_bool for some functions that was defined as BOOLEAN in dbug.c code
    Added DBUGGER_ON/DEBUGGER_OFF to speed up execution when DBUG is not used

  include/my_global.h@1.153.1.2, 2007-12-30 22:38:28+02:00, monty@mysql.com +2 -4
    Define my_bool early
    Increase MY_HOW_OFTEN_TO_WRITE as computers are now faster than 10 years ago

  mysql-test/mysql-test-run.pl@1.319.1.2, 2007-12-30 22:38:28+02:00, monty@mysql.com +2 -0
    Added debug-on=0 to speed up tests

  mysql-test/r/maria-recovery.result@1.6.2.1, 2007-12-30 22:38:28+02:00, monty@mysql.com +23 -2
    Added new test by Guilhem to test if UNDO_ROW_DELETE preserves rowid

  mysql-test/r/maria.result@1.28.1.1, 2007-12-30 22:38:28+02:00, monty@mysql.com +10 -1
    Added testing of page checksums

  mysql-test/t/crash_commit_before-master.opt@1.2, 2007-12-30 22:38:28+02:00, monty@mysql.com +1 -2
    Added --debug-on as test require DBUG to work

  mysql-test/t/maria-recovery-bitmap-master.opt@1.2, 2007-12-30 22:38:28+02:00, monty@mysql.com +1 -1
    Added --debug-on as test require DBUG to work

  mysql-test/t/maria-recovery-master.opt@1.2, 2007-12-30 22:38:28+02:00, monty@mysql.com +1 -1
    Added --debug-on as test require DBUG to work

  mysql-test/t/maria-recovery.test@1.6.2.1, 2007-12-30 22:38:28+02:00, monty@mysql.com +16 -0
    Added new test by Guilhem to test if UNDO_ROW_DELETE preserves rowid

  mysql-test/t/maria.test@1.24.1.1, 2007-12-30 22:38:28+02:00, monty@mysql.com +12 -3
    Added testing of page checksums

  sql/mysqld.cc@1.610.1.2, 2007-12-30 22:39:15+02:00, monty@mysql.com +77 -71
    Added --debug-on option (to be able to turn of DBUG with --debug-on=0)
    Indentation fixes
    Removed end spaces

  sql/sql_show.cc@1.440.1.2, 2007-12-30 22:39:15+02:00, monty@mysql.com +9 -7
    Allow update_create_info() to inform MySQL if PACK_KEYS, NO_PACK_KEYS, CHECKSUM, PAGE_CHECKSUM or DELAY_KEY_WRITE is used

  storage/maria/Makefile.am@1.23.1.1, 2007-12-30 22:39:15+02:00, monty@mysql.com +2 -1
    Added ma_test_big.sh

  storage/maria/ha_maria.cc@1.63.2.1, 2007-12-30 22:39:15+02:00, monty@mysql.com +8 -1
    Store in create_info if page checksums are used (For SHOW CREATE TABLE)

  storage/maria/ma_bitmap.c@1.31.2.1, 2007-12-30 22:39:35+02:00, monty@mysql.com +124 -46
    Added _ma_bitmap_wait_or_flush() to cause reader of bitmap pages to wait with reading until bitmap is flushed.
    Use TAIL_PAGE_COUNT_MARKER for tail pages
    Set 'sub_blocks' for and only for the head page or for the first extent of a blob. This is needed for store_extent_info() to be able to set START_EXTENT_BIT's
    Don't allocate more than 0x3ffff pages in one extent (We need bit 0x4000 as a START_EXTENT_BIT)
    Increase the calculated 'head_length' with the number of bytes used for extents.
    Update row->space_on_head_page also in _ma_bitmap_find_new_place()
    Make _ma_bitmap_get_page_bits() global. (Needed for UNDO handling)
    Changed _ma_bitmap_flushable() to take MARIA_HA instead of MARIA_SHARE.
    This was needed to be able to mark the handler if we had a 'non_flushable' call pending or not.
    Don't use 'non_flushable' marking of bitmap pages for not transactional tables.
    Added BLOCKUSED_USE_ORG_BITMAP handling also for tail pages.
    Added more DBUG_ASSERT() to find possible errors in other code
    Some code simplications by adding new local variables

  storage/maria/ma_blockrec.c@1.70.1.1, 2007-12-30 22:40:00+02:00, monty@mysql.com +1107 -446
    UNDO of rows now puts back all part of the row on their original pages and positions.
    Changed UNDO of DELETE and UNDO of UPDATE to contain information about the original length of data on head block and also extent information
    This changes a lot of logic as now an insert of a row on a page may happen to any position (and not just to the first or next free)
    Use PAGE_COUNT to mark if an extent is the start of of a blob. (Needed for extent_to_bitmap_blocks())
    Added check_directory() for checking that directroy entries are correct.
    Added checking of row checksums when reading rows (with EXTRA_DEBUG)
    Added make_space_for_directory() and extend_directory() for doing expansion of directory
    Added get_rowpos_in_head_or_tail_page() to be able to store head/tail on original position in UNDO
    Added extent_to_bitmap_blocks() to be able to generate original bitmap blocks from UNDO entry
    Added _ma_update_at_original_place() for UNDO of DELETES
    Added row->min_length to hold minmum required space needed on head page
    Changed find_free_position() to use make_space_for_directory()
    Changed make_empty_page() to allow optional creation of directory entry
    Changed delete_head_or_tail() and _ma_apply_undo_row_isnert() to not copy pagecache block (speed optimization)
    Changed _ma_apply_redo_insert_row_head_or_tail() to be able to insert new row at any position on 'new' page
    Changed _ma_apply_undo_row_delete() and _ma_apply_undo_row_update() to put row in it's original position
    Ensure allocation of tail blocks are of at least MIN_TAIL_SIZE.
    Ensure we store pages in pinned pages even if read failed. (If not we will have pages pinned forever in page cache)
    Write original extent information in UNDO entry, not compacted ones (we need position to tails!)
    When setting BLOCKUSED_USED, don't clear other bits (we have to preserve BLOCKUSED_USE_ORG_BITMAP)
    Fixed som bugs in directory handling
    Fixed bug where we wrote wrong lsn to blob pages
    Added separate blob_buffer for fixing bug when updating row that had char/varchar that spanned several pages and also had blobs
    Ensure we call _ma_bitmap_flushable() also in case of errors
    When doing an update, first delete old entries, then search in bitmap for where to put new information
    Info->s -> share
    Rowid -> rowid
    More DBUG_ASSERT()

  storage/maria/ma_blockrec.h@1.24.1.1, 2007-12-30 22:40:00+02:00, monty@mysql.com +7 -1
    Added START_EXTENT_BIT and TAIL_PAGE_COUNT_MARKER
    Added _ma_bitmap_wait_or_flush() and _ma_bitmap_get_page_bits()

  storage/maria/ma_check.c@1.59.2.1, 2007-12-30 22:40:00+02:00, monty@mysql.com +32 -15
    Don't write extra empty line if there is no deleted blocks
    Ignore START_EXTENT_BIT's in page count
    Call _ma_fast_unlock_key_del() to free key_del link

  storage/maria/ma_close.c@1.27, 2007-12-30 22:40:00+02:00, monty@mysql.com +3 -0
    Ensure that used_key_del is 0. (If not, someone forgot to call _ma_unlock_key_del())

  storage/maria/ma_create.c@1.41, 2007-12-30 22:40:00+02:00, monty@mysql.com +2 -1
    Changed constant to macro

  storage/maria/ma_delete.c@1.22, 2007-12-30 22:40:00+02:00, monty@mysql.com +4 -1
    For deleted keys, log also position to row

  storage/maria/ma_extra.c@1.22.1.1, 2007-12-30 22:40:00+02:00, monty@mysql.com +11 -9
    Release blob buffer at maria_reset() if bigger than MARIA_SMALL_BLOB_BUFFER
    

  storage/maria/ma_key_recover.c@1.11.3.1, 2007-12-30 22:40:00+02:00, monty@mysql.com +22 -6
    Added bzero() of LSN that confused paged cache in case of uninitialized block
    Mark file crashed if applying of index changes fails
    Added calls to _ma_fast_unlock_key_del() for protection of shared key_del link.
    

  storage/maria/ma_locking.c@1.21.1.1, 2007-12-30 22:40:00+02:00, monty@mysql.com +21 -5
    Added usage of MARIA_FILE_OPEN_COUNT_OFFSET
    Added _ma_mark_file_crashed()

  storage/maria/ma_loghandler.c@1.95.2.1, 2007-12-30 22:40:00+02:00, monty@mysql.com +1 -1
    Fixed bug where we logged uninitialized memory

  storage/maria/ma_open.c@1.47.2.1, 2007-12-30 22:40:00+02:00, monty@mysql.com +8 -5
    Moved state->changed to be at start of state info on disk to allow one to easly mark files as crashed

  storage/maria/ma_page.c@1.22, 2007-12-30 22:40:00+02:00, monty@mysql.com +3 -6
    Disable 'dummy' checksumming of pages as this gave false warnings.
    (Need to investigate if this is ever needed)

  storage/maria/ma_pagecache.c@1.64.2.1, 2007-12-30 22:40:00+02:00, monty@mysql.com +2 -2
    Fixed wrong shift that caused Maria to crash on files > 4G

  storage/maria/ma_recovery.c@1.62.2.1, 2007-12-30 22:40:00+02:00, monty@mysql.com +51 -55
    In case of errors, start writing on new line if we where in %## %## printing mode (Made errors more readable)
    Changed global variable name from warnings -> recovery_warnings
    Use MARIA_FILE_CREATE_RENAME_LSN_OFFSET instead of constant
    Removed special handling of row position for deleted keys. Keys now always includes row positions
    _ma_apply_undo_row_delete() now gets page and row position
    Added check that we don't loop forever when handling undo's (in case of bug in undo chain)
    Print name of failed REDO/UNDO

  storage/maria/ma_recovery.h@1.13, 2007-12-30 22:40:00+02:00, monty@mysql.com +0 -1
    Removed old comment

  storage/maria/ma_static.c@1.12, 2007-12-30 22:40:00+02:00, monty@mysql.com +1 -1
    Chaned version number of Maria files to not accidently use old ones (becasue of change of ordering of status variables)
    
    

  storage/maria/ma_test2.c@1.33, 2007-12-30 22:40:00+02:00, monty@mysql.com +36 -21
    Added option -u to specify number of rows to update
    Changed old option -u to be -A, as for ma_test1
    Fixed bug in update of rows with blobs (before blobs was always reset to empty on update)
    First created blob is now of max blob length to ensure we have at least one big blob in the table

  storage/maria/ma_test_all.sh@1.18.1.1, 2007-12-30 22:40:00+02:00, monty@mysql.com +22 -3
    More tests

  storage/maria/ma_test_big.sh@1.1, 2007-12-30 22:40:01+02:00, monty@mysql.com +22 -0
    Testing of insert, update, delete, recovery and undo of rows with blobs
    Thanks to the random-ness of ma_test2 this is likely to find most bugs in the row handling
    
    

  storage/maria/ma_test_big.sh@1.0, 2007-12-30 22:40:01+02:00, monty@mysql.com +0 -0

  storage/maria/ma_test_recovery@1.20, 2007-12-30 22:40:01+02:00, monty@mysql.com +18 -6
    Changed tests to use bigger blobs (not just 1K)
    Added new tests that tests recovery of update with blobs
    Removed comparision of .MAD file as it's not guranteed that recovery from scratch gives identical data file as original update
    (compact_page() may be called at different times during normal execution and during REDO)
    

  storage/maria/ma_update.c@1.17, 2007-12-30 22:40:01+02:00, monty@mysql.com +4 -3
    Simplify code (changed * to if)

  storage/maria/maria_chk.c@1.36.2.1, 2007-12-30 22:40:01+02:00, monty@mysql.com +7 -7
    Make output more readable

  storage/maria/maria_def.h@1.56.2.1, 2007-12-30 22:40:01+02:00, monty@mysql.com +22 -12
    Changed 'changed' to int to prepare for more bits
    Added 2 more bytes to status information
    Added 'st_mara_row->min_length' for storing min length needed on head page
    Added 'st_mara_handler->blob_buff & blob_buff_size' for storing blobs
    Moved all tunning parameters into one block
    Added MARIA_SMALL_BLOB_BUFFER
    Added _ma_mark_file_crashed()

  storage/maria/ma_test_recovery.expected@1.16, 2007-12-30 22:40:01+02:00, monty@mysql.com +536 -72
    Updated results

  storage/myisam/mi_test2.c@1.43, 2007-12-30 22:40:01+02:00, monty@mysql.com +2 -2
    Fixed bug in update of rows with blobs (before blobs was always reset to empty on update)

ChangeSet@1.2476.808.1, 2007-12-30 21:32:07+01:00, guilhem@gbichot4.local +28 -0
  WL#3072 - Maria Recovery
  * to honour WAL we now force the whole log when flushing a bitmap page.
  * ability to intentionally crash in various places for recovery testing
  * bugfix (dirty pages list found in checkpoint record was ignored)
  * smaller checkpoint record
  * misc small cleanups and comments

  mysql-test/include/maria_empty_logs.inc@1.2, 2007-12-30 21:31:30+01:00, guilhem@gbichot4.local +41 -2
    maria-purge.test creates ~11 logs, remove them all

  mysql-test/r/maria-recovery-bitmap.result@1.2, 2007-12-30 21:31:30+01:00, guilhem@gbichot4.local +18 -0
    result is good; without the _ma_bitmap_get_log_address() call,
    we got
    check   error   Bitmap at 0 has pages reserved outside of data file length

  mysql-test/r/maria-recovery.result@1.6.1.1, 2007-12-30 21:31:30+01:00, guilhem@gbichot4.local +31 -0
    result update

  mysql-test/t/maria-recovery-bitmap.test@1.2, 2007-12-30 21:31:30+01:00, guilhem@gbichot4.local +0 -5
    enable test of "bitmap-flush should flush whole log otherwise
    corrupted data file (bitmap ahead of data pages)".

  mysql-test/t/maria-recovery.test@1.6.1.1, 2007-12-30 21:31:30+01:00, guilhem@gbichot4.local +29 -0
    test of checkpoint

  sql/sql_table.cc@1.445.1.2, 2007-12-30 21:31:30+01:00, guilhem@gbichot4.local +1 -0
    comment

  storage/maria/ha_maria.cc@1.63.1.1, 2007-12-30 21:31:30+01:00, guilhem@gbichot4.local +27 -12
    _ma_reenable_logging_for_table() now includes file->trn=0.
    At the end of repair() we don't need to re-enable logging, it is
    done already by caller (like copy_data_between_tables()); it sounds
    strange that this function could decide to re-enable, it should be
    up to caller who knows what other operations it plans. Removing this
    line led to assertion failure in maria_lock_database(F_UNLCK), fixed
    by removing the assertion: maria_lock_database()
    is here called in a context where F_UNLCK does not make the
    table visible to others so assertion is excessive, and external_lock()
    is already designed to honour the asserted condition.
    Ability to crash at the end of bulk insert when indices
    have been enabled.

  storage/maria/ma_bitmap.c@1.31.1.1, 2007-12-30 21:31:30+01:00, guilhem@gbichot4.local +48 -15
    Better use pagecache_file_init() than set pagecache callbacks directly;
    and a new function to set those callbacks for bitmap so that we can
    reuse it.
    _ma_bitmap_get_log_address() is a pagecache get_log_address callback
    which causes the whole log to be flushed when a bitmap page
    is flushed by the page cache. This was required by WAL.

  storage/maria/ma_blockrec.c@1.71, 2007-12-30 21:31:30+01:00, guilhem@gbichot4.local +35 -0
    get_log_address pagecache callback for data (non bitmap) pages:
    just reads the LSN from the page's content, like was hard-coded
    before in ma_pagecache.c.

  storage/maria/ma_blockrec.h@1.25, 2007-12-30 21:31:30+01:00, guilhem@gbichot4.local +4 -0
    functions which need to be exported

  storage/maria/ma_check.c@1.59.1.1, 2007-12-30 21:31:30+01:00, guilhem@gbichot4.local +47 -11
    create_new_data_handle() can be static.
    Ability to crash after rebuilding the index in OPTIMIZE,
    in REPAIR. my_lock() implemented already.

  storage/maria/ma_checkpoint.c@1.37, 2007-12-30 21:31:31+01:00, guilhem@gbichot4.local +14 -20
    As MARIA_SHARE* is now accessible to pagecache_collect_changed_blocks_LSN(),
    we don't need to store kfile/dfile descriptors in checkpoint record,
    2-byte-id of the table plus one byte to say if this is data or index
    file is enough. So we go from 4+4 bytes per table down to 2+1.

  storage/maria/ma_commit.c@1.7, 2007-12-30 21:31:31+01:00, guilhem@gbichot4.local +0 -23
    removing duplicate functions (see _ma_tmp_disable_logging_for_table())

  storage/maria/ma_extra.c@1.23, 2007-12-30 21:31:31+01:00, guilhem@gbichot4.local +0 -2
    Monty fixed

  storage/maria/ma_key_recover.c@1.11.2.1, 2007-12-30 21:31:31+01:00, guilhem@gbichot4.local +3 -0
    comment

  storage/maria/ma_locking.c@1.22, 2007-12-30 21:31:31+01:00, guilhem@gbichot4.local +0 -7
    Sometimes other code does funny things with maria_lock_database(),
    like ha_maria::repair() calling it at start and end without going
    through ha_maria::external_lock(). So it happens that maria_lock_database()
    is called with now_transactional!=born_transactional.

  storage/maria/ma_loghandler.c@1.95.1.1, 2007-12-30 21:31:31+01:00, guilhem@gbichot4.local +1 -1
    update to new prototype

  storage/maria/ma_open.c@1.47.1.1, 2007-12-30 21:32:05+01:00, guilhem@gbichot4.local +25 -33
    set_data|index_pagecache_callbacks() need to be exported as
    they are now called when disabling/enabling transactionality.

  storage/maria/ma_pagecache.c@1.64.1.1, 2007-12-30 21:32:05+01:00, guilhem@gbichot4.local +30 -30
    Removing PAGE_LSN_OFFSET, as much of the code relies on it being
    0 anyway (let's not give impression we can just change this constant).
    When flushing a page to disk, call the get_log_address callback to
    know up to which LSN the log should be flushed.
    As we now can access MARIA_SHARE* we can know share->id and store
    it into the checkpoint record; we thus go from 4 bytes per dirty page
    to 2+1.

  storage/maria/ma_pagecache.h@1.33.1.1, 2007-12-30 21:32:05+01:00, guilhem@gbichot4.local +7 -2
    get_log_address callback

  storage/maria/ma_panic.c@1.7.1.1, 2007-12-30 21:32:05+01:00, guilhem@gbichot4.local +9 -14
    No reason to reset pagecache callbacks in HA_PANIC_READ:
    all we do is reopen files if they were closed; callbacks should
    be in place already as 'info' exists; we just want to modify
    the file descriptors, not the full PAGECACHE_FILE structure.
    If we open data file and it was closed, share->bitmap.file needs
    to be set.
    Note that the modified code is disabled anyway.

  storage/maria/ma_recovery.c@1.62.1.1, 2007-12-30 21:32:05+01:00, guilhem@gbichot4.local +115 -48
    Checkpoint record does not contain kfile/dfile descriptors anymore
    so code can be simplified. Hash key in all_dirty_pages is 
    not made from file_descriptor & pageno anymore, but
    index_or_data & table-short-id & pageno.
    If a table's create_rename_lsn is higher than record's LSN,
    we skip the table and don't fail if it's corrupted (because the LSNs
    say that we don't have to look at this table).
    If a table is skipped (for example due to create_rename_lsn),
    its UNDOs still cause undo_lsn to advance; this is so that if later
    we notice the transaction has to rollback we fail (as table should
    not be skipped in this case).
    Fixing a bug: the dirty_pages list was never used, because
    the LSN below which it was used was the minimum rec_lsn of dirty pages!
    It is now the min(checkpoint_start_log_horizon, min(trn's rec_lsn)).
    When we disable/reenable transactionality, we modify pagecache
    callbacks (needed for example for get_log_address: changing
    share->page_type is not enough anymore).

  storage/maria/ma_write.c@1.27, 2007-12-30 21:32:05+01:00, guilhem@gbichot4.local +0 -4
    'records' and 'checksum' are protected: they are updated under
    log's mutex in write-hooks when UNDO is written.

  storage/maria/maria_chk.c@1.36.1.1, 2007-12-30 21:32:05+01:00, guilhem@gbichot4.local +3 -3
    remove use of duplicate functions.

  storage/maria/maria_def.h@1.56.1.1, 2007-12-30 21:32:05+01:00, guilhem@gbichot4.local +5 -4
    set_data|index_pagecache_callbacks() need to be exported;
    _ma_reenable_logging_for_table() changes to a real function.

  storage/maria/unittest/ma_pagecache_consist.c@1.17.1.1, 2007-12-30 21:32:05+01:00, guilhem@gbichot4.local +1 -1
    new prototype

  storage/maria/unittest/ma_pagecache_single.c@1.17.1.1, 2007-12-30 21:32:05+01:00, guilhem@gbichot4.local +1 -1
    new prototype

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.21.1.1, 2007-12-30 21:32:06+01:00, guilhem@gbichot4.local +2 -3
    new prototype

ChangeSet@1.2507, 2007-12-30 19:47:36+01:00, serg@janus.mylan +1 -0
  dbug/remove_function_from_trace.pl

  dbug/remove_function_from_trace.pl@1.1, 2007-12-30 19:47:33+01:00, serg@janus.mylan +26 -0
    New BitKeeper file ``dbug/remove_function_from_trace.pl''

  dbug/remove_function_from_trace.pl@1.0, 2007-12-30 19:47:33+01:00, serg@janus.mylan +0 -0

ChangeSet@1.2476.1.174, 2007-12-28 16:10:17+01:00, joerg@trift2. +1 -0
  scripts/make_binary_distribution.sh
      After-merge fix for bug#33536: The target to copy to is now called "$DEST".

  scripts/make_binary_distribution.sh@1.162.2.2, 2007-12-28 16:10:09+01:00, joerg@trift2. +1 -1
    After-merge fix for bug#33536: The target to copy to is now called "$DEST".

ChangeSet@1.2505, 2007-12-28 00:15:29+01:00, serg@janus.mylan +9 -0
  after merge

  BitKeeper/etc/ignore@1.265, 2007-12-28 00:15:24+01:00, serg@janus.mylan +1 -0
    Added libmysqld/sql_profile.cc to the ignore list

  include/mysql/plugin.h@1.42, 2007-12-28 00:15:23+01:00, serg@janus.mylan +4 -1
    move declarations after merge

  mysql-test/r/change_user.result@1.4, 2007-12-28 00:15:23+01:00, serg@janus.mylan +6 -0
    more tests

  mysql-test/t/change_user.test@1.3, 2007-12-28 00:15:23+01:00, serg@janus.mylan +2 -0
    more tests

  mysys/my_getopt.c@1.84, 2007-12-28 00:15:23+01:00, serg@janus.mylan +0 -2
    remove wrong code

  sql/lex.h@1.179, 2007-12-28 00:15:23+01:00, serg@janus.mylan +1 -2
    after merge

  sql/mysql_priv.h@1.533, 2007-12-28 00:15:23+01:00, serg@janus.mylan +0 -2
    after merge

  sql/set_var.cc@1.249, 2007-12-28 00:15:24+01:00, serg@janus.mylan +1 -9
    after merge

  storage/maria/ha_maria.cc@1.64, 2007-12-28 00:15:24+01:00, serg@janus.mylan +13 -17
    after merge

ChangeSet@1.1616.3131.1, 2007-12-27 19:51:06+01:00, joerg@trift2. +1 -0
  scripts/make_binary_distribution.sh:
  
  Fix the code to get the "libgcc" file name so that the failure of Intel's ICC
  to provide this information does not cause any problems.
  
  This fixes  bug#33536  Option "--print-libgcc-file" does not work with ICC compiler

  scripts/make_binary_distribution.sh@1.55.8.10, 2007-12-27 19:51:03+01:00, joerg@trift2. +6 -4
    The (old) code to get the "libgcc" file name does not really work when using Intel's ICC.
    ICC accepts the "--print-libgcc-file" option but ignores it, does not produce any output.
    
    However, ICC tricks automake into taking it for a GCC ("GXX" variable is set, see
    http://www.gnu.org/software/autoconf/manual/html_node/C_002b_002b-Compiler.html#C_002b_002b-Compiler
    and its discussion of the "AC_PROG_CXX" macro).
    
    There are two possible approaches:
    a) Check "$CC" or "$CXX" to tell ICC from GCC, and do not ask ICC for the "libgcc" file name.
    b) Just ask it, but protect that code so that its failure does not cause any damage.
    
    This patch takes the second route:
    1) Put the call "@CC@ ... --print-libgcc-file" into a pipeline, followed by "|| true",
       so that (for the shell semantics) the command cannot fail.
       (ICC will exit non-zero because it is not given a source file.)
    2) Explicitly redirect any error messages.
    3) Do not use the compiler's return code but rather the (non)empty variable to check success.
    4) Ensure that the contents really is a file before taking it as a file name.
    
    Item 1) is especially important when the tool gets a "set -e" (this happens in 5.1, currently)
    which would make the failing compiler call a fatal thing.
    
    This fixes  bug#33536  Option "--print-libgcc-file" does not work with ICC compiler

ChangeSet@1.2476.720.18, 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.1810.3562.11, 2007-12-24 17:42:13+03:00, kaa@polly.(none) +5 -0
  Fix for bug #33305: Test case in 'skip_grants' file need dynamic loading
                      to be compiled in
  
  The problem was that on a statically built server an attempt to create
  a UDF resulted in a different, but reasonable error ("Can't open shared
  library" instead of "UDFs are unavailable with the --skip-grant-tables
  option"), which caused a failure for the test case for bug #32020.
  
  Fixed by moving the test case for bug #32020 from skip_grants.test to a
  separate test to ensure that it is only run when the server is built
  with support for dynamically loaded libraries.

  mysql-test/r/skip_grants.result@1.10.1.2, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +0 -4
    Moved the test case for bug #32020 to a separate test.

  mysql-test/r/udf_skip_grants.result@1.1, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +5 -0
    Moved the test case for bug #32020 to a separate test.

  mysql-test/r/udf_skip_grants.result@1.0, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +0 -0

  mysql-test/t/skip_grants.test@1.6.1.8, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +0 -10
    Moved the test case for bug #32020 to a separate test.

  mysql-test/t/udf_skip_grants-master.opt@1.1, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +1 -0
    Moved the test case for bug #32020 to a separate test.

  mysql-test/t/udf_skip_grants-master.opt@1.0, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +0 -0

  mysql-test/t/udf_skip_grants.test@1.1, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +28 -0
    Moved the test case for bug #32020 to a separate test.

  mysql-test/t/udf_skip_grants.test@1.0, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +0 -0

ChangeSet@1.2476.720.17, 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.720.16, 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.2476.794.11, 2007-12-24 07:38:44+02:00, jani@dsl-vrkgw1-ff01c000-22.dsl.inet.fi +1 -0
  Added a missing file.

  storage/maria/unittest/ma_test_all-t@1.1, 2007-12-24 07:33:12+02:00, jani@dsl-vrkgw1-ff01c000-22.dsl.inet.fi +424 -0
    BitKeeper file /home/my/bk/mysql-maria/storage/maria/unittest/ma_test_all-t

  storage/maria/unittest/ma_test_all-t@1.0, 2007-12-24 07:33:12+02:00, jani@dsl-vrkgw1-ff01c000-22.dsl.inet.fi +0 -0

ChangeSet@1.1810.3571.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.3571.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.3574.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.807.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.3573.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.794.10, 2007-12-21 15:25:30+02:00, bell@desktop.sanja.is.com.ua +11 -0
  Parameter added to the log initializer to suppress unwanted
    error messages during unit tests.

  storage/maria/ma_loghandler.c@1.97, 2007-12-21 15:25:27+02:00, bell@desktop.sanja.is.com.ua +13 -8
    Parameter added to the log initializer to suppress unwanted
      error messages during unit tests.

  storage/maria/ma_loghandler.h@1.43, 2007-12-21 15:25:27+02:00, bell@desktop.sanja.is.com.ua +3 -2
    Parameter added to the log initializer to suppress unwanted
      error messages during unit tests.

  storage/maria/unittest/ma_test_loghandler-t.c@1.28, 2007-12-21 15:25:27+02:00, bell@desktop.sanja.is.com.ua +2 -1
    Parameter added to the log initializer to suppress unwanted
      error messages during unit tests.

  storage/maria/unittest/ma_test_loghandler_first_lsn-t.c@1.11, 2007-12-21 15:25:27+02:00, bell@desktop.sanja.is.com.ua +2 -1
    Parameter added to the log initializer to suppress unwanted
      error messages during unit tests.

  storage/maria/unittest/ma_test_loghandler_max_lsn-t.c@1.12, 2007-12-21 15:25:27+02:00, bell@desktop.sanja.is.com.ua +2 -1
    Parameter added to the log initializer to suppress unwanted
      error messages during unit tests.

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.25, 2007-12-21 15:25:27+02:00, bell@desktop.sanja.is.com.ua +2 -2
    Parameter added to the log initializer to suppress unwanted
      error messages during unit tests.

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.25, 2007-12-21 15:25:27+02:00, bell@desktop.sanja.is.com.ua +2 -1
    Parameter added to the log initializer to suppress unwanted
      error messages during unit tests.

  storage/maria/unittest/ma_test_loghandler_noflush-t.c@1.11, 2007-12-21 15:25:27+02:00, bell@desktop.sanja.is.com.ua +2 -1
    Parameter added to the log initializer to suppress unwanted
      error messages during unit tests.

  storage/maria/unittest/ma_test_loghandler_nologs-t.c@1.2, 2007-12-21 15:25:27+02:00, bell@desktop.sanja.is.com.ua +4 -2
    Parameter added to the log initializer to suppress unwanted
      error messages during unit tests.

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.23, 2007-12-21 15:25:27+02:00, bell@desktop.sanja.is.com.ua +2 -1
    Parameter added to the log initializer to suppress unwanted
      error messages during unit tests.

  storage/maria/unittest/ma_test_loghandler_purge-t.c@1.10, 2007-12-21 15:25:27+02:00, bell@desktop.sanja.is.com.ua +2 -1
    Parameter added to the log initializer to suppress unwanted
      error messages during unit tests.

ChangeSet@1.2476.720.14, 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.3567.2, 2007-12-21 12:44:24+02:00, gkodinov@macbook.gmz +6 -0
  Bug #33256: CREATE ... SELECT creates obsolete table 
   w/ Field_date instead of Field_newdate
    
  Field_date was still used in temp table creation.
  Fixed by using Field_newdate consistently throughout the server
  except when reading tables defined with older MySQL version.
  No test suite is possible because both Field_date and Field_newdate
  return the same values in all the metadata calls. 

  mysql-test/r/type_decimal.result@1.38.1.11, 2007-12-21 12:44:21+02:00, gkodinov@macbook.gmz +0 -4
    Bug #33256: removed redundant warnings

  sql/field.h@1.153.36.1, 2007-12-21 12:44:21+02:00, gkodinov@macbook.gmz +4 -0
    Bug #33256: Add a constructor similar to Field_date::Field_date()

  sql/item.cc@1.113.1.183, 2007-12-21 12:44:21+02:00, gkodinov@macbook.gmz +1 -1
    Bug #33256: Use Field_newdate instead of Field_date 
    for all temp tables and CREATE .. SELECT

  sql/item_sum.cc@1.170.1.48, 2007-12-21 12:44:21+02:00, gkodinov@macbook.gmz +1 -1
    Bug #33256: Use Field_newdate instead of Field_date 
    for all temp tables and CREATE .. SELECT

  sql/item_timefunc.cc@1.100.40.1, 2007-12-21 12:44:21+02:00, gkodinov@macbook.gmz +1 -1
    Bug #33256: Use Field_newdate instead of Field_date 
    for all temp tables and CREATE .. SELECT

  sql/item_timefunc.h@1.63.9.1, 2007-12-21 12:44:21+02:00, gkodinov@macbook.gmz +3 -3
    Bug #33256: Use Field_newdate instead of Field_date 
    for all temp tables and CREATE .. SELECT

ChangeSet@1.1810.3566.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.3566.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.3572.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.3570.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.86.1.2, 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.583.1.103, 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.5.1.7, 2007-12-20 23:57:51+01:00, serg@janus.mylan +9 -2
    gcc bug workaround

ChangeSet@1.2476.806.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.720.12, 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.1810.3569.1, 2007-12-20 21:37:21+01:00, df@pippilotta.erinye.com +1 -0
  BUG#33057 mysql command line client slows down and uses 100% CPU when restoring dump

  client/mysql.cc@1.199.34.1, 2007-12-20 21:37:19+01:00, df@pippilotta.erinye.com +1 -3
    BUG#33057, avoid calling strlen() *for every single character* in the client's input

ChangeSet@1.2476.766.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.583.121.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.556.2, 2007-12-20 12:23:35-08:00, brian@zim.(none) +2 -0
  client_priv.h:
    Removed dead option
  mysqlslap.c:
    Updates from Paul for help.
    Removed dead option

  client/client_priv.h@1.74.3.1, 2007-12-20 12:18:49-08:00, brian@zim.(none) +0 -1
    Removed dead option

  client/mysqlslap.c@1.62.1.2, 2007-12-20 12:18:18-08:00, brian@zim.(none) +24 -25
    Updates from Paul for help.
    Removed dead option

ChangeSet@1.2476.766.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.104.1.13, 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.315.1.17, 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.244.1.38, 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.541.1.37, 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.438.4.4, 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.437.38.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.154.1.1, 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.98.4.2, 2007-12-20 21:16:52+03:00, kostja@bodhi.(none) +2 -2
    create_handler_files -> ha_create_handler_files

ChangeSet@1.1810.3568.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.794.8, 2007-12-20 14:10:07+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +6 -0
  Fixes to merge.

  mysql-test/r/maria.result@1.30, 2007-12-20 14:10:01+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -2
    Fixed result file. The results will be fixed by Sergei's patch.

  mysql-test/t/variables.test@1.88, 2007-12-20 14:10:01+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -2
    Fixed result file. The results will be fixed by Sergei's patch.

  mysys/my_getopt.c@1.83, 2007-12-20 14:10:01+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +22 -20
    Fixed a problem with manual merge.

  sql/set_var.cc@1.247, 2007-12-20 14:10:01+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +13 -6
    Fixed a problem with manual merge.

  sql/set_var.h@1.97, 2007-12-20 14:10:01+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +18 -0
    Fixed a problem with manual merge.

  sql/sql_plugin.cc@1.81, 2007-12-20 14:10:01+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +0 -1
    Removed unneccessary function call. This was forgotten from
    a previous patch.

ChangeSet@1.2476.505.54, 2007-12-20 12:24:03+02:00, bell@desktop.sanja.is.com.ua +14 -0
  Write failure callback added.

  storage/maria/ma_bitmap.c@1.32, 2007-12-20 12:23:59+02:00, bell@desktop.sanja.is.com.ua +1 -0
    Write failure callback added.

  storage/maria/ma_check.c@1.60, 2007-12-20 12:23:59+02:00, bell@desktop.sanja.is.com.ua +4 -2
    Write failure callback added.

  storage/maria/ma_key_recover.c@1.11.1.1, 2007-12-20 12:23:59+02:00, bell@desktop.sanja.is.com.ua +1 -0
    Initialization fixed (by Monty)

  storage/maria/ma_loghandler.c@1.96, 2007-12-20 12:23:59+02:00, bell@desktop.sanja.is.com.ua +16 -4
    Write failure callback added.

  storage/maria/ma_open.c@1.48, 2007-12-20 12:23:59+02:00, bell@desktop.sanja.is.com.ua +1 -0
    Write failure callback added.

  storage/maria/ma_pagecache.c@1.65, 2007-12-20 12:23:59+02:00, bell@desktop.sanja.is.com.ua +10 -2
    Write failure callback added.

  storage/maria/ma_pagecache.h@1.34, 2007-12-20 12:23:59+02:00, bell@desktop.sanja.is.com.ua +3 -1
    Write failure callback added.

  storage/maria/ma_pagecrc.c@1.3, 2007-12-20 12:24:00+02:00, bell@desktop.sanja.is.com.ua +10 -0
    Write failure callback added.

  storage/maria/ma_panic.c@1.8, 2007-12-20 12:24:00+02:00, bell@desktop.sanja.is.com.ua +4 -2
    Write failure callback added.

  storage/maria/maria_chk.c@1.37, 2007-12-20 12:24:00+02:00, bell@desktop.sanja.is.com.ua +2 -1
    Write failure callback added.

  storage/maria/maria_def.h@1.57, 2007-12-20 12:24:00+02:00, bell@desktop.sanja.is.com.ua +2 -0
    Write failure callback added.

  storage/maria/unittest/ma_pagecache_consist.c@1.18, 2007-12-20 12:24:00+02:00, bell@desktop.sanja.is.com.ua +17 -4
    Write failure callback added.

  storage/maria/unittest/ma_pagecache_single.c@1.18, 2007-12-20 12:24:00+02:00, bell@desktop.sanja.is.com.ua +16 -4
    Write failure callback added.

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.22, 2007-12-20 12:24:00+02:00, bell@desktop.sanja.is.com.ua +17 -4
    Write failure callback added.

ChangeSet@1.1810.3549.2, 2007-12-20 10:58:21+01:00, mhansson@linux-st28.site +1 -0
  Bug#32848: Data type conversion bug in union subselects in MySQL 5.0.38 
  
  Warnings elimination

  sql/sql_select.cc@1.312.193.2, 2007-12-20 10:58:19+01:00, mhansson@linux-st28.site +1 -1
    Bug#32848: Warnings elimination

ChangeSet@1.2476.756.3, 2007-12-20 08:15:34+01:00, tnurnberg@mysql.com +1 -0
  Bug#31990: MINUTE() and SECOND() return bogus results when used on a DATE
  
  post-merge fixes

  mysql-test/r/type_date.result@1.29.1.2, 2007-12-20 08:15:32+01:00, tnurnberg@mysql.com +5 -0
    post-merge fixes: test results

ChangeSet@1.2476.803.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.2.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.3566.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.790.7, 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.104.1.12, 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.244.1.37, 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.541.1.36, 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.437.39.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.766.14, 2007-12-19 14:16:10+01:00, serg@janus.mylan +1 -0
  SHOW_VAR arrays are null-terminated :-[]

  sql/mysqld.cc@1.583.121.13, 2007-12-19 14:16:07+01:00, serg@janus.mylan +5 -3
    SHOW_VAR arrays are null-terminated :-[]

ChangeSet@1.2476.766.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.583.121.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.505.53, 2007-12-19 00:20:25+01:00, serg@janus.mylan +1 -0
  typo fixed

  storage/maria/ma_recovery.c@1.63, 2007-12-19 00:20:22+01:00, serg@janus.mylan +1 -1
    typo fixed

ChangeSet@1.2476.505.52, 2007-12-18 23:22:55+01:00, serg@janus.mylan +8 -0
  solaris fixes

  include/lf.h@1.15, 2007-12-18 23:22:50+01:00, serg@janus.mylan +4 -4
    Forte fixes

  storage/maria/lockman.c@1.18, 2007-12-18 23:22:50+01:00, serg@janus.mylan +4 -4
    solaris fixes

  storage/maria/lockman.h@1.7, 2007-12-18 23:22:50+01:00, serg@janus.mylan +2 -2
    solaris fixes

  storage/maria/tablockman.c@1.10, 2007-12-18 23:22:50+01:00, serg@janus.mylan +3 -3
    solaris fixes

  storage/maria/tablockman.h@1.6, 2007-12-18 23:22:50+01:00, serg@janus.mylan +2 -2
    solaris fixes

  storage/maria/unittest/lockman-t.c@1.14, 2007-12-18 23:22:50+01:00, serg@janus.mylan +1 -1
    solaris fixes

  storage/maria/unittest/lockman1-t.c@1.6, 2007-12-18 23:22:50+01:00, serg@janus.mylan +1 -1
    solaris fixes

  storage/maria/unittest/lockman2-t.c@1.9, 2007-12-18 23:22:50+01:00, serg@janus.mylan +1 -1
    solaris fixes

ChangeSet@1.2476.794.7, 2007-12-18 23:55:49+02:00, jani@hynda.mysql.fi +18 -0
  - Clean up function for my_uuid()
  - Merge fixes
  - "make test" for maria
  - Replaced ma_test_all with a perl version,
    which now can be run in unittest mode.

  BitKeeper/deleted/.del-unit.pl@1.1, 2007-12-18 23:55:48+02:00, jani@hynda.mysql.fi +109 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/unit.pl

  BitKeeper/deleted/.del-unit.pl@1.0, 2007-12-18 23:55:48+02:00, jani@hynda.mysql.fi +0 -0

  include/my_sys.h@1.226, 2007-12-18 23:55:46+02:00, jani@hynda.mysql.fi +1 -0
    Added clean up function for my_uuid()

  mysql-test/r/create.result@1.160, 2007-12-18 23:55:46+02:00, jani@hynda.mysql.fi +2 -2
    Fixed result file.

  mysql-test/r/maria-big.result@1.3, 2007-12-18 23:55:46+02:00, jani@hynda.mysql.fi +1 -1
    Changed not to get a warning.

  mysql-test/r/maria-connect.result@1.4, 2007-12-18 23:55:46+02:00, jani@hynda.mysql.fi +1 -1
    Not to get a warning.

  mysql-test/r/maria-recovery.result@1.7, 2007-12-18 23:55:46+02:00, jani@hynda.mysql.fi +1 -1
    Not to get a warning.

  mysql-test/r/maria.result@1.29, 2007-12-18 23:55:46+02:00, jani@hynda.mysql.fi +6 -3
    Fixed result file. Added test for warning on log file.

  mysql-test/r/ps_maria.result@1.9, 2007-12-18 23:55:46+02:00, jani@hynda.mysql.fi +10 -9
    Fixed result file. New bit was added to source.

  mysql-test/t/maria-big.test@1.3, 2007-12-18 23:55:47+02:00, jani@hynda.mysql.fi +1 -1
    To avoid a warning.

  mysql-test/t/maria-connect.test@1.4, 2007-12-18 23:55:47+02:00, jani@hynda.mysql.fi +1 -1
    To avoid a warning.

  mysql-test/t/maria-recovery.test@1.7, 2007-12-18 23:55:47+02:00, jani@hynda.mysql.fi +1 -1
    To avoid a warning.

  mysql-test/t/maria.test@1.25, 2007-12-18 23:55:47+02:00, jani@hynda.mysql.fi +8 -1
    To avoid a warning.

  mysql-test/t/ps_maria.test@1.5, 2007-12-18 23:55:47+02:00, jani@hynda.mysql.fi +1 -1
    To avoid a warning.

  mysys/my_uuid.c@1.3, 2007-12-18 23:55:47+02:00, jani@hynda.mysql.fi +10 -0
    Added clean up function for my_uuid()

  sql/mysqld.cc@1.613, 2007-12-18 23:55:47+02:00, jani@hynda.mysql.fi +2 -3
    Manual merge.

  storage/maria/Makefile.am@1.24, 2007-12-18 23:55:48+02:00, jani@hynda.mysql.fi +8 -0
    Added "make test" for maria.

  storage/maria/ma_key_recover.c@1.12, 2007-12-18 23:55:48+02:00, jani@hynda.mysql.fi +1 -0
    Fix for maria_recovery

  storage/maria/ma_test_all.sh@1.19, 2007-12-18 23:55:48+02:00, jani@hynda.mysql.fi +3 -277
    Deprecated file. Functionality moved to
    unittest/ma_test_all-t

ChangeSet@1.2476.790.6, 2007-12-19 00:36:20+03:00, kostja@bodhi.(none) +1 -0
  Sort class handler public declarations. 

  sql/handler.h@1.244.1.36, 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.720.10, 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.790.4, 2007-12-18 15:47:22+03:00, kostja@vajra.(none) +1 -0
  Consistently use doxygen comments in class handler.

  sql/handler.h@1.244.1.35, 2007-12-18 15:47:19+03:00, kostja@vajra.(none) +92 -114
    Consistently use doxygen comments in class handler.

ChangeSet@1.1810.3480.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.2476.505.50, 2007-12-18 03:21:32+02:00, monty@mysql.com +33 -0
  Fixed several bugs in page CRC handling
  - Ignore CRC errors in REDO for potential new pages
  - Ignore CRC errors when repairing tables
  - Don't do readcheck callback on read error
  - Set my_errno to HA_ERR_WRONG_CRC if we find page with wrong CRC
  - Check index page for length before calculating CRC to catch bad pages
  Fixed bugs where we used wrong file descriptor to read/write bitmaps
  Fixed wrong hash key in 'files_in_flush'
  Fixed wrong lock method when writing bitmap
  Fixed some wrong printf statements in check/repair that caused core dumps
  Fixed argument to translog_page_validator that cause reading of log files to fail
  Store number of bytes used for delete-linked key pages to be able to use standard index CRC for deleted key pages.
  Use fast 'dummy' pagecheck callbacks for temporary tables
  Don't die silently if flush finds pinned pages
  Give error (for now) if one tries to create a transactional table with fulltext or spatial keys
  Removed some not needed calls to pagecache_file_init()
  Added checking of pagecache checksums to ma_test1 and ma_test2
  More DBUG
  Fixed some DBUG_PRINT to be in line with rest of the code

  include/my_base.h@1.103.2.1, 2007-12-18 03:21:29+02:00, monty@mysql.com +3 -1
    Added HA_ERR_INTERNAL_ERROR (used for flush with pinned pages) and HA_ERR_WRONG_CRC

  mysql-test/r/maria.result@1.26.1.1, 2007-12-18 03:21:29+02:00, monty@mysql.com +8 -1
    Added TRANSACTIONAL=0 when testing with fulltext keys
    Added test that verifies we can't yet create transactional test with fulltext or spatial keys

  mysql-test/r/ps_maria.result@1.8, 2007-12-18 03:21:29+02:00, monty@mysql.com +1 -1
    Added TRANSACTIONAL=0 when testing with fulltext keys

  mysql-test/r/binlog_unsafe.result@1.5.1.1, 2007-12-18 03:21:29+02:00, monty@mysql.com +1 -0
    Added missing DROP VIEW statement

  mysql-test/t/binlog_unsafe.test@1.4, 2007-12-18 03:21:29+02:00, monty@mysql.com +1 -2
    Added missing DROP VIEW statement

  mysql-test/t/maria.test@1.24, 2007-12-18 03:21:29+02:00, monty@mysql.com +13 -1
    Added TRANSACTIONAL=0 when testing with fulltext keys
    Added test that verifies we can't yet create transactional test with fulltext or spatial keys

  mysql-test/t/ps_maria.test@1.4, 2007-12-18 03:21:29+02:00, monty@mysql.com +1 -1
    Added TRANSACTIONAL=0 when testing with fulltext keys

  mysys/my_fopen.c@1.21, 2007-12-18 03:21:30+02:00, monty@mysql.com +1 -1
    Fd: -> fd:

  mysys/my_handler.c@1.34, 2007-12-18 03:21:30+02:00, monty@mysql.com +3 -2
    Added new error messages

  mysys/my_lock.c@1.20, 2007-12-18 03:21:30+02:00, monty@mysql.com +1 -1
    Fd: -> fd:

  mysys/my_pread.c@1.23, 2007-12-18 03:21:30+02:00, monty@mysql.com +2 -2
    Fd: -> fd:

  mysys/my_read.c@1.22, 2007-12-18 03:21:30+02:00, monty@mysql.com +1 -1
    Fd: -> fd:

  mysys/my_seek.c@1.25, 2007-12-18 03:21:30+02:00, monty@mysql.com +2 -2
    Fd: -> fd:

  mysys/my_sync.c@1.10, 2007-12-18 03:21:30+02:00, monty@mysql.com +1 -1
    Fd: -> fd:

  mysys/my_write.c@1.16.1.1, 2007-12-18 03:21:30+02:00, monty@mysql.com +1 -1
    Fd: -> fd:

  sql/mysqld.cc@1.610.1.1, 2007-12-18 03:21:30+02:00, monty@mysql.com +1 -1
    Fixed wrong argument to my_uuid_init()

  sql/sql_plugin.cc@1.73.1.3, 2007-12-18 03:21:30+02:00, monty@mysql.com +1 -1
    Unified DBUG_PRINT (for convert-dbug-for-diff)

  storage/maria/ma_bitmap.c@1.31, 2007-12-18 03:21:30+02:00, monty@mysql.com +31 -7
    Fixed wrong lock method when writing bitmap
    Fixed valgrind error
    Use fast  'dummy' pagecheck callbacks for temporary tables
    Faster bitmap handling for non transational tables

  storage/maria/ma_blockrec.c@1.70, 2007-12-18 03:21:30+02:00, monty@mysql.com +9 -8
    Fixed that bitmap reading is done with the correct filehandle
    Handle reading of pages with wrong CRC when page contect doesn't matter
    Use the page buffer also when we get WRONG CRC or FILE_TOO_SHORT. (Faster and fixed a couple of bugs)

  storage/maria/ma_check.c@1.59, 2007-12-18 03:21:30+02:00, monty@mysql.com +33 -18
    Split long strings for readablity
    Fixed some wrong printf statements that caused core dumps
    Use bitmap.file for bitmaps
    Ignore pages with wrong CRC
    

  storage/maria/ma_close.c@1.26, 2007-12-18 03:21:30+02:00, monty@mysql.com +4 -1
    More DBUG_PRINT

  storage/maria/ma_create.c@1.40, 2007-12-18 03:21:30+02:00, monty@mysql.com +19 -14
    Give error (for now) if one tries to create a crash safe table with fulltext or spatial keys

  storage/maria/ma_key_recover.c@1.11, 2007-12-18 03:21:30+02:00, monty@mysql.com +15 -9
    Ignore HA_ERR_WRONG_CRC for new pages
    info->s  ->  share
    Store number of bytes used for delete-linked key pages to be able to use standard index CRC for deleted key pages.

  storage/maria/ma_loghandler.c@1.95, 2007-12-18 03:21:30+02:00, monty@mysql.com +1 -1
    Fixed argument to translog_page_validator()

  storage/maria/ma_open.c@1.47, 2007-12-18 03:21:30+02:00, monty@mysql.com +67 -40
    Removed old VMS specific code
    Added function to setup pagecache callbacks
    Moved code around to set 'share->temporary' early
    Removed some not needed calls to pagecache_file_init()

  storage/maria/ma_page.c@1.21, 2007-12-18 03:21:30+02:00, monty@mysql.com +1 -0
    Store number of bytes used for delete-linked key pages to be able to use standard index CRC for deleted key pages.

  storage/maria/ma_pagecache.c@1.64, 2007-12-18 03:21:30+02:00, monty@mysql.com +37 -24
    Don't do readcheck callback on read error
    Reset PCBLOCK_ERROR in pagecache_unlock_by_link() if we write page
    Set my_errno to HA_ER_INTERNAL_ERROR if flush() finds pinned pages
    Don't die silently if flush finds pinned pages.
    Use correct file descriptor when flushing pages
    Fixed wrong hash key in 'files_in_flush';  This must be the file descriptor, not the PAGECACHE_FILE as there may be several PAGECACHE_FILE for same file descriptor
    More DBUG_PRINT

  storage/maria/ma_pagecrc.c@1.2, 2007-12-18 03:21:30+02:00, monty@mysql.com +70 -31
    Removed inline from not tiny static function
    Set my_errno to HA_ERR_WRONG_CRC if we find page with wrong CRC
    (Otherwise my_errno may be 0, and a lot of other code will be confused)
    CRCerror -> error (to keep code uniform)
    Print crc with %lu, as in my_checksum()
    uchar* -> uchar *
    Check index page for length before calculating CRC to catch bad pages
    Added 'dummy' crc_check and filler functions that are used for temporary tables

  storage/maria/ma_recovery.c@1.62, 2007-12-18 03:21:30+02:00, monty@mysql.com +29 -9
    More DBUG
    More message to users to give information what phase failed
    Better error message if recovery failed

  storage/maria/ma_test1.c@1.34, 2007-12-18 03:21:30+02:00, monty@mysql.com +1 -1
    Added checking of page checksums (combined with 'c' to not have to add more test runs)

  storage/maria/ma_test2.c@1.32, 2007-12-18 03:21:30+02:00, monty@mysql.com +1 -1
    Added checking of page checksums (combined with 'c' to not have to add more test runs)

  storage/maria/maria_chk.c@1.36, 2007-12-18 03:21:30+02:00, monty@mysql.com +2 -2
    Fixed wrong argument to _ma_check_print_error()

  storage/maria/maria_def.h@1.56, 2007-12-18 03:21:31+02:00, monty@mysql.com +19 -10
    Added format information to _ma_check_print_xxxx functions
    uchar* -> uchar *

ChangeSet@1.2476.798.3, 2007-12-17 20:33:27+01:00, serg@janus.mylan +4 -0
  maria_page_checksum variable

  include/maria.h@1.23, 2007-12-17 20:33:23+01:00, serg@janus.mylan +2 -2
    maria_page_checksum variable

  mysql-test/r/maria.result@1.27, 2007-12-17 20:33:23+01:00, serg@janus.mylan +1 -0
    maria_page_checksum variable

  storage/maria/ha_maria.cc@1.60.1.1, 2007-12-17 20:33:24+01:00, serg@janus.mylan +7 -1
    maria_page_checksum variable

  storage/maria/ma_static.c@1.11, 2007-12-17 20:33:24+01:00, serg@janus.mylan +1 -1
    maria_page_checksum variable

ChangeSet@1.2476.798.2, 2007-12-17 19:22:04+01:00, serg@janus.mylan +2 -0
  move HA_OPTIONS_xxx where they belong

  include/my_base.h@1.103.1.1, 2007-12-17 19:22:00+01:00, serg@janus.mylan +4 -2
    move HA_OPTIONS_xxx where they belong

  sql/handler.h@1.258.2.1, 2007-12-17 19:22:00+01:00, serg@janus.mylan +0 -2
    move HA_OPTIONS_xxx where they belong

ChangeSet@1.1810.3564.3, 2007-12-17 18:56:39+02:00, gkodinov@magare.gmz +2 -0
  Bug #19390: Test 'rpl_trigger' fails, might be random
  
  The checks in the test for bug #12480 were too wide and
  made the test to depend on the procedures and triggers
  present in the server.
  Corrected the test to check only for the procedure and 
  trigger it creates.

  mysql-test/r/rpl_trigger.result@1.4.1.8, 2007-12-17 18:56:38+02:00, gkodinov@magare.gmz +8 -4
    Bug #19390: corrected the test to check for its procedure only

  mysql-test/t/rpl_trigger.test@1.4.1.7, 2007-12-17 18:56:38+02:00, gkodinov@magare.gmz +8 -4
    Bug #19390: corrected the test to check for its procedure only

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.799.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_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

  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

  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.1616.3125.3, 2007-12-17 12:09:21+01:00, tnurnberg@mysql.com +1 -0
  Bug#31752: check strmake() bounds
  
  fix test program

  client/mysqltest.c@1.92.21.69, 2007-12-17 12:09:21+01:00, tnurnberg@mysql.com +2 -2
    fix buffer off-by-ones in test program

ChangeSet@1.2476.797.2, 2007-12-17 10:43:19+01:00, tnurnberg@mysql.com +1 -0
  Bug#31752: check strmake() bounds
  
  build fixes

  strings/strmake.c@1.11, 2007-12-17 10:43:18+01:00, tnurnberg@mysql.com +1 -1
    build fix

ChangeSet@1.2476.794.4, 2007-12-17 10:54:27+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -0
  Removed wrong patch. SELECT UUID() crashed the server due to
  uninitialized mutex lock.

  sql/mysqld.cc@1.609.1.2, 2007-12-17 10:54:23+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +3 -1
    Removed wrong patch. SELECT UUID() crashed the server due to
    uninitialized mutex lock.

ChangeSet@1.1616.3130.1, 2007-12-17 06:13:26+01:00, tnurnberg@mysql.com +1 -0
  Bug#32350: mysqldump should show more version information in output
  
  show version of mysqldump, release of server et al., and version of
  current server in mysqldumps.

  client/mysqldump.c@1.143.16.1, 2007-12-17 06:13:25+01:00, tnurnberg@mysql.com +3 -1
    show version of mysqldump, release of server et al., and version of
    current server in mysqldumps.

ChangeSet@1.2476.505.48, 2007-12-17 01:44:35+02:00, monty@mysql.com +1 -0
  Fixed bug when comparing row types to see if file format has changed

  storage/maria/ha_maria.cc@1.62, 2007-12-17 01:44:32+02:00, monty@mysql.com +5 -4
    Fixed bug when comparing row types to see if file format has changed

ChangeSet@1.2476.795.1, 2007-12-17 01:17:37+02:00, monty@mysql.com +40 -0
  Fixed bug in undo_key_delete; Caused crashed key files in recovery
  Maria is now used for internal temporary tables in MySQL
  Better usage of VARCHAR and long strings in temporary tables
  Use packed fields if BLOCK_RECORD is used
  null_bytes are not anymore stored in a separate field
  New interface to remember and restore scan position
  Fixed bugs in unique handling
  Don't sync Maria temporary tables
  Lock control file while it's used to stop several processes from using it
  Changed value of MA_DONT_OVERWRITE_FILE as it collided with MY_SYNC_DIR
  Split MY_DONT_WAIT into MY_NO_WAIT and MY_SHORT_WAIT (for my_lock())
  Added MY_FORCE_LOCK

  include/my_sys.h@1.223.1.1, 2007-12-17 01:15:50+02:00, monty@mysql.com +4 -2
    Changed value of MA_DONT_OVERWRITE_FILE as it collided with MY_SYNC_DIR
    Split MY_DONT_WAIT into MY_NO_WAIT and MY_SHORT_WAIT (for my_lock())
    Added MY_FORCE_LOCK

  include/myisam.h@1.88.1.1, 2007-12-17 01:15:50+02:00, monty@mysql.com +1 -1
    Make MyISAM columndef compile time compatible with Maria

  mysql-test/lib/mtr_process.pl@1.79, 2007-12-17 01:15:50+02:00, monty@mysql.com +0 -6
    Removed confusing warning (It's common that there is a lot of other files than pid files)

  mysql-test/mysql-test-run.pl@1.319.1.1, 2007-12-17 01:15:50+02:00, monty@mysql.com +2 -0
    Added --sync-frm to speed up tests

  mysql-test/r/maria-recovery.result@1.4.1.1, 2007-12-17 01:15:50+02:00, monty@mysql.com +1 -0
    Updated results from wrong push

  mysql-test/suite/rpl/t/rpl_innodb_bug28430.test@1.5.3.1, 2007-12-17 01:15:51+02:00, monty@mysql.com +1 -0
    Marked test as --big

  mysys/my_lock.c@1.19, 2007-12-17 01:15:51+02:00, monty@mysql.com +9 -3
    If MY_FORCE_LOCK is given, use locking even if my_disable_locking is given
    If MY_NO_WAIT is given, return at once if lock is occupied
    If MY_SHORT_WAIT is given, wait some time for lock before returning (This was called MY_DONT_WAIT before)

  mysys/my_thr_init.c@1.62, 2007-12-17 01:15:51+02:00, monty@mysql.com +2 -2
    Fix that we don't give name to thread before it's properly initied

  sql/handler.cc@1.323.1.1, 2007-12-17 01:15:51+02:00, monty@mysql.com +1 -1
    Added myisam.h

  sql/handler.h@1.258.1.1, 2007-12-17 01:15:51+02:00, monty@mysql.com +8 -4
    Changes to use Maria for internal temporary tables
    Removed not needed argument to restart_rnd_next()
    Added function remember_rnd_pos()

  sql/my_lock.c@1.13, 2007-12-17 01:15:51+02:00, monty@mysql.com +29 -16
    If MY_FORCE_LOCK is given, use locking even if my_disable_locking is given
    If MY_NO_WAIT is given, return at once if lock is occupied
    If MY_SHORT_WAIT is given, wait some time for lock before returning (This was called MY_DONT_WAIT before)

  sql/mysql_priv.h@1.529.1.1, 2007-12-17 01:15:51+02:00, monty@mysql.com +1 -0
    Added maria_hton

  sql/sql_class.h@1.399.2.4, 2007-12-17 01:15:52+02:00, monty@mysql.com +8 -1
    Changes to use Maria for internal temporary tables

  sql/sql_select.cc@1.544.1.1, 2007-12-17 01:15:52+02:00, monty@mysql.com +241 -62
    Changes to use Maria for internal temporary tables
    Temporary tables didn't properly switch to dynamic row format if long strings was used
    Better usage of VARCHAR in temporary tables
    Use new interface to restart scan in duplicate removal

  sql/sql_select.h@1.128.2.1, 2007-12-17 01:15:52+02:00, monty@mysql.com +1 -1
    Changes to use Maria for internal temporary tables

  sql/sql_show.cc@1.440.1.1, 2007-12-17 01:17:10+02:00, monty@mysql.com +125 -125
    Changes to use Maria for internal temporary tables
    Removed all end space

  sql/sql_table.cc@1.445.1.1, 2007-12-17 01:17:10+02:00, monty@mysql.com +4 -4
    Set HA_OPTION_PACK_RECORD if we are not using default or static record

  sql/sql_union.cc@1.153.1.1, 2007-12-17 01:17:10+02:00, monty@mysql.com +2 -2
    If MY_FORCE_LOCK is given, use locking even if my_disable_locking is given
    If MY_NO_WAIT is given, return at once if lock is occupied
    If MY_SHORT_WAIT is given, wait some time for lock before returning (This was called MY_DONT_WAIT before)

  sql/sql_update.cc@1.239.14.1, 2007-12-17 01:17:10+02:00, monty@mysql.com +1 -1
    If MY_FORCE_LOCK is given, use locking even if my_disable_locking is given
    If MY_NO_WAIT is given, return at once if lock is occupied
    If MY_SHORT_WAIT is given, wait some time for lock before returning (This was called MY_DONT_WAIT before)

  storage/maria/ha_maria.cc@1.59.1.1, 2007-12-17 01:17:10+02:00, monty@mysql.com +26 -16
    Use packed fields
    null_bytes are not anymore stored in a separate field
    Changes to use Maria for internal temporary tables
    Give warning if we try to do an ALTER TABLE to a unusable row format

  storage/maria/ha_maria.h@1.18, 2007-12-17 01:17:10+02:00, monty@mysql.com +3 -1
    Allow Maria with block format to restart scanning at given position

  storage/maria/ma_blockrec.c@1.64.1.1, 2007-12-17 01:17:33+02:00, monty@mysql.com +102 -6
    Added functions to remember and restore scan position
    Allocate cur_row.extents so that we don't have to do a malloc on first read
    Fixed bug when using packed row without packed strings
    Removed unneeded calls to free_full_pages()
    Fixed unlikely bug when using old bitmap to read head page and head page had gone away
    Remember row position when doing undo of delete and update row (needed for undo of key delete)
    

  storage/maria/ma_blockrec.h@1.21.1.1, 2007-12-17 01:17:33+02:00, monty@mysql.com +4 -0
    Added functions to remember and restore scan position

  storage/maria/ma_close.c@1.25, 2007-12-17 01:17:33+02:00, monty@mysql.com +1 -1
    Don't sync temporary tables

  storage/maria/ma_control_file.c@1.23, 2007-12-17 01:17:33+02:00, monty@mysql.com +27 -0
    Lock control file while it's used to stop several processes from using it

  storage/maria/ma_create.c@1.36.1.1, 2007-12-17 01:17:33+02:00, monty@mysql.com +16 -8
    Fixed bug when using FIELD_NORMAL that was longer than FULL_PAGE_SIZE
    Fixed bug that casued fields to not be ordered according to offset
    Fixed bug in unique creation

  storage/maria/ma_delete.c@1.21, 2007-12-17 01:17:33+02:00, monty@mysql.com +5 -1
    Don't write record reference when deleting key.
    (Rowid is likely to be different when we undo this)

  storage/maria/ma_dynrec.c@1.22, 2007-12-17 01:17:34+02:00, monty@mysql.com +3 -0
    Fixed core dump when comparing records (happended in unique handling)

  storage/maria/ma_extra.c@1.22, 2007-12-17 01:17:34+02:00, monty@mysql.com +4 -16
    MY_DONT_WAIT -> MY_SHORT_WAIT
    Removed TODO comment. (Was not relevant as all other instances are guranteed to be closed when we the code is excecuted)
    Added DBUG_ASSERT() to prove above.

  storage/maria/ma_key_recover.c@1.8.1.1, 2007-12-17 01:17:34+02:00, monty@mysql.com +18 -3
    CLR's for UNDO_ROW_DELETE and UNDO_ROW_UPDATE now include rowid for the row.
    This was needed for undo_key_delete to work, as undo of delete row is likely to put row in a new position.
    undo_delete_key now doesn't include row position

  storage/maria/ma_open.c@1.42.1.1, 2007-12-17 01:17:34+02:00, monty@mysql.com +17 -8
    Added virtual functions for remembering and restoring scan position
    Fixed wrong key search method when using multi-byte character sets (Bug#32705)
    Store original column number in index file
    
    NOTE: Index files are now incompatible with previous versions!
    (Ok as we haven't yet made a public Maria release)

  storage/maria/ma_recovery.c@1.58.1.1, 2007-12-17 01:17:34+02:00, monty@mysql.com +49 -23
    Set info->cur_row.lastpos when reading CLR's for UNDO_ROW_DELETE or UNDO_ROW_UPDATE

  storage/maria/ma_scan.c@1.5, 2007-12-17 01:17:34+02:00, monty@mysql.com +13 -0
    Added default function to remember and restore scan position

  storage/maria/maria_def.h@1.51.1.1, 2007-12-17 01:17:34+02:00, monty@mysql.com +9 -3
    Added virtual functions & variables to remember and restore scan position
    Added MARIA_MAX_CONTROL_FILE_LOCK_RETRY

  storage/myisam/ha_myisam.cc@1.190.1.1, 2007-12-17 01:17:34+02:00, monty@mysql.com +19 -13
    Fixed compiler errors as columdef->type is now an enum, not an integer
    Added functions to remember and restore scan position

  storage/myisam/ha_myisam.h@1.82.1.1, 2007-12-17 01:17:34+02:00, monty@mysql.com +2 -1
    Added functions to remember and restore scan position

  storage/myisam/mi_check.c@1.152.1.1, 2007-12-17 01:17:34+02:00, monty@mysql.com +1 -1
    MY_DONT_WAIT -> MY_SHORT_WAIT

  storage/myisam/mi_extra.c@1.59, 2007-12-17 01:17:34+02:00, monty@mysql.com +1 -1
    MY_DONT_WAIT -> MY_SHORT_WAIT

  storage/myisam/mi_open.c@1.111.1.1, 2007-12-17 01:17:34+02:00, monty@mysql.com +1 -1
    MY_DONT_WAIT -> MY_SHORT_WAIT

  storage/myisam/myisamdef.h@1.99, 2007-12-17 01:17:34+02:00, monty@mysql.com +1 -1
    MY_DONT_WAIT -> MY_SHORT_WAIT

ChangeSet@1.2476.794.2, 2007-12-16 20:37:22+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +7 -0
  Fixed after-merge problems.

  include/my_base.h@1.105, 2007-12-16 20:37:16+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -1
    Fixed after-merge problems.

  include/myisam.h@1.89, 2007-12-16 20:37:16+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -1
    Fixed after-merge problems.

  mysys/my_getopt.c@1.82, 2007-12-16 20:37:16+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +11 -10
    Fixed after-merge problems.

  storage/maria/ma_ft_boolean_search.c@1.9, 2007-12-16 20:37:16+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -2
    Fixed after-merge problems.

  storage/maria/ma_ft_nlq_search.c@1.7, 2007-12-16 20:37:16+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -1
    Fixed after-merge problems.

  storage/maria/ma_sort.c@1.16, 2007-12-16 20:37:16+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +6 -6
    Fixed after-merge problems.

  storage/myisam/mi_check.c@1.154, 2007-12-16 20:37:16+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +3 -3
    Fixed after-merge problems.

ChangeSet@1.2476.505.46, 2007-12-16 19:39:06+02:00, bell@desktop.sanja.is.com.ua +1 -0
  test of removing logs.

  storage/maria/unittest/ma_test_loghandler_nologs-t.c@1.1, 2007-12-16 19:39:04+02:00, bell@desktop.sanja.is.com.ua +179 -0
    New BitKeeper file ``storage/maria/unittest/ma_test_loghandler_nologs-t.c''

  storage/maria/unittest/ma_test_loghandler_nologs-t.c@1.0, 2007-12-16 19:39:04+02:00, bell@desktop.sanja.is.com.ua +0 -0

ChangeSet@1.2476.505.45, 2007-12-16 15:26:22+02:00, bell@desktop.sanja.is.com.ua +1 -0
  page CRC calculating

  storage/maria/ma_pagecrc.c@1.1, 2007-12-16 15:26:20+02:00, bell@desktop.sanja.is.com.ua +253 -0
    New BitKeeper file ``storage/maria/ma_pagecrc.c''

  storage/maria/ma_pagecrc.c@1.0, 2007-12-16 15:26:20+02:00, bell@desktop.sanja.is.com.ua +0 -0

ChangeSet@1.2476.792.1, 2007-12-16 12:31:29+01:00, serg@janus.mylan +2 -0
  my_uuid_init() was forgotten

  mysys/my_uuid.c@1.2, 2007-12-16 12:31:25+01:00, serg@janus.mylan +3 -4
    de-corelate two randominit's

  sql/mysqld.cc@1.610, 2007-12-16 12:31:26+01:00, serg@janus.mylan +1 -0
    my_uuid_init() was forgotten here

ChangeSet@1.2476.505.44, 2007-12-16 13:30:05+02:00, bell@desktop.sanja.is.com.ua +1 -0
  postmerge changes.

  storage/maria/ma_loghandler.c@1.94, 2007-12-16 13:30:00+02:00, bell@desktop.sanja.is.com.ua +74 -53
    postmerge changes.

ChangeSet@1.2476.791.1, 2007-12-15 23:31:22+02:00, bell@desktop.sanja.is.com.ua +27 -0
  Pagecache callbacks support added.
  Page CRC check based on pagecache support added.
  Loghandler pagecache callbacks support added.
  Loghandler filecache rewritten.
  Support of deletting all logs added.

  storage/maria/Makefile.am@1.21.1.1, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +2 -1
    New file with functions for CRC calculation.

  storage/maria/ma_bitmap.c@1.27.1.1, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +18 -31
    Page CRC support.

  storage/maria/ma_blockrec.c@1.63.1.1, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +1 -7
    Removed code replaced by pagecache callbacks.

  storage/maria/ma_check.c@1.53.2.1, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +36 -5
    Page CRC support.

  storage/maria/ma_create.c@1.35.1.1, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +8 -0
    Page CRC support.

  storage/maria/ma_loghandler.c@1.84.2.1, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +480 -201
    Pagecache callbacks support.
    New file cache support.
    Removing log files support.

  storage/maria/ma_loghandler.h@1.38.1.1, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +0 -1
    CRC_LENGTH replaced with CRC_SIZE

  storage/maria/ma_open.c@1.41.1.1, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +20 -0
    Page CRC support.

  storage/maria/ma_page.c@1.18.1.1, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +1 -4
    Page CRC support.

  storage/maria/ma_pagecache.c@1.60.1.1, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +56 -44
    Pagecache callbacks support.

  storage/maria/ma_pagecache.h@1.33, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +25 -24
    Pagecache callbacks support.

  storage/maria/ma_panic.c@1.7, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +11 -0
    Page CRC support.

  storage/maria/maria_chk.c@1.32.1.1, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +4 -0
    Page CRC support.

  storage/maria/maria_def.h@1.49.2.1, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +36 -1
    Page CRC support.

  storage/maria/unittest/Makefile.am@1.17.1.1, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +3 -1
    New test of removing logs.

  storage/maria/unittest/ma_maria_log_cleanup.c@1.2, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +4 -0
    Memory leack fixed.

  storage/maria/unittest/ma_pagecache_consist.c@1.17, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +13 -0
    Pagecache callbacks support.

  storage/maria/unittest/ma_pagecache_single.c@1.17, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +14 -1
    Pagecache callbacks support.

  storage/maria/unittest/ma_test_loghandler-t.c@1.25.1.1, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +0 -1
    Fixed the test error processing.

  storage/maria/unittest/ma_test_loghandler_first_lsn-t.c@1.7.1.1, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +0 -1
    Fixed the test error processing.

  storage/maria/unittest/ma_test_loghandler_max_lsn-t.c@1.8.1.1, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +0 -1
    Fixed the test error processing.

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.21.1.1, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +0 -2
    Fixed the test error processing.

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.21.1.1, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +0 -1
    Fixed the test error processing.

  storage/maria/unittest/ma_test_loghandler_noflush-t.c@1.7.1.1, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +0 -1
    Fixed the test error processing.

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.18.1.1, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +14 -1
    Pagecache callbacks support.

  storage/maria/unittest/ma_test_loghandler_purge-t.c@1.6.1.1, 2007-12-15 23:31:19+02:00, bell@desktop.sanja.is.com.ua +0 -1
    Fixed the test error processing.

  storage/maria/unittest/test_file.c@1.7, 2007-12-15 23:31:20+02:00, bell@desktop.sanja.is.com.ua +0 -5
    Removed unneeded sync.

ChangeSet@1.2476.790.3, 2007-12-15 22:24:01+03:00, kostja@bodhi.(none) +1 -0
  Try to fix assertion failures at slave shutdown when running
  rpl_ndb tests on sapsrv1.

  sql/ha_ndbcluster_binlog.cc@1.140, 2007-12-15 22:23:55+03:00, kostja@bodhi.(none) +6 -3
    Try to fix assertion failures at slave shutdown when running
    rpl_ndb tests. If the binlog thread is killed, which happens during
    shutdown, open_tables returns error without setting an error
    in THD. Therefore one can't access thd->main_da.message() if thd->killed.

ChangeSet@1.2476.505.42, 2007-12-15 19:16:41+02:00, bell@desktop.sanja.is.com.ua +13 -0
  Postmerge fix.

  storage/maria/ma_init.c@1.16, 2007-12-15 19:16:37+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Postmerge fix.

  storage/maria/ma_loghandler.c@1.92, 2007-12-15 19:16:37+02:00, bell@desktop.sanja.is.com.ua +35 -10
    Postmerge fix.
    New state of the log added to proicess correctly shutdown.

  storage/maria/ma_loghandler.h@1.41, 2007-12-15 19:16:37+02:00, bell@desktop.sanja.is.com.ua +2 -1
    New state of the log added to proicess correctly shutdown.

  storage/maria/maria_chk.c@1.34, 2007-12-15 19:16:37+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Postmerge fix.

  storage/maria/maria_read_log.c@1.31, 2007-12-15 19:16:37+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Postmerge fix.

  storage/maria/unittest/ma_loghandler_examples.c@1.3, 2007-12-15 19:16:37+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Postmerge fix.

  storage/maria/unittest/ma_test_loghandler_first_lsn-t.c@1.9, 2007-12-15 19:16:37+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Postmerge fix.

  storage/maria/unittest/ma_test_loghandler_max_lsn-t.c@1.10, 2007-12-15 19:16:37+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Postmerge fix.

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.23, 2007-12-15 19:16:37+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Postmerge fix.

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.23, 2007-12-15 19:16:37+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Postmerge fix.

  storage/maria/unittest/ma_test_loghandler_noflush-t.c@1.9, 2007-12-15 19:16:38+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Postmerge fix.

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.20, 2007-12-15 19:16:38+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Postmerge fix.

  storage/maria/unittest/ma_test_loghandler_purge-t.c@1.8, 2007-12-15 19:16:38+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Postmerge fix.

ChangeSet@1.2476.789.1, 2007-12-15 15:44:29+02:00, bell@desktop.sanja.is.com.ua +18 -0
  Transaction log behaviour in case of write
    error fixed (switching to the read only mode).
  Added read only mode of transactions log handler.

  storage/maria/ha_maria.cc@1.51.1.7, 2007-12-15 15:44:25+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Transaction log initialization parameters change.

  storage/maria/ma_check.c@1.45.1.1, 2007-12-15 15:44:25+02:00, bell@desktop.sanja.is.com.ua +1 -1
    New status variable of transactional log.

  storage/maria/ma_create.c@1.31.1.1, 2007-12-15 15:44:25+02:00, bell@desktop.sanja.is.com.ua +2 -1
    New status variable of transactional log.

  storage/maria/ma_loghandler.c@1.67.1.4, 2007-12-15 15:44:25+02:00, bell@desktop.sanja.is.com.ua +162 -75
    - New status variable added.
    - Checking the status variable in the loghandler
    interface functions added
    - All fails of loghandler functions revised.
    - UNRECOVERABLE_ERROR() removed.
    - Switching to read only mode added where it nead.
    - Checking of log state added before writes log content
      and changing status variables like sent_to_file, n_buffers_only, flushed.
    - Readonly loghandler initialization added.
    - Fixed problem with example table transactional log initialization.

  storage/maria/ma_loghandler.h@1.27.1.2, 2007-12-15 15:44:25+02:00, bell@desktop.sanja.is.com.ua +19 -6
    Readonly loghandler initialization added.
    Fixed problem with example table transactional log initialization.
    New status variable added.

  storage/maria/ma_open.c@1.33.1.2, 2007-12-15 15:44:25+02:00, bell@desktop.sanja.is.com.ua +1 -1
    New status variable of transactional log.

  storage/maria/ma_test1.c@1.27.1.1, 2007-12-15 15:44:25+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Transaction log initialization parameters change.

  storage/maria/ma_test2.c@1.23.1.3, 2007-12-15 15:44:25+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Transaction log initialization parameters change.

  storage/maria/maria_read_log.c@1.25.1.1, 2007-12-15 15:44:25+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Transaction loghandler initialization in read only mode in
    case of only dysplay parameter.

  storage/maria/unittest/Makefile.am@1.16.1.1, 2007-12-15 15:44:25+02:00, bell@desktop.sanja.is.com.ua +4 -1
    Test of readonly mode added.

  storage/maria/unittest/ma_test_loghandler-t.c@1.20.1.1, 2007-12-15 15:44:25+02:00, bell@desktop.sanja.is.com.ua +3 -3
    Transaction log initialization parameters change.
    Fixed problem with example table transactional log initialization.
    Fixed incorrect fprintf call parameters.

  storage/maria/unittest/ma_test_loghandler_first_lsn-t.c@1.5.2.1, 2007-12-15 15:44:25+02:00, bell@desktop.sanja.is.com.ua +2 -2
    Transaction log initialization parameters change.
    Fixed problem with example table transactional log initialization.

  storage/maria/unittest/ma_test_loghandler_max_lsn-t.c@1.5.2.1, 2007-12-15 15:44:25+02:00, bell@desktop.sanja.is.com.ua +2 -2
    Transaction log initialization parameters change.
    Fixed problem with example table transactional log initialization.

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.18.2.1, 2007-12-15 15:44:25+02:00, bell@desktop.sanja.is.com.ua +19 -7
    Useing this test also as read only loghandler test.
    Transaction log initialization parameters change.
    Fixed problem with example table transactional log initialization.

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.18.2.1, 2007-12-15 15:44:25+02:00, bell@desktop.sanja.is.com.ua +2 -2
    Transaction log initialization parameters change.
    Fixed problem with example table transactional log initialization.

  storage/maria/unittest/ma_test_loghandler_noflush-t.c@1.5.2.1, 2007-12-15 15:44:25+02:00, bell@desktop.sanja.is.com.ua +2 -2
    Transaction log initialization parameters change.
    Fixed problem with example table transactional log initialization.

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.16.2.1, 2007-12-15 15:44:25+02:00, bell@desktop.sanja.is.com.ua +2 -2
    Transaction log initialization parameters change.
    Fixed problem with example table transactional log initialization.

  storage/maria/unittest/ma_test_loghandler_purge-t.c@1.3.2.1, 2007-12-15 15:44:25+02:00, bell@desktop.sanja.is.com.ua +2 -2
    Transaction log initialization parameters change.
    Fixed problem with example table transactional log initialization.

ChangeSet@1.2476.788.1, 2007-12-15 14:17:23+01:00, guilhem@gbichot4.local +4 -0
  WL#3072 Maria Recovery.
  Updates to the bitmap flush/pin logic to prepare for when we support
  multiple writers.

  storage/maria/ma_bitmap.c@1.29, 2007-12-15 14:17:20+01:00, guilhem@gbichot4.local +69 -30
    Read lock is less bad than write lock.
    Changing bitmap->flushable to a counter, to prepare for when multiple
    writers are allowed on a table.
    Using bitmap->flush_all_requested instead of share->in_checkpoint; the
    latter can be true for the time of a whole checkpoint even though
    the checkpoint is not yet handling our table, or has already handled it,
    so to decrease the number of broadcasts we use a dedicated my_bool
    which is true only when checkpoint is handling this table's bitmap.
    _ma_bitmap_flushable(share,+1) waits for a concurrent _ma_bitmap_flush_all()
    to finish before incrementing non_flushable; without this, with multiple
    writers there may always be one thread making the bitmap unflushable
    and thus checkpoint would stall.

  storage/maria/ma_blockrec.c@1.65.1.1, 2007-12-15 14:17:20+01:00, guilhem@gbichot4.local +11 -11
    update to new prototype: "flushable is FALSE|TRUE" becomes "add 1|-1 to
    non_flushable".

  storage/maria/ma_blockrec.h@1.23, 2007-12-15 14:17:21+01:00, guilhem@gbichot4.local +1 -1
    new prototype

  storage/maria/maria_def.h@1.53, 2007-12-15 14:17:21+01:00, guilhem@gbichot4.local +2 -1
    MARIA_FILE_BITMAP::flushable becomes a counter.
    New MARIA_FILE_BITMAP::flush_all_requested.

ChangeSet@1.2476.505.39, 2007-12-15 13:07:40+01:00, serg@janus.mylan +3 -0
  include sys/stat.h
  remove duplicate symbol

  configure.in@1.374.1.1, 2007-12-15 13:07:35+01:00, serg@janus.mylan +1 -1
    include sys/stat.h

  include/my_global.h@1.153.1.1, 2007-12-15 13:07:36+01:00, serg@janus.mylan +3 -0
    include sys/stat.h

  sql/mysqld.cc@1.609, 2007-12-15 13:07:36+01:00, serg@janus.mylan +1 -3
    remove duplicate symbol

ChangeSet@1.1810.3480.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.776.8, 2007-12-14 17:46:24-07:00, malff@lambda.hsd1.co.comcast.net. +3 -0
  WL#4165 (Prepared statements: validation)
  
  Adding the tests cases alone for WL#4165, disabled

  mysql-test/r/ps_ddl.result@1.1, 2007-12-14 17:46:22-07:00, malff@lambda.hsd1.co.comcast.net. +2329 -0
    WL#4165 (Prepared statements: validation)

  mysql-test/r/ps_ddl.result@1.0, 2007-12-14 17:46:22-07:00, malff@lambda.hsd1.co.comcast.net. +0 -0

  mysql-test/t/disabled.def@1.266.25.1, 2007-12-14 17:46:21-07:00, malff@lambda.hsd1.co.comcast.net. +1 -1
    WL#4165 (Prepared statements: validation)

  mysql-test/t/ps_ddl.test@1.1, 2007-12-14 17:46:22-07:00, malff@lambda.hsd1.co.comcast.net. +1851 -0
    WL#4165 (Prepared statements: validation)

  mysql-test/t/ps_ddl.test@1.0, 2007-12-14 17:46:22-07:00, malff@lambda.hsd1.co.comcast.net. +0 -0

ChangeSet@1.2476.787.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.583.133.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.2476.505.38, 2007-12-14 23:26:17+01:00, serg@janus.mylan +4 -0
  pushbuild fixes to please gcc and darwin/ppc64

  include/my_atomic.h@1.15, 2007-12-14 23:26:13+01:00, serg@janus.mylan +10 -1
    transparent_union doesn't work in g++, doesn't work on darwin/ppc64

  storage/maria/ma_blockrec.c@1.66, 2007-12-14 23:26:13+01:00, serg@janus.mylan +1 -0
    compiler warning

  storage/maria/ma_loghandler.c@1.90, 2007-12-14 23:26:13+01:00, serg@janus.mylan +2 -1
    compiler warning

  storage/maria/ma_page.c@1.19, 2007-12-14 23:26:13+01:00, serg@janus.mylan +3 -2
    compiler warning

ChangeSet@1.1810.3561.1, 2007-12-14 13:42:46-08:00, igor@olga.mysql.com +3 -0
  Fixed bug #27848.
  In a union without braces, the order by at the end is applied to the 
  overall union. It therefore should not interfere with the individual
  select parts of the union.
  
  Fixed by changing our parser rules appropriately.

  mysql-test/r/union.result@1.80.6.1, 2007-12-14 13:42:41-08:00, igor@olga.mysql.com +51 -0
    Added a test case for bug #27848.

  mysql-test/t/union.test@1.97.3.1, 2007-12-14 13:42:41-08:00, igor@olga.mysql.com +44 -0
    Added a test case for bug #27848.

  sql/sql_yacc.yy@1.371.132.10, 2007-12-14 13:42:42-08:00, igor@olga.mysql.com +10 -1
    Fixed bug #27848.
    In a union without braces, the order by at the end is applied to the 
    overall union. It therefore should not interfere with the individual
    select parts of the union.
    
    Fixed by changing our parser rules appropriately.

ChangeSet@1.2476.1.166, 2007-12-14 15:49:51-05:00, iggy@amd64.(none) +1 -0
  Bug#26811 Symbolic links don't work in Windows Vista
  - Enable check for symbolic link files.

  sql/sql_table.cc@1.437.37.1, 2007-12-14 15:49:49-05:00, iggy@amd64.(none) +6 -1
    Bug#26811 Symbolic links don't work in Windows Vista
    - On systems that support symbolic link files, make sure to check for them.

ChangeSet@1.1810.3560.2, 2007-12-14 21:38:58+01:00, kent@mysql.com +1 -0
  sp_head.cc:
    Corrected typo

  sql/sp_head.cc@1.200.29.5, 2007-12-14 21:03:30+01:00, kent@mysql.com +1 -1
    Corrected typo

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.786.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.159.1.13, 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.108.1.5, 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.1810.3560.1, 2007-12-14 18:23:11+01:00, kent@mysql.com +3 -0
  sp_head.cc:
    Made sp_head::operator delete() match prototype, added throw()
  mysql_test_run.c, mysqld_safe.c:
    Include "mysql_version.h" to get MYSQL_PORT defined

  netware/mysql_test_run.c@1.18.2.3, 2007-12-14 18:22:06+01:00, kent@mysql.com +1 -0
    Include "mysql_version.h" to get MYSQL_PORT defined

  netware/mysqld_safe.c@1.12, 2007-12-14 18:22:44+01:00, kent@mysql.com +1 -0
    Include "mysql_version.h" to get MYSQL_PORT defined

  sql/sp_head.cc@1.200.29.4, 2007-12-14 18:21:18+01:00, kent@mysql.com +1 -1
    Made sp_head::operator delete() match prototype, added throw()

ChangeSet@1.2476.505.37, 2007-12-14 17:40:08+01:00, guilhem@gbichot4.local +1 -0
  fix for pushbuild test failure

  mysql-test/t/ps_maria.test@1.3, 2007-12-14 17:40:06+01:00, guilhem@gbichot4.local +1 -2
    test Maria presence before setting Maria variables

ChangeSet@1.2476.505.36, 2007-12-14 17:24:46+01:00, guilhem@gbichot4.local +3 -0
  fix for some gcc -ansi warnings.

  storage/maria/ma_checkpoint.c@1.36, 2007-12-14 17:24:44+01:00, guilhem@gbichot4.local +18 -16
    gcc -ansi warnings

  storage/maria/ma_pagecache.c@1.62, 2007-12-14 17:24:44+01:00, guilhem@gbichot4.local +4 -0
    comment

  storage/maria/ma_recovery.c@1.60, 2007-12-14 17:24:44+01:00, guilhem@gbichot4.local +55 -37
    gcc -ansi warnings

ChangeSet@1.2476.747.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.1810.3555.6, 2007-12-14 16:58:12+01:00, kent@mysql.com +1 -0
  Raise version number after cloning 5.0.54

  configure.in@1.245.77.50, 2007-12-14 16:58:00+01:00, kent@mysql.com +2 -2
    Raise version number after cloning 5.0.54

ChangeSet@1.1810.3533.7, 2007-12-14 15:43:54+00:00, jperkin@chorlton.adsl.perkin.org.uk +1 -0
  post-commit:
    Rationalise setting $FROM.

  BitKeeper/triggers/post-commit@1.26.11.5, 2007-12-14 15:42:40+00:00, jperkin@chorlton.adsl.perkin.org.uk +1 -2
    Rationalise setting $FROM.

ChangeSet@1.2476.784.1, 2007-12-14 16:14:12+01:00, guilhem@gbichot4.local +19 -0
  WL#3072 - Maria recovery.
  * fix for bitmap vs checkpoint bug which could lead to corrupted
  tables in case of crashes at certain moments: a bitmap could be flushed
  to disk even though it was inconsistent with the log (it could be
  flushed before REDO-UNDO are written to the log). One bug remains, need
  code from others. Tests added. Fix is to pin unflushable bitmap pages,
  and let checkpoint wait for them to be flushable.
  * fix for long_trid!=0 assertion failure at Recovery.
  * less useless wakeups in the background flush|checkpoint thread.
  * store global_trid_generator in checkpoint record.

  mysql-test/r/maria-recovery-bitmap.result@1.1, 2007-12-14 16:14:08+01:00, guilhem@gbichot4.local +29 -0
    result is ok. Without the code fix, we would get a corruption message
    about the bitmap page in CHECK TABLE EXTENDED.

  mysql-test/r/maria-recovery-bitmap.result@1.0, 2007-12-14 16:14:08+01:00, guilhem@gbichot4.local +0 -0

  mysql-test/r/maria-recovery.result@1.5, 2007-12-14 16:13:11+01:00, guilhem@gbichot4.local +4 -0
    result update

  mysql-test/t/maria-recovery-bitmap-master.opt@1.1, 2007-12-14 16:14:08+01:00, guilhem@gbichot4.local +2 -0
    usual when we crash mysqld in tests

  mysql-test/t/maria-recovery-bitmap-master.opt@1.0, 2007-12-14 16:14:08+01:00, guilhem@gbichot4.local +0 -0

  mysql-test/t/maria-recovery-bitmap.test@1.1, 2007-12-14 16:14:08+01:00, guilhem@gbichot4.local +79 -0
    test of recovery problems specific of the bitmap pages.

  mysql-test/t/maria-recovery-bitmap.test@1.0, 2007-12-14 16:14:08+01:00, guilhem@gbichot4.local +0 -0

  mysql-test/t/maria-recovery.test@1.6, 2007-12-14 16:13:11+01:00, guilhem@gbichot4.local +3 -0
    make it easier to locate subtests

  storage/maria/ma_bitmap.c@1.28, 2007-12-14 16:13:11+01:00, guilhem@gbichot4.local +199 -17
    When we send a bitmap to the pagecache, if this bitmap is not in a
    flushable state we keep it pinned and add it to a list, it will be
    unpinned when the bitmap is flushable again.
    A new function _ma_bitmap_flush_all() used by checkpoint.
    A new function _ma_bitmap_flushable() used by block format to signal
    when it starts modifying a bitmap and when it is done with it.

  storage/maria/ma_blockrec.c@1.65, 2007-12-14 16:13:11+01:00, guilhem@gbichot4.local +38 -25
    When starting a row operation (insert/update/delete), mark that
    the bitmap is not flushable (because for example INSERT is going
    to over-allocate in the bitmap to prevent other threads from using
    our data pages). If a checkpoint comes at this moment it will wait
    for the bitmap to be flushable before flushing it.
    When the operation ends, bitmap becomes flushable again; that
    transition is done under the bitmap's mutex (needed for correct
    synchro with a concurrent checkpoint); but for INSERT/UPDATE this
    happens inside _ma_bitmap_release_unused() at a place where it already
    has the mutex, so the only penalty (mutex adding) is in DELETE and UNDO
    of INSERT. In case of errors after setting the bitmap unflushable,
    we must always set it back to flushable or checkpoint would block.
    Debug possibilities to force a sleep while the bitmap is over-allocated.
    In case of error in get_head_or_tail() in allocate_and_write_block_record(),
    we still need to unpin all pages.
    Bugfix: _ma_apply_redo_insert_row_blobs() produced wrong
    data_file_length.

  storage/maria/ma_blockrec.h@1.22, 2007-12-14 16:13:11+01:00, guilhem@gbichot4.local +2 -0
    new bitmap calls.

  storage/maria/ma_checkpoint.c@1.35, 2007-12-14 16:13:11+01:00, guilhem@gbichot4.local +81 -96
    filter_flush_indirect not needed anymore (flushing bitmap
    pages happens in _ma_bitmap_flush_all() now). So
    st_filter_param::is_data_file|pages_covered_by_bitmap not needed.
    Other filter_flush* don't need to flush bitmap anymore.
    Add debug possibility to flush all bitmap pages outside of a checkpoint,
    to simulate pagecache LRU eviction.
    When the background flush/checkpoint thread notices it has nothing
    to flush, it now sleeps directly until the next potential checkpoint
    moment instead of waking up every second.
    When in checkpoint we decide to not store a table in the checkpoint record
    (because it has logged no writes for example), we can also skip flushing
    this table.

  storage/maria/ma_commit.c@1.6, 2007-12-14 16:13:11+01:00, guilhem@gbichot4.local +0 -6
    comment is out-of-date

  storage/maria/ma_key_recover.c@1.9, 2007-12-14 16:13:11+01:00, guilhem@gbichot4.local +1 -1
    comment fix

  storage/maria/ma_loghandler.c@1.89, 2007-12-14 16:13:12+01:00, guilhem@gbichot4.local +0 -2
    comment is out-of-date

  storage/maria/ma_open.c@1.43, 2007-12-14 16:13:12+01:00, guilhem@gbichot4.local +0 -2
    comment is out-of-date

  storage/maria/ma_pagecache.c@1.61, 2007-12-14 16:13:12+01:00, guilhem@gbichot4.local +4 -12
    comment for bug to fix. And we don't take checkpoints at end of REDO
    phase yet so can trust block->type.

  storage/maria/ma_recovery.c@1.59, 2007-12-14 16:14:07+01:00, guilhem@gbichot4.local +23 -20
    Comments. Now-unneeded code for incomplete REDO-UNDO groups removed.
    When we forget about an old transaction we must really forget
    about it with bzero() (fixes the "long_trid!=0 assertion" recovery
    bug). When we delete a row with maria_delete() we turn on
    STATE_NOT_OPTIMIZED_ROWS so we do the same when we see a CLR_END
    for an UNDO_ROW_INSERT or when we execute an UNDO_ROW_INSERT (in both
    cases a row was deleted). Pick up max_long_trid from the checkpoint record.

  storage/maria/maria_chk.c@1.33, 2007-12-14 16:14:07+01:00, guilhem@gbichot4.local +2 -2
    comment

  storage/maria/maria_def.h@1.52, 2007-12-14 16:14:07+01:00, guilhem@gbichot4.local +3 -1
    MARIA_FILE_BITMAP gets new members: 'flushable', 'bitmap_cond' and
    'pinned_pages'.

  storage/maria/trnman.c@1.30, 2007-12-14 16:14:07+01:00, guilhem@gbichot4.local +3 -0
    I used to think that recovery only needs to know the maximum TrID
    of the lists of active and committed transactions. But no, sometimes
    both lists can even be empty and their TrID should not be reused.
    So Checkpoint now saves global_trid_generator in the checkpoint record.

  storage/maria/trnman_public.h@1.6, 2007-12-14 16:14:07+01:00, guilhem@gbichot4.local +3 -1
    macros to read/store a TrID

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.720.6, 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/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_charset_innodb.result@1.2, 2007-12-14 14:40:43+01:00, sven@riska.(none) +12 -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.24.1.2, 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.783.2, 2007-12-14 13:35:52+01:00, mhansson@linux-st28.site +1 -0
  Bug#32798: DISTINCT in GROUP_CONCAT clause fails when ordering by 
  a column with null values
  
  Post-merge fix

  sql/item_sum.cc@1.229.3.2, 2007-12-14 13:35:49+01:00, mhansson@linux-st28.site +1 -1
    Bug#32798:Post-merge fix

ChangeSet@1.1810.3559.1, 2007-12-14 12:24:20+01:00, mhansson@linux-st28.site +4 -0
  Bug#32798: DISTINCT in GROUP_CONCAT clause fails when ordering by a column 
  with null values
  
  For queries containing GROUP_CONCAT(DISTINCT fields ORDER BY fields), there 
  was a limitation that the DISTINCT fields had to be the same as ORDER BY 
  fields, owing to the fact that one single sorted tree was used for keeping 
  track of tuples, ordering and uniqueness. Fixed by introducing a second 
  structure to handle uniqueness so that the original structure has only to 
  order the result.

  mysql-test/r/func_gconcat.result@1.52.5.1, 2007-12-14 12:24:18+01:00, mhansson@linux-st28.site +62 -1
    Bug#32798:
    - Wrong test result turned correct after fix.
    - Correct test result

  mysql-test/t/func_gconcat.test@1.44.6.1, 2007-12-14 12:24:18+01:00, mhansson@linux-st28.site +43 -0
    Bug#32798: Test case

  sql/item_sum.cc@1.170.29.1, 2007-12-14 12:24:18+01:00, mhansson@linux-st28.site +80 -72
    Bug#32798: Implementation of fix. Dead code removal.
    
    - removed comment describing this bug
    - replaced body of function group_concat_key_cmp_with_distinct
    - removed function group_concat_key_cmp_with_distinct_and_order
    - Added a Unique object to maintain uniqueness of values.

  sql/item_sum.h@1.102.1.12, 2007-12-14 12:24:18+01:00, mhansson@linux-st28.site +18 -10
    Bug#32798: Declarations and comments.

ChangeSet@1.2476.505.34, 2007-12-14 10:51:07+01:00, serg@janus.mylan +2 -0
  more cmake fixes

  mysys/CMakeLists.txt@1.12.1.2, 2007-12-14 10:51:04+01:00, serg@janus.mylan +1 -1
    more cmake fixes

  server-tools/instance-manager/CMakeLists.txt@1.8.1.1, 2007-12-14 10:51:04+01:00, serg@janus.mylan +1 -1
    more cmake fixes

ChangeSet@1.1810.3558.2, 2007-12-14 10:51:05+01:00, df@pippilotta.erinye.com +1 -0
  typo

  mysql-test/mysql-test-run.pl@1.30.97.2, 2007-12-14 10:51:04+01:00, df@pippilotta.erinye.com +1 -1
    typo

ChangeSet@1.1810.3558.1, 2007-12-14 10:47:01+01:00, df@pippilotta.erinye.com +1 -0
  BUG#31880 make test failure from public bk tree

  mysql-test/mysql-test-run.pl@1.30.97.1, 2007-12-14 10:46:59+01:00, df@pippilotta.erinye.com +4 -8
    BUG#31880 make test failure from public bk tree
    
    Instead of handling "MTR_BUILD_THREAD set" and "MTR_BUILD_THREAD not set" differently, use the same subroutine to set up the port numbers. The addition of a second master apparently broke the old static port numbers.

ChangeSet@1.2476.781.1, 2007-12-14 09:47:00+01:00, serg@janus.mylan +1 -0
  windows fix: fix the #include directive

  mysys/my_rnd.c@1.2, 2007-12-14 09:46:56+01:00, serg@janus.mylan +1 -1
    windows fix: fix the #include directive

ChangeSet@1.2476.776.5, 2007-12-14 02:23:42+03:00, kostja@bodhi.(none) +2 -0
  Remove an unused argument of sql_update::do_updates().

  sql/sql_class.h@1.412, 2007-12-14 02:23:35+03:00, kostja@bodhi.(none) +1 -1
    Remove an unused argument.

  sql/sql_update.cc@1.239.1.25, 2007-12-14 02:23:35+03:00, kostja@bodhi.(none) +3 -4
    Remove an unused argument.

ChangeSet@1.2476.505.32, 2007-12-13 23:46:59+02:00, bell@desktop.sanja.is.com.ua +1 -0
  postreview changes.

  storage/maria/ma_loghandler.c@1.88, 2007-12-13 23:46:57+02:00, bell@desktop.sanja.is.com.ua +9 -16
    Using pthread_cond instead of WQUEUE.

ChangeSet@1.2476.769.8, 2007-12-13 23:58:55+03:00, kostja@bodhi.(none) +6 -0
  Fix broken embedded build (broken by the patch for Bug#12713, first part).

  client/mysqltest.c@1.321.1.1, 2007-12-13 23:58:52+03:00, kostja@bodhi.(none) +0 -1
    Remove a call to my_message() (server call) in case of a client error.
    It asserts in the embedded build now, since is called after send_ok().

  libmysqld/emb_qcache.cc@1.11.1.1, 2007-12-13 23:58:53+03:00, kostja@bodhi.(none) +1 -1
    Use net_send_eof (embedded implementation) in embedded query cache/
    send result to client, since send_eof currently does not
    send anything. 

  libmysqld/emb_qcache.h@1.5.1.1, 2007-12-13 23:58:53+03:00, kostja@bodhi.(none) +1 -0
    Declare net_send_eof.

  libmysqld/lib_sql.cc@1.145, 2007-12-13 23:58:53+03:00, kostja@bodhi.(none) +2 -0
    Fix the main loop of the embedded server to use the new Diagnostics_area
    API.

  sql/log.cc@1.303, 2007-12-13 23:58:53+03:00, kostja@bodhi.(none) +39 -28
    Silence errors of open_performance_schema_table. This function
    is called for general logging, and it happens after the error
    has been sent to the client, and thus triggers an assert.

  storage/myisam/ha_myisam.cc@1.175.48.1, 2007-12-13 23:58:53+03:00, kostja@bodhi.(none) +0 -2
    Remove an old hack that broke repair.test in embedded build:
    unless we clear an error here, the server attempts to send OK after
    ERROR. This currently asserts.

ChangeSet@1.1810.3557.1, 2007-12-13 21:31:38+01:00, tomas@whalegate.ndb.mysql.com +2 -0
  Bug #33168 Incorrectly handled parameters can make the TC crash during node failure
  - during commit deadlock timeout needs to be at least 5 times db hearbeat

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp@1.26.28.1, 2007-12-13 21:31:36+01:00, tomas@whalegate.ndb.mysql.com +1 -0
    Bug #33168 Incorrectly handled parameters can make the TC crash during node failure
    - during commit deadlock timeout needs to be at least 5 times db hearbeat

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.73.54.1, 2007-12-13 21:31:36+01:00, tomas@whalegate.ndb.mysql.com +13 -4
    Bug #33168 Incorrectly handled parameters can make the TC crash during node failure
    - during commit deadlock timeout needs to be at least 5 times db hearbeat

ChangeSet@1.2476.777.2, 2007-12-13 22:12:44+02:00, bell@desktop.sanja.is.com.ua +3 -0
  Fixed maximum file size change. Now it flush buffer after
    switching to new one which prevent deadlock.

  mysql-test/r/maria-purge.result@1.3, 2007-12-13 22:12:42+02:00, bell@desktop.sanja.is.com.ua +8 -4
    Fixed test which use setting maria_checkpoint_interval to force
      checkpoint now.

  mysql-test/t/maria-purge.test@1.3, 2007-12-13 22:12:42+02:00, bell@desktop.sanja.is.com.ua +6 -2
    Fixed test which use setting maria_checkpoint_interval to force
      checkpoint now.

  storage/maria/ma_loghandler.c@1.84.1.2, 2007-12-13 22:12:42+02:00, bell@desktop.sanja.is.com.ua +8 -2
    Fixed maximum file size change. Now it flush buffer after
      switching to new one which prevent deadlock.

ChangeSet@1.1810.3555.5, 2007-12-13 23:46:29+04:00, gluh@mysql.com +1 -0
  additional fix
  TAG: clone-5.0.54-build

  sql/ha_blackhole.cc@1.21.8.1, 2007-12-13 23:46:28+04:00, gluh@mysql.com +1 -1
    additional fix

ChangeSet@1.2476.505.30, 2007-12-13 19:25:01+01:00, serg@janus.mylan +2 -0
  fixes for windows builds

  libmysql/CMakeLists.txt@1.13.4.1, 2007-12-13 19:24:57+01:00, serg@janus.mylan +2 -2
    fixes for windows builds

  mysys/CMakeLists.txt@1.12.1.1, 2007-12-13 19:24:57+01:00, serg@janus.mylan +1 -1
    fixes for windows builds

ChangeSet@1.2476.779.5, 2007-12-13 21:34:05+04:00, gluh@mysql.com +4 -0
  additional after merge fix

  mysql-test/r/partition_range.result@1.24, 2007-12-13 21:34:03+04:00, gluh@mysql.com +0 -20
    removed fix for bug#30573

  mysql-test/suite/parts/r/rpl_partition.result@1.5, 2007-12-13 21:34:03+04:00, gluh@mysql.com +1 -1
    updated result file

  mysql-test/t/partition_range.test@1.20, 2007-12-13 21:34:03+04:00, gluh@mysql.com +18 -18
    removed test case for bug#30573

  sql/ha_partition.cc@1.104.1.10, 2007-12-13 21:34:03+04:00, gluh@mysql.com +1 -1
    removed fix for bug#30573

ChangeSet@1.1810.3555.4, 2007-12-13 21:13:08+04:00, gluh@mysql.com +1 -0
  valgrind error fix

  sql/ha_blackhole.cc@1.21.7.1, 2007-12-13 21:13:06+04:00, gluh@mysql.com +9 -1
    valgrind error fix

ChangeSet@1.2476.779.4, 2007-12-13 18:26:27+04:00, gluh@mysql.com +1 -0
  after merge fix

  sql/sql_parse.cc@1.683.36.2, 2007-12-13 18:26:24+04:00, gluh@mysql.com +2 -2
    after merge fix

ChangeSet@1.2476.505.29, 2007-12-13 14:48:50+01:00, serg@janus.mylan +2 -0
  restore plug.in - referenced by Makefile.am

  configure.in@1.374, 2007-12-13 14:48:47+01:00, serg@janus.mylan +1 -1
    restore plug.in - referenced by Makefile.am

  storage/myisam/plug.in@1.5, 2007-12-13 14:48:47+01:00, serg@janus.mylan +6 -6
    restore plug.in - referenced by Makefile.am

  storage/myisam/plug.in@1.4, 2007-12-13 13:52:02+01:00, serg@janus.mylan +0 -0
    Rename: BitKeeper/deleted/.del-plug.in -> storage/myisam/plug.in

ChangeSet@1.2476.779.3, 2007-12-13 16:43:38+04:00, gluh@mysql.com +2 -0
  after merge fix

  mysql-test/r/range.result@1.65, 2007-12-13 16:43:36+04:00, gluh@mysql.com +14 -14
    after merge fix

  tests/mysql_client_test.c@1.260, 2007-12-13 16:43:36+04:00, gluh@mysql.com +2 -0
    after merge fix

ChangeSet@1.2476.505.28, 2007-12-13 13:28:35+01:00, serg@janus.mylan +4 -0
  fixes for make distclean, solaris, macosx, windows

  configure.in@1.373, 2007-12-13 13:28:32+01:00, serg@janus.mylan +12 -1
    MyISAM should be the first plugin in the list for now
    check for thr_yield, just in case

  include/my_pthread.h@1.118.1.3, 2007-12-13 13:28:32+01:00, serg@janus.mylan +12 -0
    pthread_yield for windows, solaris, macosx

  storage/Makefile.am@1.9, 2007-12-13 13:28:32+01:00, serg@janus.mylan +1 -6
    fix for make distclean (myisam was listed twice in SUBDIRS)

  BitKeeper/deleted/.del-plug.in@1.3, 2007-12-13 12:59:29+01:00, serg@janus.mylan +0 -0
    Delete: storage/myisam/plug.in

ChangeSet@1.1810.3555.3, 2007-12-13 15:47:23+04:00, gluh@mysql.com +3 -0
  after merge fix

  mysql-test/r/delayed.result@1.12.2.4, 2007-12-13 15:47:21+04:00, gluh@mysql.com +0 -16
    after merge fix

  mysql-test/r/func_misc.result@1.21.4.4, 2007-12-13 15:47:21+04:00, gluh@mysql.com +1 -1
    after merge fix

  mysql-test/t/func_misc.test@1.21.4.4, 2007-12-13 15:47:21+04:00, gluh@mysql.com +1 -2
    after merge fix

ChangeSet@1.1810.3491.18, 2007-12-13 12:03:11+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #33206  	signal not reset properly in ndb

  ndb/src/kernel/vm/SimulatedBlock.cpp@1.17.14.1, 2007-12-13 12:03:09+01:00, tomas@whalegate.ndb.mysql.com +2 -0
    Bug #33206  	signal not reset properly in ndb

ChangeSet@1.1810.3554.1, 2007-12-13 13:38:22+03:00, sergefp@mysql.com +4 -0
  BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly
  - Make conditions like "date_col $CMP$ 'datetime-const'" range-sargable

  mysql-test/r/range.result@1.44.1.15, 2007-12-13 13:38:19+03:00, sergefp@mysql.com +18 -0
    BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly
    - Testcase

  mysql-test/t/range.test@1.37.1.12, 2007-12-13 13:38:19+03:00, sergefp@mysql.com +20 -0
    BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly
    - Testcase

  sql/field.cc@1.256.1.111, 2007-12-13 13:38:19+03:00, sergefp@mysql.com +3 -0
    BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly
    - Added comments

  sql/opt_range.cc@1.159.41.7, 2007-12-13 13:38:20+03:00, sergefp@mysql.com +26 -1
    BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly
    - Make conditions like "date_col $CMP$ 'datetime-const'" range-sargable

ChangeSet@1.2476.777.1, 2007-12-13 12:26:55+02:00, bell@desktop.sanja.is.com.ua +13 -0
  Postreview changes.

  mysql-test/r/maria-big.result@1.2, 2007-12-13 12:26:52+02:00, bell@desktop.sanja.is.com.ua +2 -0
    Change to make maria-purge more stable: increasing file size
      to let all records fit in one log.

  mysql-test/r/maria-connect.result@1.3, 2007-12-13 12:26:52+02:00, bell@desktop.sanja.is.com.ua +1 -0
    Change to make maria-purge more stable: increasing file size
      to let all records fit in one log.

  mysql-test/r/maria-purge.result@1.2, 2007-12-13 12:26:52+02:00, bell@desktop.sanja.is.com.ua +20 -14
    Change to make maria-purge more stable.

  mysql-test/r/maria.result@1.26, 2007-12-13 12:26:52+02:00, bell@desktop.sanja.is.com.ua +2 -1
    Change to make maria-purge more stable: increasing file size
      to let all records fit in one log.

  mysql-test/r/ps_maria.result@1.7, 2007-12-13 12:26:52+02:00, bell@desktop.sanja.is.com.ua +1 -0
    Change to make maria-purge more stable: increasing file size
      to let all records fit in one log.

  mysql-test/t/maria-big.test@1.2, 2007-12-13 12:26:52+02:00, bell@desktop.sanja.is.com.ua +2 -0
    Change to make maria-purge more stable: increasing file size
      to let all records fit in one log.

  mysql-test/t/maria-connect.test@1.3, 2007-12-13 12:26:52+02:00, bell@desktop.sanja.is.com.ua +2 -0
    Change to make maria-purge more stable: increasing file size
      to let all records fit in one log.

  mysql-test/t/maria-purge.test@1.2, 2007-12-13 12:26:52+02:00, bell@desktop.sanja.is.com.ua +10 -5
    Change to make maria-purge more stable.

  mysql-test/t/maria-recovery.test@1.3.1.1, 2007-12-13 12:26:52+02:00, bell@desktop.sanja.is.com.ua +2 -0
    Change to make maria-purge more stable: increasing file size
      to let all records fit in one log.

  mysql-test/t/maria.test@1.23, 2007-12-13 12:26:52+02:00, bell@desktop.sanja.is.com.ua +2 -0
    Change to make maria-purge more stable: increasing file size
      to let all records fit in one log.

  mysql-test/t/ps_maria.test@1.2, 2007-12-13 12:26:52+02:00, bell@desktop.sanja.is.com.ua +2 -0
    Change to make maria-purge more stable: increasing file size
      to let all records fit in one log.

  storage/maria/ma_loghandler.c@1.84.1.1, 2007-12-13 12:26:52+02:00, bell@desktop.sanja.is.com.ua +216 -187
    Postreview changes.

  storage/maria/ma_loghandler.h@1.39, 2007-12-13 12:26:52+02:00, bell@desktop.sanja.is.com.ua +7 -2
    Postreview changes.

ChangeSet@1.1810.3553.1, 2007-12-13 11:19:05+01:00, mhansson@linux-st28.site +5 -0
  Bug #32858: Erro: "Incorrect usage of UNION and INTO" does not take 
  subselects into account
  
  It is forbidden to use the SELECT INTO construction inside UNION statements
  unless on the last SELECT of the union. The parser records whether it 
  has seen INTO or not when parsing a UNION statement. But if the INTO was
  legally used in an outer query, an error is thrown if UNION is seen in a
  subquery. Fixed in 5.0 by remembering the nesting level of INTO tokens and 
  mitigate the error unless it collides with the UNION.

  mysql-test/r/union.result@1.80.5.1, 2007-12-13 11:19:03+01:00, mhansson@linux-st28.site +42 -0
    Bug#32858: Test result

  mysql-test/t/union.test@1.97.2.1, 2007-12-13 11:19:03+01:00, mhansson@linux-st28.site +59 -0
    Bug#32858: Test case

  sql/sql_class.cc@1.223.39.1, 2007-12-13 11:19:03+01:00, mhansson@linux-st28.site +1 -0
    Bug#32858: Initializing new member

  sql/sql_class.h@1.230.88.1, 2007-12-13 11:19:03+01:00, mhansson@linux-st28.site +34 -3
    Bug#32858: Added property nest_level to select_result class.

  sql/sql_yacc.yy@1.371.140.1, 2007-12-13 11:19:03+01:00, mhansson@linux-st28.site +16 -9
    Bug#32858: The fix.

ChangeSet@1.2476.771.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.747.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.769.7, 2007-12-13 05:37:38+03:00, kostja@bodhi.(none) +2 -0
  Fix a compilation warning and a subtle bug with truncation of the 
  last_insert_id introduced by the patch for Bug#12713 (part 1)

  sql/sql_class.cc@1.354, 2007-12-13 05:37:34+03:00, kostja@bodhi.(none) +1 -1
    Fix a compilation warning and a subtle bug with truncation of the 
    last_insert_id introduced by the patch for Bug#12713 (part 1)

  sql/sql_class.h@1.411, 2007-12-13 05:37:35+03:00, kostja@bodhi.(none) +3 -3
    Fix a compilation warning and a subtle bug with truncation of the 
    last_insert_id introduced by the patch for Bug#12713 (part 1)

ChangeSet@1.2476.768.4, 2007-12-12 19:14:28-07:00, tsmith@ramayana.hindu.god +1 -0
  Bug #33192: mysql_install_db bad merge, corrupt code == appears to succeed but does nothing
  
  Repair a bad merge that made mysql_install_db silently fail, doing nothing.

  scripts/mysql_install_db.sh@1.95, 2007-12-12 19:14:27-07:00, tsmith@ramayana.hindu.god +17 -3
    Repair a bad merge that left out some code changes.

ChangeSet@1.2476.769.6, 2007-12-13 04:33:54+03:00, kostja@bodhi.(none) +1 -0
  Silence a new warning printed by rpl_row_tabledefs_3innodb test execution.

  mysql-test/lib/mtr_report.pl@1.61.1.5, 2007-12-13 04:33:51+03:00, kostja@bodhi.(none) +1 -0
    Silence a new warning printed by rpl_row_tabledefs_3innodb test execution.

ChangeSet@1.2476.769.5, 2007-12-13 04:19:23+03:00, kostja@bodhi.(none) +1 -0
  Fix a compilation error.

  sql/protocol.cc@1.133.1.3, 2007-12-13 04:19:15+03:00, kostja@bodhi.(none) +0 -1
    Fix a compilation error.

ChangeSet@1.2476.775.1, 2007-12-12 23:57:28+02:00, monty@mysql.com +13 -0
  Removed MARIA_BASE min_row_length (duplicate of min_block_length)
  Cleanup of recent code changes in dbug and my_thr_init
  Added name for each safe_mutex (for better DBUG and error reporting)
  Fixed that sort_info.max_records is calculated correctly. This fixed a bug in maria_chk
  Removed duplicate printing of mutex address in dbug log

  dbug/dbug.c@1.38.1.2, 2007-12-12 23:57:23+02:00, monty@mysql.com +5 -4
    Cleanup of recent code changes

  include/my_pthread.h@1.118.1.2, 2007-12-12 23:57:23+02:00, monty@mysql.com +4 -5
    Added name for each safe_mutex (for better DBUG and error reporting)

  mysys/my_thr_init.c@1.61, 2007-12-12 23:57:23+02:00, monty@mysql.com +3 -17
    Cleanup of recent code changes

  mysys/thr_mutex.c@1.32.1.3, 2007-12-12 23:57:23+02:00, monty@mysql.com +49 -41
    Added name for each safe_mutex (for better DBUG and error reporting)

  mysys/wqueue.c@1.2, 2007-12-12 23:57:23+02:00, monty@mysql.com +7 -5
    Removed some mutex printing (as it's done now when we take mutex)

  storage/maria/Makefile.am@1.22, 2007-12-12 23:57:23+02:00, monty@mysql.com +3 -0
    Fixed that 'make tags' works with xemacs

  storage/maria/ma_blockrec.c@1.62.1.1, 2007-12-12 23:57:23+02:00, monty@mysql.com +11 -10
    base.min_row_length -> base.min_block_length
    (As they where basicly the same variable) 

  storage/maria/ma_check.c@1.53.1.1, 2007-12-12 23:57:23+02:00, monty@mysql.com +68 -78
    Moved more common stuff to initialize_variables_for_repair
    Fixed that sort_info.max_records is calculated correctly. This fixed a bug in maria_chk

  storage/maria/ma_create.c@1.36, 2007-12-12 23:57:23+02:00, monty@mysql.com +13 -7
    More comments
    Fixed that min_pack_length is calculated more correctly
    Removed duplicate variable base.min_row_length

  storage/maria/ma_loghandler.c@1.80.3.1, 2007-12-12 23:57:23+02:00, monty@mysql.com +15 -33
    Removed duplicate printing of mutex address

  storage/maria/ma_open.c@1.42, 2007-12-12 23:57:23+02:00, monty@mysql.com +3 -3
    Removed base.min_row_length

  storage/maria/ma_packrec.c@1.18, 2007-12-12 23:57:23+02:00, monty@mysql.com +0 -3
    Removed not anymore needed code
    (One should not change any .base variables as this will affect repair with unpack)

  storage/maria/maria_def.h@1.49.1.1, 2007-12-12 23:57:23+02:00, monty@mysql.com +0 -1
    Removed base.min_row_length

ChangeSet@1.2476.774.1, 2007-12-12 19:44:14-02:00, davi@mysql.com +11 -0
  Bug#32395 Alter table under a impending global read lock causes a server crash
  
  The problem is that some DDL statements (ALTER TABLE, CREATE
  TRIGGER, FLUSH TABLES, ...) when under LOCK TABLES need to
  momentarily drop the lock, reopen the table and grab the write
  lock again (using reopen_tables). When grabbing the lock again,
  reopen_tables doesn't pass a flag to mysql_lock_tables in
  order to ignore the impending global read lock, which causes a
  assertion because LOCK_open is being hold. Also dropping the
  lock must not signal to any threads that the table has been
  relinquished (related to the locking/flushing protocol).
  
  The solution is to correct the way the table is reopenned
  and the locks grabbed. When reopening the table and under
  LOCK TABLES, the table version should be set to 0 so other
  threads have to wait for the table. When grabbing the lock,
  any other flush should be ignored because it's theoretically
  a atomic operation. The chosen solution also fixes a potential
  discrepancy between binlog and GRL (global read lock) because
  table placeholders were being ignored, now a FLUSH TABLES WITH
  READ LOCK will properly for table with open placeholders.
  
  It's also important to mention that this patch doesn't fix
  a potential deadlock if one uses two GRLs under LOCK TABLES
  concurrently.

  mysql-test/r/lock_multi.result@1.32, 2007-12-12 19:44:11-02:00, davi@mysql.com +30 -0
    Add test case result for Bug#32395

  mysql-test/r/trigger_notembedded.result@1.16, 2007-12-12 19:44:11-02:00, davi@mysql.com +14 -0
    Add test case result for Bug#32395

  mysql-test/t/lock_multi.test@1.34, 2007-12-12 19:44:11-02:00, davi@mysql.com +97 -1
    Add test case for Bug#32395

  mysql-test/t/trigger_notembedded.test@1.18, 2007-12-12 19:44:11-02:00, davi@mysql.com +3 -3
    Enable test case for Bug#32395

  sql/ha_ndbcluster.cc@1.461.14.1, 2007-12-12 19:44:11-02:00, davi@mysql.com +2 -2
    Update close_cached_tables usage.

  sql/ha_ndbcluster_binlog.cc@1.136.2.1, 2007-12-12 19:44:11-02:00, davi@mysql.com +6 -6
    Update close_cached_tables usage.

  sql/mysql_priv.h@1.523.23.7, 2007-12-12 19:44:11-02:00, davi@mysql.com +2 -1
    Update close_cache_tables prototype.

  sql/set_var.cc@1.240.25.1, 2007-12-12 19:44:12-02:00, davi@mysql.com +1 -1
    Update close_cached_tables usage and set flag to wait for
    tables with placeholders. This is one of the places where
    a GRL can be obtained.

  sql/sql_base.cc@1.421.26.1, 2007-12-12 19:44:12-02:00, davi@mysql.com +46 -23
    Preserve old version for write locked tables and ignore
    pending flushes and update close_cache_tables to take
    into account name locked tables.

  sql/sql_parse.cc@1.683.34.3, 2007-12-12 19:44:12-02:00, davi@mysql.com +4 -3
    Update close_cached_tables usage and pass flag so that
    name locked tables are waited for.

  sql/sql_table.cc@1.437.35.1, 2007-12-12 19:44:12-02:00, davi@mysql.com +1 -1
    Protect the table against a impending GRL if under LOCK TABLES.

ChangeSet@1.2476.505.26, 2007-12-12 22:33:36+01:00, guilhem@gbichot4.local +13 -0
  WL#3072 - Maria Recovery: recovery of state.auto_increment.
  When we log UNDO_KEY_INSERT for an auto_inc key, we update
  state.auto_increment (not anymore at the end of maria_write() except
  if this is a non-transactional table). When Recovery sees UNDO_KEY_INSERT
  in the REDO phase, it reads the auto_inc value from it and updates
  state.auto_increment.

  mysql-test/r/maria-recovery.result@1.4, 2007-12-12 22:33:33+01:00, guilhem@gbichot4.local +60 -0
    Without the code fix, there would be in CHECK TABLE:
    "Auto-increment value: 0 is smaller than max used value: 3"
    and no AUTO_INCREMENT= clause in SHOW CREATE TABLE.

  mysql-test/t/maria-recovery.test@1.4, 2007-12-12 22:33:33+01:00, guilhem@gbichot4.local +33 -0
    Test of recovery of state.auto_increment: from an old table,
    does the replaying of the log set state.auto_increment to
    what it should be.

  storage/maria/ma_check.c@1.55, 2007-12-12 22:33:33+01:00, guilhem@gbichot4.local +7 -2
    new way of calling ma_retrieve_auto_increment(): pass key

  storage/maria/ma_key.c@1.11, 2007-12-12 22:33:33+01:00, guilhem@gbichot4.local +8 -6
    ma_retrieve_auto_increment() now operates directly with a pointer
    to the key and not on the record.

  storage/maria/ma_key_recover.c@1.8, 2007-12-12 22:33:33+01:00, guilhem@gbichot4.local +28 -0
    dedicated write_hook_for_undo_key_insert(): sets state.auto_increment
    under log's mutex.

  storage/maria/ma_key_recover.h@1.4, 2007-12-12 22:33:33+01:00, guilhem@gbichot4.local +4 -0
    Dedicated hook for UNDO_KEY_INSERT, to set state.auto_increment.
    Such hook needs a new member st_msg_write_hook_for_undo_key::auto_increment,
    which contains the auto_increment value inserted.

  storage/maria/ma_loghandler.c@1.85, 2007-12-12 22:33:33+01:00, guilhem@gbichot4.local +1 -1
    UNDO_KEY_INSERT gets a dedicated write_hook, to set auto_increment.

  storage/maria/ma_recovery.c@1.58, 2007-12-12 22:33:33+01:00, guilhem@gbichot4.local +44 -0
    When in the REDO phase we see UNDO_KEY_INSERT: if the state is older
    than this record, and the key is the auto_increment one, read
    the key's value from the log record and update state.auto_increment.

  storage/maria/ma_test_all.sh@1.18, 2007-12-12 22:33:33+01:00, guilhem@gbichot4.local +10 -10
    use $maria_path to be able to run from /dev/shm (faster)

  storage/maria/ma_update.c@1.16, 2007-12-12 22:33:34+01:00, guilhem@gbichot4.local +7 -3
    bool is more of C++, using my_bool.
    If table is transactional, state.auto_increment is already updated
    in write_hook_for_undo_key_insert().

  storage/maria/ma_write.c@1.26, 2007-12-12 22:33:34+01:00, guilhem@gbichot4.local +26 -7
    If table is transactional, state.auto_increment is not updated at
    the end of maria_write() but rather in write_hook_for_undo_key_insert()
    (under log's mutex, so that a concurrent checkpoint does not read
    state.auto_increment while it is changing - corrupted).
    _ma_ck_write_btree_with_log() extracts the auto_increment value
    from the key, puts it into msg.auto_increment, and this is passed
    to write_hook_for_undo_key_insert().

  storage/maria/maria_def.h@1.50, 2007-12-12 22:33:34+01:00, guilhem@gbichot4.local +1 -2
    change of prototype of ma_retrieve_auto_increment()

  storage/maria/maria_read_log.c@1.29, 2007-12-12 22:33:34+01:00, guilhem@gbichot4.local +5 -5
    use default log file size. Use separate page caches for table
    and logs (needed if maria_block_size!=TRANSLOG_PAGE_SIZE).

ChangeSet@1.2476.771.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/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_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_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.1810.3545.6, 2007-12-12 19:49:08+01:00, istruewing@stella.local +1 -0
  Dummy push to help pushbuild running again.
  Fixed case of comment.

  mysql-test/t/merge.test@1.37.4.1, 2007-12-12 19:49:07+01:00, istruewing@stella.local +1 -1
    Fixed case of comment.

ChangeSet@1.2476.773.1, 2007-12-12 13:05:32-05:00, dkatz@damien-katzs-computer.local +1 -0
  Bug #29993	Default value of log_output should be 'FILE', not 'TABLE'
  
  Ensure default logging is "file" logging, for additional ways the option can be turned on. Verified on OS X, but not tested automatically.

  sql/mysqld.cc@1.583.130.1, 2007-12-12 13:05:25-05:00, dkatz@damien-katzs-computer.local +2 -2
    Bug #29993	Default value of log_output should be 'FILE', not 'TABLE'
    
    Ensure default logging is "file" logging, for additional ways the option can be turned on. Verified on OS X, but not tested automatically.

ChangeSet@1.2476.772.1, 2007-12-12 18:21:01+03:00, kostja@bodhi.(none) +51 -0
  Bug#12713 "Error in a stored function called from a SELECT doesn't 
  cause ROLLBACK of statement", part 1. Review fixes.
  
  Do not send OK/EOF packets to the client until we reached the end of 
  the current statement.
  This is a consolidation, to keep the functionality that is shared by all 
  SQL statements in one place in the server.
  Currently this functionality includes:
  - close_thread_tables()
  - log_slow_statement().
  
  After this patch and the subsequent patch for Bug#12713, it shall also include:
  - ha_autocommit_or_rollback()
  - net_end_statement()
  - query_cache_end_of_result().
  
  In future it may also include:
  - mysql_reset_thd_for_next_command().

  include/mysql_com.h@1.123.1.4, 2007-12-12 18:20:53+03:00, kostja@bodhi.(none) +9 -10
    Rename now unused members of NET: no_send_ok, no_send_error, report_error.
    These were server-specific variables related to the client/server
    protocol. They have been made obsolete by this patch.
    
    Previously the same members of NET were used to store the error message
    both on the client and on the server. 
    The error message was stored in net.last_error (client: mysql->net.last_error,
    server: thd->net.last_error).
    The error code was stored in net.last_errno (client: mysql->net.last_errno,
    server: thd->net.last_errno).
    The server error code and message are now stored elsewhere 
    (in the Diagnostics_area), thus NET members are no longer used by the
    server.
    Rename last_error to client_last_error, last_errno to client_last_errno
    to avoid potential bugs introduced by merges.

  include/mysql_h.ic@1.15, 2007-12-12 18:20:53+03:00, kostja@bodhi.(none) +5 -5
    Update the ABI file to reflect a rename. 
    Renames do not break the binary compatibility.

  libmysql/libmysql.c@1.305, 2007-12-12 18:20:53+03:00, kostja@bodhi.(none) +22 -18
    Rename last_error to client_last_error, last_errno to client_last_errno.
    This is necessary to ensure no unnoticed bugs introduced by merged
    changesets.
    
    Remove net.report_error, net.no_send_ok, net.no_send_error.

  libmysql/manager.c@1.19, 2007-12-12 18:20:53+03:00, kostja@bodhi.(none) +1 -1
    Rename net.last_errno to net.client_last_errno.

  libmysqld/lib_sql.cc@1.144, 2007-12-12 18:20:53+03:00, kostja@bodhi.(none) +56 -31
    Rename net.last_errno to net.client_last_errno.
    
    Update the embedded implementation of the client-server protocol to
    reflect the refactoring of protocol.cc.

  libmysqld/libmysqld.c@1.76, 2007-12-12 18:20:53+03:00, kostja@bodhi.(none) +3 -2
    Rename net.last_errno to net.client_last_errno.

  mysql-test/r/events.result@1.56, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +2 -1
    Update to reflect the change in mysql_rm_db(). Now we drop stored
    routines and events for a given database name only if there
    is a directory for this database name. ha_drop_database() and
    query_cache_invalidate() are called likewise. 
    Previously we would attempt to drop routines/events even if database
    directory was not found (it worked, since routines and events are stored
    in tables). This fixes Bug 29958 "Weird message on DROP DATABASE if mysql.proc
    does not exist".
    The change was done because the previous code used to call send_ok()
    twice, which led to an assertion failure when asserts against it were
    added by this patch.

  mysql-test/r/grant.result@1.83.1.4, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +1 -3
    Fix the patch for Bug 16470, now FLUSH PRIVILEGES produces an error 
    if mysql.procs_priv is missing.
    This fixes the assert that send_ok() must not called after send_error()
    (the original patch for Bug 16470 was prone to this).

  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result@1.27.1.1, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +2 -2
    Produce a more detailed error message.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result@1.24.1.1, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +2 -2
    Produce a more detailed error message.

  mysql-test/t/grant.test@1.63.1.2, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +1 -0
    Update the test, now FLUSH PRIVILEGES returns an error if mysql.procs_priv
    is missing.

  server-tools/instance-manager/mysql_connection.cc@1.30.1.1, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +1 -1
    Rename net.last_errno to net.client_last_errno.

  sql-common/client.c@1.149, 2007-12-12 18:20:56+03:00, kostja@bodhi.(none) +38 -36
    Rename last_error to client_last_error, last_errno to client_last_errno.

  sql/ha_ndbcluster_binlog.cc@1.136.1.1, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +21 -4
    Add asserts. 
    
    Use getters to access statement status information.
    
    Add a comment why run_query() is broken. Reset the diagnostics area
    in the end of run_query() to fulfill the invariant that the diagnostics_area
    is never assigned twice per statement (see the comment in the code
    when this can happen). We still do not clear thd->is_fatal_error and
    thd->is_slave_error, which may lead to bugs, I consider the whole affair
    as something to be dealt with separately.

  sql/ha_partition.cc@1.104.7.1, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +1 -0
    fatal_error() doesn't set an error by itself. Perhaps we should
    remove this method altogether and instead add a flag to my_error 
    to set thd->is_fatal_error property.
    
    Meanwhile, this change is a part of inspection made to the entire source
    code with the goal to ensure that fatal_error()
    is always accompanied by my_error().

  sql/item_func.cc@1.409.17.7, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +0 -1
    There is no net.last_error anymore. Remove the obsolete assignment.

  sql/log_event.cc@1.277.43.1, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +31 -21
    Use getters to access statement error status information.

  sql/log_event_old.cc@1.11.1.1, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +8 -8
    Use getters to access statement error status information.

  sql/mysqld.cc@1.583.129.1, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +31 -19
    Previously, if a continue handler for an error was found, my_message_sql() 
    would not set an error in THD. Since the current statement
    must be aborted in any case, find_handler() had a hack to assign 
    thd->net.report_error to 1.
    
    Remove this hack. Set an error in my_message_sql() even if the continue
    handler is found. The error will be cleared anyway when the handler
    is executed. This is one action among many in this patch to ensure the 
    invariant that whenever thd->is_error() is TRUE, we have a message in 
    thd->main_da.message().

  sql/net_serv.cc@1.113.2.2, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +29 -29
    Use a full-blown my_error() in net_serv.cc to report an error,
    instead of just setting net->last_errno. This ensures the invariant that
    whenever thd->is_error() returns TRUE, we have a message in 
    thd->main_da.message().
    
    Remove initialization of removed NET members.

  sql/opt_range.cc@1.274.8.1, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +1 -1
    Use my_error() instead of just raising thd->net.report_error. 
    This ensures the invariant that whenever thd->is_error() returns TRUE, 
    there is a message in thd->main_da.message().

  sql/opt_sum.cc@1.64.1.2, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +2 -0
    Move invocation of fatal_error() right next to the place where
    we set the error message. That makes it easier to track that whenever
    fatal_error() is called, there is a message in THD.

  sql/protocol.cc@1.133.1.2, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +155 -72
    Rename send_ok() and send_eof() to net_send_ok() and net_send_eof() 
    respectively. These functions write directly to the network and are not 
    for use anywhere outside the client/server protocol code. 
    
    Remove the code that was responsible for cases when either there is 
    no error code, or no error message, or both.
    Instead the calling code ensures that they are always present. Asserts
    are added to enforce the invariant.
    
    Instead of a direct access to thd->server_status and thd->total_warn_count
    use function parameters, since these from now on don't always come directly
    from THD.
    
    Introduce net_end_statement(), the single-entry-point replacement API for 
    send_ok(), send_eof() and net_send_error().
    
    Implement Protocol::end_partial_result_set to use in select_send::abort()
    when there is a continue handler. 

  sql/protocol.h@1.42.1.2, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +2 -3
    Update declarations.

  sql/repl_failsafe.cc@1.76.3.1, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +3 -1
    Use getters to access statement status information in THD.
    Rename net.last_error to net.client_last_error.

  sql/rpl_record.cc@1.17, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +3 -2
    Set an error message in prepare_record() if there is no default
    value for the field -- later we do print this message to the client.

  sql/rpl_rli.cc@1.14.1.1, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +2 -2
    Use getters to access statement status information in THD.

  sql/slave.cc@1.328, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +36 -24
    In create_table_from_dump() (a common function that is used in 
    LOAD MASTER TABLE SQL statement and COM_LOAD_MASTER_DATA), instead of hacks
    with no_send_ok, clear the diagnostics area when mysql_rm_table() succeeded.
    
    Update has_temporary_error() to work correctly when no error is set.
    This is the case when Incident_log_event is executed: it always returns
    an error but does not set an error message.
    
    Use getters to access error status information.

  sql/sp_head.cc@1.299, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +9 -7
    Instead of hacks with no_send_error, work through the diagnostics area 
    interface to suppress sending of OK/ERROR packets to the client.
    
    Move query_cache_end_of_result before log_slow_statement(), similarly
    to how it's done in dispatch_command().

  sql/sp_rcontext.cc@1.49, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +1 -21
    Remove hacks with assignment of thd->net.report_error, they are not
    necessary any more (see the changes in mysqld.cc).

  sql/sql_acl.cc@1.253.1.1, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +3 -6
    Use getters to access error status information in THD.

  sql/sql_base.cc@1.421.1.22, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +28 -5
    Access thd->main_da.sql_errno() only if there is an error. This fixes
    a bug when auto-discovery, that was effectively disabled under pre-locking.

  sql/sql_binlog.cc@1.16, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +0 -16
    Remove hacks with no_send_ok/no_send_error, they are not necessary 
    anymore: the caller is responsible for network communication.

  sql/sql_cache.cc@1.129.1.1, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +1 -0
    Disable sending of OK/ERROR/EOF packet in the end of dispatch_command
    if the response has been served from the query cache. This raises the 
    question whether we should store EOF packet in the query cache at all,
    or generate it anew for each statement (we should generate it anew), but
    this is to be addressed separately.

  sql/sql_class.cc@1.353, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +131 -24
    Implement class Diagnostics_area. Please see comments in sql_class.h
    for details.
    
    Fix a subtle coding mistake in select_send::send_data: when on slave, 
    an error in Item::send() was ignored.
    The problem became visible due to asserts that the diagnostics area is
    never double assigned.
    
    Remove initialization of removed NET members.
    
    In select_send::abort() do not call select_send::send_eof(). This is
    not inheritance-safe. Even if a stored procedure continue handler is
    found, the current statement is aborted, not succeeded.
    Instead introduce a Protocol API to send the required response, 
    Protocol::end_partial_result_set().
    
    This simplifies implementation of select_send::send_eof(). No need
    to add more asserts that there is no error, there is an assert inside
    Diagnostics_area::set_ok_status() already.
    
    Leave no trace of no_send_* in the code.

  sql/sql_class.h@1.408.2.1, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +153 -6
    Declare class Diagnostics_area. 
    
    Remove the hack with no_send_ok from
    Substatement_state.
    
    Provide inline implementations of send_ok/send_eof.
    
    Add commetns.

  sql/sql_connect.cc@1.20, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +10 -23
    Remove hacks with no_send_error. 
    
    Since now an error in THD is always set if net->error, it's not necessary
    to check both net->error and thd->is_error() in the do_command loop.
    
    Use thd->main_da.message() instead of net->last_errno.
    
    Remove the hack with is_slave_error in sys_init_connect. Since now we do not
    reset the diagnostics area in net_send_error (it's reset at the beginning
    of the next statement), we can access it safely even after 
    execute_init_command.

  sql/sql_db.cc@1.165, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +3 -2
    Update the code to satisfy the invariant that the diagnostics area is never
    assigned twice.
    Incidentally, this fixes Bug 29958 "Weird message on DROP DATABASE if 
    mysql.proc does not exist".

  sql/sql_delete.cc@1.235, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +8 -0
    Change multi-delete to abort in abort(), as per select_send protocol.
    Fixes the merge error with the test for Bug 29136

  sql/sql_derived.cc@1.84, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +3 -2
    Use getters to access error information.

  sql/sql_insert.cc@1.299.7.1, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +10 -6
    Use getters to access error information.

  sql/sql_parse.cc@1.683.35.1, 2007-12-12 18:20:56+03:00, kostja@bodhi.(none) +61 -65
    Remove hacks with no_send_error. Deploy net_end_statement().
    
    The story of COM_SHUTDOWN is interesting. Long story short, the server 
    would become on its death's door, and only no_send_ok/no_send_error assigned
    by send_ok()/net_send_error() would hide its babbling from the client.
    
    First of all, COM_QUIT does not require a response. So, the comment saying
    "Let's send a response to possible COM_QUIT" is not only groundless 
    (even mysqladmin shutdown/mysql_shutdown() doesn't send COM_QUIT after 
    COM_SHUTDOWN), it's plainly incorrect.
    
    Secondly, besides this additional 'OK' packet to respond to a hypothetical
    COM_QUIT, there was the following code in dispatch_command():
    
    if (thd->killed)
      thd->send_kill_message();
    if (thd->is_error()
      net_send_error(thd);
    
    This worked out really funny for the thread through which COM_SHUTDOWN
    was delivered: we would get COM_SHUTDOWN, say okay, say okay again, 
    kill everybody, get the kill signal ourselves, and then attempt to say 
    "Server shutdown in progress" to the client that is very likely long gone.
    
    This all became visible when asserts were added that the Diagnostics_area
    is not assigned twice.
    
    Move query_cache_end_of_result() to the end of dispatch_command(), since
    net_send_eof() has been moved there. This is safe, query_cache_end_of_result()
    is a no-op if there is no started query in the cache.
    
    Consistently use select_send interface to call abort() or send_eof()
    depending on the operation result.
    
    Remove thd->fatal_error() from reset_master(), it was a no-op. 
    in hacks with no_send_error woudl save us
    from complete breakage of the client/server protocol.
    
    Consistently use select_send::abort() whenever there is an error, 
    and select_send::send_eof() in case of success.
    The issue became visible due to added asserts.

  sql/sql_partition.cc@1.120.1.1, 2007-12-12 18:20:56+03:00, kostja@bodhi.(none) +1 -0
    Always set an error in THD whenever there is a call to fatal_error().

  sql/sql_prepare.cc@1.234.1.3, 2007-12-12 18:20:56+03:00, kostja@bodhi.(none) +17 -10
    Deploy class Diagnostics_area.
    Remove the unnecessary juggling with the protocol in 
    Select_fetch_protocol_binary::send_eof(). EOF packet format is 
    protocol-independent.

  sql/sql_select.cc@1.541.39.4, 2007-12-12 18:20:56+03:00, kostja@bodhi.(none) +1 -1
    Call fatal_error() directly in opt_sum_query.
    Call my_error() whenever we call thd->fatal_error().

  sql/sql_servers.cc@1.17, 2007-12-12 18:20:56+03:00, kostja@bodhi.(none) +1 -1
    Use getters to access error information in THD.

  sql/sql_show.cc@1.438.4.3, 2007-12-12 18:20:56+03:00, kostja@bodhi.(none) +32 -23
    Use getters to access error information in THD.
    
    Add comments.
    
    Call my_error() whenever we call fatal_error().

  sql/sql_table.cc@1.437.33.1, 2007-12-12 18:20:56+03:00, kostja@bodhi.(none) +23 -9
    Replace hacks with no_send_ok with the interface of the diagnostics area.
    
    Clear the error if ENOENT error in ha_delete_table().

  sql/sql_update.cc@1.239.1.24, 2007-12-12 18:20:56+03:00, kostja@bodhi.(none) +4 -0
    Introduce multi_update::abort(), which is the proper way to abort a
    multi-update. This fixes the merge conflict between this patch and
    the patch for Bug 29136.

  sql/table.cc@1.296.10.9, 2007-12-12 18:20:56+03:00, kostja@bodhi.(none) +14 -13
    Use a getter to access error information in THD.

  sql/tztime.cc@1.60, 2007-12-12 18:20:56+03:00, kostja@bodhi.(none) +1 -1
    Use a getter to access error information in THD.

ChangeSet@1.2476.770.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/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_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_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.523.28.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.583.120.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.240.23.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.84.15.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.159.9.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.758.3, 2007-12-11 17:30:42-05:00, dkatz@damien-katzs-computer.local +4 -0
  Bug #30651	Problems with thread_handling system variable
  
  Changed thread_handling variable to a global only, read only variable, as it is currently used.

  mysql-test/r/no-threads.result@1.3, 2007-12-11 17:30:36-05:00, dkatz@damien-katzs-computer.local +4 -0
    Bug #30651	Problems with thread_handling system variable
    
    Changed thread_handling variable to a global only, read only variable, as it is currently used.

  mysql-test/t/no-threads.test@1.3, 2007-12-11 17:30:37-05:00, dkatz@damien-katzs-computer.local +10 -0
    Bug #30651	Problems with thread_handling system variable
    
    Changed thread_handling variable to a global only, read only variable, as it is currently used.

  sql/set_var.cc@1.240.22.1, 2007-12-11 17:30:37-05:00, dkatz@damien-katzs-computer.local +8 -1
    Bug #30651	Problems with thread_handling system variable
    
    Changed thread_handling variable to a global only, read only variable, as it is currently used.

  sql/set_var.h@1.84.14.1, 2007-12-11 17:30:37-05:00, dkatz@damien-katzs-computer.local +18 -0
    Bug #30651	Problems with thread_handling system variable
    
    Changed thread_handling variable to a global only, read only variable, as it is currently used.

ChangeSet@1.2476.751.5, 2007-12-11 20:32:38+01:00, joerg@debian.(none) +1 -0
  Merge debian.(none):/MySQL/M50/indent-5.0
  into  debian.(none):/MySQL/M51/indent-5.1
  
  Manual merge of a formatting change.

  Makefile.am@1.118.5.1, 2007-12-11 20:32:30+01:00, joerg@debian.(none) +40 -40
    Manual merge of the formatting change in 5.0,
    the test actions differ so much that automerge doesn't work.

ChangeSet@1.1810.3549.1, 2007-12-11 20:15:03+01:00, mhansson@linux-st28.site +6 -0
  Bug#32848: Data type conversion bug in union subselects in MySQL 5.0.38
  
  There were two problems when inferring the correct field types resulting from
  UNION queries.
  - If the type is NULL for all corresponding fields in the UNION, the resulting 
    type would be NULL, while the type is BINARY(0) if there is just a single 
    SELECT NULL.
  - If one SELECT in the UNION uses a subselect, a temporary table is created
    to represent the subselect, and the result type defaults to a STRING type,
    hiding the fact that the type was unknown(just a NULL value).
  Fixed by remembering whenever a field was created from a NULL value and pass
  type NULL to the type coercion if that is the case, and creating a string field
  as result of UNION only if the type would otherwise be NULL.

  mysql-test/r/union.result@1.80.1.12, 2007-12-11 20:14:59+01:00, mhansson@linux-st28.site +24 -0
    Bug#32848: Test result

  mysql-test/t/union.test@1.97.1.3, 2007-12-11 20:14:59+01:00, mhansson@linux-st28.site +24 -0
    Bug#32848: Test case

  sql/field.cc@1.256.67.1, 2007-12-11 20:14:59+01:00, mhansson@linux-st28.site +2 -1
    Bug#32848: Initialization of new field

  sql/field.h@1.153.35.1, 2007-12-11 20:14:59+01:00, mhansson@linux-st28.site +10 -0
    Bug#32848: New member to record when a field was created from a NULL value.

  sql/item.cc@1.113.104.1, 2007-12-11 20:14:59+01:00, mhansson@linux-st28.site +4 -0
    Bug#32848: 
    A field created from a NULL value will submit NULL as type to the 
    type coercion procedure.
    If Item_type_holder has not inferred the correct type after processing all
    SELECTs in a UNION, a string field is created.

  sql/sql_select.cc@1.312.193.1, 2007-12-11 20:14:59+01:00, mhansson@linux-st28.site +2 -0
    Bug#32848: Recording when a field is created from a NULL value.

ChangeSet@1.2476.719.27, 2007-12-11 19:57:26+01:00, tomas@whalegate.ndb.mysql.com +5 -0
  move randomly failing tests to ndb_team suite

  mysql-test/suite/ndb/t/disabled.def@1.10, 2007-12-11 19:57:23+01:00, tomas@whalegate.ndb.mysql.com +0 -2
    move randomly failing tests to ndb_team suite

  mysql-test/suite/ndb_team/r/ndb_backup_print.result@1.6, 2007-12-11 19:55:57+01:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/ndb/r/ndb_backup_print.result -> mysql-test/suite/ndb_team/r/ndb_backup_print.result

  mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result@1.14, 2007-12-11 19:55:13+01:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/ndb/r/ndb_dd_backuprestore.result -> mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result

  mysql-test/suite/ndb_team/t/ndb_backup_print.test@1.6, 2007-12-11 19:56:08+01:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/ndb/t/ndb_backup_print.test -> mysql-test/suite/ndb_team/t/ndb_backup_print.test

  mysql-test/suite/ndb_team/t/ndb_dd_backuprestore.test@1.13, 2007-12-11 19:55:02+01:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/ndb/t/ndb_dd_backuprestore.test -> mysql-test/suite/ndb_team/t/ndb_dd_backuprestore.test

ChangeSet@1.2476.719.26, 2007-12-11 19:52:35+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  add capability to run certain testsuites optionally depending on name of clone

  mysql-test/mysql-test-run.pl@1.313.14.1, 2007-12-11 19:52:32+01:00, tomas@whalegate.ndb.mysql.com +24 -2
    add capability to run certain testsuites optionally depending on name of clone

ChangeSet@1.2476.719.25, 2007-12-11 19:51:44+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  remove memleak cased by dynamic variables being lost

  sql/ha_ndbcluster_binlog.cc@1.138, 2007-12-11 19:51:41+01:00, tomas@whalegate.ndb.mysql.com +2 -2
    remove memleak cased by dynamic variables being lost

ChangeSet@1.2476.764.1, 2007-12-11 19:38:40+01:00, guilhem@gbichot4.local +3 -0
  WL#3072 Maria recovery: small fixes to ma_test_recovery
  (output was not repeatable accross machines).

  storage/maria/ma_check.c@1.54, 2007-12-11 19:38:38+01:00, guilhem@gbichot4.local +5 -0
    comment

  storage/maria/ma_test_recovery@1.19, 2007-12-11 19:38:38+01:00, guilhem@gbichot4.local +17 -7
    * data_file_length/key_file_length differ between machines because
    ma_test2 uses srand(). Removing them from output.
    * there is no reason to copy/restore logs, test should work without
    * applying log to recreate tables should not change log, testing this.

  storage/maria/ma_test_recovery.expected@1.15, 2007-12-11 19:38:38+01:00, guilhem@gbichot4.local +0 -192
    output update

ChangeSet@1.1810.3548.1, 2007-12-11 17:38:49+01:00, df@pippilotta.erinye.com +1 -0
  No we're still at 5.0.54.

  configure.in@1.245.77.49, 2007-12-11 17:38:47+01:00, df@pippilotta.erinye.com +2 -2
    No we're still at 5.0.54.

ChangeSet@1.2476.505.24, 2007-12-11 18:10:43+02:00, bell@desktop.sanja.is.com.ua +1 -0
  Logfile size put in allowed boumnds.

  storage/maria/unittest/ma_test_loghandler_purge-t.c@1.6, 2007-12-11 18:10:41+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Logfile size put in allowed boumnds.

ChangeSet@1.2476.505.23, 2007-12-11 17:12:21+02:00, bell@desktop.sanja.is.com.ua +2 -0
  Postmerge changes.

  storage/maria/ma_loghandler.c@1.84, 2007-12-11 17:12:17+02:00, bell@desktop.sanja.is.com.ua +7 -9
    Fixed compiler warning.
    translog_mutex_unlock -> pthread_mutex_unlock: postmerge change.

  storage/maria/unittest/ma_test_loghandler_max_lsn-t.c@1.8, 2007-12-11 17:12:18+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Fixed forgoten log size out of bounds.

ChangeSet@1.2476.762.3, 2007-12-11 16:04:33+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  bug#33142: access after free() for blob replication and online alter table

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@1.90, 2007-12-11 16:04:31+01:00, tomas@whalegate.ndb.mysql.com +12 -0
    bug#33142: access after free() for blob replication and online alter table

ChangeSet@1.2476.763.1, 2007-12-11 15:32:10+01:00, istruewing@stella.local +7 -0
  Bug#30273 - merge tables: Can't lock file (errno: 155)
  
  The patch for Bug 26379 (Combination of FLUSH TABLE and
  REPAIR TABLE corrupts a MERGE table) fixed this bug too.
  However it revealed a new bug that crashed the server.
  
  Flushing a merge table at the moment when it is between open
  and attach of children crashed the server.
  
  The flushing thread wants to abort locks on the flushed table.
  It calls ha_myisammrg::lock_count() and ha_myisammrg::store_lock()
  on the TABLE object of the other thread.
  
  Changed ha_myisammrg::lock_count() and ha_myisammrg::store_lock()
  to accept non-attached children. ha_myisammrg::lock_count() returns
  the number of MyISAM tables in the MERGE table so that the memory
  allocation done by get_lock_data() is done correctly, even if the
  children become attached before ha_myisammrg::store_lock() is
  called. ha_myisammrg::store_lock() will not return any lock if the
  children are not attached.
  
  This is however a change in the handler interface. lock_count()
  can now return a higher number than store_lock() stores locks.
  This is more safe than the reverse implementation would be.
  get_lock_data() in the SQL layer is adjusted accordingly. It sets
  MYSQL_LOCK::lock_count based on the number of locks returned by
  the handler::store_lock() calls, not based on the numbers returned
  by the handler::lock_count() calls. The latter are only used for
  allocation of memory now.
  
  No test case. The test suite cannot reliably run FLUSH between
  lock_count() and store_lock() of another thread. The bug report
  contains a program that can repeat the problem with some
  probability.

  include/myisammrg.h@1.22, 2007-12-11 15:32:09+01:00, istruewing@stella.local +1 -0
    Bug#30273 - merge tables: Can't lock file (errno: 155)
    Added mutex to struct st_myrg_info (MYRG_INFO).

  sql/handler.h@1.244.1.34, 2007-12-11 15:32:09+01:00, istruewing@stella.local +10 -1
    Bug#30273 - merge tables: Can't lock file (errno: 155)
    Extended comments for handler::lock_count() and
    handler::store_lock().

  sql/lock.cc@1.106.13.1, 2007-12-11 15:32:09+01:00, istruewing@stella.local +17 -3
    Bug#30273 - merge tables: Can't lock file (errno: 155)
    Changed get_lock_data() so that the final lock_count is taken
    from the number of locks returned from handler::store_lock()
    instead of from handler::lock_count().

  sql/sql_base.cc@1.421.25.1, 2007-12-11 15:32:09+01:00, istruewing@stella.local +1 -1
    Fixed a purecov comment. (unrelated to the rest of the changeset)

  storage/myisammrg/ha_myisammrg.cc@1.123.2.2, 2007-12-11 15:32:09+01:00, istruewing@stella.local +29 -2
    Bug#30273 - merge tables: Can't lock file (errno: 155)
    Changed ha_myisammrg::lock_count() and ha_myisammrg::store_lock()
    to accept non-attached children.
    Protected ha_myisammrg::store_lock() by MYRG_INFO::mutex.

  storage/myisammrg/myrg_close.c@1.12, 2007-12-11 15:32:09+01:00, istruewing@stella.local +1 -0
    Bug#30273 - merge tables: Can't lock file (errno: 155)
    Added MYRG_INFO::mutex destruction to myrg_parent_close().

  storage/myisammrg/myrg_open.c@1.40, 2007-12-11 15:32:09+01:00, istruewing@stella.local +16 -1
    Bug#30273 - merge tables: Can't lock file (errno: 155)
    Added MYRG_INFO::mutex initialization to myrg_parent_open().
    Protected myrg_attach_children() and myrg_detach_children()
    by MYRG_INFO::mutex.
    Fixed a purecov comment. (unrelated to the rest of the changeset)

ChangeSet@1.2476.762.2, 2007-12-11 15:19:37+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  compile error fix for osx

  storage/ndb/src/mgmsrv/MgmtSrvr.cpp@1.134, 2007-12-11 15:19:34+01:00, tomas@whalegate.ndb.mysql.com +0 -1
    compile error fix for osx

ChangeSet@1.2476.762.1, 2007-12-11 15:08:00+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  bug#32759 already fixed

  mysql-test/suite/ndb/t/disabled.def@1.9, 2007-12-11 15:07:57+01:00, tomas@whalegate.ndb.mysql.com +0 -1
    bug#32759 already fixed
    - see rev 1.131.1.6 of sql/ha_ndbcluster_binlog.cc

ChangeSet@1.2476.722.14, 2007-12-11 15:26:08+02:00, bell@desktop.sanja.is.com.ua +4 -0
  Post review fix (serg).
  Added more checks.

  storage/maria/ha_maria.cc@1.59, 2007-12-11 15:26:04+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Let control size to my_get_opts().

  storage/maria/ma_loghandler.c@1.82, 2007-12-11 15:26:04+02:00, bell@desktop.sanja.is.com.ua +16 -18
    Let control size to my_get_opts().
    Removed unused function.
    Assert to check log file size.
    Additional compilation warnings.

  storage/maria/ma_loghandler.h@1.37, 2007-12-11 15:26:04+02:00, bell@desktop.sanja.is.com.ua +2 -3
    New log size bounds.
    Removed unused function.

  storage/maria/unittest/ma_test_loghandler-t.c@1.25, 2007-12-11 15:26:04+02:00, bell@desktop.sanja.is.com.ua +2 -2
    Fixed test to confirm new log size bounds.

ChangeSet@1.2476.761.1, 2007-12-11 11:51:14+01:00, mskold@mysql.com +2 -0
  Enabled test rpl_ndb_ddl

  mysql-test/suite/rpl_ndb/r/rpl_ndb_ddl.result@1.5, 2007-12-11 11:51:00+01:00, mskold@mysql.com +26 -14
    Enabled test rpl_ndb_ddl

  mysql-test/suite/rpl_ndb/t/disabled.def@1.16, 2007-12-11 11:51:00+01:00, mskold@mysql.com +0 -1
    Enabled test rpl_ndb_ddl

ChangeSet@1.1810.3491.16, 2007-12-11 11:41:19+01:00, tomas@whalegate.ndb.mysql.com +2 -0
  remoce compiler warnings

  ndb/src/ndbapi/NdbOperationDefine.cpp@1.19.11.1, 2007-12-11 11:41:16+01:00, tomas@whalegate.ndb.mysql.com +2 -0
    remoce compiler warnings

  ndb/src/ndbapi/NdbOperationSearch.cpp@1.24.7.1, 2007-12-11 11:41:16+01:00, tomas@whalegate.ndb.mysql.com +2 -0
    remoce compiler warnings

ChangeSet@1.1810.3534.4, 2007-12-11 10:12:05+01:00, tnurnberg@mysql.com +8 -0
  Bug#31990: MINUTE() and SECOND() return bogus results when used on a DATE
  
  HOUR(), MINUTE(), ... returned spurious results when used on a DATE-cast.
  This happened because DATE-cast object did not overload get_time() method
  in superclass Item. The default method was inappropriate here and
  misinterpreted the data.
  
  Patch adds missing method; get_time() on DATE-casts now returns SQL-NULL
  on NULL input, 0 otherwise. This coincides with the way DATE-columns
  behave.
  
  Also fixes similar bug in Date-Field now.

  mysql-test/r/cast.result@1.39.3.1, 2007-12-11 10:12:04+01:00, tnurnberg@mysql.com +24 -0
    Show that HOUR(), MINUTE(), ... return sensible values when used
    on DATE-cast objects, namely NULL for NULL-dates and 0 otherwise.
    Show that this coincides with how DATE-columns behave.

  mysql-test/r/type_date.result@1.13.7.1, 2007-12-11 10:12:04+01:00, tnurnberg@mysql.com +5 -0
    Show that HOUR(), MINUTE(), ... return sensible values when used
    on DATE-fields.

  mysql-test/t/cast.test@1.31.3.1, 2007-12-11 10:12:04+01:00, tnurnberg@mysql.com +22 -0
    Show that HOUR(), MINUTE(), ... return sensible values when used
    on DATE-cast objects, namely NULL for NULL-dates and 0 otherwise.
    Show that this coincides with how DATE-columns behave.

  mysql-test/t/type_date.test@1.14.6.1, 2007-12-11 10:12:04+01:00, tnurnberg@mysql.com +8 -0
    Show that HOUR(), MINUTE(), ... return sensible values when used
    on DATE-fields.

  sql/field.cc@1.256.66.1, 2007-12-11 10:12:04+01:00, tnurnberg@mysql.com +7 -0
    Add get_time() method to DATE-field object to overload
    the method in Field superclass that would return spurious
    results. Return zero-result.

  sql/field.h@1.153.34.1, 2007-12-11 10:12:04+01:00, tnurnberg@mysql.com +1 -0
    Add get_time() declaration to date-field class

  sql/item_timefunc.cc@1.100.39.1, 2007-12-11 10:12:04+01:00, tnurnberg@mysql.com +7 -0
    Add get_time() method to DATE-cast object to overload
    the method in Item superclass that would return spurious
    results. Return zero-result; flag NULL if input was NULL.

  sql/item_timefunc.h@1.63.8.1, 2007-12-11 10:12:04+01:00, tnurnberg@mysql.com +1 -0
    Add get_time() declaration to DATE-cast object.

ChangeSet@1.2476.755.6, 2007-12-11 09:17:10+02:00, bell@desktop.sanja.is.com.ua +1 -0
  Page number calculation fixed.

  storage/maria/ma_loghandler.c@1.80.2.1, 2007-12-11 09:17:08+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Page number calculation fixed.

ChangeSet@1.2476.505.20, 2007-12-10 23:26:53+01:00, guilhem@gbichot4.local +11 -0
  WL#3072 Maria recovery:
  fix for bug: if a crash happened right after writing a REDO like this:
  REDO - UNDO - REDO*, then recovery would ignore the last REDO* (ok),
  rollback: REDO - UNDO - REDO* - REDO - CLR, and a next recovery would
  thus execute REDO* instead of skipping it again. Recovery now logs
  LOGREC_INCOMPLETE_GROUP when it meets REDO* for the first time,
  to draw a boundary and ensure it is always skipped. Tested by hand.
  Note: ma_test_all fails "maria_chk: error: Key 1 - Found too many records"
  not due to this patch (failed before).

  BitKeeper/triggers/post-commit@1.39, 2007-12-10 23:26:50+01:00, guilhem@gbichot4.local +1 -1
    no truncation of the commit mail, or how to review patches?

  mysql-test/include/maria_verify_recovery.inc@1.4, 2007-12-10 23:26:50+01:00, guilhem@gbichot4.local +4 -4
    let caller choose the statement used to crash (sometimes we
    want the crash to happen at special places)

  mysql-test/t/maria-recovery.test@1.3, 2007-12-10 23:26:50+01:00, guilhem@gbichot4.local +3 -0
    user of maria_verify_recovery.inc now specifies statement which the
    script should use for crashing.

  storage/maria/ma_bitmap.c@1.27, 2007-12-10 23:26:51+01:00, guilhem@gbichot4.local +22 -18
    it's easier to search for all places using functions from the bitmap
    module (like in ma_blockrec.c) if those exported functions all start
    with "_ma_bitmap": renaming some of them.
    Assertion that when we read a bitmap page, overwriting bitmap->map,
    we are not losing information (i.e. bitmap->changed is false).

  storage/maria/ma_blockrec.c@1.63, 2007-12-10 23:26:51+01:00, guilhem@gbichot4.local +44 -9
    update to new names. Adding code (disabled, protected by a #ifdef)
    that I use to test certain crash scenarios (more to come).

  storage/maria/ma_blockrec.h@1.21, 2007-12-10 23:26:51+01:00, guilhem@gbichot4.local +7 -5
    update to new names

  storage/maria/ma_checkpoint.c@1.32.1.1, 2007-12-10 23:26:51+01:00, guilhem@gbichot4.local +1 -1
    update to new names

  storage/maria/ma_extra.c@1.21, 2007-12-10 23:26:51+01:00, guilhem@gbichot4.local +1 -1
    update to new names

  storage/maria/ma_loghandler.c@1.80.1.4, 2007-12-10 23:26:51+01:00, guilhem@gbichot4.local +9 -2
    new LOGREC_INCOMPLETE_GROUP

  storage/maria/ma_loghandler.h@1.35.1.2, 2007-12-10 23:26:51+01:00, guilhem@gbichot4.local +1 -0
    new LOGREC_INCOMPLETE_GROUP

  storage/maria/ma_recovery.c@1.56, 2007-12-10 23:26:51+01:00, guilhem@gbichot4.local +51 -38
    When at the end of the REDO phase we have identified some transactions
    with incomplete REDO groups (REDOs without an UNDO or CLR_END),
    for each of them we log LOGREC_INCOMPLETE_GROUP. This way, the
    upcoming UNDO phase can write more records for such transaction,
    a future recovery won't pair the incomplete group with the
    CLR_END (as there is LOGREC_INCOMPLETE_GROUP to draw a boundary).

ChangeSet@1.1810.3466.40, 2007-12-10 19:23:17+01:00, joerg@debian.(none) +1 -0
  Makefile.am
      Formatting change to improve readability of the "test-*" targets.

  Makefile.am@1.68.11.1, 2007-12-10 19:23:09+01:00, joerg@debian.(none) +17 -17
    Formatting change to improve readability:
    
    In multi-line actions, indent the continuation lines
    so that the start of the next statement is better visible.
    This affects only "test-*" targets.

ChangeSet@1.1810.3546.2, 2007-12-10 16:16:21+01:00, thek@adventure.(none) +2 -0
  Test fails because of non deterministric function: show grants for current_user()

  mysql-test/r/read_only.result@1.4.1.2, 2007-12-10 16:16:20+01:00, thek@adventure.(none) +0 -5
    Removing non deterministic test results from test.

  mysql-test/t/read_only.test@1.1.1.5, 2007-12-10 16:16:20+01:00, thek@adventure.(none) +0 -1
    Removing non deterministic test results from test.

ChangeSet@1.2476.759.1, 2007-12-10 15:49:57+02:00, bell@desktop.sanja.is.com.ua +1 -0
  Fixed bug in first log file detecting function.

  storage/maria/ma_loghandler.c@1.80.1.3, 2007-12-10 15:49:53+02:00, bell@desktop.sanja.is.com.ua +1 -1
    min_file should be for sure unexistant file for right search.

ChangeSet@1.2476.433.42, 2007-12-10 13:29:23+01:00, tomas@whalegate.ndb.mysql.com +6 -0
  backport test for bug#30674
  (bug not present in 5.1)

  mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@1.3.1.1, 2007-12-10 13:29:20+01:00, tomas@whalegate.ndb.mysql.com +1 -8
    backport test for bug#30674
    (bug not present in 5.1)

  mysql-test/suite/ndb/r/ndb_blob.result@1.24, 2007-12-10 13:29:20+01:00, tomas@whalegate.ndb.mysql.com +21 -0
    backport test for bug#30674
    (bug not present in 5.1)

  mysql-test/suite/ndb/t/ndb_blob.test@1.25, 2007-12-10 13:29:20+01:00, tomas@whalegate.ndb.mysql.com +20 -0
    backport test for bug#30674
    (bug not present in 5.1)

  mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@1.3.1.1, 2007-12-10 13:29:20+01:00, tomas@whalegate.ndb.mysql.com +36 -33
    backport test for bug#30674
    (bug not present in 5.1)

  mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@1.3.1.1, 2007-12-10 13:29:20+01:00, tomas@whalegate.ndb.mysql.com +36 -33
    backport test for bug#30674
    (bug not present in 5.1)

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result@1.1.1.1, 2007-12-10 13:29:20+01:00, tomas@whalegate.ndb.mysql.com +6 -4
    backport test for bug#30674
    (bug not present in 5.1)

ChangeSet@1.2476.755.4, 2007-12-10 14:21:45+02:00, monty@mysql.com +3 -0
  Fixed bug in allocation of dynamic record buffer in Maria
  Unified printing of mutex addresses to make them easier to compare

  mysys/thr_mutex.c@1.32.1.2, 2007-12-10 14:21:43+02:00, monty@mysql.com +3 -3
    Unified printing of mutex addresses to make them easier to compare

  storage/maria/ma_dynrec.c@1.21, 2007-12-10 14:21:43+02:00, monty@mysql.com +2 -1
    Fixed indentation

  storage/maria/ma_open.c@1.41, 2007-12-10 14:21:43+02:00, monty@mysql.com +6 -5
    Fixed bug in allocation of dynamic record buffer

ChangeSet@1.2476.1.158, 2007-12-10 12:21:02+01:00, df@pippilotta.erinye.com +1 -0
  after-merge fix

  scripts/mysql_install_db.sh@1.94, 2007-12-10 12:21:00+01:00, df@pippilotta.erinye.com +1 -1
    after-merge fix

ChangeSet@1.1810.3544.1, 2007-12-10 09:17:18+01:00, tnurnberg@mysql.com +3 -0
  Bug#32770: LAST_DAY() returns a DATE, but somehow internally keeps track of the TIME.
  
  LAST_DAY() says it returns a DATE, not a DATETIME, but didn't zero the time fields.
  Adapted from a patch kindly supplied by Claudio Cherubino.

  mysql-test/r/func_time.result@1.47.1.39, 2007-12-10 09:17:16+01:00, tnurnberg@mysql.com +3 -0
    show that LAST_DAY() returns only a DATE, not a DATETIME

  mysql-test/t/func_time.test@1.41.1.32, 2007-12-10 09:17:17+01:00, tnurnberg@mysql.com +7 -0
    show that LAST_DAY() returns only a DATE, not a DATETIME

  sql/item_timefunc.cc@1.100.38.1, 2007-12-10 09:17:17+01:00, tnurnberg@mysql.com +2 -0
    zero time-fields as we return only a DATE

ChangeSet@1.2476.756.1, 2007-12-10 08:12:41+01:00, tnurnberg@mysql.com +4 -0
  Bug #31177: Server variables can't be set to their current values
  
  fixes for SLES10

  mysql-test/r/change_user.result@1.3, 2007-12-10 08:12:40+01:00, tnurnberg@mysql.com +2 -2
    It's unsigned.

  mysys/my_getopt.c@1.80, 2007-12-10 08:12:40+01:00, tnurnberg@mysql.com +0 -2
    Failsafe no longer needed, we handle signedness correctly now.

  sql/set_var.cc@1.240.21.3, 2007-12-10 08:12:40+01:00, tnurnberg@mysql.com +1 -1
    ha_rows can be derived from all kinds of types, but
    they're all unsigned. Display it as such.

  tests/mysql_client_test.c@1.255.5.1, 2007-12-10 08:12:40+01:00, tnurnberg@mysql.com +11 -0
    cannot easily check this here due to types.
    check with Alik whether we need this on top
    of change_user.test.

ChangeSet@1.2476.755.3, 2007-12-10 03:37:29+02:00, monty@mysql.com +2 -0
  Fixed some compiler errors

  mysys/my_thr_init.c@1.60, 2007-12-10 03:37:27+02:00, monty@mysql.com +3 -1
    Added missing DBUG_OFF

  storage/maria/ma_loghandler.c@1.80.1.2, 2007-12-10 03:37:28+02:00, monty@mysql.com +2 -2
    Fixed wrong macro

ChangeSet@1.2476.755.2, 2007-12-10 03:23:15+02:00, monty@mysql.com +3 -0
  Fixed core dump when running myisamchk (as this doesn't call translog_init)
  Added option --transaction-log to maria_chk

  storage/maria/ma_init.c@1.15, 2007-12-10 03:23:13+02:00, monty@mysql.com +2 -1
    Fixed core dump when running maria_chk (as this doesn't call translog_init)

  storage/maria/ma_test_all.sh@1.17, 2007-12-10 03:23:13+02:00, monty@mysql.com +1 -0
    Added testing of --transaction-log

  storage/maria/maria_chk.c@1.32, 2007-12-10 03:23:13+02:00, monty@mysql.com +37 -8
    Enable logging of repair commands if run with --transaction-log

ChangeSet@1.2476.754.1, 2007-12-10 02:32:00+02:00, monty@mysql.com +43 -0
  Added MARIA_SHARE *share to a lot of places to make code simpler
  Changed info->s -> share to get more efficent code
  Updated arguments to page accessor functions to use MARIA_SHARE * instead of MARIA_HA *.
  Tested running tests in quick mode (no balance page on insert and only when critical on delete)
  Fixed bug in underflow handling in quick mode
  Fixed bug in log handler where it accessed not initialized variable
  Fixed bug in log handler where it didn't free mutex in unlikely error condition
  Removed double write of page in case of of some underflow conditions
  Added DBUG_PRINT in safemutex lock/unlock

  dbug/dbug.c@1.38.1.1, 2007-12-10 02:31:56+02:00, monty@mysql.com +15 -14
    Compile without SAFE_MUTEX (to be able to use DBUG_PRINT in safe_mutex code)
    Use calls to get/set my_thread_var->dbug. (Make dbug independent of compile time options for mysys)

  include/my_pthread.h@1.118.1.1, 2007-12-10 02:31:57+02:00, monty@mysql.com +2 -0
    Added prototypes for my_thread_var_get_dbug() & my_thread_var_set_dbug()

  mysql-test/lib/mtr_report.pl@1.63, 2007-12-10 02:31:57+02:00, monty@mysql.com +1 -1
    Don't check warnings in log files if we are using --extern

  mysys/my_thr_init.c@1.59, 2007-12-10 02:31:57+02:00, monty@mysql.com +29 -2
    Added my_thread_var_get_dbug() & my_thread_var_set_dbug()

  mysys/thr_mutex.c@1.32.1.1, 2007-12-10 02:31:57+02:00, monty@mysql.com +12 -0
    Added DBUG printing of addresses to mutex for lock/unlock

  storage/maria/ma_blockrec.c@1.60.1.1, 2007-12-10 02:31:57+02:00, monty@mysql.com +1 -1
    Fixed comment

  storage/maria/ma_check.c@1.53, 2007-12-10 02:31:57+02:00, monty@mysql.com +218 -199
    Added MARIA_SHARE *share to a lot of places to make code simpler
    info->s -> share
    Updated arguments to page accessor functions

  storage/maria/ma_close.c@1.24, 2007-12-10 02:31:57+02:00, monty@mysql.com +1 -1
    Indentation fixes

  storage/maria/ma_create.c@1.35, 2007-12-10 02:31:57+02:00, monty@mysql.com +26 -17
    Calculate min_key_length correctly

  storage/maria/ma_dbug.c@1.7, 2007-12-10 02:31:57+02:00, monty@mysql.com +1 -1
    Indentation fixes

  storage/maria/ma_delete.c@1.20, 2007-12-10 02:31:57+02:00, monty@mysql.com +127 -94
    Added MARIA_SHARE *share to a lot of places to make code simpler
    info->s -> share
    Updated arguments to page accessor functions
    Removed some writing of key pages that underflow (will be written by caller)
    Fixed crashing bug in underflow handling when using quick mode

  storage/maria/ma_delete_all.c@1.23, 2007-12-10 02:31:57+02:00, monty@mysql.com +1 -1
    Indentation fixes

  storage/maria/ma_dynrec.c@1.20, 2007-12-10 02:31:57+02:00, monty@mysql.com +1 -1
    Indentation fixes

  storage/maria/ma_extra.c@1.20, 2007-12-10 02:31:57+02:00, monty@mysql.com +49 -49
    Fixed indentation
    Removed old useless code
    Reset share->changed if we have written state

  storage/maria/ma_ft_update.c@1.10, 2007-12-10 02:31:57+02:00, monty@mysql.com +8 -7
    Added MARIA_SHARE *share to a lot of places to make code simpler
    info->s -> share
    Updated arguments to page accessor functions

  storage/maria/ma_info.c@1.9, 2007-12-10 02:31:57+02:00, monty@mysql.com +1 -1
    Indentation fixes

  storage/maria/ma_key_recover.c@1.7, 2007-12-10 02:31:57+02:00, monty@mysql.com +9 -8
    Added MARIA_SHARE *share to a lot of places to make code simpler
    info->s -> share
    Updated arguments to page accessor functions

  storage/maria/ma_locking.c@1.21, 2007-12-10 02:31:57+02:00, monty@mysql.com +5 -5
    Indentation fixes

  storage/maria/ma_loghandler.c@1.77.1.1, 2007-12-10 02:31:57+02:00, monty@mysql.com +45 -71
    Removed wrapper functions translog_mutex_lock and translog_mutex_unlock (safemutex now does same kind of printing)
    Renamed LOGREC_REDO_INSERT_ROW_BLOB to LOGREC_REDO_INSERT_NOT_USED to mark it free
    Fixed some DBUG_PRINT to ensure that convert-dbug-for-diff works
    Fixed bug in translog_flush() that caused log to stop syncing to disk
    Added missing mutex_unlock in case of error

  storage/maria/ma_loghandler.h@1.34.1.1, 2007-12-10 02:31:57+02:00, monty@mysql.com +1 -1
    Renamed LOGREC_REDO_INSERT_ROW_BLOB to LOGREC_REDO_INSERT_NOT_USED to mark it free

  storage/maria/ma_open.c@1.40, 2007-12-10 02:31:57+02:00, monty@mysql.com +1 -1
    Indentation fixes

  storage/maria/ma_packrec.c@1.17, 2007-12-10 02:31:57+02:00, monty@mysql.com +5 -5
    Indentation fixes

  storage/maria/ma_page.c@1.18, 2007-12-10 02:31:57+02:00, monty@mysql.com +41 -32
    Added MARIA_SHARE *share to a lot of places to make code simpler
    info->s -> share
    Updated arguments to page accessor functions
    Added check that we never write a key page without content (except in recovery where a key page may temporary be without content)

  storage/maria/ma_preload.c@1.9, 2007-12-10 02:31:58+02:00, monty@mysql.com +2 -2
    Updated arguments to page accessor functions

  storage/maria/ma_range.c@1.13, 2007-12-10 02:31:58+02:00, monty@mysql.com +2 -2
    Updated arguments to page accessor functions

  storage/maria/ma_rkey.c@1.11, 2007-12-10 02:31:58+02:00, monty@mysql.com +1 -1
    Indentation fixes

  storage/maria/ma_rprev.c@1.5, 2007-12-10 02:31:58+02:00, monty@mysql.com +1 -1
    Indentation fixes

  storage/maria/ma_rt_index.c@1.13, 2007-12-10 02:31:58+02:00, monty@mysql.com +68 -59
    Added MARIA_SHARE *share to a lot of places to make code simpler
    info->s -> share
    Updated arguments to page accessor functions

  storage/maria/ma_rt_index.h@1.7, 2007-12-10 02:31:58+02:00, monty@mysql.com +4 -4
    Updated arguments to page accessor functions

  storage/maria/ma_rt_key.c@1.10, 2007-12-10 02:31:58+02:00, monty@mysql.com +15 -13
    Added MARIA_SHARE *share to a lot of places to make code simpler
    info->s -> share
    Updated arguments to page accessor functions

  storage/maria/ma_rt_mbr.c@1.7, 2007-12-10 02:31:58+02:00, monty@mysql.com +22 -21
    Added MARIA_SHARE *share to a lot of places to make code simpler
    info->s -> share
    Updated arguments to page accessor functions

  storage/maria/ma_rt_split.c@1.11, 2007-12-10 02:31:58+02:00, monty@mysql.com +19 -16
    Added MARIA_SHARE *share to a lot of places to make code simpler
    info->s -> share
    Updated arguments to page accessor functions

  storage/maria/ma_search.c@1.16, 2007-12-10 02:31:58+02:00, monty@mysql.com +25 -19
    Added MARIA_SHARE *share to a lot of places to make code simpler
    info->s -> share
    Updated arguments to page accessor functions

  storage/maria/ma_sort.c@1.15, 2007-12-10 02:31:58+02:00, monty@mysql.com +1 -1
    Indentation fixes

  storage/maria/ma_statrec.c@1.11, 2007-12-10 02:31:58+02:00, monty@mysql.com +1 -1
    Indentation fixes

  storage/maria/ma_test1.c@1.32, 2007-12-10 02:31:58+02:00, monty@mysql.com +16 -2
    Added extra undo test
    Flush also keys in -u1, to ensure that the full log is flushed

  storage/maria/ma_test2.c@1.30, 2007-12-10 02:31:58+02:00, monty@mysql.com +18 -4
    Added extra undo test
    Flush also keys in -u1, to ensure that the full log is flushed

  storage/maria/ma_test_recovery@1.18, 2007-12-10 02:31:58+02:00, monty@mysql.com +3 -2
    Added extra undo test

  storage/maria/ma_update.c@1.15, 2007-12-10 02:31:58+02:00, monty@mysql.com +1 -1
    Indentation fixes

  storage/maria/ma_write.c@1.25, 2007-12-10 02:31:58+02:00, monty@mysql.com +114 -105
    Added MARIA_SHARE *share to a lot of places to make code simpler
    info->s -> share
    Updated arguments to page accessor functions
    Prepare for quick mode for insert (don't balance page)

  storage/maria/maria_chk.c@1.31, 2007-12-10 02:31:58+02:00, monty@mysql.com +12 -11
    Added MARIA_SHARE *share to a lot of places to make code simpler
    info->s -> share
    Updated arguments to page accessor functions

  storage/maria/maria_def.h@1.49, 2007-12-10 02:31:58+02:00, monty@mysql.com +13 -13
    Updated arguments to page accessor functions

  storage/maria/ma_test_recovery.expected@1.14, 2007-12-10 02:31:58+02:00, monty@mysql.com +289 -9
    Updated results

ChangeSet@1.1810.3412.58, 2007-12-09 11:53:07-08:00, igor@olga.mysql.com +1 -0
  Forced compilers to remove the warning appeared after the patch
  with a fix for bug 32694. 

  sql/item_cmpfunc.cc@1.187.54.3, 2007-12-09 11:53:05-08:00, igor@olga.mysql.com +1 -0
    Forced compilers to remove the warning appeared after the patch
    with a fix for bug 32694. 

ChangeSet@1.2476.753.1, 2007-12-09 19:35:51+02:00, bell@desktop.sanja.is.com.ua +8 -0
  Manageable transactional log purge and file size
  support added to maria.

  mysql-test/r/maria-purge.result@1.1, 2007-12-09 19:35:48+02:00, bell@desktop.sanja.is.com.ua +82 -0
    New BitKeeper file ``mysql-test/r/maria-purge.result''

  mysql-test/r/maria-purge.result@1.0, 2007-12-09 19:35:48+02:00, bell@desktop.sanja.is.com.ua +0 -0

  mysql-test/r/maria.result@1.19.1.5, 2007-12-09 19:35:48+02:00, bell@desktop.sanja.is.com.ua +2 -0
    New variables added.

  mysql-test/t/maria-purge.test@1.1, 2007-12-09 19:35:49+02:00, bell@desktop.sanja.is.com.ua +95 -0
    New BitKeeper file ``mysql-test/t/maria-purge.test''

  mysql-test/t/maria-purge.test@1.0, 2007-12-09 19:35:48+02:00, bell@desktop.sanja.is.com.ua +0 -0

  storage/maria/ha_maria.cc@1.51.2.1, 2007-12-09 19:35:48+02:00, bell@desktop.sanja.is.com.ua +150 -1
    Variable for transactional log purge method added.
    Variable for transactional log size added.
    SHOW for engine logs added.
    Log flush purge logs in case of "ondemand" type of
      log processing.

  storage/maria/ma_checkpoint.c@1.26.2.1, 2007-12-09 19:35:48+02:00, bell@desktop.sanja.is.com.ua +0 -2
    log purge call enabled.

  storage/maria/ma_loghandler.c@1.67.2.1, 2007-12-09 19:35:48+02:00, bell@desktop.sanja.is.com.ua +159 -15
    Support for different methods of log purge added.
    Functions for getting information about logs state added.
    Functions for getting/setting log size.

  storage/maria/ma_loghandler.h@1.27.2.1, 2007-12-09 19:35:48+02:00, bell@desktop.sanja.is.com.ua +20 -3
    Fixed defines.
    Functions for for transactional log mannegment added.

  storage/maria/ma_recovery.c@1.47.2.1, 2007-12-09 19:35:48+02:00, bell@desktop.sanja.is.com.ua +3 -2
    Dependence on TRANSLOG_FILE_SIZE removed.

ChangeSet@1.2476.667.63, 2007-12-08 23:54:07+02:00, timour@lapi.mysql.com +2 -0
  BUG#32694 post-merge adjustment of EXPLAIN results for 5.1.

  BitKeeper/etc/ignore@1.235.33.4, 2007-12-08 23:54:05+02:00, timour@lapi.mysql.com +1 -0
    Added ylwrap to the ignore list

  mysql-test/r/type_datetime.result@1.60, 2007-12-08 23:54:03+02:00, timour@lapi.mysql.com +12 -12
    BUG#32694 post-merge adjustment of EXPLAIN results for 5.1.

ChangeSet@1.1810.3543.1, 2007-12-08 23:05:00+02:00, timour@lapi.mysql.com +3 -0
  Fix for BUG#32694 "NOT NULL table field in a subquery produces invalid results"
    
  The problem was that when convert_constant_item is called for subqueries,
  this happens when we already started executing the top-level query, and
  the field argument of convert_constant_item pointed to a valid table row.
  In turn convert_constant_item used the field buffer to compute the value
  of its item argument. This copied the item's value into the field,
  and made equalities with outer references always true.
    
  The fix saves/restores the original field's value when it belongs to an
  outer table.

  mysql-test/r/type_datetime.result@1.30.1.21, 2007-12-08 23:04:56+02:00, timour@lapi.mysql.com +55 -0
    Test for BUG#32694.

  mysql-test/t/type_datetime.test@1.18.10.1, 2007-12-08 23:04:58+02:00, timour@lapi.mysql.com +37 -0
    Test for BUG#32694.

  sql/item_cmpfunc.cc@1.187.54.2, 2007-12-08 23:04:58+02:00, timour@lapi.mysql.com +41 -26
    - Changed convert_constant_item() so that it doesn't destroy the contents
      of its field argument when the field originates from table in an outer
      query.

ChangeSet@1.1810.3412.56, 2007-12-07 23:36:58-08:00, igor@olga.mysql.com +3 -0
  Fixed bug #27545.
  Both arguments of the function NAME_CONST must be constant expressions.
  This constraint is checked in the Item_name_const::fix_fields method. 
  Yet if the argument of the function was not a constant expression no
  error message was reported. As a result the client hanged waiting for a
  response.
  Now the function Item_name_const::fix_fields reports an error message
  when any of the additional context conditions imposed on the function
  NAME_CONST is not satisfied. 

  mysql-test/r/func_misc.result@1.21.6.1, 2007-12-07 23:36:53-08:00, igor@olga.mysql.com +5 -0
    Added a test case for bug #26545.

  mysql-test/t/func_misc.test@1.21.6.1, 2007-12-07 23:36:53-08:00, igor@olga.mysql.com +13 -0
    Added a test case for bug #26545.

  sql/item.cc@1.113.1.180, 2007-12-07 23:36:53-08:00, igor@olga.mysql.com +7 -7
    Fixed bug #27545.
    Both arguments of the function NAME_CONST must be constant expressions.
    This constraint is checked in the Item_name_const::fix_fields method. 
    Yet if the argument of the function was not a constant expression no
    error message was reported. As a result the client hanged waiting for a
    response.
    Now the function Item_name_const::fix_fields reports an error message
    when any of the additional context conditions imposed on the function
    NAME_CONST is not satisfied. 

ChangeSet@1.1810.3542.1, 2007-12-07 17:14:59-08:00, igor@olga.mysql.com +3 -0
  Fixed bug #32815.
  The index (key_part_1, key_part-2) was erroneously considered as compatible
  with the required ordering in the function test_test_if_order_by_key when 
  a query with an ORDER BY clause contained a condition of the form
    key_part_1=const OR key_part_1 IS NULL 
  and the order list contained only key_part_2. This happened because the value
  of the const_key_parts field in the KEYUSE structure was not formed correctly
  for the keys that could be used for ref_or_null access. 
  This was fixed in the code of the update_ref_and_keys function.
  The problem could not manifest itself for MyISAM databases because the
  implementation of the keys_to_use_for_scanning() handler function always
  returns an empty bitmap for the MyISAM engine.

  mysql-test/t/innodb_mysql.test@1.3.51.1, 2007-12-07 17:14:54-08:00, igor@olga.mysql.com +15 -0
    Added a test case for bug #32815.

  mysql-test/r/innodb_mysql.result@1.3.25.2, 2007-12-07 17:14:54-08:00, igor@olga.mysql.com +12 -0
    Added a test case for bug #32815.

  sql/sql_select.cc@1.312.183.10, 2007-12-07 17:14:54-08:00, igor@olga.mysql.com +1 -1
    Fixed bug #32815.
    The index (key_part_1, key_part-2) was erroneously considered as compatible
    with the required ordering in the function test_test_if_order_by_key when 
    a query with an ORDER BY clause contained a condition of the form
      key_part_1=const OR key_part_1 IS NULL 
    and the order list contained only key_part_2. This happened because the value
    of the const_key_parts field in the KEYUSE structure was not formed correctly
    for the keys that could be used for ref_or_null access. 
    This was fixed in the code of the update_ref_and_keys function.

ChangeSet@1.2476.749.2, 2007-12-07 19:27:45-05:00, dkatz@damien-katzs-computer.local +4 -0
  Bug#29830	Test case 'events_scheduling' fails on Mac OS X and Windows.
  
  Change LAST_EXECUTED time the execution start time, instead of the execution completion time. This ensures the END time always the same or later than the LAST_EXECUTED time.

  mysql-test/r/events_scheduling.result@1.13, 2007-12-07 19:27:36-05:00, dkatz@damien-katzs-computer.local +2 -2
    Bug#29830	Test case 'events_scheduling' fails on Mac OS X and Windows.
    
    Change LAST_EXECUTED time the execution start time, instead of the execution completion time. This ensures the END time always the same or later than the LAST_EXECUTED time.

  mysql-test/t/disabled.def@1.266.24.1, 2007-12-07 19:27:36-05:00, dkatz@damien-katzs-computer.local +0 -1
    Enable events_scheduling test

  mysql-test/t/events_scheduling.test@1.17, 2007-12-07 19:27:36-05:00, dkatz@damien-katzs-computer.local +1 -1
    Bug#29830	Test case 'events_scheduling' fails on Mac OS X and Windows.
    
    Change LAST_EXECUTED time the execution start time, instead of the execution completion time. This ensures the END time always the same or later than the LAST_EXECUTED time.

  sql/event_data_objects.cc@1.112, 2007-12-07 19:27:36-05:00, dkatz@damien-katzs-computer.local +0 -2
    Bug#29830	Test case 'events_scheduling' fails on Mac OS X and Windows.
    
    Change LAST_EXECUTED time the execution start time, instead of the execution completion time. This ensures the END time always the same or later than the LAST_EXECUTED time.

ChangeSet@1.1810.3491.13, 2007-12-07 14:43:31-07:00, tsmith@ramayana.hindu.god +1 -0
  Add a way to remove options which mysql-test-run.pl no longer uses.

  mysql-test/mysql-test-run.pl@1.30.96.2, 2007-12-07 14:43:29-07:00, tsmith@ramayana.hindu.god +25 -0
    Add a way to remove options which mysql-test-run.pl no longer uses.  Since
    mysql-test-run.pl passes unrecognized options through to mysqld directly,
    it is not possible to just remove an option.  Otherwise it would be given
    to mysqld, which probably will not recognize it and will fail to start.
    
    Instead, we now explicitly ignore the option, and print a warning to
    the user.

ChangeSet@1.2476.752.1, 2007-12-07 22:54:47+03:00, evgen@moonbone.local +3 -0
  Bug#32482: Crash for a query with ORDER BY a user variable.
  
  The Item_func_set_user_var::register_field_in_read_map() did not check 
  that the result_field was null.This caused server crashes for queries that
  required order by such a field and were executed without using a temporary
  table.
  
  The Item_func_set_user_var::register_field_in_read_map() now checks the
  result_field to be not null.

  mysql-test/r/user_var.result@1.48.1.1, 2007-12-07 22:53:53+03:00, evgen@moonbone.local +7 -0
    Added a test case for the bug#32482: Crash for a query with ORDER BY a user variable.

  mysql-test/t/user_var.test@1.44.1.1, 2007-12-07 22:53:30+03:00, evgen@moonbone.local +8 -0
    Added a test case for the bug#32482: Crash for a query with ORDER BY a user variable.

  sql/item_func.cc@1.409.22.1, 2007-12-07 22:54:15+03:00, evgen@moonbone.local +6 -3
    Bug#32482: Crash for a query with ORDER BY a user variable.
    The Item_func_set_user_var::register_field_in_read_map() now checks the
    result_field to be not null.

ChangeSet@1.1810.3524.2, 2007-12-07 15:39:41+01:00, thek@adventure.(none) +3 -0
  Bug #27440 read_only allows create and drop database
  
  When read_only option was enabled, a user without SUPER privilege could
  perform CREATE DATABASE and DROP DATABASE operations.
  
  This patch adds a check to make sure this isn't possible. It also attempts to 
  simplify the logic used to determine if relevant tables are updated,
  making it more human readable.

  mysql-test/r/read_only.result@1.4.1.1, 2007-12-07 15:39:40+01:00, thek@adventure.(none) +31 -0
    Updated result file

  mysql-test/t/read_only.test@1.1.1.4, 2007-12-07 15:39:40+01:00, thek@adventure.(none) +34 -0
    A test case is added which shows that it is not possible to drop or create a
    database in read-only mode despite having the GRANT permissions to do so,
    SUPER user excepted. 

  sql/sql_parse.cc@1.426.168.4, 2007-12-07 15:39:40+01:00, thek@adventure.(none) +69 -8
    - Simplified complex predicate by grouping it in a read friendly way.
    - Added predicate to fail on database updates while running in read-only
      mode.

ChangeSet@1.2476.750.2, 2007-12-07 14:46:52+01:00, joerg@trift2. +1 -0
  Makefile.am
      Makefile syntax error, comment should precede the whole target.

  Makefile.am@1.118.1.29, 2007-12-07 14:46:47+01:00, joerg@trift2. +1 -1
    Makefile syntax error, comment should precede the whole target.

ChangeSet@1.2476.433.41, 2007-12-07 14:06:44+01:00, mskold@mysql.com +1 -0
  Removed illegal cast

  sql/ha_ndbcluster.cc@1.461.9.15, 2007-12-07 14:06:38+01:00, mskold@mysql.com +1 -1
    Removed illegal cast

ChangeSet@1.1810.3217.28, 2007-12-07 14:03:54+01:00, mskold@mysql.com +1 -0
  Removed illegal cast

  sql/ha_ndbcluster.cc@1.175.91.9, 2007-12-07 14:03:41+01:00, mskold@mysql.com +1 -1
    Removed illegal cast

ChangeSet@1.1810.3217.27, 2007-12-07 13:42:44+01:00, mskold@mysql.com +1 -0
  Removed illegal cast

  sql/ha_ndbcluster.cc@1.175.91.8, 2007-12-07 13:42:38+01:00, mskold@mysql.com +2 -2
    Removed illegal cast

ChangeSet@1.2476.433.38, 2007-12-07 12:20:04+01:00, mskold@mysql.com +1 -0
  bug#21072 Duplicate key error in NDB references wrong key: regenerated result

  mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result@1.5.1.1, 2007-12-07 12:19:32+01:00, mskold@mysql.com +2 -2
    bug#21072 Duplicate key error in NDB references wrong key: regenerated result

ChangeSet@1.2476.750.1, 2007-12-07 11:54:59+01:00, joerg@trift2. +1 -0
  Makefile.am
      In the "test-bt" target, replace the call "$(MAKE) test-embedded" by the actions of that target.

  Makefile.am@1.118.1.28, 2007-12-07 11:54:55+01:00, joerg@trift2. +8 -1
    In the "test-bt" target, replace the call "$(MAKE) test-embedded" by the actions of that target.
    
    Reason:
    For release builds, we run the tests in a tree that contains just a binary installation.
    So the Makefile is not in the test tree, and we explicitly address it in the build tree.
    This explicit path is not kept by "make", so it is missing in the sub-make.
    There seems to be no way to solve this with (portable!) "make" features -
    we could add a new variable and use it in the sub-make, but it is easier to duplicate these few lines.

ChangeSet@1.2476.749.1, 2007-12-07 14:44:03+04:00, svoj@mysql.com +3 -0
  BUG#32817 - though CSV is marked as supported create table is rejected
              with error 1005.
  
  CSV doesn't support nullable fields. Report descriptive error if create
  table with nullable field is requested.

  mysql-test/r/csv.result@1.25, 2007-12-07 14:44:01+04:00, svoj@mysql.com +8 -2
    A test case for BUG#32817.

  mysql-test/t/csv.test@1.30, 2007-12-07 14:44:01+04:00, svoj@mysql.com +9 -2
    A test case for BUG#32817.

  storage/csv/ha_tina.cc@1.45.20.3, 2007-12-07 14:44:01+04:00, svoj@mysql.com +4 -1
    CSV doesn't support nullable fields. Report descriptive error if create
    table with nullable field is requested.

ChangeSet@1.1810.3491.10, 2007-12-07 03:39:37-07:00, tsmith@ramayana.hindu.god +2 -0
  Make tests more robust (clean up better after grant.test)

  mysql-test/r/grant.result@1.37.15.1, 2007-12-07 03:39:36-07:00, tsmith@ramayana.hindu.god +2 -0
    Update test results to .test changes

  mysql-test/t/grant.test@1.41.10.1, 2007-12-07 03:39:36-07:00, tsmith@ramayana.hindu.god +2 -0
    Drop users when done with them, to avoid skewing results of later tests.
    
    For example, running some test which examines the cardinality of the
    mysql.user table would fail if run right after this test, due to the
    extra users. 

ChangeSet@1.2476.433.37, 2007-12-07 11:05:19+01:00, mskold@mysql.com +7 -0
  bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes

  mysql-test/suite/ndb/r/ndb_charset.result@1.17, 2007-12-07 11:05:12+01:00, mskold@mysql.com +4 -4
    bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes

  mysql-test/suite/ndb/r/ndb_index_unique.result@1.36, 2007-12-07 11:05:12+01:00, mskold@mysql.com +7 -7
    bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes

  mysql-test/suite/ndb/r/ndb_update.result@1.25, 2007-12-07 11:05:13+01:00, mskold@mysql.com +3 -3
    bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes

  sql/ha_ndbcluster.cc@1.461.9.12, 2007-12-07 11:05:12+01:00, mskold@mysql.com +0 -1
    bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes

  storage/ndb/include/ndbapi/NdbDictionary.hpp@1.95, 2007-12-07 11:05:12+01:00, mskold@mysql.com +0 -5
    bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes

  storage/ndb/src/ndbapi/NdbDictionary.cpp@1.73, 2007-12-07 11:05:12+01:00, mskold@mysql.com +0 -9
    bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes

  storage/ndb/src/ndbapi/NdbOperationExec.cpp@1.31, 2007-12-07 11:05:12+01:00, mskold@mysql.com +1 -1
    bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes

ChangeSet@1.1810.3217.26, 2007-12-07 10:33:50+01:00, mskold@mysql.com +3 -0
  bug#21072 Duplicate key error in NDB references wrong key: Post-review fixes

  sql/ha_ndbcluster.cc@1.175.91.7, 2007-12-07 10:33:45+01:00, mskold@mysql.com +0 -2
    bug#21072 Duplicate key error in NDB references wrong key: Post-review fixes

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.73.53.2, 2007-12-07 10:33:45+01:00, mskold@mysql.com +1 -5
    bug#21072 Duplicate key error in NDB references wrong key: Post-review fixes

  ndb/src/ndbapi/NdbTransaction.cpp@1.43.30.2, 2007-12-07 10:33:45+01:00, mskold@mysql.com +0 -1
    bug#21072 Duplicate key error in NDB references wrong key: Post-review fixes

ChangeSet@1.2476.745.4, 2007-12-07 00:54:32-07:00, tsmith@ramayana.hindu.god +4 -0
  Move the test case for bug #20901 from create.test to grant.test, so
  testing embedded server works correctly.

  mysql-test/r/create.result@1.158, 2007-12-07 00:54:30-07:00, tsmith@ramayana.hindu.god +0 -38
    Move one test from create.test to grant.test, because it actually tests
    privileges (and thus doesn't work with embedded server).

  mysql-test/r/grant.result@1.86, 2007-12-07 00:54:30-07:00, tsmith@ramayana.hindu.god +39 -0
    Move one test from create.test to grant.test, because it actually tests
    privileges (and thus doesn't work with embedded server).

  mysql-test/t/create.test@1.108, 2007-12-07 00:54:30-07:00, tsmith@ramayana.hindu.god +0 -76
    Move one test from create.test to grant.test, because it actually tests
    privileges (and thus doesn't work with embedded server).

  mysql-test/t/grant.test@1.65, 2007-12-07 00:54:30-07:00, tsmith@ramayana.hindu.god +78 -0
    Move one test from create.test to grant.test, because it actually tests
    privileges (and thus doesn't work with embedded server).

ChangeSet@1.1810.3491.9, 2007-12-06 16:11:26-07:00, tsmith@ramayana.hindu.god +1 -0
  Fix compiler warning about wrong integer size (probably harmless)

  sql/sql_select.cc@1.312.190.3, 2007-12-06 16:11:24-07:00, tsmith@ramayana.hindu.god +1 -1
    Fix compiler warning (probably harmless, wrong integer size)

ChangeSet@1.1616.3129.2, 2007-12-06 15:05:24-07:00, tsmith@ramayana.hindu.god +1 -0
  ctype-simple.c: Backport quick fix to remove Windows compiler warnings

  strings/ctype-simple.c@1.57.1.13, 2007-12-06 15:05:23-07:00, tsmith@ramayana.hindu.god +2 -2
    Backport quick fix to remove Windows compiler warnings.

ChangeSet@1.2476.738.4, 2007-12-06 22:17:42+04:00, holyfoot@mysql.com +2 -0
  partition_archive tests added

  mysql-test/r/partition_archive.result@1.2, 2007-12-06 22:17:39+04:00, holyfoot@mysql.com +78 -0
    test results

  mysql-test/t/partition_archive.test@1.2, 2007-12-06 22:17:39+04:00, holyfoot@mysql.com +75 -0
    tests added

ChangeSet@1.2476.722.12, 2007-12-06 20:03:38+02:00, bell@desktop.sanja.is.com.ua +1 -0
  Post-review fixes + some locking cleanup.

  storage/maria/ma_loghandler.c@1.80, 2007-12-06 20:03:34+02:00, bell@desktop.sanja.is.com.ua +36 -31
    translog_lock() made safe (non-mutex-protected operation is atomic now).
    Fixed translog_destroy() because it will not work to be
      called several times.

ChangeSet@1.2476.1.153, 2007-12-06 18:26:50+01:00, mleich@five.local.lan +1 -0
  Fix for
     Bug#32856 testsuite parts: partition_basic_myisam fails 
                                in pushbuild
  Skip test if symlink support is missing.

  mysql-test/suite/parts/t/partition_basic_myisam.test@1.5, 2007-12-06 18:26:46+01:00, mleich@five.local.lan +3 -0
    Skip test if running on a server with disabled symlinking.

ChangeSet@1.2476.667.57, 2007-12-06 18:03:30+01:00, tnurnberg@sin.intern.azundris.com +1 -0
  Bug#31177: Server variables can't be set to their current values
  
  initialise limits properly for getopt_ll_limit()
  (fixes falcon_opt test)

  sql/sql_plugin.cc@1.75.1.5, 2007-12-06 18:03:24+01:00, tnurnberg@sin.intern.azundris.com +2 -0
    initialise limits properly for getopt_ll_limit()

ChangeSet@1.1810.3217.25, 2007-12-06 17:15:21+01:00, mskold@mysql.com +13 -0
  bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  mysql-test/r/ndb_charset.result@1.5.1.5, 2007-12-06 17:15:10+01:00, mskold@mysql.com +4 -4
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  mysql-test/r/ndb_index_unique.result@1.16.1.6, 2007-12-06 17:15:10+01:00, mskold@mysql.com +7 -7
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  mysql-test/r/ndb_update.result@1.5.3.1, 2007-12-06 17:15:10+01:00, mskold@mysql.com +1 -1
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  sql/ha_ndbcluster.cc@1.175.91.6, 2007-12-06 17:15:11+01:00, mskold@mysql.com +22 -1
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  ndb/include/kernel/signaldata/TcKeyRef.hpp@1.1.2.1, 2007-12-06 17:15:10+01:00, mskold@mysql.com +2 -1
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  ndb/include/kernel/signaldata/TcRollbackRep.hpp@1.2.2.1, 2007-12-06 17:15:10+01:00, mskold@mysql.com +2 -1
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  ndb/include/ndbapi/NdbDictionary.hpp@1.48.12.1, 2007-12-06 17:15:10+01:00, mskold@mysql.com +6 -1
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp@1.26.27.1, 2007-12-06 17:15:10+01:00, mskold@mysql.com +1 -0
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.73.53.1, 2007-12-06 17:15:10+01:00, mskold@mysql.com +20 -1
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  ndb/src/ndbapi/NdbDictionary.cpp@1.34.9.1, 2007-12-06 17:15:10+01:00, mskold@mysql.com +9 -0
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  ndb/src/ndbapi/NdbOperationExec.cpp@1.18.6.1, 2007-12-06 17:15:10+01:00, mskold@mysql.com +7 -0
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  ndb/src/ndbapi/NdbTransaction.cpp@1.43.30.1, 2007-12-06 17:15:10+01:00, mskold@mysql.com +11 -2
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  ndb/src/ndbapi/ndberror.c@1.30.42.1, 2007-12-06 17:15:10+01:00, mskold@mysql.com +0 -2
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

ChangeSet@1.2476.747.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.7.1.1, 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.18.1.2, 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.631.73, 2007-12-06 14:43:06+01:00, mattiasj@witty.ndb.mysql.com +3 -0
  Bug#32948: FKs allowed to reference partitioned table
  
  Problem: when alter to partitioned table,
  it does not see it as change of engine.
  
  Solution: If alter includes partitioning, check if it is possible
  to change engines (eg. is the table referenced by a FK)

  mysql-test/r/partition_innodb.result@1.10, 2007-12-06 14:43:04+01:00, mattiasj@witty.ndb.mysql.com +12 -0
    Bug#32948: FKs allowed to reference partitioned table
    test result

  mysql-test/t/partition_innodb.test@1.9, 2007-12-06 14:43:04+01:00, mattiasj@witty.ndb.mysql.com +15 -0
    Bug#32948: FKs allowed to reference partitioned table
    test case

  sql/sql_table.cc@1.437.32.1, 2007-12-06 14:43:05+01:00, mattiasj@witty.ndb.mysql.com +2 -1
    Bug#32948: FKs allowed to reference partitioned table
    
    if alter to partitioning, it is the same as changing engine.

ChangeSet@1.2476.746.1, 2007-12-06 16:39:42+04:00, holyfoot@mysql.com +6 -0
  Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table).
  
  ha_partition::update_create_info() just calls update_create_info
  of a first partition, so only get the autoincrement maximum
  of the first partition, so SHOW CREATE TABLE can show
  small AUTO_INCREMENT parameters.
  Fixed by implementing ha_partition::update_create_info() in a way
  other handlers work.
  HA_ARCHIVE:stats.auto_increment handling made consistent with other engines

  mysql-test/r/archive.result@1.36.2.1, 2007-12-06 16:39:40+04:00, holyfoot@mysql.com +1 -1
    Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table).
    
    test result fixed

  mysql-test/r/partition.result@1.69.5.1, 2007-12-06 16:39:40+04:00, holyfoot@mysql.com +15 -0
    Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table).
    
    test result

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@1.6.2.1, 2007-12-06 16:39:40+04:00, holyfoot@mysql.com +1 -1
    Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table).
    
    test result fixed

  mysql-test/t/partition.test@1.63.5.1, 2007-12-06 16:39:40+04:00, holyfoot@mysql.com +21 -0
    Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table).
    
    test added as rpl_innodb_bug28430 is INNOBASE specific while
    the bug is not

  sql/ha_partition.cc@1.104.6.1, 2007-12-06 16:39:40+04:00, holyfoot@mysql.com +5 -1
    Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table).
    
    ha_partition::update_create_info() implemented

  storage/archive/ha_archive.cc@1.138.1.7, 2007-12-06 16:39:40+04:00, holyfoot@mysql.com +14 -23
    Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table).
    
    ha_archive.stats.auto_increment now contains next (not last used) value
    of auto_increment to be consistent with other engines

ChangeSet@1.2476.743.2, 2007-12-06 13:32:16+02:00, bell@desktop.sanja.is.com.ua +9 -0
  Trivial postreview changes.

  storage/maria/ma_blockrec.c@1.61, 2007-12-06 13:32:13+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Layout fix.

  storage/maria/ma_loghandler.c@1.79, 2007-12-06 13:32:13+02:00, bell@desktop.sanja.is.com.ua +115 -162
    Renamed struct variable 'class' to avoid problems with c++ compiler.
    Renamed translog_init_scanner to fit othere init functions naming pattern.
    translog_relative_LSN_encode can't return error for now.
    Other trivial postreview changes.

  storage/maria/ma_loghandler.h@1.35, 2007-12-06 13:32:13+02:00, bell@desktop.sanja.is.com.ua +11 -24
    Trivial postreview changes.

  storage/maria/ma_loghandler_lsn.h@1.18, 2007-12-06 13:32:13+02:00, bell@desktop.sanja.is.com.ua +4 -4
    trivial postreview changes.

  storage/maria/ma_recovery.c@1.52.1.3, 2007-12-06 13:32:13+02:00, bell@desktop.sanja.is.com.ua +2 -2
    Renamed translog_init_scanner to fit othere init functions naming pattern.

  storage/maria/unittest/ma_loghandler_examples.c@1.2, 2007-12-06 13:32:13+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Renamed struct variable 'class' to avoid problems with c++ compiler.

  storage/maria/unittest/ma_test_loghandler-t.c@1.24, 2007-12-06 13:32:13+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Renamed translog_init_scanner to fit othere init functions naming pattern.

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.21, 2007-12-06 13:32:13+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Renamed translog_init_scanner to fit othere init functions naming pattern.

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.21, 2007-12-06 13:32:13+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Renamed translog_init_scanner to fit othere init functions naming pattern.

ChangeSet@1.1616.3125.2, 2007-12-06 11:48:27+01:00, tnurnberg@mysql.com +4 -0
  Bug#31752: check strmake() bounds
  
  post-fixes: prevent semi-related overflow, additional comments

  mysys/mf_pack.c@1.21.2.1, 2007-12-06 11:48:27+01:00, tnurnberg@mysql.com +2 -2
    extra comments

  sql/log.cc@1.108.9.2, 2007-12-06 11:48:27+01:00, tnurnberg@mysql.com +1 -1
    prevent overflow (length parameter of strmake() should
    never become < 0)

  sql/sql_show.cc@1.122.1.90, 2007-12-06 11:48:27+01:00, tnurnberg@mysql.com +3 -2
    additional comments

  sql/unireg.cc@1.43.3.2, 2007-12-06 11:48:27+01:00, tnurnberg@mysql.com +5 -0
    additional comments

ChangeSet@1.1810.3534.3, 2007-12-06 01:28:01+01:00, tnurnberg@mysql.com +11 -0
  Bug#31177: Server variables can't be set to their current values
  
  additional fixes for BDB and correct assignment of both signed
  and unsigned 64-bit data to unsigned system variables

  mysql-test/r/ps_6bdb.result@1.27.23.1, 2007-12-06 01:27:59+01:00, tnurnberg@mysql.com +8 -8
    account for UNSIGNED_FLAG

  mysql-test/r/ps_2myisam.result@1.39.9.1, 2007-12-06 01:27:59+01:00, tnurnberg@mysql.com +8 -8
    account for UNSIGNED_FLAG

  mysql-test/r/ps_3innodb.result@1.42.9.1, 2007-12-06 01:27:59+01:00, tnurnberg@mysql.com +8 -8
    account for UNSIGNED_FLAG

  mysql-test/r/ps_4heap.result@1.38.9.1, 2007-12-06 01:27:59+01:00, tnurnberg@mysql.com +8 -8
    account for UNSIGNED_FLAG

  mysql-test/r/ps_5merge.result@1.39.9.1, 2007-12-06 01:27:59+01:00, tnurnberg@mysql.com +16 -16
    account for UNSIGNED_FLAG

  mysql-test/r/ps_7ndb.result@1.26.13.1, 2007-12-06 01:27:59+01:00, tnurnberg@mysql.com +8 -8
    account for UNSIGNED_FLAG

  mysys/my_getopt.c@1.55.1.11, 2007-12-06 01:27:59+01:00, tnurnberg@mysql.com +0 -2
    We have correct signed/unsigned information now, so we no longer
    need to err on the side of caution.

  sql/item_func.cc@1.270.89.2, 2007-12-06 01:27:59+01:00, tnurnberg@mysql.com +2 -0
    Copy unsigned info over from entry so the item's data
    correctly describe it.

  sql/mysqld.cc@1.439.143.1, 2007-12-06 01:27:59+01:00, tnurnberg@mysql.com +1 -1
    BDB log buffer size: default can't be less than minimum

  sql/set_var.cc@1.125.42.2, 2007-12-06 01:27:59+01:00, tnurnberg@mysql.com +24 -8
    Handle signedness of in-values correctly when assigning to
    unsigned types, all the way up to 64-bit. Use handler from
    all three unsigned sysvar types.

  sql/set_var.h@1.68.8.2, 2007-12-06 01:27:59+01:00, tnurnberg@mysql.com +1 -0
    thd_ulonglong: Override default check with one for unsigned types

ChangeSet@1.2476.745.2, 2007-12-05 13:54:11-07:00, tsmith@ramayana.hindu.god +1 -0
  Post-merge fix (reorder tests in ctype_ucs.test)

  mysql-test/t/ctype_ucs.test@1.62, 2007-12-05 13:54:08-07:00, tsmith@ramayana.hindu.god +8 -8
    Post-merge fix (fix order of tests to match results).

ChangeSet@1.2476.720.4, 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.720.3, 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.744.1, 2007-12-05 09:48:13-02:00, davi@mysql.com +2 -0
  Bug#32996 log_tables.test fails sporadically
  
  Only select entries from the general_log that were issued by the current
  connection.

  mysql-test/r/log_tables.result@1.30, 2007-12-05 09:48:11-02:00, davi@mysql.com +2 -1
    Update test result.

  mysql-test/t/log_tables.test@1.26, 2007-12-05 09:48:11-02:00, davi@mysql.com +2 -1
    Only select entries from the current thread.

ChangeSet@1.2476.743.1, 2007-12-05 12:13:02+02:00, bell@desktop.sanja.is.com.ua +1 -0
  Fixed loop condition.

  storage/maria/ma_loghandler.c@1.78, 2007-12-05 12:13:00+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Fixed loop condition.

ChangeSet@1.2476.742.1, 2007-12-05 10:47:23+02:00, monty@mysql.com +1 -0
  Fixed wrong placement of #ifdef

  storage/maria/ma_key_recover.c@1.6, 2007-12-05 10:47:21+02:00, monty@mysql.com +1 -1
    Fixed wrong placement of #ifdef

ChangeSet@1.1810.3541.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.8, 2007-12-05 04:29:59+02:00, bell@desktop.sanja.is.com.ua +1 -0
  Postreview fix + some improvements of the loop.
  Fixed overlaying block waiting during flushing block.
  Sync directory only is file size really changed.
  Fixed bug in the flush function when we access data
   in file cache and horizon value without mutex protection.

  storage/maria/ma_loghandler.c@1.77, 2007-12-05 04:29:56+02:00, bell@desktop.sanja.is.com.ua +83 -35
    Postreview fix + some improvements of the loop.
    Fixed overlaying block waiting during flushing block.
    Sync directory only is file size really changed.
    Fixed bug in the flush function when we access data
     in file cache and horizon value without mutex protection.

ChangeSet@1.2476.722.7, 2007-12-05 00:45:32+02:00, monty@mysql.com +5 -0
  Don't give warnings when reading blocks when we know the block may not exist (in maria_read_log)
  Don't give warnings when opening a wrong control file in ma_control_file_t (unit test)

  BitKeeper/deleted/.del-ma_key_redo.c@1.1.1.1, 2007-12-04 23:27:03+02:00, monty@mysql.com +0 -0
    Delete: storage/maria/ma_key_redo.c

  storage/maria/ma_blockrec.c@1.60, 2007-12-05 00:45:29+02:00, monty@mysql.com +20 -11
    Don't give warnings when reading blocks when we know the block may not exist

  storage/maria/ma_pagecache.c@1.60, 2007-12-05 00:45:29+02:00, monty@mysql.com +1 -0
    Keep a convinience copy of readwrite_flags

  storage/maria/ma_pagecache.h@1.32, 2007-12-05 00:45:29+02:00, monty@mysql.com +1 -0
    Keep a convinience copy of readwrite_flags

  storage/maria/unittest/ma_control_file-t.c@1.19, 2007-12-05 00:45:29+02:00, monty@mysql.com +39 -7
    Don't give warnings when opening a wrong control file

ChangeSet@1.2476.741.1, 2007-12-04 23:23:42+02:00, monty@mysql.com +66 -0
  Added error HA_ERR_FILE_TOO_SHORT to be used when files are shorter than expected (by my_read/my_pread)
  Added debugger hook _my_dbug_put_break_here() that is called if we get a CRC that matches --debug-crc-break (my_crc_dbug_break)
  Fixed REDO_REPAIR to use all repair modes (repair, repair_by_sort, repair_paralell
  REDO_REPAIR now also logs used key map
  Fixed some bugs in REDO logging of key pages
  Better error messages from maria_read_log
  Added my_readwrite_flags to init_pagecache() to be able to get better error messages and simplify code.
  Don't allow pagecaches with less than 8 blocks (Causes strange crashes)
  Added EXTRA_DEBUG_KEY_CHANGES. When this is defined some REDO_INDEX entries contains page checksums (these are calculated and checked in DBUG mode, ignored otherwise)
  Fixed bug in ma_pagecache unit tests that caused program to sometimes fail
  Added some missing calls to MY_INIT() that caused some unit tests to fail
  Fixed that TRUNCATE works properly on temporary MyISAM files
  Updates some result files to new table checksums results (checksum when NULL fields are ignored)
  perl test-insert can be replayed with maria_read_log!

  BitKeeper/etc/ignore@1.263, 2007-12-04 23:13:21+02:00, monty@mysql.com +2 -0
    added storage/maria/unittest/page_cache_test_file_1 storage/maria/unittest/pagecache_debug.log

  include/maria.h@1.22, 2007-12-04 23:23:00+02:00, monty@mysql.com +1 -1
    Added maria_tmpdir

  include/my_base.h@1.103, 2007-12-04 23:23:00+02:00, monty@mysql.com +2 -1
    Added error HA_ERR_FILE_TOO_SHORT

  include/my_sys.h@1.223, 2007-12-04 23:23:00+02:00, monty@mysql.com +2 -0
    Added variable my_crc_dbug_check
    Added function my_dbug_put_break_here()

  include/myisamchk.h@1.6, 2007-12-04 23:23:00+02:00, monty@mysql.com +1 -0
    Added org_key_map (Needed for writing REDO record for REPAIR)

  mysql-test/r/innodb.result@1.202.4.1, 2007-12-04 23:23:00+02:00, monty@mysql.com +7 -7
    Updated to new checksum algorithm (NULL ignored)

  mysql-test/r/mix2_myisam.result@1.7, 2007-12-04 23:23:00+02:00, monty@mysql.com +14 -14
    Updated to new checksum algorithm (NULL ignored)

  mysql-test/r/myisam.result@1.112.2.1, 2007-12-04 23:23:00+02:00, monty@mysql.com +6 -6
    Updated to new checksum algorithm (NULL ignored)

  mysql-test/r/old-mode.result@1.1, 2007-12-04 23:23:40+02:00, monty@mysql.com +14 -0
    New BitKeeper file ``mysql-test/r/old-mode.result''

  mysql-test/r/old-mode.result@1.0, 2007-12-04 23:23:40+02:00, monty@mysql.com +0 -0

  mysql-test/t/myisam.test@1.89, 2007-12-04 23:23:00+02:00, monty@mysql.com +1 -1
    Added used table

  mysql-test/t/old-mode-master.opt@1.1, 2007-12-04 23:23:40+02:00, monty@mysql.com +1 -0
    New BitKeeper file ``mysql-test/t/old-mode-master.opt''

  mysql-test/t/old-mode-master.opt@1.0, 2007-12-04 23:23:40+02:00, monty@mysql.com +0 -0

  mysql-test/t/old-mode.test@1.1, 2007-12-04 23:23:40+02:00, monty@mysql.com +16 -0
    New BitKeeper file ``mysql-test/t/old-mode.test''

  mysql-test/t/old-mode.test@1.0, 2007-12-04 23:23:40+02:00, monty@mysql.com +0 -0

  mysys/checksum.c@1.12, 2007-12-04 23:23:00+02:00, monty@mysql.com +9 -3
    Added DBUG for checksum results
    Added debugger hook so that _my_dbug_put_break_here() is called if we get matching CRC

  mysys/lf_alloc-pin.c@1.15, 2007-12-04 23:23:00+02:00, monty@mysql.com +1 -0
    Fixed compiler warning

  mysys/my_handler.c@1.33, 2007-12-04 23:23:00+02:00, monty@mysql.com +2 -1
    Added new error message

  mysys/my_init.c@1.60, 2007-12-04 23:23:00+02:00, monty@mysql.com +11 -1
    If my_progname is not given, use 'unknown' form my_progname_short
    Added debugger function my_debug_put_break_here()

  mysys/my_pread.c@1.22, 2007-12-04 23:23:00+02:00, monty@mysql.com +6 -1
    In case of too short file when MY_NABP or MY_FNABP is specified, give error HA_ERR_FILE_TO_SHORT

  mysys/my_read.c@1.21, 2007-12-04 23:23:00+02:00, monty@mysql.com +4 -2
    In case of too short file when MY_NABP or MY_FNABP is specified, give error HA_ERR_FILE_TO_SHORT

  sql/mysqld.cc@1.608, 2007-12-04 23:23:01+02:00, monty@mysql.com +7 -1
    Added debug option --debug-crc-break

  sql/share/Makefile.am@1.35, 2007-11-29 12:08:04+02:00, monty@mysql.com +0 -0
    Change mode to -rw-rw-r--

  sql/sql_parse.cc@1.688, 2007-12-04 23:23:01+02:00, monty@mysql.com +1 -2
    Trivial optimization

  storage/maria/ha_maria.cc@1.55.1.1, 2007-12-04 23:23:01+02:00, monty@mysql.com +10 -7
    Renamed variable to be more logical
    Ensure that param.testflag is correct when calling repair
    Added extra argument to init_pagecache
    Set default value for maria_tempdir

  storage/maria/ma_blockrec.c@1.59, 2007-12-04 23:23:01+02:00, monty@mysql.com +2 -2
    Test for HA_ERR_FILE_TOO_SHORT instead for -1

  storage/maria/ma_cache.c@1.5, 2007-12-04 23:23:01+02:00, monty@mysql.com +2 -2
    Test for HA_ERR_FILE_TOO_SHORT instead for -1

  storage/maria/ma_check.c@1.52, 2007-12-04 23:23:01+02:00, monty@mysql.com +25 -14
    Set param->testflag to match how repair is run (needed for REDO logging)
    Simple optimization
    Moved flag if page is node from pagelength to keypage-flag byte
    Log used key map in REDO log.

  storage/maria/ma_delete.c@1.19, 2007-12-04 23:23:38+02:00, monty@mysql.com +48 -30
    Remember previous UNDO entry when writing undo (for future CLR records)
    Moved flag if page is node from pagelength to keypage-flag byte
    Fixed some bugs in redo logging
    Added CRC for some translog REDO_INDEX entries

  storage/maria/ma_dynrec.c@1.19, 2007-12-04 23:23:38+02:00, monty@mysql.com +1 -1
    Test for HA_ERR_FILE_TOO_SHORT instead for -1

  storage/maria/ma_ft_update.c@1.9, 2007-12-04 23:23:38+02:00, monty@mysql.com +1 -1
    Fixed call to _ma_store_page_used()

  storage/maria/ma_key_recover.c@1.5, 2007-12-04 23:23:38+02:00, monty@mysql.com +95 -27
    Added CRC for some translog REDO_INDEX entries
    Removed not needed pagecache_write() in _ma_apply_redo_index()

  storage/maria/ma_locking.c@1.20, 2007-12-04 23:23:38+02:00, monty@mysql.com +2 -2
    Test for HA_ERR_FILE_TOO_SHORT instead for -1

  storage/maria/ma_loghandler.c@1.73.1.1, 2007-12-04 23:23:39+02:00, monty@mysql.com +1 -1
    Added used key map to REDO_REPAIR_TABLE

  storage/maria/ma_loghandler.h@1.32.1.1, 2007-12-04 23:23:39+02:00, monty@mysql.com +1 -0
    Added operation for checksum of key pages

  storage/maria/ma_open.c@1.39, 2007-12-04 23:23:39+02:00, monty@mysql.com +4 -0
    Allocate storage for undo lsn pointers

  storage/maria/ma_pagecache.c@1.59, 2007-12-04 23:23:39+02:00, monty@mysql.com +105 -109
    Remove not needed include file
    Change logging to use fd: for file descritors as other code
    Added my_readwrite_flags to init_pagecache() to be able to get better error messages for maria_chk/maria_read_log
    Don't allow pagecaches with less than 8 blocks
    Remove wrong DBUG_ASSERT()

  storage/maria/ma_pagecache.h@1.31, 2007-12-04 23:23:39+02:00, monty@mysql.com +3 -2
    Added readwrite_flags

  storage/maria/ma_recovery.c@1.52.1.2, 2007-12-04 23:23:39+02:00, monty@mysql.com +129 -62
    Better error messages for maria_read_log:
    - Added eprint() for printing error messages
    - Print extra \n before error message if we are printing %0 %10 ...
    
    Added used key_map to REDO_REPAIR log entry
    More DBUG
    Call same repair method that was used by mysqld

  storage/maria/ma_rt_index.c@1.12, 2007-12-04 23:23:39+02:00, monty@mysql.com +4 -3
    Moved flag if page is node from pagelength to keypage-flag byte

  storage/maria/ma_rt_key.c@1.9, 2007-12-04 23:23:39+02:00, monty@mysql.com +2 -2
    Fixed call to _ma_store_page_used()

  storage/maria/ma_rt_split.c@1.10, 2007-12-04 23:23:39+02:00, monty@mysql.com +4 -3
    Moved flag if page is node from pagelength to keypage-flag byte

  storage/maria/ma_static.c@1.10, 2007-12-04 23:23:39+02:00, monty@mysql.com +1 -0
    Added maria_tmpdir

  storage/maria/ma_test1.c@1.31, 2007-12-04 23:23:39+02:00, monty@mysql.com +3 -3
    Updated call to init_pagecache()

  storage/maria/ma_test2.c@1.29, 2007-12-04 23:23:39+02:00, monty@mysql.com +2 -2
    Updated call to init_pagecache()

  storage/maria/ma_test3.c@1.11, 2007-12-04 23:23:39+02:00, monty@mysql.com +2 -1
    Updated call to init_pagecache()

  storage/maria/ma_write.c@1.24, 2007-12-04 23:23:39+02:00, monty@mysql.com +22 -18
    Removed #ifdef NOT_YET
    Moved flag if page is node from pagelength to keypage-flag byte
    Fixed bug in  _ma_log_del_prefix()

  storage/maria/maria_chk.c@1.30, 2007-12-04 23:23:39+02:00, monty@mysql.com +2 -2
    Fixed wrong min limit for page_buffer_size
    Updated call to init_pagecache()

  storage/maria/maria_def.h@1.48, 2007-12-04 23:23:39+02:00, monty@mysql.com +19 -14
    Added EXTRA_DEBUG_KEY_CHANGES. When this is defined some REDO_INDEX entries contains page checksums
    Moved flag if page is node from pagelength to keypage-flag byte

  storage/maria/maria_ftdump.c@1.9, 2007-12-04 23:23:39+02:00, monty@mysql.com +1 -1
    Updated call to init_pagecache()

  storage/maria/maria_pack.c@1.17, 2007-12-04 23:23:39+02:00, monty@mysql.com +4 -1
    Updated call to init_pagecache()
    Reset share->state.create_rename_lsn & share->state.is_of_horizon

  storage/maria/maria_read_log.c@1.28, 2007-12-04 23:23:39+02:00, monty@mysql.com +45 -11
    Better error messages
    Added --tmpdir option (needed to set temporary directory for REDO_REPAIR)
    Added --start-from-lsn
    Changed option for --display-only to 'd' (wanted to use -o for 'offset')

  storage/maria/unittest/lockman2-t.c@1.8, 2007-12-04 23:23:39+02:00, monty@mysql.com +2 -1
    Added missing call to MY_INIT()

  storage/maria/unittest/ma_pagecache_consist.c@1.16, 2007-12-04 23:23:39+02:00, monty@mysql.com +1 -1
    Updated call to init_pagecache()

  storage/maria/unittest/ma_pagecache_single.c@1.14.1.1, 2007-12-04 23:23:39+02:00, monty@mysql.com +50 -40
    Fixed bug that caused program to sometimes fail
    Added some DBUG_ASSERTS()
    Changed some calls to malloc()/free() to my_malloc()/my_free()
    Create extra file to expose original hard-to-find bug

  storage/maria/unittest/ma_test_loghandler-t.c@1.21.1.1, 2007-12-04 23:23:39+02:00, monty@mysql.com +1 -1
    Updated call to init_pagecache()

  storage/maria/unittest/ma_test_loghandler_first_lsn-t.c@1.5.1.1, 2007-12-04 23:23:39+02:00, monty@mysql.com +1 -1
    Updated call to init_pagecache()

  storage/maria/unittest/ma_test_loghandler_max_lsn-t.c@1.5.1.1, 2007-12-04 23:23:39+02:00, monty@mysql.com +1 -1
    Updated call to init_pagecache()

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.18.1.1, 2007-12-04 23:23:39+02:00, monty@mysql.com +2 -2
    Updated call to init_pagecache()

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.18.1.1, 2007-12-04 23:23:39+02:00, monty@mysql.com +1 -1
    Updated call to init_pagecache()

  storage/maria/unittest/ma_test_loghandler_noflush-t.c@1.5.1.1, 2007-12-04 23:23:39+02:00, monty@mysql.com +1 -1
    Updated call to init_pagecache()

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.16.1.1, 2007-12-04 23:23:39+02:00, monty@mysql.com +1 -1
    Updated call to init_pagecache()

  storage/maria/unittest/ma_test_loghandler_purge-t.c@1.3.1.1, 2007-12-04 23:23:39+02:00, monty@mysql.com +1 -1
    Updated call to init_pagecache()

  storage/maria/unittest/test_file.c@1.4.1.1, 2007-12-04 23:23:39+02:00, monty@mysql.com +18 -9
    Changed malloc()/free() to my_malloc()/my_free()
    Fixed memory leak
    Changd logic a bit while trying to find bug in reset_file()

  storage/maria/unittest/trnman-t.c@1.13, 2007-12-04 23:23:40+02:00, monty@mysql.com +2 -1
    Added missing call to MY_INIT()

  storage/myisam/mi_cache.c@1.19, 2007-12-04 23:23:40+02:00, monty@mysql.com +2 -2
    Test for HA_ERR_FILE_TOO_SHORT instead for -1

  storage/myisam/mi_create.c@1.69, 2007-12-04 23:23:40+02:00, monty@mysql.com +1 -1
    Removed O_EXCL to get TRUNCATE to work for temporary files

  storage/myisam/mi_dynrec.c@1.53, 2007-12-04 23:23:40+02:00, monty@mysql.com +1 -1
    Test for HA_ERR_FILE_TOO_SHORT instead for -1

  storage/myisam/mi_locking.c@1.56, 2007-12-04 23:23:40+02:00, monty@mysql.com +2 -2
    Test for HA_ERR_FILE_TOO_SHORT instead for -1

ChangeSet@1.2476.1.152, 2007-12-04 20:27:08+01:00, kent@mysql.com +1 -0
  configure.in:
    Removed the auto detection and use of Solaris "libmtmalloc", as it
    cause regression on bug#18322. The code removed also prevented
    a build without using this library. Users can still compile with
    "libmtmalloc", if configuring with "--with-mysqld-libs=-lmtmalloc"

  configure.in@1.355.52.43, 2007-12-04 20:23:19+01:00, kent@mysql.com +0 -1
    Removed the auto detection and use of Solaris "libmtmalloc", as it
    cause regression on bug#18322. The code removed also prevented
    a build without using this library. Users can still compile with
    "libmtmalloc", if configuring with "--with-mysqld-libs=-lmtmalloc"

ChangeSet@1.2476.719.13, 2007-12-04 18:52:43+03:00, anozdrin@station. +1 -0
  Bug#32966 main.status fails.
  Disable failing test case.

  mysql-test/t/disabled.def@1.266.20.25, 2007-12-04 18:52:40+03:00, anozdrin@station. +1 -0
    Disable main.status test case.

ChangeSet@1.2476.719.12, 2007-12-04 18:51:03+03:00, anozdrin@station. +1 -0
  Bug#32965 main.ctype_create fails.
  Disable failing test case.

  mysql-test/t/disabled.def@1.266.20.24, 2007-12-04 18:51:00+03:00, anozdrin@station. +1 -0
    Disable main.ctype_create test case.

ChangeSet@1.1810.3533.6, 2007-12-04 12:57:16+00:00, jperkin@chorlton.adsl.perkin.org.uk +1 -0
  post-commit:
    Use $BK_USER, if set, in preference to $USER

  BitKeeper/triggers/post-commit@1.26.11.4, 2007-12-04 12:56:36+00:00, jperkin@chorlton.adsl.perkin.org.uk +10 -3
    Use $BK_USER, if set, in preference to $USER

ChangeSet@1.2476.740.1, 2007-12-04 12:48:11+04:00, gluh@mysql.com +2 -0
  test case fix

  mysql-test/r/information_schema.result@1.151.1.24, 2007-12-04 12:48:09+04:00, gluh@mysql.com +1 -0
    test case fix

  mysql-test/t/information_schema.test@1.98.6.2, 2007-12-04 12:48:09+04:00, gluh@mysql.com +1 -0
    test case fix

ChangeSet@1.2476.739.1, 2007-12-03 18:19:35-07:00, tsmith@ramayana.hindu.god +2 -0
  Bug #32679: mysqld_safe looks for errmsg.sys in wrong path
  
  The fix for bug 28544 moved our package data from ./share/mysql
  to ./share.  mysqld_safe had the old directory hard-coded.  The
  fix is to use the @pkgdatadir@ and @prefix@ values, to adapt to
  different ways of building the package.

  scripts/make_binary_distribution.sh@1.162.1.1, 2007-12-03 18:19:34-07:00, tsmith@ramayana.hindu.god +2 -1
    Document that our build system explicitly overrides the @pkgfoo@ (e.g.,
    pkgdatadir, pkglibdir, etc.) variables when 'make' is called.

  scripts/mysqld_safe.sh@1.96, 2007-12-03 18:19:34-07:00, tsmith@ramayana.hindu.god +12 -3
    Replace hard-coded "./share/mysql" with something like
    echo @pkgdatadir@ | sed -e s/^@prefix@//.
    
    Since the fix for bug 28544, this has been broken for mysql 5.1+,
    where the package data dir is "./share" instead of "./share/mysql".

ChangeSet@1.2476.738.1, 2007-12-04 01:17:52+01:00, tnurnberg@mysql.com +3 -0
  Bug#31177: Server variables can't be set to their current values
  
  additional fixes for 64-bit
  ---
  Merge mysql.com:/misc/mysql/31177/50-31177
  into  mysql.com:/misc/mysql/31177/51-31177
  ---
  Bug#31177: Server variables can't be set to their current values
  
  additional 5.1 fixes (for plugins)

  mysql-test/t/variables.test@1.82, 2007-12-04 01:17:50+01:00, tnurnberg@mysql.com +1 -1
    replace 32-bit and 64-bit values
    ---
    manual merge

  mysys/my_getopt.c@1.78, 2007-12-04 01:17:50+01:00, tnurnberg@mysql.com +3 -1
    'mod' no longer used.
    on 64-bit, limit to (signed) (LONG)LONG_MAX to prevent badness
    in classes using longlong.

  sql/sql_plugin.cc@1.75.1.4, 2007-12-04 01:17:50+01:00, tnurnberg@mysql.com +21 -2
    handle signedness in plugin-vars so we won't hit an assert()
    in getopt_*_limit_value()

ChangeSet@1.2476.722.5, 2007-12-03 18:09:36+02:00, bell@desktop.sanja.is.com.ua +15 -0
  Added variable to control log directory syncs.
  Part of postreview fixes added.

  mysql-test/r/maria.result@1.24, 2007-12-03 18:09:34+02:00, bell@desktop.sanja.is.com.ua +1 -0
    Added variable to control log directory syncs.

  storage/maria/ha_maria.cc@1.56, 2007-12-03 18:09:34+02:00, bell@desktop.sanja.is.com.ua +18 -0
    Added variable to control log directory syncs.

  storage/maria/ma_loghandler.c@1.75, 2007-12-03 18:09:34+02:00, bell@desktop.sanja.is.com.ua +201 -183
    Added variable to control log directory syncs.
    Part of postreview fixes added.

  storage/maria/ma_loghandler.h@1.33, 2007-12-03 18:09:35+02:00, bell@desktop.sanja.is.com.ua +8 -2
    Added variable to control log directory syncs.

  storage/maria/ma_loghandler_lsn.h@1.17, 2007-12-03 18:09:35+02:00, bell@desktop.sanja.is.com.ua +6 -1
    postreview fix

  storage/maria/unittest/Makefile.am@1.17, 2007-12-03 18:09:35+02:00, bell@desktop.sanja.is.com.ua +9 -9
    New file with logrecord descriptors for tests.

  storage/maria/unittest/ma_loghandler_examples.c@1.1, 2007-12-03 18:09:35+02:00, bell@desktop.sanja.is.com.ua +52 -0
    New BitKeeper file ``storage/maria/unittest/ma_loghandler_examples.c''

  storage/maria/unittest/ma_loghandler_examples.c@1.0, 2007-12-03 18:09:35+02:00, bell@desktop.sanja.is.com.ua +0 -0

  storage/maria/unittest/ma_test_loghandler-t.c@1.22, 2007-12-03 18:09:35+02:00, bell@desktop.sanja.is.com.ua +1 -0
    New file with logrecord descriptors for tests.

  storage/maria/unittest/ma_test_loghandler_first_lsn-t.c@1.6, 2007-12-03 18:09:35+02:00, bell@desktop.sanja.is.com.ua +1 -0
    New file with logrecord descriptors for tests.

  storage/maria/unittest/ma_test_loghandler_max_lsn-t.c@1.6, 2007-12-03 18:09:35+02:00, bell@desktop.sanja.is.com.ua +1 -0
    New file with logrecord descriptors for tests.

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.19, 2007-12-03 18:09:35+02:00, bell@desktop.sanja.is.com.ua +1 -0
    New file with logrecord descriptors for tests.

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.19, 2007-12-03 18:09:35+02:00, bell@desktop.sanja.is.com.ua +1 -0
    New file with logrecord descriptors for tests.

  storage/maria/unittest/ma_test_loghandler_noflush-t.c@1.6, 2007-12-03 18:09:35+02:00, bell@desktop.sanja.is.com.ua +1 -0
    New file with logrecord descriptors for tests.

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.17, 2007-12-03 18:09:35+02:00, bell@desktop.sanja.is.com.ua +1 -0
    New file with logrecord descriptors for tests.

  storage/maria/unittest/ma_test_loghandler_purge-t.c@1.4, 2007-12-03 18:09:35+02:00, bell@desktop.sanja.is.com.ua +1 -0
    New file with logrecord descriptors for tests.

ChangeSet@1.2476.631.71, 2007-12-03 16:12:25+01:00, mattiasj@witty. +1 -0
  Bug#30480: Falcon: searches fail if LIKE and key partition
  (also fixes the bugs: Bug#29320, Bug#29493 and Bug#30536)
  
  Problem: Partitioning did not handle unordered scans correctly
  for engines with unordered read order.
  
  Solution: do not stop scanning fi a recored is out of range, since
  there can be more records within the range afterwards.
  
  Note: this is the patch that fixes the bug, but since there are no
  storage engines shipped with mysql 5.1 (falcon comes in 6.0) there
  are no test cases (it is a separate patch that only goes into 6.0)

  sql/ha_partition.cc@1.104.5.1, 2007-12-03 16:12:22+01:00, mattiasj@witty. +4 -2
    Bug#30480: Falcon: searches fail if LIKE and key partition
    
    Problem was that partitioning did not handle unordered scans correctly
    for engines with unordered read order.
    
    Solution: do not stop if a recored is out of range, since it can come
    more records within the range afterwards

ChangeSet@1.2476.433.35, 2007-12-03 14:31:17+01:00, jonas@perch.ndb.mysql.com +7 -0
  ndb - testNodeRestart -n Bug27466 T1
    make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race, error insert causes 5s delay)

  storage/ndb/src/kernel/blocks/backup/Backup.cpp@1.68, 2007-12-03 14:31:13+01:00, jonas@perch.ndb.mysql.com +3 -2
    make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.139, 2007-12-03 14:31:14+01:00, jonas@perch.ndb.mysql.com +3 -2
    make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.132, 2007-12-03 14:31:14+01:00, jonas@perch.ndb.mysql.com +29 -8
    make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.172, 2007-12-03 14:31:14+01:00, jonas@perch.ndb.mysql.com +3 -2
    make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.157, 2007-12-03 14:31:14+01:00, jonas@perch.ndb.mysql.com +5 -3
    make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@1.66, 2007-12-03 14:31:14+01:00, jonas@perch.ndb.mysql.com +3 -2
    make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)

  storage/ndb/test/ndbapi/testNodeRestart.cpp@1.62, 2007-12-03 14:31:14+01:00, jonas@perch.ndb.mysql.com +2 -0
    soem more printout

ChangeSet@1.2403.18.98, 2007-12-03 12:43:50+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#26457
      Fix bug in bug fix, causing random test-failure

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.100.3.11, 2007-12-03 12:43:48+01:00, jonas@perch.ndb.mysql.com +1 -1
    ndb - bug#26457
        Fix bug in bug fix, causing random test-failure

ChangeSet@1.2476.737.2, 2007-12-03 11:39:49+01:00, mhansson@linux-st28.site +2 -0
  Bug#30234: Post-null-merge fix
  Restores files that were automerged during null merge.

  mysql-test/r/delete.result@1.31.1.2, 2007-12-03 11:39:47+01:00, mhansson@linux-st28.site +37 -0
    Bug#30234: Post-null-merge fix

  mysql-test/t/delete.test@1.29.1.2, 2007-12-03 11:39:47+01:00, mhansson@linux-st28.site +44 -0
    Bug#30234: Post-null-merge fix

ChangeSet@1.1810.3540.1, 2007-12-03 10:08:58+01:00, mhansson@linux-st28.site +3 -0
  Bug#30234: Unexpected behavior using DELETE with AS and USING
  
  Anti-patch. This patch undoes the previously pushed patch. It is 
  null-merged in versions 5.1 and above since there the original 
  patch is still desired.

  mysql-test/r/delete.result@1.31.1.1, 2007-12-03 10:08:56+01:00, mhansson@linux-st28.site +0 -37
    Bug#30234: Anti-patch 

  mysql-test/t/delete.test@1.29.1.1, 2007-12-03 10:08:56+01:00, mhansson@linux-st28.site +0 -44
    Bug#30234: Anti-patch 

  sql/sql_yacc.yy@1.371.135.3, 2007-12-03 10:08:56+01:00, mhansson@linux-st28.site +2 -17
    Bug#30234: Anti-patch 

ChangeSet@1.1810.3534.2, 2007-12-03 10:01:56+01:00, tnurnberg@mysql.com +2 -0
  Bug#31177: Server variables can't be set to their current values
  
  additional fixes for 64-bit

  mysql-test/t/variables.test@1.51.10.2, 2007-12-03 10:01:55+01:00, tnurnberg@mysql.com +1 -1
    replace 32-bit and 64-bit values

  mysys/my_getopt.c@1.55.1.10, 2007-12-03 10:01:55+01:00, tnurnberg@mysql.com +3 -1
    'mod' no longer used.
    on 64-bit, limit to (signed) (LONG)LONG_MAX to prevent badness
    in classes using longlong.

ChangeSet@1.2476.735.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.3480.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.1810.3539.4, 2007-12-02 13:49:12+03:00, kaa@polly.(none) +3 -0
  Windows-specific fixes in floating point tests.

  mysql-test/t/insert.test@1.22.2.3, 2007-12-02 13:49:09+03:00, kaa@polly.(none) +3 -0
    Windows implements a different rounding rules in printf("%g"), thus we still need to do replace_result

  mysql-test/t/variables.test@1.51.11.2, 2007-12-02 13:49:09+03:00, kaa@polly.(none) +2 -0
    We need to do replace_result because variables are printed by another procedure.

  sql/field.cc@1.256.64.4, 2007-12-02 13:49:09+03:00, kaa@polly.(none) +4 -1
    Fixed the code to limit the precision to DBL_DIG.

ChangeSet@1.2476.667.53, 2007-12-02 05:18:34+01:00, tnurnberg@mysql.com +1 -0
  Bug#31177: Server variables can't be set to their current values
  
  extra 5.1 fixes

  mysql-test/t/order_fill_sortbuf-master.opt@1.4, 2007-12-02 05:18:32+01:00, tnurnberg@mysql.com +1 -1
    If we set the variable below minimum, we'll get a warning
    at start-up that we don't want in the tests.

ChangeSet@1.2476.734.2, 2007-12-01 19:55:06+01:00, tnurnberg@mysql.com +8 -0
  Bug#31177: Server variables can't be set to their current values
  
  5.1+ specific fixes (plugins etc.)

  include/my_getopt.h@1.26, 2007-12-01 19:55:04+01:00, tnurnberg@mysql.com +2 -1
    make both ull and ll global

  mysql-test/r/index_merge_myisam.result@1.8.1.1, 2007-12-01 19:55:04+01:00, tnurnberg@mysql.com +2 -0
    we throw warnings to the client, yea, verily

  mysql-test/r/innodb.result@1.202.3.2, 2007-12-01 19:55:04+01:00, tnurnberg@mysql.com +2 -2
    we throw warnings to the client, yea, verily

  mysql-test/r/variables.result@1.108, 2007-12-01 19:55:04+01:00, tnurnberg@mysql.com +30 -4
    we throw warnings to the client, yea, verily

  mysql-test/t/variables.test@1.78.1.2, 2007-12-01 19:55:04+01:00, tnurnberg@mysql.com +1 -1
    correct result, is multiple of variable's block_size now

  mysys/my_getopt.c@1.77, 2007-12-01 19:55:04+01:00, tnurnberg@mysql.com +35 -13
    export getopt_ll_limit_value(), check for integer wrap-around
    in it, same as in ull variant.  Only print warnings to reporter
    when caller didn't ask for diagnostics, otherwise assume caller
    will handle any warnings (id est, throw them client-wards)

  sql/mysqld.cc@1.583.127.2, 2007-12-01 19:55:04+01:00, tnurnberg@mysql.com +1 -1
    correct signedness of "concurrent-insert"

  sql/sql_plugin.cc@1.75.3.1, 2007-12-01 19:55:04+01:00, tnurnberg@mysql.com +31 -4
    Throw sys-var out-of-range warnings client-wards for
    plugins, too.

ChangeSet@1.2476.722.4, 2007-12-01 14:50:47+02:00, bell@desktop.sanja.is.com.ua +2 -0
  sync() the file to try to fix pagecache test.

  storage/maria/unittest/ma_pagecache_single.c@1.15, 2007-12-01 14:50:44+02:00, bell@desktop.sanja.is.com.ua +16 -4
    Check flush result.

  storage/maria/unittest/test_file.c@1.5, 2007-12-01 14:50:44+02:00, bell@desktop.sanja.is.com.ua +5 -0
    sync() the file to try to fix pagecache test.

ChangeSet@1.1810.3539.3, 2007-12-01 15:25:24+03:00, kaa@polly.(none) +4 -0
  Fixed the floating point number tests on Windows.

  mysql-test/r/insert.result@1.22.2.2, 2007-12-01 15:25:21+03:00, kaa@polly.(none) +12 -12
    Fixed the test cases.

  mysql-test/t/cast.test@1.31.2.2, 2007-12-01 15:25:21+03:00, kaa@polly.(none) +2 -0
    We need to do replace_result because warnings are printed by another procedure.

  mysql-test/t/insert.test@1.22.2.2, 2007-12-01 15:25:21+03:00, kaa@polly.(none) +3 -1
    Windows implements a different rounding rules in printf("%g"), thus we still need to do replace_result.

  sql/field.cc@1.256.64.3, 2007-12-01 15:25:21+03:00, kaa@polly.(none) +1 -1
    Limit the precision to avoid garbage past the significant digits.

ChangeSet@1.1810.3539.2, 2007-12-01 12:46:25+03:00, kaa@polly.(none) +1 -0
  Fixed the build failure on Windows. It does not have trunc() defined in math.h, so we should not use it code.

  sql/field.cc@1.256.64.2, 2007-12-01 12:46:22+03:00, kaa@polly.(none) +2 -1
    Fixed the build failure on Windows. It does not have trunc() defined in math.h, so we should not use it code.

ChangeSet@1.2476.667.49, 2007-12-01 13:07:28+04:00, holyfoot@mysql.com +1 -0
  merging

  mysql-test/r/federated.result@1.55, 2007-12-01 13:07:25+04:00, holyfoot@mysql.com +1 -1
    merging

ChangeSet@1.1810.3539.1, 2007-12-01 10:05:59+03:00, kaa@polly.(none) +6 -0
  Fix for bug #26788 "mysqld (debug) aborts when inserting specific
  numbers into char fields" and bug #12860 "Difference in zero padding of
  exponent between Unix and Windows"
  
  Rewrote the code that determines what 'precision' argument should be
  passed to sprintf() to fit the string representation of the input number
  into the field.
  We get finer control over conversion by pre-calculating the exponent, so
  we are able to determine which conversion format, 'e' or 'f', will be
  used by sprintf().
  We also remove the leading zero from the exponent on Windows to make it
  compatible with the sprintf() output on other platforms.

  mysql-test/r/insert.result@1.22.2.1, 2007-12-01 10:05:54+03:00, kaa@polly.(none) +120 -0
    Added test cases for bug #26788 and bug #31152.

  mysql-test/t/cast.test@1.31.2.1, 2007-12-01 10:05:54+03:00, kaa@polly.(none) +0 -2
    Removed --replace_result, since the result is now correct on Windows.

  mysql-test/t/insert.test@1.22.2.1, 2007-12-01 10:05:54+03:00, kaa@polly.(none) +81 -0
    Added test cases for bug #26788 and bug #31152.

  mysql-test/t/type_float.test@1.29.2.4, 2007-12-01 10:05:54+03:00, kaa@polly.(none) +0 -5
    Removed --replace_result, since the result is now correct on Windows.

  mysql-test/t/variables.test@1.51.11.1, 2007-12-01 10:05:54+03:00, kaa@polly.(none) +0 -2
    Removed --replace_result, since the result is now correct on Windows.

  sql/field.cc@1.256.64.1, 2007-12-01 10:05:54+03:00, kaa@polly.(none) +60 -14
    Rewrote the code that determines what 'precision' argument should be
    passed to sprintf() to fit the string representation of the input number
    into the field.
    We get finer control over conversion by pre-calculating the exponent, so
    we are able to determine which conversion format, 'e' or 'f', will be
    used by sprintf().

ChangeSet@1.2476.722.3, 2007-11-30 21:28:39+02:00, bell@desktop.sanja.is.com.ua +3 -0
  Fix bug with skipped syncing.
  Fix of unit tests.
  2 new tests for new features.

  storage/maria/ma_control_file.c@1.22, 2007-11-30 21:28:36+02:00, bell@desktop.sanja.is.com.ua +5 -0
    Getting the definition from the file for unit-test.

  storage/maria/ma_loghandler.c@1.74, 2007-11-30 21:28:36+02:00, bell@desktop.sanja.is.com.ua +2 -2
    Fix bug with skipped syncing.

  storage/maria/unittest/ma_control_file-t.c@1.18, 2007-11-30 21:28:36+02:00, bell@desktop.sanja.is.com.ua +90 -15
    Fix of unit test of control file.
    2 new tests for new features of control file.

ChangeSet@1.2476.731.1, 2007-11-30 22:17:11+04:00, holyfoot@mysql.com +4 -0
  Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc...
  
  PS-protocol data is stored in different format - the MYSQL_RECORDS->data
  contains the link to the record content, not to array of the links to
  the field's contents. So we have to handle it separately for
  embedded-server query cache.

  libmysqld/emb_qcache.cc@1.12, 2007-11-30 22:17:10+04:00, holyfoot@mysql.com +69 -34
    Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc...
    
    ps_protocol data now stored in it's particular way.

  libmysqld/emb_qcache.h@1.6, 2007-11-30 22:17:10+04:00, holyfoot@mysql.com +2 -2
    Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc...
    
    Querycache_stream::load_char/store_char  ->
      load_uchar/store_uchar

  mysql-test/r/func_misc.result@1.38.1.1, 2007-11-30 22:17:10+04:00, holyfoot@mysql.com +1 -1
    Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc...
    
    test result

  mysql-test/t/func_misc.test@1.29.1.1, 2007-11-30 22:17:10+04:00, holyfoot@mysql.com +1 -1
    Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc...
    
    the test uses t2 table, so let's make sure it doesn't exist befor the start

ChangeSet@1.1616.3120.6, 2007-11-30 18:06:28+01:00, mleich@four.local.lan +3 -0
  Fix for
     Bug#31030 rpl000015.test fails if $MYSQL_TCP_PORT != 3306
  Note:
    This bug does not occur in MySQL 5.0 and up, because
    ChangeSet 1.2328.2.1 2006/11/27 for MySQL 5.0 prevents this.
    The 5.0 fix uses the environment variable DEFAULT_MASTER_PORT
    which is set by mysql-test-run.pl.
    mysql-test-run.pl in 4.1 does not set this variable.
    There are two alternatives:
    1) Backport the 5.0 fix for this test including modifications
       to mysql-test-run.pl and mysql-test-run-shell.
       This is a not acceptable impact on an old MySQL version.
    2) Fix the problem different than in 5.0 like in the current
       ChangeSet + do not apply these changes when upmerging to 5.0

  mysql-test/t/disabled.def@1.1.6.1, 2007-11-30 18:06:27+01:00, mleich@four.local.lan +0 -1
    Enable rpl000015

  mysql-test/r/rpl000015.result@1.30.1.3, 2007-11-30 18:06:27+01:00, mleich@four.local.lan +1 -1
    Updated result

  mysql-test/t/rpl000015.test@1.25.1.7, 2007-11-30 18:06:27+01:00, mleich@four.local.lan +1 -1
    Unify the MASTER_PORT number

ChangeSet@1.1810.3537.1, 2007-11-30 19:16:13+04:00, holyfoot@mysql.com +2 -0
  Bug #26921 Problem in mysql_insert_id() Embedded C API function.
  
  client library only sets mysql->insert_id when query returned
  no recordset. So the embedded library should behave the same way

  libmysqld/lib_sql.cc@1.107.9.1, 2007-11-30 19:16:12+04:00, holyfoot@mysql.com +5 -3
    Bug #26921 Problem in mysql_insert_id() Embedded C API function.
    
    only set 'affected_rows' and 'insert_id' fields when query
    didn't return a recordset

  tests/mysql_client_test.c@1.167.41.1, 2007-11-30 19:16:12+04:00, holyfoot@mysql.com +11 -0
    Bug #26921 Problem in mysql_insert_id() Embedded C API function.
    
    testcase added

ChangeSet@1.2476.667.44, 2007-11-30 18:48:22+04:00, gluh@mysql.com +4 -0
  Bug#32775 problems with SHOW EVENTS and Information_Schema
  removed unnecessary privilege checks for I_S schema

  mysql-test/r/information_schema.result@1.151.1.23, 2007-11-30 18:48:20+04:00, gluh@mysql.com +7 -0
    test result

  mysql-test/t/information_schema.test@1.98.6.1, 2007-11-30 18:48:20+04:00, gluh@mysql.com +8 -0
    test case

  sql/events.cc@1.85.2.2, 2007-11-30 18:48:20+04:00, gluh@mysql.com +2 -2
    There is no events in I_S so we don't need to execute check_access here.

  sql/sql_parse.cc@1.683.29.2, 2007-11-30 18:48:20+04:00, gluh@mysql.com +0 -4
    removed unnecessary check

ChangeSet@1.2476.727.1, 2007-11-30 15:16:31+01:00, istruewing@stella.local +2 -0
  Bug#30491 - MERGE doesn't report error when one table is Innodb
  
  1. A bad error message was given when a MERGE table with an
     InnoDB child table was tried to use.
  
  2. After selecting from a correct MERGE table and then altering
     one of the children to InnoDB, incorrect results were returned.
  
  These bugs have been fixed with the patch for bug 26379 (Combination
  of FLUSH TABLE and REPAIR TABLE corrupts a MERGE table).
  
  For verification, I added the test case from the bug report.

  mysql-test/r/merge_innodb.result@1.1, 2007-11-30 15:16:30+01:00, istruewing@stella.local +37 -0
    Bug#30491 - MERGE doesn't report error when one table is Innodb
    Added test result.

  mysql-test/r/merge_innodb.result@1.0, 2007-11-30 15:16:30+01:00, istruewing@stella.local +0 -0

  mysql-test/t/merge_innodb.test@1.1, 2007-11-30 15:16:30+01:00, istruewing@stella.local +41 -0
    Bug#30491 - MERGE doesn't report error when one table is Innodb
    Added test case.

  mysql-test/t/merge_innodb.test@1.0, 2007-11-30 15:16:30+01:00, istruewing@stella.local +0 -0

ChangeSet@1.2476.719.10, 2007-11-30 16:12:20+03:00, anozdrin@ibm. +2 -0
  A patch for BUG#32148: killing a query may be ineffective.
  
  The problem was that THD::killed was reset after a command was
  read from the socket, but before it was actually handled. That lead
  to a race: if another KILL statement was issued for this connection
  in the middle of reading from the socket and processing a command,
  THD::killed state would be cleaned.
  
  The fix is to move this cleanup into net_send_error() function.
  
  A sample test case exists in binlog_killed.test:
    - connection 1: start a new transaction on table t1;
    - connection 2: send query to the server (w/o waiting for the
      result) to update data in table t1 -- this query will be blocked
      since there is unfinished transaction;
    - connection 1: kill query in connection 2 and finish the transaction;
    - connection 2: get result of the previous query -- it should be
      the "query-killed" error.
  
  This test however contains race condition, which can not be fixed
  with the current protocol: there is no way to guarantee, that the
  server will receive and start processing the query in connection 2
  (which is intended to get blocked) before the KILL command (sent in
  the connection 1) will arrive. In other words, there is no way to
  ensure that the following sequence will not happen:
  
    - connection 1: start a new transaction on table t1;
    - connection 1: kill query in connection 2 and finish the transaction;
    - connection 2: send query to the server (w/o waiting for the
      result) to update data in table t1 -- this query will be blocked
      since there is unfinished transaction;
    - connection 2: get result of the previous query -- the query will
      succeed.
  
  So, there is no test case for this bug, since it's impossible
  to write a reliable test case under the current circumstances.

  sql/protocol.cc@1.133.1.1, 2007-11-30 16:12:18+03:00, anozdrin@ibm. +6 -0
    Move thd->killed cleanup from dispatch_command() to net_send_error().

  sql/sql_parse.cc@1.683.15.17, 2007-11-30 16:12:18+03:00, anozdrin@ibm. +1 -6
    Move thd->killed cleanup from dispatch_command() to net_send_error().

ChangeSet@1.1810.3536.1, 2007-11-30 17:08:00+04:00, holyfoot@mysql.com +4 -0
  Bug #32374 crash with filesort when selecting from federated table and view.
  
  filesort() uses file->estimate_rows_upper_bound() call to allocate
  internal buffers. If this function returns a value smaller than
  a number of row that will be returned later in find_all_keys(),
  that can cause server crash.
  Fixed by implementing ha_federated::estimate_rows_upper_bound() to
  return maximum possible number of rows.
  Present estimation for FEDERATED always returns 0 if the linked to the VIEW.

  mysql-test/r/federated.result@1.25.11.3, 2007-11-30 17:07:58+04:00, holyfoot@mysql.com +111 -0
    Bug #32374 crash with filesort when selecting from federated table and view.
    
    test result

  mysql-test/t/federated.test@1.19.9.3, 2007-11-30 17:07:58+04:00, holyfoot@mysql.com +31 -0
    Bug #32374 crash with filesort when selecting from federated table and view.
    
    test case

  sql/ha_federated.cc@1.24.32.1, 2007-11-30 17:07:58+04:00, holyfoot@mysql.com +18 -0
    Bug #32374 crash with filesort when selecting from federated table and view.
    
    ha_federated::estimate_rows_upper_bound() implemented

  sql/ha_federated.h@1.18.10.1, 2007-11-30 17:07:58+04:00, holyfoot@mysql.com +1 -0
    Bug #32374 crash with filesort when selecting from federated table and view.
    
    ha_federated::estimate_rows_upper_bound() interface

ChangeSet@1.2476.719.9, 2007-11-30 14:49:34+03:00, anozdrin@ibm. +1 -0
  BUG#32723 (grant3.test fails) can not be reproduced.
  Enabling the test case.

  mysql-test/t/disabled.def@1.266.20.23, 2007-11-30 14:49:31+03:00, anozdrin@ibm. +0 -1
    Enable grant3.test.

ChangeSet@1.2476.725.1, 2007-11-30 09:34:25-02:00, davi@mysql.com +3 -0
  Bug#22312 Syntax error in expression with INTERVAL()
  
  Parser rejects valid INTERVAL() expressions when associated with
  arithmetic operators. The problem is the way in which the expression
  and interval grammar rules were organized caused shift/reduce conflicts.
  
  The solution is to tweak the interval rules to avoid shift/reduce
  conflicts by removing the broken interval_expr rule and explicitly
  specify it's content where necessary.
  
  Original fix by Davi Arnaut, revised and improved rules by Marc Alff

  mysql-test/r/parser.result@1.7, 2007-11-30 09:34:22-02:00, davi@mysql.com +43 -0
    Add test case result for Bug#22312

  mysql-test/t/parser.test@1.7, 2007-11-30 09:34:22-02:00, davi@mysql.com +28 -0
    Add test case for Bug#22312

  sql/sql_yacc.yy@1.611, 2007-11-30 09:34:23-02:00, davi@mysql.com +30 -27
    Resolve shift/reduce conflicts by reorganizing the interval
    expression rules.

ChangeSet@1.2476.724.3, 2007-11-30 15:00:15+04:00, svoj@mysql.com +1 -0
  BUG#32050 - table logging gone wrong.
  
  Reverted log tables alteration.

  scripts/mysql_system_tables_fix.sql@1.67, 2007-11-30 15:00:10+04:00, svoj@mysql.com +0 -16
    Altering log table is wrong, because
    - it is not possible to alter log table when it is in use;
    - log table may use MyISAM engine, which perfectly supports NULLs.
    
    Reverted log tables alteration.

ChangeSet@1.2476.719.8, 2007-11-30 12:14:07+03:00, anozdrin@ibm. +2 -0
  A test case for BUG#26676: VIEW using old table schema in a session.
  
  The following clarification should be made in The Manual:
  
  Standard SQL is quite clear that, if new columns are added
  to a table after a view on that table is created with
  "select *", the new columns will not become part of the view.
  In all cases, the view definition (view structure) is frozen
  at CREATE time, so changes to the underlying tables do not
  affect the view structure.

  mysql-test/r/view.result@1.235.1.10, 2007-11-30 12:14:00+03:00, anozdrin@ibm. +43 -0
    Update result file.

  mysql-test/t/view.test@1.204.1.7, 2007-11-30 12:14:00+03:00, anozdrin@ibm. +51 -0
    Add a test case for BUG#26676: VIEW using old table schema in a session.

ChangeSet@1.1810.3534.1, 2007-11-30 06:32:04+01:00, tnurnberg@mysql.com +21 -0
  Bug#31177: Server variables can't be set to their current values
  
  Default values of variables were not subject to upper/lower bounds
  and step, while setting variables was. Bounds and step are also
  applied to defaults now; defaults are corrected quietly, values
  given by the user are corrected, and a correction-warning is thrown
  as needed. Lastly, very large values could wrap around, starting
  from 0 again. They are bounded at the maximum value for the
  respective data-type now if no lower maximum is specified in the
  variable's definition.

  mysql-test/r/index_merge.result@1.19.4.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +2 -0
    We throw a warning now when we adjust out of range parameters.

  client/mysql.cc@1.199.33.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +7 -6
    correct maxima in options array

  client/mysqltest.c@1.155.37.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +1 -1
    adjust minimum for "sleep" option so default value is no longer
    out of bounds.

  include/m_string.h@1.37.1.6, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +1 -0
    ullstr() - the unsigned brother of llstr()

  include/my_getopt.h@1.19.2.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +2 -1
    Flag if we bounded the value (that is, correct anything aside from
    making value a multiple of block-size)

  mysql-test/r/delayed.result@1.12.4.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +16 -0
    We throw a warning now when we adjust out of range parameters.

  mysql-test/r/innodb.result@1.145.8.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +4 -0
    We throw a warning now when we adjust out of range parameters.

  mysql-test/r/innodb_mysql.result@1.3.25.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +2 -0
    We throw a warning now when we adjust out of range parameters.

  mysql-test/r/key_cache.result@1.19.1.4, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +2 -0
    We throw a warning now when we adjust out of range parameters.

  mysql-test/r/packet.result@1.8, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +8 -0
    We throw a warning now when we adjust out of range parameters.

  mysql-test/r/ps.result@1.56.17.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +2 -0
    We throw a warning now when we adjust out of range parameters.

  mysql-test/r/subselect.result@1.134.27.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +4 -0
    We throw a warning now when we adjust out of range parameters.

  mysql-test/r/type_bit.result@1.14.3.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +2 -0
    We throw a warning now when we adjust out of range parameters.

  mysql-test/r/type_bit_innodb.result@1.3.1.4, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +2 -0
    We throw a warning now when we adjust out of range parameters.

  mysql-test/r/variables.result@1.76.1.20, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +28 -2
    correct results: bounds and step apply to variables' default values, too

  mysql-test/t/variables.test@1.51.10.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +1 -1
    correct results: bounds and step apply to variables' default values, too

  mysys/my_getopt.c@1.55.1.9, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +127 -48
    - apply bounds/step to default values of variables (based on work by serg)
    - print complaints about incorrect values for variables (truncation etc.,
      by requestion of consulting)
    - if no lower maximum is specified in variable definition, bound unsigned
      values at their maximum to prevent wrap-around
    - some calls to error_reporter had a \n, some didn't. remove \n from calls,
      let reporter-function handle it, so the default reporter behaves like that
      in mysqld

  sql/mysql_priv.h@1.290.132.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +1 -1
    correct RANGE_ALLOC_BLOCK_SIZE (cleared with monty)

  sql/mysqld.cc@1.439.141.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +41 -39
    correct maxima to correct data-type.
    correct minima where higher than default.
    correct range-alloc-block-size.
    correct inno variables so GET_* corresponds to actual variable's type.

  sql/set_var.cc@1.125.42.1, 2007-11-30 06:32:03+01:00, tnurnberg@mysql.com +48 -22
    When the new value for a variable is out of bounds, we'll send the
    client a warning (but not if the value was simply not a multiple of
    'blocksize').  sys_var_thd_ulong had this, sys_var_long_ptr_global
    didn't; broken out and streamlined to avoid duplication of code.

  strings/llstr.c@1.8.1.1, 2007-11-30 06:32:03+01:00, tnurnberg@mysql.com +6 -0
    ullstr() - the unsigned brother of llstr()

ChangeSet@1.1810.3508.2, 2007-11-30 06:14:43+01:00, tsmith@mysql.com +3 -0
  Bug #32219: too many hosts in default grant tables 6.0.3
  
  Fix is to remove any references to the current hostname when running
  mysql_install_db --cross-bootstrap.  (The dist-hook make target makes
  this call, and the resulting data directory is included in the source
  distribution as win/data/*.)
  
  Also, a few other clean-ups to mysql_install_db while there.
  TAG: mysql-5.0.52

  Makefile.am@1.68.1.41, 2007-11-30 06:12:25+01:00, tsmith@mysql.com +1 -1
    Adapt to clean-up in mysql_install_db (--windows becomes --cross-bootstrap)

  scripts/mysql_install_db.sh@1.64.5.1, 2007-11-30 06:12:25+01:00, tsmith@mysql.com +37 -29
    Filter out references to the current hostname when performing
    a cross-bootstrap installation by removing any lines which
    contain the string "@current_hostname".
    
    Deprecate the old --windows option; use --cross-bootstrap
    instead, since it more accurately reflects the purpose.
    
    Other clean-up: the wrong syntax was being used to test the
    exit status of mysqld --bootstrap.  It mostly worked, as long
    as mysqld succeeded.  However, it was not robust.

  scripts/mysql_system_tables_data.sql@1.1.1.5, 2007-11-30 06:12:25+01:00, tsmith@mysql.com +8 -3
    Rename local @hostname variable to @current_hostname, which is a more
    unique label to search on.  mysql_install_db now filters out all
    lines which include "@current_hostname" during a --cross-bootstrap
    installation.

ChangeSet@1.1616.3095.17, 2007-11-30 01:36:05+01:00, kent@mysql.com +1 -0
  my_global.h:
    Added 64 bit Mac OS X hard coded settings, for universal binaries

  include/my_global.h@1.47.1.70, 2007-11-30 01:35:56+01:00, kent@mysql.com +25 -30
    Added 64 bit Mac OS X hard coded settings, for universal binaries

ChangeSet@1.1616.3095.16, 2007-11-30 01:22:15+01:00, kent@mysql.com +1 -0
  Excluded verbose and bad change to Mac OS X universal binaries handling

  include/my_global.h@1.47.1.69, 2007-11-30 01:22:15+01:00, kent@mysql.com +0 -0
    Excluded verbose and bad change to Mac OS X universal binaries handling

ChangeSet@1.2476.631.66, 2007-11-29 22:32:34+04:00, ramil@mysql.com +1 -0
  after-merge fix:
    - result adjusted.

  mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result@1.10, 2007-11-29 22:32:32+04:00, ramil@mysql.com +74 -0
    after-merge fix:
      - result adjusted.

ChangeSet@1.1810.3515.3, 2007-11-29 16:40:46+00:00, jonathan@chorlton.adsl.perkin.org.uk +1 -0
  Shell portability fix.

  scripts/mysql_install_db.sh@1.64.1.37, 2007-11-29 16:39:11+00:00, jonathan@chorlton.adsl.perkin.org.uk +3 -3
    Use "test !" instead of "! test", as the
    latter does not work on certain shells.

ChangeSet@1.2476.719.7, 2007-11-29 09:42:26-02:00, davi@mysql.com +10 -0
  Bug#23713 LOCK TABLES + CREATE TRIGGER + FLUSH TABLES WITH READ LOCK = deadlock
  
  This bug is actually two bugs in one, one of which is CREATE TRIGGER under
  LOCK TABLES and the other is CREATE TRIGGER under LOCK TABLES simultaneous
  to a FLUSH TABLES WITH READ LOCK (global read lock). Both situations could
  lead to a server crash or deadlock.
  
  The first problem arises from the fact that when under LOCK TABLES, if the
  table is in the set of locked tables, the table is already open and it doesn't
  need to be reopened (not a placeholder). Also in this case, if the table is
  not write locked, a exclusive lock can't be acquired because of a possible
  deadlock with another thread also holding a (read) lock on the table. The
  second issue arises from the fact that one should never wait for a global
  read lock if it's holding any locked tables, because the global read lock
  is waiting for these tables and this leads to a circular wait deadlock.
  
  The solution for the first case is to check if the table is write locked
  and upgraded the write lock to a exclusive lock and fail otherwise for non
  write locked tables. Grabbin the exclusive lock in this case also means
  to ensure that the table is opened only by the calling thread. The second
  issue is partly fixed by not waiting for the global read lock if the thread
  is holding any locked tables.
  
  The second issue is only partly addressed in this patch because it turned
  out to be much wider and also affects other DDL statements. Reported as
  Bug#32395

  mysql-test/r/trigger.result@1.75, 2007-11-29 09:42:23-02:00, davi@mysql.com +35 -0
    Add test case result for Bug#23713

  mysql-test/r/trigger_notembedded.result@1.15, 2007-11-29 09:42:23-02:00, davi@mysql.com +1 -0
    Add test case result for Bug#23713

  mysql-test/r/trigger_notembedded.result@1.14, 2007-11-29 09:37:30-02:00, davi@mysql.com +0 -0
    Rename: mysql-test/r/trigger-grant.result -> mysql-test/r/trigger_notembedded.result

  mysql-test/t/trigger.test@1.85, 2007-11-29 09:42:23-02:00, davi@mysql.com +47 -0
    Add test case for Bug#23713

  mysql-test/t/trigger_notembedded.test@1.17, 2007-11-29 09:42:23-02:00, davi@mysql.com +34 -0
    Add test case for Bug#23713

  mysql-test/t/trigger_notembedded.test@1.16, 2007-11-29 09:37:41-02:00, davi@mysql.com +0 -0
    Rename: mysql-test/t/trigger-grant.test -> mysql-test/t/trigger_notembedded.test

  sql/mysql_priv.h@1.523.23.6, 2007-11-29 09:42:23-02:00, davi@mysql.com +4 -2
    Locally export wait_while_table_is_used and name_lock_locked_table
    and add flag to mysql_ha_rm_tables to signal that LOCK_open is locked.

  sql/sql_base.cc@1.421.1.21, 2007-11-29 09:42:23-02:00, davi@mysql.com +40 -2
    Introduce name_lock_locked_table function and match
    close_old_data_files function declaration and definition.

  sql/sql_handler.cc@1.106, 2007-11-29 09:42:23-02:00, davi@mysql.com +3 -4
    Add flag to mysql_ha_rm_tables to signal that LOCK_open is locked.

  sql/sql_rename.cc@1.49, 2007-11-29 09:42:23-02:00, davi@mysql.com +1 -1
    Fix mysql_ha_rm_tables caller.

  sql/sql_table.cc@1.437.16.11, 2007-11-29 09:42:24-02:00, davi@mysql.com +7 -5
    Export wait_while_table_is_used and assert that LOCK_open is locked
    and fix mysql_ha_rm_tables caller.

  sql/sql_trigger.cc@1.105.1.3, 2007-11-29 09:42:24-02:00, davi@mysql.com +35 -33
    Upgrade write locked tables to a exclusive lock and fail if
    the table is not write locked. Also, don't wait for the global
    read lock if under LOCK TABLES.

ChangeSet@1.2476.720.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.61.1.19, 2007-11-29 12:23:16+01:00, msvensson@pilot.mysql.com +64 -63
    Revert bad merge, should have used local code

ChangeSet@1.1616.3127.1, 2007-11-29 14:52:36+04:00, holyfoot@mysql.com +1 -0
  Bug #29085 A small double precision number becomes zero.
  
  Denormalized DOUBLE-s can't be properly handled by old MIPS processors.
  So we need to enable specific mode for them so IRIX will do use
  software round to handle such numbers. 

  sql/mysqld.cc@1.356.117.4, 2007-11-29 14:52:36+04:00, holyfoot@mysql.com +17 -3
    Bug #29085 A small double precision number becomes zero.
    
    reset_floating_point_exeption() renamed as set_proper_floating_point_mode()
    #ifdef __sgi code added to enable denormalized DOUBLE-s on IRIX

ChangeSet@1.2476.722.2, 2007-11-29 11:37:05+02:00, monty@mysql.com +1 -0
  Added missing #ifdef

  mysys/mf_iocache.c@1.73, 2007-11-29 11:37:03+02:00, monty@mysql.com +2 -0
    Added missing #ifdef

ChangeSet@1.1810.3513.4, 2007-11-29 10:37:07+04:00, holyfoot@mysql.com +3 -0
  Bug #32624 Error with multi queries in MySQL embedded server 5.1.22.
  
  server status wasn't properly sent to the client after the error
  by the embedded server. Wasn't noticed before as one usually stopped
  retrieving results after he gets an error.

  libmysqld/lib_sql.cc@1.107.1.23, 2007-11-29 10:37:05+04:00, holyfoot@mysql.com +2 -0
    Bug #32624 Error with multi queries in MySQL embedded server 5.1.22.
    
    server status transferred to the client after errors

  sql/protocol.cc@1.111.6.3, 2007-11-29 10:37:06+04:00, holyfoot@mysql.com +3 -2
    Bug #32624 Error with multi queries in MySQL embedded server 5.1.22.
    
    set server status before net_send_error_packet() call as this
    function sends it to the client in the embedded server

  tests/mysql_client_test.c@1.167.39.2, 2007-11-29 10:37:06+04:00, holyfoot@mysql.com +14 -0
    Bug #32624 Error with multi queries in MySQL embedded server 5.1.22.
    
    testcase added

ChangeSet@1.2476.722.1, 2007-11-28 21:38:30+02:00, monty@mysql.com +22 -0
  Fixed repair_by_sort to work with BLOCK_RECORD
  Fixed bugs in undo logging
  Fixed bug where head block was split before min_row_length (caused Maria to believe row was crashed on read)
  Reserved place for reference-transid on key pages (for packing of transids)
  ALTER TABLE and INSERT ... SELECT now uses fast creation of index
      
  Known bugs:
  ma_test_recovery fails because of a bug in redo handling when log is cut directly after a redo (Guilhem knows how to fix)
  ma_test_recovery.excepted is not totally correct, because of the above bug
  mysqld sometimes fails to restart; Fails with error "end_of_redo_phase: Assertion `long_trid != 0' failed"; Guilhem to investigate

  include/maria.h@1.21, 2007-11-28 21:37:13+02:00, monty@mysql.com +7 -9
    Prototype changes
    Added current_filepos to st_maria_sort_info

  mysql-test/r/maria.result@1.23, 2007-11-28 21:37:13+02:00, monty@mysql.com +3 -3
    Updated results that changes as alter table and insert ... select now uses fast creation of index

  mysys/mf_iocache.c@1.72, 2007-11-28 21:37:13+02:00, monty@mysql.com +1 -0
    Reset variable to gurard against double invocation

  storage/maria/ma_bitmap.c@1.26, 2007-11-28 21:37:13+02:00, monty@mysql.com +38 -18
    Added _ma_bitmap_reset_cache() (needed for repair)

  storage/maria/ma_blockrec.c@1.58, 2007-11-28 21:37:13+02:00, monty@mysql.com +23 -11
    Simplify code
    More initial allocations
    Fixed bug where head block was split before min_row_length (caused Maria to believe row was crashed on read)
    

  storage/maria/ma_blockrec.h@1.20, 2007-11-28 21:37:13+02:00, monty@mysql.com +8 -3
    Moved TRANSID_SIZE to maria_def.h
    Added prototype for new functions

  storage/maria/ma_check.c@1.51, 2007-11-28 21:38:28+02:00, monty@mysql.com +380 -267
    Simplicy code
    Fixed repair_by_sort to work with BLOCK_RECORD
    - When using BLOCK_RECORD or UNPACK create new Maria handle
    - Use common initializer function
    - Align code with maria_repair()
    
    Made some changes to maria_repair_parallel() to use common initializer function
    Removed ASK_MONTY section by fixing noted problem
    
    

  storage/maria/ma_close.c@1.23, 2007-11-28 21:38:28+02:00, monty@mysql.com +1 -2
    Moved check for readonly to _ma_state_info_write()

  storage/maria/ma_key_recover.c@1.4, 2007-11-28 21:38:28+02:00, monty@mysql.com +34 -13
    Use different log entries if key root changes or not.
    This fixed some bugs when tree grows
    

  storage/maria/ma_key_recover.h@1.3, 2007-11-28 21:38:28+02:00, monty@mysql.com +1 -0
    Added keynr to st_msg_to_write_hook_for_undo_key

  storage/maria/ma_loghandler.c@1.73, 2007-11-28 21:38:28+02:00, monty@mysql.com +9 -0
    Added INIT_LOGREC_UNDO_KEY_INSERT_WITH_ROOT

  storage/maria/ma_loghandler.h@1.32, 2007-11-28 21:38:28+02:00, monty@mysql.com +1 -0
    Added INIT_LOGREC_UNDO_KEY_INSERT_WITH_ROOT

  storage/maria/ma_open.c@1.38, 2007-11-28 21:38:28+02:00, monty@mysql.com +11 -2
    Added TRANSID to all key pages (for future compressing of trans id's)
    For compressed records, alloc a bit bigger buffer to avoid valgrind warnings
    If table is opened readonly, don't update state

  storage/maria/ma_packrec.c@1.16, 2007-11-28 21:38:28+02:00, monty@mysql.com +10 -2
    Allocate bigger array for bit unpacking to avoid valgrind errors

  storage/maria/ma_recovery.c@1.52.1.1, 2007-11-28 21:38:28+02:00, monty@mysql.com +27 -4
    Added UNDO_KEY_INSERT_WITH_ROOT & UNDO_KEY_DELETE_WITH_ROOT

  storage/maria/ma_sort.c@1.14, 2007-11-28 21:38:28+02:00, monty@mysql.com +3 -1
    More logging

  storage/maria/ma_test_all.sh@1.16, 2007-11-28 21:38:28+02:00, monty@mysql.com +31 -2
    More tests

  storage/maria/ma_test_recovery@1.17, 2007-11-28 21:38:28+02:00, monty@mysql.com +1 -9
    Removed recreation of index (not needed when we have redo for index pages)

  storage/maria/maria_chk.c@1.29, 2007-11-28 21:38:28+02:00, monty@mysql.com +18 -15
    When using flag --read-only, don't update status for files
    When using --unpack, don't use REPAIR_BY_SORT if other repair option is given
    Enable repair_by_sort for BLOCK records
    Removed not needed newline at start of --describe

  storage/maria/maria_def.h@1.47, 2007-11-28 21:38:28+02:00, monty@mysql.com +9 -2
    Support for TRANSID_SIZE to key pages

  storage/maria/maria_read_log.c@1.27, 2007-11-28 21:38:28+02:00, monty@mysql.com +7 -7
    renamed --only-display to --display-only

  storage/maria/ma_test_recovery.expected@1.13, 2007-11-28 21:38:28+02:00, monty@mysql.com +99 -99
    Update results
    Note that this is not complete becasue of a bug in recovery

ChangeSet@1.2476.1.145, 2007-11-28 17:36:28+01:00, df@pippilotta.erinye.com +1 -0
  use --builddir option for mysql_install_db

  Makefile.am@1.118.1.27, 2007-11-28 17:36:26+01:00, df@pippilotta.erinye.com +1 -1
    use --builddir option for mysql_install_db

ChangeSet@1.2476.1.144, 2007-11-28 17:32:28+01:00, df@pippilotta.erinye.com +1 -0
  fix make distcheck in a different way

  scripts/mysql_install_db.sh@1.91, 2007-11-28 17:32:22+01:00, df@pippilotta.erinye.com +29 -20
    apply different patch for make distcheck failure

ChangeSet@1.2476.699.4, 2007-11-28 17:04:02+01:00, df@pippilotta.erinye.com +1 -0
  include data files for parts test suite in distribution

  mysql-test/Makefile.am@1.119.1.1, 2007-11-28 17:04:00+01:00, df@pippilotta.erinye.com +4 -0
    include data files for parts test suite in distribution

ChangeSet@1.2476.719.4, 2007-11-28 08:41:45-07:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  Manual merge

  sql/sql_table.cc@1.437.30.2, 2007-11-28 08:41:35-07:00, malff@lambda.hsd1.co.comcast.net. +0 -3
    Manual merge

ChangeSet@1.1810.3531.1, 2007-11-28 10:18:01-02:00, davi@mysql.com +3 -0
  Bug#31479 Bad lock interaction if CREATE TABLE LIKE is killed
  
  Kill of a CREATE TABLE source_table LIKE statement waiting for a
  name-lock on the source table causes a bad lock interaction.
  
  The mysql_create_like_table() has a bug that if the connection is
  killed while waiting for the name-lock on the source table, it will
  jump to the wrong error path and try to unlock the source table and
  LOCK_open, but both weren't locked.
  
  The solution is to simple return when the name lock request is killed,
  it's safe to do so because no lock was acquired and no cleanup is needed.
  
  Original bug report also contains description of other problems
  related to this scenario but they either already fixed in 5.1 or
  will be addressed separately (see bug report for details).

  mysql-test/r/lock_multi.result@1.15.1.7, 2007-11-28 10:18:00-02:00, davi@mysql.com +11 -0
    Add test case result for Bug#31479

  mysql-test/t/lock_multi.test@1.13.1.10, 2007-11-28 10:18:00-02:00, davi@mysql.com +32 -0
    Add test case for Bug#31479

  sql/sql_table.cc@1.239.74.1, 2007-11-28 10:18:00-02:00, davi@mysql.com +1 -1
    Rerturn TRUE when the lock gets killed.

ChangeSet@1.2476.721.1, 2007-11-28 15:37:00+04:00, gluh@mysql.com +3 -0
  Bug#25629 CREATE TABLE LIKE does not work with INFORMATION_SCHEMA
  added new func mysql_create_like_schema_frm() which creates frm file based on I_S table

  mysql-test/r/create.result@1.155.2.1, 2007-11-28 15:36:58+04:00, gluh@mysql.com +38 -0
    test result

  mysql-test/t/create.test@1.105.2.1, 2007-11-28 15:36:58+04:00, gluh@mysql.com +13 -0
    test case

  sql/sql_table.cc@1.437.27.5, 2007-11-28 15:36:58+04:00, gluh@mysql.com +58 -1
    added new func mysql_create_like_schema_frm() which creates frm file based on I_S table

ChangeSet@1.2476.685.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.719.1, 2007-11-28 10:00:23+01:00, istruewing@stella.local +2 -0
  Bug#8693 Test 'rpl_log_pos' fails sometimes
  Moved disabling to rpl suite.
  Bug#32801 wait_timeout.test fails randomly
  Disabled test case.

  mysql-test/suite/rpl/t/disabled.def@1.22, 2007-11-28 10:00:21+01:00, istruewing@stella.local +1 -0
    Bug#8693 Test 'rpl_log_pos' fails sometimes
    Moved disabling to rpl suite.

  mysql-test/t/disabled.def@1.266.20.21, 2007-11-28 10:00:21+01:00, istruewing@stella.local +1 -1
    Bug#8693 Test 'rpl_log_pos' fails sometimes
    Moved disabling to rpl suite.
    Bug#32801 wait_timeout.test fails randomly
    Disabled test case.

ChangeSet@1.1810.3466.37, 2007-11-28 09:48:06+01:00, istruewing@stella.local +1 -0
  Bug#29149 Test "kill" fails on Windows
  Disabled test case.

  mysql-test/t/disabled.def@1.2.4.35, 2007-11-28 09:48:04+01:00, istruewing@stella.local +1 -0
    Bug#29149 Test "kill" fails on Windows
    Disabled test case.

ChangeSet@1.2476.694.9, 2007-11-28 09:03:21+01:00, thek@adventure.(none) +1 -0
  Error number increased; fixing broken number.

  mysql-test/r/grant.result@1.83.1.3, 2007-11-28 09:03:18+01:00, thek@adventure.(none) +1 -1
    Error number increased; fixing broken number.

ChangeSet@1.1810.3530.1, 2007-11-28 10:55:13+04:00, ramil@mysql.com +9 -0
  Fix for bug #32726: crash with cast in order by clause and cp932 charset
    - fix for #31070 (missed during merging) applied for cp932 charset.
    - tests/results adjusted.

  mysql-test/t/ctype_cp932.test@1.8.7.1, 2007-11-28 10:55:11+04:00, ramil@mysql.com +4 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  mysql-test/include/ctype_common.inc@1.4, 2007-11-28 10:55:11+04:00, ramil@mysql.com +2 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  mysql-test/r/ctype_big5.result@1.16, 2007-11-28 10:55:11+04:00, ramil@mysql.com +4 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  mysql-test/r/ctype_euckr.result@1.2.1.3, 2007-11-28 10:55:11+04:00, ramil@mysql.com +4 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  mysql-test/r/ctype_gb2312.result@1.5, 2007-11-28 10:55:11+04:00, ramil@mysql.com +4 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  mysql-test/r/ctype_gbk.result@1.7, 2007-11-28 10:55:11+04:00, ramil@mysql.com +4 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  mysql-test/r/ctype_uca.result@1.21.2.1, 2007-11-28 10:55:11+04:00, ramil@mysql.com +4 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  mysql-test/r/ctype_cp932.result@1.6.7.1, 2007-11-28 10:55:11+04:00, ramil@mysql.com +74 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  strings/ctype-cp932.c@1.11.1.7, 2007-11-28 10:55:12+04:00, ramil@mysql.com +2 -2
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - fix for #31070 (missed during merging) applied for cp932.
     

ChangeSet@1.2476.1.142, 2007-11-27 17:38:21-07:00, tsmith@ramayana.hindu.god +1 -0
  Cset exclude: tsmith@ramayana.hindu.god|ChangeSet|20071127191535|13686
  
  This change isn't correct, and the correct one will be pulled in from another
  repository.

  client/mysql.cc@1.272.5.2, 2007-11-27 17:38:16-07:00, tsmith@ramayana.hindu.god +0 -0
    Exclude

ChangeSet@1.2476.667.42, 2007-11-28 03:02:05+03:00, sergefp@mysql.com +3 -0
  BUG#32772: partition crash 1: enum column
  The bug was that for ordered index scans, ha_partition::index_init() did
  not put index columns into table->read_set if the underlying storage 
  engine did not have HA_PARTIAL_COLUMN_READ flag. 
  This was causing assertion failure when handle_ordered_index_scan() tried
  to sort the records according to index order.
  
  Fixed by making ha_partition::index_init() put index columns into table->read_set
  for all ordered scans. 

  mysql-test/r/partition.result@1.75.1.1, 2007-11-28 03:02:02+03:00, sergefp@mysql.com +13 -0
    BUG#32772: partition crash 1: enum column
    - Testcase

  mysql-test/t/partition.test@1.68.2.1, 2007-11-28 03:02:02+03:00, sergefp@mysql.com +20 -0
    BUG#32772: partition crash 1: enum column
    - Testcase

  sql/ha_partition.cc@1.104.1.7, 2007-11-28 03:02:02+03:00, sergefp@mysql.com +9 -6
    BUG#32772: partition crash 1: enum column
    - Make ha_partition::index_init() include index columns in the read_set
      whenever an ordered scan is initialized, no matter if
      HA_PARTIAL_COLUMN_READ is set or not.

ChangeSet@1.1810.3529.2, 2007-11-27 21:30:00+04:00, ramil@mysql.com +2 -0
  after-merge fixup: archive test/result adjusted.

  mysql-test/r/archive.result@1.13.1.8, 2007-11-27 21:29:58+04:00, ramil@mysql.com +1 -1
    after-merge fixup: archive test/result adjusted.

  mysql-test/t/archive.test@1.14.1.8, 2007-11-27 21:29:58+04:00, ramil@mysql.com +1 -1
    after-merge fixup: archive test/result adjusted.

ChangeSet@1.1616.3123.4, 2007-11-27 18:24:24+01:00, tnurnberg@mysql.com +1 -0
  Bug#32707: misdimensioned buffer in protocol layer
  
  Miscalculation in protocol-layer: size buffer correctly so
  even really long error messages cannot overflow our buffer.

  sql/protocol.cc@1.56.1.51, 2007-11-27 18:24:24+01:00, tnurnberg@mysql.com +4 -1
    size buffer correctly so really long error messages cannot overflow it.

ChangeSet@1.1810.3466.34, 2007-11-27 17:28:55+01:00, istruewing@stella.local +1 -0
  Bug#8693 Test 'rpl_log_pos' fails sometimes
  Disabled the test case.

  mysql-test/t/disabled.def@1.2.4.34, 2007-11-27 17:28:54+01:00, istruewing@stella.local +1 -0
    Bug#8693 Test 'rpl_log_pos' fails sometimes
    Disabled the test case.

ChangeSet@1.1810.3513.3, 2007-11-27 17:16:52+02:00, gkodinov@magare.gmz +6 -0
  Bug #30355: Incorrect ordering of UDF results
  
  There's currently no way of knowing the determinicity of an UDF.
  And the optimizer and the sequence() UDFs were making wrong
  assumptions about what the is_const member means.
  Plus there was no implementation of update_system_tables()
  causing the optimizer to overwrite the information returned by
  the <udf>_init function.
  
  Fixed by equating the assumptions about the semantics of 
  is_const and providing a implementation of update_used_tables().
  Added a TODO item for the UDF API change needed to make a better 
  implementation.

  include/mysql_com.h@1.100.7.1, 2007-11-27 17:16:51+02:00, gkodinov@magare.gmz +4 -0
    Bug #30355: comment added

  mysql-test/r/udf.result@1.3.1.13, 2007-11-27 17:16:51+02:00, gkodinov@magare.gmz +27 -0
    Bug #30355: test case

  mysql-test/t/udf.test@1.8.1.8, 2007-11-27 17:16:51+02:00, gkodinov@magare.gmz +21 -0
    Bug #30355: test case

  sql/item_func.cc@1.270.92.1, 2007-11-27 17:16:51+02:00, gkodinov@magare.gmz +6 -0
    Bug #30355: keep const_item_cache and used_tables_cache in sync

  sql/item_func.h@1.136.31.1, 2007-11-27 17:16:51+02:00, gkodinov@magare.gmz +50 -0
    Bug #30355: 
     - a better implementation of update_used_tables()
     - keep const_item_cache and used_tables_cache in sync

  sql/udf_example.c@1.29.1.9, 2007-11-27 17:16:51+02:00, gkodinov@magare.gmz +4 -6
    Bug #30355: Wrong value for const_item fixed.

ChangeSet@1.1810.3527.1, 2007-11-27 19:14:48+04:00, gshchepa@gleb.loc +1 -0
  Fixed bug #32403: query causes a crash due to stack and
                    memory corruptions.
  
  The right pointer field of the SEL_ARG structure was not
  initialized in the constructor and sometimes that led to
  server crashes.
  
  There is no testcase because the bug occurs only when
  uninitialized memory has particular values, which can't be
  re-created in the test suite.

  sql/opt_range.cc@1.159.42.1, 2007-11-27 19:14:11+04:00, gshchepa@gleb.loc +4 -1
    Fixed bug #32403.
    
    The eq_tree function requires that SEL_ARG::left and
    SEL_ARG::right are equal to null pointer if SEL_ARG
    type is MAYBE_KEY, but SEL_ARG::right was not initialized
    and contained garbage.

ChangeSet@1.2476.692.12, 2007-11-27 11:02:00+01:00, mkindahl@dl145h.mysql.com +3 -0
  Disabling several tests that fail and reported as errors.

  mysql-test/suite/ndb/t/disabled.def@1.6.1.1, 2007-11-27 11:01:55+01:00, mkindahl@dl145h.mysql.com +1 -0
    Disabling failing tests.

  mysql-test/suite/rpl/t/disabled.def@1.20, 2007-11-27 11:01:55+01:00, mkindahl@dl145h.mysql.com +1 -0
    Disabling failing tests.

  mysql-test/suite/rpl/t/rpl_ssl.test@1.11.1.1, 2007-11-27 11:01:55+01:00, mkindahl@dl145h.mysql.com +6 -1
    Disabling part of test that fails.

ChangeSet@1.2476.717.1, 2007-11-27 14:01:11+04:00, svoj@mysql.com +2 -0
  BUG#32050 - table logging gone wrong.
  
  INSERT/UPDATE against CSV table created by MySQL earlier than 5.1.23
  with NULL-able column results in server crash in debug builds.
  
  Starting with 5.1.23 CSV doesn't permit creation of NULL-able columns,
  but it is still possible to get such table from older MySQL versions.
  
  Fixed by removing excessive DBUG_ASSERT().

  scripts/mysql_system_tables_fix.sql@1.66, 2007-11-27 14:01:02+04:00, svoj@mysql.com +16 -0
    Starting with 5.1.23 CSV doesn't permit creation of NULL-able columns.
    Alter system CSV tables structure so that all columns are NOT NULL.

  storage/csv/ha_tina.cc@1.45.20.2, 2007-11-27 14:01:02+04:00, svoj@mysql.com +0 -8
    Starting with 5.1.23 CSV doesn't permit creation of NULL-able columns,
    but it is still possible to get such table from older MySQL versions.
    
    Removed excessive DBUG_ASSERT().

ChangeSet@1.2476.685.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.313.12.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.716.2, 2007-11-27 12:28:08+04:00, ramil@mysql.com +4 -0
  after-merge fix:
    - archive test/result adjusted.
    - OPTIMIZE/ANALYZE PARTITION EXTENDED test case added.

  mysql-test/r/archive.result@1.36.1.1, 2007-11-27 12:28:05+04:00, ramil@mysql.com +1 -1
    after-merge fix:
      - archive test/result adjusted.

  mysql-test/r/partition.result@1.76.1.1, 2007-11-27 12:28:05+04:00, ramil@mysql.com +10 -0
    after-merge fix:
      - test case added.

  mysql-test/t/archive.test@1.35.1.1, 2007-11-27 12:28:05+04:00, ramil@mysql.com +1 -1
    after-merge fix:
      - archive test/result adjusted.

  mysql-test/t/partition.test@1.69.1.1, 2007-11-27 12:28:05+04:00, ramil@mysql.com +15 -0
    after-merge fix:
      - test case added.

ChangeSet@1.2476.631.57, 2007-11-27 09:25:45+01:00, istruewing@stella.local +7 -0
  Bug#32754 - InnoDB tests do not prepare or clean up correctly
  
  Some test cases were missing preparation to deal with failed
  predecessor test cases.
  
  Added preparation (drop table if exists) to some test cases.

  mysql-test/include/innodb_rollback_on_timeout.inc@1.2, 2007-11-27 09:25:44+01:00, istruewing@stella.local +4 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Added preparation (drop table if exists).

  mysql-test/r/innodb-semi-consistent.result@1.2, 2007-11-27 09:25:44+01:00, istruewing@stella.local +1 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Fixed test result.

  mysql-test/r/innodb-ucs2.result@1.2, 2007-11-27 09:25:44+01:00, istruewing@stella.local +1 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Fixed test result.

  mysql-test/r/innodb_mysql.result@1.60.1.5, 2007-11-27 09:25:44+01:00, istruewing@stella.local +3 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Fixed test result.

  mysql-test/r/innodb_timeout_rollback.result@1.2, 2007-11-27 09:25:44+01:00, istruewing@stella.local +1 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Fixed test result.

  mysql-test/t/innodb-semi-consistent.test@1.2, 2007-11-27 09:25:44+01:00, istruewing@stella.local +4 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Added preparation (drop table if exists).

  mysql-test/t/innodb-ucs2.test@1.2, 2007-11-27 09:25:44+01:00, istruewing@stella.local +4 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Added preparation (drop table if exists).

ChangeSet@1.1810.3525.1, 2007-11-27 09:36:43+04:00, ramil@mysql.com +4 -0
  Fix for bug #32559: connection hangs on query with name_const
  
  Problem: passing a non-constant name to the NAME_CONST function results in a crash.
  
  Fix: check the NAME_CONST name argument; return fake item type if we got
  non-constant argument(s).

  mysql-test/r/func_misc.result@1.21.4.1, 2007-11-27 09:36:40+04:00, ramil@mysql.com +7 -0
    Fix for bug #32559: connection hangs on query with name_const
      - test result.

  mysql-test/t/func_misc.test@1.21.4.1, 2007-11-27 09:36:40+04:00, ramil@mysql.com +11 -1
    Fix for bug #32559: connection hangs on query with name_const
      - test case.

  sql/item.cc@1.113.103.1, 2007-11-27 09:36:40+04:00, ramil@mysql.com +11 -1
    Fix for bug #32559: connection hangs on query with name_const
      - Item_name_const::type() now returns NULL_ITEM if non-constant arguments 
        were used to create the item to avoid wrong type casting.

  sql/item.h@1.183.43.1, 2007-11-27 09:36:40+04:00, ramil@mysql.com +3 -1
    Fix for bug #32559: connection hangs on query with name_const
      - NAME_CONST name argument checked for invariability.

ChangeSet@1.2476.715.2, 2007-11-26 22:50:12+01:00, hhunger@hh-nb.hhunger +2 -0
  post merge fix for bug#32496.

  mysql-test/suite/funcs_1/r/myisam_views.result@1.12, 2007-11-26 22:50:08+01:00, hhunger@hh-nb.hhunger +1192 -1184
    post merge fix for bug#32496.

  mysql-test/suite/funcs_1/r/ndb_views.result@1.6, 2007-11-26 22:50:08+01:00, hhunger@hh-nb.hhunger +11 -4
    post merge fix for bug#32496.

ChangeSet@1.1810.3514.2, 2007-11-26 21:28:01+01:00, hhunger@hh-nb.hhunger +5 -0
  patch for bug#32496 (2nd) with ansi conformant and Mysql test case.

  BitKeeper/etc/ignore@1.210.1.45, 2007-11-26 21:27:59+01:00, hhunger@hh-nb.hhunger +2 -0
    Added scripts/make_win_src_distribution_old server-tools/instance-manager/net_serv.cc to the ignore list

  mysql-test/suite/funcs_1/r/innodb_views.result@1.1.2.2, 2007-11-26 21:27:58+01:00, hhunger@hh-nb.hhunger +11 -4
    patch for bug#32496 (2nd) with ansi conformant and Mysql test case.

  mysql-test/suite/funcs_1/r/memory_views.result@1.1.2.2, 2007-11-26 21:27:59+01:00, hhunger@hh-nb.hhunger +11 -4
    patch for bug#32496 (2nd) with ansi conformant and Mysql test case.

  mysql-test/suite/funcs_1/r/myisam_views.result@1.1.2.2, 2007-11-26 21:27:59+01:00, hhunger@hh-nb.hhunger +1158 -1150
    patch for bug#32496 (2nd) with ansi conformant and Mysql test case.

  mysql-test/suite/funcs_1/views/views_master.inc@1.1.2.1, 2007-11-26 21:27:59+01:00, hhunger@hh-nb.hhunger +9 -0
    patch for bug#32496 (2nd) with ansi conformant and Mysql test case.

ChangeSet@1.2476.667.40, 2007-11-26 22:21:46+03:00, evgen@moonbone.local +4 -0
  Many files:
    Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.

  mysql-test/r/subselect.result@1.196.1.11, 2007-11-26 22:20:54+03:00, evgen@moonbone.local +0 -101
    Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.

  mysql-test/r/subselect_notembedded.result@1.3, 2007-11-26 22:21:29+03:00, evgen@moonbone.local +101 -0
    Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.

  mysql-test/t/subselect.test@1.160.2.10, 2007-11-26 22:21:34+03:00, evgen@moonbone.local +0 -94
    Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.

  mysql-test/t/subselect_notembedded.test@1.3, 2007-11-26 22:21:36+03:00, evgen@moonbone.local +96 -0
    Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.

ChangeSet@1.2476.692.11, 2007-11-26 20:05:52+01:00, msvensson@pilot.mysql.com +1 -0
  Remove disabling of testcases

  mysql-test/suite/rpl/t/disabled.def@1.19, 2007-11-26 20:05:50+01:00, msvensson@pilot.mysql.com +0 -2
    Remove disabling of testcases

ChangeSet@1.2476.692.10, 2007-11-26 19:50:43+01:00, msvensson@pilot.mysql.com +3 -0
  Bug#25146 Some warnings/errors not shown when using --show-warnings
   - Additional patch to fix compiler warnings

  client/mysql.cc@1.278, 2007-11-26 19:50:40+01:00, msvensson@pilot.mysql.com +3 -2
    Initialize warnings to 0 to avid compiler warning
    Call 'print_warnings' also when error occured

  mysql-test/r/mysql.result@1.43, 2007-11-26 19:50:41+01:00, msvensson@pilot.mysql.com +1 -1
    Change test to make is possible to see that second set of warnings
    are from second invocation of mysql 

  mysql-test/t/mysql.test@1.52, 2007-11-26 19:50:41+01:00, msvensson@pilot.mysql.com +1 -1
    Change test to make is possible to see that second set of warnings
    are from second invocation of mysql 

ChangeSet@1.2476.692.9, 2007-11-26 19:42:07+01:00, msvensson@pilot.mysql.com +1 -0
  Revert

  client/mysql.cc@1.277, 2007-11-26 19:42:05+01:00, msvensson@pilot.mysql.com +1 -1
    Revert

ChangeSet@1.1810.3466.32, 2007-11-26 19:16:23+01:00, istruewing@stella.local +2 -0
  Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
  Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
  Fixed wrong variable assignment.

  mysql-test/r/delayed.result@1.12.3.1, 2007-11-26 19:16:21+01:00, istruewing@stella.local +8 -8
    Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
    Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
    Fixed wrong variable assignment.

  mysql-test/t/delayed.test@1.11.3.1, 2007-11-26 19:16:21+01:00, istruewing@stella.local +8 -8
    Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
    Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
    Fixed wrong variable assignment.

ChangeSet@1.2476.713.1, 2007-11-26 19:09:40+01:00, thek@adventure.(none) +4 -0
  Bug#16470 crash on grant if old grant tables
  
  Loading 4.1 into 5.0 or 5.1 failed silently because procs_priv table missing.
  This caused the server to crash on any attempt to store new grants because
  of uninitialized structures.
  
  This patch breaks up the grant loading function into two phases to allow
  for procs_priv table to fail with an warning instead of crashing the server.

  mysql-test/r/grant.result@1.81.1.1, 2007-11-26 19:09:38+01:00, thek@adventure.(none) +19 -0
    Test case

  mysql-test/t/grant.test@1.62.1.1, 2007-11-26 19:09:38+01:00, thek@adventure.(none) +20 -0
    Test case making sure that FLUSH PRIVILEGES doesn't crash the server if
    procs_priv is removed.

  sql/sql_acl.cc@1.243.4.1, 2007-11-26 19:09:38+01:00, thek@adventure.(none) +202 -112
    - Refactored grant_reload into two phases: 1. open and lock tables_priv and 
      columns_priv tables, read the data, close tables. 2. open and lock
      procs_priv, read data, close table. Since the tables are independant of
      each other there will be no race conditions and it will be possible to
      handle situations where the procs_priv table isn't present.
    - Refactored the helper function grant_load into new grant_load (without
      procs_priv table) and grant_load_procs_priv.
      

  sql/sql_parse.cc@1.683.31.1, 2007-11-26 19:09:38+01:00, thek@adventure.(none) +15 -16
    - Changed comment style to doxygen style.

ChangeSet@1.2476.1.139, 2007-11-26 18:46:05+01:00, msvensson@pilot.mysql.com +1 -0
  Use myisam as default storage engine when running mysqld in --bootstrap
  mode

  scripts/mysql_install_db.sh@1.88.1.1, 2007-11-26 18:46:02+01:00, msvensson@pilot.mysql.com +1 -0
    Bug#31315 mysql_install_db fails if a default table type of NDB is set in my.cnf
     - Use myisam as default storage engine when running mysqld in --bootstrap
     mode

ChangeSet@1.2476.631.55, 2007-11-26 17:31:53+01:00, istruewing@stella.local +4 -0
  Moved disabling of tests to the respective suites.

  mysql-test/suite/binlog/t/disabled.def@1.4, 2007-11-26 17:31:51+01:00, istruewing@stella.local +1 -0
    Moved disabling of tests to the respective suites.

  mysql-test/suite/ndb/t/disabled.def@1.7, 2007-11-26 17:31:51+01:00, istruewing@stella.local +2 -0
    Moved disabling of tests to the respective suites.

  mysql-test/suite/rpl/t/disabled.def@1.11.1.3, 2007-11-26 17:31:51+01:00, istruewing@stella.local +2 -0
    Moved disabling of tests to the respective suites.

  mysql-test/t/disabled.def@1.266.20.19, 2007-11-26 17:31:51+01:00, istruewing@stella.local +0 -6
    Moved disabling of tests to the respective suites.

ChangeSet@1.1810.3524.1, 2007-11-26 14:09:37-02:00, davi@mysql.com +5 -0
  Bug#29592 SQL Injection issue
  
  Remove the mysql_odbc_escape_string() function. The function
  has multi-byte character escaping issues, doesn't honor the
  NO_BACKSLASH_ESCAPES mode and is not used anymore by the
  Connector/ODBC as of 3.51.17.

  include/mysql.h@1.154.7.6, 2007-11-26 14:09:35-02:00, davi@mysql.com +0 -10
    Remove mysql_odbc_escape_string() prototype.

  include/mysql_h.ic@1.3.1.6, 2007-11-26 14:09:35-02:00, davi@mysql.com +233 -235
    Update abi check file, mostly line changes and mysql_odbc_escape_string
    removal.

  libmysql/libmysql.c@1.233.1.16, 2007-11-26 14:09:35-02:00, davi@mysql.com +0 -72
    Remove mysql_odbc_escape_string() body.

  libmysql/libmysql.def@1.43.1.3, 2007-11-26 14:09:35-02:00, davi@mysql.com +0 -1
    Remove mysql_odbc_escape_string()

  libmysqld/libmysqld.def@1.14.1.4, 2007-11-26 14:09:35-02:00, davi@mysql.com +0 -1
    Remove mysql_odbc_escape_string()

ChangeSet@1.1810.3435.4, 2007-11-26 18:58:54+03:00, kaa@polly.(none) +6 -0
  Fix for bug #28837: MyISAM storage engine error (134) doing delete with
  self-join
  
  When doing DELETE with self-join on a MyISAM or MERGE table, it could
  happen that a record being retrieved in join_read_next_same() has
  already been deleted by previous iterations. That caused the engine's
  index_next_same() method to fail with HA_ERR_RECORD_DELETED error and
  the whole DELETE query to be aborted with an error.
  
  Fixed by suppressing the HA_ERR_RECORD_DELETED error in
  hy_myisam::index_next_same() and ha_myisammrg::index_next_same(). Since
  HA_ERR_RECORD_DELETED can only be returned by MyISAM, there is no point
  in filtering this error in the SQL layer.

  mysql-test/r/merge.result@1.43.4.1, 2007-11-26 18:58:50+03:00, kaa@polly.(none) +37 -0
    Added a test case for bug #28837.

  mysql-test/r/myisam.result@1.71.14.1, 2007-11-26 18:58:50+03:00, kaa@polly.(none) +22 -0
    Added a test case for bug #28837.

  mysql-test/t/merge.test@1.37.3.1, 2007-11-26 18:58:50+03:00, kaa@polly.(none) +22 -0
    Added a test case for bug #28837.

  mysql-test/t/myisam.test@1.55.13.1, 2007-11-26 18:58:50+03:00, kaa@polly.(none) +17 -0
    Added a test case for bug #28837.

  sql/ha_myisam.cc@1.147.32.1, 2007-11-26 18:58:51+03:00, kaa@polly.(none) +6 -2
    Skip HA_ERR_RECORD_DELETED silently when calling mi_rnext_same().

  sql/ha_myisammrg.cc@1.59.22.1, 2007-11-26 18:58:51+03:00, kaa@polly.(none) +6 -2
    Skip HA_ERR_RECORD_DELETED silently when calling mi_rnext_same().

ChangeSet@1.2476.692.8, 2007-11-26 16:45:58+01:00, msvensson@pilot.mysql.com +1 -0
  Fix warning about possibly uninitialized variable "warnings"

  client/mysql.cc@1.276, 2007-11-26 16:45:56+01:00, msvensson@pilot.mysql.com +1 -1
    Fix warning about possibly uninitialized variable "warnings"

ChangeSet@1.1810.3523.1, 2007-11-26 18:36:05+03:00, kaa@polly.(none) +3 -0
  5.0 version of the fix for bug #9481: mysql_insert_id() returns 0 after
  insert ... select.
  
  The 5.0 manual page for mysql_insert_id() does not mention anything
  about INSERT ... SELECT, though its current behavior is incosistent
  with what the manual says about the plain INSERT.
  
  Fixed by changing the AUTO_INCREMENT and mysql_insert_id() handling
  logic in INSERT ... SELECT to be consistent with the INSERT behavior,
  the manual, and the changes in 5.1 introduced by WL3146:
  
  
  - mysql_insert_id() now returns the first automatically generated
  AUTO_INCREMENT value that was successfully inserted by INSERT ... SELECT
  
  -  if an INSERT ... SELECT statement is executed, and no automatically
  generated value is successfully inserted, mysql_insert_id() now returns
  the ID of the last inserted row.

  sql/sql_class.h@1.230.87.1, 2007-11-26 18:36:00+03:00, kaa@polly.(none) +2 -1
    Replaced last_insert_id with autoinc_value_of_last_inserted_row to be
    consistent with 5.1 code.

  sql/sql_insert.cc@1.146.74.1, 2007-11-26 18:36:00+03:00, kaa@polly.(none) +40 -8
    Revised the AUTO_INCREMENT and mysql_insert_id() handling logic in
    INSERT ... SELECT to be consistent with INSERT behavior, the manual, and
    changes in 5.1 introduced by WL3146:
    
    - mysql_insert_id() now returns the first automatically generated
    AUTO_INCREMENT value that was successfully inserted;
    
    -  if an INSERT ... SELECT statement is executed, and no automatically
    generated value is successfully inserted, mysql_insert_id() now returns
    the ID of the last inserted row.

  tests/mysql_client_test.c@1.167.40.1, 2007-11-26 18:36:00+03:00, kaa@polly.(none) +182 -0
    Backported the test cases related to INSERT ... SELECT and
    mysql_insert_id() from WL3146 patch to 5.0.

ChangeSet@1.2476.692.6, 2007-11-26 16:31:35+01:00, msvensson@pilot.mysql.com +1 -0
  Add suppressions for expected warning messages that appears in
  slave's error log when running rpl_extraColmaster_*.test 

  mysql-test/lib/mtr_report.pl@1.61.3.2, 2007-11-26 16:31:33+01:00, msvensson@pilot.mysql.com +9 -1
    Add suppressions for expected warning messages that appears in
    slave's error log when running rpl_extraColmaster_*.test 

ChangeSet@1.2476.712.1, 2007-11-26 16:20:37+01:00, mkindahl@dl145h.mysql.com +1 -0
  Disabling testcases that have warnings that PB cannot handle.

  mysql-test/suite/rpl/t/disabled.def@1.18, 2007-11-26 16:20:34+01:00, mkindahl@dl145h.mysql.com +2 -0
    Disabling testcases that have warnings that PB cannot handle.

ChangeSet@1.2476.692.5, 2007-11-26 16:19:34+01:00, msvensson@pilot.mysql.com +1 -0
  Disable combinations processing until next version

  mysql-test/lib/mtr_cases.pl@1.61.4.1, 2007-11-26 16:19:31+01:00, msvensson@pilot.mysql.com +1 -1
    Disable combinations processing until next version

ChangeSet@1.2476.631.54, 2007-11-26 16:17:26+01:00, istruewing@stella.local +1 -0
  Bug#30751: rpl_ndb_multi missing row in output
  Disabled the test case.

  mysql-test/t/disabled.def@1.266.20.18, 2007-11-26 16:17:24+01:00, istruewing@stella.local +1 -0
    Bug#30751: rpl_ndb_multi missing row in output
    Disabled the test case.

ChangeSet@1.2476.631.53, 2007-11-26 16:12:14+01:00, istruewing@stella.local +1 -0
  Bug#32724: innodb_mysql.test fails randomly
  Disabled test case.

  mysql-test/t/disabled.def@1.266.20.17, 2007-11-26 16:12:13+01:00, istruewing@stella.local +1 -0
    Bug#32724: innodb_mysql.test fails randomly
    Disabled test case.

ChangeSet@1.2476.631.52, 2007-11-26 16:04:29+01:00, istruewing@stella.local +1 -0
  Bug#32723: grant3.test fails
  Disabled test case.

  mysql-test/t/disabled.def@1.266.20.16, 2007-11-26 16:04:27+01:00, istruewing@stella.local +1 -0
    Bug#32723: grant3.test fails
    Disabled test case.

ChangeSet@1.1810.3495.2, 2007-11-26 15:44:05+01:00, thek@adventure.(none) +1 -0
  Bug #32436 KILL QUERY completely deadlocks mysqld
  
  Sending several "KILL QUERY" statements to target a connection running
  "SELECT SLEEP" could freeze the server.
  
  The locking order in Item_func_sleep was wrong and this could lead to a
  dead lock.
  
  This patch solves the issue by resolving the locking order properly.

  sql/item_func.cc@1.270.91.1, 2007-11-26 15:44:04+01:00, thek@adventure.(none) +1 -2
    - Moved LOCK_user_locks critical region so that it doesn't share space with
      mysys_var->mutex region; this can lead to deadlock.

ChangeSet@1.2476.685.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.631.51, 2007-11-26 15:40:08+01:00, istruewing@stella.local +1 -0
  Bug#29149: Test "kill" fails on Windows
  Disabled test case.

  mysql-test/t/disabled.def@1.266.20.15, 2007-11-26 15:40:06+01:00, istruewing@stella.local +1 -0
    Bug#29149: Test "kill" fails on Windows
    Disabled test case.

ChangeSet@1.2476.692.4, 2007-11-26 15:36:23+01:00, mkindahl@dl145h.mysql.com +1 -0
  Disabling failing test that has been reported as bug.

  mysql-test/suite/rpl_ndb/t/disabled.def@1.15, 2007-11-26 15:36:20+01:00, mkindahl@dl145h.mysql.com +1 -0
    Disabling failing test.

ChangeSet@1.2476.667.38, 2007-11-26 16:06:46+02:00, gkodinov@magare.gmz +1 -0
  merge of 5.0-opt to 5.1-opt

  mysql-test/r/subselect.result@1.196.1.10, 2007-11-26 16:06:45+02:00, gkodinov@magare.gmz +41 -12
    merge of 5.0-opt to 5.1-opt

ChangeSet@1.1810.3466.31, 2007-11-26 14:49:41+01:00, istruewing@stella.local +1 -0
  Bug#32357 - ndb_backup_print test fails sometimes in pushbuild
  Disabled test case

  mysql-test/t/disabled.def@1.2.4.33, 2007-11-26 14:49:40+01:00, istruewing@stella.local +1 -0
    Bug#32357 - ndb_backup_print test fails sometimes in pushbuild
    Disabled test case

ChangeSet@1.1810.3466.30, 2007-11-26 14:48:49+01:00, istruewing@stella.local +1 -0
  BUG#31277 - myisamchk --unpack corrupts a table
  Another try to fix a compiler warning on win64.

  myisam/mi_packrec.c@1.30.19.1, 2007-11-26 14:48:48+01:00, istruewing@stella.local +1 -1
    BUG#31277 - myisamchk --unpack corrupts a table
    Another try to fix a compiler warning on win64.

ChangeSet@1.1616.3126.1, 2007-11-26 16:25:18+04:00, holyfoot@mysql.com +1 -0
  Bug #31900 Wrong confusing comment in mysql_com.h header file.
  
  comment fixed as we truly need const_item to be 1 to mark
  constant function

  include/mysql_com.h@1.67.7.1, 2007-11-26 16:25:18+04:00, holyfoot@mysql.com +5 -5
    Bug #31900 Wrong confusing comment in mysql_com.h header file.
    
    comment fixed

ChangeSet@1.1810.3521.1, 2007-11-26 13:36:24+02:00, gkodinov@magare.gmz +3 -0
  Bug #32036: EXISTS within a WHERE clause with a UNION 
    crashes MySQL 5.122
  There was a difference in how UNIONs are handled
  on top level and when in sub-query.
  Because the rules for sub-queries were syntactically
  allowing cases that are not currently supported by
  the server we had crashes (this bug) or wrong results
  (bug 32051).
  Fixed by making the syntax rules for UNIONs match the 
  ones at top level.
  
  These rules however do not support nesting UNIONs, e.g.
  (SELECT a FROM t1 UNION ALL SELECT b FROM t2) 
   UNION
  (SELECT c FROM t3 UNION ALL SELECT d FROM t4)
  Supports for statements with nested UNIONs will be
  added in a future version.

  mysql-test/r/subselect.result@1.134.26.1, 2007-11-26 13:36:22+02:00, gkodinov@magare.gmz +27 -8
    Bug #32036: test case

  mysql-test/t/subselect.test@1.129.17.1, 2007-11-26 13:36:22+02:00, gkodinov@magare.gmz +30 -1
    Bug #32036: test case

  sql/sql_yacc.yy@1.371.139.1, 2007-11-26 13:36:22+02:00, gkodinov@magare.gmz +14 -27
    Bug #32036: Make the syntax rules for UNIONs in subqueries the same
    as for top level UNIONs.

ChangeSet@1.2476.685.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.61.1.17, 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.1810.3518.2, 2007-11-26 13:29:26+04:00, ramil@mysql.com +3 -0
  Fix for bug #32676: insert delayed crash with wrong column and function specified
  
  Problem: using wrong local lock type value in the mysql_insert() results in a crash. 
  
  Fix: use a proper value.

  mysql-test/r/delayed.result@1.12.2.1, 2007-11-26 13:29:25+04:00, ramil@mysql.com +5 -0
    Fix for bug #32676: insert delayed crash with wrong column and function specified
      - test result.

  mysql-test/t/delayed.test@1.11.2.1, 2007-11-26 13:29:25+04:00, ramil@mysql.com +9 -0
    Fix for bug #32676: insert delayed crash with wrong column and function specified
      - test case.

  sql/sql_insert.cc@1.146.73.1, 2007-11-26 13:29:25+04:00, ramil@mysql.com +2 -2
    Fix for bug #32676: insert delayed crash with wrong column and function specified
      - the local lock_type var assigment displaced just after the line 
        where the table_list->lock_type is filnally defined in the mysql_insert() 
        to avoid using its old value.

ChangeSet@1.2476.667.35, 2007-11-26 12:56:31+04:00, gluh@mysql.com +1 -0
  Bug#30152 MySQLD crash duing alter table causes DROP DATABASE to FAIL due to temp file(addon)
  result fix

  mysql-test/r/drop.result@1.35, 2007-11-26 12:56:29+04:00, gluh@mysql.com +2 -0
    result fix

ChangeSet@1.2476.701.3, 2007-11-26 09:38:42+01:00, tnurnberg@mysql.com +1 -0
  Bug#31752: check strmake() bounds
  
  strmake() called with wrong parameters:
  5.1-specific fixes.

  sql/sql_db.cc@1.163.2.1, 2007-11-26 09:38:40+01:00, tnurnberg@mysql.com +1 -1
    fix off-by-one buffer-length

ChangeSet@1.1810.3467.5, 2007-11-26 09:13:23+01:00, tnurnberg@mysql.com +2 -0
  Bug#31752: check strmake() bounds
  
  strmake() called with wrong parameters:
  5.0-specific fixes.

  client/mysql.cc@1.199.32.1, 2007-11-26 09:13:22+01:00, tnurnberg@mysql.com +4 -1
    In debug-mode, strmake() fills unused part of buffer with
    a test-pattern. This overwrites our previous extra '\0'
    (from previous bzero()).

  sql/sp.cc@1.82.31.1, 2007-11-26 09:13:22+01:00, tnurnberg@mysql.com +1 -1
    off-by-one buffer-size.

ChangeSet@1.1616.3125.1, 2007-11-26 08:20:40+01:00, tnurnberg@mysql.com +6 -0
  Bug#31752: check strmake() bounds
  
  strmake() calls are easy to get wrong. Add checks in extra
  debug mode to identify possible exploits.
  
  Remove some dead code.
  
  Remove some off-by-one errors identified with new checks.

  sql/log.cc@1.108.9.1, 2007-11-26 08:20:40+01:00, tnurnberg@mysql.com +1 -1
    fix off-by-one buffer-length argument to prevent stack smashing 

  sql/repl_failsafe.cc@1.32.1.32, 2007-11-26 08:20:40+01:00, tnurnberg@mysql.com +1 -1
    fix off-by-one buffer-length argument to prevent stack smashing 

  sql/set_var.cc@1.34.72.1, 2007-11-26 08:20:40+01:00, tnurnberg@mysql.com +1 -1
    fix off-by-one buffer-length argument to prevent stack smashing
    (already approved, backports #31588)

  sql/sql_show.cc@1.122.1.89, 2007-11-26 08:20:40+01:00, tnurnberg@mysql.com +2 -2
    misdimensioned buffers: functions further down the callstack
    expect bufsize of FN_REFLEN

  sql/unireg.cc@1.43.3.1, 2007-11-26 08:20:40+01:00, tnurnberg@mysql.com +3 -0
    When EXTRA_DEBUG is enabled, strmake() will write funny patterns to
    buffers it operates on to identify possibly overflows. This leads to
    badness in mysql_create_frm(), so we explicitly put any unused bytes
    (back) into a defined state. Not a bug-fix, but part of the strmake()
    bug detector.

  strings/strmake.c@1.7.1.1, 2007-11-26 08:20:40+01:00, tnurnberg@mysql.com +16 -14
    strmake() takes maximum string length rather than buffer-length
    (string length + 1 to accomodate \0 terminator) as argument.
    Since this is easy to get wrong, add extra debug code to identify
    off-by-ones so we can prevent stack smashing.
    
    Alternative "BAD_STRING_COMPILER" removed after checking
    with Monty.

ChangeSet@1.2476.710.1, 2007-11-26 10:28:25+04:00, ramil@mysql.com +4 -0
  Fix for bug #29258: Partitions: search fails for maximum unsigned bigint
  
  Problems: 
    1. looking for a matching partition we miss the fact that the maximum 
       allowed value is in the PARTITION p LESS THAN MAXVALUE.
    2. one can insert maximum value if numeric maximum value is the last range.
       (should only work if LESS THAN MAXVALUE).
    3. one cannot have both numeric maximum value and MAXVALUE string as ranges 
      (the same value, but different meanings).
  
  Fix: consider the maximum value as a supremum.

  mysql-test/r/partition.result@1.77, 2007-11-26 10:28:24+04:00, ramil@mysql.com +47 -0
    Fix for bug #29258: Partitions: search fails for maximum unsigned bigint
      - test result.

  mysql-test/t/partition.test@1.70, 2007-11-26 10:28:24+04:00, ramil@mysql.com +39 -0
    Fix for bug #29258: Partitions: search fails for maximum unsigned bigint
      - test case.

  sql/partition_info.cc@1.41.1.1, 2007-11-26 10:28:24+04:00, ramil@mysql.com +7 -0
    Fix for bug #29258: Partitions: search fails for maximum unsigned bigint
      - In case of PARTITION p VALUES LESS THAN MAXVALUE consider the 
        maximium value as a supremum.

  sql/sql_partition.cc@1.121, 2007-11-26 10:28:24+04:00, ramil@mysql.com +9 -3
    Fix for bug #29258: Partitions: search fails for maximum unsigned bigint
      - In case of PARTITION p VALUES LESS THAN MAXVALUE consider the 
        maximium value as a supremum.

ChangeSet@1.2476.685.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.61.1.16, 2007-11-24 20:34:17+03:00, skozlov@mysql.com +11 -0
    Added the optimization of rpl tests

ChangeSet@1.1810.3520.2, 2007-11-24 14:57:09+04:00, holyfoot@mysql.com +2 -0
  merging fix

  mysql-test/r/gis.result@1.35.3.2, 2007-11-24 14:57:08+04:00, holyfoot@mysql.com +1 -1
    result fixed

  mysql-test/t/gis.test@1.29.3.2, 2007-11-24 14:57:08+04:00, holyfoot@mysql.com +1 -1
    test fixed

ChangeSet@1.2476.631.46, 2007-11-23 23:21:37+01:00, istruewing@stella.local +1 -0
  Bug#32661 - Compiler warning in client/mysql.cc
  
  The initialization to zero via LINT_INIT made mysql.test fail.
  print_warnings() was suppressed where it should not.
  
  Fixed initialization so that it fakes warnings.

  client/mysql.cc@1.272.4.3, 2007-11-23 23:21:35+01:00, istruewing@stella.local +2 -2
    Bug#32661 - Compiler warning in client/mysql.cc
    Fixed initialization so that it fakes warnings.

ChangeSet@1.2476.631.45, 2007-11-23 18:27:05+01:00, istruewing@stella.local +1 -0
  Bug#32668 rpl_row_charset_innodb.test fails
  Re-enabled test case after fix

  mysql-test/t/disabled.def@1.266.20.12, 2007-11-23 18:27:04+01:00, istruewing@stella.local +0 -1
    Bug#32668 rpl_row_charset_innodb.test fails
    Re-enabled test case after fix

ChangeSet@1.2476.685.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.631.44, 2007-11-23 18:05:45+01:00, istruewing@stella.local +1 -0
  Bug#32668 - rpl_row_charset_innodb.test fails
  
  The test case fails on "vanilla" and "no_innodb" builds.
  These builds do not include InnoDB.
  The test case requires InnoDB.
  
  Added requirement for InnoDB into the test case, so that
  it does not start on those builds.

  mysql-test/suite/rpl/t/rpl_row_charset_innodb.test@1.2, 2007-11-23 18:05:43+01:00, istruewing@stella.local +1 -0
    Bug#32668 - rpl_row_charset_innodb.test fails
    Added requirement for InnoDB.

ChangeSet@1.2476.631.43, 2007-11-23 17:54:19+01:00, istruewing@stella.local +1 -0
  Bug#32668 - rpl_row_charset_innodb.test fails
  Disabled test case

  mysql-test/t/disabled.def@1.266.20.11, 2007-11-23 17:54:18+01:00, istruewing@stella.local +1 -0
    Bug#32668 - rpl_row_charset_innodb.test fails
    Disabled test case

ChangeSet@1.2476.631.42, 2007-11-23 17:47:22+01:00, istruewing@stella.local +1 -0
  Bug#32667 lowercase_table3.test reports to error log
  Disabled test case

  mysql-test/t/disabled.def@1.266.20.10, 2007-11-23 17:47:20+01:00, istruewing@stella.local +1 -0
    Bug#32667 lowercase_table3.test reports to error log
    Disabled test case

ChangeSet@1.2476.631.41, 2007-11-23 17:05:16+01:00, istruewing@stella.local +1 -0
  Bug#29830 Test case 'events_scheduling' fails on Mac OS X and Windows
  Disabled the test case

  mysql-test/t/disabled.def@1.266.20.9, 2007-11-23 17:05:14+01:00, istruewing@stella.local +1 -0
    Bug#29830 Test case 'events_scheduling' fails on Mac OS X and Windows
    Disabled the test case

ChangeSet@1.2476.631.40, 2007-11-23 16:53:31+01:00, istruewing@stella.local +1 -0
  Bug#32664 - events.test fails randomly
  Disabled test case

  mysql-test/t/disabled.def@1.266.20.8, 2007-11-23 16:53:29+01:00, istruewing@stella.local +1 -0
    Bug#32664 - events.test fails randomly
    Disabled test case

ChangeSet@1.2476.631.39, 2007-11-23 16:32:51+01:00, istruewing@stella.local +1 -0
  Bug#32663 binlog_multi_engine.test fails randomly
  Disabled test case

  mysql-test/t/disabled.def@1.266.20.7, 2007-11-23 16:32:50+01:00, istruewing@stella.local +2 -1
    Bug#32663 binlog_multi_engine.test fails randomly
    Disabled test case

ChangeSet@1.2476.685.13, 2007-11-23 16:19:42+01:00, msvensson@shellback.(none) +1 -0
  Remove printout

  mysql-test/lib/mtr_cases.pl@1.61.1.15, 2007-11-23 16:19:38+01:00, msvensson@shellback.(none) +1 -1
    Remove printout

ChangeSet@1.2476.685.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.61.1.14, 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.631.38, 2007-11-23 16:02:51+01:00, istruewing@stella.local +1 -0
  Bug#32661 - Compiler warning in client/mysql.cc
  
  Compiler warned about possible use of uninitialized variable
  'warnings' in com_go().
  
  Added LINT_INIT for 'warnings'.

  client/mysql.cc@1.272.4.2, 2007-11-23 16:02:49+01:00, istruewing@stella.local +1 -0
    Bug#32661 - Compiler warning in client/mysql.cc
    Added LINT_INIT for 'warnings'.

ChangeSet@1.2476.685.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.685.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.313.12.7, 2007-11-23 15:54:05+01:00, msvensson@shellback.(none) +5 -4
    Apply patch for BUG#30630 

ChangeSet@1.2476.631.37, 2007-11-23 15:30:04+01:00, istruewing@stella.local +1 -0
  Bug#32659 - ndb_dd_backuprestore.test fails randomly
  Disabled test case

  mysql-test/t/disabled.def@1.266.20.6, 2007-11-23 15:30:02+01:00, istruewing@stella.local +1 -0
    Bug#32659 - ndb_dd_backuprestore.test fails randomly
    Disabled test case

ChangeSet@1.2476.708.1, 2007-11-23 18:21:24+04:00, gluh@mysql.com +5 -0
  Bug#30152 MySQLD crash duing alter table causes DROP DATABASE to FAIL due to temp file
  disable decoding of table name if the table is internal temporary table

  mysql-test/r/drop.result@1.34, 2007-11-23 18:21:22+04:00, gluh@mysql.com +5 -0
    test result

  mysql-test/t/drop.test@1.24, 2007-11-23 18:21:22+04:00, gluh@mysql.com +13 -0
    test case

  sql/sql_db.cc@1.163.1.1, 2007-11-23 18:21:22+04:00, gluh@mysql.com +1 -0
    check is the name is internal tmp table name

  sql/sql_table.cc@1.437.27.4, 2007-11-23 18:21:22+04:00, gluh@mysql.com +3 -2
    disable decoding of table name if the table is internal temporary table

  sql/table.h@1.175.11.1, 2007-11-23 18:21:22+04:00, gluh@mysql.com +1 -0
    added flag which is true when table name is the name of internal temporary table

ChangeSet@1.2476.707.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.61.1.13, 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.313.12.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.706.1, 2007-11-23 17:51:12+04:00, svoj@mysql.com +3 -0
  BUG#31833 - ORDER BY leads to wrong result when ARCHIVE, BLOB and
              table cache is full
  
  After reading last record from freshly opened archive table
  (e.g. after flush table, or if there is no room in table cache),
  the table is reported as crashed.
  
  The problem was that azio wrongly invalidated azio_stream when it
  meets EOF.

  mysql-test/r/archive.result@1.37, 2007-11-23 17:50:36+04:00, svoj@mysql.com +7 -0
    A test case for BUG#31833.

  mysql-test/t/archive.test@1.36, 2007-11-23 17:50:36+04:00, svoj@mysql.com +9 -0
    A test case for BUG#31833.

  storage/archive/azio.c@1.23, 2007-11-23 17:50:36+04:00, svoj@mysql.com +1 -1
    After azread() successfuly read and inflated data, it calls
    check_header() function. According to the comment it is done
    to detect concatenated .az files.
    
    When we read last record, there are no more bytes left at the
    current offset, all further my_read() calls will return 0. In
    this case check_header() wrongly sets s->z_err to Z_ERRNO,
    indicating that azio_stream is broken.
    
    Following is original condition from gzio:
    len = (uInt)fread(s->inbuf + len, 1, Z_BUFSIZE >> len, s->file);
    if (len == 0 && ferror(s->file)) s->z_err = Z_ERRNO;
    
    As fread() returns 0 on both EOF and error, the condition states:
    Invalidate gzio_stream if we got an error from last fread().
    
    Applied the same logic to azio.
    
    Note that a test case contains FLUSH TABLE t1 prior to SELECT. It is
    needed because azio doesn't flush buffers immediately. Thus we may
    azread() last record from in-memory buffer. When we read from
    in-memory buffer, EOF is detected by different branch of code in
    azread() and we never enter check_header() in this case.

ChangeSet@1.2476.705.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.699.3, 2007-11-23 13:38:59+01:00, df@pippilotta.erinye.com +1 -0
  Fix make distcheck.

  scripts/mysql_install_db.sh@1.89, 2007-11-23 13:38:54+01:00, df@pippilotta.erinye.com +19 -15
    Give precedence to basedir if both basedir and srcdir are specified, but set mysqld_opt, pkgdatadir and scriptdir always from srcdir if it is specified. This is to unbreak out-of-directory builds like make distcheck does, where we don't have binaries in srcdir.

ChangeSet@1.1810.3518.1, 2007-11-23 16:30:06+04:00, ramil@mysql.com +3 -0
  Fix for bug #32560: crash with interval function and count(*)
  
  Problem: INTERVAL function implementation doesn't handle NULL range values.
  
  Fix: skip NULL ranges looking for a proper one.

  mysql-test/r/func_set.result@1.15.1.1, 2007-11-23 16:30:04+04:00, ramil@mysql.com +30 -0
    Fix for bug #32560: crash with interval function and count(*)
      - test result.

  mysql-test/t/func_set.test@1.15, 2007-11-23 16:30:04+04:00, ramil@mysql.com +18 -1
    Fix for bug #32560: crash with interval function and count(*)
      - test case.

  sql/item_cmpfunc.cc@1.187.55.1, 2007-11-23 16:30:04+04:00, ramil@mysql.com +25 -12
    Fix for bug #32560: crash with interval function and count(*)
      - skip NULL ranges calculating INTERVAL(...).

ChangeSet@1.2476.685.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.61.1.12, 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.61.6.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.313.12.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.703.1, 2007-11-23 16:27:05+04:00, gluh@mysql.com +2 -0
  Bug#32178 server crash when select from i_s and concurrent partition management
  The crash happens because we change share->partition_info where 'share' is global struct
  (it affects other threads which use the same 'share').
  It causes discrepancy between 'share' and handler data. 
  The fix:
  Move share->partition_info update into WFRM_INSTALL_SHADOW part which is protected by OPEN_lock.

  sql/sql_partition.cc@1.119.1.1, 2007-11-23 16:27:03+04:00, gluh@mysql.com +9 -5
    fast_end_partition: added close_thread_tables() for the case when error occures
    fast_alter_partition_table: added close_thread_tables() for the case when error occures

  sql/sql_table.cc@1.437.27.3, 2007-11-23 16:27:03+04:00, gluh@mysql.com +38 -14
    The crash happens because we change share->partition_info where 'share' is global struct.
    It causes discrepancy between 'share' and handler data.
    The fix:
    Move share->partition_info update into WFRM_INSTALL_SHADOW part which is protected by OPEN_lock.

ChangeSet@1.1810.3517.3, 2007-11-23 13:03:38+01:00, istruewing@stella.local +1 -0
  Bug#32654: rpl_view.test fails randomly
  Disabled test case

  mysql-test/t/disabled.def@1.2.4.32, 2007-11-23 13:03:37+01:00, istruewing@stella.local +1 -0
    Bug#32654: rpl_view.test fails randomly
    Disabled test case

ChangeSet@1.1810.3517.2, 2007-11-23 12:54:05+01:00, istruewing@stella.local +1 -0
  Bug#32653 - rpl_log.test fails randomly
  Disabled test case

  mysql-test/t/disabled.def@1.2.4.31, 2007-11-23 12:54:04+01:00, istruewing@stella.local +1 -0
    Bug#32653 - rpl_log.test fails randomly
    Disabled test case

ChangeSet@1.1810.3517.1, 2007-11-23 12:52:29+01:00, istruewing@stella.local +1 -0
  BUG#31277 - myisamchk --unpack corrupts a table
  Fixed a compiler warning on win64. Backport from 5.1.

  myisam/mi_packrec.c@1.30.18.1, 2007-11-23 12:52:28+01:00, istruewing@stella.local +1 -1
    BUG#31277 - myisamchk --unpack corrupts a table
    Fixed a compiler warning on win64. Backport from 5.1.

ChangeSet@1.2476.692.3, 2007-11-23 12:51:14+01:00, mkindahl@dl145h.mysql.com +7 -0
  Post-merge fixes.

  mysql-test/r/innodb.result@1.206, 2007-11-23 12:51:10+01:00, mkindahl@dl145h.mysql.com +1 -1
    Result change.

  mysql-test/suite/rpl/r/rpl_binlog_grant.result@1.3, 2007-11-23 12:51:10+01:00, mkindahl@dl145h.mysql.com +6 -0
    Result change.

  mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@1.6, 2007-11-23 12:51:10+01:00, mkindahl@dl145h.mysql.com +15 -15
    Result change.

  mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@1.6, 2007-11-23 12:51:10+01:00, mkindahl@dl145h.mysql.com +15 -15
    Result change.

  mysql-test/suite/rpl/t/disabled.def@1.17, 2007-11-23 12:51:10+01:00, mkindahl@dl145h.mysql.com +0 -3
    Enabling some tests.

  mysql-test/suite/rpl/t/rpl_binlog_grant.test@1.3, 2007-11-23 12:51:11+01:00, mkindahl@dl145h.mysql.com +1 -0
    Adding missing master-slave.inc, causing previous tests to pollute
    the binary log.

  mysql-test/suite/rpl_ndb/t/disabled.def@1.14, 2007-11-23 12:51:11+01:00, mkindahl@dl145h.mysql.com +3 -5
    Enabling some tests.

ChangeSet@1.2476.667.27, 2007-11-23 13:40:53+02:00, gkodinov@magare.gmz +3 -0
  merge 5.0-opt -> 5.1-opt

  mysql-test/r/subselect.result@1.196.1.6, 2007-11-23 13:40:51+02:00, gkodinov@magare.gmz +101 -0
    merge 5.0-opt -> 5.1-opt

  sql/opt_range.cc@1.274.1.17, 2007-11-23 13:40:51+02:00, gkodinov@magare.gmz +1 -1
    merge 5.0-opt -> 5.1-opt

  sql/sql_select.cc@1.541.40.6, 2007-11-23 13:40:51+02:00, gkodinov@magare.gmz +1 -1
    merge 5.0-opt -> 5.1-opt

ChangeSet@1.1810.3516.2, 2007-11-23 12:28:36+01:00, istruewing@stella.local +1 -0
  BUG#31277 - myisamchk --unpack corrupts a table
  Fixed a compiler warning on win64

  myisam/mi_packrec.c@1.30.17.1, 2007-11-23 12:28:34+01:00, istruewing@stella.local +1 -1
    BUG#31277 - myisamchk --unpack corrupts a table
    Fixed a compiler warning on win64

ChangeSet@1.2403.18.97, 2007-11-23 12:13:10+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#32652
    release subscriber

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@1.53.2.7, 2007-11-23 12:13:07+01:00, jonas@perch.ndb.mysql.com +1 -0
    release subscriber

ChangeSet@1.1810.3516.1, 2007-11-23 12:06:55+01:00, istruewing@stella.local +1 -0
  Bug#32651 - grant_cache.test fails
  Disabled test case

  mysql-test/t/disabled.def@1.2.4.30, 2007-11-23 12:06:53+01:00, istruewing@stella.local +1 -0
    Bug#32651 - grant_cache.test fails
    Disabled test case

ChangeSet@1.2476.625.7, 2007-11-23 13:13:37+03:00, kaa@polly.(none) +1 -0
  Fix for bug #32080: Excessive warnings on Solaris: setrlimit could not
  change the size of core files.
  
  Suppress the 'setrlimit could not change the size of the core files'
  warning in mysql-test-run. We do not want core files on some of the
  PushBuild hosts, and PushBuild itself does not set --core-files, so
  that warning is expected.

  mysql-test/lib/mtr_report.pl@1.61.4.1, 2007-11-23 13:13:27+03:00, kaa@polly.(none) +4 -1
    Suppress the 'setrlimit could not change the size of the core files'
    warning in mysql-test-run. We do not want core files on some of the
    PushBuild machines, and PushBuild itself does not set --core-files, so
    that warning is expected.

ChangeSet@1.2476.697.3, 2007-11-23 10:46:48+01:00, tomas@whalegate.ndb.mysql.com +4 -0
  bug#28445 - Heartbeat does not start until first API_REGREQ is recevied
  - move api failure handling into own method
  - add START_ORD so that hb checking can start really early

  storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@1.55, 2007-11-23 10:46:46+01:00, tomas@whalegate.ndb.mysql.com +29 -28
    - make sure qmgr is "fully" informed about connections so that it can handle hb correctly
    - dont allow API/mysqld node to reconnect if we have not started yet (sp 8)

  storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp@1.24, 2007-11-23 10:46:46+01:00, tomas@whalegate.ndb.mysql.com +3 -0
    - move api failure handling into own method
    - add START_ORD so that hb checking can start really early

  storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp@1.15, 2007-11-23 10:46:46+01:00, tomas@whalegate.ndb.mysql.com +22 -4
    - move api failure handling into own method
    - add START_ORD so that hb checking can start really early
    - Init datastructures in constructor
    - as CONNECT_REP may occur before start phases
     

  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@1.57, 2007-11-23 10:46:46+01:00, tomas@whalegate.ndb.mysql.com +189 -173
    - Init datastructures in constructor
    - as CONNECT_REP may occur before start phases
    - start hb handling directly on connect rep (instead of first hb)
    
     

ChangeSet@1.2476.697.2, 2007-11-23 10:25:19+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug#29621 - ndb_mgmd can timeout logevent request, making it to fail

  storage/ndb/src/mgmsrv/MgmtSrvr.cpp@1.133, 2007-11-23 10:25:16+01:00, tomas@whalegate.ndb.mysql.com +52 -30
    Bug#29621 - ndb_mgmd can timeout logevent request, making it to fail

ChangeSet@1.2476.1.137, 2007-11-23 10:15:55+01:00, kent@mysql.com +4 -0
  ReadMe.txt, INSTALL-WIN-SOURCE, INSTALL-BINARY, INSTALL-SOURCE:
    Updated links to version 5.1 of the manual

  Docs/INSTALL-BINARY@1.3, 2007-11-23 10:14:07+01:00, kent@mysql.com +1 -1
    Updated links to version 5.1 of the manual

  INSTALL-SOURCE@1.3, 2007-11-23 10:14:07+01:00, kent@mysql.com +1 -1
    Updated links to version 5.1 of the manual

  INSTALL-WIN-SOURCE@1.3, 2007-11-23 10:14:07+01:00, kent@mysql.com +1 -1
    Updated links to version 5.1 of the manual

  support-files/MacOSX/ReadMe.txt@1.3, 2007-11-23 10:14:07+01:00, kent@mysql.com +1 -1
    Updated links to version 5.1 of the manual

ChangeSet@1.1810.3412.39, 2007-11-23 00:16:17+03:00, evgen@moonbone.local +3 -0
  opt_range.cc:
    Fix for the bug#31048 for 64bit platforms.
  subselect.test, subselect.result:
    Corrected text case for the bug#31048.

  mysql-test/r/subselect.result@1.134.25.2, 2007-11-23 00:13:32+03:00, evgen@moonbone.local +6 -9
    Corrected text case for the bug#31048.

  mysql-test/t/subselect.test@1.129.16.2, 2007-11-23 00:12:16+03:00, evgen@moonbone.local +4 -6
    Corrected text case for the bug#31048.

  sql/opt_range.cc@1.159.41.5, 2007-11-23 00:14:47+03:00, evgen@moonbone.local +1 -1
    Fix for the bug#31048 for 64bit platforms.

ChangeSet@1.2476.656.13, 2007-11-22 21:39:28+01:00, istruewing@stella.local +1 -0
  Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
              corrupts a MERGE table
  
  Post-pushbuild fix. The merge test failed on Windows.
  The MoveFile() function returned the error code
  ERROR_ACCESS_DENIED.
  
  The fix is to use a different name for the file to be
  deleted. This is the same trick as we use for the error
  code ERROR_ALREADY_EXISTS.
  
  Added ERROR_ACCESS_DENIED to the list of error codes that
  require to change the name of the file to be deleted.

  mysys/my_delete.c@1.6.1.2, 2007-11-22 21:39:27+01:00, istruewing@stella.local +7 -3
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added ERROR_ACCESS_DENIED to the list of error codes that
    require to change the name of the file to be deleted.

ChangeSet@1.1810.3514.1, 2007-11-22 17:48:40+01:00, kent@mysql.com +2 -0
  Makefile.am, configure.in:
    Include "manual.chm" in source TAR if it exists

  Docs/Makefile.am@1.57.1.13, 2007-11-22 17:48:11+01:00, kent@mysql.com +1 -1
    Include "manual.chm" in source TAR if it exists

  configure.in@1.245.108.1, 2007-11-22 17:46:40+01:00, kent@mysql.com +5 -0
    Include "manual.chm" in source TAR if it exists

ChangeSet@1.2476.541.6, 2007-11-22 19:22:54+03:00, kaa@polly.(none) +1 -0
  Fix for bug #29976: Excessive Slave I/O errors in replication tests
  
  Problem:
  
  The "Slave I/O thread couldn't register on master" error sporadically
  occurred in replication tests because the slave I/O thread got
  killed by STOP SLAVE before or while registering on master.
  
  Fixed by checking the state of the I/O thread, and issueing
  the error only if it was not explicitely killed by a user.

  sql/slave.cc@1.315.6.1, 2007-11-22 19:22:47+03:00, kaa@polly.(none) +13 -8
    When the slave I/O thread fails to register on master, issue an error
    message only if it is not explicitely killed by a user with STOP SLAVE.

ChangeSet@1.1810.3467.3, 2007-11-22 17:13:12+03:00, kaa@polly.(none) +1 -0
  Fixed build failures on Windows introduced by the patch for bug #32221.
  We do not have any executables in libmysql/release/ anymore.

  scripts/make_win_bin_dist@1.1.13.8, 2007-11-22 17:13:04+03:00, kaa@polly.(none) +0 -1
    Fixed build failures on Windows introduced by the patch for bug #32221.
    We do not have any executables in libmysql/release/ anymore.

ChangeSet@1.2476.697.1, 2007-11-22 14:59:16+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #29139  	missing error message for 275

  storage/ndb/src/ndbapi/ndberror.c@1.97, 2007-11-22 14:59:13+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug #29139  	missing error message for 275

ChangeSet@1.1810.3454.12, 2007-11-22 10:18:19-02:00, davi@endora.local +3 -0
  Bug#32528 Global read lock with a low priority write lock causes a server crash
  
  FLUSH TABLES WITH READ LOCK fails to properly detect write locked
  tables when running under low priority updates.
  
  The problem is that when trying to aspire a global read lock, the
  reload_acl_and_cache() function fails to properly check if the thread
  has a low priority write lock, which later my cause a server crash or
  deadlock.
  
  The solution is to simple check if the thread has any type of the
  possible exclusive write locks.

  mysql-test/r/flush.result@1.16.1.1, 2007-11-22 10:18:18-02:00, davi@endora.local +17 -0
    Add test case result for Bug#32528

  mysql-test/t/flush.test@1.22.1.1, 2007-11-22 10:18:18-02:00, davi@endora.local +31 -0
    Add test case for Bug#32528

  sql/sql_parse.cc@1.426.168.3, 2007-11-22 10:18:18-02:00, davi@endora.local +1 -1
    Although it should not matter under LOCK TABLES, use TL_WRITE_ALLOW_WRITE
    to emphasize that it should fail in case of any write lock.

ChangeSet@1.2476.671.7, 2007-11-22 14:48:03+03:00, kostja@bodhi.(none) +2 -0
  Add a test case for Bug#29817. The bug was fixed by the patch for
  Bug#28318.

  mysql-test/r/skip_grants.result@1.12.1.1, 2007-11-22 14:48:01+03:00, kostja@bodhi.(none) +6 -0
    Add a test case for Bug#29817

  mysql-test/t/skip_grants.test@1.13.1.1, 2007-11-22 14:48:01+03:00, kostja@bodhi.(none) +6 -0
    Add a test case for Bug#29817

ChangeSet@1.2476.671.6, 2007-11-22 03:48:51+03:00, kostja@bodhi.(none) +2 -0
  Update the failing kill test in the team tree.

  mysql-test/r/kill.result@1.22, 2007-11-22 03:48:48+03:00, kostja@bodhi.(none) +3 -1
    Update the broken result (kill.test fails in the team tree).

  mysql-test/t/kill.test@1.30, 2007-11-22 03:48:48+03:00, kostja@bodhi.(none) +3 -1
    Fix the broken test (team tree)

ChangeSet@1.2476.693.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.61.1.11, 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.313.12.4, 2007-11-21 23:44:22+03:00, skozlov@mysql.com +3 -0
    added --skip-combination option

ChangeSet@1.1810.3412.37, 2007-11-21 22:56:42+04:00, gshchepa@gleb.loc +3 -0
  Fixed bug #32556: assert in "using index for group-by" :
                    is_last_prefix <= 0, file .\opt_range.cc.
  
  SELECT ... GROUP BY bit field failed with an assertion if the
  bit length of that field was not divisible by 8.
  

  mysql-test/r/type_bit.result@1.14.1.11, 2007-11-21 22:39:16+04:00, gshchepa@gleb.loc +10 -0
    Added test case for bug #32556.

  mysql-test/t/type_bit.test@1.18.1.5, 2007-11-21 22:39:04+04:00, gshchepa@gleb.loc +15 -0
    Added test case for bug #32556.

  sql/key.cc@1.34.1.9, 2007-11-21 22:38:52+04:00, gshchepa@gleb.loc +0 -13
    Fixed bug #32556.
    Copying of "uneven" bits of a bit field was duplicated in the
    key_copy() and in the Field_bit::get_key_image().
    So, instead of copying of the rest of a bit field, 
    Field_bit::get_key_image() copied "uneven" bits to key image again,
    and the lowest field byte was not copied to key at all.
    
    Duplicated code has been removed from the key_copy function.

ChangeSet@1.1810.3510.2, 2007-11-21 19:41:13+01:00, df@pippilotta.erinye.com +1 -0
  add wrong warning to suppression file

  support-files/compiler_warnings.supp@1.2.1.9, 2007-11-21 19:41:11+01:00, df@pippilotta.erinye.com +1 -0
    we want that.

ChangeSet@1.1810.3510.1, 2007-11-21 18:11:08+01:00, df@pippilotta.erinye.com +1 -0
  ignore readline warnings

  support-files/compiler_warnings.supp@1.2.1.8, 2007-11-21 18:11:04+01:00, df@pippilotta.erinye.com +5 -0
    readline is not maintained by us

ChangeSet@1.1810.3509.1, 2007-11-21 20:53:44+04:00, ramil@mysql.com +3 -0
  Fix for bug #32558: group by null-returning expression with rollup causes crash
  
  Problem: setting Item_func_rollup_const::null_value property to argument's null_value
  before (without) the argument evaluation may result in a crash due to wrong null_value.
  
  Fix: use is_null() to set Item_func_rollup_const::null_value instead as it evaluates
  the argument if necessary and returns a proper value.

  mysql-test/r/olap.result@1.33.1.8, 2007-11-21 20:53:42+04:00, ramil@mysql.com +8 -0
    Fix for bug #32558: group by null-returning expression with rollup causes crash
      - test result.

  mysql-test/t/olap.test@1.30, 2007-11-21 20:53:42+04:00, ramil@mysql.com +9 -0
    Fix for bug #32558: group by null-returning expression with rollup causes crash
      - test case.

  sql/item_func.h@1.136.3.41, 2007-11-21 20:53:42+04:00, ramil@mysql.com +1 -1
    Fix for bug #32558: group by null-returning expression with rollup causes crash
      - use args[0]->is_null() to obtain Item_func_rollup_const::null_value 
        instead of args[0]->null_value as it's not set in advance in case of 
        constant functions.

ChangeSet@1.2476.690.1, 2007-11-21 18:52:38+02:00, gkodinov@macbook.gmz +1 -0
  Bug #31171: test alter_table, fulltext2, ps, sp fail, 
   "Table is already up to date" vs. "OK"
  
  On MacOSX 10.5 when you cast something to "bool"
  (the built in C type) it takes values 0 or 1 
  instead of 0-255 as it seems to be on older compilers.
  Fixed by removing the typecast (not needed).
  No test case needed : there are tests that test it.

  storage/myisam/mi_open.c@1.100.8.1, 2007-11-21 18:52:37+02:00, gkodinov@macbook.gmz +1 -1
    Bug #31171: don't typecast when not needed

ChangeSet@1.2476.685.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.667.22, 2007-11-21 15:56:45+02:00, gkodinov@magare.gmz +1 -0
  merge of bug 30788 to 5.1-opt

  mysql-test/r/subselect.result@1.196.1.4, 2007-11-21 15:56:43+02:00, gkodinov@magare.gmz +1 -1
    merge of bug 30788 to 5.1-opt

ChangeSet@1.1810.3508.1, 2007-11-21 14:27:35+01:00, jperkin@mysql.com +1 -0
  configure.in:
    Revert version back to 5.0.52 for release build

  configure.in@1.245.77.47, 2007-11-21 14:26:36+01:00, jperkin@mysql.com +2 -2
    Revert version back to 5.0.52 for release build

ChangeSet@1.2476.505.17, 2007-11-21 14:18:02+01:00, guilhem@gbichot4.local +2 -0
  removing old file replaced by ma_key_recover.c

  BitKeeper/deleted/.del-ma_key_redo.c@1.2, 2007-11-21 14:10:57+01:00, guilhem@gbichot4.local +0 -0
    Delete: storage/maria/ma_key_redo.c

  storage/maria/ma_recovery.c@1.53, 2007-11-21 14:18:00+01:00, guilhem@gbichot4.local +2 -2
    now that we have indices, when state is older we don't always
    update rows' count

ChangeSet@1.1810.3466.22, 2007-11-21 13:50:17+01:00, mleich@five.local.lan +6 -0
  This changeset fixes
     Bug#31567 "datadict" tests (all engines) fail:
               Reference protocol is non-standard build
     Bug#30418 "datadict" tests (all engines) fail:
               Dependency on the host name for ordering   
  Modifications:
     1. The standard builds (build team) do not contain
        the collation 'utf8_general_cs'.
        The common developer builds (compuile-....-max)
        contain this collation.
        Solution fitting to both build variants:
           Exclude the collation 'utf8_general_cs' from
           result sets.
     2. Use mysqltest builtin sorting of result set for
        the statement where the hostname affects the
        row order.

  mysql-test/suite/funcs_1/datadict/datadict_master.inc@1.1.2.3, 2007-11-21 13:50:16+01:00, mleich@five.local.lan +7 -5
    Exclude collation 'utf8_general_cs' from result set.

  mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc@1.1.2.1, 2007-11-21 13:50:16+01:00, mleich@five.local.lan +2 -1
    Use mysqltest builtin sorting of result set.

  mysql-test/suite/funcs_1/datadict/datadict_tables.inc@1.1.1.1, 2007-11-21 13:50:16+01:00, mleich@five.local.lan +2 -2
    Exclude collation 'utf8_general_cs' from result set.

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.1.2.4, 2007-11-21 13:50:16+01:00, mleich@five.local.lan +18 -16
    Updated  results

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.1.2.4, 2007-11-21 13:50:16+01:00, mleich@five.local.lan +18 -16
    Updated  results

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.1.2.4, 2007-11-21 13:50:16+01:00, mleich@five.local.lan +18 -16
    Updated  results

ChangeSet@1.2476.689.1, 2007-11-21 16:00:09+04:00, ramil@mysql.com +3 -0
  Fix for bug #32557: order by updatexml causes assertion in filesort
  
  Problem: even if an Item_xml_str_func successor returns NULL, it doesn't have 
  a corresponding property (maybe_null) set, that leads to a failed assertion.
  
  Fix: set nullability property of Item_xml_str_func.

  mysql-test/r/xml.result@1.30, 2007-11-21 16:00:05+04:00, ramil@mysql.com +7 -0
    Fix for bug #32557: order by updatexml causes assertion in filesort
      - test result.

  mysql-test/t/xml.test@1.24, 2007-11-21 16:00:06+04:00, ramil@mysql.com +8 -0
    Fix for bug #32557: order by updatexml causes assertion in filesort
      - test case.

  sql/item_xmlfunc.h@1.10, 2007-11-21 16:00:06+04:00, ramil@mysql.com +10 -2
    Fix for bug #32557: order by updatexml causes assertion in filesort
      - set Item_xml_str_func::maybe_null.

ChangeSet@1.2476.685.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.61.1.10, 2007-11-21 13:25:05+03:00, skozlov@mysql.com +1 -2
    fixed path to combination file

ChangeSet@1.2476.505.16, 2007-11-21 12:13:27+02:00, monty@mysql.com +5 -0
  Fixed errors found by valgrind
  Changed bitmaps to be written before unpinning of pages in write_block_record()
  Log handler now assumes we never call it for not transactional tables
  Fixed bug in ma_test_all that caused it to fail

  sql/unireg.cc@1.102, 2007-11-21 12:13:23+02:00, monty@mysql.com +1 -1
    Removed 'at', as this makes it hard to find valgrind errors from the debug log

  storage/maria/ma_blockrec.c@1.57, 2007-11-21 12:13:23+02:00, monty@mysql.com +7 -7
    Changed bzero() of blocks to get rid of a (non critical) valgrind error
    Changed bitmaps to be written before unpinning of pages in write_block_record()
    fixed that we don't log tails if table isn't transactional

  storage/maria/ma_key_recover.c@1.3, 2007-11-21 12:13:23+02:00, monty@mysql.com +1 -2
    Fixed wrong log_data[] that caused us to log uninitialized data

  storage/maria/ma_loghandler.c@1.72, 2007-11-21 12:13:23+02:00, monty@mysql.com +1 -5
    Replaced not needed test with DBUG_ASSERT()

  storage/maria/ma_test_all.sh@1.15, 2007-11-21 12:13:23+02:00, monty@mysql.com +4 -0
    Remove control file if block size changes

ChangeSet@1.1810.3507.1, 2007-11-21 11:40:05+02:00, gkodinov@magare.gmz +5 -0
  Bug #30788: Inconsistent retrieval of char/varchar
  
  Index lookup does not always guarantee that we can
  simply remove the relevant conditions from the WHERE
  clause. Reasons can be e.g. conversion errors, 
  partial indexes etc. 
  The optimizer was removing these parts of the WHERE 
  condition without any further checking.
  This leads to "false positives" when using indexes.
  Fixed by checking the index reference conditions
  (using WHERE) when using indexes with sub-queries.

  mysql-test/r/subselect.result@1.134.24.1, 2007-11-21 11:40:04+02:00, gkodinov@magare.gmz +39 -8
    Bug #30788: 
     - using where
     - test case

  mysql-test/r/subselect3.result@1.1.1.11, 2007-11-21 11:40:04+02:00, gkodinov@magare.gmz +1 -1
    Bug #30788: using where

  mysql-test/t/subselect.test@1.129.15.1, 2007-11-21 11:40:04+02:00, gkodinov@magare.gmz +25 -0
    Bug #30788: test case

  sql/item.h@1.183.42.1, 2007-11-21 11:40:04+02:00, gkodinov@magare.gmz +21 -1
    Bug #30788: 
     - Declare eq() method of Item_cache descendants : this is used in
     test_if_ref()
     - preserve the field that is being cached for type comparisions

  sql/sql_select.cc@1.312.192.1, 2007-11-21 11:40:04+02:00, gkodinov@magare.gmz +15 -11
    Bug #30788: Don't remove the WHERE when using index lookup 
    with subqueries.

ChangeSet@1.1810.3486.3, 2007-11-21 11:11:22+04:00, ramil@mysql.com +3 -0
  Fix for bug #30495: optimize table t1,t2,t3 extended errors
  
  Problem: we have CHECK TABLE options allowed (by accident?) for
  ANALYZE/OPTIMIZE TABLE.
  
  Fix: disable them.
  
  Note: it might require additional fixes in 5.1/6.0

  mysql-test/r/analyze.result@1.7.1.1, 2007-11-21 11:11:20+04:00, ramil@mysql.com +8 -0
    Fix for bug #30495: optimize table t1,t2,t3 extended errors
      - test result.

  mysql-test/t/analyze.test@1.10.1.1, 2007-11-21 11:11:20+04:00, ramil@mysql.com +13 -1
    Fix for bug #30495: optimize table t1,t2,t3 extended errors
      - test case.

  sql/sql_yacc.yy@1.371.132.7, 2007-11-21 11:11:20+04:00, ramil@mysql.com +2 -2
    Fix for bug #30495: optimize table t1,t2,t3 extended errors
      - opt_mi_check_type (CHECK TABLE options) removed from analyze: and optimize: 

ChangeSet@1.2476.651.18, 2007-11-21 08:01:00+04:00, ramil@mysql.com +4 -0
  Fix for bug #32021: Using Date 000-00-01 in WHERE causes wrong result
    
  Problem: caching 00000000-00000099 dates as integer values we're 
  improperly shifting them up twice in the get_datetime_value().
    
  Fix: don't shift cached DATETIME values up for the second time.

  mysql-test/r/type_date.result@1.26.1.1, 2007-11-21 08:00:58+04:00, ramil@mysql.com +7 -0
    Fix for bug #32021: Using Date 000-00-01 in WHERE causes wrong result
      - test result.

  mysql-test/t/type_date.test@1.23.1.1, 2007-11-21 08:00:58+04:00, ramil@mysql.com +10 -0
    Fix for bug #32021: Using Date 000-00-01 in WHERE causes wrong result
      - test case.

  sql/item.h@1.270, 2007-11-21 08:00:58+04:00, ramil@mysql.com +16 -1
    Fix for bug #32021: Using Date 000-00-01 in WHERE causes wrong result
      - Item_cache::field_type() method added.
      - new Item_cache(enum_field_types) and Item_cache_int(enum_field_types) 
        constructors added.

  sql/item_cmpfunc.cc@1.267.15.1, 2007-11-21 08:00:58+04:00, ramil@mysql.com +6 -3
    Fix for bug #32021: Using Date 000-00-01 in WHERE causes wrong result
      - don't shift cached DATETIME values for the second time in the
        get_datetime_value():
          creating new Item_cache_int set DATETIME filed type,
          check the type before shifting.

ChangeSet@1.2476.687.1, 2007-11-20 17:03:56-07:00, tsmith@ramayana.hindu.god +3 -0
  Bug #25146: Some warnings/errors not shown when using --show-warnings
  
  In several cases, an error when processing the query would cause mysql to
  return to the top level without printing warnings.  Fix is to always
  print any available warnings before returning to the top level.

  client/mysql.cc@1.272.3.1, 2007-11-20 17:03:55-07:00, tsmith@ramayana.hindu.god +29 -23
    In com_go(), ensure that warnings are printed even if an error
    occurred when processing the query.  Before this patch, an error
    in several places would return to the top level without printing
    associated warnings.
    
    Attempt to avoid printing the warning, though, if it's a duplicate
    of mysql_error() for the connection handle.

  mysql-test/r/mysql.result@1.40.1.1, 2007-11-20 17:03:55-07:00, tsmith@ramayana.hindu.god +7 -0
    Add test for bug 25146

  mysql-test/t/mysql.test@1.49.1.1, 2007-11-20 17:03:55-07:00, tsmith@ramayana.hindu.god +18 -0
    Add test for bug 25146

ChangeSet@1.1810.3504.1, 2007-11-21 02:48:01+03:00, evgen@moonbone.local +1 -0
  sql_select.cc:
    Additional stack check for the bug#31048.

  sql/sql_select.cc@1.312.191.1, 2007-11-21 02:47:31+03:00, evgen@moonbone.local +5 -0
    Additional stack check for the bug#31048.

ChangeSet@1.2476.685.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.313.12.3, 2007-11-21 00:39:46+03:00, skozlov@mysql.com +1 -1
    updated mtr

ChangeSet@1.2476.631.29, 2007-11-20 12:51:36-07:00, tsmith@ramayana.hindu.god +1 -0
  Minor update to allowed errors list in mysql-test's mtr_report.pl

  mysql-test/lib/mtr_report.pl@1.61.3.1, 2007-11-20 12:51:34-07:00, tsmith@ramayana.hindu.god +1 -1
    Update 'allowed errors' list to match re-formatted InnoDB error message.

ChangeSet@1.2476.686.2, 2007-11-20 17:45:49-02:00, davi@endora.local +1 -0
  This issue was fixed in Bug 30904 which includes a similar test case.

  mysql-test/t/sp_notembedded.test@1.10, 2007-11-20 17:45:47-02:00, davi@endora.local +1 -22
    Remove test case, it's not needed any more.

ChangeSet@1.2476.631.28, 2007-11-20 12:23:18-07:00, tsmith@ramayana.hindu.god +3 -0
  Applied InnoDB snapshot innodb-5.1-ss2093
  
  Fixes the following bug:
  
  - Bug #32125: Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase
  
    When unknown find_flag is encountered in convert_search_mode_to_innobase()
    do not call assert(0); instead queue a MySQL error using my_error() and
    return the error code PAGE_CUR_UNSUPP. Change the functions that call
    convert_search_mode_to_innobase() to handle that error code by "canceling"
    execution and returning appropriate error code further upstream.

  storage/innobase/dict/dict0dict.c@1.109, 2007-11-20 12:02:16-07:00, tsmith@ramayana.hindu.god +0 -10
    Applied InnoDB snapshot innodb-5.1-ss2093
    
    Revision r2092:
    Remove the unused function innobase_convert_from_filename() that was
    inadvertently added in r590.

  storage/innobase/handler/ha_innodb.cc@1.369, 2007-11-20 12:02:17-07:00, tsmith@ramayana.hindu.god +66 -47
    Applied InnoDB snapshot innodb-5.1-ss2093
    
    Revision r2088:
    Fix Bug#32125 (http://bugs.mysql.com/32125)
    "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
    
    When unknown find_flag is encountered in convert_search_mode_to_innobase()
    do not call assert(0); instead queue a MySQL error using my_error() and
    return the error code PAGE_CUR_UNSUPP. Change the functions that call
    convert_search_mode_to_innobase() to handle that error code by "canceling"
    execution and returning appropriate error code further upstream.
    
    Approved by:	Heikki (via IM)
    
    
    
    Revision r2093:
    convert_search_mode_to_innobase(): Add the missing case label
    HA_READ_MBR_EQUAL that was forgotten in r2088.
    
    
    Revision r2089:
    Non-functional change: convert the switch in convert_search_mode_to_innobase()
    to the InnoDB coding style.
    
    
    Revision r2092:
    Remove the unused function innobase_convert_from_filename() that was
    inadvertently added in r590.

  storage/innobase/include/page0cur.h@1.12, 2007-11-20 12:02:17-07:00, tsmith@ramayana.hindu.god +1 -0
    Applied InnoDB snapshot innodb-5.1-ss2093
    
    Revision r2088:
    Fix Bug#32125 (http://bugs.mysql.com/32125)
    "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
    
    When unknown find_flag is encountered in convert_search_mode_to_innobase()
    do not call assert(0); instead queue a MySQL error using my_error() and
    return the error code PAGE_CUR_UNSUPP. Change the functions that call
    convert_search_mode_to_innobase() to handle that error code by "canceling"
    execution and returning appropriate error code further upstream.
    
    Approved by:	Heikki (via IM)

ChangeSet@1.2476.594.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.1810.3466.21, 2007-11-20 10:53:19-07:00, tsmith@ramayana.hindu.god +12 -0
  Applied InnoDB snapshot innodb-5.0-ss2095
  
  Fixes the following bugs:
  
  - Bug #29560: InnoDB >= 5.0.30 hangs on adaptive hash rw-lock 'waiting for an X-lock'
  
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
  
  - Bug #32125: Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase
  
    When unknown find_flag is encountered in convert_search_mode_to_innobase()
    do not call assert(0); instead queue a MySQL error using my_error() and
    return the error code PAGE_CUR_UNSUPP. Change the functions that call
    convert_search_mode_to_innobase() to handle that error code by "canceling"
    execution and returning appropriate error code further upstream.

  sql/ha_innodb.cc@1.202.55.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +37 -8
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2091:
    branches/5.0:
     
    Merge r2088 from trunk:
     
    log for r2088:
    
    Fix Bug#32125 (http://bugs.mysql.com/32125)
    "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
    
    When unknown find_flag is encountered in convert_search_mode_to_innobase()
    do not call assert(0); instead queue a MySQL error using my_error() and
    return the error code PAGE_CUR_UNSUPP. Change the functions that call
    convert_search_mode_to_innobase() to handle that error code by "canceling"
    execution and returning appropriate error code further upstream.
    
    Approved by:	Heikki
    
    
    Revision r2095:
    branches/5.0: Merge r2093 from trunk:
    
    convert_search_mode_to_innobase(): Add the missing case label
    HA_READ_MBR_EQUAL that was forgotten in r2088.

  innobase/include/db0err.h@1.10.1.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +12 -0
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2091:
    branches/5.0:
     
    Merge r2088 from trunk:
     
    log for r2088:
    
    Fix Bug#32125 (http://bugs.mysql.com/32125)
    "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
    
    When unknown find_flag is encountered in convert_search_mode_to_innobase()
    do not call assert(0); instead queue a MySQL error using my_error() and
    return the error code PAGE_CUR_UNSUPP. Change the functions that call
    convert_search_mode_to_innobase() to handle that error code by "canceling"
    execution and returning appropriate error code further upstream.
    
    Approved by:	Heikki

  innobase/include/os0sync.h@1.14.1.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +32 -6
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/include/page0cur.h@1.6.3.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +1 -0
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2091:
    branches/5.0:
     
    Merge r2088 from trunk:
     
    log for r2088:
    
    Fix Bug#32125 (http://bugs.mysql.com/32125)
    "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
    
    When unknown find_flag is encountered in convert_search_mode_to_innobase()
    do not call assert(0); instead queue a MySQL error using my_error() and
    return the error code PAGE_CUR_UNSUPP. Change the functions that call
    convert_search_mode_to_innobase() to handle that error code by "canceling"
    execution and returning appropriate error code further upstream.
    
    Approved by:	Heikki

  innobase/include/sync0rw.h@1.11.4.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +11 -0
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/include/sync0rw.ic@1.9.7.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +6 -0
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/include/sync0sync.ic@1.18.3.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +1 -1
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/os/os0sync.c@1.24.8.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +48 -8
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/srv/srv0srv.c@1.87.13.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +8 -8
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/sync/sync0arr.c@1.20.5.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +60 -11
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/sync/sync0rw.c@1.19.4.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +17 -1
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/sync/sync0sync.c@1.34.6.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +35 -5
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

ChangeSet@1.1810.3503.1, 2007-11-20 19:18:21+02:00, gkodinov@magare.gmz +11 -0
  Bug #32400: Complex SELECT query returns correct result 
   only on some occasions
  
  Referencing an element from the SELECT list in a WHERE 
  clause is not permitted. The namespace of the WHERE
  clause is the table columns only. This was not enforced
  correctly when resolving outer references in sub-queries.
  
  Fixed by not allowing references to aliases in a 
  sub-query in WHERE.

  mysql-test/r/ps_6bdb.result@1.27.22.1, 2007-11-20 19:18:20+02:00, gkodinov@magare.gmz +6 -6
    Bug #32400: fixed old test queries

  mysql-test/include/ps_query.inc@1.18, 2007-11-20 19:18:19+02:00, gkodinov@magare.gmz +2 -2
    Bug #32400: fixed old test queries

  mysql-test/r/ps_2myisam.result@1.39.6.7, 2007-11-20 19:18:19+02:00, gkodinov@magare.gmz +6 -6
    Bug #32400: fixed old test queries

  mysql-test/r/ps_3innodb.result@1.42.6.7, 2007-11-20 19:18:20+02:00, gkodinov@magare.gmz +6 -6
    Bug #32400: fixed old test queries

  mysql-test/r/ps_4heap.result@1.38.6.7, 2007-11-20 19:18:20+02:00, gkodinov@magare.gmz +6 -6
    Bug #32400: fixed old test queries

  mysql-test/r/ps_5merge.result@1.39.6.7, 2007-11-20 19:18:20+02:00, gkodinov@magare.gmz +12 -12
    Bug #32400: fixed old test queries

  mysql-test/r/subselect.result@1.134.1.65, 2007-11-20 19:18:20+02:00, gkodinov@magare.gmz +38 -9
    Bug #32400: test case

  mysql-test/r/ps_7ndb.result@1.26.12.1, 2007-11-20 19:18:20+02:00, gkodinov@magare.gmz +6 -6
    Bug #32400: fixed old test queries

  mysql-test/t/subselect.test@1.129.12.5, 2007-11-20 19:18:20+02:00, gkodinov@magare.gmz +44 -6
    Bug #32400: test case

  sql/item.cc@1.113.1.179, 2007-11-20 19:18:20+02:00, gkodinov@magare.gmz +1 -1
    Bug #32400: don't allow references to aliases in WHERE

  tests/mysql_client_test.c@1.167.1.74, 2007-11-20 19:18:20+02:00, gkodinov@magare.gmz +1 -1
    Bug #32400: fixed old test queries

ChangeSet@1.2476.686.1, 2007-11-20 15:17:53-02:00, davi@endora.local +9 -0
  Bug#31397 Inconsistent drop table behavior of handler tables.
  
  The problem is that DROP TABLE and other DDL statements failed to
  automatically close handlers associated with tables that were marked
  for reopen (FLUSH TABLES).
  
  The current implementation fails to properly discard handlers of
  dropped tables (that were marked for reopen) because it searches
  on the open handler tables list and using the current alias of the
  table being dropped. The problem is that it must not use the open
  handler tables list to search because the table might have been
  closed (marked for reopen) by a flush tables command and also it
  must not use the current table alias at all since multiple different
  aliases may be associated with a single table. This is specially
  visible when a user has two open handlers (using alias) of a same
  table and a flush tables command is issued before the table is
  dropped (see test case). Scanning the handler table list is also
  useless for dropping handlers associated with temporary tables,
  because temporary tables are not kept in the THD::handler_tables
  list.
  
  The solution is to simple scan the handlers hash table searching
  for, and deleting all handlers with matching table names if the
  reopen flag is not passed to the flush function, indicating that
  the handlers should be deleted. All matching handlers are deleted
  even if the associated the table is not open.

  mysql-test/include/handler.inc@1.41, 2007-11-20 15:17:51-02:00, davi@endora.local +94 -0
    Add test case for Bug#31397

  mysql-test/r/handler_innodb.result@1.23, 2007-11-20 15:17:51-02:00, davi@endora.local +91 -0
    Add test case result for Bug#31397

  mysql-test/r/handler_myisam.result@1.36, 2007-11-20 15:17:51-02:00, davi@endora.local +91 -0
    Add test case result for Bug#31397

  sql/mysql_priv.h@1.523.25.1, 2007-11-20 15:17:51-02:00, davi@endora.local +3 -6
    Rename flush functions to better match the intent of the caller and
    update functions prototypes and remove unused flags.

  sql/sql_base.cc@1.421.22.1, 2007-11-20 15:17:51-02:00, davi@endora.local +4 -4
    Rename flush functions to better match the intent of the caller.

  sql/sql_class.cc@1.347.11.1, 2007-11-20 15:17:51-02:00, davi@endora.local +1 -3
    Rename the flush functions to better match the intent of the caller.
    The hash_free function is moved to the cleanup.

  sql/sql_handler.cc@1.105, 2007-11-20 15:17:52-02:00, davi@endora.local +107 -138
    When dropping tables for a final close, scan the handler's hash table since
    the table might not be in the handlers open table list because the table was
    marked for reopen or because it's a temporary table.

  sql/sql_rename.cc@1.48, 2007-11-20 15:17:52-02:00, davi@endora.local +2 -0
    Drop handlers associated with tables that are being renamed.

  sql/sql_table.cc@1.437.28.1, 2007-11-20 15:17:52-02:00, davi@endora.local +6 -12
    Now that temporary tables are properly removed even when opened
    by a SQL HANDLER, enable the assert since this branch can't be taken
    outside of SF/trigger/prelocked mode.

ChangeSet@1.2476.685.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.61.1.9, 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.25.1.5, 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.313.12.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.1810.3502.1, 2007-11-20 20:15:20+04:00, gshchepa@gleb.loc +3 -0
  Fixed bug #32533.
  8bit escape characters, termination and enclosed characters
  were silently ignored by SELECT INTO query, but LOAD DATA INFILE
  algorithm is 8bit-clean, so data was corrupted during 
  encoding.

  mysql-test/r/outfile_loaddata.result@1.2, 2007-11-20 20:14:52+04:00, gshchepa@gleb.loc +18 -0
    Added test case for bug #32533.

  mysql-test/t/outfile_loaddata.test@1.2, 2007-11-20 20:14:51+04:00, gshchepa@gleb.loc +24 -0
    Added test case for bug #32533.

  sql/sql_class.cc@1.223.20.25, 2007-11-20 20:14:49+04:00, gshchepa@gleb.loc +10 -7
    Fixed bug #32533.
    SELECT INTO OUTFILE encoding was not 8bit clear, it
    has been fixed for a symmetry with the LOAD DATA INFILE
    decoding algorithm.

ChangeSet@1.2476.505.14, 2007-11-20 17:42:16+02:00, monty@mysql.com +30 -0
  Fixes for redo/undo logging of key pages
  New extendable format for maria_log_control file
  Fixed some compiler warnings

  include/maria.h@1.20, 2007-11-20 17:39:24+02:00, monty@mysql.com +2 -0
    Added maria_disable_logging() and maria_enable_logging()

  mysql-test/include/maria_verify_recovery.inc@1.3, 2007-11-20 17:39:25+02:00, monty@mysql.com +4 -5
    Updated tests now when key redo/undo works

  mysql-test/r/maria-recovery.result@1.3, 2007-11-20 17:39:25+02:00, monty@mysql.com +18 -30
    Updated tests now when key redo/undo works

  storage/maria/ma_blockrec.c@1.56, 2007-11-20 17:39:25+02:00, monty@mysql.com +42 -125
    Use unified CLR code
    Added rec_lsn for full pages
    Moved clr write hook to ma_key_recover.c
    Changed REDO code to keep pages pinned until undo
    Mark page_link's as changed

  storage/maria/ma_blockrec.h@1.19, 2007-11-20 17:39:25+02:00, monty@mysql.com +0 -3
    Moved write_hook_for_clr_end() to ma_key_recover.c

  storage/maria/ma_check.c@1.50, 2007-11-20 17:39:25+02:00, monty@mysql.com +18 -8
    Changed key check code to use PAGECACHE_READ_UNKNOWN_PAGE
    Fixed wrong warning when checking files after maria_pack
    When unpacking files, we have to use new keypos_to_recpos method
    When doing repair, we can disregard index key file pages in page cache
    

  storage/maria/ma_commit.c@1.5, 2007-11-20 17:39:25+02:00, monty@mysql.com +23 -0
    Added simple enable/disable logging functions
    (Needed for recovery)

  storage/maria/ma_control_file.c@1.21, 2007-11-20 17:39:25+02:00, monty@mysql.com +233 -109
    Make maria control file extendable without having to make it incompatible for older versions

  storage/maria/ma_control_file.h@1.20, 2007-11-20 17:39:25+02:00, monty@mysql.com +10 -0
    New error messages
    Added CONTROL_FILE_VERSION

  storage/maria/ma_delete.c@1.18, 2007-11-20 17:41:16+02:00, monty@mysql.com +381 -132
    Added redo/undo for key pages
    change_length -> changed_length to make things similar
    More comments & more DBUG
    

  storage/maria/ma_key_recover.c@1.2, 2007-11-20 17:41:50+02:00, monty@mysql.com +385 -52
    Unified CLR method
    Moved here write_hook_for_clr_end() and common keypage log functions
    Changed REDO to keep pages pinned until undo
    Changed UNDO code to change key_root under log mutex

  storage/maria/ma_key_recover.h@1.2, 2007-11-20 17:41:50+02:00, monty@mysql.com +35 -1
    New structures and functions

  storage/maria/ma_loghandler.c@1.71, 2007-11-20 17:41:50+02:00, monty@mysql.com +2 -1
    Include needed files

  storage/maria/ma_open.c@1.37, 2007-11-20 17:41:50+02:00, monty@mysql.com +8 -10
    Change maria_open() to use pread() instead of read()

  storage/maria/ma_page.c@1.17, 2007-11-20 17:41:50+02:00, monty@mysql.com +14 -4
    Fixed bug in key_del handling
    Clear pages if IDENTICAL_PAGES_AFTER_RECOVERY is defined

  storage/maria/ma_pagecache.c@1.57, 2007-11-20 17:41:50+02:00, monty@mysql.com +10 -7
    Indentation and spelling fixes
    More DBUG
    Added helper function: pagecache_block_link_to_buffer()

  storage/maria/ma_pagecache.h@1.29, 2007-11-20 17:41:50+02:00, monty@mysql.com +1 -0
    Added pagecache_block_link_to_buffer()

  storage/maria/ma_recovery.c@1.51, 2007-11-20 17:41:50+02:00, monty@mysql.com +41 -26
    Fixed state.changed
    Fixed that REDO keeps pages pinned until UNDO
    Some bug fixes from previous commit
    Fixes for UNDO/REDO of key pages

  storage/maria/ma_search.c@1.15, 2007-11-20 17:41:50+02:00, monty@mysql.com +37 -29
    Fixed packing and storing of keys to provide more information to caller so
    that we can do efficent REDO logging of the changes.

  storage/maria/ma_test1.c@1.30, 2007-11-20 17:41:50+02:00, monty@mysql.com +2 -2
    Fixed bug with not initialized variable

  storage/maria/ma_test2.c@1.28, 2007-11-20 17:41:50+02:00, monty@mysql.com +0 -9
    Removed not used code

  storage/maria/ma_test_all.res@1.3, 2007-11-20 17:41:51+02:00, monty@mysql.com +4 -52
    Updated results

  storage/maria/ma_test_all.sh@1.14, 2007-11-20 17:41:51+02:00, monty@mysql.com +14 -14
    Changed one test to test more
    Removed timing tests as not relevant here

  storage/maria/ma_test_recovery@1.16, 2007-11-20 17:41:51+02:00, monty@mysql.com +11 -18
    Updated test after redo/undo if key pages works

  storage/maria/ma_write.c@1.23, 2007-11-20 17:42:13+02:00, monty@mysql.com +82 -251
    Moved some general log functions to ma_key_recover.c
    Fixed some bugs in undo
    Moved ma_log_split() to _ma_split_page()
    Small changes in some function arguments to be able to do redo logging
    

  storage/maria/maria_chk.c@1.27, 2007-11-20 17:42:13+02:00, monty@mysql.com +4 -0
    disable logging while doing repair table

  storage/maria/maria_def.h@1.46, 2007-11-20 17:42:13+02:00, monty@mysql.com +9 -21
    New function prototypes
    Move some structs and functions to ma_key_recover.c

  storage/maria/unittest/ma_control_file-t.c@1.17, 2007-11-20 17:42:13+02:00, monty@mysql.com +40 -11
    Updated with patch from Sanja
    NOTE: This is not complete and need to be updated to new control file format

  storage/maria/unittest/ma_test_loghandler-t.c@1.21, 2007-11-20 17:42:13+02:00, monty@mysql.com +1 -1
    Fixed compiler warning

  storage/maria/ma_test_recovery.expected@1.12, 2007-11-20 17:41:51+02:00, monty@mysql.com +104 -983
    Updated test result after redo/undo if key pages works

ChangeSet@1.2476.631.25, 2007-11-20 16:04:07+01:00, mleich@five.local.lan +121 -0
  Fixes for the bugs
         Bug#31610 Remove outdated and redundant tests:
                   partition_02myisam partition_03ndb
         Bug#32405 testsuite parts: partition_char_myisam wrong content
  and cleanup of testsuite
     - remove/correct wrong comments
     - remove workarounds for fixed bugs
     - replace error numbers with error names
     - exclude subtests from execution which fail now because of
       new limitations for partitioning functions
     - remove code for the no more intended dual use
       fast test in regression tests/slow test in testsuite
     - analyze and fix problems with partition_char_innodb
     - fix problems caused by last change of error numbers
     - Introduce error name to error number mapping which makes
       maintenance after next error renumbering easier

  BitKeeper/deleted/.del-partition_02myisam.result@1.9, 2007-11-20 16:01:44+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/r/partition_02myisam.result -> BitKeeper/deleted/.del-partition_02myisam.result

  BitKeeper/deleted/.del-partition_02myisam.test@1.2, 2007-11-20 16:01:45+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/t/partition_02myisam.test -> BitKeeper/deleted/.del-partition_02myisam.test

  BitKeeper/deleted/.del-partition_03ndb.result@1.3, 2007-11-20 16:01:42+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/suite/ndb/r/partition_03ndb.result -> BitKeeper/deleted/.del-partition_03ndb.result

  BitKeeper/deleted/.del-partition_03ndb.test@1.3, 2007-11-20 16:01:42+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/suite/ndb/t/partition_03ndb.test -> BitKeeper/deleted/.del-partition_03ndb.test

  BitKeeper/deleted/.del-partition_1.inc@1.5, 2007-11-20 16:01:42+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/include/partition_1.inc -> BitKeeper/deleted/.del-partition_1.inc

  BitKeeper/deleted/.del-partition_char_myisam.result@1.3, 2007-11-20 16:01:45+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/suite/parts/r/partition_char_myisam.result -> BitKeeper/deleted/.del-partition_char_myisam.result

  mysql-test/suite/parts/inc/methods1.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +5 -13
    Fixes + cleanup

  mysql-test/suite/parts/inc/part_blocked_sql_funcs_main.inc@1.7, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +0 -47
    Fixes + cleanup

  mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc@1.7, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -1
    Fixes + cleanup

  mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc@1.8, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +0 -23
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition.pre@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +98 -59
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_10.inc@1.3, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -8
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_10.inc@1.2, 2007-11-20 16:01:45+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/include/partition_10.inc -> mysql-test/suite/parts/inc/partition_10.inc

  mysql-test/suite/parts/inc/partition_11.inc@1.3, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +3 -3
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_11.inc@1.2, 2007-11-20 16:01:45+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/include/partition_11.inc -> mysql-test/suite/parts/inc/partition_11.inc

  mysql-test/suite/parts/inc/partition_12.inc@1.3, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -8
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_12.inc@1.2, 2007-11-20 16:01:45+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/include/partition_12.inc -> mysql-test/suite/parts/inc/partition_12.inc

  mysql-test/suite/parts/inc/partition_20.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +5 -10
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter1.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +10 -41
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter2.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +10 -72
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter3.inc@1.6, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +19 -21
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter4.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +1 -22
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter_1.inc@1.7, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +10 -9
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter_11.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +4 -12
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter_13.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +4 -12
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter_41.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +6 -14
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_basic.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -23
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_binary.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +9 -0
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_bit.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +1 -1
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_blob.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -0
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_char.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +4 -2
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_check.inc@1.7, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +47 -92
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_check_drop.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +3 -3
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_check_read.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +3 -3
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_check_read1.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -2
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_check_read2.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -2
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_cleanup.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -2
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_directory.inc@1.6, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +2 -9
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_engine.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +2 -16
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_enum.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +7 -1
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_layout.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +1 -1
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_layout.inc@1.4, 2007-11-20 16:01:43+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/include/partition_layout.inc -> mysql-test/suite/parts/inc/partition_layout.inc

  mysql-test/suite/parts/inc/partition_layout_check1.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +3 -3
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_layout_check2.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +4 -4
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_methods1.inc@1.6, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +5 -13
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_methods2.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +5 -13
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_set.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +2 -0
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc@1.7, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +0 -2
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_syntax.inc@1.7, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +4 -67
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_syntax_1.inc@1.7, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +12 -20
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_syntax_2.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +3 -11
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_text.inc@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +2 -1
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_trigg1.inc@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +5 -5
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_trigg2.inc@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +4 -4
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_trigg3.inc@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +5 -23
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_value.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +2 -2
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_varbinary.inc@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +2 -0
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_varchar.inc@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +2 -0
    Fixes + cleanup

  mysql-test/suite/parts/r/partition_alter1_innodb.result@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +336 -341
    Updated result

  mysql-test/suite/parts/r/partition_alter1_myisam.result@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +128 -133
    Updated result

  mysql-test/suite/parts/r/partition_alter2_innodb.result@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +480 -485
    Updated result

  mysql-test/suite/parts/r/partition_alter2_myisam.result@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +288 -293
    Updated result

  mysql-test/suite/parts/r/partition_alter3_innodb.result@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -7
    Updated result

  mysql-test/suite/parts/r/partition_alter3_myisam.result@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +0 -5
    Updated result

  mysql-test/suite/parts/r/partition_alter4_innodb.result@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +144 -149
    Updated result

  mysql-test/suite/parts/r/partition_alter4_myisam.result@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +176 -181
    Updated result

  mysql-test/suite/parts/r/partition_basic_innodb.result@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +205 -210
    Updated result

  mysql-test/suite/parts/r/partition_basic_myisam.result@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +161 -166
    Updated result

  mysql-test/suite/parts/r/partition_bit_myisam.result@1.3, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -2
    Updated result

  mysql-test/suite/parts/r/partition_char_innodb.result@1.3, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +674 -1543
    Updated result

  mysql-test/suite/parts/r/partition_char_myisam.result@1.1, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1340 -0
    Updated result
    bk rm + new file is caused by bk complaining about filetype

  mysql-test/suite/parts/r/partition_char_myisam.result@1.0, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/parts/r/partition_datetime_myisam.result@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +5 -5
    Updated result

  mysql-test/suite/parts/r/partition_decimal_myisam.result@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +1 -1
    Updated result

  mysql-test/suite/parts/r/partition_engine_innodb.result@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +28 -33
    Updated result

  mysql-test/suite/parts/r/partition_engine_myisam.result@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +28 -33
    Updated result

  mysql-test/suite/parts/r/partition_float_innodb.result@1.3, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +0 -292
    Updated result

  mysql-test/suite/parts/r/partition_float_myisam.result@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -2
    Updated result

  mysql-test/suite/parts/r/partition_int_myisam.result@1.3, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +5 -5
    Updated result

  mysql-test/suite/parts/r/partition_special_myisam.result@1.3, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +4 -4
    Updated result

  mysql-test/suite/parts/r/partition_syntax_innodb.result@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +115 -5
    Updated result

  mysql-test/suite/parts/r/partition_syntax_myisam.result@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +115 -5
    Updated result

  mysql-test/suite/parts/t/disabled.def@1.7, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +0 -2
    Fixes + cleanup

  mysql-test/suite/parts/t/part_blocked_sql_func_innodb.test@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -4
    Fixes + cleanup

  mysql-test/suite/parts/t/part_blocked_sql_func_myisam.test@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +1 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/part_supported_sql_func_innodb.test@1.6, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +1 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/part_supported_sql_func_myisam.test@1.6, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +1 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/part_supported_sql_func_ndb.test@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +1 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter1_innodb.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter1_myisam.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter1_ndb.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter2_innodb.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter2_myisam.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter2_ndb.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter3_innodb.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter3_myisam.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter4_innodb.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter4_myisam.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +1 -4
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_basic_innodb.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_basic_myisam.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_basic_ndb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +4 -7
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_bit_innodb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_bit_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -2
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_bit_ndb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_char_innodb.test@1.5, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -10
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_char_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +15 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_datetime_innodb.test@1.5, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -7
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_datetime_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_decimal_innodb.test@1.5, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_decimal_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -2
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_engine_innodb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_engine_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_engine_ndb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_float_innodb.test@1.5, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +5 -7
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_float_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_int_innodb.test@1.5, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -7
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_int_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_int_ndb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_special_innodb.test@1.5, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_special_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_syntax_innodb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_syntax_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_syntax_ndb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_value_innodb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_value_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_value_ndb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

ChangeSet@1.2476.683.1, 2007-11-20 15:08:48+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#32519
    Add *correct* check when a LCP is restorable
    by looking at maxGciStarted from LCP_FRAG_REP
    (for all fragments)
  
    bug observed by running testSystemRestart -n SR_DD_1_LCP T1
    (causes "incorrect" behaviour in 51-ndb, and crash when using 2 LCP)

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.130, 2007-11-20 15:08:46+01:00, jonas@perch.ndb.mysql.com +14 -4
    ndb - bug#32519
      Add *correct* check when a LCP is restorable
      by looking at maxGciStarted from LCP_FRAG_REP
      (for all fragments)

ChangeSet@1.1810.3501.1, 2007-11-20 16:07:24+02:00, gkodinov@magare.gmz +3 -0
  Bug #32268: Indexed queries give bogus MIN and MAX results
  
  Loose index scan does the grouping so the temp table does 
  not need to do it, even when sorting.
  Fixed by checking if the grouping is already done before
  doing sorting and grouping in a temp table and do only 
  sorting.

  mysql-test/r/group_min_max.result@1.23.1.7, 2007-11-20 16:07:23+02:00, gkodinov@magare.gmz +46 -0
    Bug #32268: test case

  mysql-test/t/group_min_max.test@1.21.1.8, 2007-11-20 16:07:23+02:00, gkodinov@magare.gmz +24 -0
    Bug #32268: test case

  sql/sql_select.cc@1.312.183.8, 2007-11-20 16:07:23+02:00, gkodinov@magare.gmz +2 -1
    Bug #32268: don't group in the temp table if already done

ChangeSet@1.2403.29.1, 2007-11-20 15:02:37+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #31958  	Slave stuck and stops processing relay logs

  storage/ndb/src/ndbapi/TransporterFacade.cpp@1.57.2.3, 2007-11-20 15:02:34+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug #31958  	Slave stuck and stops processing relay logs

ChangeSet@1.1810.3500.1, 2007-11-20 17:04:24+04:00, holyfoot@mysql.com +2 -0
  test case added for the bug #31155

  mysql-test/r/gis.result@1.35.1.16, 2007-11-20 17:04:22+04:00, holyfoot@mysql.com +6 -0
    test result complete

  mysql-test/t/gis.test@1.29.1.13, 2007-11-20 17:04:22+04:00, holyfoot@mysql.com +9 -0
    test case added for the bug

ChangeSet@1.2476.681.4, 2007-11-20 15:46:33+04:00, holyfoot@mysql.com +1 -0
  merging

  sql/mysql_priv.h@1.523.24.3, 2007-11-20 15:46:31+04:00, holyfoot@mysql.com +1 -1
    merging

ChangeSet@1.1810.3499.1, 2007-11-20 11:26:16+01:00, dfischer@mysql.com +1 -0
  Raise version number after cloning 5.0.52

  configure.in@1.245.77.46, 2007-11-20 11:26:09+01:00, dfischer@mysql.com +2 -2
    Raise version number after cloning 5.0.52

ChangeSet@1.2476.680.1, 2007-11-20 11:21:00+01:00, mattiasj@mattias-jonssons-macbook.local +5 -0
  Bug#30822: ALTER TABLE COALESCE PARTITION causes segmentation fault
  
  Problem was for LINEAR HASH/KEY. Crashes because of wrong partition id
  returned when creating the new altered partitions. (because of wrong
  linear hash mask)
  
  Solution: Update the linear hash mask before using it for the new
  altered table.

  mysql-test/r/partition_hash.result@1.10, 2007-11-20 11:20:55+01:00, mattiasj@mattias-jonssons-macbook.local +12 -0
    Bug#30822: ALTER TABLE COALESCE PARTITION causes segmentation fault
    
    test result

  mysql-test/t/partition_hash.test@1.12, 2007-11-20 11:20:55+01:00, mattiasj@mattias-jonssons-macbook.local +16 -0
    Bug#30822: ALTER TABLE COALESCE PARTITION causes segmentatition fault
    
    test case

  sql/ha_partition.cc@1.104.4.1, 2007-11-20 11:20:55+01:00, mattiasj@mattias-jonssons-macbook.local +8 -0
    Bug#30822: ALTER TABLE COALESCE PARTITION causes segmentation fault
    
    Updating the linear hash mask before using it.

  sql/sql_partition.cc@1.118.1.2, 2007-11-20 11:20:55+01:00, mattiasj@mattias-jonssons-macbook.local +1 -1
    Bug#30822: ALTER TABLE COALESCE PARTITION causes segmentation fault
    
    exporting the set_linear_hash_mask function (static -> non static)

  sql/sql_partition.h@1.16, 2007-11-20 11:20:55+01:00, mattiasj@mattias-jonssons-macbook.local +1 -0
    Bug#30822: ALTER TABLE COALESCE PARTITION causes segmentation fault
    
    exporting the set_linear_hash_mask function (static -> non static)

ChangeSet@1.1810.3491.2, 2007-11-20 10:25:07+01:00, guilhem@gbichot4.local +1 -0
  BUG#27850 "mysqldump --single-transaction does not work if TRUNCATE/DROP/RENAME/ALTER":
  this has already been closed by a note in the manual, now we
  complete this by a note in "mysqldump --help"

  client/mysqldump.c@1.214.31.1, 2007-11-20 10:25:04+01:00, guilhem@gbichot4.local +6 -2
    mention, in "mysqldump --help", of limitations reported as BUG#27850
    "mysqldump --single-transaction does not work if TRUNCATE/DROP/RENAME/ALTER"
    The new text is inspired from what the "mysqldump" section of the
    manual now says about --single-transaction:
    http://dev.mysql.com/doc/refman/5.1/en/mysqldump.html

ChangeSet@1.2476.667.19, 2007-11-20 05:02:49+03:00, sergefp@mysql.com +3 -0
  BUG#30573: Ordered range scan over partitioned tables returns some rows twice
  The problem: ha_partition::read_range_first() could return a record that is 
  outside of the scanned range. If that record happened to be in the next 
  subsequent range, it would satisfy the WHERE and appear in the output twice.
  (we would get it the second time when scanning the next subsequent range)
  
  Fix: 
  Made ha_partition::read_range_first() check if the returned recod is within
  the scanned range, like other read_range_first() implementations do.

  mysql-test/r/partition_range.result@1.23, 2007-11-20 05:02:43+03:00, sergefp@mysql.com +21 -1
    BUG#30573: Ordered range scan over partitioned tables returns some rows twice
     - Testcase

  mysql-test/t/partition_range.test@1.19, 2007-11-20 05:02:43+03:00, sergefp@mysql.com +27 -1
    BUG#30573: Ordered range scan over partitioned tables returns some rows twice
     - Testcase

  sql/ha_partition.cc@1.104.1.6, 2007-11-20 05:02:43+03:00, sergefp@mysql.com +1 -1
    BUG#30573: Ordered range scan over partitioned tables returns some rows twice
    - Make ha_partition::read_range_first() check if the returned record is 
      within the range.

ChangeSet@1.1810.3497.1, 2007-11-19 21:05:17+00:00, evgen@moonbone.local +2 -0
  Bug#30384: Having SQL_BUFFER_RESULT option in the CREATE .. KEY(..) .. SELECT
  led to creating corrupted index.
  
  Corrected fix. The new method called prepare2 is added to the select_create
  class. As all preparations are done by the select_create::prepare function
  it doesn't do anything. Slightly changed algorithm of calling the 
  start_bulk_insert function. Now it's called from the select_insert::prepare2
  function when the SQL_BUFFER_RESULT flags is set.
  The is_bulk_insert_mode flag is removed as it is not needed anymore.

  sql/sql_class.h@1.230.85.1, 2007-11-19 21:05:04+00:00, evgen@moonbone.local +2 -2
    Bug#30384: Having SQL_BUFFER_RESULT option in the CREATE .. KEY(..) .. SELECT
    led to creating corrupted index.
    Corrected fix. The new method called prepare2 is added to the select_create
    class. As all preparetions are done by the select_create::prepare function
    it doesn't do anything.
    The is_bulk_insert_mode flag is removed as it is not needed anymore.

  sql/sql_insert.cc@1.146.69.5, 2007-11-19 21:05:07+00:00, evgen@moonbone.local +5 -13
    Bug#30384: Having SQL_BUFFER_RESULT option in the CREATE .. KEY(..) .. SELECT
    led to creating corrupted index. Slightly changed algorithm of calling the
    start_bulk_insert function. Now it's called from the select_insert::prepare2
    function when the SQL_BUFFER_RESULT flags is set.
    Corrected fix. The is_bulk_insert_mode flag is removed as it is not needed
    anymore.

ChangeSet@1.2476.631.23, 2007-11-19 21:24:36+01:00, joerg@trift2. +7 -0
  The error number for ER_ILLEGAL_HA_CREATE_OPTION changed from 1477 to 1478,
  this must be reflected in the test result files.

  mysql-test/suite/funcs_1/r/ndb_cursors.result@1.5, 2007-11-19 21:24:31+01:00, joerg@trift2. +1 -1
    Error number changed, adapt the test result.

  mysql-test/suite/funcs_1/r/ndb_trig_0102.result@1.6, 2007-11-19 21:24:31+01:00, joerg@trift2. +1 -1
    Error number changed, adapt the test result.

  mysql-test/suite/funcs_1/r/ndb_trig_03.result@1.5, 2007-11-19 21:24:31+01:00, joerg@trift2. +1 -1
    Error number changed, adapt the test result.

  mysql-test/suite/funcs_1/r/ndb_trig_0407.result@1.5, 2007-11-19 21:24:31+01:00, joerg@trift2. +1 -1
    Error number changed, adapt the test result.

  mysql-test/suite/funcs_1/r/ndb_trig_08.result@1.6, 2007-11-19 21:24:31+01:00, joerg@trift2. +1 -1
    Error number changed, adapt the test result.

  mysql-test/suite/funcs_1/r/ndb_trig_09.result@1.5, 2007-11-19 21:24:31+01:00, joerg@trift2. +1 -1
    Error number changed, adapt the test result.

  mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result@1.5, 2007-11-19 21:24:31+01:00, joerg@trift2. +1 -1
    Error number changed, adapt the test result.

ChangeSet@1.1810.3496.1, 2007-11-19 20:00:25+00:00, evgen@moonbone.local +4 -0
  Bug#31048: Many nested subqueries may cause server crash.
  
  This bug is actually two. The first one manifests itself on an EXPLAIN
  SELECT query with nested subqueries that employs the filesort algorithm.
  The whole SELECT under explain is marked as UNCACHEABLE_EXPLAIN to preserve
  some temporary structures for explain. As a side-effect of this values of
  nested subqueries weren't cached and subqueries were re-evaluated many
  times. Each time buffer for filesort was allocated but wasn't freed because
  freeing occurs at the end of topmost SELECT. Thus all available memory was
  eaten up step by step and OOM event occur.
  The second bug manifests itself on SELECT queries with conditions where
  a subquery result is compared with a key field and the subquery itself also
  has such condition. When a long chain of such nested subqueries is present
  the stack overrun occur. This happens because at some point the range optimizer
  temporary puts the PARAM structure on the stack. Its size if about 8K and
  the stack is exhausted very fast.
  
  Now the subselect_single_select_engine::exec function allows subquery result
  caching when the UNCACHEABLE_EXPLAIN flag is set.
  Now the SQL_SELECT::test_quick_select function calls the check_stack_overrun
  function for stack checking purposes to prevent server crash.

  mysql-test/r/subselect.result@1.134.23.1, 2007-11-19 19:55:51+00:00, evgen@moonbone.local +104 -0
    Added a test case for the bug#31048: Many nested subqueries may cause server crash.

  mysql-test/t/subselect.test@1.129.14.1, 2007-11-19 19:55:43+00:00, evgen@moonbone.local +95 -0
    Added a test case for the bug#31048: Many nested subqueries may cause server crash.

  sql/item_subselect.cc@1.113.19.1, 2007-11-19 19:59:30+00:00, evgen@moonbone.local +3 -1
    Bug31048: Many nested subqueries may cause server crash.
    Now the subselect_single_select_engine::exec function allows subquery result
    caching when the UNCACHEABLE_EXPLAIN flag is set.

  sql/opt_range.cc@1.159.41.4, 2007-11-19 19:59:00+00:00, evgen@moonbone.local +6 -0
    Bug#31048: Many nested subqueries may cause server crash.
    Now the SQL_SELECT::test_quick_select function calls the check_stack_overrun
    function for stack checking purposes to preven server crash.

ChangeSet@1.1810.3412.29, 2007-11-19 21:34:21+04:00, gshchepa@gleb.loc +3 -0
  Fixed bug #32282: TEXT silently truncates when value is exactly 65536
  bytes length.
  
  The server has been modified to report warnings on truncation to
  65536 bytes as usual.
  

  mysql-test/r/type_blob.result@1.49.2.7, 2007-11-19 21:34:12+04:00, gshchepa@gleb.loc +14 -0
    Added test case for bug #32282.

  mysql-test/t/type_blob.test@1.33.1.2, 2007-11-19 21:34:12+04:00, gshchepa@gleb.loc +11 -0
    Added test case for bug #32282.

  sql/sql_string.cc@1.91.1.9, 2007-11-19 21:34:10+04:00, gshchepa@gleb.loc +4 -1
    Fixed bug #32282.
    The well_formed_copy_nchars function returned an incorrect value
    of copied bytes of the truncated input string: extra length of
    the first truncated character added to the *from_end_pos pointer.
    That has been fixed.

ChangeSet@1.1810.3495.1, 2007-11-19 17:59:44+01:00, thek@adventure.(none) +7 -0
  Bug #31153 calling stored procedure crashes server if available memory is low
  
  When the server was out of memory it crashed because of invalid memory access.
  
  This patch adds detection for failed memory allocations and make the server
  output a proper error message.

  sql/mysqld.cc@1.439.139.1, 2007-11-19 17:59:43+01:00, thek@adventure.(none) +12 -2
    Don't try to push_warning from within push_warning. It will cause a recursion
    until the stack is consumed.
    
    If my_net_init fails (for example: because of OOM) the temporary vio object 
    might have been attached to the thd object already. This will cause a double
    free on the vio object when the thd object is deleted later on and the server
    will crash.

  sql/sp_head.cc@1.200.31.1, 2007-11-19 17:59:43+01:00, thek@adventure.(none) +30 -8
    Added check for out-of-memory on a 'new' operation.
    Refactored reset_lex method to return a error state code instead of void.
    Initialize the mem-root with init_sql_alloc to get a basic error handler for
    memory allocation problems. This alone won't prevent the server from crashing,
    NULL pointers have to be accounted for as well.

  sql/sp_head.h@1.79.6.1, 2007-11-19 17:59:43+01:00, thek@adventure.(none) +3 -3
    Use the throw() clause in operator new, to indicate to the compiler that
    memory allocation can fail and return NULL, so that the compiler should
    generate code to check for NULL before invoking C++ constructors, to be
    crash safe.

  sql/sql_base.cc@1.235.117.1, 2007-11-19 17:59:43+01:00, thek@adventure.(none) +1 -2
    Use init_sql_alloc to get basic out-of-memory error handling.

  sql/sql_lex.h@1.175.41.13, 2007-11-19 17:59:43+01:00, thek@adventure.(none) +3 -2
    Use the throw() clause in operator new, to indicate to the compiler that
    memory allocation can fail and return NULL, so that the compiler should
    generate code to check for NULL before invoking C++ constructors, to be
    crash safe.

  sql/sql_prepare.cc@1.142.38.1, 2007-11-19 17:59:43+01:00, thek@adventure.(none) +1 -1
    Use init_sql_alloc to get basic out-of-memory error handling.

  sql/sql_yacc.yy@1.371.136.1, 2007-11-19 17:59:43+01:00, thek@adventure.(none) +118 -31
    Check for memory allocation failures where it matters.

ChangeSet@1.1810.3467.2, 2007-11-19 18:59:25+03:00, kaa@polly.(none) +13 -0
  Fix for bug #32221: bug25714, mytest, mysql_client_test complaints and
  crashes.
  
  MySQL distributions contain a number of programs that are used only by
  the MySQL test suite internally, i.e. they are not indended to be
  invoked directly by a user. As a result, such programs are not
  documented, do not have any built-in help or proper error reporting,
  which may confuse users.
  
  This patch fixes the problem with the following changes:
  - mytest, libmysqltest and all references to them were removed from the
  distribution since they are not used anymore
  - bug25714 now displays an error message when run with incorrect
  arguments or with the --help option
  - mysql_client_test now does not call abort() in case of errors,
  instead it does a clean exit() with a proper error status.

  VC++Files/copy_mysql_files.bat@1.3.2.1, 2007-11-19 18:59:20+03:00, kaa@polly.(none) +0 -5
    Removed references to libmysqltest.

  BitKeeper/deleted/.del-myTest-package.dsp@1.1.1.1, 2007-11-19 17:40:05+03:00, kaa@polly.(none) +0 -0
    Delete: VC++Files/libmysqltest/myTest-package.dsp

  BitKeeper/deleted/.del-myTest-package_ia64.dsp@1.1.1.1, 2007-11-19 17:40:06+03:00, kaa@polly.(none) +0 -0
    Delete: VC++Files/libmysqltest/myTest-package_ia64.dsp

  BitKeeper/deleted/.del-myTest.dsp~4a8c480769193952@1.8.1.1, 2007-11-19 17:40:06+03:00, kaa@polly.(none) +0 -0
    Delete: VC++Files/libmysqltest/myTest.dsp

  BitKeeper/deleted/.del-myTest.vcproj@1.1.2.1, 2007-11-19 17:40:06+03:00, kaa@polly.(none) +0 -0
    Delete: VC++Files/libmysqltest/myTest.vcproj

  BitKeeper/deleted/.del-myTest_ia64.dsp@1.2.1.1, 2007-11-19 17:40:06+03:00, kaa@polly.(none) +0 -0
    Delete: VC++Files/libmysqltest/myTest_ia64.dsp

  BitKeeper/deleted/.del-mytest.c~9a99338689e5de8@1.4.1.1, 2007-11-19 17:40:06+03:00, kaa@polly.(none) +0 -0
    Delete: VC++Files/libmysqltest/mytest.c

  BitKeeper/deleted/.del-mytest.dsw~2324698861155335@1.4.1.1, 2007-11-19 17:40:06+03:00, kaa@polly.(none) +0 -0
    Delete: VC++Files/libmysqltest/mytest.dsw

  BitKeeper/deleted/.del-mytest.c@1.4, 2007-11-19 17:37:30+03:00, kaa@polly.(none) +0 -0
    Delete: libmysql/mytest.c

  libmysql/CMakeLists.txt@1.1.9.1, 2007-11-19 18:59:20+03:00, kaa@polly.(none) +0 -3
    Removed rules for myTest.

  libmysql/Makefile.am@1.47.1.6, 2007-11-19 18:59:20+03:00, kaa@polly.(none) +1 -1
    Removed mytest.c from EXTRA_DIST.

  tests/bug25714.c@1.2.1.1, 2007-11-19 18:59:20+03:00, kaa@polly.(none) +5 -1
    Display a meaningful error message when run incorrectly or with the --help option.

  tests/mysql_client_test.c@1.167.37.2, 2007-11-19 18:59:20+03:00, kaa@polly.(none) +1 -1
    In case of error, don't cause abnormal program termination, do a clean exit() with an error status.

ChangeSet@1.1810.3493.1, 2007-11-19 14:38:08+01:00, df@pippilotta.erinye.com +43 -0
  Update readline to version 5.2. This fixes bug#18431.

  cmd-line-utils/readline/INSTALL@1.6, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +15 -1
    update readline to version 5.2

  cmd-line-utils/readline/README@1.6, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +16 -2
    update readline to version 5.2

  cmd-line-utils/readline/bind.c@1.15.1.2, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +201 -109
    update readline to version 5.2

  cmd-line-utils/readline/callback.c@1.9, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +118 -14
    update readline to version 5.2

  cmd-line-utils/readline/chardefs.h@1.7, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +2 -4
    update readline to version 5.2

  cmd-line-utils/readline/compat.c@1.3, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +3 -1
    update readline to version 5.2

  cmd-line-utils/readline/complete.c@1.16.1.2, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +82 -58
    update readline to version 5.2

  cmd-line-utils/readline/configure.in@1.6, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +90 -9
    update readline to version 5.2

  cmd-line-utils/readline/display.c@1.16.1.2, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +340 -188
    update readline to version 5.2

  cmd-line-utils/readline/funmap.c@1.10, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +4 -1
    update readline to version 5.2

  cmd-line-utils/readline/histexpand.c@1.14, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +29 -25
    update readline to version 5.2

  cmd-line-utils/readline/histfile.c@1.9.1.3, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +10 -6
    update readline to version 5.2

  cmd-line-utils/readline/history.c@1.9, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +95 -18
    update readline to version 5.2

  cmd-line-utils/readline/histsearch.c@1.9, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +3 -1
    update readline to version 5.2

  cmd-line-utils/readline/input.c@1.15, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +35 -10
    update readline to version 5.2

  cmd-line-utils/readline/isearch.c@1.12, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +447 -337
    update readline to version 5.2

  cmd-line-utils/readline/keymaps.c@1.8, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +3 -1
    update readline to version 5.2

  cmd-line-utils/readline/kill.c@1.11, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +22 -14
    update readline to version 5.2

  cmd-line-utils/readline/macro.c@1.10, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +18 -5
    update readline to version 5.2

  cmd-line-utils/readline/mbutil.c@1.9, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +34 -14
    update readline to version 5.2

  cmd-line-utils/readline/misc.c@1.7, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +203 -99
    update readline to version 5.2

  cmd-line-utils/readline/nls.c@1.9, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +4 -2
    update readline to version 5.2

  cmd-line-utils/readline/parens.c@1.8, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +3 -1
    update readline to version 5.2

  cmd-line-utils/readline/readline.c@1.12, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +299 -85
    update readline to version 5.2

  cmd-line-utils/readline/readline.h@1.9, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +41 -24
    update readline to version 5.2

  cmd-line-utils/readline/rlconf.h@1.5, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +4 -1
    update readline to version 5.2

  cmd-line-utils/readline/rldefs.h@1.7, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +6 -2
    update readline to version 5.2

  cmd-line-utils/readline/rlmbutil.h@1.5, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +36 -2
    update readline to version 5.2

  cmd-line-utils/readline/rlprivate.h@1.5, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +139 -2
    update readline to version 5.2

  cmd-line-utils/readline/rltty.c@1.11.1.1, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +79 -10
    update readline to version 5.2

  cmd-line-utils/readline/savestring.c@1.3, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +1 -2
    update readline to version 5.2

  cmd-line-utils/readline/search.c@1.11, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +208 -108
    update readline to version 5.2

  cmd-line-utils/readline/shell.c@1.10, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +25 -15
    update readline to version 5.2

  cmd-line-utils/readline/signals.c@1.8, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +71 -7
    update readline to version 5.2

  cmd-line-utils/readline/terminal.c@1.17, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +108 -33
    update readline to version 5.2

  cmd-line-utils/readline/text.c@1.9, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +240 -133
    update readline to version 5.2

  cmd-line-utils/readline/tilde.c@1.12, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +53 -9
    update readline to version 5.2

  cmd-line-utils/readline/tilde.h@1.6, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +3 -0
    update readline to version 5.2

  cmd-line-utils/readline/undo.c@1.10.1.3, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +80 -11
    update readline to version 5.2

  cmd-line-utils/readline/util.c@1.10, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +28 -6
    update readline to version 5.2

  cmd-line-utils/readline/vi_keymap.c@1.5, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +1 -1
    update readline to version 5.2

  cmd-line-utils/readline/vi_mode.c@1.15, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +403 -131
    update readline to version 5.2

  cmd-line-utils/readline/xmalloc.c@1.8.1.2, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +7 -4
    update readline to version 5.2

ChangeSet@1.1810.3455.5, 2007-11-19 15:27:44+03:00, kaa@polly.(none) +1 -0
  Changed the help text for --comments to make it clear which option
  disables the option explicitely.
  Changed the option location in code so that --help will show it in
  lexical option order.
  
  This is for bug #26215: mysql command line client should not strip
  comments from SQL statements

  client/mysql.cc@1.199.30.3, 2007-11-19 15:27:40+03:00, kaa@polly.(none) +4 -4
    Changed the help text for --comments to make it clear which option
    disables the option explicitely.
    Changed the option location in code so that --help will show it in
    lexical option order.

ChangeSet@1.2476.433.29, 2007-11-19 13:11:03+01:00, jonas@perch.ndb.mysql.com +1 -0
  remove debug printout

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.171, 2007-11-19 13:11:01+01:00, jonas@perch.ndb.mysql.com +0 -2
    remove debug printout

ChangeSet@1.2476.433.28, 2007-11-19 11:10:36+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#22696
    additional (not stricly necessary for this bug...)
    only send EXEC_SRCONF to node *in* SR

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.170, 2007-11-19 11:10:33+01:00, jonas@perch.ndb.mysql.com +4 -11
    ndb - bug#22696
      additional (not stricly necessary for this bug...)
      only send EXEC_SRCONF to node *in* SR

ChangeSet@1.2476.677.1, 2007-11-19 10:47:26+01:00, jonas@perch.ndb.mysql.com +5 -0
  ndb - bug#22696
    Fix handling of multiple redo phases
    - set correct state
    - handle 4 phases, by moving START_FRAGCONF to end of phase instead of beginning...

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.74, 2007-11-19 10:47:23+01:00, jonas@perch.ndb.mysql.com +7 -12
    remove unused state ACTIVE_REMOVE_AFTER
    remove unused variable nextLcp
    remove unused methods (BUILD_INDX)
    add counter of outstanding GSN_EXEC_FRAGREQ
    remove c_redo_complete_fragments cause it fits badly with functional multi-redo-phases

  storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp@1.31, 2007-11-19 10:47:23+01:00, jonas@perch.ndb.mysql.com +0 -4
    remove unused stuff

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.169, 2007-11-19 10:47:23+01:00, jonas@perch.ndb.mysql.com +47 -154
    1) set correct state before starting next non-empty REDO phase
    2) move GSN_START_FRAGCONF to execFRAGCONF instead of when sending GSN_EXEC_FRAGREQ
       or fragments with 4 redo-phases would never be complete...

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.20, 2007-11-19 10:47:23+01:00, jonas@perch.ndb.mysql.com +39 -2
    testcase

  storage/ndb/test/run-test/daily-basic-tests.txt@1.111, 2007-11-19 10:47:23+01:00, jonas@perch.ndb.mysql.com +3 -0
    testcase

ChangeSet@1.2476.667.16, 2007-11-19 12:42:25+04:00, gluh@mysql.com +1 -0
  Bug#32158 Crash in open_table_from_share, on mysql_unpack_partition errors
  added check for the result of mysql_unpack_partition()

  sql/table.cc@1.296.16.1, 2007-11-19 12:42:23+04:00, gluh@mysql.com +9 -3
    added check for the result of mysql_unpack_partition()

ChangeSet@1.1616.3124.1, 2007-11-19 11:03:03+04:00, holyfoot@mysql.com +3 -0
  Bug #30284 spatial key corruption.
  
  SPATIAL key is fine actually, but the chk_key() function
  mistakenly returns error. It tries to compare checksums
  of btree and SPATIAL keys while the checksum for the SPATIAL isn't
  calculated (always 0). Same thing with FULLTEXT keys is handled
  using full_text_keys counter, so fixed by counting both
  SPATIAL and FULLTEXT keys in that counter.

  mysql-test/r/gis.result@1.15.3.1, 2007-11-19 11:03:01+04:00, holyfoot@mysql.com +8 -0
    Bug #30284 spatial key corruption
    
    test result

  mysql-test/t/gis.test@1.17.2.1, 2007-11-19 11:03:01+04:00, holyfoot@mysql.com +11 -0
    Bug #30284 spatial key corruption.
    
    test case

  myisam/mi_check.c@1.105.10.1, 2007-11-19 11:03:01+04:00, holyfoot@mysql.com +1 -1
    Bug #30284 spatial key corruption
    
    full_text_keys counts both FULL_TEXT and SPATIAL keys

ChangeSet@1.2476.676.1, 2007-11-18 20:28:37+01:00, istruewing@stella.local +3 -0
  Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
              corrupts a MERGE table
  
  Post-pushbuild fix for a Valgrind warning.

  mysql-test/r/merge.result@1.67.1.3, 2007-11-18 20:28:35+01:00, istruewing@stella.local +0 -4
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed test result.

  mysql-test/t/merge.test@1.55.1.3, 2007-11-18 20:28:35+01:00, istruewing@stella.local +0 -2
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Removed unnecessary statements from test.

  sql/sql_trigger.cc@1.105.1.2, 2007-11-18 20:28:35+01:00, istruewing@stella.local +5 -2
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed usage of db and table_name for
    close_data_files_and_morph_locks().

ChangeSet@1.2476.670.3, 2007-11-18 17:33:12+04:00, holyfoot@mysql.com +1 -0
  test fixed

  mysql-test/r/windows.result@1.15, 2007-11-18 17:33:10+04:00, holyfoot@mysql.com +1 -0
    test fixed

ChangeSet@1.2476.670.2, 2007-11-18 00:32:06+04:00, holyfoot@mysql.com +3 -0
  Bug #32211 Test 'windows' and 'windows_shm' failed for embedded server
  
  failing 'INSTALL PLUGIN' statement doesn't work in embedded server
  as we disable library loading there.
  Fixed by enabling loading libraries (#define HAVE_DLOPEN), what also
  makes UDF working in the embedded server.

  include/mysql_embed.h@1.15, 2007-11-18 00:32:04+04:00, holyfoot@mysql.com +0 -1
    Bug #32211 Test 'windows' and 'windows_shm' failed for embedded server
    
    Let loading libraries in the embedded server

  libmysqld/CMakeLists.txt@1.18, 2007-11-18 00:32:04+04:00, holyfoot@mysql.com +1 -1
    Bug #32211 Test 'windows' and 'windows_shm' failed for embedded server
    
    let loading libraries in the embedded server

  mysql-test/t/windows.test@1.12, 2007-11-18 00:32:04+04:00, holyfoot@mysql.com +3 -0
    Bug #32211 Test 'windows' and 'windows_shm' failed for embedded server
    
    make sure proc_1() doesn't exists before we start

ChangeSet@1.1810.3492.1, 2007-11-18 00:02:55+04:00, gshchepa@gleb.loc +3 -0
  Fixed bug #32335.
  Comparison of a BIGINT NOT NULL column with a constant arithmetic
  expression that evaluates to NULL caused error 1048: "Column '...'
  cannot be null".
  
  Made convert_constant_item() check if the constant expression is NULL
  before attempting to store it in a field. Attempts to store NULL in a
  NOT NULL field caused query errors.

  mysql-test/r/select.result@1.121.1.40, 2007-11-18 00:01:31+04:00, gshchepa@gleb.loc +6 -0
    Added test case for bug #32335.

  mysql-test/t/select.test@1.102.1.35, 2007-11-18 00:01:30+04:00, gshchepa@gleb.loc +11 -0
    Added test case for bug #32335.

  sql/item_cmpfunc.cc@1.187.54.1, 2007-11-18 00:01:29+04:00, gshchepa@gleb.loc +2 -1
    Fixed bug #32335.
    1. Made convert_constant_item() check if the constant expression is NULL
       before attempting to store it in a field. Attempts to store NULL in
       a NOT NULL field caused query errors.
    
    2. Also minor bug has been fixed: the thd->count_cuted_fields value
       was not restored in case of successful conversion.

ChangeSet@1.2476.675.2, 2007-11-17 19:42:16+01:00, tnurnberg@mysql.com +2 -0
  Bug#24907: unpredictable (display) precission, if input precission increases
  
  post-merge fixes: some things work differently in 5.1

  mysql-test/r/type_newdecimal.result@1.63, 2007-11-17 19:42:14+01:00, tnurnberg@mysql.com +1 -1
    post-merge fix: 5.1 throws different warning here

  sql/sql_select.cc@1.541.43.2, 2007-11-17 19:42:14+01:00, tnurnberg@mysql.com +1 -1
    post-merge fix: signature has changed in 5.1

ChangeSet@1.1810.3490.1, 2007-11-17 19:05:31+01:00, tnurnberg@mysql.com +3 -0
  Bug#24907: unpredictable (display) precission, if input precission increases
  
  Server failed in assert() when we tried to create a DECIMAL() temp field
  with a scale of more than the allowed 30. Now we limit the scale to the
  allowed maximum. A truncation warning is thrown as necessary.

  mysql-test/r/type_newdecimal.result@1.36.1.15, 2007-11-17 19:05:29+01:00, tnurnberg@mysql.com +20 -0
    Show that out of range DECIMAL temp fields will no longer
    stop the server with an assert. 

  mysql-test/t/type_newdecimal.test@1.33.1.16, 2007-11-17 19:05:29+01:00, tnurnberg@mysql.com +20 -1
    Show that out of range DECIMAL temp fields will no longer
    stop the server with an assert. 

  sql/sql_select.cc@1.312.189.1, 2007-11-17 19:05:29+01:00, tnurnberg@mysql.com +36 -2
    When creating DECIMAL() temp field, ascertain we stay within allowed
    limits. If not, truncate and warn.

ChangeSet@1.1810.3489.2, 2007-11-17 17:11:05+04:00, holyfoot@mysql.com +1 -0
  merging

  mysql-test/r/gis.result@1.35.1.15, 2007-11-17 17:11:04+04:00, holyfoot@mysql.com +2 -64
    merging

ChangeSet@1.2476.656.11, 2007-11-17 11:20:50+04:00, ramil@mysql.com +3 -0
  Fix for bug #32260: User variables in query cause server crash
    
  Problem: there's no guarantee that the user variable item's result_field
  is assigned when we're adjusting its table read map.
    
  Fix: check the result_field before using it.

  mysql-test/r/user_var.result@1.49, 2007-11-17 11:20:48+04:00, ramil@mysql.com +11 -0
    Fix for bug #32260: User variables in query cause server crash
      - test result.

  mysql-test/t/user_var.test@1.45, 2007-11-17 11:20:48+04:00, ramil@mysql.com +21 -0
    Fix for bug #32260: User variables in query cause server crash
      - test case.

  sql/item_func.cc@1.409.19.1, 2007-11-17 11:20:48+04:00, ramil@mysql.com +2 -1
    Fix for bug #32260: User variables in query cause server crash
      - using the result_field ensure it is set.

ChangeSet@1.1810.3442.14, 2007-11-16 14:56:37-07:00, tsmith@ramayana.hindu.god +1 -0
  Eliminate 'unused variable' warnings when compiling non-debug build

  mysys/default.c@1.72.1.20, 2007-11-16 14:56:35-07:00, tsmith@ramayana.hindu.god +12 -3
    Eliminate 'unused variable' warnings when compiling non-debug build

ChangeSet@1.2476.651.15, 2007-11-16 18:05:30+01:00, istruewing@stella.local +2 -0
  Bug#32443 - trigger.test produces warnings files
  
  Wrong syntax for mysqltest commands was used in test file.
  
  Fixed test.

  mysql-test/r/trigger.result@1.74, 2007-11-16 18:05:28+01:00, istruewing@stella.local +0 -2
    Bug#32443 - trigger.test produces warnings files
    Fixed test result

  mysql-test/t/trigger.test@1.84, 2007-11-16 18:05:28+01:00, istruewing@stella.local +2 -2
    Bug#32443 - trigger.test produces warnings files
    Fixed test

ChangeSet@1.1810.3487.1, 2007-11-16 17:43:15+01:00, tnurnberg@mysql.com +3 -0
  Bug #32180: DATE_ADD treats datetime numeric argument as DATE instead of DATETIME
  
  This is a regression from 2007-05-18 when code to zero out the returned struct was
  added to number_to_datetime(); zero for time_type corresponds to MYSQL_TIMESTAMP_DATE.
  We now explicitly set the type we return (MYSQL_TIMESTAMP_DATETIME).

  mysql-test/r/func_time.result@1.47.1.38, 2007-11-16 17:43:13+01:00, tnurnberg@mysql.com +12 -0
    show that DATE_ADD() behaves the same for YYYYMMDDhhmmss given
    as string and as integer.

  mysql-test/t/func_time.test@1.41.1.31, 2007-11-16 17:43:14+01:00, tnurnberg@mysql.com +10 -0
    show that DATE_ADD() behaves the same for YYYYMMDDhhmmss given
    as string and as integer.

  sql-common/my_time.c@1.19.18.1, 2007-11-16 17:43:14+01:00, tnurnberg@mysql.com +8 -1
    explictly set return type in number_to_datetime()

ChangeSet@1.1810.3466.17, 2007-11-16 17:36:13+01:00, joerg@trift2. +1 -0
  In the "spec" file for RPM builds, handle the debug server tests different from the standard server.

  support-files/mysql.spec.sh@1.99.18.2, 2007-11-16 17:36:11+01:00, joerg@trift2. +5 -1
    Don't use the "test-bt" target to run the tests on the debug server,
    rather use "test-bt-debug".
    
    There are two reasons for this:
    1) Consistency with the "tar.gz" builds.
    2) The tool that evaluates the build logs needs unique "--comment=" options in the log,
       or else it will fail when it generates the test status summary.

ChangeSet@1.2476.513.30, 2007-11-16 17:09:51+01:00, guilhem@gbichot4.local +11 -0
  WL#3071 Maria checkpoint, WL#3072 Maria recovery
  instead of fprintf(stderr) when a task (with no user connected) gets
  an error, use my_printf_error(). Flags ME_JUST_WARNING and ME_JUST_INFO
  added to my_error()/my_printf_error(), which pass it to
  my_message_sql() which is modified to call the appropriate
  sql_print_*(). This way recovery can signal its start and end with
  [Note] and not [ERROR] (but failure with [ERROR]).
  Recovery's detailed progress (percents etc) still uses stderr as they
  have to stay on one single line.
  sql_print_error() changed to use my_progname_short (nicer display).
  mysql-test-run.pl --gdb/--ddd does not run mysqld, because
  a breakpoint in mysql_parse is too late to debug startup problems;
  instead, dev should set the breakpoints it wants and then "run" ("r").

  include/my_sys.h@1.219.1.2, 2007-11-16 17:09:47+01:00, guilhem@gbichot4.local +3 -0
    new flags to tell error_handler_hook that this is not an error
    but an information or warning

  mysql-test/mysql-test-run.pl@1.319, 2007-11-16 17:09:47+01:00, guilhem@gbichot4.local +2 -11
    when running with --gdb/--ddd to debug mysqld, breaking at mysql_parse
    is too late to debug startup problems; now, it does not run mysqld,
    does not set breakpoints, developer can set as early breakpoints
    as it wants and is responsible for typing "run" (or "r")

  mysys/my_init.c@1.59, 2007-11-16 17:09:47+01:00, guilhem@gbichot4.local +1 -0
    set my_progname_short

  mysys/my_static.c@1.26, 2007-11-16 17:09:47+01:00, guilhem@gbichot4.local +1 -1
    my_progname_short added

  sql/mysqld.cc@1.603.1.3, 2007-11-16 17:09:47+01:00, guilhem@gbichot4.local +29 -9
    * my_message_sql() can now receive info or warning, not only error;
    this allows mysys to tell the user (or the error log if no user)
    about an info or warning. Used from Maria.
    * plugins (or engines like Maria) may want to call my_error(), so
    set up the error handler hook (my_message_sql) before initializing
    plugins; otherwise they get my_message_no_curses which is less
    integrated into mysqld (is just fputs())
    * using my_progname_short instead of my_progname, in my_message_sql()
    (less space on screen)

  storage/maria/ma_checkpoint.c@1.30.1.3, 2007-11-16 17:09:47+01:00, guilhem@gbichot4.local +16 -18
    fprintf(stderr) -> ma_message_no_user()

  storage/maria/ma_checkpoint.h@1.10, 2007-11-16 17:09:47+01:00, guilhem@gbichot4.local +11 -0
    function for any Maria task, not connected to a user (example:
    checkpoint, recovery; soon could be deleted records purger)
    to report a message (calls my_printf_error() which, when inside ha_maria,
    leads to sql_print_*(), and when outside, leads to
    my_message_no_curses i.e. stderr).

  storage/maria/ma_recovery.c@1.47.1.6, 2007-11-16 17:09:47+01:00, guilhem@gbichot4.local +18 -16
    To tell that recovery starts and ends we use ma_message_no_user()
    (sql_print_*() in practice). Detailed progress info still uses
    stderr as sql_print() cannot put several messages on one line.
    071116 18:42:16 [Note] mysqld: Maria engine: starting recovery
    recovered pages: 0% 67% 100% (0.0 seconds); transactions to roll back: 1 0 (0.0
    seconds); tables to flush: 1 0 (0.0 seconds);
    071116 18:42:16 [Note] mysqld: Maria engine: recovery done

  storage/maria/maria_chk.c@1.24.1.1, 2007-11-16 17:09:47+01:00, guilhem@gbichot4.local +0 -2
    my_progname_short moved to mysys

  storage/maria/maria_read_log.c@1.26, 2007-11-16 17:09:49+01:00, guilhem@gbichot4.local +0 -2
    my_progname_short moved to mysys

  storage/myisam/myisamchk.c@1.128, 2007-11-16 17:09:49+01:00, guilhem@gbichot4.local +0 -2
    my_progname_short moved to mysys

ChangeSet@1.2476.672.1, 2007-11-16 15:55:22+01:00, mkindahl@dl145h.mysql.com +4 -0
  Bug#32435:
  DROP DATABASE statement writes changes to mysql.proc table under RBR
  
  When replicating a DROP DATABASE statement with a database holding
  stored procedures, the changes to the mysql.proc table was recorded
  in the binary log under row-based replication.
  
  With this patch, the thread uses statement-logging format for the
  duration of the DROP DATABASE statement. The logging format is
  (already) reset at the end of the statement, so no additional code
  for resetting the logging format is necessary.

  mysql-test/extra/binlog_tests/database.test@1.1, 2007-11-16 15:55:19+01:00, mkindahl@dl145h.mysql.com +15 -0
    New BitKeeper file ``mysql-test/extra/binlog_tests/database.test''

  mysql-test/extra/binlog_tests/database.test@1.0, 2007-11-16 15:55:19+01:00, mkindahl@dl145h.mysql.com +0 -0

  mysql-test/suite/binlog/r/binlog_database.result@1.1, 2007-11-16 15:55:19+01:00, mkindahl@dl145h.mysql.com +56 -0
    New BitKeeper file ``mysql-test/suite/binlog/r/binlog_database.result''

  mysql-test/suite/binlog/r/binlog_database.result@1.0, 2007-11-16 15:55:19+01:00, mkindahl@dl145h.mysql.com +0 -0

  mysql-test/suite/binlog/t/binlog_database.test@1.1, 2007-11-16 15:55:19+01:00, mkindahl@dl145h.mysql.com +12 -0
    New BitKeeper file ``mysql-test/suite/binlog/t/binlog_database.test''

  mysql-test/suite/binlog/t/binlog_database.test@1.0, 2007-11-16 15:55:19+01:00, mkindahl@dl145h.mysql.com +0 -0

  sql/sql_db.cc@1.164, 2007-11-16 15:55:19+01:00, mkindahl@dl145h.mysql.com +7 -0
    Clearing the row-based statement flag for the DROP DATABASE statement
    since it should always be replicated as a statement.

ChangeSet@1.2476.513.29, 2007-11-16 12:09:03+01:00, guilhem@gbichot4.local +1 -0
  WL#3071 Maria checkpoint
  background page flushing was using dfile even when it wanted to flush
  the index file.

  storage/maria/ma_checkpoint.c@1.30.1.2, 2007-11-16 12:09:01+01:00, guilhem@gbichot4.local +42 -42
    * filter_flush_data_file* functions are in fact for the index file too,
    renaming them.
    * flush of index file was using dfile (bad copy-paste)

ChangeSet@1.1810.3435.3, 2007-11-16 13:58:09+03:00, kaa@polly.(none) +3 -0
  Fix for bug #32241: memory corruption due to large index map in 'Range
  checked for each record'
  
  The problem was in incorrectly calculated length of the buffer used to
  store a hexadecimal representation of an index map in
  select_describe(). This could result in buffer overrun and stack
  corruption under some circumstances.
  
  Fixed by correcting the calculation.

  mysql-test/r/explain.result@1.17.1.4, 2007-11-16 13:58:06+03:00, kaa@polly.(none) +20 -0
    Added a test case for bug #32241.

  mysql-test/t/explain.test@1.10.1.3, 2007-11-16 13:58:06+03:00, kaa@polly.(none) +28 -0
    Added a test case for bug #32241.

  sql/sql_select.cc@1.312.184.2, 2007-11-16 13:58:06+03:00, kaa@polly.(none) +2 -1
    Corrected the buffer length calculation. Count one hex digit as 4 bits,
    not 8.

ChangeSet@1.1810.3485.1, 2007-11-16 14:46:36+04:00, gluh@mysql.com +3 -0
  Bug#30294 blackhole engine causes 100% with 2 alter table statements running
  Implement neccessary shared lock structure for table locks.
  This is the backport of bug26241 fix.

  sql/handler.cc@1.167.1.73, 2007-11-16 14:46:35+04:00, gluh@mysql.com +4 -0
    added BLACKHOLE_DB case

  sql/ha_blackhole.cc@1.21.6.1, 2007-11-16 14:46:35+04:00, gluh@mysql.com +112 -10
    Implement neccessary shared lock structure for table locks.

  sql/ha_blackhole.h@1.5.4.1, 2007-11-16 14:46:35+04:00, gluh@mysql.com +16 -2
    Declare shared structure for table locks

ChangeSet@1.2476.513.28, 2007-11-16 12:43:25+02:00, bell@desktop.sanja.is.com.ua +3 -0
  Flush status differentiation between error and skipping pinned pages.

  storage/maria/ma_checkpoint.c@1.30.1.1, 2007-11-16 12:43:21+02:00, bell@desktop.sanja.is.com.ua +10 -15
    React only on errors during the flush.

  storage/maria/ma_pagecache.c@1.52.1.4, 2007-11-16 12:43:21+02:00, bell@desktop.sanja.is.com.ua +41 -18
    Flush status differentiation between error and skipping pinned pages.

  storage/maria/ma_pagecache.h@1.27.1.1, 2007-11-16 12:43:21+02:00, bell@desktop.sanja.is.com.ua +14 -0
    Flush status differentiation between error and skipping pinned pages.

ChangeSet@1.1810.3483.1, 2007-11-16 10:43:59+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#32429 ssl_cipher setting in my.cnf not read by libmysqlclient

  sql-common/client.c@1.83.19.1, 2007-11-16 10:43:58+01:00, msvensson@pilot.mysql.com +5 -0
    Store ssl_cipher setting read from my.cnf into "option->ssl_cipher"

ChangeSet@1.2476.656.10, 2007-11-15 20:25:43+01:00, istruewing@stella.local +35 -0
  Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
              corrupts a MERGE table
  Bug 26867 - LOCK TABLES + REPAIR + merge table result in
              memory/cpu hogging
  Bug 26377 - Deadlock with MERGE and FLUSH TABLE
  Bug 25038 - Waiting TRUNCATE
  Bug 25700 - merge base tables get corrupted by
              optimize/analyze/repair table
  Bug 30275 - Merge tables: flush tables or unlock tables
              causes server to crash
  Bug 19627 - temporary merge table locking
  Bug 27660 - Falcon: merge table possible
  Bug 30273 - merge tables: Can't lock file (errno: 155)
  
  The problems were:
  
  Bug 26379 - Combination of FLUSH TABLE and REPAIR TABLE
                  corrupts a MERGE table
  
    1. A thread trying to lock a MERGE table performs busy waiting while
       REPAIR TABLE or a similar table administration task is ongoing on
       one or more of its MyISAM tables.
    
    2. A thread trying to lock a MERGE table performs busy waiting until all
       threads that did REPAIR TABLE or similar table administration tasks
       on one or more of its MyISAM tables in LOCK TABLES segments do UNLOCK
       TABLES. The difference against problem #1 is that the busy waiting
       takes place *after* the administration task. It is terminated by
       UNLOCK TABLES only.
    
    3. Two FLUSH TABLES within a LOCK TABLES segment can invalidate the
       lock. This does *not* require a MERGE table. The first FLUSH TABLES
       can be replaced by any statement that requires other threads to
       reopen the table. In 5.0 and 5.1 a single FLUSH TABLES can provoke
       the problem.
  
  Bug 26867 - LOCK TABLES + REPAIR + merge table result in
              memory/cpu hogging
  
    Trying DML on a MERGE table, which has a child locked and
    repaired by another thread, made an infinite loop in the server.
  
  Bug 26377 - Deadlock with MERGE and FLUSH TABLE
  
    Locking a MERGE table and its children in parent-child order
    and flushing the child deadlocked the server.
  
  Bug 25038 - Waiting TRUNCATE
  
    Truncating a MERGE child, while the MERGE table was in use,
    let the truncate fail instead of waiting for the table to
    become free.
  
  Bug 25700 - merge base tables get corrupted by
              optimize/analyze/repair table
  
    Repairing a child of an open MERGE table corrupted the child.
    It was necessary to FLUSH the child first.
  
  Bug 30275 - Merge tables: flush tables or unlock tables
              causes server to crash
  
    Flushing and optimizing locked MERGE children crashed the server.
  
  Bug 19627 - temporary merge table locking
  
    Use of a temporary MERGE table with non-temporary children
    could corrupt the children.
  
    Temporary tables are never locked. So we do now prohibit
    non-temporary chidlren of a temporary MERGE table.
  
  Bug 27660 - Falcon: merge table possible
  
    It was possible to create a MERGE table with non-MyISAM children.
  
  Bug 30273 - merge tables: Can't lock file (errno: 155)
  
    This was a Windows-only bug. Table administration statements
    sometimes failed with "Can't lock file (errno: 155)".
  
  These bugs are fixed by a new implementation of MERGE table open.
  
  When opening a MERGE table in open_tables() we do now add the
  child tables to the list of tables to be opened by open_tables()
  (the "query_list"). The children are not opened in the handler at
  this stage.
  
  After opening the parent, open_tables() opens each child from the
  now extended query_list. When the last child is opened, we remove
  the children from the query_list again and attach the children to
  the parent. This behaves similar to the old open. However it does
  not open the MyISAM tables directly, but grabs them from the already
  open children.
  
  When closing a MERGE table in close_thread_table() we detach the
  children only. Closing of the children is done implicitly because
  they are in thd->open_tables.
  
  For more detail see the comment at the top of ha_myisammrg.cc.
  
  Changed from open_ltable() to open_and_lock_tables() in all places
  that can be relevant for MERGE tables. The latter can handle tables
  added to the list on the fly. When open_ltable() was used in a loop
  over a list of tables, the list must be temporarily terminated
  after every table for open_and_lock_tables().
  table_list->required_type is set to FRMTYPE_TABLE to avoid open of
  special tables. Handling of derived tables is suppressed.
  These details are handled by the new function
  open_n_lock_single_table(), which has nearly the same signature as
  open_ltable() and can replace it in most cases.
  
  In reopen_tables() some of the tables open by a thread can be
  closed and reopened. When a MERGE child is affected, the parent
  must be closed and reopened too. Closing of the parent is forced
  before the first child is closed. Reopen happens in the order of
  thd->open_tables. MERGE parents do not attach their children
  automatically at open. This is done after all tables are reopened.
  So all children are open when attaching them.
  
  Special lock handling like mysql_lock_abort() or mysql_lock_remove()
  needs to be suppressed for MERGE children or forwarded to the parent.
  This depends on the situation. In loops over all open tables one
  suppresses child lock handling. When a single table is touched,
  forwarding is done.
  
  Behavioral changes:
  ===================
  
  This patch changes the behavior of temporary MERGE tables.
  Temporary MERGE must have temporary children.
  The old behavior was wrong. A temporary table is not locked. Hence
  even non-temporary children were not locked. See
  Bug 19627 - temporary merge table locking.
  
  You cannot change the union list of a non-temporary MERGE table
  when LOCK TABLES is in effect. The following does *not* work:
  CREATE TABLE m1 ... ENGINE=MRG_MYISAM ...;
  LOCK TABLES t1 WRITE, t2 WRITE, m1 WRITE;
  ALTER TABLE m1 ... UNION=(t1,t2) ...;
  However, you can do this with a temporary MERGE table.
  
  You cannot create a MERGE table with CREATE ... SELECT, neither
  as a temporary MERGE table, nor as a non-temporary MERGE table.
  CREATE TABLE m1 ... ENGINE=MRG_MYISAM ... SELECT ...;
  Gives error message: table is not BASE TABLE.

  include/my_base.h@1.86.13.1, 2007-11-15 20:25:40+01:00, istruewing@stella.local +7 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added HA_EXTRA_ATTACH_CHILDREN and HA_EXTRA_DETACH_CHILDREN.

  include/myisammrg.h@1.21, 2007-11-15 20:25:40+01:00, istruewing@stella.local +9 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added element 'children_attached' to MYRG_INFO.
    Added declarations for myrg_parent_open(),
    myrg_attach_children() and myrg_detach_children()
    for the new MERGE table open approach.

  mysql-test/extra/binlog_tests/blackhole.test@1.23, 2007-11-15 20:25:40+01:00, istruewing@stella.local +9 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Preliminarily added new error message with a comment.

  mysql-test/r/create.result@1.155.1.2, 2007-11-15 20:25:40+01:00, istruewing@stella.local +1 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed test result.

  mysql-test/r/delayed.result@1.17, 2007-11-15 20:25:40+01:00, istruewing@stella.local +0 -5
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Moved test result from here to merge.result.

  mysql-test/r/merge-big.result@1.1, 2007-11-15 20:25:41+01:00, istruewing@stella.local +77 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE corrupts a MERGE table
    New test result

  mysql-test/r/merge-big.result@1.0, 2007-11-15 20:25:41+01:00, istruewing@stella.local +0 -0

  mysql-test/r/merge.result@1.67.1.2, 2007-11-15 20:25:40+01:00, istruewing@stella.local +1080 -14
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed/added test result.

  mysql-test/r/myisam.result@1.117, 2007-11-15 20:25:40+01:00, istruewing@stella.local +0 -18
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Moved test result for bug 8306 from here to merge.result.

  mysql-test/suite/binlog/r/binlog_stm_blackhole.result@1.22, 2007-11-15 20:25:40+01:00, istruewing@stella.local +1 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed test result.

  mysql-test/t/create.test@1.105.1.1, 2007-11-15 20:25:40+01:00, istruewing@stella.local +1 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed error number.

  mysql-test/t/delayed.test@1.20.1.2, 2007-11-15 20:25:40+01:00, istruewing@stella.local +0 -8
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Moved test from here to merge.test.

  mysql-test/t/merge-big.test@1.1, 2007-11-15 20:25:41+01:00, istruewing@stella.local +150 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE corrupts a MERGE table
    New test case

  mysql-test/t/merge-big.test@1.0, 2007-11-15 20:25:41+01:00, istruewing@stella.local +0 -0

  mysql-test/t/merge.test@1.55.1.2, 2007-11-15 20:25:40+01:00, istruewing@stella.local +841 -6
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed test for new temporary MERGE table behavior.
    Exchanged error numbers by symbolic codes.
    Added tests. Included are tests for bugs
    8306 (moved from myisam.test), 26379, 19627, 25038, 25700, 26377,
    26867, 27660, 30275, and 30273.
    Fixed changes resulting from disabled CREATE...SELECT.
    Integrated tests moved from delayed.test and myisam.test to here.

  mysql-test/t/myisam.test@1.86.1.6, 2007-11-15 20:25:40+01:00, istruewing@stella.local +0 -26
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Moved test for bug 8306 from here to merge.test.

  mysys/thr_lock.c@1.60.1.2, 2007-11-15 20:25:40+01:00, istruewing@stella.local +23 -10
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added code to let the owner of a high priority lock (TL_WRITE_ONLY)
    to bypass its own lock.

  sql/ha_ndbcluster_binlog.cc@1.133.2.2, 2007-11-15 20:25:40+01:00, istruewing@stella.local +1 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added 'thd' argument to init_tmp_table_share().

  sql/handler.cc@1.315.20.2, 2007-11-15 20:25:40+01:00, istruewing@stella.local +6 -5
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added 'thd' argument to init_tmp_table_share().

  sql/mysql_priv.h@1.523.23.2, 2007-11-15 20:25:41+01:00, istruewing@stella.local +20 -4
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Removed declaration of check_merge_table_access(). It is now static
    in sql_parse.cc.
    Added declaration for fix_merge_after_open().
    Renamed open_and_lock_tables() to open_and_lock_tables_derived()
    with additional parameter 'derived'.
    Added inline functions simple_open_n_lock_tables() and
    open_and_lock_tables(), which call open_and_lock_tables_derived()
    and add the argument for 'derived'.
    Added new function open_n_lock_single_table(), which can be used
    as an replacement for open_ltable() in most situations. Internally
    it calls simple_open_n_lock_tables() so hat it is appropriate for
    MERGE tables.
    Added 'thd' argument to init_tmp_table_share().

  sql/slave.cc@1.315.5.2, 2007-11-15 20:25:41+01:00, istruewing@stella.local +6 -0
    ug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added comment.

  sql/sql_base.cc@1.421.21.2, 2007-11-15 20:25:41+01:00, istruewing@stella.local +984 -88
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    
    Defined new functions add_merge_table_list(),
    attach_merge_children(), detach_merge_children(), and
    fix_merge_after_open() for the new MERGE table open approach.
    
    Added calls of the new functions to
    close_handle_and_leave_table_as_lock(), close_thread_tables(),
    close_thread_table(), unlink_open_table(), reopen_name_locked_table(),
    reopen_table(), drop_locked_tables(), close_temporary_table(),
    and open_tables() respectively.
    
    Prevented special lock handling of merge children (like
    mysql_lock_remove, mysql_lock_merge or mysql_lock_abort)
    at many places. Some of these calls are forwarded to the
    parent table instead.
    
    Added code to set thd->some_tables_deleted for every thread that has
    a table open that we are flushing.
    Added code for MERGE tables to unlink_open_table().
    Added MERGE children to the list of unusable tables in open_table().
    Added MERGE table handling to reopen_table().
    Added lock handling and closing of a parent before the children
    in close_data_files_and_morph_locks().
    Added code for re-attaching children in reopen_tables().
    Added MYSQL_LOCK_NOTIFY_IF_NEED_REOPEN to the locking flags and
    error reporting after mysql_lock_tables() in reopen_tables().
    Added lock handling and closing of a parent before the children
    in close_old_data_files().
    Added lock handling and detaching in drop_locked_tables().
    Added code for removing the children list from the statement list
    to prepare for a repetition in open_tables().
    Added new function open_n_lock_single_table(), which can be used
    as an replacement for open_ltable() in most situations. Internally
    it calls simple_open_n_lock_tables() so hat it is appropriate for
    MERGE tables.
    Disabled use of open_ltable() for MERGE tables.
    Removed function simple_open_n_lock_tables(). It is now inline
    declared in mysql_priv.h.
    Renamed open_and_lock_tables() to open_and_lock_tables_derived()
    with additional parameter 'derived'. open_and_lock_tables() is now
    inline declared in mysql_priv.h.
    Added a check for end-of-list in two loops in lock_tables().
    Added 'thd' argument to init_tmp_table_share().

  sql/sql_insert.cc@1.299.4.2, 2007-11-15 20:25:41+01:00, istruewing@stella.local +12 -2
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Changed from open_ltable() to open_n_lock_single_table() in
    handle_delayed_insert().
    Reestablished LEX settings after lex initialization.
    Added 'thd' argument to init_tmp_table_share().

  sql/sql_parse.cc@1.683.24.6, 2007-11-15 20:25:41+01:00, istruewing@stella.local +53 -20
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Made check_merge_table_access() a static function.
    Disabled use of CREATE...SELECT for MERGE tables.

  sql/sql_partition.cc@1.118.1.1, 2007-11-15 20:25:41+01:00, istruewing@stella.local +1 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed comment typo.

  sql/sql_select.cc@1.541.41.1, 2007-11-15 20:25:41+01:00, istruewing@stella.local +1 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added 'thd' argument to init_tmp_table_share().

  sql/sql_table.cc@1.437.23.6, 2007-11-15 20:25:41+01:00, istruewing@stella.local +75 -5
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Optimized use of mysql_ha_flush() in mysql_rm_table_part2().
    Disabled the use of MERGE tables with prepare_for_restore() and
    prepare_for_repair().
    Changed from open_ltable() to open_n_lock_single_table() in
    mysql_alter_table() and mysql_checksum_table().
    Disabled change of child list under LOCK TABLES.
    Initialized table_list->table in mysql_recreate_table().

  sql/sql_trigger.cc@1.105.1.1, 2007-11-15 20:25:41+01:00, istruewing@stella.local +39 -5
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added code for allowing CREATE TRIGGER under LOCK TABLE, to be able
    to test it with MERGE tables.

  sql/table.cc@1.296.10.8, 2007-11-15 20:25:41+01:00, istruewing@stella.local +27 -2
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added 'thd' argument to init_tmp_table_share().
    Setting table_map_id from query_id in init_tmp_table_share().
    Added member function TABLE::is_children_attached().

  sql/table.h@1.175.10.2, 2007-11-15 20:25:41+01:00, istruewing@stella.local +33 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added access method get_table_def_version() to TABLE_SHARE.
    Added elements for MERGE tables to TABLE and TABLE_LIST.

  storage/myisam/ha_myisam.cc@1.175.44.2, 2007-11-15 20:25:41+01:00, istruewing@stella.local +4 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added an unrelated comment to the function comment of table2myisam().

  storage/myisam/ha_myisam.h@1.72.1.17, 2007-11-15 20:25:41+01:00, istruewing@stella.local +4 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added new member function MI_INFO::file_ptr().

  storage/myisammrg/ha_myisammrg.cc@1.123.2.1, 2007-11-15 20:25:41+01:00, istruewing@stella.local +580 -90
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added callback functions to support parent open and children attach
    of MERGE tables.
    Changed ha_myisammrg::open() to initialize storage engine structures
    and create a list of child tables only. Child tables are not opened.
    Added ha_myisammrg::attach_children(), which does now the main part
    of MERGE open.
    Added ha_myisammrg::detach_children().
    Added calls to ::attach_children() and ::detach_children() to
    ::extra() on HA_EXTRA_ATTACH_CHILDREN and HA_EXTRA_DETACH_CHILDREN
    respectively.
    Added a check for matching TEMPORARY type for children against
    parent.
    Added a check for table def version.
    Added support for thd->open_options to attach_children().
    Changed child path name generation for temporary tables so that
    it does nothing special for temporary tables.

  storage/myisammrg/ha_myisammrg.h@1.42.1.15, 2007-11-15 20:25:41+01:00, istruewing@stella.local +8 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added elements to class ha_myisammrg to support the new
    open approach.
    Changed empty destructor definition to a declaration.
    Implemented in ha_myisammrg.cc.
    Added declaration for methods attach_children() and
    detach_children().
    Added definition for method table_ptr() for use with
    callback functions.

  storage/myisammrg/myrg_close.c@1.11, 2007-11-15 20:25:41+01:00, istruewing@stella.local +31 -3
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added a check to avoid closing of MyISAM tables when the
    child tables are not attached.
    Added freeing of rec_per_key_part when the child tables
    are not attached.

  storage/myisammrg/myrg_extra.c@1.19, 2007-11-15 20:25:41+01:00, istruewing@stella.local +4 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Some ::extra() functions and ::reset() can be called when
    children are detached.

  storage/myisammrg/myrg_open.c@1.39, 2007-11-15 20:25:41+01:00, istruewing@stella.local +326 -8
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    
    Kept old myrg_open() for MERGE use independent from MySQL.
    Removed an always true condition in myrg_open().
    Set children_attached for independent MERGE use in myrg_open().
    
    Added myrg_parent_open(), myrg_attach_children(), and
    myrg_detach_children() for the new MERGE table open approach.

ChangeSet@1.2476.636.7, 2007-11-15 15:35:35+03:00, anozdrin@station. +3 -0
  A patch for BUG#19723: kill of active connection yields
  different error code depending on platform.
  
  On Mac OS X, KILL statement issued to kill the current
  connection would return a different error code and message than on
  other platforms ('MySQL server has gone away' instead of 'Shutdown
  in progress').
  
  The reason for this difference was that on Mac OS X we have macro
  SIGNAL_WITH_VIO_CLOSE defined. This macro forces KILL
  implementation to close the communication socket of the thread
  that is being killed. SIGNAL_WITH_VIO_CLOSE macro is defined on
  platforms where just sending a signal is not a reliable mechanism
  to interrupt the thread from sleeping on a blocking system call.
  In a nutshell, closing the socket is a hack to work around an
  operating system bug and awake the blocked thread no matter what.
  
  However, if the thread that is being killed is the same
  thread that issued KILL statement, closing the socket leads to a
  prematurely lost connection. At the same time it is not necessary
  to close the socket in this case, since the thread in question
  is not inside a blocking system call.
  
  The fix, therefore, is to not close the socket if the thread that
  is being killed is the same that issued KILL statement, even with
  defined SIGNAL_WITH_VIO_CLOSE.

  mysql-test/r/kill.result@1.21, 2007-11-15 15:35:32+03:00, anozdrin@station. +9 -0
    Update result file.

  mysql-test/t/kill.test@1.29, 2007-11-15 15:35:32+03:00, anozdrin@station. +16 -0
    Added a test case for BUG#19723: kill of active connection yields
    different error code depending on platform.

  sql/sql_class.cc@1.347.10.1, 2007-11-15 15:35:32+03:00, anozdrin@station. +14 -1
    Call close_active_vio() only if we're killing another thread.

ChangeSet@1.2476.667.7, 2007-11-15 14:12:59+02:00, gkodinov@magare.gmz +1 -0
  merge of bug 31928 to 5.1-opt

  mysql-test/r/type_date.result@1.28, 2007-11-15 14:12:58+02:00, gkodinov@magare.gmz +0 -1
    merge of bug 31928 to 5.1-opt

ChangeSet@1.2476.669.1, 2007-11-15 12:30:35+01:00, tnurnberg@mysql.com +2 -0
  Bug#31700: thd->examined_row_count not incremented for 'const' type queries
  
  tests adjusted for Windows

  mysql-test/r/log_tables.result@1.27.1.1, 2007-11-15 12:30:32+01:00, tnurnberg@mysql.com +12 -12
    Be more conservative in tests (for Windows)

  mysql-test/t/log_tables.test@1.25, 2007-11-15 12:30:32+01:00, tnurnberg@mysql.com +3 -3
    Be more conservative in tests (for Windows)

ChangeSet@1.2476.656.9, 2007-11-15 11:36:50+01:00, istruewing@stella.local +2 -0
  Bug#22351 - handler::index_next_same() call to key_cmp_if_same() uses
              the wrong buffer
  Post-pushbuild fix
  Added test case for better coverage.

  mysql-test/r/partition.result@1.74.1.1, 2007-11-15 11:36:49+01:00, istruewing@stella.local +7 -0
    Bug#22351 - handler::index_next_same() call to key_cmp_if_same() uses
                the wrong buffer
    Added test result

  mysql-test/t/partition.test@1.67.1.1, 2007-11-15 11:36:49+01:00, istruewing@stella.local +10 -0
    Bug#22351 - handler::index_next_same() call to key_cmp_if_same() uses
                the wrong buffer
    Added test case

ChangeSet@1.2476.667.5, 2007-11-15 11:58:42+04:00, gluh@mysql.com +3 -0
  updated result file

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.14, 2007-11-15 11:58:40+04:00, gluh@mysql.com +71 -59
    updated result file

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.14, 2007-11-15 11:58:40+04:00, gluh@mysql.com +71 -59
    updated result file

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.14, 2007-11-15 11:58:40+04:00, gluh@mysql.com +71 -59
    updated result file

ChangeSet@1.2476.636.5, 2007-11-14 16:12:46-05:00, dkatz@damien-katzs-computer.local +4 -0
  Bug#28785 thread-handling not displayed properly in SHOW VARIABLES

  mysql-test/r/no-threads.result@1.2, 2007-11-14 16:12:42-05:00, dkatz@damien-katzs-computer.local +3 -0
    Test that we are in the 'no-threads' thread_handling mode.

  mysql-test/t/no-threads.test@1.2, 2007-11-14 16:12:42-05:00, dkatz@damien-katzs-computer.local +1 -0
    Test that we are in the 'no-threads' thread_handling mode.

  sql/mysqld.cc@1.583.123.1, 2007-11-14 16:12:42-05:00, dkatz@damien-katzs-computer.local +3 -2
    Changes to make global_system_variables.thread_handling be zero based, instead of 1
    based.

  sql/scheduler.h@1.2, 2007-11-14 16:12:42-05:00, dkatz@damien-katzs-computer.local +1 -1
    Changed the enum to start at 0, to match the array elements in thread_handling_names
    in mysqld.cc

ChangeSet@1.2476.665.3, 2007-11-14 21:08:59+01:00, mkindahl@dl145h.mysql.com +1 -0
  Post-merge fixes.

  sql/sql_delete.cc@1.234, 2007-11-14 21:08:55+01:00, mkindahl@dl145h.mysql.com +1 -1
    Correcting merge error.

ChangeSet@1.2476.668.1, 2007-11-14 22:20:31+04:00, holyfoot@mysql.com +4 -0
  Bug #31890 Partitions: ORDER BY DESC in InnoDB not working.
  
  It's not InnoDB specific bug.
  Error is in QUEUE code, about the way we handle queue->max_at_top.
  It's either '0' or '-2' and we do '^' operation to get the proper
  direction. Though queue->compare() function can return '-2' as
  a result of comparison sometimes. So we'll get
  queue->compare() ^ queue->max_at_top == 0 (when max_at_top is -2)
  and _downheap() function code will go wrong way here:
  ...
      if (next_index < elements &&
          (queue->compare(queue->first_cmp_arg,
                          queue->root[next_index]+offset_to_key,
                          queue->root[next_index+1]+offset_to_key) ^
           queue->max_at_top) > 0)
        next_index++;
  ...
  
  Fixed by changing max_at_top to be either 1 or -1, doing
  '* max_at_top' to get proper direction.

  include/queues.h@1.16, 2007-11-14 22:20:28+04:00, holyfoot@mysql.com +3 -3
    Bug #31890 Partitions: ORDER BY DESC in InnoDB not working
    
    max_at_top policy changed

  mysql-test/r/partition.result@1.69.2.4, 2007-11-14 22:20:28+04:00, holyfoot@mysql.com +35 -0
    Bug #31890 Partitions: ORDER BY DESC in InnoDB not working
    
    test result

  mysql-test/t/partition.test@1.63.3.4, 2007-11-14 22:20:29+04:00, holyfoot@mysql.com +27 -0
    Bug #31890 Partitions: ORDER BY DESC in InnoDB not working
    
    test case

  mysys/queues.c@1.20.1.1, 2007-11-14 22:20:29+04:00, holyfoot@mysql.com +15 -21
    Bug #31890 Partitions: ORDER BY DESC in InnoDB not working.
    
    queue->max_at_top policy changed - now it can either be '1' or '-1'.
    We multiply comparison result on max_at_top to get the proper
    direction.

ChangeSet@1.2476.505.12, 2007-11-14 19:08:06+02:00, monty@mysql.com +60 -0
  First part of redo/undo for key pages
  Added key_nr to st_maria_keydef for faster keyinfo->keynr conversion
  For transactional tables, shift record number in keys up with 1 bit to have place to indicate if transid follows
  Checksum for MyISAM now ignores NULL and not used part of VARCHAR
  Renamed some variables that caused shadow compiler warnings
  Moved extra() call when waiting for tables to not be used to after tables are removed from cache.
  Fixed crashing bugs when using Maria TEMPORARY tables with TRUNCATE. Removed 'hack' code in sql directory to go around this bug.
  pagecache_unlock_by_ulink() now has extra argument to say if page was changed.
  Give error message if we fail to open control file
  Mark page cache variables as not flushable

  storage/maria/ma_key_redo.c@1.1, 2007-11-14 19:08:04+02:00, monty@mysql.com +417 -0
    New BitKeeper file ``storage/maria/ma_key_redo.c''

  storage/maria/ma_key_redo.c@1.0, 2007-11-14 19:08:04+02:00, monty@mysql.com +0 -0

  include/maria.h@1.19, 2007-11-14 19:05:52+02:00, monty@mysql.com +8 -5
    Made min page cache larger (needed for pinning key page)
    Added key_nr to st_maria_keydef for faster keyinfo->keynr conversion
    Added write_comp_flag to move some runtime code to maria_open()

  include/my_base.h@1.102, 2007-11-14 19:05:52+02:00, monty@mysql.com +2 -1
    Added new error message to be used when handler initialization failed

  include/my_global.h@1.153, 2007-11-14 19:05:52+02:00, monty@mysql.com +1 -1
    Renamed dummy to swap_dummy to avoid conflicts with local 'dummy' variables

  include/my_handler.h@1.18, 2007-11-14 19:05:52+02:00, monty@mysql.com +4 -4
    Added const to some parameters

  mysys/array.c@1.17, 2007-11-14 19:06:20+02:00, monty@mysql.com +35 -35
    More DBUG

  mysys/my_error.c@1.28, 2007-11-14 19:06:20+02:00, monty@mysql.com +2 -2
    Fixed indentation

  mysys/my_handler.c@1.32, 2007-11-14 19:06:20+02:00, monty@mysql.com +35 -13
    Added const to some parameters
    Added missing error messages

  sql/field.h@1.248.2.1, 2007-11-14 19:06:20+02:00, monty@mysql.com +3 -3
    Renamed variables to avoid variable shadowing

  sql/handler.h@1.258, 2007-11-14 19:06:20+02:00, monty@mysql.com +4 -2
    Renamed parameter to avoid variable name conflict

  sql/item.h@1.260.2.1, 2007-11-14 19:06:20+02:00, monty@mysql.com +6 -6
    Renamed variables to avoid variable shadowing

  sql/log_event_old.h@1.5.1.2, 2007-11-14 19:06:20+02:00, monty@mysql.com +6 -6
    Renamed variables to avoid variable shadowing

  sql/set_var.h@1.95, 2007-11-14 19:06:21+02:00, monty@mysql.com +2 -2
    Renamed variables to avoid variable shadowing

  sql/sql_delete.cc@1.226.1.3, 2007-11-14 19:06:21+02:00, monty@mysql.com +13 -16
    Removed maria hack for temporary tables
    Fixed indentation

  sql/sql_table.cc@1.445, 2007-11-14 19:06:21+02:00, monty@mysql.com +1 -1
    Moved extra() call when waiting for tables to not be used to after tables are removed from cache.
    This was needed to ensure we don't do a PREPARE_FOR_DROP or similar call while the table is still in use.

  sql/table.cc@1.303, 2007-11-14 19:06:21+02:00, monty@mysql.com +2 -7
    Copy page_checksum from share
    Removed Maria hack

  storage/maria/Makefile.am@1.21, 2007-11-14 19:06:21+02:00, monty@mysql.com +3 -2
    Added new files

  storage/maria/ha_maria.cc@1.54, 2007-11-14 19:06:21+02:00, monty@mysql.com +13 -13
    Renamed records -> record_count and info -> create_info to avoid variable name conflicts
    Mark page cache variables as not flushable

  storage/maria/lockman.c@1.17, 2007-11-14 19:08:03+02:00, monty@mysql.com +1 -1
    Removed end space

  storage/maria/lockman.c@1.16, 2007-11-14 19:06:21+02:00, monty@mysql.com +5 -5
    Renamed link to cur_link to avoid variable name conflict

  storage/maria/ma_blockrec.c@1.54, 2007-11-14 19:06:21+02:00, monty@mysql.com +68 -161
    Moved _ma_unpin_all_pages() to ma_key_recover.c
    Moved init of info->pinned_pages to ma_open.c
    Moved _ma_finalize_row() to maria_key_recover.h
    Renamed some variables to avoid variable name conflicts
    Mark page_link.changed for blocks we change directly
    Simplify handling of undo link when writing LOGREC_UNDO_ROW_INSERT (old code crashed when having redo for index)
    

  storage/maria/ma_blockrec.h@1.18, 2007-11-14 19:06:21+02:00, monty@mysql.com +0 -1
    Removed extra empty line

  storage/maria/ma_check.c@1.49, 2007-11-14 19:08:03+02:00, monty@mysql.com +12 -12
    Removed end space

  storage/maria/ma_check.c@1.48, 2007-11-14 19:06:21+02:00, monty@mysql.com +57 -25
    Changed arguments to _ma_rec_pos(), _ma_write_keypage(), _ma_new() and _ma_fetch_keypage()
    Added error reporting of key_root[] is wrong
    Added report_keypage_fault() for consistent reporting of key page errors

  storage/maria/ma_checkpoint.c@1.26.1.1, 2007-11-14 19:06:21+02:00, monty@mysql.com +0 -1
    Remove not needed trnman.h

  storage/maria/ma_close.c@1.20.1.1, 2007-11-14 19:06:21+02:00, monty@mysql.com +2 -1
    Free pinned pages (which are now always allocated)

  storage/maria/ma_control_file.c@1.20, 2007-11-14 19:06:21+02:00, monty@mysql.com +23 -6
    Give error message if we fail to open control file

  storage/maria/ma_create.c@1.34, 2007-11-14 19:08:03+02:00, monty@mysql.com +1 -1
    Removed end space

  storage/maria/ma_create.c@1.33, 2007-11-14 19:06:21+02:00, monty@mysql.com +10 -7
    Added marker if we should use ma_checksum()
    Use #ifdef EXTERNAL_LOCKING for the old external locking code we don't support anymore
    Renamed variables to avoid variable name conflicts
    Removed NO_EXCL flag for temporary tables as it caused TRUNCATE to fail

  storage/maria/ma_delete.c@1.17, 2007-11-14 19:06:46+02:00, monty@mysql.com +298 -95
    Changes for redo logging (first part, logging of underflow not yet done)
    - Log undo-key-delete
    - Log delete of key
    - Updated arguments to _ma_fetch_keypage(), _ma_dispose(), _ma_write_keypage(), _ma_insert()
    - Added new arguments to some functions to be able to write redo information
    - Mark key pages as changed when we write with PAGECACHE_LOCK_LEFT_WRITELOCKED
    
    Remove one not needed _ma_write_keypage() in d_search() when upper level will do the write anyway
    Changed 2 bmove_upp() to bmove() as this made code easer to understand
    More function comments
    Indentation fixes

  storage/maria/ma_ft_update.c@1.8, 2007-11-14 19:06:46+02:00, monty@mysql.com +6 -3
    New arguments to _ma_write_keypage()

  storage/maria/ma_key_recover.c@1.1, 2007-11-14 19:08:04+02:00, monty@mysql.com +599 -0
    New BitKeeper file ``storage/maria/ma_key_recover.c''

  storage/maria/ma_key_recover.c@1.0, 2007-11-14 19:08:04+02:00, monty@mysql.com +0 -0

  storage/maria/ma_key_recover.h@1.1, 2007-11-14 19:08:04+02:00, monty@mysql.com +64 -0
    New BitKeeper file ``storage/maria/ma_key_recover.h''

  storage/maria/ma_key_recover.h@1.0, 2007-11-14 19:08:04+02:00, monty@mysql.com +0 -0

  storage/maria/ma_locking.c@1.19, 2007-11-14 19:08:03+02:00, monty@mysql.com +1 -1
    Removed end space

  storage/maria/ma_locking.c@1.18, 2007-11-14 19:06:46+02:00, monty@mysql.com +20 -13
    Simplify flush page code
    Don't flush pages if temporary file
    Use #ifdef EXTERNAL_LOCKING for the old external locking code we don't support anymore

  storage/maria/ma_loghandler.c@1.69, 2007-11-14 19:06:46+02:00, monty@mysql.com +57 -41
    Fixed some DBUG_PRINT messages
    Simplify code
    Added new log entrys for key page redo
    Renamed some variables to avoid variable name shadowing

  storage/maria/ma_loghandler.h@1.30, 2007-11-14 19:06:46+02:00, monty@mysql.com +23 -0
    Moved some defines here
    Added define for storing key number on key pages
    Added new translog record types
    Added enum for type of operations in LOGREC_REDO_INDEX

  storage/maria/ma_open.c@1.35, 2007-11-14 19:06:46+02:00, monty@mysql.com +39 -10
    Always allocate info.pinned_pages (we need now also for normal key page usage)
    Update keyinfo->key_nr
    Added virtual functions to convert record position o number to be stored on key pages
    Update keyinfo->write_comp_flag to value of search flag to be used when writing key

  storage/maria/ma_packrec.c@1.15, 2007-11-14 19:08:03+02:00, monty@mysql.com +1 -1
    Removed end space

  storage/maria/ma_page.c@1.15, 2007-11-14 19:06:58+02:00, monty@mysql.com +199 -81
    Added redo for key pages
    - Extended _ma_fetch_keypage() with type of lock to put on page and address to used MARIA_PINNED_PAGE
    - _ma_fetch_keypage() now pin's pages if needed
    - Extended _ma_write_keypage() with type of locks to be used
    - ma_dispose() now locks info->s->state.key_del from other threads
    - ma_dispose() writes redo log record
    - ma_new() locks info->s->state.key_del from other threads if it was used
    - ma_new() now pins read page
    
    Other things:
    - Removed some not needed arguments from _ma_new() and _ma_dispose)
    - Added some new variables to simplify code
    - If EXTRA_DEBUG is used, do crc on full page to catch not unitialized bytes
    

  storage/maria/ma_pagecache.c@1.55, 2007-11-14 19:08:03+02:00, monty@mysql.com +2 -2
    Removed end space

  storage/maria/ma_pagecache.c@1.54, 2007-11-14 19:06:58+02:00, monty@mysql.com +137 -70
    Applied patch from Sanja to add extra argument to pagecache_unlock_by_ulink() to mark if page was changed
    Added PCBLOCK_DIRECT_W as marker if there is a direct write link to the page in use
    Give error if we are using a too small page cache
    Renamed some variables to avoid variable name shadowing
    Don't change LSN's in pagecache_unlock_By_unlink() for page if it was not changed

  storage/maria/ma_pagecache.h@1.26.1.1, 2007-11-14 19:06:58+02:00, monty@mysql.com +5 -2
    Applied patch from Sanja to add extra argument to pagecache_unlock_by_ulink() to mark if page was changed
    Added some defines for pagecache priority levels that one can use

  storage/maria/ma_panic.c@1.6, 2007-11-14 19:08:03+02:00, monty@mysql.com +1 -1
    Removed end space

  storage/maria/ma_range.c@1.12, 2007-11-14 19:06:58+02:00, monty@mysql.com +3 -1
    Added new arguments for call to _ma_fetch_keypage()

  storage/maria/ma_recovery.c@1.49, 2007-11-14 19:07:11+02:00, monty@mysql.com +313 -45
    - Added hooks for new translog types:
      REDO_INDEX, REDO_INDEX_NEW_PAGE, REDO_INDEX_FREE_PAGE, UNDO_KEY_INSERT, UNDO_KEY_DELETE and
      UNDO_KEY_DELETE_WITH_ROOT.
    - Moved variable declarations to start of function (portability fixes)
    - Removed some not needed initializations
    - Set only relevant state changes for each redo/undo entry

  storage/maria/ma_rt_index.c@1.11, 2007-11-14 19:08:03+02:00, monty@mysql.com +133 -92
    Added new arguments for call to _ma_fetch_keypage(), _ma_write_keypage(), _ma_dispose() and _ma_new()
    Fixed indentation

  storage/maria/ma_rt_key.c@1.8, 2007-11-14 19:08:03+02:00, monty@mysql.com +2 -1
    Added new arguments for call to _ma_fetch_keypage()

  storage/maria/ma_rt_split.c@1.9, 2007-11-14 19:08:03+02:00, monty@mysql.com +6 -3
    Added new arguments for call to _ma_new()
    Use new keypage header
    Added new arguments for call to _ma_write_keypage()

  storage/maria/ma_search.c@1.14, 2007-11-14 19:08:03+02:00, monty@mysql.com +119 -60
    Updated comments & indentation
    Added new arguments for call to _ma_fetch_keypage()
    Made some variables and arguments const
    Added virtual functions for converting row position to number to be stored in key
    use MARIA_RECORD_POS of record position instead of my_off_t
    Record in MARIA_KEY_PARAM how page was changed one key insert (needed for REDO)

  storage/maria/ma_sort.c@1.13, 2007-11-14 19:08:03+02:00, monty@mysql.com +2 -3
    Removed end space

  storage/maria/ma_statrec.c@1.10, 2007-11-14 19:08:03+02:00, monty@mysql.com +1 -1
    Updated arguments for call to _ma_rec_pos()

  storage/maria/ma_test1.c@1.29, 2007-11-14 19:08:03+02:00, monty@mysql.com +10 -4
    Fixed too small buffer to init_pagecache()
    Fixed bug when using insert_count and test_flag

  storage/maria/ma_test2.c@1.27, 2007-11-14 19:08:03+02:00, monty@mysql.com +2 -10
    Use more resonable pagecache size
    Remove not used code
    Reset blob_length to fix wrong output message

  storage/maria/ma_test_all.sh@1.13, 2007-11-14 19:08:03+02:00, monty@mysql.com +1 -1
    Fixed wrong test

  storage/maria/ma_write.c@1.21, 2007-11-14 19:08:03+02:00, monty@mysql.com +1245 -139
    Lots of new code to handle REDO of key pages
    No logic changes because of REDO code, mostly adding new arguments and adding new code for logging 
    
    Added new arguments for calls to _ma_fetch_keypage(), _ma_write_keypage() and similar functions
    Move setting of comp_flag in ma_ck_wrte_btree() from runtime to maria_open()
    Zerofill new used pages for:
    - To remove possible sensitive data left in buffer
    - To get idenitical data on pages after running redo
    - Better compression of pages if archived
    

  storage/maria/maria_chk.c@1.26, 2007-11-14 19:08:03+02:00, monty@mysql.com +3 -1
    Added information if table is crash safe

  storage/maria/maria_def.h@1.44, 2007-11-14 19:08:04+02:00, monty@mysql.com +75 -30
    New virtual function to convert between record position on key and normal record position
    Aded mutex and extra variables to handle locking of share->state.key_del
    Moved some structure variables to get things more aligned
    Added extra arguments to MARIA_KEY_PARAM to be able to remember what was changed on key page on key insert
    Added argument to MARIA_PINNED_PAGE to indicate if page was changed
    Updated prototypes for functions
    Added some structures for signaling changes in REDO handling

  storage/maria/unittest/ma_pagecache_single.c@1.12.1.1, 2007-11-14 19:08:04+02:00, monty@mysql.com +1 -1
    Updated arguments for changed function calls

  storage/myisam/mi_check.c@1.152, 2007-11-14 19:08:04+02:00, monty@mysql.com +12 -12
    Made calc_check_checksum virtual

  storage/myisam/mi_checksum.c@1.14, 2007-11-14 19:08:04+02:00, monty@mysql.com +17 -10
    Update checksums to ignore null columns

  storage/myisam/mi_create.c@1.68, 2007-11-14 19:08:04+02:00, monty@mysql.com +4 -0
    Mark if table has null column (to know when we have to use mi_checksum())

  storage/myisam/mi_open.c@1.111, 2007-11-14 19:08:04+02:00, monty@mysql.com +12 -5
    Added virtual function for calculating checksum to be able to easily ignore NULL fields

  storage/myisam/mi_test2.c@1.42, 2007-11-14 19:08:04+02:00, monty@mysql.com +2 -2
    Fixed bug

  storage/myisam/myisamdef.h@1.98, 2007-11-14 19:08:04+02:00, monty@mysql.com +3 -3
    Added virtual function for calculating checksum during check table
    Removed ha_key_cmp() as this is in handler.h

ChangeSet@1.2476.667.4, 2007-11-14 20:40:07+04:00, gluh@mysql.com +1 -0
  updated result file

  mysql-test/suite/ndb/r/ps_7ndb.result@1.62.1.3, 2007-11-14 20:40:05+04:00, gluh@mysql.com +1 -1
    updated result file

ChangeSet@1.1810.3466.14, 2007-11-14 18:56:14+04:00, gluh@mysql.com +1 -0
  after merge fix
  TAG: clone-5.0.52-build

  mysql-test/t/select.test@1.102.1.34, 2007-11-14 18:56:12+04:00, gluh@mysql.com +3 -0
    after merge fix

ChangeSet@1.2476.665.2, 2007-11-14 14:04:33+01:00, mkindahl@dl145h.mysql.com +1 -0
  Reverting changes to debug printouts to ha_ndbcluster.cc.

  sql/ha_ndbcluster.cc@1.461.10.3, 2007-11-14 14:04:28+01:00, mkindahl@dl145h.mysql.com +55 -55
    Reverting previous changes done to DBUG_ENTER strings.

ChangeSet@1.2476.433.25, 2007-11-14 13:28:45+01:00, jonas@perch.ndb.mysql.com +2 -0
  ndb -
    add new testtool that does connect/disconnect in loop

  storage/ndb/test/tools/Makefile.am@1.20, 2007-11-14 13:28:42+01:00, jonas@perch.ndb.mysql.com +2 -1
    add new test tool

  storage/ndb/test/tools/connect.cpp@1.1, 2007-11-14 13:28:42+01:00, jonas@perch.ndb.mysql.com +152 -0
    New BitKeeper file ``storage/ndb/test/tools/connect.cpp''

  storage/ndb/test/tools/connect.cpp@1.0, 2007-11-14 13:28:42+01:00, jonas@perch.ndb.mysql.com +0 -0

ChangeSet@1.2476.513.27, 2007-11-14 12:51:16+01:00, guilhem@gbichot4.local +8 -0
  WL#3072 - Maria recovery
  maria_read_log used to always print a warning message at startup
  to say it is unsafe if ALTER TABLE was used. Now it prints it only
  if the log does show the problem (=ALTER TABLE or CREATE SELECT, which
  both disable logging of REDO_INSERT*).
  For that, when ha_maria::external_lock() disables transactionality
  it writes a LOGREC_INCOMPLETE_LOG to the log, which "maria_read_log -a"
  picks up to write a warning.
  REPAIR TABLE also disables those REDO_INSERT* but as maria_read_log
  executes LOGREC_REDO_REPAIR no warning is needed.

  storage/maria/ha_maria.cc@1.51.1.6, 2007-11-14 12:51:13+01:00, guilhem@gbichot4.local +14 -14
    as we now log a record when disabling transactionility, we need the
    TRN to be set up first

  storage/maria/ma_blockrec.c@1.50.1.7, 2007-11-14 12:51:14+01:00, guilhem@gbichot4.local +3 -1
    comment

  storage/maria/ma_loghandler.c@1.67.1.3, 2007-11-14 12:51:14+01:00, guilhem@gbichot4.local +9 -2
    new type of log record

  storage/maria/ma_loghandler.h@1.27.1.1, 2007-11-14 12:51:14+01:00, guilhem@gbichot4.local +1 -0
    new type of log record

  storage/maria/ma_recovery.c@1.47.1.5, 2007-11-14 12:51:14+01:00, guilhem@gbichot4.local +107 -52
    * maria_apply_log() now returns a count of warnings. What currently
    produces warnings is:
    - skipping applying UNDOs though there are some (=> inconsistent table)
    - replaying log (in maria_read_log) though the log contains some
    ALTER TABLE or CREATE SELECT (log misses REDO_INSERT* for those
    and is so incomplete).
    Count of warnings affects the final message of maria_read_log and
    recovery (though in recovery none of the two conditions above should
    happen).
    * maria_read_log used to always print a warning message at startup
    to say it is unsafe if ALTER TABLE was used. Now it prints it only
    if the log does show the problem, i.e. ALTER TABLE or CREATE SELECT
    was used (both disable logging of REDO_INSERT* as those records are
    not needed for recovery; those missing records in turn make
    recreation-from-scratch, via maria_read_log, impossible). For that,
    when ha_maria::external_lock() disables transactionality,
    _ma_tmp_disable_logging_for_table() writes a LOGREC_INCOMPLETE_LOG to
    the log, which maria_apply_log() picks up to write a warning.

  storage/maria/ma_recovery.h@1.12, 2007-11-14 12:51:14+01:00, guilhem@gbichot4.local +1 -1
    maria_apply_log() returns a count of warnings

  storage/maria/maria_def.h@1.42.1.1, 2007-11-14 12:51:14+01:00, guilhem@gbichot4.local +2 -2
    _ma_tmp_disable_logging_for_table() grows so becomes a function

  storage/maria/maria_read_log.c@1.25, 2007-11-14 12:51:14+01:00, guilhem@gbichot4.local +11 -5
    maria_apply_log can now return a count of warnings, to temper the
    "SUCCESS" message printed in the end by maria_read_log.
    Advise users to make a backup first.

ChangeSet@1.1810.3481.1, 2007-11-14 12:02:20+01:00, istruewing@stella.local +3 -0
  Bug#4692 - DISABLE/ENABLE KEYS waste a space
  
  Post-pushbuild fix
  
  Added a purecov comment and a test for coverage of parallel
  enable keys.

  mysql-test/r/myisam.result@1.71.13.2, 2007-11-14 12:02:18+01:00, istruewing@stella.local +8 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added test result.

  mysql-test/t/myisam.test@1.55.12.2, 2007-11-14 12:02:18+01:00, istruewing@stella.local +6 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added test for coverage of parallel enable keys.

  myisam/mi_check.c@1.129.30.1, 2007-11-14 12:02:18+01:00, istruewing@stella.local +1 -1
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added purecov comment.

ChangeSet@1.2476.433.24, 2007-11-14 11:52:40+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - Add new dump 8011
    which dumps all subscribers

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@1.64, 2007-11-14 11:52:38+01:00, jonas@perch.ndb.mysql.com +48 -0
    Add new dump 8011
      which dumps all subscribers

ChangeSet@1.2476.664.3, 2007-11-14 13:48:21+04:00, gshchepa@gleb.loc +4 -0
  Fixed bug #32034: On 64bit platforms assigning values of
  storage engine system variables was not validated and
  unexpected value was assigned.
  
  The check_func_enum function used subtraction from the uint
  value with the probably negative result. That result of
  type uint was compared with 0 after casting to signed long
  type. On architectures where long type is longer than int
  type the result of comparison was unexpected.

  mysql-test/r/plugin.result@1.4, 2007-11-14 13:48:18+04:00, gshchepa@gleb.loc +10 -0
    Added test case for bug #32034.

  mysql-test/t/plugin.test@1.3, 2007-11-14 13:48:17+04:00, gshchepa@gleb.loc +15 -0
    Added test case for bug #32034.

  sql/sql_plugin.cc@1.75.2.1, 2007-11-14 13:48:16+04:00, gshchepa@gleb.loc +1 -1
    Fixed bug #32034.
    The check_func_enum function used subtraction from the uint
    value with the probably negative result. That result of
    type uint was compared with 0 after casting to signed long
    type. On architectures where long type is longer than int
    type the result of comparison was unexpected.
    
    uint value has been casted to long type before subtraction.

  storage/example/ha_example.cc@1.62, 2007-11-14 13:48:15+04:00, gshchepa@gleb.loc +29 -1
    Fixed bug #32034.
    Sample system variable example_enum_var has been added to the
    EXAMPLE storage to test ENUM variables.

ChangeSet@1.2476.433.23, 2007-11-14 10:46:34+01:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#32359
    Increase connection negotiation timeout
    Improve some weirdness

  storage/ndb/src/common/transporter/Transporter.cpp@1.30, 2007-11-14 10:46:32+01:00, jonas@perch.ndb.mysql.com +2 -2
    - Increase connection negotiation timeout
    - return false if trying to connect when already connected (should still be assert)

  storage/ndb/src/common/transporter/TransporterRegistry.cpp@1.78, 2007-11-14 10:46:32+01:00, jonas@perch.ndb.mysql.com +2 -1
    Use correct "is_connected" checks
      (although this is kind of bogus and should be cleaned-up)

ChangeSet@1.2476.513.26, 2007-11-13 18:49:00+01:00, guilhem@gbichot4.local +4 -0
  Addendum to WL#4137 "Maria- Framework for testing recovery in mysql-test-run":
  possibility, if requested in the test, to do byte-for-byte comparison
  of data files after recovery. This makes sense only when testing
  REDOs, as UNDO phase generates new log records thus data pages get
  new LSNs. First test of maria-recovery.test is changed to test only
  REDOs and do byte-for-byte comparison.

  mysql-test/include/maria_make_snapshot.inc@1.2, 2007-11-13 18:48:58+01:00, guilhem@gbichot4.local +8 -18
    possibility to compare physically the data files (makes sense
    only if testing REDO phase).

  mysql-test/include/maria_verify_recovery.inc@1.2, 2007-11-13 18:48:58+01:00, guilhem@gbichot4.local +13 -3
    allow physical comparison of data files after recovery if requested

  mysql-test/r/maria-recovery.result@1.2, 2007-11-13 18:48:58+01:00, guilhem@gbichot4.local +3 -4
    result update (first test tests REDO only now)

  mysql-test/t/maria-recovery.test@1.2, 2007-11-13 18:48:58+01:00, guilhem@gbichot4.local +12 -7
    first test tests REDO only now, and thus can do byte-for-byte
    comparison of data files.

ChangeSet@1.2476.580.53, 2007-11-13 19:32:12+02:00, gkodinov@magare.gmz +1 -0
  merge bug 31562 to 5.1 : changed SHOW CREATE VIEW format

  mysql-test/r/lowercase_view.result@1.14, 2007-11-13 19:32:11+02:00, gkodinov@magare.gmz +2 -2
    merge bug 31562 to 5.1 : changed SHOW CREATE VIEW format

ChangeSet@1.2476.513.25, 2007-11-13 17:12:29+01:00, guilhem@gbichot4.local +15 -0
  * WL#4137 Maria- Framework for testing recovery in mysql-test-run
  See test maria-recovery.test for a model; all include scripts have
  an "API" section at start if they do take parameters from outside.
  * Fixing bug reported by Jani and Monty (when two REDOs about the same
  page in one group, see ma_blockrec.c). 
  * Fixing small bugs in recovery

  mysql-test/include/maria_empty_logs.inc@1.1, 2007-11-13 17:12:27+01:00, guilhem@gbichot4.local +33 -0
    removes logs, to have a clean sheet for testing recovery.

  mysql-test/include/maria_empty_logs.inc@1.0, 2007-11-13 17:12:27+01:00, guilhem@gbichot4.local +0 -0

  mysql-test/include/maria_make_snapshot.inc@1.1, 2007-11-13 17:12:27+01:00, guilhem@gbichot4.local +58 -0
    copies a table to another directory, or back, or compares both
    (comparison is not implemented as physical comparison is impossible
    if an UNDO phase happened).

  mysql-test/include/maria_make_snapshot.inc@1.0, 2007-11-13 17:12:27+01:00, guilhem@gbichot4.local +0 -0

  mysql-test/include/maria_make_snapshot_for_comparison.inc@1.1, 2007-11-13 17:12:27+01:00, guilhem@gbichot4.local +30 -0
    copies tables to another directory so that they can later
    serve as a comparison reference (they are the good tables,
    recovery should produce similar ones).

  mysql-test/include/maria_make_snapshot_for_comparison.inc@1.0, 2007-11-13 17:12:27+01:00, guilhem@gbichot4.local +0 -0

  mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc@1.1, 2007-11-13 17:12:27+01:00, guilhem@gbichot4.local +35 -0
    When we want to force recovery to start on old tables, we prepare
    old tables with this script: we put them in a spare directory.
    They are later copied back over mysqltest tables while mysqld is dead.
    We also need to copy back the control file, otherwise mysqld,
    in recovery, would start from the latest checkpoint: latest
    checkpoint plus old tables is not a recovery-possible scenario of course.

  mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc@1.0, 2007-11-13 17:12:27+01:00, guilhem@gbichot4.local +0 -0

  mysql-test/include/maria_verify_recovery.inc@1.1, 2007-11-13 17:12:27+01:00, guilhem@gbichot4.local +87 -0
    causes mysqld to crash, restores old tables if requested,
    lets recovery run, compares resulting tables with reference tables
    by using CHECKSUM TABLE.
    We don't do any sanity checks on page's LSN in resulting tables, yet.

  mysql-test/include/maria_verify_recovery.inc@1.0, 2007-11-13 17:12:27+01:00, guilhem@gbichot4.local +0 -0

  mysql-test/include/wait_until_connected_again.inc@1.3, 2007-11-13 17:12:26+01:00, guilhem@gbichot4.local +4 -2
    be sure to enter the loop (the previous query by the caller may not have
    failed: it could be
    query;
    mysqladmin shutdown;
    call this script).

  mysql-test/lib/mtr_process.pl@1.78, 2007-11-13 17:12:26+01:00, guilhem@gbichot4.local +26 -8
    * Through the "expect" file a test can tell mtr that a server crash
    is expected. What the file contains is irrelevant. Now if its last
    line starts with "wait", mtr will wait before restarting (it will
    wait for the last line to not start with "wait"). This is for
    tests which need to mangle files under the feet of a dead mysqld.
    * Remove "expect" file before restarting; otherwise there could be a
    race condition: tests sees server restarted, does something, writes
    an "expect" file, and then mtr removes that file, then
    test kills mysqld, and then mtr will never restart it.

  mysql-test/r/maria-recovery.result@1.1, 2007-11-13 17:12:26+01:00, guilhem@gbichot4.local +168 -0
    result

  mysql-test/r/maria-recovery.result@1.0, 2007-11-13 17:12:26+01:00, guilhem@gbichot4.local +0 -0

  mysql-test/t/maria-recovery-master.opt@1.1, 2007-11-13 17:12:26+01:00, guilhem@gbichot4.local +2 -0
    crash is expected, core file would take room, stack trace would
    wake pushbuild up.

  mysql-test/t/maria-recovery-master.opt@1.0, 2007-11-13 17:12:26+01:00, guilhem@gbichot4.local +0 -0

  mysql-test/t/maria-recovery.test@1.1, 2007-11-13 17:12:26+01:00, guilhem@gbichot4.local +141 -0
    Test of recovery from mysql-test (it is already tested as unit tests
    in ma_test_recovery) (WL#4137)
    - test that, if recovery is made to start on an empty table it can
    replay the effects of committed and uncommitted statements (having only
    the committed ones in the end result). This should be the first test
    for someone writing code of new REDOs.
    - test that, if mysqld is crashed and recovery runs we have only
    committed statements in the end result. Crashes are done in different
    ways: flush nothing (so, uncommitted statement is often missing
    from the log => no rollback to do); flush pagecache (implicitely flushes
    log (WAL)) and flush log, both causes rollbacks; flush log can also
    flush state (state.records etc) to test recovery of the state
    (not tested well now as we repair the index anyway).
    - test of bug found by Jani and Monty in recovery (two REDO about
    the same page in one group).

  mysql-test/t/maria-recovery.test@1.0, 2007-11-13 17:12:26+01:00, guilhem@gbichot4.local +0 -0

  storage/maria/ma_blockrec.c@1.50.1.6, 2007-11-13 17:12:26+01:00, guilhem@gbichot4.local +55 -28
    - when applying a REDO in recovery, we don't anymore put UNDO's LSN on the page
    at once; indeed if in this REDO's group there comes another REDO
    for the same page it would be wrongly skipped. Instead, we keep
    pages pinned, don't change their LSN. When done with all REDOs
    of the group we unpin them and stamp them with UNDO's LSN.
    - fixing bug in applying of REDO_PURGE_BLOCKS in recovery: page_range
    sometimes has TAIL_BIT set, need to turn it down to know the real page
    range.
    - Both bugs are covered in maria-recovery.test

  storage/maria/ma_checkpoint.c@1.30, 2007-11-13 17:12:26+01:00, guilhem@gbichot4.local +63 -0
    Capability to, in debug builds only, do some special operations
    (flush all bitmap and data pages, flush state, flush log)
    and crash mysqld, to later test recovery.
     Driven by some --debug=d, symbols.

  storage/maria/ma_open.c@1.33.1.1, 2007-11-13 17:12:26+01:00, guilhem@gbichot4.local +2 -0
    debugging info

  storage/maria/ma_pagecache.c@1.52.1.3, 2007-11-13 17:12:26+01:00, guilhem@gbichot4.local +6 -1
    Now that we can _ma_unpin_all_pages() during the REDO phase
    to set page's LSN, the assertion needs to be relaxed.

  storage/maria/ma_recovery.c@1.47.1.4, 2007-11-13 17:12:26+01:00, guilhem@gbichot4.local +35 -4
    - open trace file in append mode (useful when a test triggers several
    recoveries, we see them all).
    - fixing wrong error detection, it's possible that during recovery
    we want to open an already open table.
    - when applying a REDO in recovery, we don't anymore put UNDO's LSN on the page
    at once; indeed if in this REDO's group there comes another REDO
    for the same page it would be wrongly skipped. Instead, we keep
    pages pinned, don't change their LSN. When done with all REDOs
    of the group we unpin them and stamp them with UNDO's LSN.
    - we verify that all log records of a group are about the same table,
    for debugging.

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.663.1, 2007-11-13 13:24:48+00:00, evgen@moonbone.local +17 -0
  Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDS
  command and reported to a client.
  
  The fact that a timestamp field will be set to NO on UPDATE wasn't shown 
  by the SHOW COMMAND and reported to a client through connectors. This led to
  problems in the ODBC connector and might lead to a user confusion.
  
  A new filed flag called ON_UPDATE_NOW_FLAG is added. 
  Constructors of the Field_timestamp set it when a field should be set to NOW
  on UPDATE.
  
  The get_schema_column_record function now reports whether a timestamp field
  will be set to NOW on UPDATE.

  client/mysql.cc@1.272.2.1, 2007-11-13 13:24:10+00:00, evgen@moonbone.local +1 -0
    Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDS
    command and reported to a client.
    The fieldflag2str function is adjusted to print the ON_UPDATE_NOW_FLAG.

  include/mysql_com.h@1.123.1.2, 2007-11-13 13:24:09+00:00, evgen@moonbone.local +1 -0
    Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDS
    command and reported to a client.
    A new filed flag called ON_UPDATE_NOW_FLAG  is added.

  mysql-test/r/grant.result@1.83.1.1, 2007-11-13 13:23:34+00:00, evgen@moonbone.local +1 -1
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/information_schema.result@1.151.4.1, 2007-11-13 13:22:58+00:00, evgen@moonbone.local +4 -2
    A test case adjusted after fixing the bug#30081.

  mysql-test/r/log_tables.result@1.26.1.1, 2007-11-13 13:22:57+00:00, evgen@moonbone.local +2 -2
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/metadata.result@1.19, 2007-11-13 13:22:56+00:00, evgen@moonbone.local +1 -1
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/ps_2myisam.result@1.62.2.1, 2007-11-13 13:22:41+00:00, evgen@moonbone.local +1 -1
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/ps_3innodb.result@1.65.2.1, 2007-11-13 13:22:40+00:00, evgen@moonbone.local +1 -1
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/ps_4heap.result@1.61.2.1, 2007-11-13 13:22:39+00:00, evgen@moonbone.local +1 -1
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/ps_5merge.result@1.62.2.1, 2007-11-13 13:22:38+00:00, evgen@moonbone.local +2 -2
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/show_check.result@1.133, 2007-11-13 13:22:37+00:00, evgen@moonbone.local +2 -2
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/type_ranges.result@1.48, 2007-11-13 13:22:36+00:00, evgen@moonbone.local +2 -2
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/type_timestamp.result@1.39, 2007-11-13 13:22:29+00:00, evgen@moonbone.local +4 -4
    Adjusted a test case after fixing bug#30081.

  mysql-test/t/information_schema.test@1.98.5.1, 2007-11-13 13:21:58+00:00, evgen@moonbone.local +2 -1
    A test case adjusted after fixing the bug#30081.

  sql/field.cc@1.416.4.1, 2007-11-13 13:24:07+00:00, evgen@moonbone.local +4 -0
    Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDS
    command and reported to a client.
    Constructors of the Field_timestamp set the ON_UPDATE_NOW_FLAG on a field when
    it should be set to NOW on UPDATE.

  sql/sql_show.cc@1.438.6.1, 2007-11-13 13:24:02+00:00, evgen@moonbone.local +6 -3
    Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDS
    command and reported to a client.
    The get_schema_column_record function now reports whether a timestamp field
    will be set to NOW on UPDATE.

  tests/mysql_client_test.c@1.255.2.1, 2007-11-13 13:23:36+00:00, evgen@moonbone.local +1 -1
    A test case adjusted after fixing the bug#30081.

ChangeSet@1.2476.656.5, 2007-11-13 11:12:53+01:00, istruewing@stella.local +3 -0
  Bug#32091: Security breach via directory changes
  
  Post pushbuild fix
  
  Disabled test on windows due to bug#30459
  (DATA/INDEX DIR for partitions not working on windows)
  
  Patch from Mattias Jonsson.

  mysql-test/r/partition_mgm.result@1.14, 2007-11-13 11:12:51+01:00, istruewing@stella.local +0 -10
    Bug#32091: Security breach via directory changes
    
    fixed non-windows lines.

  mysql-test/t/partition_mgm.test@1.13, 2007-11-13 11:12:51+01:00, istruewing@stella.local +10 -9
    Bug#32091: Security breach via directory changes
    
    fixed non-windows lines.

  mysql-test/t/partition_symlink.test@1.2, 2007-11-13 11:12:51+01:00, istruewing@stella.local +2 -0
    Bug#32091: Security breach via directory changes
    
    Added no_windows, since it is affected of bug#30459

ChangeSet@1.1810.3479.1, 2007-11-13 11:39:52+02:00, gkodinov@magare.gmz +5 -0
  Bug #31562: HAVING and lower case
  
  The columns in HAVING can reference the GROUP BY and 
  SELECT columns. There can be "table" prefixes when
  referencing these columns. And these "table" prefixes
  in HAVING use the table alias if available.
  This means that table aliases are subject to the same
  storage rules as table names and are dependent on 
  lower_case_table_names in the same way as the table 
  names are.
  Fixed by :
  1. Treating table aliases as table names
  and make them lowercase when printing out the SQL
  statement for view persistence.
  2. Using case insensitive comparison for table 
  aliases when requested by lower_case_table_names

  mysql-test/r/lowercase_view.result@1.11.1.1, 2007-11-13 11:39:51+02:00, gkodinov@magare.gmz +19 -2
    Bug #31562: test case

  mysql-test/t/lowercase_view.test@1.8, 2007-11-13 11:39:51+02:00, gkodinov@magare.gmz +23 -0
    Bug #31562: test case

  sql/item.cc@1.113.102.1, 2007-11-13 11:39:51+02:00, gkodinov@magare.gmz +1 -1
    Bug #31562: lower_case_table_name contious comparison
    when searching in GROUP BY

  sql/sql_base.cc@1.235.79.36, 2007-11-13 11:39:51+02:00, gkodinov@magare.gmz +2 -1
    Bug #31562: lower_case_table_name contious comparison
    when searching in SELECT

  sql/sql_select.cc@1.312.188.1, 2007-11-13 11:39:51+02:00, gkodinov@magare.gmz +14 -1
    Bug #31562: treat table aliases as table names
    and make them lowercase when printing

ChangeSet@1.2476.658.2, 2007-11-13 10:25:22+01:00, istruewing@stella.local +1 -0
  Bug#32078 - Excessive warnings: One can only use the --user switch
              if running as root
  
  Every start of a server in the test suite raised that warning.
  
  The cause was an unconditionla add of the --user option to the
  server command line. Only the "root" user (effective user id == 0)
  must use that option.
  
  Added check for effective user id == 0 before adding --user.
  
  Thanks to Magnus Svensson for the patch.

  mysql-test/mysql-test-run.pl@1.313.9.3, 2007-11-13 10:25:20+01:00, istruewing@stella.local +3 -1
    Bug#32078 - Excessive warnings: One can only use the --user switch
                if running as root
    Added check for effective user id == 0 before adding --user
    in mysqld_arguments().

ChangeSet@1.2476.662.1, 2007-11-13 13:09:59+04:00, holyfoot@mysql.com +4 -0
  Bug #31868 mysql_server_init crash when language path is not correctly set.
  
  When mysql_server_init() interrupts on some error (wrong errmsg file
  for example) in the middle of it's execution, it doesn't call
  execute_ddl_log_recovery() so LOCK_gdl mutex isn't init-ed.
  In this case we shouldn't execute release_ddl_log during cleanup
  as it uses that mutex inside.

  BitKeeper/etc/ignore@1.235.35.1, 2007-11-13 13:09:56+04:00, holyfoot@mysql.com +4 -0
    Added libmysqld/scheduler.cc libmysqld/sql_connect.cc libmysqld/sql_tablespace.cc libmysql_r/client_settings.h to the ignore list

  libmysqld/lib_sql.cc@1.140.2.1, 2007-11-13 13:09:56+04:00, holyfoot@mysql.com +0 -1
    Bug #31868 mysql_server_init crash when language path is not correctly set.
    
    line moved to clean_up()

  sql/mysqld.cc@1.583.118.4, 2007-11-13 13:09:56+04:00, holyfoot@mysql.com +2 -1
    Bug #31868 mysql_server_init crash when language path is not correctly set.
    
    release_ddl_log() now can be called from common 'clean_up()'

  sql/sql_table.cc@1.437.26.1, 2007-11-13 13:09:56+04:00, holyfoot@mysql.com +10 -3
    Bug #31868 mysql_server_init crash when language path is not correctly set.
    
    do_release flag added to the global_ddl_log and the construcntor to
    set it's initial value.
    Also now release_ddl_log() checks for that flag.

ChangeSet@1.1810.3478.3, 2007-11-13 09:43:29+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Elimination of warning for unused function code_name() in non-debug mode.

  sql/log_event.cc@1.174.27.6, 2007-11-13 09:43:25+01:00, mats@kindahl-laptop.dnsalias.net +2 -0
    Elimination of warning for unused function code_name() in non-debug mode.

ChangeSet@1.2476.661.1, 2007-11-13 12:10:22+04:00, holyfoot@mysql.com +2 -0
  Bug #31960 All embedded test crash
  
  Crash happens as a result of NO_EMBEDDED_ACCESS_CHECKS option
  (which is default for embedded server).
  check_table_access failed on using unintialized structure.
  Better solutions here is to disable that code completely in this case.
  Though the crash happens only in 6.0 i belive it's good to do it in 5.1

  sql/mysql_priv.h@1.523.21.6, 2007-11-13 12:10:19+04:00, holyfoot@mysql.com +36 -0
    Bug #31960 All embedded test crash.
    
    Access check functions from sql_parse.cc defined as FALSE if
    NO_EMBEDDED_ACCESS_CHECKS

  sql/sql_parse.cc@1.683.28.1, 2007-11-13 12:10:20+04:00, holyfoot@mysql.com +2 -18
    Bug #31960 All embedded test crash.
    
    Implementation of access checkings functions #ifdefed out for
    NO_EMBEDDED_ACCESS_CHECKS

ChangeSet@1.1810.3478.2, 2007-11-13 09:01:42+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Fixes to eliminate warnings.

  sql/log_event.cc@1.174.27.5, 2007-11-13 09:01:39+01:00, mats@kindahl-laptop.dnsalias.net +6 -4
    Fixes to eliminate warnings.

ChangeSet@1.1616.3121.1, 2007-11-13 10:51:47+04:00, holyfoot@mysql.com +5 -0
  Bug #31158  Spatial, Union, LONGBLOB vs BLOB bug (crops data)
  
  max_length parameter for BLOB-returning functions must be big enough
  for any possible content. Otherwise the field created for a table
  will be too small.

  mysql-test/r/gis.result@1.15.1.12, 2007-11-13 10:51:47+04:00, holyfoot@mysql.com +25 -1
    Bug #31158  Spatial, Union, LONGBLOB vs BLOB bug (crops data)
    
    test result

  mysql-test/t/gis.test@1.17.1.8, 2007-11-13 10:51:47+04:00, holyfoot@mysql.com +31 -0
    Bug #31158  Spatial, Union, LONGBLOB vs BLOB bug (crops data)
    
    test case

  sql/field.cc@1.197.1.41, 2007-11-13 10:51:47+04:00, holyfoot@mysql.com +1 -1
    Bug #31158  Spatial, Union, LONGBLOB vs BLOB bug (crops data)
    
    max_field_size used instead of numeric value

  sql/field.h@1.120.1.19, 2007-11-13 10:51:47+04:00, holyfoot@mysql.com +1 -0
    Bug #31158  Spatial, Union, LONGBLOB vs BLOB bug (crops data)
    
    max_field_size constant defined

  sql/item_geofunc.cc@1.18.1.8, 2007-11-13 10:51:47+04:00, holyfoot@mysql.com +1 -1
    Bug #31158  Spatial, Union, LONGBLOB vs BLOB bug (crops data)
    
    max_length parameter fixed

ChangeSet@1.2476.580.50, 2007-11-13 09:41:59+04:00, holyfoot@mysql.com +2 -0
  test fixed

  mysql-test/r/partition_innodb.result@1.9, 2007-11-13 09:41:57+04:00, holyfoot@mysql.com +4 -3
    result fixed

  mysql-test/t/partition_innodb.test@1.8, 2007-11-13 09:41:57+04:00, holyfoot@mysql.com +3 -2
    number of subpartitions fixed

ChangeSet@1.1810.3478.1, 2007-11-12 22:02:12+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  BUG#31793 (log event corruption causes crash):
  
  Corrections to get_str_len_and_pointer().

  sql/log_event.cc@1.174.27.4, 2007-11-12 22:02:05+01:00, mats@kindahl-laptop.dnsalias.net +37 -10
    Adding missing return at end of get_str_len_and_pointer()
    and correcting computation of missing bytes.

ChangeSet@1.1616.3120.3, 2007-11-12 21:52:30+04:00, svoj@mysql.com +2 -0
  symlink.test, symlink.result:
    Use proper variable for test.

  mysql-test/r/symlink.result@1.11.1.17, 2007-11-12 21:51:47+04:00, svoj@mysql.com +3 -3
    Use proper variable for test.

  mysql-test/t/symlink.test@1.11.1.10, 2007-11-12 21:51:28+04:00, svoj@mysql.com +4 -4
    Use proper variable for test.

ChangeSet@1.2476.659.1, 2007-11-12 21:11:31+04:00, holyfoot@mysql.com +3 -0
  Bug #32067 Partitions: crash with timestamp column.
  
  Partition handler fails updating tables with partitioning
  based on timestamp field, as it calculates the timestamp field
  AFTER it calculates the number of partition of a record.
  
  Fixed by adding timestamp_field->set_time() call and disabling
  such consequent calls

  mysql-test/r/partition.result@1.69.4.1, 2007-11-12 21:11:27+04:00, holyfoot@mysql.com +5 -0
    Bug #32067 Partitions: crash with timestamp column.
    
    test result

  mysql-test/t/partition.test@1.63.4.1, 2007-11-12 21:11:27+04:00, holyfoot@mysql.com +21 -0
    Bug #32067 Partitions: crash with timestamp column.
    
    test case

  sql/ha_partition.cc@1.104.3.1, 2007-11-12 21:11:27+04:00, holyfoot@mysql.com +22 -6
    Bug #32067 Partitions: crash with timestamp column.
    
    do timestamp_field->set_time() in the ha_partition::update_row()

ChangeSet@1.2476.636.3, 2007-11-12 17:26:32+03:00, anozdrin@station. +1 -0
  A patch for BUG#32172: information_schema test fails with
  wait_condition timeout.
  
  The problem was that the event thread didn't manage to execute
  the event in 30 seconds on highly-loaded box. The fix is to
  increase timeout.
  
  This is a fix for the test suite.

  mysql-test/t/information_schema.test@1.98.4.1, 2007-11-12 17:26:29+03:00, anozdrin@station. +1 -0
    Provide more time to execute an event.

ChangeSet@1.2476.623.3, 2007-11-12 14:51:14+01:00, mattiasj@mattiasj-laptop.(none) +3 -0
  Bug#31705 Partitions: crash if varchar length > 65530
  
  Buffer overflow due to wrong key length in partitioning
  
  Changed to the correct key_length function.

  mysql-test/r/partition_datatype.result@1.1, 2007-11-12 14:51:12+01:00, mattiasj@mattiasj-laptop.(none) +282 -0
    Bug#31705 Partitions: crash if varchar length > 65530
    New test-result case for testing all column types
    used in key-partitioning.
    
    (For verifying correct key-length use)

  mysql-test/r/partition_datatype.result@1.0, 2007-11-12 14:51:12+01:00, mattiasj@mattiasj-laptop.(none) +0 -0

  mysql-test/t/partition_datatype.test@1.1, 2007-11-12 14:51:12+01:00, mattiasj@mattiasj-laptop.(none) +213 -0
    Bug#31705 Partitions: crash if varchar length > 65530 
    New test case for testing all column types
    used in key-partitioning.
    
    (For verifying correct key-length used)
    

  mysql-test/t/partition_datatype.test@1.0, 2007-11-12 14:51:12+01:00, mattiasj@mattiasj-laptop.(none) +0 -0

  sql/opt_range.cc@1.274.6.1, 2007-11-12 14:51:12+01:00, mattiasj@mattiasj-laptop.(none) +4 -6
    Bug#31705 Partitions: crash if varchar length > 65530
    Problem: buffer overflow due to wrong key-length
    
    Fix: Using correct key_length function

ChangeSet@1.2476.645.4, 2007-11-12 13:23:45+01:00, mattiasj@mattiasj-laptop.(none) +4 -0
  Bug#32091: Security breach via directory changes
  
  Merge fix
  
  partition_mgm did not require have_symlink.
  
  Moved the test case to partition_symlink, which
  require have_symlink, and should work on both *nix and
  Windows

  mysql-test/r/partition_mgm.result@1.13, 2007-11-12 13:23:43+01:00, mattiasj@mattiasj-laptop.(none) +0 -82
    Bug#32091: Security breach via directory changes
    
    Moved the test case to partition_symlink.

  mysql-test/r/partition_symlink.result@1.1, 2007-11-12 13:23:43+01:00, mattiasj@mattiasj-laptop.(none) +83 -0
    Bug#32091: Security breach via directory changes
    
    Moved the test case to partition_symlink. It requires
    have_symlink.

  mysql-test/r/partition_symlink.result@1.0, 2007-11-12 13:23:43+01:00, mattiasj@mattiasj-laptop.(none) +0 -0

  mysql-test/t/partition_mgm.test@1.12, 2007-11-12 13:23:43+01:00, mattiasj@mattiasj-laptop.(none) +2 -112
    Bug#32091: Security breach via directory changes
    
    Moved the test case to partition_symlink.

  mysql-test/t/partition_symlink.test@1.1, 2007-11-12 13:23:43+01:00, mattiasj@mattiasj-laptop.(none) +119 -0
    Bug#32091: Security breach via directory changes
    
    Moved the test case to partition_symlink. It requires
    have_symlink.

  mysql-test/t/partition_symlink.test@1.0, 2007-11-12 13:23:43+01:00, mattiasj@mattiasj-laptop.(none) +0 -0

ChangeSet@1.2476.657.1, 2007-11-12 13:07:54+01:00, istruewing@stella.local +1 -0
  Bug#31210 - INSERT DELAYED crashes server when used on
                  partitioned table
      
  Post-pushbuild fix
      
  Pushbuild detected yet another need for lex initialization in
  embedded server.

  libmysqld/lib_sql.cc@1.140.1.2, 2007-11-12 13:07:52+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                        partitioned table
    Initialized lex for later use in open_table().

ChangeSet@1.1616.3098.2, 2007-11-12 12:52:03+01:00, kent@mysql.com +2 -0
  bigint.test, bigint.result:
    Test case for Bug#30069

  mysql-test/r/bigint.result@1.23.1.3, 2007-11-12 12:51:40+01:00, kent@mysql.com +6 -0
    Test case for Bug#30069

  mysql-test/t/bigint.test@1.22.1.3, 2007-11-12 12:51:40+01:00, kent@mysql.com +9 -0
    Test case for Bug#30069

ChangeSet@1.2476.636.2, 2007-11-12 14:44:17+03:00, anozdrin@station. +1 -0
  Fix for a BUG#31898: 16M memory allocations for user variables
  in stored procedure.
  
  The problem was that MySQL used unnecessarily large amounts of
  memory if user variables were used as an argument to CONCAT or
  CONCAT_WS -- 16M per each user variable used.
  
  Technically, it happened because MySQL used the following
  allocation strategy for string functions to avoid multiple
  realloc() calls: in the virtual operation fix_length_and_dec()
  the attribute max_length was calculated as a sum of max_length
  values for each argument.
  
  Although this approach worked well for small (or fixed) data types,
  there could be a problem if there as a user variable among
  the arguments of a string function -- max_length of the function
  would be 16M (as the max_length of a user variable is 16M).
  
  Both CONCAT() and CONCAT_WS() functions suffer from this problem.
  
  The fix is to do not use meta-data for allocating memory.
  The following strategy is proposed instead: allocate the exact
  length of the result string at the first record, double the amount
  of memory allocated when it is required.
  
  No test case for this bug because there is no way to test memory
  consumption in a robust way with our test suite.

  sql/item_strfunc.cc@1.329.1.2, 2007-11-12 14:44:15+03:00, anozdrin@station. +55 -5
    Implement memory-wise allocation strategy.

ChangeSet@1.1616.3120.2, 2007-11-12 15:15:16+04:00, svoj@mysql.com +1 -0
  After merge fix.

  mysql-test/r/symlink.result@1.11.1.16, 2007-11-12 15:15:15+04:00, svoj@mysql.com +1 -1
    After merge fix.

ChangeSet@1.2476.656.1, 2007-11-12 11:29:55+01:00, mats@kindahl-laptop.dnsalias.net +2 -0
  BUG#31611 (Security risk with BINLOG statement):
  
  Adding missing drop of user created for test case.

  mysql-test/r/mysqlbinlog.result@1.39, 2007-11-12 11:29:48+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Result file change.

  mysql-test/t/mysqlbinlog.test@1.53, 2007-11-12 11:29:48+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Dropping user that was added earlier in the test.

ChangeSet@1.2476.655.1, 2007-11-12 14:26:09+04:00, holyfoot@mysql.com +4 -0
  'no innodb engine' test failure fixed

  mysql-test/r/partition.result@1.69.2.2, 2007-11-12 14:26:07+04:00, holyfoot@mysql.com +0 -14
    test result fixed

  mysql-test/r/partition_innodb.result@1.8, 2007-11-12 14:26:07+04:00, holyfoot@mysql.com +12 -0
    test result fixed

  mysql-test/t/partition.test@1.63.3.2, 2007-11-12 14:26:07+04:00, holyfoot@mysql.com +0 -11
    test moved to partition_innodb

  mysql-test/t/partition_innodb.test@1.7, 2007-11-12 14:26:07+04:00, holyfoot@mysql.com +11 -0
    test moved from partition.test

ChangeSet@1.1616.3119.1, 2007-11-12 13:00:22+04:00, holyfoot@mysql.com +4 -0
  Bug #31305 myisam tables crash when they are near capacity.
  
  When we insert a record into MYISAM table which is almost 'full',
  we first write record data in the free space inside a file, and then
  check if we have enough space after the end of the file.
  So if we don't have the space, table will left corrupted.
  Similar error also happens when we updata MYISAM tables.
  
  Fixed by modifying write_dynamic_record and update_dynamic_record functions
  to check for free space before writing parts of a record

  BitKeeper/etc/ignore@1.153.1.89, 2007-11-12 13:00:21+04:00, holyfoot@mysql.com +2 -0
    Added libmysql_r/client_settings.h libmysqld/ha_blackhole.cc to the ignore list

  mysql-test/r/almost_full.result@1.1, 2007-11-12 13:00:21+04:00, holyfoot@mysql.com +29 -0
    New BitKeeper file ``mysql-test/r/almost_full.result''

  mysql-test/r/almost_full.result@1.0, 2007-11-12 13:00:21+04:00, holyfoot@mysql.com +0 -0

  mysql-test/t/almost_full.test@1.1, 2007-11-12 13:00:21+04:00, holyfoot@mysql.com +41 -0
    New BitKeeper file ``mysql-test/t/almost_full.test''

  mysql-test/t/almost_full.test@1.0, 2007-11-12 13:00:21+04:00, holyfoot@mysql.com +0 -0

  myisam/mi_dynrec.c@1.36.3.1, 2007-11-12 13:00:21+04:00, holyfoot@mysql.com +68 -0
    Bug #31305 myisam tables crash when they are near capacity.
    
    now we check space left in table in write_dynamic_record
    and update_dynamic_record functions.
    If we don't have enough room for the new (updated) record, return with the
    error.

ChangeSet@1.2476.652.1, 2007-11-11 22:30:01+01:00, mattiasj@mattiasj-laptop.(none) +1 -0
  Bug#30695: An apostrophe ' in the comment of the ADD PARTITION
      causes the Server to crash.
  
  Post-pushbuild fix
  
  Pushbuild genereted valgrind warnings.
  
  Changed function to safer variant.

  sql/sql_partition.cc@1.118, 2007-11-11 22:29:56+01:00, mattiasj@mattiasj-laptop.(none) +1 -1
    Bug#30695: An apostrophe ' in the comment of the ADD PARTITION
        causes the Server to crash.
    
    Fix for valgrind warning in pushbuild.
    String.c_prt fcn is not as safe as comment says.
    (gives valgrind errors in this case)

ChangeSet@1.2476.635.8, 2007-11-11 20:38:28+01:00, istruewing@stella.local +3 -0
  Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    
  Post-pushbuild fix
    
  Pushbuild detected a new need for lex initialization in
  embedded server.
  
  Fixed test for INSERT DELAYED in partitions_hash.test so that
  it works with embedded server.

  libmysqld/lib_sql.cc@1.140.1.1, 2007-11-11 20:38:26+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                    partitioned table
    Initialized lex for later use in open_table().

  mysql-test/r/partition_hash.result@1.9, 2007-11-11 20:38:26+01:00, istruewing@stella.local +0 -1
    Bug#31210 - INSERT DELAYED crashes server when used on
                    partitioned table
    Fixed test result for embedded server.

  mysql-test/t/partition_hash.test@1.11, 2007-11-11 20:38:26+01:00, istruewing@stella.local +3 -1
    Bug#31210 - INSERT DELAYED crashes server when used on
                    partitioned table
    Fixed test for embedded server.

ChangeSet@1.2476.513.24, 2007-11-11 19:01:53+01:00, guilhem@gbichot4.local +4 -0
  comments

  storage/maria/ma_checkpoint.c@1.29, 2007-11-11 19:01:51+01:00, guilhem@gbichot4.local +7 -5
    comments

  storage/maria/ma_pagecache.c@1.52.1.2, 2007-11-11 19:01:51+01:00, guilhem@gbichot4.local +4 -0
    comments

  storage/maria/ma_recovery.c@1.47.1.3, 2007-11-11 19:01:51+01:00, guilhem@gbichot4.local +5 -0
    comments

  storage/maria/ma_write.c@1.19.1.1, 2007-11-11 19:01:51+01:00, guilhem@gbichot4.local +7 -0
    comments

ChangeSet@1.2476.513.23, 2007-11-11 15:27:07+01:00, guilhem@gbichot4.local +4 -0
  WL#3071 Maria checkpoint
  Fixing bad comments (I remember my maths' teacher "one late night you'll
  obey to the simplifications made by your tired neurons"; exactly
  what happened here). In Checkpoint, when we flush a table's state
  we must flush all log records (WAL), not only those before checkpoint
  started.

  storage/maria/ma_bitmap.c@1.21.1.4, 2007-11-11 15:27:05+01:00, guilhem@gbichot4.local +25 -10
    there was a flaw in reasoning, bug does exist.

  storage/maria/ma_blockrec.c@1.50.1.5, 2007-11-11 15:27:05+01:00, guilhem@gbichot4.local +3 -11
    moving piece of comment to ma_checkpoint.c

  storage/maria/ma_checkpoint.c@1.28, 2007-11-11 15:27:05+01:00, guilhem@gbichot4.local +35 -32
    Comments.
    When checkpoint flushes a state, WAL imposes that all records up
    to this state have been flushed, not only up to checkpoint_start_log_horizon.

  storage/maria/ma_recovery.c@1.47.1.2, 2007-11-11 15:27:05+01:00, guilhem@gbichot4.local +8 -7
    finishing comment.

ChangeSet@1.2476.1.130, 2007-11-10 22:41:43+01:00, serg@janus.mylan +1 -0
  bad merge fixed

  sql/sql_class.h@1.399.8.1, 2007-11-10 22:41:40+01:00, serg@janus.mylan +0 -2
    bad merge fixed

ChangeSet@1.2476.649.2, 2007-11-10 21:51:47+01:00, tnurnberg@mysql.com +2 -0
  Bug#31700: thd->examined_row_count not incremented for 'const' type queries
  
  add 5.1-specific test showing that 'const' access increments 'examined'
  counter in slow query log.

  mysql-test/r/log_tables.result@1.27, 2007-11-10 21:51:46+01:00, tnurnberg@mysql.com +28 -0
    5.1-only test showing that 'const' access increments counters

  mysql-test/t/log_tables.test@1.24, 2007-11-10 21:51:46+01:00, tnurnberg@mysql.com +31 -0
    5.1-only test showing that 'const' access increments counters

ChangeSet@1.2476.645.3, 2007-11-10 21:29:39+01:00, mattiasj@mattiasj-laptop.(none) +2 -0
  Bug#32091: Security breach via directory changes
  
  Changed test case from GRANT to CREATE USER

  mysql-test/r/partition_mgm.result@1.12, 2007-11-10 21:29:38+01:00, mattiasj@mattiasj-laptop.(none) +3 -2
    Bug#32091: Security breach via directory changes
    test result

  mysql-test/t/partition_mgm.test@1.11, 2007-11-10 21:29:38+01:00, mattiasj@mattiasj-laptop.(none) +3 -2
    Bug#32091: Security breach via directory changes
    Changed test case from GRANT to CREATE USER

ChangeSet@1.1810.3472.1, 2007-11-10 23:44:48+04:00, gshchepa@gleb.loc +9 -0
  Fixed bug #28076: inconsistent binary/varbinary comparison.
  
  After adding an index the <VARBINARY> IN (SELECT <BINARY> ...)
  clause returned a wrong result: the VARBINARY value was illegally padded
  with zero bytes to the length of the BINARY column for the index search.
  (<VARBINARY>, ...) IN (SELECT <BINARY>, ... ) clauses are affected too.

  mysql-test/r/subselect.result@1.134.1.63, 2007-11-10 23:44:29+04:00, gshchepa@gleb.loc +49 -0
    Added test case for bug #28076.

  mysql-test/t/subselect.test@1.129.12.2, 2007-11-10 23:44:16+04:00, gshchepa@gleb.loc +42 -0
    Added test case for bug #28076.

  sql/item.cc@1.113.1.177, 2007-11-10 23:44:09+04:00, gshchepa@gleb.loc +12 -4
    Fixed bug #28076.
    The Item_cache_str::save_in_field method has been overloaded
    to check cached values for an illegal padding before the saving
    into a field.

  sql/item.h@1.183.1.63, 2007-11-10 23:44:11+04:00, gshchepa@gleb.loc +11 -3
    Fixed bug #28076.
    The Item_cache_str::is_varbinary flag has been added and the
    Item_cache_str::save_in_field method has been overloaded to prevent
    cached values from an illegal padding when saving in fields.
    The signature of the Item_cache::get_cache method has been
    changed to accept pointers to Item instead of Item_result
    values.

  sql/item_cmpfunc.cc@1.187.53.1, 2007-11-10 23:44:12+04:00, gshchepa@gleb.loc +1 -1
    Fixed bug #28076.
    The Item_in_optimizer::fix_left method has been modified to
    to call Item_cache::get_cache in a new manner.

  sql/item_subselect.cc@1.113.1.48, 2007-11-10 23:44:13+04:00, gshchepa@gleb.loc +12 -1
    Fixed bug #28076.
    The subselect_indexsubquery_engine::exec method has been
    modified to take into account field conversion errors
    (copy&paste from subselect_uniquesubquery_engine::exec).

  sql/sp_rcontext.cc@1.44.1.2, 2007-11-10 23:44:14+04:00, gshchepa@gleb.loc +3 -3
    Fixed bug #28076.
    The sp_rcontext::create_case_expr_holder method has been
    modified to call Item_cache::get_cache in a new manner.

  sql/sp_rcontext.h@1.36, 2007-11-10 23:44:15+04:00, gshchepa@gleb.loc +1 -1
    Fixed bug #28076.
    The sp_rcontext::create_case_expr_holder method signature
    has been modified to pass Item pointers to the
    Item_cache::get_cache method.

  sql/sql_class.cc@1.223.20.24, 2007-11-10 23:44:15+04:00, gshchepa@gleb.loc +1 -1
    Fixed bug #28076.
    The select_max_min_finder_subselect::send_data method has been
    modified to call Item_cache::get_cache in a new manner.

ChangeSet@1.1810.3470.2, 2007-11-10 21:39:30+04:00, ramil@mysql.com +2 -0
  compiler warnings fixed.

  sql/unireg.cc@1.53.11.3, 2007-11-10 21:39:29+04:00, ramil@mysql.com +1 -1
    compiler warning fixed.

  sql/ha_myisam.cc@1.147.30.1, 2007-11-10 21:39:29+04:00, ramil@mysql.com +1 -1
    compiler warning fixed.

ChangeSet@1.1810.3471.1, 2007-11-10 18:29:13+01:00, tnurnberg@mysql.com +2 -0
  Bug#31700: thd->examined_row_count not incremented for 'const' type queries
  
  UNIQUE (eq-ref) lookups result in table being considered as a "constant" table.
  Queries that consist of only constant tables are processed in do_select() in a
  special way that doesn't invoke evaluate_join_record(), and therefore doesn't
  increase the counters join->examined_rows and join->thd->row_count.
  
  The patch increases these counters in this special case.
  
  NOTICE:
  This behavior seems to contradict what the documentation says in Sect. 5.11.4:
  "Queries handled by the query cache are not added to the slow query log, nor
  are queries that would not benefit from the presence of an index because the
  table has zero rows or one row."
  
  No test case in 5.0 as issue shows only in slow query log, and other counters
  can give subtly different values (with regard to counting in create_sort_index(),
  synthetic rows in ROLLUP, etc.).

  sql/sql_class.h@1.230.55.34, 2007-11-10 18:29:11+01:00, tnurnberg@mysql.com +19 -4
    add documentation for some variables

  sql/sql_select.cc@1.312.186.1, 2007-11-10 18:29:11+01:00, tnurnberg@mysql.com +9 -0
    Don't forget const tables when counting read records!

ChangeSet@1.2476.563.24, 2007-11-10 18:57:09+04:00, ramil@mysql.com +1 -0
  manual merge.

  mysql-test/r/ps.result@1.119.1.2, 2007-11-10 18:57:06+04:00, ramil@mysql.com +5 -0
    manual merge.

ChangeSet@1.1810.3448.3, 2007-11-10 18:27:57+04:00, ramil@mysql.com +3 -0
  manual merge.

  mysql-test/r/ps.result@1.56.1.40, 2007-11-10 18:27:56+04:00, ramil@mysql.com +5 -0
    manual merge.

  mysql-test/t/ps.test@1.56.1.40, 2007-11-10 18:27:56+04:00, ramil@mysql.com +10 -0
    manual merge.

  sql/item_timefunc.cc@1.100.36.2, 2007-11-10 18:27:56+04:00, ramil@mysql.com +26 -22
    manual merge.

ChangeSet@1.2476.645.2, 2007-11-10 14:56:21+01:00, mattiasj@mattiasj-laptop.(none) +2 -0
  Bug#32091: Security breach via directory changes
  
  small fix of test case (when running make test after
  merge, it did not substitute MYSQLTEST_VARDIR in
  the error)

  mysql-test/r/partition_mgm.result@1.11, 2007-11-10 14:56:19+01:00, mattiasj@mattiasj-laptop.(none) +2 -2
    Bug#32091: Security breach via directory changes
    small fix in test result

  mysql-test/t/partition_mgm.test@1.10, 2007-11-10 14:56:19+01:00, mattiasj@mattiasj-laptop.(none) +2 -2
    Bug#32091: Security breach via directory changes
    small fix in test case

ChangeSet@1.2476.635.7, 2007-11-10 14:36:25+01:00, istruewing@stella.local +1 -0
  Bug#31210 - INSERT DELAYED crashes server when used on
              partitioned table
  
  Post-merge fix
  
  A new need for lex initialization arose.

  sql/ha_ndbcluster.cc@1.461.12.3, 2007-11-10 14:36:23+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

ChangeSet@1.1616.3118.1, 2007-11-10 16:54:25+04:00, holyfoot@mysql.com +1 -0
  Bug #32063 "create table like" works case-significant only in "embedded" server (libmysqld)
  
  in mysql_creata_like_table() we 'downcase' the complete path to the
  .frm file. It works fine in standalone case as there usually
  we only have './' as a path to the datahome, but doesn't work in
  the embedded server where we add the real path there, so if a
  directory has uppercase letters in it's name, it won't be found.
  
  Fixed by 'downcasing' only database/table pair.

  sql/sql_table.cc@1.157.63.1, 2007-11-10 16:54:24+04:00, holyfoot@mysql.com +4 -4
    Bug #32063 "create table like" works case-significant only in "embedded" server (libmysqld)
    
    do not lowercase the database directory

ChangeSet@1.1810.3469.1, 2007-11-10 13:33:42+01:00, tnurnberg@mysql.com +4 -0
  Bug#31800: Date comparison fails with timezone and slashes for greater than comparison
  
  BETWEEN was more lenient with regard to what it accepted as a DATE/DATETIME
  in comparisons than greater-than and less-than were. ChangeSet makes < >
  comparisons similarly robust with regard to trailing garbage (" GMT-1")
  and "missing" leading zeros. Now all three comparators behave similarly
  in that they throw a warning for "junk" at the end of the data, but then
  proceed anyway if possible. Before < > fell back on a string- (rather than
  date-) comparison when a warning-condition was raised in the string-to-date
  conversion. Now the fallback only happens on actual errors, while warning-
  conditions still result in a warning being to delivered to the client.

  mysql-test/r/select.result@1.121.16.1, 2007-11-10 13:33:41+01:00, tnurnberg@mysql.com +153 -7
    Show that we compare DATE/DATETIME-like strings as date(time)s
    now, rather than as bin-strings.
    Adjust older result as "2005-09-3a" is now correctly seen as
    "2005-09-3" + trailing garbage, rather than as "2005-09-30".

  mysql-test/t/select.test@1.102.14.1, 2007-11-10 13:33:41+01:00, tnurnberg@mysql.com +72 -6
    Show that we compare DATE/DATETIME-like strings as date(time)s
    now, rather than as bin-strings.

  sql-common/my_time.c@1.19.17.4, 2007-11-10 13:33:41+01:00, tnurnberg@mysql.com +16 -16
    correct/clarify date-related comments, particulary for check_date().
    doxygenize comment while at it.

  sql/item_cmpfunc.cc@1.187.52.1, 2007-11-10 13:33:41+01:00, tnurnberg@mysql.com +38 -25
    get_date_from_str() no longer signals an error when all we had
    was a warning-condition -- and one we already gave the user a
    warning for at that. Preamble doxygenized.

ChangeSet@1.2476.647.1, 2007-11-10 13:09:18+01:00, mattiasj@mattiasj-laptop.(none) +4 -0
  Bug#29368: Modified error messages
  
  Problem: there was no standard syntax error when
           creating partitions with syntax error in
           the partitioning clause.
  
  Solution: added "Syntax error: " to the error message

  mysql-test/r/partition.result@1.69.3.1, 2007-11-10 13:09:16+01:00, mattiasj@mattiasj-laptop.(none) +2 -2
    Bug#29368: Incorrect error for syntax error when createing
               partition
    
    test result update

  mysql-test/r/partition_error.result@1.16, 2007-11-10 13:09:16+01:00, mattiasj@mattiasj-laptop.(none) +12 -3
    Bug#29368: Incorrect error for syntax error when createing
               partition
    
    test result

  mysql-test/t/partition_error.test@1.18, 2007-11-10 13:09:16+01:00, mattiasj@mattiasj-laptop.(none) +13 -0
    Bug#29368: Incorrect error for syntax error when createing
               partition
    
    test case

  sql/share/errmsg.txt@1.159.8.1, 2007-11-10 13:09:16+01:00, mattiasj@mattiasj-laptop.(none) +3 -3
    Bug#29368: Incorrect error for syntax error when createing
               partition
    
    Modified error messages

ChangeSet@1.1810.3445.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.683.18.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.1810.3453.5, 2007-11-09 18:27:20-07:00, tsmith@ramayana.hindu.god +2 -0
  Fix Windows build problems.

  libmysql/CMakeLists.txt@1.1.8.1, 2007-11-09 18:27:19-07:00, tsmith@ramayana.hindu.god +1 -1
    Add new mysys/mf_arr_appstr.c source file

  mysys/default.c@1.72.1.19, 2007-11-09 18:27:19-07:00, tsmith@ramayana.hindu.god +7 -7
    Fix some bad code that caused warnings on Windows

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.2476.513.22, 2007-11-09 23:30:31+01:00, guilhem@gbichot4.local +6 -0
  WL#3071 - Maria checkpoint
  Observe WAL for the table's state: all log records needed for undoing
  uncommitted state must be in the log before we flush state.

  storage/maria/ha_maria.cc@1.51.1.5, 2007-11-09 23:30:26+01:00, guilhem@gbichot4.local +10 -0
    comments

  storage/maria/ma_bitmap.c@1.21.1.3, 2007-11-09 23:30:26+01:00, guilhem@gbichot4.local +11 -0
    Comment for why there is no bug

  storage/maria/ma_blockrec.c@1.50.1.4, 2007-11-09 23:30:27+01:00, guilhem@gbichot4.local +16 -0
    comment for why there is no bug

  storage/maria/ma_checkpoint.c@1.27, 2007-11-09 23:30:27+01:00, guilhem@gbichot4.local +31 -6
    Observe WAL for the table's state: all log records needed for undoing
    uncommitted state must be in the log before we flush state. I tested
    by hand that the bug existed (create table, insert one row into it
    but let that insert pause after increasing data_file_length, let
    checkpoint start but kill it after it has flushed state).
    Log contains nothing, table is not recovered though it has
    a too big data_file_length. With this bugfix, the log contains
    REDO so table is opened so data_file_length is corrected.

  storage/maria/ma_close.c@1.21, 2007-11-09 23:30:27+01:00, guilhem@gbichot4.local +3 -2
    If table is read-only we must never write to it.
    Should be a no-change in fact, as if read-only, share->changed is
    normally always false.

  storage/maria/ma_recovery.c@1.47.1.1, 2007-11-09 23:30:27+01:00, guilhem@gbichot4.local +23 -2
    documenting bug found by Monty. Print when fixing data_file_length.

ChangeSet@1.2476.645.1, 2007-11-09 23:22:00+01:00, mattiasj@mattiasj-laptop.(none) +3 -0
  Bug#32091: Security breach via directory changes
  
  Problem: the table's INDEX and DATA DIR was taken
    directly from the table's first partition.
    This allowed rename attack similar to
    bug#32111 when ALTER TABLE REMOVE PARTITIONING
  
  Solution: Silently ignore the INDEX/DATA DIR
    for the table. (Like some other storage engines
    do). 
    Partitioned tables do not support DATA/INDEX
    DIR on the table level, only on its partitions.

  mysql-test/r/partition_mgm.result@1.10, 2007-11-09 23:21:58+01:00, mattiasj@mattiasj-laptop.(none) +81 -0
    Bug#32091: Security breach via directory changes
    test result

  mysql-test/t/partition_mgm.test@1.9, 2007-11-09 23:21:58+01:00, mattiasj@mattiasj-laptop.(none) +111 -2
    Bug#32091: Security breach via directory changes
    test case

  sql/ha_partition.cc@1.104.1.4, 2007-11-09 23:21:58+01:00, mattiasj@mattiasj-laptop.(none) +1 -0
    Bug#32091: Security breach via directory changes
    
    Do not use the first partition's DATA/INDEX DIR
    as the table's DATA/INDEX DIR.
    (A partitioned table do not have support for DATA/
    INDEX DIR, only its partitions do)

ChangeSet@1.2476.513.21, 2007-11-09 22:32:23+02:00, bell@desktop.sanja.is.com.ua +2 -0
  Infinite loop in case of given address more then last LSN fixed.

  storage/maria/ma_loghandler.c@1.67.1.2, 2007-11-09 22:32:19+02:00, bell@desktop.sanja.is.com.ua +2 -1
    Infinite loop in case of given address more then last LSN fixed
    (now it means just flush all log).
    Removed unneeded ASSERT.

  storage/maria/unittest/ma_test_loghandler-t.c@1.20, 2007-11-09 22:32:19+02:00, bell@desktop.sanja.is.com.ua +10 -1
    The test case of flushing all log added.

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.683.18.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.438.1.7, 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.1810.3455.4, 2007-11-09 19:12:12+03:00, kaa@polly.(none) +3 -0
  Fix for bug #32202: ORDER BY not working with GROUP BY
  
  The bug is a regression introduced by the fix for bug30596. The problem
  was that in cases when groups in GROUP BY correspond to only one row,
  and there is ORDER BY, the GROUP BY was removed and the ORDER BY
  rewritten to ORDER BY <group_by_columns> without checking if the
  columns in GROUP BY and ORDER BY are compatible. This led to
  incorrect ordering of the result set as it was sorted using the
  GROUP BY columns. Additionaly, the code discarded ASC/DESC modifiers
  from ORDER BY even if its columns were compatible with the GROUP BY
  ones.
  
  This patch fixes the regression by checking if ORDER BY columns form a
  prefix of the GROUP BY ones, and rewriting ORDER BY only in that case,
  preserving the ASC/DESC modifiers. That check is sufficient, since the
  GROUP BY columns contain a unique index.

  mysql-test/r/group_by.result@1.69.1.12, 2007-11-09 19:12:09+03:00, kaa@polly.(none) +65 -0
    Added a test case for bug #32202.

  mysql-test/t/group_by.test@1.59.1.7, 2007-11-09 19:12:09+03:00, kaa@polly.(none) +35 -0
    Added a test case for bug #32202.

  sql/sql_select.cc@1.312.185.1, 2007-11-09 19:12:10+03:00, kaa@polly.(none) +12 -3
    In cases when groups in GROUP BY correspond to only one row and there
    is ORDER BY, rewrite the query to ORDER BY <group_by_columns> only if
    the columns in ORDER BY and GROUP BY are compatible, i.e. either one
    forms a prefix for another.

ChangeSet@1.2476.618.11, 2007-11-09 14:08:12+01:00, mleich@five.local.lan +3 -0
  Fix for
     Bug#32153 Status output differs - scheduling ?
  Modifications:
  1. Introduce additional poll routines + adjust queries 
     as fixes for Bug#32153 and another non reported bug
     found during stability testing
  2. Replace builtin poll routines by wait_condition.inc.
  3. Update the comments

  mysql-test/suite/funcs_1/datadict/processlist_val.inc@1.2, 2007-11-09 14:08:10+01:00, mleich@five.local.lan +54 -69
    Fixes, details are in changeset comment

  mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result@1.2, 2007-11-09 14:08:10+01:00, mleich@five.local.lan +4 -4
    Updated results

  mysql-test/suite/funcs_1/r/b_processlist_val_ps.result@1.2, 2007-11-09 14:08:10+01:00, mleich@five.local.lan +4 -4
    Updated results

ChangeSet@1.1810.3445.3, 2007-11-09 13:43:09+01:00, mats@capulet.net +4 -0
  BUG#31793 (log event corruption causes crash):
  
  When running mysqlbinlog on a 64-bit machine with a corrupt relay log,
  it causes mysqlbinlog to crash. In this case, the crash is caused
  because a request for 18446744073709534806U bytes is issued, which
  apparantly can be served on a 64-bit machine (speculatively, I assume)
  but this causes the memcpy() issued later to copy the data to segfault.
  
  The request for the number of bytes is caused by a computation
  of data_len - server_vars_len where server_vars_len is corrupt in such
  a sense that it is > data_len. This causes a wrap-around, with the
  the data_len given above.
  
  This patch adds a check that if server_vars_len is greater than
  data_len before the substraction, and aborts reading the event in
  that case marking the event as invalid. It also adds checks to see
  that reading the server variables does not go outside the bounds
  of the available space, giving a limited amount of integrity check.

  mysql-test/r/mysqlbinlog.result@1.25.1.12, 2007-11-09 13:43:07+01:00, mats@capulet.net +1 -0
    Result change.

  mysql-test/std_data/corrupt-relay-bin.000624@1.1, 2007-11-09 13:43:07+01:00, mats@capulet.net +2033 -0
    BitKeeper file /home/mats/devel/b31793-mysql-5.0-rpl/mysql-test/std_data/corrupt-relay-bin.000624

  mysql-test/std_data/corrupt-relay-bin.000624@1.0, 2007-11-09 13:43:07+01:00, mats@capulet.net +0 -0

  mysql-test/t/mysqlbinlog.test@1.21.1.30, 2007-11-09 13:43:07+01:00, mats@capulet.net +4 -0
    Adding test that it fails gracefully for a corrupt relay log.

  sql/log_event.cc@1.174.28.1, 2007-11-09 13:43:07+01:00, mats@capulet.net +84 -11
    Adding check that status var length does not cause wrap-around
    when performing subtraction. Extending get_str_len_and_pointer() to
    check that the string can actually be read without reading outside
    bounds. Adding checks when reading server variables from the Query-
    log_event so that the variable can really be read. Abort reading
    and mark the event as invalid otherwise.

ChangeSet@1.1616.3095.10, 2007-11-09 16:05:01+04:00, svoj@mysql.com +3 -0
  BUG#29083 - test suite times out on OS X 64bit - also in older releases
  
  The "mysql client in mysqld"(which is used by
  replication and federated) should use alarms instead of setting
  socket timeout value if the rest of the server uses alarm. By
  always calling 'my_net_set_write_timeout'
  or 'net_set_read_timeout' when changing the timeout value(s), the
  selection whether to use alarms or timeouts will be handled by
  ifdef's in those two functions.
  
  This is minimal backport of patch for BUG#26664, which was pushed
  to 5.0 and up.
  
  Affects 4.1 only.

  include/mysql_com.h@1.67.1.43, 2007-11-09 16:05:01+04:00, svoj@mysql.com +5 -0
    Move the net_set_*_timeout function declarations to mysql_com.h

  sql-common/client.c@1.46.9.2, 2007-11-09 16:05:01+04:00, svoj@mysql.com +2 -4
     Use my_net_read_timeout or my_net_write_timeout when setting the timeouts

  sql/mysql_priv.h@1.186.91.64, 2007-11-09 16:05:01+04:00, svoj@mysql.com +0 -3
    Move the net_set_*_timeout function declarations to mysql_com.h

ChangeSet@1.1810.3467.1, 2007-11-09 13:29:43+03:00, kaa@polly.(none) +3 -0
  Fix for bug #32020: loading udfs while --skip-grant-tables is enabled
  causes out of memory errors
  
  The code in mysql_create_function() and mysql_drop_function() assumed
  that the only reason for UDFs being uninitialized at that point is an
  out-of-memory error during initialization. However, another possible 
  reason for that is the --skip-grant-tables option in which case UDF 
  initialization is skipped and UDFs are unavailable.
  
  The solution is to check whether mysqld is running with
  --skip-grant-tables and issue a proper error in such a case.

  mysql-test/r/skip_grants.result@1.10.1.1, 2007-11-09 13:29:36+03:00, kaa@polly.(none) +5 -0
    Added a test case for bug #32020.

  mysql-test/t/skip_grants.test@1.6.1.7, 2007-11-09 13:29:36+03:00, kaa@polly.(none) +12 -0
    Added a test case for bug #32020.

  sql/sql_udf.cc@1.45.7.1, 2007-11-09 13:29:36+03:00, kaa@polly.(none) +10 -2
    Issue a proper error when a user tries to CREATE/DROP a UDF 
    on a server running with the --skip-grant-tables option.

ChangeSet@1.2476.563.22, 2007-11-09 11:16:47+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#32217 rpl_ssl fails with different number of records on master and slave
   - Add debug queries

  mysql-test/suite/rpl/t/rpl_ssl.test@1.12, 2007-11-09 11:16:44+01:00, msvensson@pilot.mysql.com +10 -0
    Add additional queries to run when we detect that the number of queries between slave and master differs

ChangeSet@1.2476.594.17, 2007-11-09 11:02:51+01:00, mats@kindahl-laptop.dnsalias.net +4 -0
  BUG#31552 (Replication breaks when deleting rows from out-of-sync table without PK):
  
  Pushing test case for bug only. Bug already fixed as a result of the patch for BUG#19958.

  mysql-test/extra/rpl_tests/rpl_row_basic.test@1.8, 2007-11-09 11:02:45+01:00, mats@kindahl-laptop.dnsalias.net +31 -5
    Adding test to see that no error is given on slave when deleting
    rows that don't exist on table without primary key.

  mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result@1.5, 2007-11-09 11:02:45+01:00, mats@kindahl-laptop.dnsalias.net +19 -0
    Result change.

  mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result@1.5, 2007-11-09 11:02:45+01:00, mats@kindahl-laptop.dnsalias.net +19 -0
    Result change.

  mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result@1.6, 2007-11-09 11:02:45+01:00, mats@kindahl-laptop.dnsalias.net +19 -0
    Result change.

ChangeSet@1.2476.594.16, 2007-11-09 09:13:47+01:00, mats@kindahl-laptop.dnsalias.net +2 -0
  Fixing some tests to make the replication team tree green.

  mysql-test/suite/rpl/r/rpl_found_rows.result@1.2, 2007-11-09 09:13:39+01:00, mats@kindahl-laptop.dnsalias.net +17 -12
    Result change.

  mysql-test/suite/rpl/t/rpl_found_rows.test@1.2, 2007-11-09 09:13:39+01:00, mats@kindahl-laptop.dnsalias.net +15 -10
    Adding ORDER BY to avoid order dependencies.
    Setting BINLOG_FORMAT=MIXED; for all master clients: one were missing.
    Dropping procedures that polluted later test results.

ChangeSet@1.2476.644.1, 2007-11-09 10:10:15+02:00, aelkin@koti.dsl.inet.fi +2 -0
  Bug #31170 rpl_innodb_bug28430 fails: varying timing, ports, and log use
  
  Non-deterministic parameters  of  SHOW SLAVE STATUS are masked out
  by means of using the standard include-macro.
  
  The masked-out parameters are not needed by the logics of the original
  tests. What is need to demonstre that replication is not stopped remains.
  

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@1.6.1.1, 2007-11-09 10:10:12+02:00, aelkin@koti.dsl.inet.fi +8 -8
    results changed

  mysql-test/suite/rpl/t/rpl_innodb_bug28430.test@1.5.2.1, 2007-11-09 10:10:12+02:00, aelkin@koti.dsl.inet.fi +1 -2
    using the standard macro that takes care of masking out env specific values
     

ChangeSet@1.2476.634.5, 2007-11-08 15:05:38+01:00, jmiller@mysql.com +1 -0
  testDict.cpp:
    Updated DropDDObjects in testDict to ignore the user tables created in the MySQL database

  storage/ndb/test/ndbapi/testDict.cpp@1.40, 2007-11-08 15:05:29+01:00, jmiller@mysql.com +7 -3
    Updated DropDDObjects in testDict to ignore the user tables created in the MySQL database

ChangeSet@1.2476.643.1, 2007-11-08 13:43:40+01:00, jperkin@production.mysql.com +1 -0
  Remove the --source-install option and instead make use of --srcdir
  to install system tables directly from the source tree (useful for
  testing purposes).  This helps clean the script up a lot and clarify
  the three possible ways the script can be called (using compiled-in
  paths, passing --basedir pointing to alternative install location,
  or --srcdir).  Include further tidying as well.
    
  This fixes bug#30759.

  scripts/mysql_install_db.sh@1.88, 2007-11-08 13:42:01+01:00, jperkin@production.mysql.com +69 -69
    Re-order the logic in printing messages at the end of the
    script, to make it clearer which paths are taken depending
    on tests or outcome of command status.  Tidy some output.

  scripts/mysql_install_db.sh@1.87, 2007-11-07 18:38:36+01:00, jperkin@production.mysql.com +59 -108
    Remove the --source-install argument and re-implement similar
    functionality by expanding the --srcdir option
      - rename missing_in_basedir to cannot_find_file and use it
        to report on missing files in --srcdir too
      - merge --windows configuration into --srcdir where it is
        better placed.  All --windows usage uses --srcdir
        anyway, so effectively a nop.
      - use cannot_find_file for more file tests

  scripts/mysql_install_db.sh@1.86, 2007-11-07 15:50:02+01:00, jperkin@production.mysql.com +4 -4
    Update and clarify some comments.

  scripts/mysql_install_db.sh@1.85, 2007-11-07 14:58:11+01:00, jperkin@production.mysql.com +2 -2
    Use consistent test style throughout the script.

  scripts/mysql_install_db.sh@1.84, 2007-11-07 14:55:10+01:00, jperkin@production.mysql.com +1 -7
    Initialise $ldata early, reduce code.

ChangeSet@1.2476.594.14, 2007-11-08 09:25:03+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Fixing test case to not print warnings causing a result mismatch for rpl_trigger.

  mysql-test/suite/rpl/t/rpl_trigger.test@1.14, 2007-11-08 09:24:52+01:00, mats@kindahl-laptop.dnsalias.net +5 -0
    Disabling warnings to prevent different result files for
    MIXED and STATEMENT mode.

ChangeSet@1.1810.3465.1, 2007-11-08 06:08:44+01:00, tnurnberg@mysql.com +4 -0
  Bug#31990: MINUTE() and SECOND() return bogus results when used on a DATE
  
  HOUR(), MINUTE(), ... returned spurious results when used on a DATE-cast.
  This happened because DATE-cast object did not overload get_time() method
  in superclass Item. The default method was inappropriate here and
  misinterpreted the data.
  
  Patch adds missing method; get_time() on DATE-casts now returns SQL-NULL
  on NULL input, 0 otherwise. This coincides with the way DATE-columns
  behave.

  mysql-test/r/cast.result@1.39.1.14, 2007-11-08 06:08:42+01:00, tnurnberg@mysql.com +24 -0
    Show that HOUR(), MINUTE(), ... return sensible values when used
    on DATE-cast objects, namely NULL for NULL-dates and 0 otherwise.
    Show that this coincides with how DATE-columns behave.

  mysql-test/t/cast.test@1.31.1.7, 2007-11-08 06:08:42+01:00, tnurnberg@mysql.com +22 -0
    Show that HOUR(), MINUTE(), ... return sensible values when used
    on DATE-cast objects, namely NULL for NULL-dates and 0 otherwise.
    Show that this coincides with how DATE-columns behave.

  sql/item_timefunc.cc@1.100.35.1, 2007-11-08 06:08:42+01:00, tnurnberg@mysql.com +7 -0
    Add get_time() method to DATE-cast object to overload
    the method in Item superclass that would return spurious
    results. Return zero-result; flag NULL if input was NULL.

  sql/item_timefunc.h@1.63.5.5, 2007-11-08 06:08:43+01:00, tnurnberg@mysql.com +1 -0
    Add get_time() declaration to DATE-cast object.

ChangeSet@1.1810.3464.1, 2007-11-07 15:23:50-07:00, tsmith@ramayana.hindu.god +6 -0
  Bug #20748: Configuration files should not be read more than once
  
  A user could not override system-wide settings in their ~/.my.cnf,
  because the DEFAULT_SYSCONFDIR was being searched last.  Also, in
  some configurations (especially when the --sysconfdir compile-time
  option is set to /etc or /etc/mysql), the system-wide my.cnf file
  was read multiple times, causing confusion and potential problems.
  
  Rearrange default directories to conform to the manual and logic.
  Move --sysconfdir=<path> (DEFAULT_SYSCONFDIR) from the last default
  directory to the middle of the list.  $HOME/.my.cnf should be last,
  so the user is able to override the system-wide settings.
  
  Change init_default_directories() to remove duplicates from the
  list.

  include/my_sys.h@1.178.15.1, 2007-11-07 15:23:49-07:00, tsmith@ramayana.hindu.god +2 -0
    Add array_append_string_unique(), from mf_arr_appstr.c

  libmysql/Makefile.shared@1.68.2.1, 2007-11-07 15:23:49-07:00, tsmith@ramayana.hindu.god +1 -1
    Add new mf_arr_appstr.lo object

  mysys/CMakeLists.txt@1.1.6.3, 2007-11-07 15:23:49-07:00, tsmith@ramayana.hindu.god +1 -1
    Add new mf_arr_appstr.c source.

  mysys/Makefile.am@1.62.1.15, 2007-11-07 15:23:49-07:00, tsmith@ramayana.hindu.god +1 -1
    Add new mf_arr_appstr.c source.

  mysys/default.c@1.72.1.18, 2007-11-07 15:23:49-07:00, tsmith@ramayana.hindu.god +129 -63
    Change order in which defaults files are added to default_directories,
    in order to conform to the manual (and to common sense).  This fixes
    a particularly bad problem on Unix, where ~/.my.cnf was read before
    /usr/local/etc/my.cnf.
    
    Also, don't add duplicate entries; move the existing entry to the
    end of the list instead.
    
    
    Here is a comparison of the order of defaults files, BEFORE and AFTER
    this patch.
    
    On Windows:
    
    BEFORE:  C:\, GetWindowsDirectory(), GetSystemWindowsDirectory(),
             $MYSQL_HOME, defaults-extra-file, INSTALLDIR
    
    AFTER:  GetSystemWindowsDirectory(), GetWindowsDirectory(), C:\,
            INSTALLDIR, $MYSQL_HOME, defaults-extra-file
    
    GetSystemWindowsDirectory() is moved before GetWindowsDirectory() because
    the former is shared by all Terminal Services users, while the latter is
    private for each user.
    
    
    On Netware (no change):
    
    BEFORE:  sys:/etc/, $MYSQL_HOME, defaults-extra-file
    
    AFTER:  sys:/etc, $MYSQL_HOME, defaults-extra-file
    
    
    On OS/2:
    
    BEFORE:  $ETC, /etc, $MYSQL_HOME, defaults-extra-file
    
    AFTER:  /etc, $ETC, $MYSQL_HOME, defaults-extra-file
    
    
    On everything else (general Unix):
    
    BEFORE:  /etc, $MYSQL_HOME, defaults-extra-file, ~/, --sysconfdir
    
    AFTER:  /etc/, --sysconfdir, $MYSQL_HOME, defaults-extra-file, ~/
    
    The BEFORE code added --sysconfdir on all systems, but only the
    Unix build system actually defined a value for it.

  mysys/mf_arr_appstr.c@1.1, 2007-11-07 15:23:49-07:00, tsmith@ramayana.hindu.god +61 -0
    BitKeeper file /home/tsmith/m/bk/build/50-b20748/mysys/mf_arr_appstr.c

  mysys/mf_arr_appstr.c@1.0, 2007-11-07 15:23:49-07:00, tsmith@ramayana.hindu.god +0 -0

ChangeSet@1.2476.641.1, 2007-11-07 12:59:22-07:00, tsmith@ramayana.hindu.god +1 -0
  Cast away compiler warning on Windows.

  storage/innobase/handler/ha_innodb.cc@1.367, 2007-11-07 12:59:20-07:00, tsmith@ramayana.hindu.god +1 -1
    Cast away a compiler warning; some functions return ulong or ulint for
    errors, and some use int.  Let's hope these all fit in an int.

ChangeSet@1.1810.3436.2, 2007-11-07 20:57:21+01:00, jonas@perch.ndb.mysql.com +5 -0
  ndb - bug#32160 (recommit to 5.0)
    fix lcp master take over bug

  ndb/src/kernel/blocks/ERROR_codes.txt@1.9.23.1, 2007-11-07 20:57:19+01:00, jonas@perch.ndb.mysql.com +6 -1
    new error codes

  ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.8.21.1, 2007-11-07 20:57:19+01:00, jonas@perch.ndb.mysql.com +10 -0
    add debug code

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.24.82.1, 2007-11-07 20:57:19+01:00, jonas@perch.ndb.mysql.com +54 -6
    fix master lcp bug
    add 2 new error codes

  ndb/test/ndbapi/testNodeRestart.cpp@1.13.32.1, 2007-11-07 20:57:19+01:00, jonas@perch.ndb.mysql.com +48 -0
    testcase

  ndb/test/run-test/daily-basic-tests.txt@1.27.51.1, 2007-11-07 20:57:19+01:00, jonas@perch.ndb.mysql.com +4 -0
    testcase

ChangeSet@1.2476.594.13, 2007-11-07 18:12:21+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Second attempt at getting rid of warnings in replication tree.

  sql/log_event.cc@1.277.37.5, 2007-11-07 18:12:13+01:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Second attempt at getting rid of warnings in replication tree.

ChangeSet@1.1810.3412.21, 2007-11-07 18:02:12+02:00, gkodinov@magare.gmz +3 -0
  Bug #31928: Search fails on '1000-00-00' date after sql_mode change
  
  When constructing a key image stricter date checking (from sql_mode)
  should not be enabled, because it will reject invalid dates that the
  server would otherwise accept for searching when there's no index.
   
  Fixed by disabling strict date checking when constructing a key image.

  mysql-test/r/type_date.result@1.13.6.1, 2007-11-07 18:02:12+02:00, gkodinov@magare.gmz +38 -1
    Bug #31928: test case

  mysql-test/t/type_date.test@1.14.5.1, 2007-11-07 18:02:12+02:00, gkodinov@magare.gmz +20 -0
    Bug #31928: test case

  sql/sql_select.h@1.92.1.32, 2007-11-07 18:02:12+02:00, gkodinov@magare.gmz +7 -4
    Bug #31928: Disable strict date checking when consructing
    a key image

ChangeSet@1.2476.640.1, 2007-11-07 19:59:58+04:00, ramil@mysql.com +6 -0
  Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
  and auto_increment keys
  
  Problems: 
    1. ALTER TABLE ... ORDER BY... doesn't make sence if there's a 
       user-defined clustered index in the table.
    2. using a secondary index is slower than using a clustered one 
       for a table scan.
  
  Fixes:
    1. raise a warning.
    2. use the clustered index.

  mysql-test/include/mix1.inc@1.57.2.3, 2007-11-07 19:59:56+04:00, ramil@mysql.com +8 -0
    Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
    and auto_increment keys
      - test case.

  mysql-test/r/innodb.result@1.202.2.1, 2007-11-07 19:59:56+04:00, ramil@mysql.com +15 -15
    Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
    and auto_increment keys
      - results adjusted.

  mysql-test/r/innodb_mysql.result@1.60.3.3, 2007-11-07 19:59:56+04:00, ramil@mysql.com +13 -8
    Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
    and auto_increment keys
      - results adjusted.

  mysql-test/r/join_outer_innodb.result@1.3, 2007-11-07 19:59:56+04:00, ramil@mysql.com +2 -2
    Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
    and auto_increment keys
      - results adjusted.

  sql/sql_select.cc@1.541.1.28, 2007-11-07 19:59:56+04:00, ramil@mysql.com +9 -1
    Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
    and auto_increment keys
      - use the clustered index for a table scan (if any) as it's faster than
        using a secondary index.

  sql/sql_table.cc@1.437.22.3, 2007-11-07 19:59:56+04:00, ramil@mysql.com +28 -16
    Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
    and auto_increment keys
      - ALTER TABLE ... ORDER BY doesn't make sence if there's a 
        user-defined clustered index in the table. Ignore it in such cases
        and raise a warning.

ChangeSet@1.1616.3117.1, 2007-11-07 18:45:04+03:00, kaa@polly.(none) +3 -0
  Fix for bug #32103: optimizer crash when join on int and mediumint with
  variable in where clause.
  
  Problem: the new_item() method of Item_uint used an incorrect
  constructor. "new Item_uint(name, max_length)" calls
  Item_uint::Item_uint(const char *str_arg, uint length) which assumes the
  first argument to be the string representation of the value, not the
  item's name. This could result in either a server crash or incorrect
  results depending on usage scenarios.
  
  Fixed by using the correct constructor in new_item():
  Item_uint::Item_uint(const char *str_arg, longlong i, uint length).

  mysql-test/r/select.result@1.34.3.42, 2007-11-07 18:45:01+03:00, kaa@polly.(none) +8 -0
    Added a test case for bug #32103.

  mysql-test/t/select.test@1.28.4.17, 2007-11-07 18:45:01+03:00, kaa@polly.(none) +21 -0
    Added a test case for bug #32103.

  sql/item.h@1.56.1.142, 2007-11-07 18:45:01+03:00, kaa@polly.(none) +1 -1
    Use the correct constructor for Item_uint in Item_uint::new_item().

ChangeSet@1.2476.594.11, 2007-11-07 15:23:57+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Adding return value, which is not used, and wrapped debug function in
  DBUG_OFF #ifdefs to eliminate two warnings in replication tree.

  sql/log_event.cc@1.277.37.4, 2007-11-07 15:23:49+01:00, mats@kindahl-laptop.dnsalias.net +2 -1
    Adding return value, which is not used, and wrapped debug function in
    DBUG_OFF #ifdefs to eliminate two warnings in replication tree.

ChangeSet@1.2476.639.1, 2007-11-07 15:08:50+03:00, kaa@polly.(none) +1 -0
  Fix for bug #25421: MySQL threads don't respond to the kill command
  
  Calculating the estimated number of records for a range scan may take a
  significant time, and it was impossible for a user to interrupt that
  process by killing the connection or the query.
  
  Fixed by checking the thread's 'killed' status in check_quick_keys() and
  interrupting the calculation process if it is set to a non-zero value.

  sql/opt_range.cc@1.274.5.1, 2007-11-07 15:08:44+03:00, kaa@polly.(none) +3 -0
    Check the thread's 'killed' status in check_quick_keys() and
    interrupt the calculation process if it is set to a non-zero value.

ChangeSet@1.1810.3435.2, 2007-11-07 14:00:45+03:00, kaa@polly.(none) +3 -0
  Fix for bug #30666: Incorrect order when using range conditions on 2
  tables or more
  
  The problem was that the optimizer used the join buffer in cases when
  the result set is ordered by filesort. This resulted in the ORDER BY
  clause being ignored, and the records being returned in the order
  determined by the order of matching records in the last table in join.
  
  Fixed by relaxing the condition in make_join_readinfo() to take
  filesort-ordered result sets into account, not only index-ordered ones.

  mysql-test/r/select.result@1.121.14.1, 2007-11-07 14:00:41+03:00, kaa@polly.(none) +39 -0
    Added a test case for bug #30666.

  mysql-test/t/select.test@1.102.12.1, 2007-11-07 14:00:41+03:00, kaa@polly.(none) +36 -0
    Added a test case for bug #30666.

  sql/sql_select.cc@1.312.184.1, 2007-11-07 14:00:42+03:00, kaa@polly.(none) +3 -4
    Relaxed the condition to determine when the join buffer usage must be
    disabled. The condition is now true for cases when the result set is
    ordered by filesort, that is when 'join->order &&
    !join->skip_sort_order' is true.

ChangeSet@1.1616.3116.1, 2007-11-07 12:55:28+04:00, svoj@mysql.com +7 -0
  BUG#31277 - myisamchk --unpack corrupts a table
  
  With certain data sets (when compressed record length gets bigger than
  uncompressed) myisamchk --unpack may corrupt data file.
  
  Fixed that record length was wrongly restored from compressed table.

  mysql-test/mysql-test-run.pl@1.8.21.16, 2007-11-07 12:55:27+04:00, svoj@mysql.com +15 -0
    Environment variables to execute myisamchk and myisampack.

  mysql-test/r/myisampack.result@1.1, 2007-11-07 12:55:27+04:00, svoj@mysql.com +29 -0
    New BitKeeper file ``mysql-test/r/myisampack.result''

  mysql-test/r/myisampack.result@1.0, 2007-11-07 12:55:27+04:00, svoj@mysql.com +0 -0

  mysql-test/t/myisampack.test@1.1, 2007-11-07 12:55:27+04:00, svoj@mysql.com +33 -0
    New BitKeeper file ``mysql-test/t/myisampack.test''

  mysql-test/t/myisampack.test@1.0, 2007-11-07 12:55:27+04:00, svoj@mysql.com +0 -0

  myisam/mi_check.c@1.105.1.59, 2007-11-07 12:55:27+04:00, svoj@mysql.com +21 -18
    With compressed tables compressed record length may be bigger than
    pack_reclength, thus we may allocate insufficient memory for record
    buffer.
    
    Let single function allocate record buffer, performing needed record
    length calculations.
    
    Still, it is not doable with parallel repair, as it allocates needed
    record buffers at once. For parellel repair added better record length
    calculation.

  myisam/mi_open.c@1.80.2.13, 2007-11-07 12:55:27+04:00, svoj@mysql.com +5 -2
    When calculating record buffer size, take into account that compressed
    record length may be bigger than uncompressed.

  myisam/mi_packrec.c@1.25.1.9, 2007-11-07 12:55:27+04:00, svoj@mysql.com +0 -1
    With certain data set share->max_pack_length (compressed record length)
    may be bigger than share->base.pack_reclength (packed record length).
    
    set_if_bigger(pack_reclength, max_pack_length) in this case causes
    myisamchk --unpack to write extra garbage, whereas pack_reclength
    remains the same in new index file. As a result we get unreadable
    table.

  myisam/myisamchk.c@1.92.6.2, 2007-11-07 12:55:27+04:00, svoj@mysql.com +4 -3
    With compressed tables compressed record length may be bigger than
    pack_reclength, thus we may allocate insufficient memory for record
    buffer.
    
    Let single function allocate record buffer, performing needed record
    length calculations.

ChangeSet@1.1616.3111.2, 2007-11-07 12:47:19+04:00, ramil@mysql.com +3 -0
  Fix for bug #32137: prepared statement crash with str_to_date in update clause
  
  Problem: calling non-constant argument's val_xxx() methods 
  in the ::fix_length_and_dec() is inadmissible.
  
  Fix: call the method only for constant arguments.

  mysql-test/r/ps.result@1.31.1.26, 2007-11-07 12:47:18+04:00, ramil@mysql.com +5 -0
    Fix for bug #32137: prepared statement crash with str_to_date in update clause
      - test result.

  mysql-test/t/ps.test@1.27.1.33, 2007-11-07 12:47:18+04:00, ramil@mysql.com +9 -0
    Fix for bug #32137: prepared statement crash with str_to_date in update clause
      - test case.

  sql/item_timefunc.cc@1.51.6.10, 2007-11-07 12:47:18+04:00, ramil@mysql.com +26 -23
    Fix for bug #32137: prepared statement crash with str_to_date in update clause
      - call argument's val_str() only for constant items in the 
        Item_func_str_to_date::fix_length_and_dec().

ChangeSet@1.2476.638.1, 2007-11-07 09:30:41+01:00, istruewing@stella.local +1 -0
  Bug#22351 - handler::index_next_same() call to key_cmp_if_same() uses
              the wrong buffer
  
  handler::index_next_same() did not take into account that the
  internally called function key_cmp_if_same() uses the fixed
  buffer table->record[0] for key comparison instead of the
  buffer provided by the caller of handler::index_next_same().
  
  Added code to temporarily redirect table->record[0] and the fields
  used for the key to the record buffer provided by the caller of
  handler::index_next_same().
  
  The test case is in partition.test already.

  sql/handler.cc@1.315.19.1, 2007-11-07 09:30:38+01:00, istruewing@stella.local +42 -1
    Bug#22351 - handler::index_next_same() call to key_cmp_if_same() uses
                the wrong buffer
    Added code to temporarily redirect table->record[0] and the fields
    used for the key to the record buffer provided by the caller of
    handler::index_next_same().

ChangeSet@1.2476.618.7, 2007-11-06 16:40:50-07:00, tsmith@ramayana.hindu.god +6 -0
  Apply snapshot innodb-5.1-ss2034
  
  The following bugs are fixed:
  
  Bug #31860: Server crashes after inserting into InnoDB table with auto_increment column
    In the Bug 16979 fix there was an erroneous assertion that
    autoincrement columns can't contain negative values. With the fix, the
    autoincrement table counter is set to 0 if the maximum value read from
    the autoinc column index is negative.

  mysql-test/r/innodb.result@1.202.1.2, 2007-11-06 16:33:49-07:00, tsmith@ramayana.hindu.god +16 -0
    Apply snapshot innodb-5.1-ss2034
    
    Revision r2034:
    Fix for Bug# 31860, in the Bug 16979 fix there was an erroneous assertion that
    autoincrement columns can't contain negative values. With the fix, the
    autoincrement table counter is set to 0 if the maximum value read from
    the autoinc column index is negative.
    
    Add test for the bug fix but the test is not really useful as the server
    needs to be restarted half way through the test. It has been added for 
    reference only.

  mysql-test/t/innodb.test@1.171.1.2, 2007-11-06 16:33:49-07:00, tsmith@ramayana.hindu.god +19 -0
    Apply snapshot innodb-5.1-ss2034
    
    Revision r2034:
    Fix for Bug# 31860, in the Bug 16979 fix there was an erroneous assertion that
    autoincrement columns can't contain negative values. With the fix, the
    autoincrement table counter is set to 0 if the maximum value read from
    the autoinc column index is negative.
    
    Add test for the bug fix but the test is not really useful as the server
    needs to be restarted half way through the test. It has been added for 
    reference only.

  storage/innobase/handler/ha_innodb.cc@1.366, 2007-11-06 16:33:49-07:00, tsmith@ramayana.hindu.god +15 -18
    Apply snapshot innodb-5.1-ss2034
    
    Revision r2017:
    Use "InnoDB:" prefix in error messages.
    
    
    Revision r2018:
    Remove ut_print_timestamp(), this should have been removed when the following
    changes were made by MySQL.
    
    	ChangeSet@1.1810.467.1  2005-08-11 19:19:20+03:00  jani@omakaista.fi
    
    Fix error message so that it conforms to "  InnoDB: Error: ...".

  storage/innobase/include/univ.i@1.65, 2007-11-06 16:33:49-07:00, tsmith@ramayana.hindu.god +8 -8
    Apply snapshot innodb-5.1-ss2034
    
    Revision r2015:
    UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Remove warnings on 64-bit systems.

  storage/innobase/row/row0sel.c@1.123, 2007-11-06 16:33:49-07:00, tsmith@ramayana.hindu.god +5 -2
    Apply snapshot innodb-5.1-ss2034
    
    Revision r2034:
    Fix for Bug# 31860, in the Bug 16979 fix there was an erroneous assertion that
    autoincrement columns can't contain negative values. With the fix, the
    autoincrement table counter is set to 0 if the maximum value read from
    the autoinc column index is negative.
    
    Add test for the bug fix but the test is not really useful as the server
    needs to be restarted half way through the test. It has been added for 
    reference only.

  storage/innobase/sync/sync0sync.c@1.50, 2007-11-06 16:33:49-07:00, tsmith@ramayana.hindu.god +1 -1
    Apply snapshot innodb-5.1-ss2034
    
    Revision r2017:
    Use "InnoDB:" prefix in error messages.

ChangeSet@1.2476.618.6, 2007-11-06 15:42:58-07:00, tsmith@ramayana.hindu.god +31 -0
  Apply snapshot innodb-5.1-ss1989
  
  Fixes the following bugs:
  
  Bug #30706: SQL thread on slave is allowed to block client queries when slave load is high
    Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
  
  Bug #30888: Innodb table + stored procedure + row deletion = server crash
    While adding code for the low level read of the AUTOINC value from the index,
    the case for MEDIUM ints which are 3 bytes was missed triggering an
    assertion.
  
  Bug #30907: Regression: "--innodb_autoinc_lock_mode=0" (off) not same as older releases
    We don't rely on *first_value to be 0 when checking whether
    get_auto_increment() has been invoked for the first time in a multi-row
    INSERT. We instead use trx_t::n_autoinc_rows. Initialize trx::n_autoinc_rows
    inside ha_innobase::start_stmt() too.
  
  Bug #31444: "InnoDB: Error: MySQL is freeing a thd" in innodb_mysql.test
    ha_innobase::external_lock(): Update prebuilt->mysql_has_locked and
    trx->n_mysql_tables_in_use only after row_lock_table_for_mysql() returns
    DB_SUCCESS.  A timeout on LOCK TABLES would lead to an inconsistent state,
    which would cause trx_free() to print a warning.
  
  Bug #31494: innodb + 5.1 + read committed crash, assertion
    Set an error code when a deadlock occurs in semi-consistent read.

  mysql-test/r/innodb-semi-consistent.result@1.1, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +36 -0
    Apply snapshot innodb-5.1-ss1989
    
    
    Revision r1988:
    Set an error code when a deadlock occurs in semi-consistent read.  (Bug #31494)
    
    innodb-semi-consistent: New tests for InnoDB semi-consistent reads.
    Unfortunately, these will not trigger Bug #31494, because there merely
    occur lock wait timeouts, not deadlocks.

  mysql-test/r/innodb-semi-consistent.result@1.0, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +0 -0

  mysql-test/r/innodb.result@1.202.1.1, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +36 -40
    Apply snapshot innodb-5.1-ss1989
    
    Also, a test is moved into the new innodb_autoinc_lock_mode_zero
    test, because it depends on a non-default setting for a read-only
    variable.
    
    Revision r1821:
    Merge a change from MySQL AB:
    
    ChangeSet@1.2536.50.1  2007-08-02 12:45:56-07:00  igor@mysql.com
    
    Fixed bug#28404.
    This patch adds cost estimation for the queries with ORDER BY / GROUP BY
    and LIMIT.
    If there was a ref/range access to the table whose rows were required
    to be ordered in the result set the optimizer always employed this access
    though a scan by a different index that was compatible with the required
    order could be cheaper to produce the first L rows of the result set.
    Now for such queries the optimizer makes a choice between the cheapest
    ref/range accesses not compatible with the given order and index scans
    compatible with it.
    
    innodb.result: Adjusted results for test cases affected fy the fix for
    bug #28404.
    
    
    Revision r1781:
    Fix a test case that was broken after Bug#16979 fix. See r1645 and r1735.
    The variable used in the tests below was introduced in r1735.
    
    
    Revision r1792:
    innodb.result: Revert r1655, which should have been reverted as part of r1781.
    
    
    Revision r1843:
    Add test for Bug# 21409, the actual bug was fixed in r1334.

  mysql-test/r/innodb_autoinc_lock_mode_zero.result@1.1, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +39 -0
    New test, using read-only setting --innodb-autoinc-lock-mode=0

  mysql-test/r/innodb_autoinc_lock_mode_zero.result@1.0, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +0 -0

  mysql-test/t/innodb-semi-consistent-master.opt@1.1, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +1 -0
    Apply snapshot innodb-5.1-ss1989
    
    
    Revision r1988:
    Set an error code when a deadlock occurs in semi-consistent read.  (Bug #31494)
    
    innodb-semi-consistent: New tests for InnoDB semi-consistent reads.
    Unfortunately, these will not trigger Bug #31494, because there merely
    occur lock wait timeouts, not deadlocks.

  mysql-test/t/innodb-semi-consistent-master.opt@1.0, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +0 -0

  mysql-test/t/innodb-semi-consistent.test@1.1, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +46 -0
    Apply snapshot innodb-5.1-ss1989
    
    
    Revision r1988:
    Set an error code when a deadlock occurs in semi-consistent read.  (Bug #31494)
    
    innodb-semi-consistent: New tests for InnoDB semi-consistent reads.
    Unfortunately, these will not trigger Bug #31494, because there merely
    occur lock wait timeouts, not deadlocks.

  mysql-test/t/innodb-semi-consistent.test@1.0, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +0 -0

  mysql-test/t/innodb.test@1.171.1.1, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +42 -33
    Apply snapshot innodb-5.1-ss1989
    
    Also, a test is moved into the new innodb_autoinc_lock_mode_zero
    test, because it depends on a non-default setting for a read-only
    variable.
    
    Revision r1781:
    Fix a test case that was broken after Bug#16979 fix. See r1645 and r1735.
    The variable used in the tests below was introduced in r1735.
    
    
    Revision r1843:
    Add test for Bug# 21409, the actual bug was fixed in r1334.

  mysql-test/t/innodb_autoinc_lock_mode_zero-master.opt@1.1, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +1 -0
    New test, using read-only setting --innodb-autoinc-lock-mode=0

  mysql-test/t/innodb_autoinc_lock_mode_zero-master.opt@1.0, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +0 -0

  mysql-test/t/innodb_autoinc_lock_mode_zero.test@1.1, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +44 -0
    New test, using read-only setting --innodb-autoinc-lock-mode=0

  mysql-test/t/innodb_autoinc_lock_mode_zero.test@1.0, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +0 -0

  storage/innobase/buf/buf0lru.c@1.38, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +1 -1
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1819:
    Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
    
    UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
    area is defined.
    
    UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
    
    UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
    writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
    in many places.
    
    mem_init_buf(): Check that the memory is writable, and declare it undefined.
    
    mem_erase_buf(): Check that the memory is writable, and declare it freed.

  storage/innobase/dict/dict0dict.c@1.108, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +4 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1894:
    Add debug lock checks to autoinc functions. Add lock guards around an
    invocation of dict_table_autoinc_initialize().

  storage/innobase/dict/dict0load.c@1.57, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +46 -32
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1974:
    Prevent loading of tables that have unsupported features most notably
    FTS indexes.

  storage/innobase/handler/ha_innodb.cc@1.365, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +67 -31
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1850:
    Implement this feature request:
    http://bugs.mysql.com/30706
    
    * Add a function that returns the number of microseconds since
      epoch - ut_time_us().
    
    * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
    
    * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
      until a timeout elapses.
    
    * Using all of the above, handle the replication thread specially in
      srv_conc_enter_innodb().
    
    Approved by:	Heikki
    
    
    
    Revision r1887:
    Merge changes from MySQL AB:
    
    ChangeSet@1.2528.115.25  2007-08-27 18:18:14-06:00  tsmith@hindu.god
    
    Fix some Windows compiler warnings.
    
    dict0mem.c: Fix compiler warning with a cast.
    
    ha_innodb.cc: Change type to fix a compiler warning.
    
    
    Revision r1809:
    ha_innobase::external_lock(): Update prebuilt->mysql_has_locked and
    trx->n_mysql_tables_in_use only after row_lock_table_for_mysql()
    returns DB_SUCCESS.  A timeout on LOCK TABLES would lead to an
    inconsistent state, which would cause trx_free() to print a warning.
    
    This was later reported as Bug #31444.
    
    
    Revision r1833:
    Add /*== ... === */ decoration that was missing around some auto-inc functions.
    Add a missing comment, fix the length of a decoration.  Initialize the *value
    out parameter in ha_innobase::innobase_get_auto_increment().
    
    
    Revision r1866:
    Revert r1850 as MySQL did not approve the addition.
    
    log for r1850:
    
    Implement this feature request:
    http://bugs.mysql.com/30706
    
    * Add a function that returns the number of microseconds since
      epoch - ut_time_us().
    
    * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
    
    * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
      until a timeout elapses.
    
    * Using all of the above, handle the replication thread specially in
      srv_conc_enter_innodb().
    
    
    Revision r1846:
    Add config option innodb_use_adaptive_hash_indexes to enable/disable
    adaptive hash indexes. It is enabled by default (no change in default
    behavior).
    
    Approved by:	Marko
    
    
    Revision r1974:
    Prevent loading of tables that have unsupported features most notably
    FTS indexes.
    
    
    Revision r1829:
    Add assertion to enforce check of an implicit invariant and add comment about
    retry of autoinc read semantics. We always reread the table's autoinc counter
    after attempting to initialize it i.e., we want to guarantee that a read of
    autoinc valus that is returned to the caller is always covered by the
    AUTOINC locking mechanism.
    
    
    Revision r1787:
    Move the prototype of innobase_print_identifier() from ut0ut.c to
    ha_prototypes.h.  Enclose the definitions in ha_prototypes.h in
    #ifndef UNIV_HOTBACKUP.
    
    
    Revision r1888:
    Merge a change from MySQL AB:
    
    ChangeSet@1.2528.115.30  2007-08-28 10:17:15-06:00  tsmith@hindu.god
    
    Fix another compiler warning on Windows in InnoDB.
    
    ha_innodb.cc:
    
    Fix compiler warning: ::get_auto_increment takes a ulonglong
    for nb_desired_values, but InnoDB's trx struct stores it as
    a ulint (unsigned long).  Probably harmless, as a single
    statement won't be asking for more than 2^32 rows.
    
    
    Revision r1987:
    Bug fix: The problem was that when write_row() attempted to update the max
    autoinc value, and if it was rolled back because of a deadlock, the 
    deadlock error (transaction rollback) was not being propagated back to MySQL.
    
    
    Revision r1889:
    Merge a change from MySQL AB:
    
    ChangeSet@1.2560  2007-09-21 10:15:16+02:00  gkodinov@local
    
    ha_innodb.cc: fixed type conversion warnings revealed by bug 30639 
    
    
    Revision r1989:
    Suppress printing of deadlock errors while reading the autoinc value.
    DB_DEADLOCK errors are part of normal processing and excessive printing
    of these error messages could be disconcerting for users. 
    
    
    Revision r1828:
    Fix two bugs:
    
    Bug# 30907: We don't rely on *first_value to be 0 when checking whether
    get_auto_increment() has been invoked for the first time in a multi-row
    INSERT. We instead use trx_t::n_autoinc_rows. Initialize trx::n_autoinc_rows
    inside ha_innobase::start_stmt() too.
    
    Bug# 30888: While adding code for the low level read of the AUTOINC value
    from the index, the case for MEDIUM ints which are 3 bytes was missed
    triggering an assertion.

  storage/innobase/handler/ha_innodb.h@1.147, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +0 -14
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1844:
    Remove the prototypes of some functions inside #if 0.
    The function definitions were removed in r1746.

  storage/innobase/ibuf/ibuf0ibuf.c@1.55, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +2 -2
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1965:
    ibuf_insert_to_index_page(): Fix typos in diagnostic output.

  storage/innobase/include/db0err.h@1.15, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +4 -2
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1974:
    Prevent loading of tables that have unsupported features most notably
    FTS indexes.

  storage/innobase/include/ha_prototypes.h@1.3, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +16 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1787:
    Move the prototype of innobase_print_identifier() from ut0ut.c to
    ha_prototypes.h.  Enclose the definitions in ha_prototypes.h in
    #ifndef UNIV_HOTBACKUP.

  storage/innobase/include/mach0data.h@1.7, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +11 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1779:
    Fix a bug that handles the case where the host specific byte order matches
    the InnoDB storage byte order, which is big-endian.

  storage/innobase/include/mach0data.ic@1.11, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +37 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1779:
    Fix a bug that handles the case where the host specific byte order matches
    the InnoDB storage byte order, which is big-endian.

  storage/innobase/include/mem0dbg.h@1.10, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +8 -8
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1830:
    Improve memory debugging.  This is follow-up to r1819.
    
    mem_heap_validate(): Compile this function also if UNIV_MEM_DEBUG is
    defined.  Previously, this function was only compiled with UNIV_DEBUG.
    
    mem_heap_free_heap_top(): Flag the memory allocated, not freed, for
    Valgrind.  Otherwise, Valgrind would complain on the second call of
    mem_heap_empty().
    
    UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display additional diagnostics
    for failed Valgrind checks.

  storage/innobase/include/mem0mem.ic@1.21, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +9 -7
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1830:
    Improve memory debugging.  This is follow-up to r1819.
    
    mem_heap_validate(): Compile this function also if UNIV_MEM_DEBUG is
    defined.  Previously, this function was only compiled with UNIV_DEBUG.
    
    mem_heap_free_heap_top(): Flag the memory allocated, not freed, for
    Valgrind.  Otherwise, Valgrind would complain on the second call of
    mem_heap_empty().
    
    UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display additional diagnostics
    for failed Valgrind checks.
    
    
    Revision r1937:
    mem_heap_free_top(): Remove a bogus Valgrind warning.
    
    
    Revision r1819:
    Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
    
    UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
    area is defined.
    
    UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
    
    UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
    writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
    in many places.
    
    mem_init_buf(): Check that the memory is writable, and declare it undefined.
    
    mem_erase_buf(): Check that the memory is writable, and declare it freed.

  storage/innobase/include/rem0rec.ic@1.31, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +1 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1918:
    Improve Valgrind instrumentation.
    
    rec_offs_set_n_alloc(): Use UNIV_MEM_ASSERT_AND_ALLOC().
    
    UNIV_MEM_ASSERT_AND_ALLOC(): New directive, similar to
    UNIV_MEM_ASSERT_AND_FREE().

  storage/innobase/include/row0mysql.h@1.54, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +8 -5
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1783:
    Correct the function comments of row_create_table_for_mysql() and
    row_drop_table_for_mysql().

  storage/innobase/include/sync0rw.h@1.22, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +2 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1757:
    Enclose rw_lock_validate() in #ifdef UNIV_DEBUG.  It is only called by
    debug assertions.

  storage/innobase/include/univ.i@1.64, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +28 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1827:
    Merge r1826 from branches/zip: UNIV_MEM_ASSERT_AND_FREE():
    Use UNIV_MEM_ASSERT_W() instead of UNIV_MEM_ASSERT_RW().
    The memory area need not be initialized.
    This mistake was made in r1815.
    
    
    Revision r1918:
    Improve Valgrind instrumentation.
    
    rec_offs_set_n_alloc(): Use UNIV_MEM_ASSERT_AND_ALLOC().
    
    UNIV_MEM_ASSERT_AND_ALLOC(): New directive, similar to
    UNIV_MEM_ASSERT_AND_FREE().
    
    
    Revision r1830:
    Improve memory debugging.  This is follow-up to r1819.
    
    mem_heap_validate(): Compile this function also if UNIV_MEM_DEBUG is
    defined.  Previously, this function was only compiled with UNIV_DEBUG.
    
    mem_heap_free_heap_top(): Flag the memory allocated, not freed, for
    Valgrind.  Otherwise, Valgrind would complain on the second call of
    mem_heap_empty().
    
    UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display additional diagnostics
    for failed Valgrind checks.
    
    
    Revision r1819:
    Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
    
    UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
    area is defined.
    
    UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
    
    UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
    writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
    in many places.
    
    mem_init_buf(): Check that the memory is writable, and declare it undefined.
    
    mem_erase_buf(): Check that the memory is writable, and declare it freed.
    
    
    Revision r1948:
    UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display also __FILE__ and __LINE__
    when these Valgrind checks fail.

  storage/innobase/include/ut0ut.h@1.25, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +18 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1850:
    Implement this feature request:
    http://bugs.mysql.com/30706
    
    * Add a function that returns the number of microseconds since
      epoch - ut_time_us().
    
    * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
    
    * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
      until a timeout elapses.
    
    * Using all of the above, handle the replication thread specially in
      srv_conc_enter_innodb().
    
    Approved by:	Heikki
    
    
    
    Revision r1862:
    Add ut_snprintf() function. On Windows this needs to be implemented
    using auxiliary functions because there is no snprintf-variant on
    Windows that behaves exactly as specified in the standard:
    
    * Always return the number of characters that would have been printed
      if the size were unlimited (not including the final `\0').
    * Always '\0'-terminate the result
    * Do not touch the buffer if size=0, only return the number of characters
      that would have been printed. Can be used to estimate the size needed
      and to allocate it dynamically.
    
    See http://www.freebsd.org/cgi/query-pr.cgi?pr=87260 for the reason why
    2 ap variables are used.
    
    Approved by:	Heikki
    
    
    Revision r1866:
    Revert r1850 as MySQL did not approve the addition.
    
    log for r1850:
    
    Implement this feature request:
    http://bugs.mysql.com/30706
    
    * Add a function that returns the number of microseconds since
      epoch - ut_time_us().
    
    * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
    
    * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
      until a timeout elapses.
    
    * Using all of the above, handle the replication thread specially in
      srv_conc_enter_innodb().

  storage/innobase/mem/mem0dbg.c@1.25, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +24 -16
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1830:
    Improve memory debugging.  This is follow-up to r1819.
    
    mem_heap_validate(): Compile this function also if UNIV_MEM_DEBUG is
    defined.  Previously, this function was only compiled with UNIV_DEBUG.
    
    mem_heap_free_heap_top(): Flag the memory allocated, not freed, for
    Valgrind.  Otherwise, Valgrind would complain on the second call of
    mem_heap_empty().
    
    UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display additional diagnostics
    for failed Valgrind checks.
    
    
    Revision r1819:
    Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
    
    UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
    area is defined.
    
    UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
    
    UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
    writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
    in many places.
    
    mem_init_buf(): Check that the memory is writable, and declare it undefined.
    
    mem_erase_buf(): Check that the memory is writable, and declare it freed.

  storage/innobase/mem/mem0mem.c@1.20, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +3 -3
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1819:
    Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
    
    UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
    area is defined.
    
    UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
    
    UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
    writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
    in many places.
    
    mem_init_buf(): Check that the memory is writable, and declare it undefined.
    
    mem_erase_buf(): Check that the memory is writable, and declare it freed.

  storage/innobase/row/row0mysql.c@1.144, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +38 -44
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1786:
    row_create_table_for_mysql(), row_truncate_table_for_mysql(),
    row_drop_table_for_mysql(): Do not mention innodb_force_recovery
    when newraw is set.
    
    
    Revision r1790:
    row_drop_table_for_mysql(): Before calling
    dict_table_remove_from_cache(table) and thus freeing the memory
    allocated for the table, copy the table name.  This avoids reading
    freed memory when name == table->name.
    
    Approved by Sunny.
    
    
    Revision r1783:
    Correct the function comments of row_create_table_for_mysql() and
    row_drop_table_for_mysql().
    
    
    Revision r1894:
    Add debug lock checks to autoinc functions. Add lock guards around an
    invocation of dict_table_autoinc_initialize().

  storage/innobase/row/row0sel.c@1.122, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +48 -27
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1782:
    Add comment that the variable dest should be word aligned. After discussion
    on IM with Heikki.
    
    
    Revision r1988:
    Set an error code when a deadlock occurs in semi-consistent read.  (Bug #31494)
    
    innodb-semi-consistent: New tests for InnoDB semi-consistent reads.
    Unfortunately, these will not trigger Bug #31494, because there merely
    occur lock wait timeouts, not deadlocks.
    
    
    Revision r1820:
    Use the clustered index and not the one selected by the optimizer in the plan,
    when building a previous version of the row. This bug is triggered when
    running queries via InnoDB's internal SQL parser; when InnoDB's optimizer
    selects a secondary index for the plan.
    
    
    Revision r1828:
    Fix two bugs:
    
    Bug# 30907: We don't rely on *first_value to be 0 when checking whether
    get_auto_increment() has been invoked for the first time in a multi-row
    INSERT. We instead use trx_t::n_autoinc_rows. Initialize trx::n_autoinc_rows
    inside ha_innobase::start_stmt() too.
    
    Bug# 30888: While adding code for the low level read of the AUTOINC value
    from the index, the case for MEDIUM ints which are 3 bytes was missed
    triggering an assertion.
    
    
    Revision r1779:
    Fix a bug that handles the case where the host specific byte order matches
    the InnoDB storage byte order, which is big-endian.

  storage/innobase/sync/sync0rw.c@1.34, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +3 -3
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1757:
    Enclose rw_lock_validate() in #ifdef UNIV_DEBUG.  It is only called by
    debug assertions.

  storage/innobase/ut/ut0ut.c@1.42, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +51 -20
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1850:
    Implement this feature request:
    http://bugs.mysql.com/30706
    
    * Add a function that returns the number of microseconds since
      epoch - ut_time_us().
    
    * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
    
    * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
      until a timeout elapses.
    
    * Using all of the above, handle the replication thread specially in
      srv_conc_enter_innodb().
    
    Approved by:	Heikki
    
    
    
    Revision r1873:
    snprintf() should always return non-negative result. According to
    Microsoft documentation about _vscprintf():
    
      If format is a null pointer, the invalid parameter handler is invoked,
      as described in Parameter Validation. If execution is allowed to
      continue, the functions return -1 and set errno to EINVAL.
    
    The UNIX variant of snprintf() segfaults if format is a NULL pointer
    (similar to strlen(NULL) for example), so it is better to conform to
    this behavior and crash our custom Windows version instead of
    returning -1. Noone would expect -1 to be returned from snprintf().
    
    Cosmetic: Add a space after typecast.
    
    Approved by:	Marko
    
    
    Revision r1862:
    Add ut_snprintf() function. On Windows this needs to be implemented
    using auxiliary functions because there is no snprintf-variant on
    Windows that behaves exactly as specified in the standard:
    
    * Always return the number of characters that would have been printed
      if the size were unlimited (not including the final `\0').
    * Always '\0'-terminate the result
    * Do not touch the buffer if size=0, only return the number of characters
      that would have been printed. Can be used to estimate the size needed
      and to allocate it dynamically.
    
    See http://www.freebsd.org/cgi/query-pr.cgi?pr=87260 for the reason why
    2 ap variables are used.
    
    Approved by:	Heikki
    
    
    Revision r1866:
    Revert r1850 as MySQL did not approve the addition.
    
    log for r1850:
    
    Implement this feature request:
    http://bugs.mysql.com/30706
    
    * Add a function that returns the number of microseconds since
      epoch - ut_time_us().
    
    * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
    
    * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
      until a timeout elapses.
    
    * Using all of the above, handle the replication thread specially in
      srv_conc_enter_innodb().
    
    
    Revision r1787:
    Move the prototype of innobase_print_identifier() from ut0ut.c to
    ha_prototypes.h.  Enclose the definitions in ha_prototypes.h in
    #ifndef UNIV_HOTBACKUP.
    
    
    Revision r1789:
    ut_print_namel(): Do not assume that all '/' are separators between
    database and table names.
    
    Approved by Heikki.
    
    
    Revision r1936:
    ut_print_buf(): Add a Valgrind check that the buffer is wholly defined.

ChangeSet@1.2476.634.4, 2007-11-06 22:28:44+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  only potentially skip GAP event on startup, not on cluster restart

  sql/ha_ndbcluster_binlog.cc@1.131.1.8, 2007-11-06 22:28:41+01:00, tomas@whalegate.ndb.mysql.com +1 -0
    only potentially skip GAP event on startup, not on cluster restart

ChangeSet@1.2476.580.34, 2007-11-06 21:57:51+03:00, sergefp@mysql.com +1 -0
  Better comments

  sql/opt_range.h@1.81, 2007-11-06 21:57:39+03:00, sergefp@mysql.com +7 -2
    Better comments

ChangeSet@1.1810.3463.5, 2007-11-06 20:31:40+02:00, aelkin@koti.dsl.inet.fi +2 -0
  bug#27571
  
  refining non-deterministic tests.
  The new Bug@32148 is in the way. Adjuting the tests to be somehow useful.
   

  mysql-test/r/binlog_killed.result@1.6.3.1, 2007-11-06 20:31:37+02:00, aelkin@koti.dsl.inet.fi +4 -0
    results changed

  mysql-test/t/binlog_killed.test@1.6.4.1, 2007-11-06 20:31:37+02:00, aelkin@koti.dsl.inet.fi +15 -0
    refining the tests as killing is inherently non-deterministic;
    leaving todos.

ChangeSet@1.2476.605.13, 2007-11-06 20:09:45+02:00, aelkin@koti.dsl.inet.fi +1 -0
  bug#27571
  
  tests fixing: refreshing the results file.

  mysql-test/suite/binlog/r/binlog_killed.result@1.13, 2007-11-06 20:09:40+02:00, aelkin@koti.dsl.inet.fi +8 -0
    results changed

ChangeSet@1.2476.637.1, 2007-11-06 17:51:32+01:00, mats@kindahl-laptop.dnsalias.net +3 -0
  BUG#12092 (FOUND_ROWS() not replicated):
  
  In BUG#30244 added FOUND_ROWS() as an unsafe function, but that
  works only in mixed mode under 5.1. There is a workaround that
  can be used in statement-based mode either under 5.0 or 5.1
  where the result of FOUND_ROWS() is stored into a user vari-
  able and used that way instead. This will replicate correctly
  even under statement-based replication, since it will write
  a User_var entry to the binary log. For some other cases, the
  value has to be passed explicitly.
  
  This patch adds tests to demonstrate that the workarounds docu-
  mented for statement-based replication works as advertised, and
  does more extensive tests for cases that does not work under sta-
  tement-based replication actually work under mixed mode by switch-
  ing to row-based replication.

  mysql-test/include/reset_master_and_slave.inc@1.1, 2007-11-06 17:51:23+01:00, mats@kindahl-laptop.dnsalias.net +10 -0
    New BitKeeper file ``mysql-test/include/reset_master_and_slave.inc''

  mysql-test/include/reset_master_and_slave.inc@1.0, 2007-11-06 17:51:23+01:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/r/rpl_found_rows.result@1.1, 2007-11-06 17:51:23+01:00, mats@kindahl-laptop.dnsalias.net +228 -0
    New BitKeeper file ``mysql-test/suite/rpl/r/rpl_found_rows.result''

  mysql-test/suite/rpl/r/rpl_found_rows.result@1.0, 2007-11-06 17:51:23+01:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/t/rpl_found_rows.test@1.1, 2007-11-06 17:51:23+01:00, mats@kindahl-laptop.dnsalias.net +251 -0
    New BitKeeper file ``mysql-test/suite/rpl/t/rpl_found_rows.test''

  mysql-test/suite/rpl/t/rpl_found_rows.test@1.0, 2007-11-06 17:51:23+01:00, mats@kindahl-laptop.dnsalias.net +0 -0

ChangeSet@1.2476.605.12, 2007-11-06 16:32:55+02:00, aelkin@koti.dsl.inet.fi +1 -0
  results from 5.0 is not needed

  BitKeeper/deleted/.del-binlog_killed_simulate.result@1.2, 2007-11-06 16:29:04+02:00, aelkin@koti.dsl.inet.fi +0 -0
    Delete: mysql-test/r/binlog_killed_simulate.result

ChangeSet@1.1810.3463.4, 2007-11-06 16:25:32+02:00, aelkin@koti.dsl.inet.fi +1 -0
  bug#27571
  
  fixing tests

  mysql-test/r/binlog_killed_simulate.result@1.1, 2007-11-06 16:25:29+02:00, aelkin@koti.dsl.inet.fi +33 -0
    the new tests' result

  mysql-test/r/binlog_killed_simulate.result@1.0, 2007-11-06 16:25:29+02:00, aelkin@koti.dsl.inet.fi +0 -0

ChangeSet@1.2476.634.3, 2007-11-06 15:12:27+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #31484    Cluster LOST_EVENTS entry not added to binlog on mysqld restart
  - correction, do not insert GAP on first startup

  sql/ha_ndbcluster_binlog.cc@1.131.1.7, 2007-11-06 15:12:25+01:00, tomas@whalegate.ndb.mysql.com +20 -2
    Bug #31484    Cluster LOST_EVENTS entry not added to binlog on mysqld restart
    - correction, do not insert GAP on first startup

ChangeSet@1.1346.896.1, 2007-11-06 18:09:33+04:00, svoj@mysql.com +3 -0
  BUG#32111 - Security Breach via DATA/INDEX DIRECORY and RENAME TABLE
  
  RENAME TABLE against a table with DATA/INDEX DIRECTORY overwrites
  the file to which the symlink points.
  
  This is security issue, because it is possible to create a table with
  some name in some non-system database and set DATA/INDEX DIRECTORY
  to mysql system database. Renaming this table to one of mysql system
  tables (e.g. user, host) would overwrite the system table.
  
  Return an error when the file to which the symlink points exist.

  mysql-test/r/symlink.result@1.4.1.4, 2007-11-06 18:09:32+04:00, svoj@mysql.com +6 -0
    A test case for BUG#32111.

  mysql-test/t/symlink.test@1.3.1.4, 2007-11-06 18:09:32+04:00, svoj@mysql.com +12 -0
    A test case for BUG#32111.

  mysys/my_symlink2.c@1.6.1.1, 2007-11-06 18:09:32+04:00, svoj@mysql.com +10 -1
    Return an error when the file to which the symlink points exist.

ChangeSet@1.2476.635.3, 2007-11-06 14:47:15+01:00, istruewing@stella.local +2 -0
  Bug#4692 - DISABLE/ENABLE KEYS waste a space
  Post-merge fix. Moved test into 5.0 section.

  mysql-test/r/myisam.result@1.115, 2007-11-06 14:47:14+01:00, istruewing@stella.local +25 -25
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Post-merge fix. Moved test into 5.0 section.

  mysql-test/t/myisam.test@1.86.1.4, 2007-11-06 14:47:14+01:00, istruewing@stella.local +26 -25
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Post-merge fix. Moved test into 5.0 section.

ChangeSet@1.2476.616.10, 2007-11-06 15:29:55+02:00, gkodinov@magare.gmz +2 -0
  Bug #31974: additional commit (test case updates)
   loose index scan enabled for subqueries

  mysql-test/r/group_min_max.result@1.37, 2007-11-06 15:29:54+02:00, gkodinov@magare.gmz +2 -2
    Bug #31974: test case updates
     loose index scan enabled for subqueries

  mysql-test/r/index_merge_myisam.result@1.10, 2007-11-06 15:29:54+02:00, gkodinov@magare.gmz +1 -1
    Bug #31974: test case updates
     loose index scan enabled for subqueries

ChangeSet@1.1810.3463.3, 2007-11-06 15:11:59+02:00, aelkin@koti.dsl.inet.fi +2 -0
  bug#27571
  
  removing extra tests (on 5.1 that's been already done)

  BitKeeper/deleted/.del-binlog_killed_bug27571-master.opt@1.1.1.1, 2007-11-06 15:09:37+02:00, aelkin@koti.dsl.inet.fi +0 -0
    Delete: mysql-test/t/binlog_killed_bug27571-master.opt

  BitKeeper/deleted/.del-binlog_killed_bug27571.test@1.1.1.1, 2007-11-06 15:09:42+02:00, aelkin@koti.dsl.inet.fi +0 -0
    Delete: mysql-test/t/binlog_killed_bug27571.test

ChangeSet@1.2476.580.33, 2007-11-06 16:53:02+04:00, gluh@mysql.com +2 -0
  fix for pushbuild 'powermacg5' failure

  mysql-test/r/information_schema.result@1.151.1.21, 2007-11-06 16:53:01+04:00, gluh@mysql.com +3 -3
    result fix

  mysql-test/t/information_schema.test@1.98.1.17, 2007-11-06 16:53:01+04:00, gluh@mysql.com +1 -1
    test fix

ChangeSet@1.1810.3454.7, 2007-11-06 13:41:32+01:00, istruewing@stella.local +3 -0
  Bug#4692 - DISABLE/ENABLE KEYS waste a space
  
  Disabling and enabling indexes on a non-empty table grows the
  index file.
  
  Disabling indexes just sets a flag per non-unique index and does not
  free the index blocks of the affected indexes. Re-enabling indexes
  creates new indexes with new blocks. The old blocks remain unused
  in the index file.
  
  Fixed by dropping and re-creating all indexes if non-empty disabled
  indexes exist when enabling indexes. Dropping all indexes resets
  the internal end-of-file marker to the end of the index file header.
  It also clears the root block pointers of every index and clears the
  deleted blocks chains. This way all blocks are declared as free.

  mysql-test/r/myisam.result@1.71.13.1, 2007-11-06 13:41:31+01:00, istruewing@stella.local +25 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added test result.

  mysql-test/t/myisam.test@1.55.12.1, 2007-11-06 13:41:31+01:00, istruewing@stella.local +26 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added test.

  myisam/mi_check.c@1.129.28.1, 2007-11-06 13:41:31+01:00, istruewing@stella.local +167 -57
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added function mi_drop_all_indexes() to support drop of all indexes
    in case we want to re-enable non-empty disabled indexes.
    Changed mi_repair(), mi_repair_by_sort(), and mi_repair_parallel()
    to use the new function instead of duplicate drop index code.

ChangeSet@1.1810.3463.2, 2007-11-06 13:53:26+02:00, aelkin@koti.dsl.inet.fi +3 -0
  bug#27571
  
  commit is specific for 5.0 to eliminated non-deterministic tests.
  Those tests run only in 5.1 env where there is a necessary devices such
  as processlist table of info_schema.

  mysql-test/r/binlog_killed.result@1.6.2.1, 2007-11-06 13:53:23+02:00, aelkin@koti.dsl.inet.fi +5 -71
    results changed

  mysql-test/t/binlog_killed.test@1.6.3.1, 2007-11-06 13:53:24+02:00, aelkin@koti.dsl.inet.fi +13 -105
    removing non-deterministic part of the test

  mysql-test/t/binlog_killed_simulate.test@1.1.1.1, 2007-11-06 13:53:24+02:00, aelkin@koti.dsl.inet.fi +1 -0
    adding the guard same as for 5.1 version

ChangeSet@1.2476.605.9, 2007-11-06 13:08:37+02:00, aelkin@koti.dsl.inet.fi +1 -0
  bug#27571
  
  non-deterministic tests refining.
  This particular patch tested on two archs.

  mysql-test/suite/binlog/t/binlog_killed.test@1.11.1.5, 2007-11-06 13:08:34+02:00, aelkin@koti.dsl.inet.fi +9 -2
    deploying synchronization of killing with reaching the explected state
    of the prey's connection.

ChangeSet@1.2476.590.12, 2007-11-06 10:57:49+01:00, mskold@mysql.com +3 -0
  ndb_auto_increment.result:
    Rename: mysql-test/r/ndb_auto_increment.result -> mysql-test/suite/ndb/r/ndb_auto_increment.result
  ndb_auto_increment.test, ndb_auto_increment.result:
    Bug #31956       auto increment bugs in MySQL Cluster: Adapted test cases
  ha_ndbcluster.cc:
    Bug #31956       auto increment bugs in MySQL Cluster: Merging from 5.0
  ndb_auto_increment.test:
    Rename: mysql-test/t/ndb_auto_increment.test -> mysql-test/suite/ndb/t/ndb_auto_increment.test

  mysql-test/suite/ndb/r/ndb_auto_increment.result@1.3, 2007-11-06 10:57:21+01:00, mskold@mysql.com +1 -1
    Bug #31956       auto increment bugs in MySQL Cluster: Adapted test cases

  mysql-test/suite/ndb/r/ndb_auto_increment.result@1.2, 2007-11-06 07:15:46+01:00, mskold@mysql.com +0 -0
    Rename: mysql-test/r/ndb_auto_increment.result -> mysql-test/suite/ndb/r/ndb_auto_increment.result

  mysql-test/suite/ndb/t/ndb_auto_increment.test@1.3, 2007-11-06 10:56:51+01:00, mskold@mysql.com +0 -1
    Bug #31956       auto increment bugs in MySQL Cluster: Adapted test cases

  mysql-test/suite/ndb/t/ndb_auto_increment.test@1.2, 2007-11-06 07:15:09+01:00, mskold@mysql.com +0 -0
    Rename: mysql-test/t/ndb_auto_increment.test -> mysql-test/suite/ndb/t/ndb_auto_increment.test

  sql/ha_ndbcluster.cc@1.461.9.9, 2007-11-06 10:54:42+01:00, mskold@mysql.com +66 -23
    Bug #31956       auto increment bugs in MySQL Cluster: Merging from 5.0

ChangeSet@1.2476.605.8, 2007-11-06 11:53:47+02:00, aelkin@koti.dsl.inet.fi +2 -0
  bug#27571 
  
  non-deterministic tests execution on some platforms.

  mysql-test/suite/binlog/r/binlog_killed.result@1.11, 2007-11-06 11:53:44+02:00, aelkin@koti.dsl.inet.fi +4 -1
    results changed

  mysql-test/suite/binlog/t/binlog_killed.test@1.11.1.4, 2007-11-06 11:53:44+02:00, aelkin@koti.dsl.inet.fi +5 -3
    correcting the prev test's cleanup;
    increasing time to wait by to be killed query;
    adding the masking out error due to Bug@32140 wrong error code caught when an SF() call is interruped with KILL query

ChangeSet@1.1810.3217.23, 2007-11-06 10:28:11+01:00, mskold@mysql.com +1 -0
  Removed compiler warnings

  sql/ha_ndbcluster.cc@1.175.91.5, 2007-11-06 10:28:04+01:00, mskold@mysql.com +6 -7
    Removed compiler warnings

ChangeSet@1.2476.634.2, 2007-11-06 10:27:56+01:00, tomas@whalegate.ndb.mysql.com +3 -0
  break out tuple data read

  sql/ha_ndbcluster_binlog.cc@1.131.1.6, 2007-11-06 10:27:53+01:00, tomas@whalegate.ndb.mysql.com +15 -10
    more state saving

  storage/ndb/tools/restore/Restore.cpp@1.55, 2007-11-06 10:27:53+01:00, tomas@whalegate.ndb.mysql.com +84 -72
    ndb:
    break out tuple data read for ndb_restore
    more save state in run query

  storage/ndb/tools/restore/Restore.hpp@1.32, 2007-11-06 10:27:53+01:00, tomas@whalegate.ndb.mysql.com +4 -0
    break out tuple data read

ChangeSet@1.2476.631.3, 2007-11-05 16:52:04-07:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  fixed coding style

  sql/sql_yacc.yy@1.601.8.3, 2007-11-05 16:51:58-07:00, malff@lambda.hsd1.co.comcast.net. +4 -3
    Fixed coding style (tabs)

ChangeSet@1.2476.634.1, 2007-11-05 23:23:26+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  preserve more of the state

  sql/ha_ndbcluster_binlog.cc@1.131.1.5, 2007-11-05 23:23:24+01:00, tomas@whalegate.ndb.mysql.com +4 -2
    preserve more of the state

ChangeSet@1.2476.605.7, 2007-11-05 22:10:25+02:00, aelkin@koti.dsl.inet.fi +3 -0
  bug#27571 asynchronous setting mysql_`query`::error and Query_log_e::error_code
  
  refining tests as they appear to be non-deterministic.

  mysql-test/suite/binlog/r/binlog_killed.result@1.10, 2007-11-05 22:10:18+02:00, aelkin@koti.dsl.inet.fi +32 -23
    results changed

  mysql-test/suite/binlog/t/binlog_killed.test@1.11.1.3, 2007-11-05 22:10:18+02:00, aelkin@koti.dsl.inet.fi +31 -19
    restructuring the test to deliver more deterministic outcome.
    order-by for update and delete did not guaratee the order of scanning.
    --error are masked with zero in order to catch more info if killing
    really will happen to be non-deterministic on some platform (witnessed
    something like that on dl145j)

  mysql-test/suite/binlog/t/binlog_killed_simulate.test@1.4, 2007-11-05 22:10:18+02:00, aelkin@koti.dsl.inet.fi +1 -0
    important guard added

ChangeSet@1.1810.3217.22, 2007-11-05 20:18:22+01:00, mskold@mysql.com +7 -0
  ha_ndbcluster.h:
    Bug #31956       auto increment bugs in MySQL Cluster: Added utility method and constant for internal prefetch default
  ndb_auto_increment.result:
    BitKeeper file /home/marty/MySQL/mysql-5.0-ndb/mysql-test/r/ndb_auto_increment.result
  mysqld.cc:
    Bug #25176  	Trying to set ndb_autoincrement_prefetch_sz always fails: Changed pointer to max value
    Bug #31956  	auto increment bugs in MySQL Cluster: Changed meaning of ndb_autoincrement_prefetch_sz to specify prefetch between statements, changed default to 1 (with internal prefetch to at least 32 inside a statement)
  ndb_insert.test, ndb_insert.result:
    Moved auto_increment tests to ndb_auto_increment.test
  ndb_auto_increment.test:
    BitKeeper file /home/marty/MySQL/mysql-5.0-ndb/mysql-test/t/ndb_auto_increment.test
  ha_ndbcluster.cc:
    Bug #31956       auto increment bugs in MySQL Cluster: Changed meaning of ndb_autoincrement_prefetch_sz to specify prefetch between statements, changed default to 1 (with internal prefetch to at least 32 inside a statement), added handling of updates of pk/unique key with auto_increment
    Bug #32055  	Cluster does not handle auto inc correctly with insert ignore statement

  mysql-test/r/ndb_auto_increment.result@1.1, 2007-11-05 18:15:18+01:00, mskold@mysql.com +445 -0
    BitKeeper file /home/marty/MySQL/mysql-5.0-ndb/mysql-test/r/ndb_auto_increment.result

  mysql-test/r/ndb_auto_increment.result@1.0, 2007-11-05 18:15:18+01:00, mskold@mysql.com +0 -0

  mysql-test/r/ndb_insert.result@1.8.1.5, 2007-11-05 18:16:18+01:00, mskold@mysql.com +0 -169
    Moved auto_increment tests to ndb_auto_increment.test

  mysql-test/t/ndb_auto_increment.test@1.1, 2007-11-05 18:15:18+01:00, mskold@mysql.com +294 -0
    BitKeeper file /home/marty/MySQL/mysql-5.0-ndb/mysql-test/t/ndb_auto_increment.test

  mysql-test/t/ndb_auto_increment.test@1.0, 2007-11-05 18:15:18+01:00, mskold@mysql.com +0 -0

  mysql-test/t/ndb_insert.test@1.12.1.3, 2007-11-05 18:15:54+01:00, mskold@mysql.com +0 -138
    Moved auto_increment tests to ndb_auto_increment.test

  sql/ha_ndbcluster.cc@1.175.91.4, 2007-11-05 18:11:55+01:00, mskold@mysql.com +62 -22
    Bug #31956       auto increment bugs in MySQL Cluster: Changed meaning of ndb_autoincrement_prefetch_sz to specify prefetch between statements, changed default to 1 (with internal prefetch to at least 32 inside a statement), added handling of updates of pk/unique key with auto_increment
    Bug #32055  	Cluster does not handle auto inc correctly with insert ignore statement

  sql/ha_ndbcluster.h@1.82.4.20, 2007-11-05 18:09:13+01:00, mskold@mysql.com +3 -0
    Bug #31956       auto increment bugs in MySQL Cluster: Added utility method and constant for internal prefetch default

  sql/mysqld.cc@1.439.138.1, 2007-11-05 18:04:13+01:00, mskold@mysql.com +2 -2
    Bug #25176  	Trying to set ndb_autoincrement_prefetch_sz always fails: Changed pointer to max value
    Bug #31956  	auto increment bugs in MySQL Cluster: Changed meaning of ndb_autoincrement_prefetch_sz to specify prefetch between statements, changed default to 1 (with internal prefetch to at least 32 inside a statement)

ChangeSet@1.1810.3453.3, 2007-11-05 17:48:11+01:00, jperkin@production.mysql.com +1 -0
  Provide better feedback to the user when unable to find MySQL files
  usually caused by a bad basedir setting.

  support-files/mysql.server.sh@1.49.1.9, 2007-11-05 17:46:23+01:00, jperkin@production.mysql.com +1 -1
    Be more verbose in error message.

ChangeSet@1.2476.468.7, 2007-11-05 16:25:40+01:00, istruewing@stella.local +17 -0
  Bug#31210 - INSERT DELAYED crashes server when used on
              partitioned table
  
  Trying INSERT DELAYED on a partitioned table, that has not been
  used right before, crashes the server. When a table is used for
  select or update, it is kept open for some time. This period I
  mean with "right before".
  
  Information about partitioning of a table is stored in form of
  a string in the .frm file. Parsing of this string requires a
  correctly set up lexical analyzer (lex). The partitioning code
  uses a new temporary instance of a lex. But it does still refer
  to the previously active lex. The delayd insert thread does not
  initialize its lex though...
  
  Added initialization for thd->lex before open table in the delayed
  thread and at all other places where it is necessary to call
  lex_start() if all tables would be partitioned and need to parse
  the .frm file.

  mysql-test/r/partition_hash.result@1.8, 2007-11-05 16:25:38+01:00, istruewing@stella.local +4 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Added test result

  mysql-test/t/partition_hash.test@1.10, 2007-11-05 16:25:38+01:00, istruewing@stella.local +8 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Added test

  sql/event_scheduler.cc@1.47.1.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/events.cc@1.84.1.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/ha_ndbcluster_binlog.cc@1.131.2.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/slave.cc@1.315.4.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/sql_acl.cc@1.243.3.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +2 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/sql_base.cc@1.421.18.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +3 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Asserted that lex is initialized in open_table().

  sql/sql_connect.cc@1.9.1.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/sql_insert.cc@1.295.5.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +6 -1
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Added initialization for thd->lex before open table.

  sql/sql_lex.cc@1.255.11.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +2 -1
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Added 'is_lex_started' to test if lex is initialized.

  sql/sql_lex.h@1.296.4.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Added 'is_lex_started' to test if lex is initialized.

  sql/sql_plugin.cc@1.75.1.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/sql_servers.cc@1.14.1.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/sql_udf.cc@1.80.1.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/table.cc@1.296.15.1, 2007-11-05 16:25:39+01:00, istruewing@stella.local +3 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Asserted that lex is initialized in open_table_from_share().

  sql/tztime.cc@1.59, 2007-11-05 16:25:39+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

ChangeSet@1.1810.3460.1, 2007-11-05 17:20:10+02:00, aelkin@koti.dsl.inet.fi +3 -0
  Bug #28597 Replication doesn't start after upgrading to 5.1.18
  
  Since bug@20166, which replaced the binlog file name generating to base
  on pidfile_name instead of the previous glob_hostname, the binlog file
  name suddenly started to be stored solely in the absolute path format,
  including a case when --log-bin option meant a relative path.
  What's more serious, the path for binlog file can lead unrequestedly 
  to pid-file directory so that after any proper fix for this bug
  there might be similar to the bug report consequences for one who
  upgrades from post-fix-bug@20166-pre-fix-bug@28597 to post-fix-bug@28597.
  
  Fixed with preserving`pidfile_name' (intr.by bug@20166) but stripping
  off its directory part. This restores the original logics of storing
  the names in compatible with --log-bin option format and with the
  requirement for --log-bin ralative path to corresond to the data directory.
  Side effects for this fix:
  
  effective fixing bug@27070, refining its test;
  ensuring no overrun for buff can happen anymore (Bug#31836 
  insufficient space reserved for the suffix of relay log file name);
  bug#31837  --remove_file $MYSQLTEST_VARDIR/tmp/bug14157.sql missed
  in rpl_temporary.test;
  fixes Bug@28603  Invalid log-bin default location;

  mysql-test/t/rpl_dual_pos_advance.test@1.2.1.1, 2007-11-05 17:20:08+02:00, aelkin@koti.dsl.inet.fi +0 -6
    After correcting the logics of log file name composing workaround for
    
      Bug #27070 server logs are created unrequested and in wrong directory
    
    is removed.

  mysql-test/t/rpl_temporary.test@1.15.1.10, 2007-11-05 17:20:08+02:00, aelkin@koti.dsl.inet.fi +2 -0
    remaining temp file of the test removed

  sql/log.cc@1.158.1.63, 2007-11-05 17:20:08+02:00, aelkin@koti.dsl.inet.fi +4 -7
    stripping off the directory part of `pidfile_name' for binlog name
    generating (which fixes two more bugs on wrong binlog file location);
    ensuring no overrun for buff can happen anymore (Bug #31836 
    insufficient space reserved for the suffix of relay log file name);

ChangeSet@1.2476.630.2, 2007-11-05 18:43:13+04:00, holyfoot@mysql.com +1 -0
  merging

  mysql-test/r/func_str.result@1.149, 2007-11-05 18:43:11+04:00, holyfoot@mysql.com +1 -1
    merging

ChangeSet@1.1810.3459.2, 2007-11-05 18:23:55+04:00, holyfoot@mysql.com +1 -0
  merging

  mysql-test/r/func_str.result@1.110.1.29, 2007-11-05 18:23:54+04:00, holyfoot@mysql.com +3 -3
    merging

ChangeSet@1.1810.3454.6, 2007-11-05 14:44:38+01:00, istruewing@stella.local +1 -0
  Bug#32108 - subselect.test produces warnings files
  
  Comment sign of -- at line begin in test files lead to warnings
  from mysqltest.
    
  Changed -- to #.

  mysql-test/t/subselect.test@1.129.13.1, 2007-11-05 14:44:37+01:00, istruewing@stella.local +1 -1
    Bug#32108 - subselect.test produces warnings files
    Changed -- to # at comment begin to avoid warnings files.

ChangeSet@1.1810.3454.5, 2007-11-05 14:37:00+01:00, istruewing@stella.local +1 -0
  Bug#32107 - ctype_uca.test produces warnings files
  
  Comment sign of -- at line begin in test files lead to warnings
  from mysqltest.
    
  Changed -- to #.

  mysql-test/t/ctype_uca.test@1.17.3.1, 2007-11-05 14:36:59+01:00, istruewing@stella.local +1 -1
    Bug#32107 - ctype_uca.test produces warnings files
    Changed -- to # at comment begin to avoid warnings files.

ChangeSet@1.2476.629.3, 2007-11-05 14:24:20+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  BUG#31611 (Security risk with BINLOG statement):
  
  Incremental patch to remove redundant, but benign, my_error() call.

  sql/sql_binlog.cc@1.13.1.2, 2007-11-05 14:24:14+01:00, mats@kindahl-laptop.dnsalias.net +0 -3
    Removing redundant error reporting.

ChangeSet@1.2476.513.20, 2007-11-05 15:07:50+02:00, bell@desktop.sanja.is.com.ua +10 -0
  Support of rec_lsn added to pagecache_write call.

  storage/maria/ma_bitmap.c@1.21.1.2, 2007-11-05 15:07:49+02:00, bell@desktop.sanja.is.com.ua +2 -1
    Support of rec_lsn added to pagecache_write call.

  storage/maria/ma_blockrec.c@1.50.1.3, 2007-11-05 15:07:49+02:00, bell@desktop.sanja.is.com.ua +15 -8
    Support of rec_lsn added to pagecache_write call.

  storage/maria/ma_loghandler.c@1.67.1.1, 2007-11-05 15:07:49+02:00, bell@desktop.sanja.is.com.ua +1 -0
    Support of rec_lsn added to pagecache_write call.

  storage/maria/ma_page.c@1.13.1.1, 2007-11-05 15:07:49+02:00, bell@desktop.sanja.is.com.ua +2 -2
    Support of rec_lsn added to pagecache_write call.

  storage/maria/ma_pagecache.c@1.52.1.1, 2007-11-05 15:07:49+02:00, bell@desktop.sanja.is.com.ua +50 -29
    Support of rec_lsn added to pagecache_write call.
    A function for setting rec_lsn made.

  storage/maria/ma_pagecache.h@1.27, 2007-11-05 15:07:49+02:00, bell@desktop.sanja.is.com.ua +5 -4
    Support of rec_lsn added to pagecache_write call.

  storage/maria/ma_preload.c@1.6.1.1, 2007-11-05 15:07:49+02:00, bell@desktop.sanja.is.com.ua +3 -2
    Support of rec_lsn added to pagecache_write call.

  storage/maria/unittest/ma_pagecache_consist.c@1.15, 2007-11-05 15:07:49+02:00, bell@desktop.sanja.is.com.ua +2 -2
    Support of rec_lsn added to pagecache_write call.

  storage/maria/unittest/ma_pagecache_single.c@1.13, 2007-11-05 15:07:49+02:00, bell@desktop.sanja.is.com.ua +11 -11
    Support of rec_lsn added to pagecache_write call.

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.16, 2007-11-05 15:07:49+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Support of rec_lsn added to pagecache_write call.

ChangeSet@1.2476.1.128, 2007-11-05 13:33:20+01:00, tomas@whalegate.ndb.mysql.com +2 -0
  workaround for case insensitive filesystems

  mysql-test/suite/ndb/r/ndb_multi.result@1.17.1.1, 2007-11-05 13:33:17+01:00, tomas@whalegate.ndb.mysql.com +2 -2
    workaround for case insensitive filesystems

  mysql-test/suite/ndb/t/ndb_multi.test@1.25.1.1, 2007-11-05 13:33:17+01:00, tomas@whalegate.ndb.mysql.com +2 -0
    workaround for case insensitive filesystems

ChangeSet@1.2476.616.9, 2007-11-05 13:19:56+02:00, gkodinov@magare.gmz +3 -0
  Bug #31974: Wrong EXPLAIN output
  
  The fix for bug 31148 is not correct. It does not
  have a relation to the problem described in this bug.
  And removing the fix will not make the bug to re-appear.
  Fixed the bug #31974 by removing the fix for bug 31148
  and adding a test case.

  mysql-test/r/key.result@1.48, 2007-11-05 13:19:54+02:00, gkodinov@magare.gmz +14 -0
    Bug #31974: test case

  mysql-test/t/key.test@1.39, 2007-11-05 13:19:54+02:00, gkodinov@magare.gmz +17 -0
    Bug #31974: test case

  sql/sql_select.cc@1.541.31.6, 2007-11-05 13:19:54+02:00, gkodinov@magare.gmz +0 -7
    Bug #31974: revert the fix for bug 31148

ChangeSet@1.1810.3455.2, 2007-11-05 13:30:31+03:00, kaa@polly.(none) +1 -0
  Fixed code that parses the DELIMITER command to correctly calculate 
  the length of the remaining input string.
  
  This is to fix mysqldump test failure in PB introduced by the patch
  for bug #26215.

  client/mysql.cc@1.199.30.2, 2007-11-05 13:30:28+03:00, kaa@polly.(none) +3 -4
    Fixed code that parses the DELIMITER command to correctly calculate 
    the length of the remaining input string.

ChangeSet@1.2476.624.6, 2007-11-05 10:57:52+01:00, istruewing@stella.local +1 -0
  Bug#4692 - DISABLE/ENABLE KEYS waste a space
  Fixed absurd compiler warnings of a Suse 10.1 system.

  storage/myisam/mi_check.c@1.142.1.23, 2007-11-05 10:57:50+01:00, istruewing@stella.local +2 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Fixed absurd compiler warnings of a Suse 10.1 system.

ChangeSet@1.2476.590.10, 2007-11-03 13:46:49+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  compile error

  sql/ha_ndbcluster_binlog.cc@1.131.1.4, 2007-11-03 13:46:46+01:00, tomas@whalegate.ndb.mysql.com +2 -2
    compile error

ChangeSet@1.2476.629.1, 2007-11-03 01:33:48+01:00, mats@kindahl-laptop.dnsalias.net +3 -0
  BUG#31611 (Security risk with BINLOG statement):
  
  Adding check that the user executing a BINLOG statement has SUPER
  privileges and aborting execution of the statement with an error
  otherwise.

  mysql-test/r/mysqlbinlog.result@1.38, 2007-11-03 01:33:44+01:00, mats@kindahl-laptop.dnsalias.net +22 -0
    Result change.

  mysql-test/t/mysqlbinlog.test@1.52, 2007-11-03 01:33:44+01:00, mats@kindahl-laptop.dnsalias.net +27 -0
    Adding test that generates a BINLOG command for inserting data into a
    table and feed the BINLOG statement into the database as an untrusted
    user. Also checking that insertion into the table fails for that user
    and that the table only contain a single line: the original one inserted.

  sql/sql_binlog.cc@1.13.1.1, 2007-11-03 01:33:44+01:00, mats@kindahl-laptop.dnsalias.net +6 -0
    Adding a check that the executor of the BINLOG command has
    SUPER privileges and give an error and abort execution if not.

ChangeSet@1.2476.590.9, 2007-11-02 23:44:17+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  this error should not be printed

  sql/ha_ndbcluster_binlog.cc@1.131.1.3, 2007-11-02 23:44:15+01:00, tomas@whalegate.ndb.mysql.com +2 -0
    this error should not be printed

ChangeSet@1.2476.590.8, 2007-11-02 23:28:29+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  reverting to old setting

  mysql-test/include/have_multi_ndb.inc@1.11, 2007-11-02 23:28:27+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    reverting to old setting

ChangeSet@1.2476.628.1, 2007-11-03 00:32:17+03:00, skozlov@mysql.com +2 -0
  WL#3949. Added an option for support "combinations" of mysqld arguments for a suite

  mysql-test/lib/mtr_cases.pl@1.61.1.8, 2007-11-03 00:31:56+03:00, skozlov@mysql.com +99 -0
    updated mtr_cases.pl

  mysql-test/mysql-test-run.pl@1.313.11.1, 2007-11-03 00:31:56+03:00, skozlov@mysql.com +5 -0
    updated mtr

ChangeSet@1.2476.623.2, 2007-11-02 14:25:48-07:00, antony@pcg5ppc.xiphis.org +1 -0
  fix for 2.4.6 bug should be properly enclosed to not break other versions.

  sql/CMakeLists.txt@1.7.4.1, 2007-11-02 14:25:45-07:00, antony@pcg5ppc.xiphis.org +2 -0
    fix for 2.4.6 bug should be properly enclosed to not break other versions.

ChangeSet@1.2476.618.4, 2007-11-02 15:30:39-04:00, iggy@alf.(none) +1 -0
  Bug#31217 C1033 compilation error on Windows
  - This workaround is no longer necessary with cmake 2.4.7.

  sql/CMakeLists.txt@1.7.1.13, 2007-11-02 15:30:37-04:00, iggy@alf.(none) +0 -7
    Bug#31217 C1033 compilation error on Windows
    - Remove workaround no longer needed.

ChangeSet@1.1810.3453.2, 2007-11-02 15:16:45-04:00, iggy@alf.(none) +1 -0
  Bug#31319 CMake build does not check for minimum required version
  - Add check

  CMakeLists.txt@1.1.30.2, 2007-11-02 15:16:44-04:00, iggy@alf.(none) +2 -0
    Bug#31319 CMake build does not check for minimum required version
    - Add check

ChangeSet@1.2476.590.7, 2007-11-02 17:34:06+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  workaround for some bug to investigate

  mysql-test/include/have_multi_ndb.inc@1.10, 2007-11-02 17:34:03+01:00, tomas@whalegate.ndb.mysql.com +2 -0
    workaround for some bug to investigate

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.683.18.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.438.1.6, 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.625.2, 2007-11-02 16:40:08+03:00, kaa@polly.(none) +3 -0
  5.1-specific changes for bug #26215 after merging the patch from 5.0:
  
  - Added trigger tests back.
  - Fixed test cases to match the extended output format of SHOW CREATE ...
  - Replaced 'gptr' with 'uchar *'.

  client/mysql.cc@1.270.2.2, 2007-11-02 16:40:01+03:00, kaa@polly.(none) +1 -1
    Replaced 'gptr' with 'uchar *'.

  mysql-test/r/mysql_comments.result@1.2, 2007-11-02 16:40:01+03:00, kaa@polly.(none) +32 -20
    Fixed test cases to match the extended output format of SHOW CREATE ...
    Added trigger tests back.

  mysql-test/t/mysql_comments.sql@1.2, 2007-11-02 16:40:01+03:00, kaa@polly.(none) +43 -2
    Added trigger tests back.

ChangeSet@1.1810.3456.4, 2007-11-02 13:16:23+01:00, kent@mysql.com +2 -0
  Makefile.am:
    Removed place holder for 'manual.chm'
  .del-manual.chm:
    Delete: Docs/manual.chm

  BitKeeper/deleted/.del-manual.chm@1.2, 2007-11-02 13:07:52+01:00, kent@mysql.com +0 -0
    Delete: Docs/manual.chm

  Docs/Makefile.am@1.57.1.12, 2007-11-02 13:15:42+01:00, kent@mysql.com +1 -1
    Removed place holder for 'manual.chm'

ChangeSet@1.1346.895.3, 2007-11-02 13:12:19+01:00, kent@mysql.com +1 -0
  Makefile.am:
    Don't install INSTALL-BINARY, handled by build scripts

  Docs/Makefile.am@1.38.1.20, 2007-11-02 13:11:55+01:00, kent@mysql.com +1 -2
    Don't install INSTALL-BINARY, handled by build scripts

ChangeSet@1.2476.626.1, 2007-11-02 14:00:38+02:00, aelkin@koti.dsl.inet.fi +3 -0
  Bug #31554  	rpl.rpl_truncate_2myisam test failure: wrong master binlog file name
  
  Actually, the failure happened with 3innodb as well. Most probably
  the reason is in failing to delete a binlog file on __NT__ so that
  that master increments the index of the binlog file.
  The test results hide valueable warning that windows could generate
  about that.
  
  The scope of this fix is to make sure we have such warning and
  to lessen chances for binlog file being held at time of closing.
  The dump thread is getting a good chance to leave and 
  release the file for its successful deletion.
  
  We shall watch over the two tests as regression is not excluded.
  In that case we would have an extra info possibly explaining why
  __NT__ env can not close/delete the file.
  However, regardless of that reason, there is alwasy workaround to mask out
  non-deterministic binlog index number.
  

  mysql-test/extra/rpl_tests/rpl_truncate_helper.test@1.7, 2007-11-02 14:00:34+02:00, aelkin@koti.dsl.inet.fi +8 -6
    enable warnings for other than DROP queries;
    wait for slave's full stop which ensures io thread left and that
    will be regarded by dump thread to leave and close the binlog file;
    relocating reset master to the end of the test so that the caller of
    this helper should start with the binlog name which has not yet been
    affected/reset since its creation.

  mysql-test/suite/rpl/r/rpl_truncate_2myisam.result@1.8, 2007-11-02 14:00:35+02:00, aelkin@koti.dsl.inet.fi +42 -0
    results changed

  mysql-test/suite/rpl/r/rpl_truncate_3innodb.result@1.8, 2007-11-02 14:00:35+02:00, aelkin@koti.dsl.inet.fi +42 -0
    results changed

ChangeSet@1.1810.3456.2, 2007-11-02 12:59:45+01:00, kent@mysql.com +5 -0
  Makefile.am:
    Added manual.chm to EXTRA_DIST
    Removed install of INSTALL-BINARY, handled
    by install scripts.
  ReadMe.txt, INSTALL-WIN-SOURCE, INSTALL-BINARY, INSTALL-SOURCE:
    Updated links to version 5.0 of the manual

  Docs/INSTALL-BINARY@1.2, 2007-11-02 12:58:10+01:00, kent@mysql.com +1 -1
    Updated links to version 5.0 of the manual

  Docs/Makefile.am@1.57.1.10, 2007-11-02 12:58:49+01:00, kent@mysql.com +2 -4
    Added manual.chm to EXTRA_DIST
    Removed install of INSTALL-BINARY, handled
    by install scripts.

  INSTALL-SOURCE@1.2, 2007-11-02 12:58:10+01:00, kent@mysql.com +1 -1
    Updated links to version 5.0 of the manual

  INSTALL-WIN-SOURCE@1.2, 2007-11-02 12:58:10+01:00, kent@mysql.com +1 -1
    Updated links to version 5.0 of the manual

  support-files/MacOSX/ReadMe.txt@1.2, 2007-11-02 12:58:10+01:00, kent@mysql.com +1 -1
    Updated links to version 5.0 of the manual

ChangeSet@1.2476.616.8, 2007-11-02 14:47:18+03:00, kostja@bodhi.(none) +2 -0
  Cleanup the test case for Bug#32030 "DELETE does not return an error and
   deletes rows if error evaluating WHERE"

  mysql-test/r/ps.result@1.121, 2007-11-02 14:47:15+03:00, kostja@bodhi.(none) +0 -3
    Disable warnings.

  mysql-test/t/ps.test@1.123, 2007-11-02 14:47:15+03:00, kostja@bodhi.(none) +2 -1
    Disable warnings.

ChangeSet@1.1616.3115.2, 2007-11-02 12:36:44+01:00, kent@mysql.com +1 -0
  INSTALL-WIN-SOURCE:
    BitKeeper file /home/kent/bk/bug25205/mysql-4.1-build/INSTALL-WIN-SOURCE

  INSTALL-WIN-SOURCE@1.1, 2007-11-02 12:36:29+01:00, kent@mysql.com +9 -0
    BitKeeper file /home/kent/bk/bug25205/mysql-4.1-build/INSTALL-WIN-SOURCE

  INSTALL-WIN-SOURCE@1.0, 2007-11-02 12:36:29+01:00, kent@mysql.com +0 -0

ChangeSet@1.1346.895.2, 2007-11-02 12:29:13+01:00, kent@mysql.com +6 -0
  mysql.info, INSTALL-BINARY, INSTALL-SOURCE, ReadMe.txt, Docs/Makefile.am:
    Let place holders for real documentation have text that
    makes sense to the user (Bug#25205)

  BitKeeper/deleted/.del-generate-text-files.pl@1.4.2.1, 2007-11-02 01:13:38+01:00, kent@mysql.com +0 -0
    Delete: Docs/Support/generate-text-files.pl

  Docs/INSTALL-BINARY@1.1, 2007-11-02 01:29:32+01:00, kent@mysql.com +8 -0
    BitKeeper file /home/kent/bk/bug25205/mysql-4.0/Docs/INSTALL-BINARY

  Docs/INSTALL-BINARY@1.0, 2007-11-02 01:29:32+01:00, kent@mysql.com +0 -0

  Docs/Makefile.am@1.38.1.19, 2007-11-02 01:32:35+01:00, kent@mysql.com +3 -26
    Don't generate text files from the documentation

  Docs/mysql.info@1.2, 2007-11-02 01:31:55+01:00, kent@mysql.com +3 -26
    More of a end-user text

  INSTALL-SOURCE@1.1, 2007-11-02 01:29:32+01:00, kent@mysql.com +8 -0
    BitKeeper file /home/kent/bk/bug25205/mysql-4.0/INSTALL-SOURCE

  INSTALL-SOURCE@1.0, 2007-11-02 01:29:32+01:00, kent@mysql.com +0 -0

  support-files/MacOSX/ReadMe.txt@1.1, 2007-11-02 01:29:32+01:00, kent@mysql.com +8 -0
    BitKeeper file /home/kent/bk/bug25205/mysql-4.0/support-files/MacOSX/ReadMe.txt

  support-files/MacOSX/ReadMe.txt@1.0, 2007-11-02 01:29:32+01:00, kent@mysql.com +0 -0

ChangeSet@1.1810.3455.1, 2007-11-02 13:40:34+03:00, kaa@polly.(none) +4 -0
  Fix for:
    bug #26215: mysql command line client should not strip comments
                from SQL statements
  and
    bug #11230: Keeping comments when storing stored procedures
  
  With the introduction of multiline comments support in the command line
  client (mysql) in MySQL 4.1, it became impossible to preserve
  client-side comments within single SQL statements or stored routines.
  This feature was useful for monitoring tools and maintenance.
  
  The patch adds a new option to the command line client
  ('--enable-comments', '-c') which allows to preserve SQL comments and
  send them to the server for single SQL statements, and to keep comments
  in the code for stored procedures / functions / triggers.
  
  The patch is a modification of the contributed patch from bug #11230
  with the following changes:
  - code style changes to conform to the coding guidelines
  - changed is_prefix() to my_strnncoll() to detect the DELIMITER
  command, since the first one is case-sensitive and not charset-aware
  - renamed t/comments-51.* to t/mysql_comments.*
  - removed tests for comments in triggers since 5.0 does not have SHOW
  CREATE TRIGGER (those tests will be added back in 5.1).
  
  The test cases are only for bug #11230. No automated test case for bug
  #26215 is possible due to the test suite deficiencies (though the cases
  from the bug report were tested manually).

  client/mysql.cc@1.199.30.1, 2007-11-02 13:40:31+03:00, kaa@polly.(none) +125 -43
    Applied the contributed patch from bug11230 with the following changes:
    - code style changes to conform to the coding guidelines
    - changed is_prefix() to my_strnncoll() to detect the DELIMITER
    command, since the first one is case-sensitive and not charset-aware
    
    The patch adds a new option to the command line client which allows to
    preserve SQL comments and send them to the server to ensure better
    error reporting and to, keep comments in the code for stored procedures
    / functions / triggers.

  mysql-test/r/mysql_comments.result@1.1, 2007-11-02 13:40:31+03:00, kaa@polly.(none) +50 -0
    Added test cases for bug11230.

  mysql-test/r/mysql_comments.result@1.0, 2007-11-02 13:40:31+03:00, kaa@polly.(none) +0 -0

  mysql-test/t/mysql_comments.sql@1.1, 2007-11-02 13:40:31+03:00, kaa@polly.(none) +177 -0
    Added test cases for bug11230.

  mysql-test/t/mysql_comments.sql@1.0, 2007-11-02 13:40:31+03:00, kaa@polly.(none) +0 -0

  mysql-test/t/mysql_comments.test@1.1, 2007-11-02 13:40:31+03:00, kaa@polly.(none) +37 -0
    Added test cases for bug11230.

  mysql-test/t/mysql_comments.test@1.0, 2007-11-02 13:40:31+03:00, kaa@polly.(none) +0 -0

ChangeSet@1.1616.3095.8, 2007-11-02 10:11:26+01:00, istruewing@stella.local +1 -0
  Bug#31030 - rpl000015.test fails if $MYSQL_TCP_PORT != 3306
  Preliminarily disabled test case

  mysql-test/t/disabled.def@1.1.5.1, 2007-11-02 10:11:26+01:00, istruewing@stella.local +1 -0
    Bug#31030 - rpl000015.test fails if $MYSQL_TCP_PORT != 3306
    Preliminarily disabled test case

ChangeSet@1.2476.608.4, 2007-11-02 09:58:29+01:00, istruewing@stella.local +2 -0
  Bug#32048 - innodb_mysql.test produces warnings files
  
  Typo --#echo at line begin in test files lead to warnings
  from mysqltest.
    
  Changed to --echo #.

  mysql-test/include/mix1.inc@1.58.1.1, 2007-11-02 09:58:27+01:00, istruewing@stella.local +1 -1
    Bug#32048 - innodb_mysql.test produces warnings files
    Fixed comment sign

  mysql-test/r/innodb_mysql.result@1.60.4.1, 2007-11-02 09:58:27+01:00, istruewing@stella.local +1 -0
    Bug#32048 - innodb_mysql.test produces warnings files
    Fixed test result

ChangeSet@1.2476.622.2, 2007-11-02 12:39:14+04:00, gluh@mysql.com +3 -0
  Bug#31630 debug assert with explain extended select ... from i_s
  added 'in_rows' column value for 'describe extended' for the case 
  when 'describe' handles I_S table

  mysql-test/r/information_schema.result@1.151.1.20, 2007-11-02 12:39:12+04:00, gluh@mysql.com +5 -0
    test result

  mysql-test/t/information_schema.test@1.98.1.16, 2007-11-02 12:39:12+04:00, gluh@mysql.com +5 -0
    test case

  sql/sql_select.cc@1.541.35.1, 2007-11-02 12:39:12+04:00, gluh@mysql.com +4 -0
    added 'in_rows' column value for 'describe extended' for the case 
    when 'describe' handles I_S table

ChangeSet@1.2476.622.1, 2007-11-02 12:24:45+04:00, gluh@mysql.com +3 -0
  Bug#31113 mysqldump 5.1 can't handle a dash ("-") in database names
  db name should be quoted. this code does communication with the server.
  it's always ok to quote names in this case.

  client/mysqldump.c@1.268.21.14, 2007-11-02 12:24:43+04:00, gluh@mysql.com +3 -1
    db name should be quoted. this code does communication with the server.
    it's always ok to quote names in this case.

  mysql-test/r/mysqldump.result@1.159.2.3, 2007-11-02 12:24:43+04:00, gluh@mysql.com +19 -0
    test result

  mysql-test/t/mysqldump.test@1.148.2.3, 2007-11-02 12:24:44+04:00, gluh@mysql.com +12 -0
    test case

ChangeSet@1.2476.590.6, 2007-11-02 07:14:56+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  make sure everything is clean before starting the test

  mysql-test/include/have_multi_ndb.inc@1.9, 2007-11-02 07:14:53+01:00, tomas@whalegate.ndb.mysql.com +20 -0
    make sure everything is clean before starting the test

ChangeSet@1.2476.621.1, 2007-11-02 02:36:12+03:00, kostja@bodhi.(none) +5 -0
  A fix for Bug#32030 "DELETE does not return an error and deletes rows if 
  error evaluating WHERE"
  
  DELETE with a subquery in WHERE clause would sometimes ignore subquery
  evaluation error and proceed with deletion.
  
  The fix is to check for an error after evaluation of the WHERE clause
  in DELETE.
  
  Addressed review comments.

  mysql-test/r/group_min_max.result@1.36, 2007-11-02 02:36:10+03:00, kostja@bodhi.(none) +1 -2
    Update the test results to reflect the fix for Bug#32030.

  mysql-test/r/ps.result@1.120, 2007-11-02 02:36:10+03:00, kostja@bodhi.(none) +20 -0
    Update test results (Bug#32030)

  mysql-test/t/group_min_max.test@1.33, 2007-11-02 02:36:10+03:00, kostja@bodhi.(none) +1 -0
    Update the test case to reflect the fix for Bug#32030

  mysql-test/t/ps.test@1.122, 2007-11-02 02:36:10+03:00, kostja@bodhi.(none) +33 -0
    Add a test case for Bug#32030

  sql/sql_delete.cc@1.226.4.2, 2007-11-02 02:36:10+03:00, kostja@bodhi.(none) +9 -2
    Check for an error before calling send_ok(). Two different places are
    covered because the subquery code has slightly different execution
    paths depending on ps-protocol/old-protocol

ChangeSet@1.2476.620.1, 2007-11-01 18:52:56-02:00, davi@endora.local +15 -0
  Bug#30882 Dropping a temporary table inside a stored function may cause a server crash
  
  If a stored function that contains a drop temporary table statement
  is invoked by a create temporary table of the same name may cause
  a server crash. The problem is that when dropping a table no check
  is done to ensure that table is not being used by some outer query
  (or outer statement), potentially leaving the outer query with a
  reference to a stale (freed) table.
  
  The solution is when dropping a temporary table, always check if
  the table is being used by some outer statement as a temporary
  table can be dropped inside stored procedures.
  
  The check is performed by looking at the TABLE::query_id value for
  temporary tables. To simplify this check and to solve a bug related
  to handling of temporary tables in prelocked mode, this patch changes
  the way in which this member is used to track the fact that table is
  used/unused. Now we ensure that TABLE::query_id is zero for unused
  temporary tables (which means that all temporary tables which were
  used by a statement should be marked as free for reuse after it's
  execution has been completed).

  mysql-test/include/handler.inc@1.40, 2007-11-01 18:52:50-02:00, davi@endora.local +32 -0
    Add test case for side effect of Bug#30882

  mysql-test/r/handler_innodb.result@1.22, 2007-11-01 18:52:50-02:00, davi@endora.local +62 -0
    Add test case result for side effect of Bug#30882

  mysql-test/r/handler_myisam.result@1.35, 2007-11-01 18:52:50-02:00, davi@endora.local +62 -0
    Add test case result for side effect of Bug#30882

  mysql-test/r/sp-error.result@1.134, 2007-11-01 18:52:50-02:00, davi@endora.local +49 -3
    Add test case result for Bug#30882

  mysql-test/t/sp-error.test@1.129, 2007-11-01 18:52:50-02:00, davi@endora.local +69 -5
    Add test case for Bug#30882

  sql/event_db_repository.cc@1.38, 2007-11-01 18:52:50-02:00, davi@endora.local +1 -1
    Update close_thread_tables call, no more default values.

  sql/mysql_priv.h@1.523.1.26, 2007-11-01 18:52:51-02:00, davi@endora.local +2 -2
    Remove implicit default parameters values of the close_thread_tables
    function as no callers are using it.

  sql/slave.cc@1.315.3.2, 2007-11-01 18:52:51-02:00, davi@endora.local +1 -1
    Update close_thread_tables call, no more default values

  sql/sp_head.cc@1.292.1.7, 2007-11-01 18:52:51-02:00, davi@endora.local +1 -1
    Update close_thread_tables call, no more default values

  sql/sql_base.cc@1.421.16.4, 2007-11-01 18:52:51-02:00, davi@endora.local +89 -52
    Changed the approach to distinguishing currently unused temporary tables.
    Now we ensure that such tables always have TABLE::query_id set to 0 and
    use this fact to perform checks during opening and dropping of temporary
    tables. This means that we have to call close_thread_tables() even for
    statements which use only temporary tables. To make this call cheaper,
    we re-factored close_thread_tables() to not take LOCK_open unless there
    are open base tables.

  sql/sql_handler.cc@1.104, 2007-11-01 18:52:52-02:00, davi@endora.local +14 -0
    Properly close temporary tables associated with a handler.

  sql/sql_insert.cc@1.299.2.2, 2007-11-01 18:52:52-02:00, davi@endora.local +1 -1
    close_temporary_table is now merged into drop_temporary_table.

  sql/sql_parse.cc@1.683.24.4, 2007-11-01 18:52:52-02:00, davi@endora.local +6 -9
    Now the condition doesn't cover all cases because close_thread_tables()
    must be called even for statements that use only temporary tables.

  sql/sql_table.cc@1.437.25.1, 2007-11-01 18:52:52-02:00, davi@endora.local +22 -6
    Use drop_temporary_table which perform checks to verify if
    the table is not being used. Error path problem is due to
    a handler tables issue and is going to be addressed in bug
    31397.

  sql/table.h@1.175.10.1, 2007-11-01 18:52:52-02:00, davi@endora.local +20 -2
    Rename previously unused clear_query_id and document the usage of
    query_id and open_by_handler.

ChangeSet@1.2476.582.7, 2007-11-01 12:30:03-07:00, antony@pcg5ppc.xiphis.org +3 -0
  Bug#30671
    "ALTER SERVER can cause server to crash"
    While retrieving values, it would erronously set the socket value
    to NULL and attempt to use it in strcmp().
    Ensure it is correctly set to "" so that strcmp may not crash.

  mysql-test/r/federated_server.result@1.10, 2007-11-01 12:29:59-07:00, antony@pcg5ppc.xiphis.org +9 -1
    results for bug30671
    fix inconsistent result

  mysql-test/t/federated_server.test@1.10, 2007-11-01 12:29:59-07:00, antony@pcg5ppc.xiphis.org +13 -1
    surplus semicolon
    test for bug30671

  sql/sql_servers.cc@1.15, 2007-11-01 12:29:59-07:00, antony@pcg5ppc.xiphis.org +2 -2
    bug30671
    inside function get_server_from_table_to_cache()
      server->socket was being set to NULL instead of empty string

ChangeSet@1.2476.619.1, 2007-11-01 17:29:20-02:00, davi@endora.local +2 -0
  Bug#31850 Test crashes in "embedded" server
  
  The mysql_change_user command fails to properly update the database pointer
  when no database is selected, leading to "use after free" errors. The same
  happens on the user privilege pointer in the thread security context.
  
  The solution is to properly reset and update the database name. Also update
  the user_priv pointer so that it doesn't point to freed memory.

  sql/sql_connect.cc@1.14.1.1, 2007-11-01 17:29:17-02:00, davi@endora.local +9 -14
    After a successful call to check_user() without specifying a new
    database name, the previous database thd->db) is freed but the
    pointer is not updated to NULL.

  sql/sql_parse.cc@1.683.26.1, 2007-11-01 17:29:17-02:00, davi@endora.local +3 -2
    Update the security_ctx->priv_user pointer as it is a alias for
    the user security_ctx->user pointer. Also remove unneeded cast,
    the x_free macro casts the argument.

ChangeSet@1.2476.590.5, 2007-11-01 20:00:44+01:00, tomas@whalegate.ndb.mysql.com +3 -0
  Bug #31484    Cluster LOST_EVENTS entry not added to binlog on mysqld restart
  - correction

  mysql-test/suite/ndb/r/ndb_multi.result@1.18, 2007-11-01 20:00:41+01:00, tomas@whalegate.ndb.mysql.com +3 -2
    Bug #31484    Cluster LOST_EVENTS entry not added to binlog on mysqld restart
    - correction

  mysql-test/suite/ndb/t/ndb_multi.test@1.26, 2007-11-01 20:00:41+01:00, tomas@whalegate.ndb.mysql.com +4 -2
    Bug #31484    Cluster LOST_EVENTS entry not added to binlog on mysqld restart
    - correction

  sql/ha_ndbcluster_binlog.cc@1.131.1.2, 2007-11-01 20:00:41+01:00, tomas@whalegate.ndb.mysql.com +1 -0
    Bug #31484    Cluster LOST_EVENTS entry not added to binlog on mysqld restart
    - correction

ChangeSet@1.1810.3302.46, 2007-11-01 19:40:27+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#30630 mysql-test-run all tests fail with MySQL 5.0.41 & 5.0.45 on Mac OS X Server 10.5

  mysql-test/mysql-test-run.pl@1.30.49.109, 2007-11-01 19:40:25+01:00, msvensson@pilot.mysql.com +10 -0
    Also check for euid == 0

ChangeSet@1.1810.3412.17, 2007-11-01 18:36:24+02:00, gkodinov@magare.gmz +3 -0
  Bug #31794: no syntax error on SELECT id FROM t HAVING count(*)>2
  
  The HAVING clause is subject to the same rules as the SELECT list
  about using aggregated and non-aggregated columns.
  But this was not enforced when processing implicit grouping from
  using aggregate functions.
  Fixed by performing the same checks for HAVING as for SELECT.

  mysql-test/r/func_group.result@1.49.1.15, 2007-11-01 18:36:24+02:00, gkodinov@magare.gmz +15 -0
    Bug #31794: test case

  mysql-test/t/func_group.test@1.48.1.11, 2007-11-01 18:36:24+02:00, gkodinov@magare.gmz +19 -0
    Bug #31794: test case

  sql/sql_select.cc@1.312.183.2, 2007-11-01 18:36:24+02:00, gkodinov@magare.gmz +10 -2
    Bug #31794: Check HAVING in addition to SELECT list

ChangeSet@1.2476.1.126, 2007-11-01 17:24:21+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  disable test

  mysql-test/suite/rpl_ndb/t/disabled.def@1.10.1.2, 2007-11-01 17:24:18+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    disable test

ChangeSet@1.2476.616.4, 2007-11-01 18:33:51+03:00, kostja@bodhi.(none) +1 -0
  Cleanup execute_ddl_log_recovery() to not generate an error if 
  there is nothing to recover.
  
  Discovered while working on Bug#12713

  sql/sql_table.cc@1.437.23.4, 2007-11-01 18:33:49+03:00, kostja@bodhi.(none) +1 -1
    Use MYF(0) in my_open() in read_ddl_log_header() called from
    execute_ddl_log_recovery() called during the server start up to not
    generate an error if no ddl log exists. This is not an erroneous situation,
    in fact it's the case in any server statrtup. The error was lost
    anyway, since it was pushed into the stack of the artificial thd.

ChangeSet@1.2476.500.40, 2007-11-01 18:06:46+03:00, kostja@bodhi.(none) +1 -0
  Use Internal_error_handler mechanism to silence ER_TOO_MANY_FIELDS
  error in mysql_create_frm instead of
  direct access to my_error() members.
  
  This is a pre-requisite for the patch for Bug#12713.

  sql/unireg.cc@1.98.1.7, 2007-11-01 18:06:44+03:00, kostja@bodhi.(none) +42 -6
    Use Internal_error_handler mechanism to silence ER_TOO_MANY_FIELDS
    error in mysql_create_frm instead of
    direct access to my_error() members.

ChangeSet@1.2476.500.39, 2007-11-01 17:08:02+03:00, kostja@bodhi.(none) +1 -0
  Use thd->is_error() instead of direct access to thd->net.report_error
  in evaluate_join_record().
  
  A minor cleanup required for the fix for Bug#12713.

  sql/sql_select.cc@1.541.31.5, 2007-11-01 17:07:59+03:00, kostja@bodhi.(none) +5 -6
    Use thd->is_error() instead of direct access to thd->net.report_error
    in evaluate_join_record()

ChangeSet@1.2476.590.4, 2007-11-01 15:08:00+01:00, tomas@whalegate.ndb.mysql.com +5 -0
  Bug #31484  	Cluster LOST_EVENTS entry not added to binlog on mysqld restart.

  mysql-test/include/have_multi_ndb.inc@1.8, 2007-11-01 15:07:57+01:00, tomas@whalegate.ndb.mysql.com +2 -10
    Bug #31484  	Cluster LOST_EVENTS entry not added to binlog on mysqld restart.

  mysql-test/suite/ndb/r/ndb_multi_row.result@1.6, 2007-11-01 15:07:57+01:00, tomas@whalegate.ndb.mysql.com +1 -0
    Bug #31484  	Cluster LOST_EVENTS entry not added to binlog on mysqld restart.

  mysql-test/suite/ndb/t/ndb_multi_row.test@1.8, 2007-11-01 15:07:57+01:00, tomas@whalegate.ndb.mysql.com +2 -1
    Bug #31484  	Cluster LOST_EVENTS entry not added to binlog on mysqld restart.

  sql/ha_ndbcluster.cc@1.461.9.7, 2007-11-01 15:07:57+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug #31484  	Cluster LOST_EVENTS entry not added to binlog on mysqld restart.

  sql/ha_ndbcluster_binlog.cc@1.131.1.1, 2007-11-01 15:07:57+01:00, tomas@whalegate.ndb.mysql.com +31 -4
    Bug #31484  	Cluster LOST_EVENTS entry not added to binlog on mysqld restart.

ChangeSet@1.1810.3452.2, 2007-11-01 15:04:23+01:00, istruewing@stella.local +1 -0
  Post-merge fix

  mysql-test/t/variables.test@1.51.9.1, 2007-11-01 15:04:22+01:00, istruewing@stella.local +1 -1
    Post-merge fix

ChangeSet@1.1810.3452.1, 2007-11-01 15:03:09+01:00, istruewing@stella.local +1 -0
  Bug#31909 - New gis.test creates warnings files
  
  Comment sign of -- at line begin in test files lead to warnings
  from mysqltest.
  
  Changed -- to #.

  mysql-test/include/gis_keys.inc@1.2, 2007-11-01 15:03:08+01:00, istruewing@stella.local +8 -8
    Bug#31909 - New gis.test creates warnings files
    Changed -- to # at comment begin to avoid warnings files.

ChangeSet@1.2476.500.38, 2007-11-01 17:00:24+03:00, kostja@bodhi.(none) +1 -0
  Fix a compilation warning.

  sql/sql_connect.cc@1.16, 2007-11-01 17:00:22+03:00, kostja@bodhi.(none) +0 -1
    Fix a compilation warning (unused variable).

ChangeSet@1.2476.617.1, 2007-11-01 14:42:14+02:00, gkodinov@magare.gmz +3 -0
  Bug #31866: MySQL Server crashes on SHOW CREATE TRIGGER statement
  
  SHOW CREATE TRIGGER was not checking for detected errors 
  opening/reading the trigger file. 
  Fixed to return the already generated error.

  mysql-test/r/trigger.result@1.73, 2007-11-01 14:42:13+02:00, gkodinov@magare.gmz +6 -0
    Bug #31866: test case

  mysql-test/t/trigger.test@1.83, 2007-11-01 14:42:13+02:00, gkodinov@magare.gmz +12 -0
    Bug #31866: test case

  sql/sql_show.cc@1.438.5.1, 2007-11-01 14:42:13+02:00, gkodinov@magare.gmz +3 -0
    Bug #31866: test for error and return it.

ChangeSet@1.1810.3430.3, 2007-11-01 16:27:01+04:00, svoj@mysql.com +1 -0
  BUG#31950 - repair table hangs while processing multicolumn utf8
              fulltext index
  
  Having a table with broken multibyte characters may cause fulltext
  parser dead-loop.
  
  Since normally it is not possible to insert broken multibyte sequence
  into a table, this problem may arise only if table is damaged.
  
  Affected statements are:
  - CHECK/REPAIR against damaged table with fulltext index;
  - boolean mode phrase search against damaged table with or
    without fulltext inex;
  - boolean mode searches without index;
  - nlq searches.
  
  No test case for this fix. Affects 5.0 only.

  myisam/ft_parser.c@1.46.6.1, 2007-11-01 16:27:00+04:00, svoj@mysql.com +1 -1
    When skipping leading spaces, skip broken characters as well (broken
    characters a identified by mbl == 0).

ChangeSet@1.2476.1.125, 2007-11-01 12:02:41+01:00, tomas@whalegate.ndb.mysql.com +3 -0
  disable tests

  BitKeeper/etc/ignore@1.235.33.1, 2007-11-01 12:02:39+01:00, tomas@whalegate.ndb.mysql.com +1 -0
    Added libmysql_r/client_settings.h to the ignore list

  mysql-test/suite/rpl/t/disabled.def@1.11.1.2, 2007-11-01 12:02:39+01:00, tomas@whalegate.ndb.mysql.com +2 -2
    disable tests

  mysql-test/suite/rpl_ndb/t/disabled.def@1.10.1.1, 2007-11-01 12:02:39+01:00, tomas@whalegate.ndb.mysql.com +2 -2
    disable tests

ChangeSet@1.1810.3421.2, 2007-11-01 11:33:35+01:00, msvensson@pilot.mysql.com +2 -0
  Bug#32023 ndb_mgmd is slow to repsond when no nodes are up

  ndb/src/mgmsrv/Services.cpp@1.45.43.1, 2007-11-01 11:33:32+01:00, msvensson@pilot.mysql.com +1 -1
    Only call 'updateStatus'(and forcing HB) once before printing
    node status 

  ndb/src/ndbapi/ClusterMgr.cpp@1.17.15.1, 2007-11-01 11:33:32+01:00, msvensson@pilot.mysql.com +4 -1
    Only wait for reply to forced API_REGREQ if any signals
    has been sent

ChangeSet@1.1810.3451.2, 2007-11-01 11:02:28+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#27753 enable mysql-test-run.pl to ignore tests based on wildcard
   - Fix problem in first implementation

  mysql-test/lib/mtr_cases.pl@1.12.1.31, 2007-11-01 11:02:27+01:00, msvensson@pilot.mysql.com +4 -6
    Prepend a ^ to the regex only if _all_ charactersin the pattern are normal

ChangeSet@1.1810.3451.1, 2007-11-01 11:01:05+01:00, msvensson@pilot.mysql.com +1 -0
  Fix comment

  client/mysqltest.c@1.155.9.119, 2007-11-01 11:01:01+01:00, msvensson@pilot.mysql.com +1 -1
    Fix comment

ChangeSet@1.1810.3217.21, 2007-11-01 07:59:55+01:00, knielsen@ymer.(none) +1 -0
  Bug #31848: Test failure: Cluster has problems on insert with auto-increment
  
  Fix uninitialized variable causing failures for some interpreted update
  operations on gcc 4.2.1.

  ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.19.13.1, 2007-11-01 07:59:52+01:00, knielsen@ymer.(none) +2 -1
    Fix uninitialized variable causing failures for some interpreted update
    operations on gcc 4.2.1.

ChangeSet@1.2476.500.36, 2007-11-01 00:55:25+03:00, kostja@bodhi.(none) +1 -0
  Another attempt to fix the Windows compilation failre.

  sql-common/client.c@1.146, 2007-11-01 00:55:23+03:00, kostja@bodhi.(none) +3 -3
    Another attempt to fix the Windows compilation failre.

ChangeSet@1.2476.614.1, 2007-10-31 22:37:10+01:00, jmiller@mysql.com +3 -0
  Adding dbutil to ndb test lib

  storage/ndb/test/include/dbutil.hpp@1.1, 2007-10-31 22:35:06+01:00, jmiller@mysql.com +97 -0
    Hearder file for SQL Database Utilities class for adding MySQL SQL abilities to NDB API tests cases.

  storage/ndb/test/include/dbutil.hpp@1.0, 2007-10-31 22:35:06+01:00, jmiller@mysql.com +0 -0

  storage/ndb/test/src/Makefile.am@1.14, 2007-10-31 22:36:40+01:00, jmiller@mysql.com +1 -1
    Updated to include dbutil

  storage/ndb/test/src/dbutil.cpp@1.1, 2007-10-31 22:36:05+01:00, jmiller@mysql.com +176 -0
    Implementation file for SQL Database Utilities class for adding MySQL SQL abilities to NDB API tests cases.

  storage/ndb/test/src/dbutil.cpp@1.0, 2007-10-31 22:36:05+01:00, jmiller@mysql.com +0 -0

ChangeSet@1.2476.500.35, 2007-11-01 00:31:57+03:00, kostja@bodhi.(none) +3 -0
  A fix for Bug#32007 select udf_function() doesn't return an error if error
  during udf initialization. The bug is spotted while working on Bug 12713.
  
  If a user-defined function was used in a SELECT statement, and an
  error would occur during UDF initialization, this error would not terminate
  execution of the SELECT, but rather would be converted to a warning.
  
  The fix is to use a stack buffer to store the message from udf_init instead
  of private my_error() buffer.

  mysql-test/r/udf.result@1.27, 2007-11-01 00:31:54+03:00, kostja@bodhi.(none) +6 -6
    Update the result to reflect the fix for Bug#32007 select udf_function() 
    doesn't return an error if error during udf initialization

  mysql-test/t/udf.test@1.25, 2007-11-01 00:31:54+03:00, kostja@bodhi.(none) +6 -6
    Update the test to reflect the fix for Bug #32007 select udf_function() 
    doesn't return an error if error during udf initialization

  sql/item_func.cc@1.409.10.7, 2007-11-01 00:31:54+03:00, kostja@bodhi.(none) +3 -2
    A fix for Bug#32007.
    
    net.last_error buffer was used to store the temporary message from udf_init.
    Then, when my_error() was called, net.last_error was not empty so 
    my_error() would conclude that there is already an error in the error stack, 
    and not "overwrite" it.
    However, thd->net.report_error was not set, so the the 
    SELECT was not aborted.
    
    The fix is to use a stack buffer instead of thd->net.last_error
    to store the message from udf_init. The message will end up in
    thd->net.last_error anyway after a call to my_error.

ChangeSet@1.2476.613.1, 2007-11-01 00:10:58+03:00, kostja@bodhi.(none) +6 -0
  Remove net_printf_error(). Do not talk to network directly in
  check_user()/check_connection()/check_for_max_user_connections().
  
  This is a pre-requisite patch for the fix for Bug#12713 "Error in a stored 
  function called from a SELECT doesn't cause ROLLBACK of statem"
  
  Implement review comments.

  sql/mysql_priv.h@1.523.1.25, 2007-11-01 00:10:56+03:00, kostja@bodhi.(none) +0 -1
    check_for_max_user_connections() is used in one place only, make it static.

  sql/mysqld.cc@1.583.1.99, 2007-11-01 00:10:56+03:00, kostja@bodhi.(none) +5 -1
    Remove net_printf_error(): a consolidation of error reporting facilities
    is necessary to simplify maintenance of the query cache, the 
    client-server protocol, stored procedure continue handlers. 
    Rewrite the only place where its use is somewhat justified 
    (my_error() can not be used since we need to report an error for the thread 
    that does not exist) with my_snprintf()/net_send_error().

  sql/protocol.cc@1.133, 2007-11-01 00:10:56+03:00, kostja@bodhi.(none) +1 -119
    Remove net_printf_error().

  sql/protocol.h@1.42.1.1, 2007-11-01 00:10:56+03:00, kostja@bodhi.(none) +0 -1
    Remove net_printf_error().

  sql/sql_connect.cc@1.15, 2007-11-01 00:10:56+03:00, kostja@bodhi.(none) +104 -83
    Remove net_printf_error(). In check_connection()/check_user()/
    check_for_max_user_connections() do not write directly to the network,
    but use the standard my_error() mechanism to record an error in THD.
    It will be sent to the client by the caller. This was the last place
    in the server that would attempt to send an error directly, mainly left 
    untouched by 5.0 refactoring because it is executed only during 
    thread startup.

  sql/sql_parse.cc@1.683.25.1, 2007-11-01 00:10:56+03:00, kostja@bodhi.(none) +0 -5
    In the old code, when res was greater than 0, it contained an exact 
    error code, e.g. ER_OUT_OF_RESOURCES or NO SUCH DATABASE, 
    or ER_HANDSHAKE_ERROR. I don't know the reason why this error code was 
    ignored, and instead a generic  ER_UNKNOWN_COM_ERROR was pushed into the
    error stack, but knowing the relaxed attitude towards preserving the error
    codes in the old code, I'm inclinded to think that it was a bug.
    
    After this patch, the most specific error message is already pushed,
    so calling my_message() again is useless.
    
    If res is < 0, the error used to be already sent. This is not done
    by the new code, but will be done later, in the end
    of dispatch_command(). When this is done, clear_error() will be called 
    for us - it is in the first lines of do_command.
    
    To sum up, this change is to remove COM_CHANGE_USER specific error handling
    in favor of the standard one employed for all other COM_* commands.

ChangeSet@1.2476.612.1, 2007-10-31 23:48:41+03:00, kostja@bodhi.(none) +1 -0
  Try to fix a Windows compilation warning.

  sql-common/client.c@1.145, 2007-10-31 23:48:37+03:00, kostja@bodhi.(none) +70 -55
    Move a block of auxiliary functions to the beginning of the file,
    to avoid compilation warnings on Windows.
    Add comments, albeit trivial, while we're at it.

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.523.22.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.583.119.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.240.19.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.2476.611.1, 2007-10-31 21:09:52+01:00, mats@kindahl-laptop.dnsalias.net +3 -0
  BUG#28086 (SBR of USER() becomes corrupted on slave):
  
  Marking statements containing USER() or CURRENT_USER() as unsafe, causing
  them to switch to using row-based logging in MIXED mode and generate a
  warning in STATEMENT mode.

  mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result@1.24.1.1, 2007-10-31 21:09:44+01:00, mats@kindahl-laptop.dnsalias.net +68 -0
    Result change.

  mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test@1.18.1.1, 2007-10-31 21:09:44+01:00, mats@kindahl-laptop.dnsalias.net +36 -0
    Adding test to check that USER() and CURRENT_USER() cause a switch
    to row-based logging.

  sql/sql_yacc.yy@1.605, 2007-10-31 21:09:44+01:00, mats@kindahl-laptop.dnsalias.net +2 -0
    Setting statements containing USER() or CURRENT_USER() to be unsafe.

ChangeSet@1.2476.605.3, 2007-10-31 14:01:01-05:00, jmiller@mysql.com +1 -0
  rpl_extraSlave_Col.test:
    Corrected issues found in preparing to push code

  mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test@1.6, 2007-10-31 14:00:09-05:00, jmiller@mysql.com +3 -0
    Corrected issues found in preparing to push code

ChangeSet@1.1810.3450.1, 2007-10-31 17:40:29+01:00, mleich@four.local.lan +1 -0
  Fix for
     Bug#29290 type_datetime.test failure in 5.1

  mysql-test/t/type_datetime.test@1.18.8.4, 2007-10-31 17:39:53+01:00, mleich@four.local.lan +16 -3
    - If we are too close to midnight sleep till we reach 
      at least midnight + 1 second.
    - Replace error numbers with error names.

ChangeSet@1.1810.3390.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.602.2, 2007-10-31 13:54:53-02:00, davi@endora.local +1 -0
  Post merge fix for bug 31669.

  tests/mysql_client_test.c@1.255.1.4, 2007-10-31 13:54:51-02:00, davi@endora.local +8 -8
    Macro name changed in 5.1

ChangeSet@1.2476.500.32, 2007-10-31 18:33:13+03:00, kostja@bodhi.(none) +3 -0
  Cleanup: rename select_send::status to select_send::is_result_set_started.
  Add select_send::cleanup.
  Fix a compilation warning.
  Issues spotted while working on the fix for Bug#12713.

  sql-common/client.c@1.144, 2007-10-31 18:33:06+03:00, kostja@bodhi.(none) +0 -1
    Fix a warning.

  sql/sql_class.cc@1.347.2.9, 2007-10-31 18:33:06+03:00, kostja@bodhi.(none) +22 -8
    Give a variable a more specific name. Rewrite an incorrect comment.
    Add a cleanup for select_send. The only case now this cleanup can be
    necessary is when we have a prepared statement inside a stored procedure, 
    and a continue handler. At first execution, the statement is killed
    after having executed select_send::send_fields. At the second execution
    it is killed after having executed select_send::send_fields.

  sql/sql_class.h@1.399.6.4, 2007-10-31 18:33:06+03:00, kostja@bodhi.(none) +8 -2
    Rename a member. Add comments.

ChangeSet@1.2476.610.1, 2007-10-31 17:16:53+03:00, kostja@bodhi.(none) +4 -0
  Cleanup: use helper functions to set an error in MYSQL or MYSQL_STMT.
  No functionality added or changed.
  This is a pre-requisite for the fix for Bug#12713 Error in a stored 
  function called from a SELECT doesn't cause ROLLBACK of statem
  
  Address post-review comments.

  include/sql_common.h@1.21, 2007-10-31 17:16:51+03:00, kostja@bodhi.(none) +4 -2
    Declare auxiliary functions to manipulate mysql.net.last_er* and 
    mysql_stmt.last_er*

  libmysql/libmysql.c@1.301.1.1, 2007-10-31 17:16:51+03:00, kostja@bodhi.(none) +66 -86
    Use helper functions to set an error in MYSQL or MYSQL_STMT

  libmysqld/lib_sql.cc@1.141, 2007-10-31 17:16:51+03:00, kostja@bodhi.(none) +8 -14
    Use helper functions to set an error in MYSQL or MYSQL_STMT

  sql-common/client.c@1.143, 2007-10-31 17:16:51+03:00, kostja@bodhi.(none) +66 -82
    Use helper functions to set an error in MYSQL or MYSQL_STMT

ChangeSet@1.2476.606.1, 2007-10-31 16:01:29+04:00, holyfoot@mysql.com +3 -0
  Bug #31893 Partitions: crash if subpartitions and engine change.
  
  The new default database engine for altered table was reassigned to
  the old one. That's wrong thing by itself, and (as the engine
  for a subpartition gets that new value) leads to DBUG_ASSERTION
  in mysql_unpack_partition()

  mysql-test/r/partition.result@1.69.2.1, 2007-10-31 16:01:26+04:00, holyfoot@mysql.com +14 -0
    Bug #31893 Partitions: crash if subpartitions and engine change.
    
    test result

  mysql-test/t/partition.test@1.63.3.1, 2007-10-31 16:01:26+04:00, holyfoot@mysql.com +11 -0
    Bug #31893 Partitions: crash if subpartitions and engine change.
    
    test case

  sql/sql_partition.cc@1.116.1.1, 2007-10-31 16:01:26+04:00, holyfoot@mysql.com +4 -1
    Bug #31893 Partitions: crash if subpartitions and engine change.
    
    Don't change part_info->default_engine_type if it's already set

ChangeSet@1.1810.3426.2, 2007-10-31 12:25:18+01:00, thek@adventure.(none) +1 -0
  Bug#31347 Increase in memory usage after many DROP USER statements
  
  Dropping users causes huge increase in memory usage because field values were
  allocated on the server memory root for temporary usage but never deallocated.
  
  This patch changes the target memory root to be that of the thread handler
  instead since this root is cleared between each statement.

  sql/sql_acl.cc@1.128.48.1, 2007-10-31 12:25:17+01:00, thek@adventure.(none) +13 -11
    Changed memory root from server life time memory to thread life time memory.

ChangeSet@1.2476.605.1, 2007-10-31 11:48:49+02:00, aelkin@koti.dsl.inet.fi +7 -0
  bug#27571 merging. Fixing offsets and moving tests to the corrent
  destination. Removing wrong (local temp) tests.

  BitKeeper/deleted/.del-binlog_killed_bug27571-master.opt@1.2, 2007-10-31 11:44:30+02:00, aelkin@koti.dsl.inet.fi +0 -0
    Delete: mysql-test/t/binlog_killed_bug27571-master.opt

  BitKeeper/deleted/.del-binlog_killed_bug27571.test@1.2, 2007-10-31 11:44:23+02:00, aelkin@koti.dsl.inet.fi +0 -0
    Delete: mysql-test/t/binlog_killed_bug27571.test

  mysql-test/suite/binlog/r/binlog_killed.result@1.9, 2007-10-31 11:48:43+02:00, aelkin@koti.dsl.inet.fi +7 -6
    results changed

  mysql-test/suite/binlog/r/binlog_killed_simulate.result@1.1, 2007-10-31 11:48:43+02:00, aelkin@koti.dsl.inet.fi +33 -0
    new results file

  mysql-test/suite/binlog/r/binlog_killed_simulate.result@1.0, 2007-10-31 11:48:43+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/suite/binlog/t/binlog_killed.test@1.11.1.2, 2007-10-31 11:48:43+02:00, aelkin@koti.dsl.inet.fi +6 -4
    binlog offset made 5.1 specific

  mysql-test/suite/binlog/t/binlog_killed_simulate-master.opt@1.2, 2007-10-31 11:32:05+02:00, aelkin@koti.dsl.inet.fi +0 -0
    Rename: mysql-test/t/binlog_killed_simulate-master.opt -> mysql-test/suite/binlog/t/binlog_killed_simulate-master.opt

  mysql-test/suite/binlog/t/binlog_killed_simulate.test@1.3, 2007-10-31 11:48:43+02:00, aelkin@koti.dsl.inet.fi +5 -2
    binlog offset + guard to run the test with stmt/mixed format

  mysql-test/suite/binlog/t/binlog_killed_simulate.test@1.2, 2007-10-31 11:31:45+02:00, aelkin@koti.dsl.inet.fi +0 -0
    Rename: mysql-test/t/binlog_killed_simulate.test -> mysql-test/suite/binlog/t/binlog_killed_simulate.test

ChangeSet@1.2476.594.7, 2007-10-31 10:45:31+01:00, mats@kindahl-laptop.dnsalias.net +2 -0
  Post-merge fixes to handle some test failures.

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@1.7, 2007-10-31 10:45:20+01:00, mats@kindahl-laptop.dnsalias.net +8 -8
    Result file change.

  mysql-test/suite/rpl/t/rpl_innodb_bug28430.test@1.5.1.1, 2007-10-31 10:45:20+01:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Include file show_slave_status.inc should be used for portable SHOW SLAVE STATUS.

ChangeSet@1.1810.3448.1, 2007-10-31 10:34:26+01:00, knielsen@loke.(none) +4 -0
  BUG#31799: Scrambled number output due to integer overflow
  
  An integer overflow in number->string conversion caused completely
  wrong output of the number LONGLONG_MIN with gcc 4.2.1.
  
  Fixed by eliminating the overflow, using only operations that are
  well-defined in ANSI C.

  strings/ctype-simple.c@1.75.4.2, 2007-10-31 10:34:25+01:00, knielsen@loke.(none) +14 -10
    An integer overflow in number->string conversion caused completely
    wrong output of the number LONGLONG_MIN with gcc 4.2.1.
    
    Fixed by eliminating the overflow, using only operations that are
    well-defined in ANSI C.

  strings/ctype-ucs2.c@1.50.1.18, 2007-10-31 10:34:25+01:00, knielsen@loke.(none) +14 -10
    An integer overflow in number->string conversion caused completely
    wrong output of the number LONGLONG_MIN with gcc 4.2.1.
    
    Fixed by eliminating the overflow, using only operations that are
    well-defined in ANSI C.

  strings/int2str.c@1.10, 2007-10-31 10:34:25+01:00, knielsen@loke.(none) +10 -6
    An integer overflow in number->string conversion caused completely
    wrong output of the number LONGLONG_MIN with gcc 4.2.1.
    
    Fixed by eliminating the overflow, using only operations that are
    well-defined in ANSI C.

  strings/longlong2str.c@1.10, 2007-10-31 10:34:25+01:00, knielsen@loke.(none) +18 -14
    An integer overflow in number->string conversion caused completely
    wrong output of the number LONGLONG_MIN with gcc 4.2.1.
    
    Fixed by eliminating the overflow, using only operations that are
    well-defined in ANSI C.

ChangeSet@1.2476.500.29, 2007-10-31 12:04:19+03:00, anozdrin@station. +1 -0
  Fix for a BUG#31649: events.test fails: NULL "state" field of
  SHOW PROCESSLIST.
  
  The problem was a race condition: if the Event Scheduler was not
  quick enough, the following scenario happens:
    - The Event Scheduler picks up the created event;
    - The event is executed;
    - event_scheduler_thread->proc_info is set to NULL;
    - The client issues SELECT FROM I_S.
  
  The fix is to wait for the Event Scheduler to reach 'Waiting
  for next activation' state. 

  mysql-test/t/events.test@1.54, 2007-10-31 12:04:17+03:00, anozdrin@station. +2 -1
    Wait for the Event Scheduler to start waiting for the activation.

ChangeSet@1.2476.500.28, 2007-10-31 09:53:58+03:00, anozdrin@station. +2 -0
  Fix result files after patch for BUG#31035.

  mysql-test/r/group_min_max.result@1.35, 2007-10-31 09:53:56+03:00, anozdrin@station. +2 -2
    Update result file.

  mysql-test/r/index_merge_myisam.result@1.9, 2007-10-31 09:53:56+03:00, anozdrin@station. +1 -1
    Update result file.

ChangeSet@1.2476.601.1, 2007-10-30 20:51:04-02:00, davi@endora.local +5 -0
  Bug#30904 SET PASSWORD statement is non-transactional
  
  The SET PASSWORD statement is non-transactional (no explicit transaction
  boundaries) in nature and hence is forbidden inside stored functions and
  triggers, but it weren't being effectively forbidden.
  
  The implemented fix is to issue a implicit commit with every SET PASSWORD
  statement, effectively prohibiting these statements in stored functions
  and triggers. 

  mysql-test/r/sp-error.result@1.133, 2007-10-30 20:51:01-02:00, davi@endora.local +10 -0
    Add test case result for Bug#30904

  mysql-test/t/sp-error.test@1.128, 2007-10-30 20:51:01-02:00, davi@endora.local +19 -0
    Add test case for Bug#30904

  sql/sql_lex.h@1.300.1.1, 2007-10-30 20:51:01-02:00, davi@endora.local +1 -1
    Add variable to set that a statement with SET PASSWORD causes a implicit
    commit.

  sql/sql_parse.cc@1.683.24.2, 2007-10-30 20:51:02-02:00, davi@endora.local +4 -0
    End active transaction in SET PASSWORD.

  sql/sql_yacc.yy@1.601.8.2, 2007-10-30 20:51:02-02:00, davi@endora.local +8 -0
    Set the correct flag on SET PASSWORD if inside a SP, thus effectively
    prohibiting SET PASSWORD statements in stored functions and triggers.

ChangeSet@1.2476.600.1, 2007-10-30 21:17:19+01:00, mats@kindahl-laptop.dnsalias.net +3 -0
  BUG#19958 (RBR idempotency issue for UPDATE and DELETE):
  
  The rpl_trigger test case indicated a problem with idempotency support when run
  under row-based replication, which this patch fixes.
  
  However, despite this, the test is not designed for execution under row-based
  replication and hence rpl_trigger.test is not executed under row-based
  replication.
  
  The problem is that the test expects triggers to be executed when the slave
  updates rows on the slave, and this is (deliberately) not done with row-based
  replication.

  mysql-test/suite/rpl/r/rpl_idempotency.result@1.1, 2007-10-30 21:17:14+01:00, mats@kindahl-laptop.dnsalias.net +71 -0
    New BitKeeper file ``mysql-test/suite/rpl/r/rpl_idempotency.result''

  mysql-test/suite/rpl/r/rpl_idempotency.result@1.0, 2007-10-30 21:17:14+01:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/t/rpl_idempotency.test@1.1, 2007-10-30 21:17:14+01:00, mats@kindahl-laptop.dnsalias.net +79 -0
    New BitKeeper file ``mysql-test/suite/rpl/t/rpl_idempotency.test''

  mysql-test/suite/rpl/t/rpl_idempotency.test@1.0, 2007-10-30 21:17:14+01:00, mats@kindahl-laptop.dnsalias.net +0 -0

  sql/log_event.cc@1.277.39.1, 2007-10-30 21:17:13+01:00, mats@kindahl-laptop.dnsalias.net +67 -4
    Adding function to print symbolic name of handler errors for debug purposes.
    Ignoring some more error messages to provide full idempotency support for
    update and delete operations.

ChangeSet@1.1810.3442.5, 2007-10-30 20:54:31+01:00, kent@mysql.com +1 -0
  Makefile.am:
    Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
    work around for problem with automake 1.10 (bug#24809)

  cmd-line-utils/libedit/Makefile.am@1.16.1.1, 2007-10-30 20:37:12+01:00, kent@mysql.com +9 -3
    Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
    work around for problem with automake 1.10 (bug#24809)

ChangeSet@1.2476.500.25, 2007-10-30 22:35:14+03:00, kostja@bodhi.(none) +7 -0
  In ha_delete_table, use a standard mechanism to intercept the error message
  and convert it to a warning instead of direct manipulation with the
  thread error stack.
  Fix a bug in handler::print_erorr when a garbled message was
  printed for HA_ERR_NO_SUCH_TABLE.
  This is a pre-requisite patch for the fix for Bug#12713 Error in a stored
  function called from a SELECT doesn't cause ROLLBACK of statem

  sql/handler.cc@1.315.15.3, 2007-10-30 22:35:11+03:00, kostja@bodhi.(none) +45 -25
    Use a standard mechanism to intercept the error message, instead
    of direct manipulation with thread error stack. 
    Fix a bug when for HA_ERR_NO_SUCH_TABLE handler::print_error() would
    print a garbled message.

  sql/log.cc@1.297.3.4, 2007-10-30 22:35:11+03:00, kostja@bodhi.(none) +2 -1
    Extend internal error handler interface to carry the message text.

  sql/mysqld.cc@1.583.1.98, 2007-10-30 22:35:11+03:00, kostja@bodhi.(none) +1 -1
    Extend internal error handler interface to carry the message text.

  sql/sql_base.cc@1.421.16.3, 2007-10-30 22:35:11+03:00, kostja@bodhi.(none) +2 -1
    Extend internal error handler interface to carry the message text.

  sql/sql_class.cc@1.347.2.8, 2007-10-30 22:35:11+03:00, kostja@bodhi.(none) +2 -2
    Extend internal error handler interface to carry the message text.

  sql/sql_class.h@1.399.6.3, 2007-10-30 22:35:11+03:00, kostja@bodhi.(none) +2 -1
    Extend internal error handler interface to carry the message text.

  sql/sql_error.cc@1.47, 2007-10-30 22:35:11+03:00, kostja@bodhi.(none) +1 -1
    Extend internal error handler interface to carry the message text.

ChangeSet@1.2476.1.121, 2007-10-30 20:06:49+01:00, joerg@trift2. +2 -0
  Minor Makefile fixes:
  
  1) Add a new top level "Makefile.am" target "make embedded-test".
  
  2) Fix a syntax error (bad merge) in "netware/Makefile.am".

  Makefile.am@1.118.1.26, 2007-10-30 20:06:46+01:00, joerg@trift2. +11 -6
    Add a new "make" target "embedded-test" so that it is easier 
    to test the "embedded server" ("libmyslqd").
    Make it "phony".
    
    Use it via a sub-make within "test-bt" to avoid code duplication.

  netware/Makefile.am@1.35, 2007-10-30 20:06:46+01:00, joerg@trift2. +0 -3
    Cleanup: Macros "BUILT_SOURCES" and "CLEANFILES" should be defined only once.

ChangeSet@1.2476.599.1, 2007-10-30 20:08:16+03:00, kostja@bodhi.(none) +20 -0
  Use an inline getter method (thd->is_error()) to query if there is an error 
  in THD.
  In future the error may be stored elsewhere (not in net.report_error) and 
  it's important to start using an opaque getter to simplify merges.

  sql/filesort.cc@1.126.4.2, 2007-10-30 20:08:10+03:00, kostja@bodhi.(none) +2 -2
    net.report_error -> is_error()

  sql/ha_ndbcluster_binlog.cc@1.133, 2007-10-30 20:08:11+03:00, kostja@bodhi.(none) +1 -1
    net.report_error -> is_error()

  sql/item_func.cc@1.409.10.6, 2007-10-30 20:08:11+03:00, kostja@bodhi.(none) +2 -2
    net.report_error -> is_error()

  sql/item_subselect.cc@1.162.1.1, 2007-10-30 20:08:11+03:00, kostja@bodhi.(none) +1 -1
    net.report_error -> is_error()

  sql/set_var.cc@1.240.16.5, 2007-10-30 20:08:11+03:00, kostja@bodhi.(none) +1 -1
    net.report_error -> is_error()

  sql/sp.cc@1.170.1.3, 2007-10-30 20:08:11+03:00, kostja@bodhi.(none) +1 -1
    net.report_error -> is_error()

  sql/sp_head.cc@1.292.1.6, 2007-10-30 20:08:11+03:00, kostja@bodhi.(none) +3 -3
    net.report_error -> is_error()

  sql/sql_base.cc@1.421.16.2, 2007-10-30 20:08:11+03:00, kostja@bodhi.(none) +5 -5
    net.report_error -> is_error()

  sql/sql_class.cc@1.347.2.7, 2007-10-30 20:08:12+03:00, kostja@bodhi.(none) +2 -2
    net.report_error -> is_error()

  sql/sql_class.h@1.399.6.2, 2007-10-30 20:08:12+03:00, kostja@bodhi.(none) +15 -1
    net.report_error -> is_error()

  sql/sql_connect.cc@1.12.1.1, 2007-10-30 20:08:12+03:00, kostja@bodhi.(none) +3 -3
    net.report_error -> is_error()

  sql/sql_delete.cc@1.226.4.1, 2007-10-30 20:08:12+03:00, kostja@bodhi.(none) +4 -4
    net.report_error -> is_error()

  sql/sql_insert.cc@1.299.2.1, 2007-10-30 20:08:12+03:00, kostja@bodhi.(none) +6 -6
    net.report_error -> is_error()

  sql/sql_parse.cc@1.683.24.1, 2007-10-30 20:08:12+03:00, kostja@bodhi.(none) +11 -11
    net.report_error -> is_error()

  sql/sql_prepare.cc@1.234.1.1, 2007-10-30 20:08:12+03:00, kostja@bodhi.(none) +1 -1
    net.report_error -> is_error()

  sql/sql_select.cc@1.541.31.4, 2007-10-30 20:08:13+03:00, kostja@bodhi.(none) +15 -15
    net.report_error -> is_error()

  sql/sql_union.cc@1.154, 2007-10-30 20:08:13+03:00, kostja@bodhi.(none) +1 -1
    net.report_error -> is_error()

  sql/sql_update.cc@1.239.12.1, 2007-10-30 20:08:13+03:00, kostja@bodhi.(none) +3 -3
    net.report_error -> is_error()

  sql/sql_view.cc@1.155.1.1, 2007-10-30 20:08:13+03:00, kostja@bodhi.(none) +3 -3
    net.report_error -> is_error()

  sql/sql_yacc.yy@1.601.8.1, 2007-10-30 20:08:13+03:00, kostja@bodhi.(none) +2 -2
    net.report_error -> is_error()

ChangeSet@1.1810.3417.3, 2007-10-30 15:22:52+01:00, df@pippilotta.erinye.com +1 -0
  bug#30630

  mysql-test/mysql-test-run.pl@1.30.95.1, 2007-10-30 15:22:49+01:00, df@pippilotta.erinye.com +7 -0
    bug#30630

ChangeSet@1.2476.596.3, 2007-10-30 14:52:12+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  correct result file

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result@1.2, 2007-10-30 14:52:09+01:00, tomas@whalegate.ndb.mysql.com +8 -8
    correct result file

ChangeSet@1.2476.594.5, 2007-10-30 14:08:37+01:00, aelkin@dl145j.mysql.com +4 -0
  manual merge

  BitKeeper/deleted/.del-rpl_slave_skip-slave.opt@1.2, 2007-10-30 13:56:11+01:00, mkindahl@dl145j.mysql.com +0 -0
    Delete: mysql-test/t/rpl_slave_skip-slave.opt

  BitKeeper/deleted/.del-rpl_slave_skip.result@1.2, 2007-10-30 13:58:30+01:00, aelkin@dl145j.mysql.com +0 -0
    Delete: mysql-test/r/rpl_slave_skip.result

  BitKeeper/deleted/.del-rpl_slave_skip.test@1.2, 2007-10-30 13:56:12+01:00, mkindahl@dl145j.mysql.com +0 -0
    Delete: mysql-test/t/rpl_slave_skip.test

  sql/slave.cc@1.324, 2007-10-30 14:07:16+01:00, aelkin@dl145j.mysql.com +8 -105
    manual merge

ChangeSet@1.2476.596.2, 2007-10-30 14:04:41+01:00, tomas@whalegate.ndb.mysql.com +2 -0
  correct manual merge

  mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@1.4, 2007-10-30 14:04:38+01:00, tomas@whalegate.ndb.mysql.com +12 -12
    correct manual merge

  mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@1.4, 2007-10-30 14:04:38+01:00, tomas@whalegate.ndb.mysql.com +12 -12
    correct manual merge

ChangeSet@1.2476.500.23, 2007-10-30 15:39:50+03:00, kostja@bodhi.(none) +1 -0
  Fix failing init_connect.test (5.1-runtime).

  sql/sql_connect.cc@1.13, 2007-10-30 15:39:47+03:00, kostja@bodhi.(none) +11 -1
    Fix failing init_connect.test (5.1-runtime). Add comments for the unjustified use
    of thd->is_slave_error.

ChangeSet@1.1810.3447.1, 2007-10-30 14:27:21+02:00, gkodinov@magare.gmz +3 -0
  Bug #31884: Assertion + crash in subquery in the SELECT clause.
  
  Item_in_subselect's only externally callable method is val_bool().
  However the nullability in the wrapper class (Item_in_optimizer) is 
  established by calling the "forbidden" method val_int().
  
  Fixed to use the correct method (val_bool() ) to establish nullability 
  of Item_in_subselect in Item_in_optimizer.

  mysql-test/r/subselect.result@1.134.1.62, 2007-10-30 14:27:19+02:00, gkodinov@magare.gmz +11 -0
    Bug #31884: test case

  mysql-test/t/subselect.test@1.129.12.1, 2007-10-30 14:27:19+02:00, gkodinov@magare.gmz +15 -0
    Bug #31884: test case

  sql/item_subselect.h@1.77.1.14, 2007-10-30 14:27:19+02:00, gkodinov@magare.gmz +1 -0
    Bug #31884: Use the correct method to establish nullability

ChangeSet@1.2476.500.22, 2007-10-30 15:25:39+03:00, kostja@bodhi.(none) +1 -0
  Make sure rpl.rpl_innodb_mixed_dml passes even if rpl_mixed.dat is read-only.
  This is important for a development environment where not all source files
  are checked out.

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@1.5.2.1, 2007-10-30 15:25:36+03:00, kostja@bodhi.(none) +1 -1
    Make sure rpl.rpl_innodb_mixed_dml passes even if rpl_mixed.dat is read-only.
    This is important for a development environment where not all source files
    are checked out.

ChangeSet@1.2476.594.4, 2007-10-30 13:49:42+02:00, aelkin@koti.dsl.inet.fi +6 -0
  Manual merge 5.0-rpl -> 5.1-rpl.
  
  involved bug#12691, bug#27571

  mysql-test/suite/rpl/r/rpl_sp_effects.result@1.9, 2007-10-30 13:49:34+02:00, aelkin@koti.dsl.inet.fi +41 -0
    results changed

  sql/slave.cc@1.323, 2007-10-30 13:49:35+02:00, aelkin@koti.dsl.inet.fi +9 -70
    pended manual merge done (mats)

  sql/sql_delete.cc@1.232, 2007-10-30 13:49:35+02:00, aelkin@koti.dsl.inet.fi +2 -23
    manual merge

  sql/sql_insert.cc@1.299.1.3, 2007-10-30 13:49:35+02:00, aelkin@koti.dsl.inet.fi +1 -25
    manual merge

  sql/sql_load.cc@1.133, 2007-10-30 13:49:36+02:00, aelkin@koti.dsl.inet.fi +5 -44
    manual merge

  sql/sql_update.cc@1.239.1.21, 2007-10-30 13:49:36+02:00, aelkin@koti.dsl.inet.fi +13 -132
    manual merge.

ChangeSet@1.2476.582.5, 2007-10-30 12:03:44+01:00, istruewing@stella.local +1 -0
  Post-merge fix

  mysql-test/t/variables.test@1.74.1.1, 2007-10-30 12:03:43+01:00, istruewing@stella.local +1 -1
    Post-merge fix

ChangeSet@1.1616.3110.2, 2007-10-30 14:46:43+04:00, svoj@mysql.com +3 -0
  BUG#11392 - fulltext search bug
  
  Fulltext boolean mode phrase search may crash server on platforms
  where size of pointer is not equal to size of unsigned integer
  (in other words some 64-bit platforms).
  
  The problem was integer overflow.
  
  Affects 4.1 only.

  mysql-test/r/fulltext.result@1.65.1.15, 2007-10-30 14:46:42+04:00, svoj@mysql.com +6 -0
    A test case for BUG#11392.

  mysql-test/t/fulltext.test@1.71.1.8, 2007-10-30 14:46:42+04:00, svoj@mysql.com +8 -0
    A test case for BUG#11392.

  myisam/ft_boolean_search.c@1.84.1.6, 2007-10-30 14:46:42+04:00, svoj@mysql.com +2 -1
    my_match_t::beg is unsigned int, that means type of expression
    (m[0].beg - 1) has unsigned type too. It may happen that instr()
    finds substring in the beggining of passed string, returning
    m[0].beg equal to 0. In this case value of expression (m[0].beg - 1)
    is equal to MAX_UINT.
    
    This is not a problem on platforms where sizeof(pointer) equals to
    sizeof(uint). That means ptr[(uint)-1] = ptr[(uint)MAX_UINT] = ptr - 1.
    
    On some 64-bit platforms where sizeof(pointer) is 8 and sizeof(uint)
    is 4, wrong address gets accessed. In other words ptr[(uint)-1] is
    equal to ptr + MAX_UINT.

ChangeSet@1.1810.3446.1, 2007-10-30 12:51:57+04:00, ramil@mysql.com +3 -0
  Fix for bug #30654: mysqlcheck fails during upgrade of tables whose 
  names include backticks or blank
  
  Problem: mysqlcheck doesn't escape backtick characters in the table names.
  
  Fix: escape them.

  client/mysqlcheck.c@1.55.2.2, 2007-10-30 12:51:55+04:00, ramil@mysql.com +38 -14
    Fix for bug #30654: mysqlcheck fails during upgrade of tables whose 
    names include backticks or blank
      - escape backtick characters in the table names.

  mysql-test/r/mysqlcheck.result@1.1.2.1, 2007-10-30 12:51:55+04:00, ramil@mysql.com +6 -1
    Fix for bug #30654: mysqlcheck fails during upgrade of tables whose 
    names include backticks or blank
      - test result.

  mysql-test/t/mysqlcheck.test@1.1.2.1, 2007-10-30 12:51:56+04:00, ramil@mysql.com +10 -1
    Fix for bug #30654: mysqlcheck fails during upgrade of tables whose 
    names include backticks or blank
      - test case.

ChangeSet@1.1616.3113.1, 2007-10-30 12:35:03+04:00, holyfoot@mysql.com +3 -0
  Bug #31758 inet_ntoa, oct crashes server with null+filesort
  
  Item_func_inet_ntoa and Item_func_conv inherit 'maybe_null' flag from an
  argument, which is wrong.
  Both can be NULL with notnull arguments, so that's fixed.

  mysql-test/r/func_str.result@1.70.1.35, 2007-10-30 12:35:02+04:00, holyfoot@mysql.com +15 -3
    Bug #31758 inet_ntoa, oct crashes server with null+filesort
    
    test case

  mysql-test/t/func_str.test@1.64.1.23, 2007-10-30 12:35:02+04:00, holyfoot@mysql.com +13 -0
    Bug #31758 inet_ntoa, oct crashes server with null+filesort
    
    test result

  sql/item_strfunc.h@1.73.2.21, 2007-10-30 12:35:02+04:00, holyfoot@mysql.com +2 -1
    Bug #31758 inet_ntoa, oct crashes server with null+filesort
    
    missing maybe_null flags set for Item_func_inet_ntoa and Item_func_conv

ChangeSet@1.2476.1.117, 2007-10-29 22:48:58+01:00, kent@mysql.com +1 -0
  autorun.sh:
    After review changes

  BUILD/autorun.sh@1.13, 2007-10-29 22:48:18+01:00, kent@mysql.com +4 -4
    After review changes

ChangeSet@1.2476.1.116, 2007-10-29 20:12:44+01:00, kent@mysql.com +2 -0
  autorun.sh:
    Removed innobase from compile-dist, and let it use autorun.sh to avoid
    code duplication. Also corrected a problem when searching for one of
    "libtoolize" and "glibtoolize", now it honors the PATH setting (Bug#31405)

  BUILD/autorun.sh@1.12, 2007-10-29 20:10:53+01:00, kent@mysql.com +16 -7
    Removed innobase from compile-dist, and let it use autorun.sh to avoid
    code duplication. Also corrected a problem when searching for one of
    "libtoolize" and "glibtoolize", now it honors the PATH setting (Bug#31405)

  BUILD/compile-dist@1.18.1.1, 2007-10-29 20:12:28+01:00, kent@mysql.com +3 -8

ChangeSet@1.2476.595.3, 2007-10-29 20:00:36+01:00, joerg@trift2. +1 -0
  5.1 has been promoted to "rc" status.

  configure.in@1.355.80.2, 2007-10-29 20:00:27+01:00, joerg@trift2. +1 -1
    5.1 has been promoted to "rc" status.

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.355.1.109, 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.563.16, 2007-10-29 20:31:03+04:00, ramil@mysql.com +4 -0
  after-merge fix-up.

  mysql-test/include/mix1.inc@1.57.2.2, 2007-10-29 20:31:01+04:00, ramil@mysql.com +9 -0
    after-merge fix-up.

  mysql-test/r/innodb_mysql.result@1.60.3.2, 2007-10-29 20:31:01+04:00, ramil@mysql.com +15 -0
    after-merge fix-up.

  mysql-test/r/key.result@1.46.1.2, 2007-10-29 20:31:01+04:00, ramil@mysql.com +45 -0
    after-merge fix-up.

  mysql-test/t/key.test@1.37.1.2, 2007-10-29 20:31:01+04:00, ramil@mysql.com +20 -0
    after-merge fix-up.

ChangeSet@1.1810.3443.1, 2007-10-29 15:20:59+02:00, aelkin@koti.dsl.inet.fi +12 -0
  Bug #27571 asynchronousity in setting mysql_`query`::error and
             Query_log_event::error_code
  
  A query can perform completely having the local var error of mysql_$query
  zero, where $query in insert, update, delete, load,
  and be  binlogged with error_code e.g KILLED_QUERY while there is no
  reason do to so.
  That can happen because Query_log_event consults thd->killed flag to
  evaluate error_code.
  
  Fixed with implementing a scheme suggested and partly implemented at
  time of bug@22725 work-on. error_status is cached immediatly after the
  control leaves the main rows-loop and that instance always corresponds
  to `error' the local of mysql_$query functions. The cached value
  is passed to Query_log_event constructor, not the default thd->killed
  which can be changed in between of the caching and the constructing.

  mysql-test/t/binlog_killed_bug27571-master.opt@1.1, 2007-10-29 15:20:55+02:00, aelkin@koti.dsl.inet.fi +1 -0
    post rows-loop killing simulation's options

  mysql-test/t/binlog_killed_bug27571-master.opt@1.0, 2007-10-29 15:20:55+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/t/binlog_killed_bug27571.test@1.1, 2007-10-29 15:20:56+02:00, aelkin@koti.dsl.inet.fi +68 -0
    Checking that if killing happens inbetween of the end of rows loop and
    recording into binlog that will not lead to recording any error incl
    the killed error.

  mysql-test/t/binlog_killed_bug27571.test@1.0, 2007-10-29 15:20:56+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/r/binlog_killed.result@1.6.1.1, 2007-10-29 15:20:53+02:00, aelkin@koti.dsl.inet.fi +106 -0
    results changed

  mysql-test/t/binlog_killed.test@1.6.2.1, 2007-10-29 15:20:54+02:00, aelkin@koti.dsl.inet.fi +170 -125
    Demonstrating that effective killing during rows-loop execution leads to the speficied actions:
    binlogging with the error for a query modified a not-transactional table or
    rolling back effects for transactional table;
    
    fixing possible non-determinism with ID when query_log_enabled;
    
    leave commented out tests for multi-update,delete due to another bug;
    
    removing an obsolete tests template;
    
    changing system rm to --remove_file.

  mysql-test/t/binlog_killed_simulate-master.opt@1.1, 2007-10-29 15:20:56+02:00, aelkin@koti.dsl.inet.fi +1 -0
    simulation options

  mysql-test/t/binlog_killed_simulate-master.opt@1.0, 2007-10-29 15:20:56+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/t/binlog_killed_simulate.test@1.1, 2007-10-29 15:20:56+02:00, aelkin@koti.dsl.inet.fi +65 -0
    tests for 
    a query (update is choosen) being killed after the row-loop;
    load data killed within the loop - effective killed error in the event is gained.
    

  mysql-test/t/binlog_killed_simulate.test@1.0, 2007-10-29 15:20:56+02:00, aelkin@koti.dsl.inet.fi +0 -0

  sql/log_event.cc@1.174.27.2, 2007-10-29 15:20:54+02:00, aelkin@koti.dsl.inet.fi +6 -5
    adding killed status arg

  sql/log_event.h@1.122.1.14, 2007-10-29 15:20:54+02:00, aelkin@koti.dsl.inet.fi +6 -4
    added killed status arg

  sql/sql_delete.cc@1.144.22.14, 2007-10-29 15:20:54+02:00, aelkin@koti.dsl.inet.fi +11 -7
    deploying the update part patch for delete, multi-delete

  sql/sql_insert.cc@1.146.44.41, 2007-10-29 15:20:55+02:00, aelkin@koti.dsl.inet.fi +2 -1
    deploying the update-part patch for insert..select

  sql/sql_load.cc@1.78.1.40, 2007-10-29 15:20:55+02:00, aelkin@koti.dsl.inet.fi +20 -6
    deploying the update-part patch for load data.
    simulation added.

  sql/sql_update.cc@1.154.38.10, 2007-10-29 15:20:55+02:00, aelkin@koti.dsl.inet.fi +34 -36
    Impementing the fix as described in the comments left by bug@22725.
    Also simulation of killing after the loop that would affect binlogging in the old code.

ChangeSet@1.2476.569.4, 2007-10-29 15:42:49+03:00, anozdrin@station. +3 -0
  Fix for BUG#27610: ALTER TABLE ROW_FORMAT=... does not
  rebuild the table.
  
  The problem was that ROW_FORMAT clause in ALTER TABLE did not trigger
  table reconstruction.
  
  The fix is to rebuild a table if ROW_FORMAT is specified.

  mysql-test/include/mix1.inc@1.57.1.1, 2007-10-29 15:42:47+03:00, anozdrin@station. +49 -0
    Add a test case for BUG#27610: ALTER TABLE ROW_FORMAT=... does not
    rebuild the table.

  mysql-test/r/innodb_mysql.result@1.60.2.1, 2007-10-29 15:42:47+03:00, anozdrin@station. +34 -0
    Update result file.

  sql/sql_table.cc@1.437.24.3, 2007-10-29 15:42:47+03:00, anozdrin@station. +1 -0
    Rebuild a table if ROW_FORMAT was specified in ALTER TABLE.

ChangeSet@1.2476.580.20, 2007-10-29 15:49:56+04:00, gluh@mysql.com +1 -0
  after merge fix

  mysql-test/r/type_decimal.result@1.53, 2007-10-29 15:49:54+04:00, gluh@mysql.com +2 -2
    after merge fix

ChangeSet@1.1810.3412.15, 2007-10-29 15:39:56+04:00, gluh@mysql.com +4 -0
  Bug#30889: filesort and order by with float/numeric crashes server
  
  There are two problems with ROUND(X, D) on an exact numeric 
  (DECIMAL, NUMERIC type) field of a table:
  1) The implementation of the ROUND function would change the number of decimal
  places regardless of the value decided upon in fix_length_and_dec. When the
  number of decimal places is not constant, this would cause an inconsistent
  state where the number of digits was less than the number of decimal places,
  which crashes filesort.
  
  Fixed by not allowing the ROUND operation to add any more decimal places than
  was decided in fix_length_and_dec.
  
  2) fix_length_and_dec would allow the number of decimals to be greater than
  the maximium configured value for constant values of D. This led to the same 
  crash as in (1).
  
  Fixed by not allowing the above in fix_length_and_dec.

  mysql-test/r/type_decimal.result@1.38.1.10, 2007-10-29 15:39:54+04:00, gluh@mysql.com +67 -0
    Bug#30889: Test result

  mysql-test/t/type_decimal.test@1.35.1.3, 2007-10-29 15:39:54+04:00, gluh@mysql.com +38 -1
    Bug#30889: Test case

  sql/item_func.cc@1.270.89.1, 2007-10-29 15:39:54+04:00, gluh@mysql.com +2 -1
    Bug#30889: 
    - Avoid setting number of digits after decimal point (scale) higher than its 
      maximum value.
    - Avoid increasing the number of decimal places in ::decimal_op

  sql/item_func.h@1.136.3.40, 2007-10-29 15:39:54+04:00, gluh@mysql.com +31 -0
    Bug#30889: Added comments to the declarations of Item_func_numhybrid::<type>_op
    family of methods.

ChangeSet@1.1810.3412.14, 2007-10-29 14:53:10+04:00, gluh@mysql.com +3 -0
  Bug#30897 GROUP_CONCAT returns extra comma on empty fields
  The fix is a copy of Martin Friebe's suggestion.
  added testing for no_appended which will be false if anything,
  including the empty string is in result

  mysql-test/r/func_gconcat.result@1.52.1.21, 2007-10-29 14:53:09+04:00, gluh@mysql.com +9 -0
    test result

  mysql-test/t/func_gconcat.test@1.44.1.16, 2007-10-29 14:53:09+04:00, gluh@mysql.com +9 -0
    test case

  sql/item_sum.cc@1.170.1.46, 2007-10-29 14:53:09+04:00, gluh@mysql.com +1 -1
    added testing for no_appended which will be False if anything,
    including the empty string is in result

ChangeSet@1.1810.3412.13, 2007-10-29 14:45:35+04:00, gluh@mysql.com +2 -0
  backported test case from 5.1

  mysql-test/r/information_schema.result@1.87.4.11, 2007-10-29 14:45:33+04:00, gluh@mysql.com +32 -0
    backported test case from 5.1

  mysql-test/t/information_schema.test@1.65.4.9, 2007-10-29 14:45:33+04:00, gluh@mysql.com +20 -0
    backported test case from 5.1

ChangeSet@1.1810.3412.12, 2007-10-29 11:52:44+03:00, kaa@polly.(none) +1 -0
  Fixed compile warnings introduced by the patch for bug #29131.

  sql/mysqld.cc@1.439.137.2, 2007-10-29 11:52:39+03:00, kaa@polly.(none) +2 -1
    Fixed compile warnings introduced by the patch for bug #29131.

ChangeSet@1.2476.1.115, 2007-10-29 09:31:13+01:00, mleich@four.local.lan +3 -0
  Fix for
    Bug#31857 funcs_1: a_processlist_priv_no_prot and b_processlist_priv_ps fail
    
  Reason for the changes is:
    WL4007 Deprecate RENAME DATABASE: replace with ALTER DATABASE <name> UPGRADE

  mysql-test/suite/funcs_1/datadict/datadict_priv.inc@1.2, 2007-10-29 09:31:11+01:00, mleich@four.local.lan +4 -1
    1. Adjustment to new server response (ER_PARSE_ERROR instead of ER_DBACCESS_DENIED_ERROR)
    2. Add missing subtest with ALTER DATABASE ... UPGRADE ...

  mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result@1.3, 2007-10-29 09:31:11+01:00, mleich@four.local.lan +4 -0
    Updated results

  mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result@1.3, 2007-10-29 09:31:11+01:00, mleich@four.local.lan +4 -0
    Updated results

ChangeSet@1.1810.3440.1, 2007-10-29 12:20:21+04:00, ramil@mysql.com +4 -0
  Fix for bug #30782: Truncated UNSIGNED BIGINT columns only in SELECT w/ CASE, 
  JOIN, and ORDER BY
  
  Problem: improper maximum length calculation of the CASE function leads to 
  decimal value truncation (storing/retrieving decimal field values).
  
  Fix: accurately calculate maximum length/unsigned flag/decimals parameters 
  of the CASE function.

  mysql-test/r/case.result@1.24.2.5, 2007-10-29 12:20:19+04:00, ramil@mysql.com +19 -1
    Fix for bug #30782: Truncated UNSIGNED BIGINT columns only in SELECT w/ CASE, 
    JOIN, and ORDER BY
      - test result.

  mysql-test/t/case.test@1.18.1.4, 2007-10-29 12:20:19+04:00, ramil@mysql.com +19 -2
    Fix for bug #30782: Truncated UNSIGNED BIGINT columns only in SELECT w/ CASE, 
    JOIN, and ORDER BY
      - test case.

  sql/item_cmpfunc.cc@1.187.51.1, 2007-10-29 12:20:19+04:00, ramil@mysql.com +30 -6
    Fix for bug #30782: Truncated UNSIGNED BIGINT columns only in SELECT w/ CASE, 
    JOIN, and ORDER BY
      - accurately calculate Item_func_case::max_length/unsigned_flag/decimals.

  sql/item_cmpfunc.h@1.122.24.1, 2007-10-29 12:20:19+04:00, ramil@mysql.com +2 -0
    Fix for bug #30782: Truncated UNSIGNED BIGINT columns only in SELECT w/ CASE, 
    JOIN, and ORDER BY
      - accurately calculate Item_func_case::max_length/unsigned_flag/decimals.

ChangeSet@1.2476.580.12, 2007-10-28 11:30:36+04:00, gshchepa@gleb.loc +3 -0
  Many files:
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_extraCol_innodb.result@1.12.1.1, 2007-10-28 11:30:08+04:00, gshchepa@gleb.loc +16 -16
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_extraCol_myisam.result@1.12.1.1, 2007-10-28 11:30:08+04:00, gshchepa@gleb.loc +16 -16
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result@1.24, 2007-10-28 11:30:08+04:00, gshchepa@gleb.loc +6 -6
    Error message numbers.

ChangeSet@1.2476.580.11, 2007-10-28 02:09:24+04:00, gshchepa@gleb.loc +3 -0
  rpl_row_tabledefs_2myisam.result, sp.result, rpl_row_colSize.result:
    Error message numbers.

  mysql-test/r/sp.result@1.304, 2007-10-28 02:09:11+04:00, gshchepa@gleb.loc +4 -4
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_row_colSize.result@1.4, 2007-10-28 02:08:51+04:00, gshchepa@gleb.loc +26 -26
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result@1.27, 2007-10-28 02:08:51+04:00, gshchepa@gleb.loc +6 -6
    Error message numbers.

ChangeSet@1.2476.580.10, 2007-10-28 02:33:18+05:00, gshchepa@gleb.loc +1 -0
  ha_archive.cc:
    Post-merge fix.

  storage/archive/ha_archive.cc@1.138.1.6, 2007-10-28 02:29:15+05:00, gshchepa@gleb.loc +1 -1
    Post-merge fix.

ChangeSet@1.2476.592.2, 2007-10-27 01:40:48+05:00, gshchepa@gleb.loc +14 -0
  Many files:
    Error message numbers.

  mysql-test/r/events_bugs.result@1.42.1.1, 2007-10-27 05:03:12+05:00, gshchepa@gleb.loc +8 -8
    Error message numbers.

  mysql-test/r/events_trans.result@1.6, 2007-10-27 05:04:18+05:00, gshchepa@gleb.loc +1 -1
    Error message numbers.

  mysql-test/r/sp_gis.result@1.11, 2007-10-27 05:07:10+05:00, gshchepa@gleb.loc +2 -2
    Error message numbers.

  mysql-test/r/xml.result@1.29, 2007-10-27 05:08:29+05:00, gshchepa@gleb.loc +9 -9
    Error message numbers.

  mysql-test/r/binlog_unsafe.result@1.6, 2007-10-27 04:37:17+05:00, gshchepa@gleb.loc +2 -2
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_dd_basic.result@1.22.1.2, 2007-10-27 05:52:59+05:00, gshchepa@gleb.loc +3 -3
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_dd_ddl.result@1.21, 2007-10-27 06:02:36+05:00, gshchepa@gleb.loc +1 -1
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_gis.result@1.27, 2007-10-27 06:02:47+05:00, gshchepa@gleb.loc +2 -2
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_row_format.result@1.9, 2007-10-27 06:02:54+05:00, gshchepa@gleb.loc +1 -1
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_single_user.result@1.15, 2007-10-27 06:02:55+05:00, gshchepa@gleb.loc +5 -5
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_incident.result@1.13, 2007-10-27 05:09:44+05:00, gshchepa@gleb.loc +2 -2
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_loaddata_fatal.result@1.8, 2007-10-27 05:10:36+05:00, gshchepa@gleb.loc +2 -2
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_udf.result@1.12, 2007-10-27 05:11:26+05:00, gshchepa@gleb.loc +4 -4
    Error message numbers.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result@1.13.1.1, 2007-10-27 05:40:31+05:00, gshchepa@gleb.loc +16 -16
    Error message numbers.

ChangeSet@1.1810.3439.1, 2007-10-26 18:52:58+02:00, mats@kindahl-laptop.dnsalias.net +4 -0
  BUG#12691 (Exec_master_log_pos corrupted with SQL_SLAVE_SKIP_COUNTER):
    
  Adding code to keep skipping events while inside a transaction. Execution
  will start just after the transaction has been skipped.

  mysql-test/t/rpl_slave_skip-slave.opt@1.1, 2007-10-26 18:52:53+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    New BitKeeper file ``mysql-test/t/rpl_slave_skip-slave.opt''

  mysql-test/t/rpl_slave_skip-slave.opt@1.0, 2007-10-26 18:52:53+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/r/rpl_slave_skip.result@1.1, 2007-10-26 18:52:53+02:00, mats@kindahl-laptop.dnsalias.net +144 -0
    New BitKeeper file ``mysql-test/r/rpl_slave_skip.result''

  mysql-test/r/rpl_slave_skip.result@1.0, 2007-10-26 18:52:53+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/t/rpl_slave_skip.test@1.1, 2007-10-26 18:52:54+02:00, mats@kindahl-laptop.dnsalias.net +203 -0
    New BitKeeper file ``mysql-test/t/rpl_slave_skip.test''

  mysql-test/t/rpl_slave_skip.test@1.0, 2007-10-26 18:52:54+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  sql/slave.cc@1.241.29.1, 2007-10-26 18:52:53+02:00, mats@kindahl-laptop.dnsalias.net +53 -3
    Adding code to set the thd->options flag for the slave SQL thread
    even when BEGIN, ROLLBACK, COMMIT, and XID events are being skipped.
        
    Adding code to not decrease the slave skip counter from 1 to 0 if we
    are inside a transaction. This will keep the counter at 1, and keep
    skipping events, until a transaction terminator is read. At that point,
    the slave skip counter will be decreased to 0, and events will be read
    and executed instead of read and skipped.

ChangeSet@1.2476.593.1, 2007-10-26 21:26:06+05:00, gshchepa@gleb.loc +4 -0
  Fixed bug #31036: Using order by with archive table crashes server.
  
  1. Memory overrun have been fixed.
  2. Server failure on assertion has been fixed.

  mysql-test/r/archive.result@1.33.1.1, 2007-10-26 20:55:06+05:00, gshchepa@gleb.loc +4 -0
    Added test case for bug #31036.

  mysql-test/t/archive.test@1.32.1.1, 2007-10-26 20:54:55+05:00, gshchepa@gleb.loc +22 -0
    Added test case for bug #31036.

  storage/archive/azio.c@1.20.1.1, 2007-10-26 20:54:40+05:00, gshchepa@gleb.loc +5 -5
    Fixed bug #31036.
    The ha_archive::rnd_pos function has been modified to take
    into account the result of the azseek function and
    to return HA_ERR_CRASHED_ON_USAGE in case of seek error.

  storage/archive/ha_archive.cc@1.138.1.5, 2007-10-26 20:54:49+05:00, gshchepa@gleb.loc +2 -2
    Fixed bug #31036.
    1. Memory overrun has been fixed: maximal sizes of azio_stream::inbuf
       and azio_stream::outbuf was mixed.
    2. Zero value of the output parameter of the azread function was
       incorrectly interpreted by the azseek function: after the first
       successful read attempt the execution of the azseek loop was
       interrupted and negative value was returned.
       (See ha_archive::rnd_pos: that negative value was silently ignored,
       and an incomplete data was used, for example, as a size of a packed
       record, and server failed with the assertion:
       "row_len <= record_buffer->length".)

ChangeSet@1.2476.1.114, 2007-10-26 17:36:22+02:00, mleich@four.local.lan +4 -0
  Fix for
     Bug#31408 funcs_1: <engine>_trig_03e test fail
  Modification:
     The TRIGGER PRIVILEGE is now needed for getting informations about TRIGGERs.
     Therefore after REVOKE TRIGGER privilege the 
     - SHOW TRIGGERS
     - SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
     result sets are now empty.

  mysql-test/suite/funcs_1/r/innodb_trig_03e.result@1.3, 2007-10-26 17:36:20+02:00, mleich@four.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/memory_trig_03e.result@1.3, 2007-10-26 17:36:20+02:00, mleich@four.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/myisam_trig_03e.result@1.3, 2007-10-26 17:36:20+02:00, mleich@four.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/ndb_trig_03e.result@1.4, 2007-10-26 17:36:20+02:00, mleich@four.local.lan +0 -2
    Updated results

ChangeSet@1.2476.567.3, 2007-10-26 16:11:20+02:00, msvensson@pilot.mysql.com +2 -0
  Bug#28772 rpl_row_until fails in pushbuild

  mysql-test/suite/rpl/t/rpl_row_until.test@1.9, 2007-10-26 16:11:18+02:00, msvensson@pilot.mysql.com +4 -0
       - Add a "wait_for_slave_to_stop.inc" after the two "stop slave"
         commands after wich we want to show the slaves status

  mysql-test/suite/rpl/t/rpl_stm_until.test@1.31, 2007-10-26 16:11:18+02:00, msvensson@pilot.mysql.com +4 -0
       - Add a "wait_for_slave_to_stop.inc" after the two "stop slave"
         commands after wich we want to show the slaves status

ChangeSet@1.1810.3318.16, 2007-10-26 15:29:06+02:00, istruewing@stella.local +3 -0
  Bug#4692 - DISABLE/ENABLE KEYS waste a space
  
  Disabling and enabling indexes on a non-empty table grows the
  index file.
  
  Disabling indexes just sets a flag per non-unique index and does not
  free the index blocks of the affected indexes. Re-enabling indexes
  creates new indexes with new blocks. The old blocks remain unused
  in the index file.
  
  Fixed by dropping and re-creating all indexes if non-empty disabled
  indexes exist when enabling indexes. Dropping all indexes resets
  the internal end-of-file marker to the end of the index file header.
  It also clears the root block pointers of every index and clears the
  deleted blocks chains. This way all blocks are declared as free.

  mysql-test/r/myisam.result@1.71.1.30, 2007-10-26 15:29:05+02:00, istruewing@stella.local +25 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added test result.

  mysql-test/t/myisam.test@1.55.1.27, 2007-10-26 15:29:05+02:00, istruewing@stella.local +26 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added test.

  myisam/mi_check.c@1.129.27.1, 2007-10-26 15:29:05+02:00, istruewing@stella.local +165 -57
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added function mi_drop_all_indexes() to support drop of all indexes
    in case we want to re-enable non-empty disabled indexes.
    Changed mi_repair(), mi_repair_by_sort(), and mi_repair_parallel()
    to use the new function instead of duplicate drop index code.

ChangeSet@1.1810.3302.41, 2007-10-26 15:37:38+05:00, ramil@mysql.com +7 -0
  Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
  file .\ha_innodb.
  
  Problem: if a partial unique key followed by a non-partial one we declare
  the second one as a primary key.
  
  Fix: sort non-partial unique keys before partial ones.

  include/my_base.h@1.70.1.17, 2007-10-26 15:37:37+05:00, ramil@mysql.com +1 -1
    Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
    file .\ha_innodb.
      - sort unique keys that don't contain partial segments before other keys:
          set HA_KEY_HAS_PART_KEY_SEG flag for such keys in the mysql_prepare_table(),
          use it in the sort_keys();

  mysql-test/t/innodb_mysql.test@1.3.50.1, 2007-10-26 15:37:37+05:00, ramil@mysql.com +9 -0
    Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
    file .\ha_innodb.
      - test case.

  mysql-test/r/innodb_mysql.result@1.3.22.6, 2007-10-26 15:37:37+05:00, ramil@mysql.com +15 -0
    Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
    file .\ha_innodb.
      - test result.

  mysql-test/r/key.result@1.28.1.12, 2007-10-26 15:37:37+05:00, ramil@mysql.com +44 -0
    Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
    file .\ha_innodb.
      - test result.

  mysql-test/t/key.test@1.24.1.7, 2007-10-26 15:37:37+05:00, ramil@mysql.com +18 -0
    Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
    file .\ha_innodb.
      - test case.

  sql/sql_table.cc@1.239.71.2, 2007-10-26 15:37:37+05:00, ramil@mysql.com +18 -8
    Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
    file .\ha_innodb.
      - sort unique keys that don't contain partial segments before other keys:
          set HA_KEY_HAS_PART_KEY_SEG flag for such keys in the mysql_prepare_table(),
          use it in the sort_keys();

  sql/structs.h@1.53.4.3, 2007-10-26 15:37:37+05:00, ramil@mysql.com +1 -1
    Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
    file .\ha_innodb.
      - sort unique keys that don't contain partial segments before other keys:
          set HA_KEY_HAS_PART_KEY_SEG flag for such keys in the mysql_prepare_table(),
          use it in the sort_keys();

ChangeSet@1.2476.590.2, 2007-10-26 11:43:05+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  correct unused code

  sql/sql_update.cc@1.239.11.1, 2007-10-26 11:43:02+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    correct unused code

ChangeSet@1.2476.590.1, 2007-10-26 11:42:33+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  commit of WL#3686 test case already in 5.1 to get regression testing, no code committed

  mysql-test/suite/ndb/r/ndb_update_no_read.result@1.1, 2007-10-26 11:42:30+02:00, tomas@whalegate.ndb.mysql.com +75 -0
    New BitKeeper file ``mysql-test/suite/ndb/r/ndb_update_no_read.result''

  mysql-test/suite/ndb/r/ndb_update_no_read.result@1.0, 2007-10-26 11:42:30+02:00, tomas@whalegate.ndb.mysql.com +0 -0

  mysql-test/suite/ndb/t/ndb_update_no_read.test@1.1, 2007-10-26 11:42:30+02:00, tomas@whalegate.ndb.mysql.com +79 -0
    New BitKeeper file ``mysql-test/suite/ndb/t/ndb_update_no_read.test''

  mysql-test/suite/ndb/t/ndb_update_no_read.test@1.0, 2007-10-26 11:42:30+02:00, tomas@whalegate.ndb.mysql.com +0 -0

ChangeSet@1.2476.433.19, 2007-10-26 09:06:18+02:00, jonas@perch.ndb.mysql.com +1 -0
  post merge weirdness

  mysql-test/suite/ndb/r/ndb_basic.result@1.60, 2007-10-26 09:06:16+02:00, jonas@perch.ndb.mysql.com +10 -10
    post merge weirdness

ChangeSet@1.1810.3437.1, 2007-10-26 09:01:29+02:00, tnurnberg@mysql.com +2 -0
  Bug#31662: 'null' is shown as type of fields for view with bad definer, breaks mysqldump
  
  SHOW FIELDS FROM a view with no valid definer was possible (since fix
  for Bug#26817), but gave NULL as a field-type. This led to mysqldump-ing
  of such views being successful, but loading such a dump with the client
  failing. Patch allows SHOW FIELDS to give data-type of field in underlying
  table.

  mysql-test/r/information_schema_db.result@1.1.2.4, 2007-10-26 09:01:28+02:00, tnurnberg@mysql.com +3 -3
    Fix test results: SHOW FIELDS FROM a view with no valid DEFINER
    gives us the field-type of the underlying table now rather than NULL.

  sql/sql_base.cc@1.235.116.1, 2007-10-26 09:01:28+02:00, tnurnberg@mysql.com +3 -1
    In the case of SHOW FIELDS FROM <view>, do not require a valid
    DEFINER for determining underlying data-type like we usually do.
    This is needed for mysqldump.

ChangeSet@1.1810.3436.1, 2007-10-26 08:42:33+02:00, jonas@perch.ndb.mysql.com +4 -0
  ndb - bug#31635 (5.0)
    0 pad varsize keys in ndbapi

  mysql-test/r/ndb_basic.result@1.28.1.11, 2007-10-26 08:42:31+02:00, jonas@perch.ndb.mysql.com +24 -0
    new testcase

  mysql-test/t/ndb_basic.test@1.32.1.9, 2007-10-26 08:42:31+02:00, jonas@perch.ndb.mysql.com +20 -2
    new testcase

  ndb/src/ndbapi/NdbOperationDefine.cpp@1.19.8.1, 2007-10-26 08:42:31+02:00, jonas@perch.ndb.mysql.com +25 -8
    pad varsize keys

  ndb/src/ndbapi/NdbOperationSearch.cpp@1.24.6.1, 2007-10-26 08:42:31+02:00, jonas@perch.ndb.mysql.com +23 -7
    pad varsize keys

ChangeSet@1.2476.588.1, 2007-10-25 21:19:28-07:00, antony@pcg5ppc.xiphis.org +3 -0
  Bug#30296
    "Dynamic plugins fail to load on FreeBSD"
    ELF executables need to be linked using the -export-dynamic option to
    ld(1) for symbols defined in the executable to become visible to dlsym().
    Also, do not build plugins on an all-static build.

  config/ac-macros/plugins.m4@1.16.1.6, 2007-10-25 21:19:20-07:00, antony@pcg5ppc.xiphis.org +11 -0
    Do not build plugins when building all-static

  configure.in@1.355.52.38, 2007-10-25 21:19:19-07:00, antony@pcg5ppc.xiphis.org +12 -1
    Bug#30296
      Use "-export-dynamic" when building executable for use with plugins.
      Add required option using MYSQLD_EXTRA_LDFLAGS variable so we do not
      affect any other binary.

  sql/sql_yacc.yy@1.601.6.1, 2007-10-25 21:19:20-07:00, antony@pcg5ppc.xiphis.org +1 -1
    build fix - surplus semicolon

ChangeSet@1.1810.3430.2, 2007-10-25 17:23:12-07:00, antony@pcg5ppc.xiphis.org +2 -0
  protect bug31473 from regressing into 5.0

  mysql-test/r/csv.result@1.4.1.5, 2007-10-25 17:23:06-07:00, antony@pcg5ppc.xiphis.org +42 -0
    protect bug31473 from regressing into 5.0

  mysql-test/t/csv.test@1.5.1.7, 2007-10-25 17:23:06-07:00, antony@pcg5ppc.xiphis.org +33 -0
    protect bug31473 from regressing into 5.0

ChangeSet@1.1616.3112.1, 2007-10-25 13:28:12+02:00, df@pippilotta.erinye.com +1 -0
  add new trigger to prevent certain naming clashes

  BitKeeper/triggers/pre-commit.check-case.pl@1.1, 2007-10-25 13:28:09+02:00, df@pippilotta.erinye.com +26 -0
    catch duplicate file names, ignoring capitalisation, mostly to avoid changesets where a deleted file foobar and a deleted file FooBar break a tree on case insensitive file systems

  BitKeeper/triggers/pre-commit.check-case.pl@1.0, 2007-10-25 13:28:09+02:00, df@pippilotta.erinye.com +0 -0

ChangeSet@1.2476.586.1, 2007-10-25 13:17:44+02:00, joerg@trift2. +1 -0
  Mimic a rename which Daniel already did in 6.0,
  to get rid of a name clash among *deleted* files on case-insignificant file systems.

  BitKeeper/deleted/.del-changelog-bleh@1.7, 2007-10-25 13:13:48+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-changelog -> BitKeeper/deleted/.del-changelog-bleh

ChangeSet@1.2476.585.1, 2007-10-25 14:03:24+04:00, kaa@polly.(none) +3 -0
  Fix for bug #29131: SHOW VARIABLES reports variable 'log' but SET
  doesn't recognize it
    
  This is a 5.1 version of the patch.
    
  Problem:
    
  'log' and 'log_slow_queries' were "fixed" variables, i.e. they showed up
  in SHOW VARIABLES, but could not be used in expressions like 
  "select @@log". Also, using them in the SET statement produced an 
  incorrect "unknown system variable" error.
    
  Solution:
  
  Since as of MySQL 5.1.12 one can enable or disable the general query log
  or the slow query log at runtime by changing values of
  general_log/slow_query_log, make 'log' and 'log_slow_queries" to be 
  synonyms for 'general_log' and 'slow_query_log' respectively.  This 
  makes expressions using the '@@var' syntax backward compatible with 
  5.0 and SHOW VARIABLES output to be consistent with the SET statement.

  mysql-test/r/log_state.result@1.7.1.1, 2007-10-25 14:03:17+04:00, kaa@polly.(none) +63 -0
    Added a test case for bug #29131.

  mysql-test/t/log_state.test@1.9.1.1, 2007-10-25 14:03:17+04:00, kaa@polly.(none) +36 -0
    Added a test case for bug #29131.

  sql/set_var.cc@1.240.18.1, 2007-10-25 14:03:17+04:00, kaa@polly.(none) +6 -2
    Made the 'log' and 'log_slow_queries' system variables to be synonyms for 'general_log' and 'slow_query_log'.

ChangeSet@1.1810.3435.1, 2007-10-25 14:02:27+04:00, kaa@polly.(none) +6 -0
  Fix for bug #29131: SHOW VARIABLES reports variable 'log' but SET
  doesn't recognize it
  
  This is a 5.0 version of the patch, it will be null-merged to 5.1
  
  Problem:
  
  'log' and 'log_slow_queries' were "fixed" variables, i.e. they showed up
  in SHOW VARIABLES, but could not be used in expressions like 
  "select @@log". Also, using them in the SET statement produced an 
  incorrect "unknown system variable" error.
  
  Solution:
  
  Make 'log' and 'log_slow_queries' read-only dynamic variables to make 
  them available for use in expressions, and produce a correct error 
  about the variable being read-only when used in the SET statement.

  mysql-test/r/variables.result@1.76.9.1, 2007-10-25 14:02:22+04:00, kaa@polly.(none) +16 -0
    Added a test case for bug #29131.

  mysql-test/t/variables.test@1.51.8.1, 2007-10-25 14:02:23+04:00, kaa@polly.(none) +14 -0
    Added a test case for bug #29131.

  sql/mysql_priv.h@1.290.130.2, 2007-10-25 14:02:23+04:00, kaa@polly.(none) +2 -2
    Changed the type of opt_log and opt_slow_log to my_bool to 
    align with the interfaces in set_var.cc

  sql/mysqld.cc@1.439.136.1, 2007-10-25 14:02:23+04:00, kaa@polly.(none) +2 -2
    Changed the type of opt_log and opt_slow_log to my_bool to 
    align with the interfaces in set_var.cc

  sql/set_var.cc@1.125.40.1, 2007-10-25 14:02:23+04:00, kaa@polly.(none) +6 -2
    Made 'log' and 'log_slow_queries' to be read-only dynamic system 
    variable, i.e. available for use in expressions with the @@var syntax.

  sql/set_var.h@1.68.8.1, 2007-10-25 14:02:23+04:00, kaa@polly.(none) +22 -0
    Added a new system variable class representing a read-only boolean
    variable.

ChangeSet@1.2476.478.18, 2007-10-25 11:58:18+02:00, sven@murkla.(none) +3 -0
  WL#4078:  Document binary format of binlog entries
  Documented some binlog events using doxygen. More will be done later.
  Also fixed typos in other comments and added remarks about dubious code.
  Only comments are affected, there is no change to the actual code.

  sql/log_event.cc@1.277.32.8, 2007-10-25 11:58:14+02:00, sven@murkla.(none) +27 -2
    Fixed typos in some comments.
    Added remarks (as comments) about questionable code.

  sql/log_event.h@1.165, 2007-10-25 11:58:14+02:00, sven@murkla.(none) +866 -127
    Documented the binary format of following binlog events:
    Log_event
    Query_log_event
    Muted_query_log_event
    Slave_log_event (partial)
    Load_log_event
    Intvar_log_event
    Rand_log_event
    Rotate_log_event (partial)

  sql/sql_class.h@1.403, 2007-10-25 11:58:14+02:00, sven@murkla.(none) +7 -5
    Fixed typo in comment.

ChangeSet@1.1810.3434.1, 2007-10-25 08:40:42+02:00, knielsen@loke.(none) +1 -0
  BUG#31810: Potential infinite loop with autoincrement failures in ndb
  
  Fix extra semicolon causing if-statement to be disabled.

  sql/ha_ndbcluster.cc@1.175.92.1, 2007-10-25 08:35:35+02:00, knielsen@loke.(none) +2 -2
    Fix extra semicolon causing if-statement to be disabled.

ChangeSet@1.1810.2128.71, 2007-10-25 07:57:18+02:00, knielsen@loke.(none) +5 -0
  BUG#31761: Code for cluster is not safe for strict-alias optimization in new gcc
  
  Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
  
  Using the same object as both Uint32 and class AttributeHeader violates
  strict aliasing rule.

  ndb/include/kernel/AttributeHeader.hpp@1.7.2.1, 2007-10-25 07:54:38+02:00, knielsen@loke.(none) +5 -5
    Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
    
    Using the same object as both Uint32 and class AttributeHeader violates
    strict aliasing rule.

  ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.19.11.1, 2007-10-25 07:54:38+02:00, knielsen@loke.(none) +3 -2
    Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
    
    Using the same object as both Uint32 and class AttributeHeader violates
    strict aliasing rule.

  ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp@1.16.4.1, 2007-10-25 07:54:38+02:00, knielsen@loke.(none) +5 -6
    Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
    
    Using the same object as both Uint32 and class AttributeHeader violates
    strict aliasing rule.

  ndb/src/kernel/blocks/dbutil/DbUtil.cpp@1.11.3.1, 2007-10-25 07:54:38+02:00, knielsen@loke.(none) +2 -3
    Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
    
    Using the same object as both Uint32 and class AttributeHeader violates
    strict aliasing rule.

  ndb/src/ndbapi/NdbOperationDefine.cpp@1.19.6.1, 2007-10-25 07:56:56+02:00, knielsen@loke.(none) +6 -9
    Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
    
    Using the same object as both Uint32 and class AttributeHeader violates
    strict aliasing rule.

ChangeSet@1.1810.3433.1, 2007-10-25 10:32:52+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #27695: View should not be allowed to have empty or
  all space column names.
  
  The parser has been modified to check VIEW column names
  with the check_column_name function and to report an error
  on empty and all space column names (same as for TABLE
  column names).

  mysql-test/r/select.result@1.121.13.1, 2007-10-25 10:32:36+05:00, gshchepa@gleb.loc +12 -14
    Updated test case for bug #27695.

  mysql-test/t/select.test@1.102.11.1, 2007-10-25 10:32:35+05:00, gshchepa@gleb.loc +15 -8
    Updated test case for bug #27695.

  sql/sql_yacc.yy@1.371.132.6, 2007-10-25 10:32:33+05:00, gshchepa@gleb.loc +6 -0
    Fixed bug #27695.
    The parser has been modified to check VIEW column aliases
    with the check_column_name function and to report an error
    on empty columns and all space columns (same as for TABLE
    column names).

ChangeSet@1.1810.3302.40, 2007-10-25 08:19:57+04:00, kaa@polly.(none) +1 -0
  Replaced 'return' with DBUG_RETURN() in the fix for bug #31566.

  mysys/my_write.c@1.15.1.2, 2007-10-25 08:19:52+04:00, kaa@polly.(none) +1 -1
    Replaced 'return' with DBUG_RETURN() in the fix for bug #31566.

ChangeSet@1.2476.569.3, 2007-10-24 19:01:08-06:00, malff@lambda.hsd1.co.comcast.net. +2 -0
  Bug#30854 (Tables name show as binary in slave err msg on vm-win2003-64-b)
  
  The root cause of this defect is that a call to my_error() is using a
  'LEX_STRING' parameter instead of a 'char*'
  
  This patch fixes the failing calls to my_error(), as well as similar calls
  found during investigation.
  
  This is a compiling bug (see the instrumentation in the bug report), no test cases provided.

  sql/sql_base.cc@1.421.14.1, 2007-10-24 19:01:04-06:00, malff@lambda.hsd1.co.comcast.net. +1 -1
    Fix broken calls to "..." (va_args) functions.

  sql/sql_table.cc@1.437.24.2, 2007-10-24 19:01:04-06:00, malff@lambda.hsd1.co.comcast.net. +5 -4
    Fix broken calls to "..." (va_args) functions.

ChangeSet@1.2476.583.1, 2007-10-24 22:36:57+05:00, ramil@mysql.com +3 -0
  Fix for bug #30679: 5.1 name encoding not performed for views during upgrade
  
  Problem: we skip views perfoming --fix-table-names.
  
  Fix: rename views as well.

  client/mysqlcheck.c@1.63.1.7, 2007-10-24 22:36:55+05:00, ramil@mysql.com +5 -2
    Fix for bug #30679: 5.1 name encoding not performed for views during upgrade
      - rename views performing --fix-table-names as well.

  mysql-test/r/mysqlcheck.result@1.14.1.1, 2007-10-24 22:36:55+05:00, ramil@mysql.com +18 -0
    Fix for bug #30679: 5.1 name encoding not performed for views during upgrade
      - test result.

  mysql-test/t/mysqlcheck.test@1.8.1.1, 2007-10-24 22:36:55+05:00, ramil@mysql.com +13 -0
    Fix for bug #30679: 5.1 name encoding not performed for views during upgrade
      - test case.

ChangeSet@1.1810.3400.2, 2007-10-24 21:16:20+04:00, kaa@polly.(none) +1 -0
  Fix for bug #31566: my_write(fd, 0x0, 0, flags) fails with EFAULT on
  some platforms
  
  Since the behavior of write(fd, buf, 0) is undefined, it may fail with
  EFAULT on some architectures when buf == NULL. The error was propagated
  up to a caller, since my_write() code did not handle it properly.
  
  Fixed by checking the 'number of bytes' argument in my_write() and
  returning before calling the write() system call when there is nothing
  to write.

  mysys/my_write.c@1.15.1.1, 2007-10-24 21:16:12+04:00, kaa@polly.(none) +4 -0
    Return from my_write() before calling the write() system call when the
    number of bytes to be written is 0, since the behavior of write() in
    this case is not portable.

ChangeSet@1.2476.478.16, 2007-10-24 16:02:37+02:00, mats@kindahl-laptop.dnsalias.net +5 -0
  BUG#31702 (Missing row on slave causes assertion failure under row-based
  replication):
  
  Incremental patch to enable idempotency support for update events again.
  The final handling of errors will be done in BUG#31609, and until then
  the handling of errors should be consistent between the different types
  of changes.

  mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result@1.23, 2007-10-24 16:02:31+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Result change.

  mysql-test/suite/rpl/r/rpl_temporary_errors.result@1.2, 2007-10-24 16:02:32+02:00, mats@kindahl-laptop.dnsalias.net +7 -7
    Result change.

  mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test@1.21, 2007-10-24 16:02:32+02:00, mats@kindahl-laptop.dnsalias.net +1 -3
    Changing test to assume idempotency handling of update event.

  mysql-test/suite/rpl/t/rpl_temporary_errors.test@1.2, 2007-10-24 16:02:32+02:00, mats@kindahl-laptop.dnsalias.net +1 -3
    Changing test to assume idempotency handling of update event.

  sql/log_event.cc@1.277.32.6, 2007-10-24 16:02:32+02:00, mats@kindahl-laptop.dnsalias.net +3 -6
    Incremental patch to enable idempotency support for the update events again.
    The real error handling will be implemented in BUG#31609.

ChangeSet@1.1616.3109.1, 2007-10-24 16:09:30+05:00, svoj@mysql.com +5 -0
  BUG#31159 - fulltext search on ucs2 column crashes server
  
  ucs2 doesn't provide required by fulltext ctype array. Crash
  happens because fulltext attempts to use unitialized ctype
  array.
  
  Fixed by converting ucs2 fields to compatible utf8 analogue.

  include/my_sys.h@1.116.5.2, 2007-10-24 16:09:29+05:00, svoj@mysql.com +2 -0
    Added a function to find compatible character set with ctype array
    available. Currently used by fulltext search to find compatible
    substitute for ucs2 collations.

  mysql-test/r/ctype_ucs.result@1.11.4.1, 2007-10-24 16:09:29+05:00, svoj@mysql.com +6 -0
    A test case for BUG#31159.

  mysql-test/t/ctype_ucs.test@1.15.3.1, 2007-10-24 16:09:29+05:00, svoj@mysql.com +8 -0
    A test case for BUG#31159.

  mysys/charset.c@1.135.1.10, 2007-10-24 16:09:29+05:00, svoj@mysql.com +40 -0
    Added a function to find compatible character set with ctype array
    available. Currently used by fulltext search to find compatible
    substitute for ucs2 collations.

  sql/item_func.cc@1.124.42.26, 2007-10-24 16:09:29+05:00, svoj@mysql.com +32 -1
    Convert ucs2 fields to utf8. Fulltext requires ctype array, but
    ucs2 doesn't provide it.

ChangeSet@1.2476.570.6, 2007-10-24 13:28:46+05:00, ramil@mysql.com +2 -0
  after-merge fix: new sys_var_character_set_client classs introduced to perform 
  separate checking.

  sql/set_var.cc@1.240.1.16, 2007-10-24 13:28:45+05:00, ramil@mysql.com +24 -1
    after-merge fix: new sys_var_character_set_client classs introduced to perform 
    separate checking.

  sql/set_var.h@1.84.12.2, 2007-10-24 13:28:45+05:00, ramil@mysql.com +14 -0
    after-merge fix: new sys_var_character_set_client classs introduced to perform 
    separate checking.

ChangeSet@1.1810.3429.1, 2007-10-24 11:15:08+03:00, gkodinov@magare.gmz +3 -0
  Bug #30715: Assertion failed: item_field->field->real_maybe_null(), 
    file .\opt_sum.cc, line
  The optimizer pre-calculates the MIN/MAX values for queries like
   SELECT MIN(kp_k) WHERE kp_1 = const AND ... AND kp_k-1 = const
  when there is a key over kp_1...kp_k
  In doing so it was not checking correctly nullability and 
  there was a superfluous assert(). 
  Fixed by making sure that the field can be null before checking and
  taking out the wrong assert().
  .
  Introduced a correct check for nullability 
  The MIN(field) can return NULL when all the row values in the group
  are NULL-able or if there were no rows.
  Fixed the assertion to reflect the case when there are no rows.

  mysql-test/r/func_group.result@1.49.1.14, 2007-10-24 11:15:07+03:00, gkodinov@magare.gmz +5 -0
    Bug #30715: test case

  mysql-test/t/func_group.test@1.48.1.10, 2007-10-24 11:15:07+03:00, gkodinov@magare.gmz +9 -0
    Bug #30715: test case

  sql/opt_sum.cc@1.44.1.19, 2007-10-24 11:15:07+03:00, gkodinov@magare.gmz +5 -5
    Bug #30715: correct nullability check for MIN/MAX pre-calculation over index.

ChangeSet@1.2476.580.5, 2007-10-24 12:49:58+05:00, gluh@mysql.com +2 -0
  result fix

  mysql-test/r/named_pipe.result@1.3, 2007-10-24 12:49:56+05:00, gluh@mysql.com +2 -2
    result fix

  mysql-test/r/shm.result@1.6, 2007-10-24 12:49:56+05:00, gluh@mysql.com +2 -2
    result fix

ChangeSet@1.1810.3428.1, 2007-10-24 12:08:33+05:00, bar@mysql.com +1 -0
  Bug#31081 server crash in regexp function
  Additional fix for valgrind warning

  sql/item_cmpfunc.cc@1.187.48.2, 2007-10-24 12:08:32+05:00, bar@mysql.com +1 -1
    Bug#31081 server crash in regexp function
    Additional fix for valgrind warning

ChangeSet@1.2476.581.1, 2007-10-23 22:04:09+02:00, mattiasj@mattiasj-laptop.(none) +4 -0
  Bug #30695: An apostrophe ' in the comment of the ADD PARTITION
    causes the Server to crash.
  
  Accessing partitioned table with an apostrophe in partition options
  like DATA DIRECTORY, INDEX DIRECTORY or COMMENT causes server crash.
  
  Partition options were saved in .frm file without escaping.
  When accessing such table it is not possible to properly restore
  partition information.
  Crashed because there was no check for partition info parser failure.
  
  Fixed by escaping quoted text in the partition info when writing it to
  the frm-file and added a check that it was able to parse the partition
  info before using it 
  
  NOTE: If the comment is written by an earlier version of the server,
  the corrupted frm-file is not fixed, but left corrupted, you have to
  manually drop the table and recreate it.

  mysql-test/r/partition.result@1.68.2.1, 2007-10-23 22:04:08+02:00, mattiasj@mattiasj-laptop.(none) +16 -0
    bug #30695: An apostrophe ' in the comment of the ADD PARTITION causes
    the Server to crash.
     testresult

  mysql-test/t/partition.test@1.62.3.1, 2007-10-23 22:04:08+02:00, mattiasj@mattiasj-laptop.(none) +26 -0
    bug #30695: An apostrophe ' in the comment of the ADD PARTITION causes
    the Server to crash.
      testcase

  sql/sql_partition.cc@1.115.1.1, 2007-10-23 22:04:08+02:00, mattiasj@mattiasj-laptop.(none) +17 -4
    Bug #30695: An apostrophe ' in the comment of the ADD PARTITION causes
      the Server to crash.
    
      Crashes when there is an non escaped apostrophe in the partition options
    
      fixed by escaping quoted text before writing to the frm-file

  sql/table.cc@1.296.14.1, 2007-10-23 22:04:08+02:00, mattiasj@mattiasj-laptop.(none) +2 -1
    Bug #30695 An apostrophe ' in the comment of the ADD PARTITION
      causes the Server to crash
    
    problem was using a null poiter without check -> crash.
    
    added a check that the previus call succeded

ChangeSet@1.1810.3412.7, 2007-10-23 21:32:30+04:00, sergefp@mysql.com +2 -0
  Post-merge fixes

  mysql-test/r/type_decimal.result@1.38.1.9, 2007-10-23 21:32:27+04:00, sergefp@mysql.com +1 -0
    Post-merge fixes

  mysql-test/t/type_decimal.test@1.35.1.2, 2007-10-23 21:32:27+04:00, sergefp@mysql.com +15 -0
    Post-merge fixes

ChangeSet@1.1810.3389.9, 2007-10-23 19:24:59+04:00, sergefp@mysql.com +3 -0
  BUG#31450: Query causes error 1048
  - Let Item::save_in_field() call set_field_to_null_with_conversions() 
    for decimal type, like this is done for the other item result types.

  mysql-test/r/type_decimal.result@1.38.2.2, 2007-10-23 19:24:56+04:00, sergefp@mysql.com +11 -0
    BUG#31450: Query causes error 1048: testcase

  mysql-test/t/type_decimal.test@1.33.1.2, 2007-10-23 19:24:56+04:00, sergefp@mysql.com +19 -0
    BUG#31450: Query causes error 1048: testcase

  sql/item.cc@1.113.101.1, 2007-10-23 19:24:56+04:00, sergefp@mysql.com +1 -1
    BUG#31450: Query causes error 1048
    - Let Item::save_in_field() call set_field_to_null_with_conversions() 
      for decimal type, like this is done for the other item result types.

ChangeSet@1.2476.580.4, 2007-10-23 20:12:50+05:00, gluh@mysql.com +1 -0
  result fix

  mysql-test/r/type_datetime.result@1.57, 2007-10-23 20:12:48+05:00, gluh@mysql.com +1 -1
    result fix

ChangeSet@1.2476.580.2, 2007-10-23 19:28:47+05:00, gluh@mysql.com +2 -0
  after merge fix

  mysql-test/r/query_cache.result@1.107, 2007-10-23 19:28:44+05:00, gluh@mysql.com +1 -78
    after merge fix

  mysql-test/t/query_cache.test@1.88, 2007-10-23 19:28:45+05:00, gluh@mysql.com +2 -2
    after merge fix

ChangeSet@1.1810.3426.1, 2007-10-23 18:03:51+04:00, anozdrin@station. +3 -0
  Patch for BUG#30736: Row Size Too Large Error Creating a Table and
  Inserting Data.
  
  The problem was that under some circumstances Field class was not
  properly initialized before calling create_length_to_internal_length()
  function, which led to assert failure.
  
  The fix is to do the proper initialization.
  
  The user-visible problem was that under some circumstances
  CREATE TABLE ... SELECT statement crashed the server or led
  to wrong error message (wrong results).

  mysql-test/r/select.result@1.121.1.38, 2007-10-23 18:03:49+04:00, anozdrin@station. +35 -0
    Update result file.

  mysql-test/t/select.test@1.102.1.32, 2007-10-23 18:03:49+04:00, anozdrin@station. +48 -0
    Add a test case for BUG#30736: Row Size Too Large Error
    Creating a Table and Inserting Data.

  sql/sql_table.cc@1.239.72.1, 2007-10-23 18:03:49+04:00, anozdrin@station. +1 -1
    Move sql_field->decimals initialization before
    sql_field->create_length_to_internal_length() call.

ChangeSet@1.1810.3425.1, 2007-10-23 09:05:39-03:00, davi@moksha.local +2 -0
  Bug#31669 Buffer overflow in mysql_change_user()
  
  The problem is that when copying the supplied username and
  database, no bounds checking is performed on the fixed-length
  buffer. A sufficiently large (> 512) user string can easily
  cause stack corruption. Since this API can be used from PHP
  and other programs, this is a serious problem.
  
  The solution is to increase the buffer size to the accepted
  size in similar functions and perform bounds checking when
  copying the username and database.

  libmysql/libmysql.c@1.233.1.14, 2007-10-23 09:05:37-03:00, davi@moksha.local +4 -3
    Increase the buffer size and perform bounds checking when copying
    the supplied arguments.

  tests/mysql_client_test.c@1.167.1.72, 2007-10-23 09:05:37-03:00, davi@moksha.local +94 -0
    Add test case for Bug#31669

ChangeSet@1.1810.3391.17, 2007-10-23 16:32:05+05:00, holyfoot@mysql.com +2 -0
  type conversions fixed to get rid of warnings

  sql/opt_range.cc@1.159.41.3, 2007-10-23 16:32:03+05:00, holyfoot@mysql.com +3 -3
    type conversion fix

  sql/ha_heap.cc@1.71.12.1, 2007-10-23 16:32:03+05:00, holyfoot@mysql.com +1 -1
    type conversion fix

ChangeSet@1.2476.514.21, 2007-10-23 14:26:57+03:00, gkodinov@magare.gmz +1 -0
  merge 5.0-opt -> 5.1-opt for bug 30825

  mysql-test/r/innodb_gis.result@1.17, 2007-10-23 14:26:54+03:00, gkodinov@magare.gmz +1 -0
    merge 5.0-opt -> 5.1-opt for bug 30825

ChangeSet@1.1810.3423.1, 2007-10-23 16:16:59+05:00, gshchepa@gleb.loc +5 -0
  Fixed bug #31663: if the FIELDS TERMINATED BY string
  in the SELECT INTO OUTFILE clause starts with a special
  character (one of n, t, r, b, 0, Z or N) and ENCLOSED BY
  is empty, every occurrence of this character within a
  field value is duplicated.
  
  Duplication has been avoided.
  New warning message has been added: "First character of
  the FIELDS TERMINATED string is ambiguous; please use
  non-optional and non-empty FIELDS ENCLOSED BY".

  mysql-test/r/outfile_loaddata.result@1.1, 2007-10-23 16:15:18+05:00, gshchepa@gleb.loc +85 -0
    BitKeeper file /home/uchum/work/bk/5.0-opt-31663/mysql-test/r/outfile_loaddata.result
    Added test case for bug #31663.

  mysql-test/r/outfile_loaddata.result@1.0, 2007-10-23 16:15:18+05:00, gshchepa@gleb.loc +0 -0

  mysql-test/t/outfile_loaddata.test@1.1, 2007-10-23 16:15:18+05:00, gshchepa@gleb.loc +89 -0
    BitKeeper file /home/uchum/work/bk/5.0-opt-31663/mysql-test/t/outfile_loaddata.test
    Added test case for bug #31663.

  mysql-test/t/outfile_loaddata.test@1.0, 2007-10-23 16:15:18+05:00, gshchepa@gleb.loc +0 -0

  sql/share/errmsg.txt@1.42.1.40, 2007-10-23 16:15:27+05:00, gshchepa@gleb.loc +2 -0
    Fixed bug #31663.
    The ER_AMBIGUOUS_FIELD_TERM warning has been added.

  sql/sql_class.cc@1.223.38.1, 2007-10-23 16:15:26+05:00, gshchepa@gleb.loc +35 -9
    Fixed bug #31663.
    The select_export::prepare method has been modified to calculate
    a value of the select_export::is_ambiguous_field_term field and
    to warn if this value is true.
    The select_export::send_data method has been modified to
    avoid escaping or duplication of the field_set_char if
    is_ambiguous_field_term is true.

  sql/sql_class.h@1.230.55.33, 2007-10-23 16:15:24+05:00, gshchepa@gleb.loc +7 -0
    Fixed bug #31663.
    The select_export::is_ambiguous_field_term field has been added.
    This field is true if select_export::field_sep_char contains
    the first char of the FIELDS TERMINATED BY (ENCLOSED BY is empty),
    and items can contain this character.
    The select_export::field_term_char field has been added (first
    char of the FIELDS TERMINATED BY string or INT_MAX).

ChangeSet@1.1810.3419.2, 2007-10-23 15:34:10+05:00, holyfoot@mysql.com +1 -0
  type conversion fixed to get rid of warnings

  sql/opt_range.cc@1.159.41.2, 2007-10-23 15:34:08+05:00, holyfoot@mysql.com +3 -3
    type conversion fixed

ChangeSet@1.1810.3421.1, 2007-10-23 11:52:55+02:00, msvensson@pilot.mysql.com +1 -0
  Bug#30560  Valgrind option to mysql-test-run with spaces in cause strange error

  mysql-test/mysql-test-run.pl@1.30.49.108, 2007-10-23 11:52:54+02:00, msvensson@pilot.mysql.com +31 -17
    Use an array to store the valgrind options
    Deprecate --valgrind-options=s and instead use --valgrind-option(but allow
    PushBuild's) --valgrind-options=s usage.
    Make the variables local

ChangeSet@1.2476.575.2, 2007-10-23 14:31:59+05:00, holyfoot@mysql.com +1 -0
  merging

  include/config-win.h@1.99.6.2, 2007-10-23 14:31:57+05:00, holyfoot@mysql.com +0 -1
    merging

ChangeSet@1.1810.3419.1, 2007-10-23 14:27:11+05:00, holyfoot@mysql.com +10 -0
  type conversions fixed to avoid warnings on Windows

  sql/opt_range.cc@1.159.41.1, 2007-10-23 14:27:09+05:00, holyfoot@mysql.com +6 -6
    type conversion fixed

  sql/sql_map.cc@1.16.1.3, 2007-10-23 14:27:09+05:00, holyfoot@mysql.com +3 -3
    type conversion fixed

  sql/sql_select.cc@1.312.174.12, 2007-10-23 14:27:09+05:00, holyfoot@mysql.com +1 -1
    type conversion fixed

  sql/sql_update.cc@1.154.43.1, 2007-10-23 14:27:09+05:00, holyfoot@mysql.com +1 -1
    type conversion fixed

  sql/ha_federated.cc@1.24.31.1, 2007-10-23 14:27:08+05:00, holyfoot@mysql.com +2 -2
    type conversion fixed

  sql/ha_heap.cc@1.71.11.1, 2007-10-23 14:27:09+05:00, holyfoot@mysql.com +1 -1
    type conversion fixed

  sql/ha_innodb.cc@1.202.53.1, 2007-10-23 14:27:09+05:00, holyfoot@mysql.com +1 -1
    type conversion fixed

  sql/ha_myisam.cc@1.147.29.1, 2007-10-23 14:27:09+05:00, holyfoot@mysql.com +1 -1
    type conversion fixed

  myisam/mi_write.c@1.50.16.1, 2007-10-23 14:27:08+05:00, holyfoot@mysql.com +1 -1
    type conversion fixed

  myisam/sort.c@1.45.25.1, 2007-10-23 14:27:08+05:00, holyfoot@mysql.com +2 -2
    type conversion fixed

ChangeSet@1.2476.479.21, 2007-10-23 11:24:34+02:00, jonas@perch.ndb.mysql.com +18 -0
  ndb - bug#26450
    partial backport from 6.2 + add fix of bug

  storage/ndb/include/kernel/GlobalSignalNumbers.h@1.34, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +5 -3
    add prep_copy_frag

  storage/ndb/include/kernel/signaldata/AccScan.hpp@1.10, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +1 -0
    add new argument specifying which page to scan to

  storage/ndb/include/kernel/signaldata/CopyFrag.hpp@1.6, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +40 -1
    add new argument specifying which page to scan to

  storage/ndb/include/ndb_version.h.in@1.16, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +47 -0
    add versioning checks for prep_copy_frag

  storage/ndb/src/common/debugger/signaldata/SignalNames.cpp@1.20, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +4 -0
    add prep_copy_frag

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.49, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +3 -1
    new error codes

  storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.39, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +6 -1
    add new to-step

  storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp@1.23, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +5 -0
    add new to-step

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.128, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +105 -6
    add new to-step

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.73, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +1 -0
    add new to-step

  storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp@1.30, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +3 -0
    add new to-step

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.168, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +91 -2
    add new to-step

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.74, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +3 -0
    add new argument specifying which page to scan to

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.43, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +19 -0
    add utility to get max page used by fragment

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@1.29, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +60 -8
    add NR scan to > frag.noOfPages

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.19, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +54 -0
    add testcase

  storage/ndb/test/run-test/daily-basic-tests.txt@1.109, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +4 -0
    add testcase

  storage/ndb/test/src/NdbRestarts.cpp@1.11, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +1 -0
    add testcase

ChangeSet@1.2476.514.19, 2007-10-23 13:20:51+05:00, gluh@mysql.com +3 -0
  Bug#31633 Information schema = NULL queries crash the server
  added correct handling of NULL values for lookup fields

  mysql-test/r/information_schema.result@1.151.1.17, 2007-10-23 13:20:49+05:00, gluh@mysql.com +40 -0
    test result

  mysql-test/t/information_schema.test@1.98.1.13, 2007-10-23 13:20:49+05:00, gluh@mysql.com +24 -0
    test case

  sql/sql_show.cc@1.438.1.3, 2007-10-23 13:20:49+05:00, gluh@mysql.com +43 -22
    added correct handling of NULL values for lookup fields

ChangeSet@1.1810.3418.2, 2007-10-23 07:09:16+02:00, tnurnberg@mysql.com +2 -0
  Bug #20901: CREATE privilege is enough to insert into a table
  
  CREATE TABLE IF NOT EXISTS ... SELECT let you insert into an existing
  table as long as you had the CREATE privilege.  CREATE ... SELECT
  variants now always require INSERT privilege on target table.

  mysql-test/r/create.result@1.107.10.2, 2007-10-23 07:09:15+02:00, tnurnberg@mysql.com +1 -1
    after-merge fixes, errno changed 4.1->5.0

  mysql-test/t/create.test@1.71.1.24, 2007-10-23 07:09:15+02:00, tnurnberg@mysql.com +1 -1
    after-merge fixes, errno changed 4.1->5.0

ChangeSet@1.1616.3100.6, 2007-10-23 06:54:31+02:00, tnurnberg@mysql.com +5 -0
  Bug #20901: CREATE privilege is enough to insert into a table
  
  CREATE TABLE IF NOT EXISTS ... SELECT let you insert into an existing
  table as long as you had the CREATE privilege.  CREATE ... SELECT
  variants now always require INSERT privilege on target table.

  mysql-test/r/create.result@1.75.1.16, 2007-10-23 06:54:30+02:00, tnurnberg@mysql.com +38 -0
    Show that CREATE...SELECT requires INSERT privilege on target table.

  mysql-test/r/grant.result@1.21.1.23, 2007-10-23 06:54:30+02:00, tnurnberg@mysql.com +3 -3
    Sort output for a defined state.

  mysql-test/t/create.test@1.48.1.16, 2007-10-23 06:54:30+02:00, tnurnberg@mysql.com +76 -0
    Show that CREATE...SELECT requires INSERT privilege on target table.

  mysql-test/t/grant.test@1.17.1.20, 2007-10-23 06:54:30+02:00, tnurnberg@mysql.com +1 -1
    Sort output for a defined state.

  sql/sql_parse.cc@1.271.134.4, 2007-10-23 06:54:30+02:00, tnurnberg@mysql.com +8 -1
    Require INSERT privilege on target table for CREATE ... SELECT.

ChangeSet@1.2476.559.6, 2007-10-22 15:16:43-04:00, dkatz@damien-katzs-computer.local +4 -0
  Bug #31332 --event-scheduler option misbehaving
    
  Changed the behaviour of the --event-scheduler option when used without an arguments. It
  now turns the option on.

  mysql-test/r/events_bugs.result@1.44, 2007-10-22 15:16:18-04:00, dkatz@damien-katzs-computer.local +4 -0
    Test that --event-scheduler with no options in events_bugs-master.opt turns the option
    on.

  mysql-test/t/events_bugs-master.opt@1.1, 2007-10-22 15:16:20-04:00, dkatz@damien-katzs-computer.local +1 -0
    Test that --event-scheduler with no options in events_bugs-master.opt turns the option
    on.

  mysql-test/t/events_bugs-master.opt@1.0, 2007-10-22 15:16:20-04:00, dkatz@damien-katzs-computer.local +0 -0

  mysql-test/t/events_bugs.test@1.37, 2007-10-22 15:16:19-04:00, dkatz@damien-katzs-computer.local +15 -0
    Test that --event-scheduler with no options in events_bugs-master.opt turns the option
    on.

  sql/events.cc@1.86, 2007-10-22 15:16:19-04:00, dkatz@damien-katzs-computer.local +1 -1
    Changed the behaviour of the --event-scheduler option when used without an arguments.
    It now turns the option on.

ChangeSet@1.2476.569.1, 2007-10-22 23:02:05+04:00, anozdrin@station. +1 -0
  WL#4104: Deprecate the Instance Manager.
  
  A deprecation warning added.

  server-tools/instance-manager/mysqlmanager.cc@1.34, 2007-10-22 23:02:03+04:00, anozdrin@station. +3 -0
    Add a deprecation warning.

ChangeSet@1.2476.568.1, 2007-10-22 21:45:21+03:00, aelkin@koti.dsl.inet.fi +3 -0
  Bug #30594  	rpl.rpl_skip_error is nondeterministic 
  
  Non-determinism in the tests was due to results of SBR are different from those gained
  with row binlog format.
  
  Because tests effectively verify skipping only ER_DUP_ENTRY it is explicitly required
  to run the test on in mixed and stmt binlog format.
  ER_DUP_ENTRY is automatically ignored when happened in RBR because of implicit rule
  favoring reentrant reading from binlog rule
  which means that a Write_rows_log_event overwrites a slave's row
  if the one has the same primary key.
  
  If future we might have skipping error due to applying of row-based events.
  The comments added saying a new file would be needed for that: rpl_row_skip_error or smth.

  mysql-test/suite/rpl/r/rpl_skip_error.result@1.18, 2007-10-22 21:45:17+03:00, aelkin@koti.dsl.inet.fi +1 -2
    new results

  mysql-test/suite/rpl/t/rpl_skip_error-slave.opt@1.9, 2007-10-22 21:45:17+03:00, aelkin@koti.dsl.inet.fi +1 -1
    wrong error code that can not happen in the test removed.

  mysql-test/suite/rpl/t/rpl_skip_error.test@1.16, 2007-10-22 21:45:17+03:00, aelkin@koti.dsl.inet.fi +8 -0
    enforcing the test is to skip only errors due to SBR.
    The current test does not check anything for RBR as ignorable ER_DUP_ENTRY
    does make sense only for SBR.

ChangeSet@1.1810.3302.32, 2007-10-22 22:35:08+04:00, kaa@polly.(none) +1 -0
  Fixed the Windows build failures introduced by the patch for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

  libmysql/CMakeLists.txt@1.1.7.2, 2007-10-22 22:35:05+04:00, kaa@polly.(none) +1 -1
    Fixed the Windows build failures introduced by the patch for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

ChangeSet@1.2476.1.112, 2007-10-22 20:10:51+02:00, mleich@four.local.lan +8 -0
  This changeset contains the following stuff:
  - Fix for
      Bug#28827 Partition test needs archive engine
      Bug#26669 Two tests on partition fail while blackhole engine is missing
    Solution: Move ARCHIVE and BLACKHOLE sub test cases to their own main test.
  - The two bugs above + the fact that CSV could be also sometimes not
    available --> Move also CSV sub tests out.
  - Minor cleanups
    - Replace error numbers with error names
    - fix typos, wrong comments
    - remove redundant sub test cases
    - add missing drop database
    - SET GLOBAL general_log = default is wrong, = 1 is correct

  mysql-test/r/partition.result@1.68.1.2, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +0 -43
    Updated results

  mysql-test/r/partition_archive.result@1.1, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +13 -0
    Expected results

  mysql-test/r/partition_archive.result@1.0, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +0 -0

  mysql-test/r/partition_blackhole.result@1.1, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +7 -0
    Expected results

  mysql-test/r/partition_blackhole.result@1.0, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +0 -0

  mysql-test/r/partition_csv.result@1.1, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +15 -0
    Expected results

  mysql-test/r/partition_csv.result@1.0, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +0 -0

  mysql-test/t/partition.test@1.62.1.2, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +22 -99
    Remove ARCHIVE, BLACKHOLE and CSV related sub test cases.

  mysql-test/t/partition_archive.test@1.1, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +32 -0
    Tests for the partition storage engine in connection with the
    storage engine ARCHIVE.

  mysql-test/t/partition_archive.test@1.0, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +0 -0

  mysql-test/t/partition_blackhole.test@1.1, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +24 -0
    Tests for the partition storage engine in connection with the
    storage engine BLACKHOLE.

  mysql-test/t/partition_blackhole.test@1.0, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +0 -0

  mysql-test/t/partition_csv.test@1.1, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +38 -0
    Tests for the partition storage engine in connection with the
    storage engine CSV.

  mysql-test/t/partition_csv.test@1.0, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +0 -0

ChangeSet@1.2476.559.5, 2007-10-22 13:25:00-04:00, dkatz@damien-katzs-computer.local +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
  into  damien-katzs-computer.local:/Users/dkatz/mysql-5.1-runtime

  BitKeeper/deleted/.del-.del-changelog@1.3, 2007-10-22 13:24:52-04:00, dkatz@damien-katzs-computer.local +0 -0
    Delete: BitKeeper/deleted/.del-changelog

ChangeSet@1.1810.3391.14, 2007-10-22 19:32:18+03:00, gkodinov@magare.gmz +3 -0
  Bug #28687: Search fails on '0000-00-00' date after sql_mode change
  
  When doing indexed search the server constructs a key image for 
  faster comparison to the stored keys. While doing that it must not
  perform (and stop if they fail) the additional date checks that can 
  be turned on by the SQL mode because there already may be values in 
  the table that don't comply with the error checks.
  Fixed by ignoring these SQL mode bits while making the key image.

  mysql-test/r/type_date.result@1.13.4.4, 2007-10-22 19:32:16+03:00, gkodinov@magare.gmz +39 -0
    Bug #28687: test case

  mysql-test/t/type_date.test@1.14.3.4, 2007-10-22 19:32:16+03:00, gkodinov@magare.gmz +20 -0
    Bug #28687: test case

  sql/item.cc@1.113.1.174, 2007-10-22 19:32:16+03:00, gkodinov@magare.gmz +3 -0
    Bug #28687: no invalid date warnings

ChangeSet@1.1810.3416.2, 2007-10-22 16:10:08+04:00, kaa@polly.(none) +3 -0
  Fix for bug #31742: delete from ... order by function call that causes
  an error, asserts server
  
  In case of a fatal error during filesort in find_all_keys() the error
  was returned without the necessary handler uninitialization.
  Fixed by changing the code so that handler uninitialization is performed
  before returning the error.

  mysql-test/r/delete.result@1.32, 2007-10-22 16:10:03+04:00, kaa@polly.(none) +8 -0
    Added a test case for bug #31742.

  mysql-test/t/delete.test@1.30, 2007-10-22 16:10:03+04:00, kaa@polly.(none) +15 -0
    Added a test case for bug #31742.

  sql/filesort.cc@1.105.1.19, 2007-10-22 16:10:03+04:00, kaa@polly.(none) +4 -1
    In case of a fatal error in find_all_keys() do not return before doing
    the necessary handler uninitialization steps.

ChangeSet@1.2476.567.2, 2007-10-22 10:32:35+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
  Post-merge fixes.

  mysql-test/suite/rpl/r/rpl_extraCol_innodb.result@1.13, 2007-10-22 10:32:27+02:00, mats@kindahl-laptop.dnsalias.net +2 -1
    Result change

  mysql-test/suite/rpl/r/rpl_extraCol_myisam.result@1.13, 2007-10-22 10:32:28+02:00, mats@kindahl-laptop.dnsalias.net +2 -1
    Result change

ChangeSet@1.1810.3416.1, 2007-10-21 21:45:31+04:00, kaa@polly.(none) +5 -0
  Bug #28550 "Potential bugs related to the return type of the CHAR function".
    
  Since, as of MySQL 5.0.15, CHAR() arguments larger than 255 are converted into multiple result bytes, a single CHAR() argument can now take up to 4 bytes. This patch fixes Item_func_char::fix_length_and_dec() to take this into account.
    
  This patch also fixes a regression introduced by the patch for bug21513. As now we do not always have the 'name' member of Item set for Item_hex_string and Item_bin_string, an own print() method has been added to Item_hex_string so that it could correctly be printed by Item_func::print_args().

  mysql-test/r/func_str.result@1.110.1.27, 2007-10-21 21:00:18+04:00, kaa@polly.(none) +11 -1
    Import patch bug288550.patch

  mysql-test/t/func_str.test@1.92.1.16, 2007-10-21 21:00:18+04:00, kaa@polly.(none) +12 -0
    Import patch bug288550.patch

  sql/item.cc@1.113.1.173, 2007-10-21 21:00:18+04:00, kaa@polly.(none) +13 -0
    Import patch bug288550.patch

  sql/item.h@1.183.1.61, 2007-10-21 21:00:18+04:00, kaa@polly.(none) +1 -0
    Import patch bug288550.patch

  sql/item_strfunc.h@1.101.1.24, 2007-10-21 21:00:18+04:00, kaa@polly.(none) +1 -1
    Import patch bug288550.patch

ChangeSet@1.1810.3415.1, 2007-10-21 18:37:37+03:00, aelkin@dsl-hkibras1-ff5fc300-23.dhcp.inet.fi +3 -0
  Bug #26199  	Replication Failure on Slave when using stored procs with bit-type parameters.
  
  The value of the actual argument of BIT-type-arg stored procedure was binlogged as non-escaped
  sequence of bytes corresponding to internal representation of the bit value.
  
  The patch enforces binlogging of the bit-argument as a valid literal: prefixing the quoted bytes
  sequence with _binary.
  Note, that behaviour of Item_field::var_str for field_type() of MYSQL_TYPE_BIT is exceptional
  in that the returned string contains the binary representation even though result_type() of
  the item is INT_RESULT.

  mysql-test/r/rpl_sp_effects.result@1.3.1.1, 2007-10-21 18:37:34+03:00, aelkin@dsl-hkibras1-ff5fc300-23.dhcp.inet.fi +41 -0
    testing stored function and procedure called with BIT-arg.

  mysql-test/t/rpl_sp_effects.test@1.3.1.1, 2007-10-21 18:37:34+03:00, aelkin@dsl-hkibras1-ff5fc300-23.dhcp.inet.fi +51 -0
    results changed

  sql/sp_head.cc@1.200.30.1, 2007-10-21 18:37:35+03:00, aelkin@dsl-hkibras1-ff5fc300-23.dhcp.inet.fi +3 -2
    Treating BIT field type specially to for its value to be prefixed and quoted.

ChangeSet@1.2476.478.15, 2007-10-20 20:16:12+02:00, mats@kindahl-laptop.dnsalias.net +4 -0
  BUG#24860 (Incorrect SLAVE_TRANSACTION_RETRIES code can result in slave stuck):
  
  If a temporary error occured inside a group on an event that was not the first
  event of the group, the slave could get stuck because the retry counter is reset
  whenever an event was executed successfully.
  
  This patch only reset the retry counter when an entire group has been successfully
  executed, or failed with a non-transient error.

  mysql-test/suite/rpl/r/rpl_temporary_errors.result@1.1, 2007-10-20 20:16:08+02:00, mats@kindahl-laptop.dnsalias.net +81 -0
    New BitKeeper file ``mysql-test/suite/rpl/r/rpl_temporary_errors.result''

  mysql-test/suite/rpl/r/rpl_temporary_errors.result@1.0, 2007-10-20 20:16:08+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt@1.1, 2007-10-20 20:16:08+02:00, mats@kindahl-laptop.dnsalias.net +3 -0
    New BitKeeper file ``mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt''

  mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt@1.0, 2007-10-20 20:16:08+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/t/rpl_temporary_errors.test@1.1, 2007-10-20 20:16:08+02:00, mats@kindahl-laptop.dnsalias.net +29 -0
    New BitKeeper file ``mysql-test/suite/rpl/t/rpl_temporary_errors.test''

  mysql-test/suite/rpl/t/rpl_temporary_errors.test@1.0, 2007-10-20 20:16:08+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  sql/slave.cc@1.320, 2007-10-20 20:16:08+02:00, mats@kindahl-laptop.dnsalias.net +21 -5
    Adding debug printouts to every place where Relay_log_info::trans_retries
    is changed and to has_temporary_error() to print the error when returning.
    
    Adding debug variable all_errors_are_temporary_errors to make all errors
    for slave thread temporary errors.
    
    Adding code so that the Relay_log_info::trans_retries is only reset when
    an entire group was sucessfully executed, or a non-temporary error occured.

ChangeSet@1.2476.559.4, 2007-10-20 21:48:15+04:00, anozdrin@station. +3 -0
  Fix for BUG#31148: bool close_thread_table(THD*, TABLE**):
  Assertion `table->key_read == 0' failed.
  
  The problem was that key_read on a table in a sub-select was not
  properly reset. That happens because the code responsible for that
  is copy&pasted all around the server. In some place, it was obviously
  forgotten to be pasted.
  
  The fix is to reset key_read properly.

  mysql-test/r/key.result@1.47, 2007-10-20 21:48:13+04:00, anozdrin@station. +15 -0
    Update result file.

  mysql-test/t/key.test@1.38, 2007-10-20 21:48:13+04:00, anozdrin@station. +23 -0
    A test case for BUG#31148: bool close_thread_table(THD*, TABLE**):
    Assertion `table->key_read == 0' failed.

  sql/sql_select.cc@1.541.31.2, 2007-10-20 21:48:13+04:00, anozdrin@station. +8 -1
    Reset key_read before closing index.

ChangeSet@1.2476.478.14, 2007-10-20 18:19:55+02:00, mats@kindahl-laptop.dnsalias.net +5 -0
  Bug#31702 (Missing row on slave causes assertion failure under row-based replication):
  
  When replicating an update pair (before image, after image) under row-based
  replication, and the before image is not found on the slave, the after image
  was not discared, and was hence read as a before image for the next row.
  Eventually, this lead to an after image being read outside the block of rows
  in the event, causing an assertion to fire.
  
  This patch fixes this by reading the after image in the event that the row
  was not found on the slave, adds some extra debug assertion to catch future
  errors earlier, and also adds a few non-debug checks to prevent reading
  outside the block of the event.

  include/my_base.h@1.86.1.22, 2007-10-20 18:19:50+02:00, mats@kindahl-laptop.dnsalias.net +5 -3
    Adding error code HA_ERR_CORRUPT_EVENT.

  mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result@1.22, 2007-10-20 18:19:50+02:00, mats@kindahl-laptop.dnsalias.net +31 -0
    Result change.

  mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test@1.20, 2007-10-20 18:19:51+02:00, mats@kindahl-laptop.dnsalias.net +37 -0
    Adding test to try to use row-based replication to replicate an
    update of a row that doesn't exist on the slave. We should get
    an apropriate error and the slave should stop.

  sql/log_event.cc@1.277.32.5, 2007-10-20 18:19:51+02:00, mats@kindahl-laptop.dnsalias.net +22 -5
    Adding debug printouts. Adding code to Update_rows_log_event::do_exec_row()
    so that the after image is read (and ignored) in the event of an error in
    finding the row. This is necessary so that the second pair of images is
    read correctly for the next update pair.
    
    Changing logic for ignoring errors to not include update events, since
    a "key not found" error or a "record changed" error is not idempotent
    for updates, just for deletes and inserts.

  sql/log_event.h@1.163, 2007-10-20 18:19:51+02:00, mats@kindahl-laptop.dnsalias.net +22 -2
    Adding debug assertions to check that row reading is within the events block of rows.

ChangeSet@1.2476.505.10, 2007-10-20 00:24:22+03:00, monty@mysql.com +22 -0
  Merge some changes from sql directory in 5.1 tree
  Changed format for REDO_INSERT_ROWS_BLOBS
  Fixed several bugs in handling of big blobs
  Added redo_free_head_or_tail() & redo_insert_row_blobs()
  Added uuid to control file
  maria_checks now verifies that not used part of bitmap is 0
  REDO_PURGE_BLOCKS -> REDO_FREE_BLOCKS
  Added REDO_FREE_HEAD_OR_TAIL
  Fixes problem when trying to read block outside of file during REDO

  include/my_global.h@1.152, 2007-10-20 00:23:42+03:00, monty@mysql.com +0 -7
    STACK_DIRECTION is already set by configure

  mysql-test/r/maria.result@1.21, 2007-10-20 00:23:42+03:00, monty@mysql.com +26 -3
    Updated results

  mysql-test/t/maria.test@1.21, 2007-10-20 00:23:42+03:00, monty@mysql.com +16 -3
    Test shrinking of VARCHAR

  mysys/my_realloc.c@1.14, 2007-10-20 00:23:42+03:00, monty@mysql.com +1 -0
    Fixed indentation

  mysys/safemalloc.c@1.36, 2007-10-20 00:23:42+03:00, monty@mysql.com +0 -1
    Fixed indentation

  sql/filesort.cc@1.132, 2007-10-20 00:23:42+03:00, monty@mysql.com +3 -3
    Removed some casts

  sql/mysqld.cc@1.605, 2007-10-20 00:23:42+03:00, monty@mysql.com +1 -0
    Added missing setting of myisam_stats_method_str

  sql/uniques.cc@1.33, 2007-10-20 00:23:42+03:00, monty@mysql.com +1 -1
    Removed some casts

  storage/maria/ma_bitmap.c@1.23, 2007-10-20 00:24:06+03:00, monty@mysql.com +137 -19
    Added printing of bitmap (for debugging)
    Renamed _ma_print_bitmap() -> _ma_print_bitmap_changes()
    Added _ma_set_full_page_bits()
    Fixed bug in ma_bitmap_find_new_place() (affecting updates) when using big files

  storage/maria/ma_blockrec.c@1.52, 2007-10-20 00:24:19+03:00, monty@mysql.com +427 -103
    Changed format for REDO_INSERT_ROWS_BLOBS
    Fixed several bugs in handling of big blobs
    Added code to fix some cases where redo when using blobs didn't produce idenital .MAD files as normal usage
    REDO_FREE_ROW_BLOCKS doesn't anymore change pages; We only mark things free in bitmap
    Remove TAIL and filler extents from REDO_FREE_BLOCKS log entry. (Fixed some asserts)
    REDO_PURGE_BLOCKS -> REDO_FREE_BLOCKS
    Delete tails in update. (Fixed bug when doing update that shrinks blob/varchar length)
    Fixed bug when doing insert in block outside of file size.
    Added redo_free_head_or_tail() & redo_insert_row_blobs()
    Added pagecache_unlock_by_link() when read fails.
    Much more comments, DBUG and ASSERT entries
    

  storage/maria/ma_blockrec.h@1.17, 2007-10-20 00:24:19+03:00, monty@mysql.com +16 -2
    Prototypes of new functions
    Define of SUB_RANGE_SIZE & BLOCK_FILLER_SIZE

  storage/maria/ma_check.c@1.47, 2007-10-20 00:24:19+03:00, monty@mysql.com +31 -4
    Verify that not used part of bitmap is 0

  storage/maria/ma_control_file.c@1.19, 2007-10-20 00:24:19+03:00, monty@mysql.com +12 -1
    Added uuid to control file

  storage/maria/ma_loghandler.c@1.61.1.1, 2007-10-20 00:24:19+03:00, monty@mysql.com +13 -4
    REDO_PURGE_BLOCKS -> REDO_FREE_BLOCKS
    Added REDO_FREE_HEAD_OR_TAIL

  storage/maria/ma_loghandler.h@1.29, 2007-10-20 00:24:19+03:00, monty@mysql.com +2 -1
    REDO_PURGE_BLOCKS -> REDO_FREE_BLOCKS
    Added REDO_FREE_HEAD_OR_TAIL

  storage/maria/ma_pagecache.c@1.49.1.1, 2007-10-20 00:24:19+03:00, monty@mysql.com +8 -8
    If we write full block, remove error flag for block.
    (Fixes problem when trying to read block outside of file)

  storage/maria/ma_recovery.c@1.39.1.1, 2007-10-20 00:24:19+03:00, monty@mysql.com +53 -6
    REDO_PURGE_BLOCKS -> REDO_FREE_BLOCKS
    Added REDO_FREE_HEAD_OR_TAIL

  storage/maria/ma_test1.c@1.25.1.1, 2007-10-20 00:24:19+03:00, monty@mysql.com +3 -1
    Allow option after 'b' to be compatible with ma_test2
    (This is just to simplify test scripts like ma_test_recovery)
    

  storage/maria/ma_test2.c@1.25, 2007-10-20 00:24:19+03:00, monty@mysql.com +1 -1
    Default size of blob is now 1000 instead of 1

  storage/maria/ma_test_all.sh@1.12, 2007-10-20 00:24:19+03:00, monty@mysql.com +2 -0
    Added test for bigger blobs

  storage/maria/ma_test_recovery@1.14, 2007-10-20 00:24:19+03:00, monty@mysql.com +1 -1
    Added test for bigger blobs

  storage/maria/ma_test_recovery.expected@1.10, 2007-10-20 00:24:19+03:00, monty@mysql.com +14 -14
    Updated results

ChangeSet@1.2476.564.1, 2007-10-20 01:20:38+04:00, kostja@bodhi.(none) +12 -0
  Rename: query_error -> is_slave_error.
  Add comments.

  sql/ha_ndbcluster_binlog.cc@1.132, 2007-10-20 01:20:33+04:00, kostja@bodhi.(none) +2 -2
    query_error -> slave_error

  sql/handler.cc@1.315.17.1, 2007-10-20 01:20:33+04:00, kostja@bodhi.(none) +3 -3
    query_error -> slave_error

  sql/log.cc@1.297.3.3, 2007-10-20 01:20:34+04:00, kostja@bodhi.(none) +2 -2
    query_error -> slave_error

  sql/log_event.cc@1.277.1.31, 2007-10-20 01:20:34+04:00, kostja@bodhi.(none) +30 -24
    query_error -> slave_error

  sql/log_event_old.cc@1.9.1.1, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +6 -6
    query_error -> slave_error

  sql/mysqld.cc@1.583.1.97, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +1 -1
    query_error -> slave_error

  sql/protocol.cc@1.129.2.2, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +2 -2
    query_error -> slave_error

  sql/slave.cc@1.315.3.1, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +3 -3
    query_error -> slave_error

  sql/sp_head.cc@1.292.1.5, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +3 -3
    query_error -> slave_error

  sql/sql_class.cc@1.347.6.1, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +1 -1
    query_error -> slave_error

  sql/sql_class.h@1.399.3.2, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +9 -2
    Rename: query_error -> is_slave_error, to avoid confusion.
    Add commenta.

  sql/sql_connect.cc@1.12, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +1 -1
    Rename: query_error -> is_slave_error, to avoid confusion.
    Originally it was the same code to handle init-connect and init-slave 
    mysqld options. Then init-connect implementation forked off,
    but the one who copy-pasted the code didn't change it to not
    use a replication-specific variable.

ChangeSet@1.2476.513.19, 2007-10-19 22:40:53+02:00, guilhem@gbichot4.local +2 -0
  WL#3071 - Maria checkpoint
  don't take a checkpoint at end of REDO phase because blocks' rec_lsn
  are not set. Fixes some assertion failures during tests of killing
  the UNDO phase (recovery then started from the end-of-REDO-phase
  checkpoint, wrongly ignoring REDOs before that record).

  storage/maria/ma_blockrec.c@1.50.1.2, 2007-10-19 22:40:49+02:00, guilhem@gbichot4.local +1 -0
    note for a bug (mail sent to colleagues, put on todo)

  storage/maria/ma_recovery.c@1.47, 2007-10-19 22:40:49+02:00, guilhem@gbichot4.local +10 -0
    this checkpoint at end of REDO phase is incorrect, disabling it.
    The one at end of UNDO phase remains.

ChangeSet@1.2476.559.2, 2007-10-19 19:57:08+04:00, anozdrin@station. +7 -0
  Patch for BUG#31111: --read-only crashes MySQL (events fail to load).
  
  There actually were several problems here:
    - WRITE-lock is required to load events from the mysql.event table,
      but in the read-only mode an ordinary user can not acquire it;
    - Security_context::master_access attribute was not properly
      initialized in Security_context::init(), which led to differences
      in behavior with and without debug configure options.
    - if the server failed to load events from mysql.event, it forgot to
      close the mysql.event table, that led to the coredump, described
      in the bug report.
  
  The patch is to fix all these problems:
    - Use the super-user to acquire WRITE-lock on the mysql.even table;
    - The WRITE-lock is acquired by the event scheduler in two cases:
      - on initial loading of events from the database;
      - when an event has been executed, so its attributes should
        be updated.
      Other cases when WRITE-lock is needed for the mysql.event table
      happen under the user account. So, nothing should be changed there
      for the read-only mode. The user is able to create/update/drop
      an event only if he is a super-user.
    - Initialize Security_context::master_access;
    - Close the mysql.event table in case something went wrong.

  mysql-test/r/events_bugs.result@1.43, 2007-10-19 19:57:06+04:00, anozdrin@station. +102 -1
    Update result file.

  mysql-test/t/events_bugs.test@1.36, 2007-10-19 19:57:06+04:00, anozdrin@station. +212 -12
    A test case for BUG#31111: --read-only crashes MySQL (events fail
    to load).

  sql/event_data_objects.cc@1.111, 2007-10-19 19:57:06+04:00, anozdrin@station. +14 -2
    When the worker thread is going to drop event after the execution
    we should do it under the super-user privileges in order to be able
    to lock the mysql.event table for writing in the read-only mode.
    
    This is a system operation, where user SQL can not be executed.
    So, there is no risk in compromising security by dropping an event
    under the super-user privileges.

  sql/event_db_repository.cc@1.37, 2007-10-19 19:57:06+04:00, anozdrin@station. +9 -0
    1. Close tables if something went wrong in simple_open_n_lock_tables();
    2. As soon as the system event scheduler thread is running under
       the super-user privileges, we should always be able to acquire
       WRITE-lock on the mysql.event table. However, let's have an assert
       to check this.

  sql/event_scheduler.cc@1.48, 2007-10-19 19:57:06+04:00, anozdrin@station. +7 -0
    Run the system event scheduler thread under the super-user privileges.
    In particular, this is needed to be able to lock the mysql.event table
    for writing when the server is running in the read-only mode.
    
    The event scheduler executes only system operations and does not
    execute user SQL (this is what the worker threads for). So, there
    is no risk in compromising security by running the event scheduler
    under the super-user privileges.

  sql/events.cc@1.85, 2007-10-19 19:57:06+04:00, anozdrin@station. +15 -1
    Open the mysql.event table as the super user to be able to acquire
    WRITE-lock in the read-only mode.

  sql/sql_class.cc@1.347.2.5, 2007-10-19 19:57:06+04:00, anozdrin@station. +1 -0
    Initialize Security_context::master_acces.

ChangeSet@1.1810.3355.3, 2007-10-19 17:07:08+02:00, df@pippilotta.erinye.com +13 -0
  export patch for bug#31221
  TAG: mysql-5.0.50

  mysql-test/r/ps_6bdb.result@1.27.20.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -1
    export patch for bug#31221

  mysql-test/r/derived.result@1.58.2.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -1
    export patch for bug#31221

  mysql-test/r/ps_2myisam.result@1.39.8.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -1
    export patch for bug#31221

  mysql-test/r/ps_3innodb.result@1.42.8.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -1
    export patch for bug#31221

  mysql-test/r/ps_4heap.result@1.38.8.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -1
    export patch for bug#31221

  mysql-test/r/ps_5merge.result@1.39.8.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +4 -2
    export patch for bug#31221

  mysql-test/r/type_date.result@1.13.5.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +30 -0
    export patch for bug#31221

  mysql-test/r/type_datetime.result@1.30.10.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -0
    export patch for bug#31221

  mysql-test/r/ps_7ndb.result@1.26.10.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -1
    export patch for bug#31221

  mysql-test/t/derived.test@1.53.1.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -1
    export patch for bug#31221

  mysql-test/t/type_date.test@1.14.4.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +21 -0
    export patch for bug#31221

  sql/field.cc@1.256.62.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +21 -4
    export patch for bug#31221

  sql/item_timefunc.cc@1.100.34.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +1 -2
    export patch for bug#31221

ChangeSet@1.2476.561.1, 2007-10-19 15:43:19+03:00, gkodinov@magare.gmz +4 -0
  Bug #31157: crash when select+order by the avg of some field within the group by
  
  The uncacheable flag should be set at fix_fields() stage.
  Fixed by moving the flag setting to match the one in 5.1

  mysql-test/r/query_cache.result@1.102.2.1, 2007-10-19 15:43:17+03:00, gkodinov@magare.gmz +14 -0
    Bug #31157: test case

  mysql-test/t/query_cache.test@1.83.2.1, 2007-10-19 15:43:17+03:00, gkodinov@magare.gmz +17 -0
    Bug #31157: test case

  sql/item_func.cc@1.409.6.5, 2007-10-19 15:43:17+03:00, gkodinov@magare.gmz +8 -1
    Bug #31157: The uncacheable flag should be set at
    fix_fields() stage.

  sql/item_func.h@1.157.1.14, 2007-10-19 15:43:17+03:00, gkodinov@magare.gmz +1 -0
    Bug #31157: The uncacheable flag should be set at
    fix_fields() stage.

ChangeSet@1.2476.560.1, 2007-10-19 14:18:41+02:00, mats@kindahl-laptop.dnsalias.net +10 -0
  BUG#28618 (Skipping into the middle of a group with SQL_SLAVE_SKIP_COUNTER
  is possible):
  
  When skipping the beginning of a transaction starting with BEGIN, the OPTION_BEGIN
  flag was not set correctly, which caused the slave to not recognize that it was
  inside a group. This patch sets the OPTION_BEGIN flag for BEGIN, COMMIT, ROLLBACK,
  and XID events. It also adds checks if inside a group before decreasing the
  slave skip counter to zero.
  
  Begin_query_log_event was not marked that it could not end a group, which is now
  corrected.

  mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test@1.3.1.2, 2007-10-19 14:18:30+02:00, mats@kindahl-laptop.dnsalias.net +3 -1
    Correcting slave skip counter to get the correct behaviour.

  mysql-test/suite/rpl/data/rpl_bug28618.dat@1.1, 2007-10-19 14:18:34+02:00, mats@kindahl-laptop.dnsalias.net +3 -0
    New BitKeeper file ``mysql-test/suite/rpl/data/rpl_bug28618.dat''

  mysql-test/suite/rpl/data/rpl_bug28618.dat@1.0, 2007-10-19 14:18:34+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/r/rpl_slave_skip.result@1.6, 2007-10-19 14:18:30+02:00, mats@kindahl-laptop.dnsalias.net +208 -0
    Result change.

  mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt@1.1, 2007-10-19 14:18:34+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    New BitKeeper file ``mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt''

  mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt@1.0, 2007-10-19 14:18:34+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/t/rpl_slave_skip.test@1.4, 2007-10-19 14:18:30+02:00, mats@kindahl-laptop.dnsalias.net +239 -0
    Adding tests to check that skipping works for transactions:
    - Skipping one group with BEGIN first
    - Skipping two groups with BEGIN first
    - Skipping one group without BEGIN first but with AUTOCOMMIT=0
    - LOAD DATA INFILE under statement-based replication

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result@1.12.1.1, 2007-10-19 14:18:31+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Result change.

  sql/log_event.cc@1.277.35.1, 2007-10-19 14:18:33+02:00, mats@kindahl-laptop.dnsalias.net +64 -17
    Adding checks if we're in a group when the slave skip counter is 1.
    In that case, we should keep going.
    
    Adding helping member function Log_event::continue_group() denoting
    that this event cannot end a group, and if the skip counter indicates
    that the group ends after this event, it should not decrease the skip
    counter.
    
    Query_log_event will change the OPTION_BEGIN flag for BEGIN, COMMIT, and
    ROLLBACK, even when skipping because of a positive skip count, and
    Xid_log_event will also affect the OPTION_BEGIN flag, even when being
    skipped.
    
    Begin_load_query_log_event cannot end a group, so it is marked to
    continue the group.

  sql/log_event.h@1.158.1.3, 2007-10-19 14:18:33+02:00, mats@kindahl-laptop.dnsalias.net +25 -0
    Adding helper function Log_event::continue_group().

  sql/rpl_rli.h@1.21.2.1, 2007-10-19 14:18:33+02:00, mats@kindahl-laptop.dnsalias.net +12 -0
    Adding Relay_log_info::get_flag() to get the value of a
    replication flag.

  sql/slave.cc@1.318.1.1, 2007-10-19 14:18:34+02:00, mats@kindahl-laptop.dnsalias.net +4 -1
    Adding debug output and changing debug message.

ChangeSet@1.2476.513.17, 2007-10-19 14:15:13+02:00, guilhem@gbichot4.local +11 -0
  WL#3071 - Maria checkpoint
  - serializing calls to flush_pagecache_blocks_int() on the same file
  to avoid known concurrency bugs
  - having that, we can now enable the background thread, as the
  flushes it does are now supposedly safe in concurrent situations.
  - new type of flush FLUSH_KEEP_LAZY: when the background checkpoint
  thread is flushing a packet of dirty pages between two checkpoints,
  it uses this flush type, indeed if a file is already being flushed
  by another thread it's smarter to move on to the next file than wait.
  - maria_checkpoint_frequency renamed to maria_checkpoint_interval.

  include/my_sys.h@1.219.1.1, 2007-10-19 14:14:37+02:00, guilhem@gbichot4.local +7 -1
    new type of flushing for the page cache: FLUSH_KEEP_LAZY

  mysql-test/r/maria.result@1.19.1.4, 2007-10-19 14:14:37+02:00, guilhem@gbichot4.local +1 -1
    result update

  mysys/mf_keycache.c@1.72, 2007-10-19 14:14:37+02:00, guilhem@gbichot4.local +3 -2
    indentation. No FLUSH_KEEP_LAZY support in key cache.

  storage/maria/ha_maria.cc@1.51.1.4, 2007-10-19 14:14:37+02:00, guilhem@gbichot4.local +18 -25
    maria_checkpoint_frequency was somehow a hidden part of the
    Checkpoint API and that was not good. Now we have checkpoint_interval,
    local to ha_maria.cc, which serves as container for the user-visible
    maria_checkpoint_interval global variable; setting it calls
    update_checkpoint_interval which passes the new value to
    ma_checkpoint_init(). There is no hiding anymore.
    By default, enable background thread which does checkpoints
    every 30 seconds, and dirty page flush in between. That thread takes
    a checkpoint when it ends, so no need for maria_hton_panic to take one.
    The | is | and not ||, because maria_panic() must always be called.
    frequency->interval.

  storage/maria/ma_checkpoint.c@1.26, 2007-10-19 14:15:11+02:00, guilhem@gbichot4.local +97 -54
    Use FLUSH_KEEP_LAZY for background thread when it flushes packets of
    dirty pages between two checkpoints: it is smarter to move on to
    the next file than wait for it to have been completely flushed, which
    may take long.
    Comments about flush concurrency bugs moved from ma_pagecache.c.
    Removing out-of-date comment.
    frequency->interval.
    create_background_thread -> (interval>0).
    In ma_checkpoint_background(), some variables need to be preserved
    between iterations.

  storage/maria/ma_checkpoint.h@1.9, 2007-10-19 14:15:11+02:00, guilhem@gbichot4.local +1 -1
    new prototype

  storage/maria/ma_pagecache.c@1.52, 2007-10-19 14:15:11+02:00, guilhem@gbichot4.local +148 -70
    - concurrent calls of flush_pagecache_blocks_int() on the same file
    cause bugs (see @note in that function); we fix them by serializing
    in this situation. For that we use a global hash of (file, wqueue).
    When flush_pagecache_blocks_int() starts it looks into the hash,
    using the file as key. If not found, it inserts (file,wqueue) into the
    hash, flushes the file, and finally removes itself from the hash and
    wakes up any waiter in the queue. If found, it adds itself to the
    wqueue and waits.
    - As a by-product, we can remove changed_blocks_is_incomplete
    and replace it by scanning the hash, replace the sleep() by a queue wait.
    - new type of flush FLUSH_KEEP_LAZY: when flushing a file, if it's
    already being flushed by another thread (even partially), return
    immediately.

  storage/maria/ma_pagecache.h@1.26, 2007-10-19 14:15:11+02:00, guilhem@gbichot4.local +2 -0
    In pagecache, a hash of files currently being flushed (i.e. there
    is a call to flush_pagecache_blocks_int() for them).

  storage/maria/ma_recovery.c@1.46, 2007-10-19 14:15:11+02:00, guilhem@gbichot4.local +1 -1
    new prototype

  storage/maria/ma_test1.c@1.27, 2007-10-19 14:15:11+02:00, guilhem@gbichot4.local +1 -1
    new prototype

  storage/maria/ma_test2.c@1.23.1.2, 2007-10-19 14:15:11+02:00, guilhem@gbichot4.local +1 -1
    new prototype

ChangeSet@1.1810.3414.1, 2007-10-19 14:54:05+05:00, ramil@mysql.com +3 -0
  Fix for bug #31349: ERROR 1062 (23000): Duplicate entry '' for key 'group_key'
  
  Problem: lying to the optimizer that a function (Item_func_inet_ntoa)
  cannot return NULL values leads to unexpected results (in the case group
  keys creation/comparison is broken). 
  
  Fix: Item_func_inet_ntoa::maybe_null should be set properly.

  mysql-test/r/func_misc.result@1.21.3.1, 2007-10-19 14:54:03+05:00, ramil@mysql.com +6 -0
    Fix for bug #31349: ERROR 1062 (23000): Duplicate entry '' for key 'group_key'
      - test result.

  mysql-test/t/func_misc.test@1.21.3.1, 2007-10-19 14:54:03+05:00, ramil@mysql.com +8 -0
    Fix for bug #31349: ERROR 1062 (23000): Duplicate entry '' for key 'group_key'
      - test case.

  sql/item_strfunc.h@1.101.12.1, 2007-10-19 14:54:03+05:00, ramil@mysql.com +6 -1
    Fix for bug #31349: ERROR 1062 (23000): Duplicate entry '' for key 'group_key'
      - set Item_func_inet_ntoa::maybe_null flag.

ChangeSet@1.2476.557.1, 2007-10-19 00:32:51+02:00, serg@janus.mylan +4 -0
  mysys/my_getopt.c
      always process uint/ulong using ulonglong (unsigned) code
      dbug printout for adjusted option values
  strings/llstr.c
      ullstr() - the unsigned brother of llstr()

  include/m_string.h@1.50, 2007-10-19 00:32:46+02:00, serg@janus.mylan +1 -0
    ullstr() - the unsigned brother of llstr()

  mysql-test/t/variables.test@1.73.1.2, 2007-10-19 00:32:46+02:00, serg@janus.mylan +2 -2
    test adjusted for 32bit

  mysys/my_getopt.c@1.73.2.2, 2007-10-19 00:32:47+02:00, serg@janus.mylan +19 -13
    always process uint/ulong using ulonglong (unsigned) code
    dbug printout for adjusted option values

  strings/llstr.c@1.9, 2007-10-19 00:32:47+02:00, serg@janus.mylan +7 -0
    ullstr() - the unsigned brother of llstr()

ChangeSet@1.2476.556.1, 2007-10-18 15:08:27-07:00, brian@zim.(none) +2 -0
  Fix for bug#31704
  
  Just had to put in the removal of the autocommit, and make sure the commit occurred at the propper time. 

  client/mysqlslap.c@1.62.1.1, 2007-10-18 15:08:21-07:00, brian@zim.(none) +15 -7
    Fix for auto-connect on counter. Relabeled variable which was misnamed. 

  mysql-test/r/mysqlslap.result@1.13.1.1, 2007-10-18 15:08:21-07:00, brian@zim.(none) +8 -0
    Updated result file

ChangeSet@1.2476.555.1, 2007-10-18 14:48:04-07:00, antony@pcg5ppc.xiphis.org +7 -0
  Bug#31473
    "CSV does not work with NULL value in datetime fields"
    Attempting to insert a row with a NULL value for a DATETIME field
    results in a CSV file which the storage engine cannot read.
    Don't blindly assume that "0" is acceptable for all field types,
    Since CSV does not support NULL, we find out from the field the
    default non-null value.
    Do not permit the creation of a table with a nullable columns.

  mysql-test/r/csv.result@1.23, 2007-10-18 14:47:59-07:00, antony@pcg5ppc.xiphis.org +82 -24
    test for bug 31473

  mysql-test/r/log_tables.result@1.22.1.1, 2007-10-18 14:47:59-07:00, antony@pcg5ppc.xiphis.org +48 -48
    change in results due to bugfix 31473

  mysql-test/r/system_mysql_db.result@1.49.1.1, 2007-10-18 14:47:59-07:00, antony@pcg5ppc.xiphis.org +9 -9
    change in results due to bugfix 31473

  mysql-test/t/csv.test@1.28, 2007-10-18 14:48:00-07:00, antony@pcg5ppc.xiphis.org +63 -24
    test for bug 31473

  mysql-test/t/log_tables.test@1.19.1.1, 2007-10-18 14:48:00-07:00, antony@pcg5ppc.xiphis.org +9 -9
    due to bug31473, all columns in CSV tables must be declared as NOT NULL

  scripts/mysql_system_tables.sql@1.15.1.1, 2007-10-18 14:48:00-07:00, antony@pcg5ppc.xiphis.org +2 -2
    due to bug31473, all columns in CSV tables must be declared as NOT NULL

  storage/csv/ha_tina.cc@1.45.20.1, 2007-10-18 14:48:00-07:00, antony@pcg5ppc.xiphis.org +27 -9
    bug31473
      Don't blindly assume that "0" is acceptable for all field types,
      Since CSV does not support NULL, we find out from the field the
      default non-null value.
      Do not permit the creation of a table with a nullable columns;

ChangeSet@1.2403.18.94, 2007-10-18 23:21:18+02:00, jonas@perch.ndb.mysql.com +4 -0
  ndb - bug#31701 Node failure with repl. wo/ load, can lead to endless out of order buckets
    Correct check for buffer/no buffer

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.32.1.9, 2007-10-18 23:21:16+02:00, jonas@perch.ndb.mysql.com +1 -1
    new error code

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@1.53.2.6, 2007-10-18 23:21:16+02:00, jonas@perch.ndb.mysql.com +4 -2
    correct check for buffer/no buffer

  storage/ndb/test/ndbapi/test_event.cpp@1.28, 2007-10-18 23:21:16+02:00, jonas@perch.ndb.mysql.com +88 -0
    test prg

  storage/ndb/test/run-test/daily-basic-tests.txt@1.63.2.12, 2007-10-18 23:21:16+02:00, jonas@perch.ndb.mysql.com +4 -0
    test prg

ChangeSet@1.2476.554.2, 2007-10-18 17:24:57-03:00, davi@moksha.com.br +2 -0
  Post merge fix for Bug 21557

  mysql-test/r/log_tables.result@1.25, 2007-10-18 17:24:54-03:00, davi@moksha.com.br +2 -1
    Update test result, general_log disabled.

  mysql-test/t/log_tables.test@1.22, 2007-10-18 17:24:54-03:00, davi@moksha.com.br +1 -0
    Disable the general_log before consulting it.

ChangeSet@1.1810.3410.1, 2007-10-18 21:48:16+02:00, msvensson@pilot.mysql.com +1 -0
  Remove unportable use of "system rm"

  mysql-test/t/binlog_killed.test@1.6.1.3, 2007-10-18 21:48:14+02:00, msvensson@pilot.mysql.com +1 -1
    Remove unportable use of "system rm"

ChangeSet@1.2476.554.1, 2007-10-18 15:45:07-03:00, davi@moksha.com.br +9 -0
  Bug#21557 entries in the general query log truncated at 1000 characters.
  
  The general log write function (general_log_print) uses printf style
  arguments which need to be pre-processed, meaning that the all arguments
  are copied to a single buffer and the problem is that the buffer size is
  constant (1022 characters) but queries can be much larger then this.
  
  The solution is to introduce a new log write function that accepts a
  buffer and it's length as arguments. The function is to be used when
  a formatted output is not required, which is the case for almost all
  query write-to-log calls.
  
  This is a incompatible change with respect to the log format of prepared
  statements.

  mysql-test/r/log_tables.result@1.24, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +214 -0
    Add test case result for Bug#21557

  mysql-test/t/log_tables.test@1.21, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +116 -0
    Add test case for Bug#21557

  sql/log.cc@1.297.3.2, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +94 -60
    Introduce the logger function general_log_write which is similar to
    general_log_print but accepts a single buffer and the buffer length.
    The function doesn't perform any formatting and sends the buffer
    directly to the underlying log handlers.

  sql/log.h@1.30.1.1, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +4 -0
    Introduce the logger function general_log_write.

  sql/log_event.cc@1.277.1.30, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +1 -1
    Pass the query buffer directly to the logger function, formatting
    is not required on this case.

  sql/mysql_priv.h@1.523.1.20, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +3 -0
    Prototype for the logger function general_log_write.

  sql/sp_head.cc@1.292.4.1, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +1 -1
    Pass the query buffer directly to the logger function, formatting
    is not required on this case.

  sql/sql_parse.cc@1.683.22.1, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +3 -4
    Pass the buffer directly to the logger function when formatting
    is not required.

  sql/sql_prepare.cc@1.234, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +2 -11
    Don't log the statement id, it avoids making a extra copy of the query
    and the query is not truncated anymore if it exceeds the limit.

ChangeSet@1.2476.553.1, 2007-10-18 16:14:27+02:00, istruewing@stella.local +1 -0
  Bug#31692 - binlog_killed.test crashes sometimes
  
  The server crashed when a thread was killed while locking the
  general_log table at statement begin.
  
  The general_log table is handled like a performance schema table.
  The state of open tables is saved and cleared so that this table
  seems to be the only open one. Then this table is opened and locked.
  After writing, the table is closed and the open table state is
  restored. Before restoring, however, it is asserted that there is
  no current table open.
  
  After locking the table, mysql_lock_tables() checks if the thread
  was killed in between. If so, it unlocks the table and returns an
  error. open_ltable() just returns with the error and leaves closing
  of the table to close_thread_tables(), which is called at
  statement end.
  
  open_performance_schema_table() did not take this into account.
  It assumed that a failed open_ltable() would not leave an open
  table behind.
  
  Fixed by closing thread tables after open_ltable() and before
  restore_backup_open_tables_state() if the thread was killed.
  
  No test case. It requires correctly timed parallel execution.
  Since this bug was detected by the test suite, it seems
  dispensable to add another test.

  sql/sql_base.cc@1.421.13.1, 2007-10-18 16:14:25+02:00, istruewing@stella.local +10 -0
    Bug#31692 - binlog_killed.test crashes sometimes
    Closing thread tables after open_ltable() and before
    restore_backup_open_tables_state() if the thread was killed.

ChangeSet@1.1810.3407.1, 2007-10-18 15:19:04+03:00, gkodinov@magare.gmz +13 -0
  Bug #31221: Optimizer incorrectly identifies impossible WHERE clause
   No warning was generated when a TIMESTAMP with a non-zero time part
   was converted to a DATE value. This caused index lookup to assume
   that this is a valid conversion and was returning rows that match 
   a comparison between a TIMESTAMP value and a DATE keypart.
   Fixed by generating a warning on such a truncation.

  mysql-test/r/ps_6bdb.result@1.27.19.1, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -1
    Bug #31221: Warnings cased by existing tests

  mysql-test/r/derived.result@1.58.1.1, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -1
    Bug #31221: fixed an existing not-precise test case

  mysql-test/r/ps_2myisam.result@1.39.6.5, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -1
    Bug #31221: Warnings cased by existing tests

  mysql-test/r/ps_3innodb.result@1.42.6.5, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -1
    Bug #31221: Warnings cased by existing tests

  mysql-test/r/ps_4heap.result@1.38.6.5, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -1
    Bug #31221: Warnings cased by existing tests

  mysql-test/r/ps_5merge.result@1.39.6.5, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +4 -2
    Bug #31221: Warnings cased by existing tests

  mysql-test/r/type_date.result@1.13.4.3, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +30 -0
    Bug #31221: Warnings cased by existing tests

  mysql-test/r/type_datetime.result@1.30.1.18, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -0
    Bug #31221: test case

  mysql-test/r/ps_7ndb.result@1.26.8.5, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -1
    Bug #31221: Warnings cased by existing tests

  mysql-test/t/derived.test@1.54, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -1
    Bug #31221: fixed an existing not-precise test case

  mysql-test/t/type_date.test@1.14.3.3, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +22 -0
    Bug #31221: test case

  sql/field.cc@1.256.61.1, 2007-10-18 15:19:03+03:00, gkodinov@magare.gmz +21 -4
    Bug #31221: 
     - Upgraded fix for bug 29729
     - issue a warning only if the hh:mm:ss.msec is not zero consistently 
       for all the Field_newdate::store function

  sql/item_timefunc.cc@1.100.31.7, 2007-10-18 15:19:03+03:00, gkodinov@magare.gmz +1 -2
    Bug #31221: don't ignore the errors when storing data

ChangeSet@1.2476.551.2, 2007-10-18 15:17:21+04:00, kaa@polly.(none) +3 -0
  Post-merge changes for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

  include/my_sys.h@1.206.1.24, 2007-10-18 15:17:15+04:00, kaa@polly.(none) +1 -1
    Post-merge changes for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

  sql/partition_info.cc@1.42, 2007-10-18 15:17:15+04:00, kaa@polly.(none) +2 -2
    Post-merge changes for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

  sql/set_var.cc@1.240.15.1, 2007-10-18 15:17:15+04:00, kaa@polly.(none) +2 -1
    Post-merge changes for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

ChangeSet@1.1810.3406.1, 2007-10-18 13:09:30+02:00, mleich@four.local.lan +4 -0
  Fix for
  Bug#31556 Test failure: "select hex(ascii(a)) ... order by a" results in different order

  mysql-test/suite/funcs_2/r/innodb_charset.result@1.1.1.1, 2007-10-18 13:09:29+02:00, mleich@four.local.lan +3 -3
    Updated result

  mysql-test/suite/funcs_2/r/memory_charset.result@1.1.1.1, 2007-10-18 13:09:29+02:00, mleich@four.local.lan +3 -3
    Updated result

  mysql-test/suite/funcs_2/r/myisam_charset.result@1.1.1.1, 2007-10-18 13:09:29+02:00, mleich@four.local.lan +3 -3
    Updated result

  mysql-test/suite/funcs_2/r/ndb_charset.result@1.1.1.1, 2007-10-18 13:09:29+02:00, mleich@four.local.lan +3 -3
    Updated result

ChangeSet@1.1810.3382.3, 2007-10-18 12:03:30+02:00, joerg@trift2. +3 -0
  Modify "mysqlbug" ("scripts/mysqlbug.sh") so that it differs between the original
  and the modified values of the compile-related variables used in "configure".
  
  Make the necessary adjustments in "configure.in" and "scripts/Makefile.am".
  
  This fixes bug#31644
     Values of *FLAGS that were used for building packages is missed in mysqlbug

  configure.in@1.245.107.3, 2007-10-18 12:03:27+02:00, joerg@trift2. +5 -0
    Add more variables to the "substitution" list: SAVE_CC, SAVE_CXX, ASFLAGS.
    
    This is necessary so that the "mysqlbug" script can output the variables affecting
    compilation with both their original (on call) and final (modified) values.
    
    This work is related to fixing bug#31644
       Values of *FLAGS that were used for building packages is missed in mysqlbug

  scripts/Makefile.am@1.43.4.1, 2007-10-18 12:03:27+02:00, joerg@trift2. +10 -4
    Clearly differ between the original and the modified values of the compile-related
    variables used in "configure".
    
    This is to fix bug#31644
       Values of *FLAGS that were used for building packages is missed in mysqlbug

  scripts/mysqlbug.sh@1.8.1.2, 2007-10-18 12:03:27+02:00, joerg@trift2. +4 -2
    Have separate variables "COMP_CALL_INFO" and "COMP_RUN_INFO"
    which contain the original (call parameters, environment) and the modified values
    of the "configure" variables controlling the compile process.
    
    This fixes bug#31644
       Values of *FLAGS that were used for building packages is missed in mysqlbug

ChangeSet@1.1810.3405.1, 2007-10-18 14:52:19+05:00, holyfoot@mysql.com +1 -0
  Bug #30638 why doesn't > 4294967295 rows work in myisam on windows.
  
  The BIG_TABLES define wasn't enabled on Windows.
  #define added

  include/config-win.h@1.71.8.1, 2007-10-18 14:52:17+05:00, holyfoot@mysql.com +1 -0
    Bug #30638 why doesn't > 4294967295 rows work in myisam on windows.
    
    BIG_TABLES enabled on Windows

ChangeSet@1.2476.514.14, 2007-10-18 11:13:52+02:00, tnurnberg@sin.intern.azundris.com +1 -0
  Bug#31588: buffer overrun when setting variables
  
  post-merge fixes: format string was changed 5.0 -> 5.1, resulting in longer output

  mysql-test/r/variables.result@1.101.1.2, 2007-10-18 11:13:47+02:00, tnurnberg@sin.intern.azundris.com +1 -1
    post-merge fixes: format string was changed 5.0 -> 5.1, resulting in longer output

ChangeSet@1.1616.3099.3, 2007-10-18 10:47:54+02:00, tnurnberg@sin.intern.azundris.com +3 -0
  Bug#31588: buffer overrun when setting variables
  
  Buffer used when setting variables was not dimensioned to accomodate
  trailing '\0'. An overflow by one character was therefore possible.
  CS corrects limits to prevent such overflows.

  mysql-test/r/variables.result@1.21.1.45, 2007-10-18 10:47:51+02:00, tnurnberg@sin.intern.azundris.com +3 -0
    Try to overflow buffer used for setting system variables.
    Unpatched server should throw a valgrind warning here.
    Actual value and error message irrelevant, only length counts.

  mysql-test/t/variables.test@1.18.1.36, 2007-10-18 10:47:52+02:00, tnurnberg@sin.intern.azundris.com +8 -1
    Try to overflow buffer used for setting system variables.

  sql/set_var.cc@1.34.71.1, 2007-10-18 10:47:52+02:00, tnurnberg@sin.intern.azundris.com +1 -1
    Adjust maximum number of characters we can store in 'buff' by one
    as strmake() will write a terminating '\0'.

ChangeSet@1.1810.3353.12, 2007-10-17 17:54:11-04:00, dkatz@damien-katzs-computer.local +5 -0
  Bug #29804  UDF parameters don't contain correct string length
      
  Previously, UDF *_init functions were passed constant strings with erroneous lengths. The length came from the containing variable's size, not the length of the value itself.
      
  Now the *_init functions get the constant as a null terminated string with the correct length supplied too.

  mysql-test/r/udf.result@1.3.4.3, 2007-10-17 17:54:08-04:00, dkatz@damien-katzs-computer.local +24 -0
    Test case to check constants passed UDFs.

  mysql-test/t/udf.test@1.8.3.3, 2007-10-17 17:54:08-04:00, dkatz@damien-katzs-computer.local +36 -0
    Test case to check constants passed UDFs.

  sql/item_func.cc@1.270.86.2, 2007-10-17 17:54:08-04:00, dkatz@damien-katzs-computer.local +2 -1
    UDF _init functions are now passed the length of the constants, rather than the max length of the var containing the constant.

  sql/udf_example.c@1.29.2.1, 2007-10-17 17:54:08-04:00, dkatz@damien-katzs-computer.local +35 -0
    Added check_const_len functions. The check_const_len_init functions checks that lengths of constants are correctly passed.

  sql/udf_example.def@1.3.2.1, 2007-10-17 17:54:08-04:00, dkatz@damien-katzs-computer.local +2 -0
    Add new example functions to windows dll export list.

ChangeSet@1.2476.545.2, 2007-10-17 16:43:30-03:00, davi@moksha.com.br +3 -0
  Bug#31608 missing mysqltest change_user command
  
  Post merge fixes: close any open statement before
  the change user command and fix test case output.

  client/mysqltest.c@1.313.2.4, 2007-10-17 16:43:26-03:00, davi@moksha.com.br +6 -0
    Close an open statement since it won't work after a change_user command.

  mysql-test/r/change_user.result@1.2, 2007-10-17 16:43:26-03:00, davi@moksha.com.br +2 -2
    Fixed test case output.

  mysql-test/t/change_user.test@1.2, 2007-10-17 16:43:26-03:00, davi@moksha.com.br +1 -1
    Fix test case output to return 1 or 0.

ChangeSet@1.2476.517.3, 2007-10-17 20:40:23+02:00, mattiasj@mattiasj-laptop.(none) +3 -0
  Bug #30878: Crashing when alter an auto_increment non partitioned
    table to partitioned
  
  Problem:
  Crashed because usage of an uninitialised mutex when auto_incrementing
    a partitioned temporary table
  
  Fix:
  Only locking (using the mutex) if not temporary table.

  mysql-test/r/partition.result@1.70, 2007-10-17 20:40:22+02:00, mattiasj@mattiasj-laptop.(none) +12 -0
    Bug #30878: Crashing when alter an auto_increment non partitioned
      table to partitioned
    test result

  mysql-test/t/partition.test@1.64, 2007-10-17 20:40:22+02:00, mattiasj@mattiasj-laptop.(none) +18 -0
    Bug #30878: Crashing when alter an auto_increment non partitioned
      table to partitioned
    testcase

  sql/ha_partition.cc@1.104.2.2, 2007-10-17 20:40:22+02:00, mattiasj@mattiasj-laptop.(none) +15 -5
    Bug #30878: Crashing when alter an auto_increment non partitioned
      table to partitioned
    
    If the table is a temporary table, the table_share->mutex is not
      initialised.
    
    Checking if not temporary table, then OK to lock (else no need
      to lock)

ChangeSet@1.1810.3302.30, 2007-10-17 11:22:41-06:00, tsmith@ramayana.hindu.god +1 -0
  Fix syntax error build problem on Windows (variable was defined
  in middle of block)

  libmysql/libmysql.c@1.233.1.13, 2007-10-17 11:22:40-06:00, tsmith@ramayana.hindu.god +11 -7
    Fix syntax error - don't define new variables in the middle of a block.
    
    Also, use size_t instead of uint to avoid unnecessary casting.

ChangeSet@1.2480, 2007-10-17 13:03:08-04:00, cmiller@zippy.cornsilk.net +2 -0
  Further clean-up.

  configure.in@1.355.1.106, 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.1810.3404.1, 2007-10-17 20:08:58+04:00, kaa@polly.(none) +21 -0
  Fix for bug #31207: Test "join_nested" shows different strategy on IA64
  CPUs / Intel's ICC compile
  
  The bug is a combination of two problems:
  
  1. IA64/ICC MySQL binaries use glibc's qsort(), not the one in mysys.
  
  2. The order relation implemented by join_tab_cmp() is not transitive,
  i.e. it is possible to choose such a, b and c that (a < b) && (b < c)
  but (c < a). This implies that result of a sort using the relation
  implemented by join_tab_cmp() depends on the order in which
  elements are compared, i.e. the result is implementation-specific. Since
  choose_plan() uses qsort() to pre-sort the
  join tables using join_tab_cmp() as a compare function, the results of
  the sorting may vary depending on qsort() implementation.
  
  It is neither possible nor important to implement a better ordering
  algorithm in join_tab_cmp(). Therefore the only way to fix it is to
  force our own qsort() to be used by renaming it to my_qsort(), so we don't depend
  on linker to decide that.
  
  This patch also "fixes" bug #20530: qsort redefinition violates the
  standard.

  include/my_sys.h@1.178.2.21, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +4 -2
    Renamed qsort() and qsort2() to my_qsort() and my_qsort2(). Since
    previously we relied on stdlib.h to provide a declaration for qsort(), a
    separate declaration for my_qsort() is now required.

  libmysql/Makefile.shared@1.68.1.2, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Added mf_qsort.c to libmysql, since my_lib.c now uses my_qsort() instead of qsort().

  mysys/mf_keycache.c@1.55.1.10, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Replaced qsort() with my_qsort().

  mysys/mf_qsort.c@1.17, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +2 -2
    Renamed qsort() to my_qsort() and qsort2() to my_qsort2().

  mysys/mf_sort.c@1.7.1.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Replaced qsort2() with my_qsort2().

  mysys/my_lib.c@1.23.3.5, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +3 -3
    Replaced qsort() with my_qsort().

  mysys/queues.c@1.15.1.3, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +2 -2
    Replaced qsort2() with my_qsort2().

  sql/item_cmpfunc.cc@1.187.50.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Replaced qsort2() with my_qsort2().

  sql/item_cmpfunc.h@1.122.23.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Replaced qsort2() with my_qsort2().

  sql/opt_range.cc@1.159.1.95, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +4 -4
    Replaced qsort() with my_qsort().

  sql/records.cc@1.40.1.7, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +2 -1
    Replaced qsort() with my_qsort().

  sql/sql_acl.cc@1.128.46.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +10 -10
    Replaced qsort() with my_qsort().

  sql/sql_array.h@1.3.1.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Replaced qsort() with my_qsort().

  sql/sql_help.cc@1.47.1.8, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Replaced qsort() with my_qsort().

  sql/sql_select.cc@1.312.182.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +15 -3
    Replaced qsort() with my_qsort().

  sql/sql_table.cc@1.239.71.1, 2007-10-17 20:08:54+04:00, kaa@polly.(none) +1 -1
    Replaced qsort() with my_qsort().

  sql/examples/ha_tina.cc@1.10.10.1, 2007-10-17 20:08:54+04:00, kaa@polly.(none) +1 -1
    Replaced qsort() with my_qsort().

  myisam/ft_boolean_search.c@1.90.8.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +2 -2
    Replaced qsort2() with my_qsort2().

  myisam/ft_nlq_search.c@1.38.4.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +2 -1
    Replaced qsort2() with my_qsort2().

  myisam/myisampack.c@1.39.24.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Replaced qsort() with my_qsort().

  myisam/sort.c@1.45.23.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +6 -6
    Replaced qsort2() with my_qsort2().

ChangeSet@1.2476.550.1, 2007-10-17 17:59:48+02:00, guilhem@gbichot4.local +1 -0
  Bugfix from Sanja (when truncating log at restart)

  storage/maria/ma_loghandler.c@1.67, 2007-10-17 17:59:44+02:00, guilhem@gbichot4.local +22 -8
    applying patch for bugfix, by Sanja.

ChangeSet@1.2476.549.1, 2007-10-17 16:55:26+02:00, guilhem@gbichot4.local +10 -0
  WL#3071 Maria checkpoint
  Ability for flush_pagecache_blocks() to flush only certain pages of
  a file, as instructed by an option "filter" pointer-to-function argument;
  Checkpoint and background dirty page flushing use that to flush only
  pages which have been dirty for long enough and bitmap pages.
  Fix for a bug in flush_cached_blocks() (no idea if it could produce
  a bug in real life, but theoretically it is).
  Testing checkpoint in ma_test_recovery via ma_test1 and ma_test2.
  Background checkpoint & dirty pages flush thread is still disabled
  by default in ha_maria.

  mysql-test/r/maria.result@1.19.1.3, 2007-10-17 16:55:21+02:00, guilhem@gbichot4.local +1 -1
    result update

  storage/maria/ha_maria.cc@1.51.1.3, 2007-10-17 16:55:21+02:00, guilhem@gbichot4.local +3 -1
    blank after function comment

  storage/maria/ma_checkpoint.c@1.25, 2007-10-17 16:55:22+02:00, guilhem@gbichot4.local +45 -87
    Using an enum instead of 0/1/2 (applying Sanja's review comments).
    The comment about "this is an horizon" can be removed as Sanja
    created translog_next_LSN() which parse_checkpoint_record() uses.
    Variables in ma_checkpoint_background() cannot be declared in the
    for() as their value must not be reset at each iteration!

  storage/maria/ma_pagecache.c@1.51, 2007-10-17 16:55:22+02:00, guilhem@gbichot4.local +70 -21
    adding to flush_pagecache_blocks() optional arguments 'filter'
    (pointer to function) and 'filter_arg'; if filter!=NULL this function
    will be called for each block of the file and will reply if this
    block and following ones should be flushed or not (3 possible
    replies).
    Fixing a bug when flush_cached_blocks() skips a pinned page: it has
    to unset PCBLOCK_IN_FLUSH set by flush_pagecache_blocks_int().

  storage/maria/ma_pagecache.h@1.25, 2007-10-17 16:55:22+02:00, guilhem@gbichot4.local +19 -3
    flush_pagecache_blocks() is changed to take "filter" and "filter_arg"
    arguments. "filter", if it is not NULL, may return one value
    among enum pagecache_flush_filter_result.

  storage/maria/ma_recovery.c@1.43.1.1, 2007-10-17 16:55:22+02:00, guilhem@gbichot4.local +7 -0
    open_count=0 when closing tables at the end of recovery.

  storage/maria/ma_test1.c@1.26, 2007-10-17 16:55:22+02:00, guilhem@gbichot4.local +17 -2
    Optional checkpoints (-H#) at various stages (stages similar
    to --testflag), for testing of checkpoints.

  storage/maria/ma_test2.c@1.23.1.1, 2007-10-17 16:55:22+02:00, guilhem@gbichot4.local +16 -3
    Optional checkpoints (-H#) at various stages (stages similar
    to -t), for testing of checkpoints.

  storage/maria/ma_test_recovery@1.12.1.1, 2007-10-17 16:55:22+02:00, guilhem@gbichot4.local +8 -1
    We duplicate the loop of tests to add an additional run with
    checkpoints at various stages, to see if maria_read_log
    uses them fine.

  storage/maria/ma_test_recovery.expected@1.8.1.1, 2007-10-17 16:55:22+02:00, guilhem@gbichot4.local +810 -24
    Result update: the results of the additional test run with -H#
    (checkpoints) are added here. They are exactly identical to without
    checkpoints except that the index's Root (printed by maria_chk)
    is more correct when using checkpoints. This is because checkpoint
    flushed the state, so it happens to be correct, while no-checkpoint
    does not flush the state, and recovery does not recover indexes
    so Root is never fixed. When we recover indices, this will go away.

ChangeSet@1.2476.548.1, 2007-10-17 17:02:14+03:00, bell@desktop.sanja.is.com.ua +2 -0
  Checking that the very last record is fully written
    on the loghandler start.
  Variable definition moved because it is C programm.

  storage/maria/ma_loghandler.c@1.66, 2007-10-17 17:02:11+03:00, bell@desktop.sanja.is.com.ua +191 -0
    Checking that the very last record is fully written
      on the loghandler start.

  storage/maria/ma_recovery.c@1.42.1.1, 2007-10-17 17:02:11+03:00, bell@desktop.sanja.is.com.ua +2 -1
    Variable definition moved because it is C programm.

ChangeSet@1.2476.500.12, 2007-10-17 15:44:22+04:00, anozdrin@station. +2 -0
  Fix result files (BUG#24923).

  mysql-test/r/information_schema.result@1.151.3.1, 2007-10-17 15:44:20+04:00, anozdrin@station. +1 -1
    Fix result files (BUG#24923).

  mysql-test/r/system_mysql_db.result@1.50, 2007-10-17 15:44:20+04:00, anozdrin@station. +1 -1
    Fix result files (BUG#24923).

ChangeSet@1.1616.3108.1, 2007-10-17 14:28:00+05:00, ramil@mysql.com +4 -0
  Fix for bug#31615: crash after set names ucs2 collate xxx
  
  Problem: currently, UCS-2 cannot be used as a client character set.
  
  Fix: raise an error if one attempts to set it to USC-2.

  mysql-test/r/ctype_ucs.result@1.11.1.25, 2007-10-17 14:27:58+05:00, ramil@mysql.com +8 -0
    Fix for bug#31615: crash after set names ucs2 collate xxx
      - test result.

  mysql-test/t/ctype_ucs.test@1.15.1.21, 2007-10-17 14:27:58+05:00, ramil@mysql.com +12 -0
    Fix for bug#31615: crash after set names ucs2 collate xxx
      - test case.

  sql/set_var.cc@1.34.52.48, 2007-10-17 14:27:58+05:00, ramil@mysql.com +22 -0
    Fix for bug#31615: crash after set names ucs2 collate xxx
      - raise an error if one is going to set character_set_client to UCS-2.

  sql/set_var.h@1.54.1.9, 2007-10-17 14:27:58+05:00, ramil@mysql.com +1 -0
    Fix for bug#31615: crash after set names ucs2 collate xxx
      - raise an error if one is going to set character_set_client to UCS-2.

ChangeSet@1.2476.541.3, 2007-10-17 14:08:03+05:00, gluh@mysql.com +3 -0
  Bug#31381 Error in retrieving Data from INFORMATION_SCHEMA
  move 'table_collation' field filling outside of if(file) condition
  because this field has 'OPEN_FRM_ONLY' attribute

  mysql-test/r/information_schema.result@1.151.1.16, 2007-10-17 14:08:01+05:00, gluh@mysql.com +4 -0
    test result

  mysql-test/t/information_schema.test@1.98.1.12, 2007-10-17 14:08:01+05:00, gluh@mysql.com +6 -0
    test case

  sql/sql_show.cc@1.438.1.2, 2007-10-17 14:08:01+05:00, gluh@mysql.com +4 -3
    move 'table_collation' field filling outside of if(file) condition
    because this field has 'OPEN_FRM_ONLY' attribute

ChangeSet@1.1810.3391.9, 2007-10-17 13:22:34+05:00, gluh@mysql.com +3 -0
  Bug#31568 Some "information_schema" entries suddenly report a NULL default
  updated result files

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.1.2.3, 2007-10-17 13:22:33+05:00, gluh@mysql.com +39 -43
    updated result file

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.1.2.3, 2007-10-17 13:22:33+05:00, gluh@mysql.com +39 -43
    updated result file

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.1.2.3, 2007-10-17 13:22:33+05:00, gluh@mysql.com +39 -43
    updated result file

ChangeSet@1.2476.500.11, 2007-10-17 12:13:56+04:00, anozdrin@station. +8 -0
  Fix for BUG#24923: Functions with ENUM issues.
  
  The problem was that the RETURNS column in the mysql.proc was of
  CHAR(64). That was not enough for storing long-named datatypes.
  
  The fix is to change CHAR(64) to LONGBLOB, and to throw warnings
  at the time a stored routine is created if some data is truncated
  during writing into mysql.proc.

  mysql-test/r/sp.result@1.303, 2007-10-17 12:13:53+04:00, anozdrin@station. +51 -0
    Update test result.

  mysql-test/t/sp.test@1.264, 2007-10-17 12:13:53+04:00, anozdrin@station. +70 -0
    Add a test case for BUG#24923.

  scripts/mysql_system_tables.sql@1.16, 2007-10-17 12:13:53+04:00, anozdrin@station. +1 -1
    Change the data type of column 'returns' from char(64) to longblob.

  scripts/mysql_system_tables_fix.sql@1.65, 2007-10-17 12:13:53+04:00, anozdrin@station. +1 -0
    Change the data type of column 'returns' from char(64) to longblob.

  sql/share/errmsg.txt@1.159.1.9, 2007-10-17 12:13:54+04:00, anozdrin@station. +3 -0
    Add new error message.

  sql/sp.cc@1.170.1.2, 2007-10-17 12:13:53+04:00, anozdrin@station. +92 -39
    Produce warnings if any data was truncated during writing
    into mysql.proc.

  sql/sp.h@1.42, 2007-10-17 12:13:53+04:00, anozdrin@station. +1 -0
    Add new error code.

  sql/sql_parse.cc@1.683.19.9, 2007-10-17 12:13:54+04:00, anozdrin@station. +3 -0
    Hande

ChangeSet@1.2476.478.13, 2007-10-17 09:29:11+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Removing debug variables from non-debug builds.

  sql/rpl_record.cc@1.16, 2007-10-17 09:29:06+02:00, mats@kindahl-laptop.dnsalias.net +4 -0
    Turning of declaration of debug variables in non-debug builds.

ChangeSet@1.1616.3100.5, 2007-10-17 10:29:51+04:00, kaa@polly.(none) +2 -0
  Fixed the test case for bug #31174 to not fail on 64-bit platforms.

  mysql-test/r/repair.result@1.14.1.9, 2007-10-17 10:29:45+04:00, kaa@polly.(none) +1 -1
    Fixed the test case for bug #31174 to not fail on 64-bit platforms.

  mysql-test/t/repair.test@1.12.1.7, 2007-10-17 10:29:45+04:00, kaa@polly.(none) +1 -1
    Fixed the test case for bug #31174 to not fail on 64-bit platforms.

ChangeSet@1.2476.547.1, 2007-10-17 06:50:03+02:00, mats@kindahl-laptop.dnsalias.net +3 -0
  Eliminating some valgrind warnings resulting from that some
  storage engines do not set the unused null bits (i.e., the
  filler bits and the X bit) correctly. Also adding some casts
  to debug printouts to eliminate compiler warnings.

  sql/ha_ndbcluster.cc@1.461.10.1, 2007-10-17 06:49:55+02:00, mats@kindahl-laptop.dnsalias.net +55 -55
    Changing debug enter names to use full names for member functions.

  sql/records.cc@1.50.1.1, 2007-10-17 06:49:55+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
    Emptying records before starting to read records since some engines do
    not set the unused null bits, leading to valgrind errors.

  sql/rpl_record.cc@1.15, 2007-10-17 06:49:55+02:00, mats@kindahl-laptop.dnsalias.net +3 -2
    Adding casts to debug printouts to eliminate compiler warnings.

ChangeSet@1.2476.500.10, 2007-10-16 20:47:08-06:00, malff@lambda.hsd1.co.comcast.net. +8 -0
  Manual merge of 5.0-runtime to 5.1-runtime

  mysql-test/r/sp-error.result@1.132, 2007-10-16 20:47:02-06:00, malff@lambda.hsd1.co.comcast.net. +14 -1
    Manual merge

  mysql-test/r/sp.result@1.302, 2007-10-16 20:47:03-06:00, malff@lambda.hsd1.co.comcast.net. +16 -0
    Manual merge

  mysql-test/r/udf.result@1.21.1.2, 2007-10-16 20:47:03-06:00, malff@lambda.hsd1.co.comcast.net. +10 -3
    Manual merge

  mysql-test/t/sp.test@1.263, 2007-10-16 20:47:03-06:00, malff@lambda.hsd1.co.comcast.net. +31 -0
    Manual merge

  mysql-test/t/udf.test@1.19.1.2, 2007-10-16 20:47:03-06:00, malff@lambda.hsd1.co.comcast.net. +2 -1
    Manual merge

  sql/item_create.cc@1.92.1.1, 2007-10-16 20:47:03-06:00, malff@lambda.hsd1.co.comcast.net. +19 -0
    Manual merge

  sql/sp_head.cc@1.292.1.3, 2007-10-16 20:47:04-06:00, malff@lambda.hsd1.co.comcast.net. +30 -4
    Manual merge

  sql/sql_yacc.yy@1.601.1.7, 2007-10-16 20:47:04-06:00, malff@lambda.hsd1.co.comcast.net. +259 -224
    Manual merge

ChangeSet@1.1810.3353.11, 2007-10-16 14:27:20-06:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  Fixed broken call to my_error

  sql/sql_yacc.yy@1.371.132.4, 2007-10-16 14:27:18-06:00, malff@lambda.hsd1.co.comcast.net. +1 -1
    Fixed error message to use char*, not LEX_STRING

ChangeSet@1.2476.512.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.523.17.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.4.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.512.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.683.20.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.541.29.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.478.11, 2007-10-16 23:19:39+04:00, skozlov@mysql.com +4 -0
  Fix for non-deterministic behavior of SELECTs and VIEWs

  mysql-test/suite/rpl/include/rpl_mixed_check_select.inc@1.2, 2007-10-16 23:19:27+04:00, skozlov@mysql.com +4 -4
    Added ORDER BY for SELECT

  mysql-test/suite/rpl/include/rpl_mixed_check_view.inc@1.2, 2007-10-16 23:19:27+04:00, skozlov@mysql.com +2 -2
    Added ORDER BY for VIEW

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@1.8, 2007-10-16 23:19:27+04:00, skozlov@mysql.com +4 -4
    Added ORDER BY for SELECT

  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result@1.8, 2007-10-16 23:19:27+04:00, skozlov@mysql.com +76 -76
    Updated result file

ChangeSet@1.2476.546.1, 2007-10-16 19:32:38+02:00, thek@adventure.(none) +2 -0
  Fixed query_cache_notembedded test program failure because of dependencies between
  test programs.

  mysql-test/r/query_cache.result@1.105, 2007-10-16 19:32:34+02:00, thek@adventure.(none) +4 -0
    Reset query cache parameters to prevent dependency between test programs.

  mysql-test/t/query_cache.test@1.86, 2007-10-16 19:32:34+02:00, thek@adventure.(none) +6 -0
    Reset query cache parameters to prevent dependency between test programs.

ChangeSet@1.1810.3387.6, 2007-10-16 11:16:31-06:00, malff@lambda.hsd1.co.comcast.net. +3 -0
  Implementing code review comments

  mysql-test/r/sp.result@1.170.50.3, 2007-10-16 11:16:23-06:00, malff@lambda.hsd1.co.comcast.net. +15 -0
    Added tests for coverage

  mysql-test/t/sp.test@1.174.50.3, 2007-10-16 11:16:23-06:00, malff@lambda.hsd1.co.comcast.net. +29 -0
    Added tests for coverage

  sql/sql_udf.cc@1.45.1.18, 2007-10-16 11:16:23-06:00, malff@lambda.hsd1.co.comcast.net. +2 -2
    Code cleanup

ChangeSet@1.2476.500.7, 2007-10-16 20:21:40+04:00, kostja@bodhi.(none) +1 -0
  Update the client ABI to reflect member rename 
  (this is a backward-compatible change).

  include/mysql_h.ic@1.13, 2007-10-16 20:21:38+04:00, kostja@bodhi.(none) +1 -1
    Update the ABI to reflect member rename 
    (this is a backward-compatible change).

ChangeSet@1.2476.545.1, 2007-10-16 12:29:22-03:00, davi@moksha.com.br +5 -0
  Bug#31608 missing mysqltest change_user command
  
  The problem is that currently there is no way to test the behavior
  of the mysql_change_user() function using the mysqltest suite because
  there is no internal command for it.
  
  The solution is to introduce a change_user command that can be used
  to test aspects of the MySQL client function mysql_change_user().

  client/mysqltest.c@1.313.2.3, 2007-10-16 12:29:19-03:00, davi@moksha.com.br +60 -1
    Add change_user command to mysqltest.

  mysql-test/r/change_user.result@1.1, 2007-10-16 12:29:20-03:00, davi@moksha.com.br +46 -0
    Add new file with test case results for bugs 20023 and 31418.

  mysql-test/r/change_user.result@1.0, 2007-10-16 12:29:19-03:00, davi@moksha.com.br +0 -0

  mysql-test/r/mysqltest.result@1.71, 2007-10-16 12:29:19-03:00, davi@moksha.com.br +3 -0
    Add test case result for change_user command

  mysql-test/t/change_user.test@1.1, 2007-10-16 12:29:19-03:00, davi@moksha.com.br +35 -0
    Add new file with test cases for bugs 20023 and 31418.

  mysql-test/t/change_user.test@1.0, 2007-10-16 12:29:19-03:00, davi@moksha.com.br +0 -0

  mysql-test/t/mysqltest.test@1.91.1.1, 2007-10-16 12:29:19-03:00, davi@moksha.com.br +18 -0
    Add test case for change_user command

ChangeSet@1.2476.513.13, 2007-10-16 16:22:13+02:00, guilhem@gbichot4.local +2 -0
  WL#3072 Maria recovery, cleanups, removing some out-of-date @todos

  storage/maria/ma_delete_all.c@1.22, 2007-10-16 16:21:43+02:00, guilhem@gbichot4.local +4 -5
    comment (@todo gone, nothing we can do)

  storage/maria/ma_recovery.c@1.43, 2007-10-16 16:22:11+02:00, guilhem@gbichot4.local +38 -23
    - fail if LOGREC_CREATE_TABLE contains some symlink info (that
    will be handled in a future version)
    - don't do buffer overrun when parsing a REDO record
    - out-of-date @todo

ChangeSet@1.2476.544.1, 2007-10-16 14:56:38+02:00, guilhem@gbichot4.local +6 -0
  WL#3072 Maria recovery
  - fixes (in recovery, checkpoint, log handler) of bugs found
  during testing.
  - new option --check for maria_read_log: with --only-display (which only
  reads the header) it reads the full record, for debugging.

  storage/maria/ma_loghandler.c@1.65, 2007-10-16 14:56:07+02:00, guilhem@gbichot4.local +20 -1
    importing patch from Sanja for bug of translog_next_LSN() found
    during recovery

  storage/maria/ma_loghandler_lsn.h@1.16, 2007-10-16 14:56:07+02:00, guilhem@gbichot4.local +2 -2
    better types (0L is 4 bytes on some platforms, it causes problems
    when used into lsn_store(): right shift >= width of type.

  storage/maria/ma_pagecache.c@1.50, 2007-10-16 14:56:07+02:00, guilhem@gbichot4.local +12 -0
    work around infamous "PAGECACHE_PLAIN_PAGE used for transactional
    tables in specialm case"; REDO phase disables logging and this causes
    pages to be PAGECACHE_PLAIN_PAGE, thus ignored wrongly by the
    checkpoint taken at the end of the REDO phase.

  storage/maria/ma_recovery.c@1.42, 2007-10-16 14:56:07+02:00, guilhem@gbichot4.local +42 -13
    - a #ifdef which broke maria_read_log in non-debug builds (no output!)
    - support for maria_read_log --check
    - detect record corruption before opening the table
    - updating is_of_horizon requires writing the state
    - fix for wrong parsing of checkpoint record by recovery

  storage/maria/ma_recovery.h@1.11, 2007-10-16 14:56:07+02:00, guilhem@gbichot4.local +4 -1
    support for maria_read_log --check

  storage/maria/maria_read_log.c@1.24, 2007-10-16 14:56:34+02:00, guilhem@gbichot4.local +9 -2
    Option --check: --only-display only looks at the header;
    adding --check tries a translog_read_record() to see if record can
    be fully read (this is to find bugs).

ChangeSet@1.2476.543.1, 2007-10-16 14:42:42+02:00, thek@adventure.(none) +5 -0
  Bug#30710 query_cache.test fails on embedded - per-column privs test
  
  The embedded version of the server doesn't use column level grants, and 
  the compile directive NO_EMBEDDED_ACCESS_CHECKS should be checked instead of
  the redundant HAVE_QUERY_CACHE (which is always the case) to determine if 
  column level grants should be compiled or not.

  mysql-test/r/query_cache.result@1.104, 2007-10-16 14:42:40+02:00, thek@adventure.(none) +0 -33
    Updated result file

  mysql-test/r/query_cache_notembedded.result@1.10, 2007-10-16 14:42:40+02:00, thek@adventure.(none) +33 -0
    Updated result file

  mysql-test/t/query_cache.test@1.85, 2007-10-16 14:42:41+02:00, thek@adventure.(none) +0 -39
    Moved test with GRANT to query_cache_notembedded test.

  mysql-test/t/query_cache_notembedded.test@1.8.1.1, 2007-10-16 14:42:41+02:00, thek@adventure.(none) +36 -0
    Moved test with GRANT to query_cache_notembedded test.

  sql/sql_cache.cc@1.128, 2007-10-16 14:42:41+02:00, thek@adventure.(none) +1 -1
    Changed the conditional compilation directive to only compile column level grant
    checks if NO_EMBEDDED_ACCESS_CHECKS isn't defined.

ChangeSet@1.2476.542.1, 2007-10-16 17:19:07+05:00, ramil@mysql.com +3 -0
  Fix bug #31604: server crash when setting slow_query_log_file/global general_log_file variable
  
  Problem: we don't evaluate given expression checking values of the
  slow_query_log_file/general_log_file, don't check it for NULL.
  
  Fix: evaluate the expression, check result returned.

  mysql-test/r/log_state.result@1.8, 2007-10-16 17:19:05+05:00, ramil@mysql.com +13 -0
    Fix bug #31604: server crash when setting slow_query_log_file/global general_log_file variable
      - test result.

  mysql-test/t/log_state.test@1.10, 2007-10-16 17:19:05+05:00, ramil@mysql.com +20 -0
    Fix bug #31604: server crash when setting slow_query_log_file/global general_log_file variable
      - test case.

  sql/set_var.cc@1.240.1.13, 2007-10-16 17:19:05+05:00, ramil@mysql.com +17 -6
    Fix bug #31604: server crash when setting slow_query_log_file/global general_log_file variable
      - evaluate var->value calling val_str() method;
      - check for null values returned;
      - return proper errors if any.

ChangeSet@1.2476.499.4, 2007-10-16 13:20:08+02:00, serg@janus.mylan +2 -0
  tests/mysql_client_test.c: typo fixed

  BitKeeper/etc/ignore@1.235.1.66, 2007-10-16 13:20:05+02:00, serg@janus.mylan +6 -0
    Added libmysql_r/client_settings.h libmysql_r/link_sources libmysqld/scheduler.cc libmysqld/sql_connect.cc libmysqld/sql_tablespace.cc sql/link_sources to the ignore list

  tests/mysql_client_test.c@1.252.4.1, 2007-10-16 13:20:04+02:00, serg@janus.mylan +1 -1
    typo fixed

ChangeSet@1.2476.478.10, 2007-10-16 15:22:44+05:00, bar@mysql.com +4 -0
  After merge fix:
  Adjusting SHOW CREATE TABLE output from 5.0 to 5.1 format

  mysql-test/r/ctype_uca.result@1.19.1.2, 2007-10-16 15:22:42+05:00, bar@mysql.com +2 -2
    Adjusting SHOW CREATE TABLE output

  mysql-test/r/ctype_ucs.result@1.59.1.2, 2007-10-16 15:22:42+05:00, bar@mysql.com +2 -2
    Adjusting SHOW CREATE TABLE output

  mysql-test/r/ctype_utf8.result@1.120.1.2, 2007-10-16 15:22:42+05:00, bar@mysql.com +2 -2
    Adjusting SHOW CREATE TABLE output

  mysql-test/r/func_regexp.result@1.12.1.2, 2007-10-16 15:22:42+05:00, bar@mysql.com +2 -2
    Adjusting SHOW CREATE TABLE output

ChangeSet@1.2476.540.1, 2007-10-16 13:43:16+05:00, ramil@mysql.com +2 -0
  Fix for bug #31285: main.status test fails with different Table_locks_waited
  
  Problem: Table_locks_waited value may depend on general logging.
  
  Fix: switch general logging off.

  mysql-test/r/status.result@1.23, 2007-10-16 13:43:13+05:00, ramil@mysql.com +3 -0
    Fix for bug #31285: main.status test fails with different Table_locks_waited
      - switch general logging off.

  mysql-test/t/status.test@1.31, 2007-10-16 13:43:14+05:00, ramil@mysql.com +3 -0
    Fix for bug #31285: main.status test fails with different Table_locks_waited
      - switch general logging off.

ChangeSet@1.1810.3387.5, 2007-10-15 19:15:38-06:00, malff@lambda.hsd1.co.comcast.net. +6 -0
  Bug#28318 (CREATE FUNCTION (UDF) requires a schema) -- part II
  
  The root cause of the issue was that the CREATE FUNCTION grammar,
  for User Defined Functions, was using the sp_name rule.
  The sp_name rule is intended for fully qualified stored procedure names,
  like either ident.ident, or just ident but with a default database
  implicitly selected.
  
  A UDF does not have a fully qualified name, only a name (ident), and should
  not use the sp_name grammar fragment during parsing.
  
  The fix is to re-organize the CREATE FUNCTION grammar, to better separate:
  - creating UDF (no definer, can have AGGREGATE, simple ident)
  - creating Stored Functions (definer, no AGGREGATE, fully qualified name)
  
  With the test case provided, another issue was exposed which is also fixed:
  the DROP FUNCTION statement was using sp_name and also failing when no database
  is implicitly selected, when droping UDF functions.
  The fix is also to change the grammar so that DROP FUNCTION works with
  both the ident.ident syntax (to drop a stored function), or just the ident
  syntax (to drop either a UDF or a Stored Function, in the current database)

  mysql-test/r/sp-error.result@1.102.1.14, 2007-10-15 19:13:24-06:00, malff@lambda.hsd1.co.comcast.net. +2 -2
    Adjust test results

  mysql-test/r/udf.result@1.3.4.2, 2007-10-15 19:13:24-06:00, malff@lambda.hsd1.co.comcast.net. +2 -2
    Adjust test results

  mysql-test/t/sp-error.test@1.100.1.17, 2007-10-15 19:13:25-06:00, malff@lambda.hsd1.co.comcast.net. +5 -2
    Adjust test results

  mysql-test/t/udf.test@1.8.3.2, 2007-10-15 19:13:25-06:00, malff@lambda.hsd1.co.comcast.net. +2 -2
    Adjust test results

  sql/sql_parse.cc@1.426.169.4, 2007-10-15 19:13:25-06:00, malff@lambda.hsd1.co.comcast.net. +0 -6
    CREATE UDF FUNCTION does not use a fully qualified name.

  sql/sql_yacc.yy@1.371.132.3, 2007-10-15 19:13:25-06:00, malff@lambda.hsd1.co.comcast.net. +222 -190
    Fix grammar for CREATE / DROP FUNCTION, FOR udf
    Improve error messages for select no_such_function()

ChangeSet@1.2476.500.5, 2007-10-15 15:53:39-04:00, dkatz@damien-katzs-computer.local +1 -0
  fix problem caused by previous submission for bugs BUG#29589 BUG#29772 

  sql/set_var.cc@1.240.11.2, 2007-10-15 15:53:37-04:00, dkatz@damien-katzs-computer.local +32 -209
    fix problem caused by previous submission

ChangeSet@1.2476.513.11, 2007-10-15 22:02:18+03:00, bell@pwbook.sanja.is.com.ua +2 -0
  fixed typo in the comment.

  storage/maria/ha_maria.cc@1.51.1.2, 2007-10-15 22:02:12+03:00, bell@pwbook.sanja.is.com.ua +3 -3
    fixed typo in the comment.

  storage/maria/ha_maria.h@1.17, 2007-10-15 22:02:12+03:00, bell@pwbook.sanja.is.com.ua +1 -1
    fixed typo in the comment.

ChangeSet@1.1810.3382.2, 2007-10-15 19:59:14+02:00, joerg@trift2. +1 -0
  Allow for different directories containing the "libc",
  as it may well happen with 32- vs 64-bit Linux systems.
  
  This patch was proposed immediately with the report of
  Bug #29658  wrong test for static nss checking on linux, doesn't cover all platforms

  configure.in@1.245.107.2, 2007-10-15 19:59:10+02:00, joerg@trift2. +1 -1
    Allow for different directories containing the "libc",
    as it may well happen with 32- vs 64-bit Linux systems.
    
    This patch was proposed immediately with the report of
    Bug #29658  wrong test for static nss checking on linux, doesn't cover all platforms

ChangeSet@1.2476.514.11, 2007-10-15 19:56:24+03:00, gkodinov@magare.gmz +2 -0
  Bug #27099: system_mysql fail in pushbuild windows
  
  On Windows the debug log was doing freopen () instead of
  fflush() and that was slowing the logging down that much 
  that some tests timed out.
  Fixed by replacing the freopen() with an syncing-to-disk
  flag to fopen() and fflush().
  Also increased the timeout of the tests running with --debug
  on windows : seems to slow down as much as valgrind on linux.

  dbug/dbug.c@1.39, 2007-10-15 19:56:22+03:00, gkodinov@magare.gmz +10 -18
    Bug #27099: remove the freopen() for the 
    windows log : too slow. Replace it with the "c" option
    for fopen().

  mysql-test/mysql-test-run.pl@1.313.8.2, 2007-10-15 19:56:22+03:00, gkodinov@magare.gmz +2 -0
    Bug #27099: on windows debug log seems to slow the tests
    down about as much as valgrind does on linux.

ChangeSet@1.2476.1.103, 2007-10-15 17:04:43+02:00, mleich@four.local.lan +2 -0
  Fix for
  Bug#31169 Test case does not check whether configuration contains feature tested

  mysql-test/suite/rpl/t/rpl_innodb_bug28430.test@1.6, 2007-10-15 17:04:41+02:00, mleich@four.local.lan +1 -0
    Add check for partitioning feature.

  mysql-test/suite/rpl/t/rpl_innodb_bug30919.test@1.3, 2007-10-15 17:04:41+02:00, mleich@four.local.lan +1 -0
    Add check for partitioning feature.

ChangeSet@1.1810.3403.1, 2007-10-15 18:40:58+05:00, gluh@mysql.com +5 -0
  Bug#30986 Character set introducer followed by a HEX string can return bad result(addon)
  issue an error if string has illegal characters

  mysql-test/r/ctype_utf8.result@1.85.11.2, 2007-10-15 18:40:57+05:00, gluh@mysql.com +8 -32
    issue an error if string has illegal characters

  mysql-test/t/ctype_utf8.test@1.84.10.2, 2007-10-15 18:40:57+05:00, gluh@mysql.com +8 -0
    issue an error if string has illegal characters

  sql/item.cc@1.113.100.2, 2007-10-15 18:40:57+05:00, gluh@mysql.com +9 -3
    issue an error if string has illegal characters

  sql/item.h@1.183.41.1, 2007-10-15 18:40:57+05:00, gluh@mysql.com +1 -1
    issue an error if string has illegal characters

  sql/sql_yacc.yy@1.371.135.2, 2007-10-15 18:40:57+05:00, gluh@mysql.com +5 -10
    issue an error if string has illegal characters

ChangeSet@1.2476.504.25, 2007-10-15 16:42:41+04:00, kostja@bodhi.(none) +2 -0
  Add comments, tidy up sql_delete.cc to refer to thd->row_count_func 
  explicitly.

  sql/sql_class.cc@1.347.2.3, 2007-10-15 16:42:39+04:00, kostja@bodhi.(none) +12 -0
    Add comments.

  sql/sql_delete.cc@1.226.2.1, 2007-10-15 16:42:39+04:00, kostja@bodhi.(none) +4 -4
    Change syntax to make grepping easier. No semantical change.

ChangeSet@1.2476.504.24, 2007-10-15 15:49:16+04:00, kostja@bodhi.(none) +1 -0
  Fix broken compilation.

  sql/net_serv.cc@1.113.2.1, 2007-10-15 15:49:05+04:00, kostja@bodhi.(none) +1 -1
    Fix the build I broke by the previous change.

ChangeSet@1.2476.504.23, 2007-10-15 15:45:20+04:00, kostja@bodhi.(none) +2 -0
  Remove an unused variable that was there since the first implementation
  of the stored procedure cursors (materialized on disk).

  include/mysql_com.h@1.123.1.1, 2007-10-15 15:45:15+04:00, kostja@bodhi.(none) +1 -1
    Remove an unused variable.

  sql/protocol.cc@1.129.2.1, 2007-10-15 15:45:16+04:00, kostja@bodhi.(none) +1 -1
    net->no_send_eof was not used anywhere.

ChangeSet@1.2476.538.2, 2007-10-15 09:17:15+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - reenable disabled testcases
    ndb_load
    ndb_dd_sql_features

  mysql-test/suite/ndb/t/disabled.def@1.6, 2007-10-15 09:17:12+02:00, jonas@perch.ndb.mysql.com +0 -3
    reenable disabled testcases

ChangeSet@1.2476.538.1, 2007-10-15 09:10:14+02:00, jonas@perch.ndb.mysql.com +17 -0
  ndb - bug#31482
    (re)impl. simple-read (read that releases lock just before LQHKEYCONF)
    use simple-read for blobs

  storage/ndb/include/kernel/signaldata/TcKeyConf.hpp@1.8, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +1 -1
    rename bit

  storage/ndb/include/ndbapi/NdbOperation.hpp@1.45.1.1, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +2 -1
    add new lock-mode

  storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp@1.5, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +2 -2
    rename bit

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.72, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +0 -1
    remove aggregate

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.167, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +48 -28
    impl. simple-read = normal read + release lock just before LQHKEYCONF

  storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp@1.59, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +4 -8
    impl. simple-read = normal read + release lock just before LQHKEYCONF

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.156, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +107 -92
    impl. simple-read = normal read + release lock just before LQHKEYCONF

  storage/ndb/src/ndbapi/NdbBlob.cpp@1.61, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +1 -1
    use simple read for blobs

  storage/ndb/src/ndbapi/NdbIndexOperation.cpp@1.32, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +3 -0
    no simple-read for ui (yet)

  storage/ndb/src/ndbapi/NdbOperationDefine.cpp@1.33, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +33 -29
    impl. simple-read

  storage/ndb/src/ndbapi/NdbOperationExec.cpp@1.29, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +8 -9
    impl. simple-read

  storage/ndb/src/ndbapi/NdbReceiver.cpp@1.22, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +1 -1
    impl. simple-read

  storage/ndb/src/ndbapi/NdbScanOperation.cpp@1.120, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +1 -0
    no simple-read for scan (yet)

  storage/ndb/src/ndbapi/NdbTransaction.cpp@1.81, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +3 -3
    rename bit

  storage/ndb/test/ndbapi/testBasic.cpp@1.25, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +13 -22
    add testcase for simlpe-read

  storage/ndb/test/run-test/daily-basic-tests.txt@1.107, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +8 -0
    add testcase

  storage/ndb/test/src/HugoOperations.cpp@1.35, 2007-10-15 09:10:11+02:00, jonas@perch.ndb.mysql.com +1 -0
    add simple-read

ChangeSet@1.1810.3392.2, 2007-10-15 10:34:34+04:00, kaa@polly.(none) +3 -0
  Fix for bug #30453: String not cast to int correctly.
  
  Problem:
  
  my_strntoull10rnd_8bit() handled incorrectly cases when the input
  string contains a decimal point and is long enough to overrun the
  'unsigned long long' type. The position of the decimal point was not
  taken into account which resulted in miscalculated numbers and
  truncation to appropriate SQL data type limits.
  
  Solution:
  
  Fix my_strntoull10rnd_8bit() to take the position of a decimal point
  into account in such cases.

  mysql-test/r/insert.result@1.22.1.8, 2007-10-15 10:34:29+04:00, kaa@polly.(none) +14 -0
    Added a test case for bug #30453.

  mysql-test/t/insert.test@1.22.1.5, 2007-10-15 10:34:29+04:00, kaa@polly.(none) +15 -0
    Added a test case for bug #30453.

  strings/ctype-simple.c@1.75.4.1, 2007-10-15 10:34:29+04:00, kaa@polly.(none) +9 -5
    In cases when the 'unsigned long long' type is overrun by the input
    string and a decimal point has occurred, adjust the 'shift' according to
    the position of the decimal point and skip all subsequent digits.

ChangeSet@1.1810.3356.4, 2007-10-15 10:11:52+05:00, holyfoot@mysql.com +1 -0
  bug #29801 Federated engine crashes local server
                 if remote server sends malicious response.
  
  We need to check if the SHOW TABLE STATUS query we issue inside the
  FEDERATED engine returned the result with the proper (or just sufficient)
  number of rows. Otherwise statements like row[12] can crash the server.

  sql/ha_federated.cc@1.24.30.1, 2007-10-15 10:11:50+05:00, holyfoot@mysql.com +6 -1
    bug #29801 Federated engine crashes local server
                   if remote server sends malicious response.
    
    Return with the error if the remote server return fewer rows than we need.

ChangeSet@1.2403.18.93, 2007-10-14 18:42:49+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - testScan -n InsertDelete
  fix testcase

  storage/ndb/test/ndbapi/testScan.cpp@1.25, 2007-10-14 18:42:47+02:00, jonas@perch.ndb.mysql.com +1 -1
    fix testcase

ChangeSet@1.1810.3217.17, 2007-10-14 16:17:39+02:00, pekka@sama.ndb.mysql.com +1 -0
  ndb - bug#29390: fix mem leak introduced in previous cset

  ndb/src/ndbapi/NdbScanFilter.cpp@1.8.9.1, 2007-10-14 16:15:43+02:00, pekka@sama.ndb.mysql.com +32 -0
    fix mem leak on discarded scanfilter

ChangeSet@1.1810.3391.6, 2007-10-14 11:28:43+03:00, gkodinov@magare.gmz +1 -0
  item_sum.cc:
    Fixed dbug macros usage errors

  sql/item_sum.cc@1.170.1.44, 2007-10-14 11:28:11+03:00, gkodinov@magare.gmz +3 -3
    Fixed dbug macros usage errors

ChangeSet@1.2476.515.5, 2007-10-13 23:12:50+03:00, aelkin@koti.dsl.inet.fi +11 -0
  manual merge for bug_29136, bug#29309.

  mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test@1.2, 2007-10-13 23:12:45+03:00, aelkin@koti.dsl.inet.fi +69 -5
    manual merge from 5.0

  mysql-test/r/innodb.result@1.204, 2007-10-13 23:12:45+03:00, aelkin@koti.dsl.inet.fi +15 -2
    results changed

  mysql-test/r/multi_update.result@1.52, 2007-10-13 23:12:45+03:00, aelkin@koti.dsl.inet.fi +21 -2
    results changed

  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result@1.25, 2007-10-13 23:12:45+03:00, aelkin@koti.dsl.inet.fi +53 -6
    manual merge: results re-recorded

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.51, 2007-10-13 23:12:46+03:00, aelkin@koti.dsl.inet.fi +53 -6
    results changed

  mysql-test/suite/manual/r/rpl_replication_delay.result@1.2, 2007-10-13 23:12:46+03:00, aelkin@koti.dsl.inet.fi +23 -8
    results recorded for 5.1

  mysql-test/t/innodb.test@1.173, 2007-10-13 23:12:46+03:00, aelkin@koti.dsl.inet.fi +0 -39
    removing bug27716 regression test as one exists in binlog suite already.

  mysql-test/t/multi_update.test@1.58, 2007-10-13 23:12:46+03:00, aelkin@koti.dsl.inet.fi +6 -2
    manual merge plus refining for execution in both binlog_format.

  sql/log_event.cc@1.277.32.4, 2007-10-13 23:12:46+03:00, aelkin@koti.dsl.inet.fi +26 -2
    bloody manual merge;
    the fact that an event is artificial is encode with setting timestamp argument to zero.
    rli's last_master_timestamp won't be updated in stmt_done in such case.

  sql/rpl_rli.cc@1.14, 2007-10-13 23:12:47+03:00, aelkin@koti.dsl.inet.fi +9 -1
    simulation and the real fixing code.
    Don't update last_master_timestamp with zero.

  sql/sql_delete.cc@1.229, 2007-10-13 23:12:47+03:00, aelkin@koti.dsl.inet.fi +3 -3
    manual merge

ChangeSet@1.2476.513.10, 2007-10-13 20:26:32+02:00, serg@janus.mylan +1 -0
  dbug_add_tags.pl:
    bugfixes

  dbug/dbug_add_tags.pl@1.4, 2007-10-13 20:26:25+02:00, serg@janus.mylan +2 -2
    bugfixes

ChangeSet@1.2476.513.9, 2007-10-13 20:25:53+02:00, serg@janus.mylan +5 -0
  my_getopt: enforce "correctness" (min/max/block_size) of default values

  client/mysqltest.c@1.313.1.3, 2007-10-13 20:25:49+02:00, serg@janus.mylan +4 -4
    fix my_option's with incorrect defaults

  mysql-test/r/maria.result@1.19.1.2, 2007-10-13 20:25:49+02:00, serg@janus.mylan +2 -2
    update results

  mysql-test/t/variables.test@1.73.1.1, 2007-10-13 20:25:49+02:00, serg@janus.mylan +2 -2
    update results

  mysys/my_getopt.c@1.73.2.1, 2007-10-13 20:25:49+02:00, serg@janus.mylan +46 -27
    my_getopt: enforce "correctness" (min/max/block_size) of default values

  sql/mysqld.cc@1.603.1.2, 2007-10-13 20:25:50+02:00, serg@janus.mylan +3 -3
    fix my_option's with incorrect defaults

ChangeSet@1.1810.3352.10, 2007-10-13 15:49:42+03:00, aelkin@koti.dsl.inet.fi +10 -0
  Bug #29136 erred multi-delete on trans table does not rollback the statement
  
  similar to bug_27716, but it was stressed on in the synopsis on that there is another
  side of the artifact affecting behaviour in transaction.
  
  Fixed with deploying multi_delete::send_error() - otherwise never called - and refining its logic
  to perform binlogging job if needed.
  
  The changeset includes the following side effects:
  - added tests to check bug_23333's scenarios on the mixture of tables for multi_update;
  - fixes bug@30763 with two-liner patch and a test coinciding to one added for bug_23333.

  mysql-test/t/mix_innodb_myisam_binlog.test@1.20.15.1, 2007-10-13 15:49:38+03:00, aelkin@koti.dsl.inet.fi +70 -6
    multi-update  and multi-delete of mixure of ta and not-ta tables tests added (relates to bug_23333).

  mysql-test/r/innodb.result@1.145.1.26, 2007-10-13 15:49:36+03:00, aelkin@koti.dsl.inet.fi +15 -2
    results changed

  mysql-test/r/multi_update.result@1.44.1.3, 2007-10-13 15:49:37+03:00, aelkin@koti.dsl.inet.fi +22 -2
    results changed

  mysql-test/r/mix_innodb_myisam_binlog.result@1.24.12.1, 2007-10-13 15:49:37+03:00, aelkin@koti.dsl.inet.fi +48 -4
    results changed

  mysql-test/t/innodb.test@1.118.2.18, 2007-10-13 15:49:37+03:00, aelkin@koti.dsl.inet.fi +32 -0
    trans table specific test added

  mysql-test/t/multi_update.test@1.48.1.3, 2007-10-13 15:49:38+03:00, aelkin@koti.dsl.inet.fi +34 -0
    testing another branch of mult-delete: send_eof() (binloggin there), send_error (early return)

  sql/sql_class.h@1.230.83.2, 2007-10-13 15:49:38+03:00, aelkin@koti.dsl.inet.fi +10 -0
    a new flag to designate the fact the statement's error has been handled.
    The flag is checked by ::send_error() methods (multi_update and _delete classes)

  sql/sql_delete.cc@1.144.22.13, 2007-10-13 15:49:38+03:00, aelkin@koti.dsl.inet.fi +25 -4
    expanding multi_delete::send_error to 
    1. early return if error_handled == t
    2. binlogging locally if there was a non-trans table modified side effect

  sql/sql_parse.cc@1.426.138.46, 2007-10-13 15:49:39+03:00, aelkin@koti.dsl.inet.fi +7 -0
    adding multi_update::send_error which can perform binlogging and rollback job in needed

  sql/sql_update.cc@1.154.38.9, 2007-10-13 15:49:39+03:00, aelkin@koti.dsl.inet.fi +11 -11
    issues relating to
     
    1. bug_27716 with zeroing of `updated' to serve as the flag of early return from send_error().
       The flag is changed to be a new member error_handled; also moved outside binlogging branch.
       The reason for this change is that bug_23333 fixes were pushed after the bug_27716's and they
       left this flaw (also no test coverage).
    2. bug_30763 with assertion on trans_safe. I decide to make 2 liner fix for that bug here instead of to remove
       those two assertions. This new bug test case is the same as for multi-update on the mixure of tables.
       The rational for this fix:
       presumption for mutli_update::trans_safe to be set to zero at
       multi_update::multi_update or multi_update::initialize_tables() is incorrect.
    
       trans_safe := false should happen only when a non-transactional table gets modified. 
       Therefore, at initialization the member must be be set to true.

ChangeSet@1.1810.3302.23, 2007-10-12 13:07:39-07:00, mtaylor@solace.(none) +45 -0
  Removing 7 year old 3.23 crufty debian dir that is not in use, so as not to cause confusion.

  BitKeeper/deleted/.del-README.debian@1.2.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/README.debian

  BitKeeper/deleted/.del-aa@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/aa

  BitKeeper/deleted/.del-ab@1.2.1.1, 2007-10-12 13:04:35-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/ab

  BitKeeper/deleted/.del-ac@1.1.1.1, 2007-10-12 13:04:35-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/ac

  BitKeeper/deleted/.del-ad@1.2.1.1, 2007-10-12 13:04:35-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/ad

  BitKeeper/deleted/.del-ae@1.2.1.1, 2007-10-12 13:04:35-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/ae

  BitKeeper/deleted/.del-az@1.1.1.1, 2007-10-12 13:04:35-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/az

  BitKeeper/deleted/.del-changelog~8457b43736642c@1.2.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/changelog

  BitKeeper/deleted/.del-control@1.2.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/control

  BitKeeper/deleted/.del-copyright~3c3485ee25f7cde0@1.1.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/copyright

  BitKeeper/deleted/.del-gomi@1.3.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/gomi

  BitKeeper/deleted/.del-libmysqlclient10.dirs@1.1.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/libmysqlclient10.dirs

  BitKeeper/deleted/.del-libmysqlclient10.postinst@1.1.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/libmysqlclient10.postinst

  BitKeeper/deleted/.del-libmysqlclient9.dirs@1.1.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/libmysqlclient9.dirs

  BitKeeper/deleted/.del-libmysqlclient9.postinst@1.1.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/libmysqlclient9.postinst

  BitKeeper/deleted/.del-move@1.2.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/move

  BitKeeper/deleted/.del-my.cnf~c8cce985cf5872e3@1.1.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/my.cnf

  BitKeeper/deleted/.del-mysql-bench.dirs@1.1.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-bench.dirs

  BitKeeper/deleted/.del-mysql-client.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-client.dirs

  BitKeeper/deleted/.del-mysql-dev.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-dev.dirs

  BitKeeper/deleted/.del-mysql-doc.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-doc.dirs

  BitKeeper/deleted/.del-mysql-max-debug.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max-debug.dirs

  BitKeeper/deleted/.del-mysql-max-debug.postinst@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max-debug.postinst

  BitKeeper/deleted/.del-mysql-max-debug.postrm@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max-debug.postrm

  BitKeeper/deleted/.del-mysql-max-shared.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max-shared.dirs

  BitKeeper/deleted/.del-mysql-max-shared.postinst@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max-shared.postinst

  BitKeeper/deleted/.del-mysql-max-shared.postrm@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max-shared.postrm

  BitKeeper/deleted/.del-mysql-max.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max.dirs

  BitKeeper/deleted/.del-mysql-max.postinst@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max.postinst

  BitKeeper/deleted/.del-mysql-max.postrm@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max.postrm

  BitKeeper/deleted/.del-mysql-server-debug.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server-debug.dirs

  BitKeeper/deleted/.del-mysql-server-debug.postinst@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server-debug.postinst

  BitKeeper/deleted/.del-mysql-server-debug.postrm@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server-debug.postrm

  BitKeeper/deleted/.del-mysql-server-shared.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server-shared.dirs

  BitKeeper/deleted/.del-mysql-server-shared.postinst@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server-shared.postinst

  BitKeeper/deleted/.del-mysql-server-shared.postrm@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server-shared.postrm

  BitKeeper/deleted/.del-mysql-server.conffiles@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server.conffiles

  BitKeeper/deleted/.del-mysql-server.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server.dirs

  BitKeeper/deleted/.del-mysql-server.postinst@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server.postinst

  BitKeeper/deleted/.del-mysql-server.postrm@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server.postrm

  BitKeeper/deleted/.del-mysql-server.prerm@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server.prerm

  BitKeeper/deleted/.del-rules~2018e0de32c6d936@1.2.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/rules

  BitKeeper/deleted/.del-shlibs@1.2.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/shlibs

  BitKeeper/deleted/.del-ta@1.1.1.1, 2007-10-12 13:04:35-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/ta

  BitKeeper/deleted/.del-tb@1.1.1.1, 2007-10-12 13:04:35-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/tb

ChangeSet@1.2476.513.8, 2007-10-12 18:46:55+02:00, serg@janus.mylan +1 -0
  different fix for strict-aliasing problem

  mysys/lf_alloc-pin.c@1.14, 2007-10-12 18:46:51+02:00, serg@janus.mylan +8 -5
    different fix for strict-aliasing problem

ChangeSet@1.2476.515.3, 2007-10-12 18:22:31+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
  BUG#29549 (Endians: rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb and rpl_ndb_mix_innodb failed on):
  Post-merge fixes. Setting write bit before calling Field::store() since the function asserts that
  the write bit has been set.

  sql/field.cc@1.419, 2007-10-12 18:22:26+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Setting bit in write set to prevent assertion from throwing when calling Field::store().

ChangeSet@1.2476.513.7, 2007-10-12 16:17:18+02:00, serg@janus.mylan +1 -0
  bugs/warnings fixed in lf_alloc-pin.c:
  1. available_stack_size() was getting the direction wrong,
     so alloca() was never used
  2. (char*) casts added to kill "break strict-aliasing rules" warnings
  3. s/node/node=0/ to kill "pointer casted to integer" warning
  4. added volatiles as appropriate to prevent gcc from moving
     assignment out of the loop

  mysys/lf_alloc-pin.c@1.13, 2007-10-12 16:17:14+02:00, serg@janus.mylan +9 -7
    bugs/warnings fixed:
    1. available_stack_size() was getting the direction wrong,
       so alloca() was never used
    2. (char*) casts added to kill "break strict-aliasing rules" warnings
    3. s/node/node=0/ to kill "pointer casted to integer" warning
    4. added volatiles as appropriate to prevent gcc from moving
       assignment out of the loop

ChangeSet@1.1810.3401.1, 2007-10-12 10:55:46-03:00, davi@moksha.com.br +1 -0
  Bug#31409 RENAME TABLE causes server crash or deadlock when used with HANDLER statements
  
  If mysql_lock_tables fails because the lock was aborted, we need to
  reset thd->some_tables_delete, otherwise we might loop indefinitely
  because handler's tables are not closed in a standard way, meaning
  that close_thread_tables() (which resets some_tables_deleted) is not
  used.
  
  This patch fixes sporadical failures of handler_myisam/innodb tests
  which were introduced by previous fix for this bug.

  sql/sql_handler.cc@1.72.1.22, 2007-10-12 10:55:44-03:00, davi@moksha.com.br +6 -0
    Properly reset thd->some_tables_deleted if mysql_lock_tables
    fails for some reason.

ChangeSet@1.1810.3399.1, 2007-10-12 14:03:51+04:00, kaa@polly.(none) +2 -0
  Fix for bug #31254: "Max_data_length" truncated / reported wrong
  (compiler issue ?)
  
  Problem:
  
  Improper compile-time flags on AIX prevented use of files > 2 GB. This
  resulted in Max_data_length being truncated to 2 GB by MyISAM code.
  
  Solution:
  
  Reverted large-file changes from the fix for bug10776. We need to define
  _LARGE_FILES on AIX to have support for files > 2 GB.
  
   Since _LARGE_FILE_API is incompatible with _LARGE_FILES and may be
  automatically defined by including standards.h, we also need a
  workaround to avoid this conflict.

  config/ac-macros/large_file.m4@1.4, 2007-10-12 14:03:41+04:00, kaa@polly.(none) +9 -2
    Reverted large-file changes from the fix for bug10776. We need to define
    _LARGE_FILES on AIX to have support for files > 2 GB.

  include/my_global.h@1.96.14.5, 2007-10-12 14:03:42+04:00, kaa@polly.(none) +5 -0
    _LARGE_FILE_API is defined in standards.h that is automatically included
    by at least some C++ compilers on AIX. Since it is also incompatible
    with _LARGE_FILES which is required for POSIX IO calls to be
    largefile-safe, the only workaround is to explicitely #undef
    _LARGE_FILE_API.

ChangeSet@1.1810.3398.1, 2007-10-12 11:46:48+02:00, tnurnberg@sin.intern.azundris.com +3 -0
  Bug#30951: makedate returns different results depending on version of mysql
  
  makedate() will fold years below 100 into the 1970-2069 range. CS removes code
  that also wrongly folded years between 100 and 200 into that range, which should
  be left unchanged. Backport from 5.1.

  mysql-test/r/func_sapdb.result@1.15.8.1, 2007-10-12 11:46:46+02:00, tnurnberg@sin.intern.azundris.com +3 -0
    Show that makedate() works correctly for 100 <= year < 200.

  mysql-test/t/func_sapdb.test@1.13.3.2, 2007-10-12 11:46:46+02:00, tnurnberg@sin.intern.azundris.com +1 -0
    Show that makedate() works correctly for 100 <= year < 200.

  sql-common/my_time.c@1.19.17.3, 2007-10-12 11:46:46+02:00, tnurnberg@sin.intern.azundris.com +0 -5
    Remove unnecessary date magic. Syncs behaviour with 5.1+
    and manual.

ChangeSet@1.1810.3396.1, 2007-10-12 11:23:45+02:00, tnurnberg@sin.intern.azundris.com +1 -0
  Bug#30821: setting --tc_heuristic_recover tries to set myisam_stats_method
  
  Options to mysqld were not processed correctly because switch statement
  was missing some "break"s. CS adds them.
  
  No test case; would require .opt file and server restart. Manually tested.

  sql/mysqld.cc@1.439.135.2, 2007-10-12 11:23:43+02:00, tnurnberg@sin.intern.azundris.com +2 -0
    Add missing "break"s to switch() in mysqld to fix option processing.

ChangeSet@1.1810.3302.22, 2007-10-12 02:15:32-07:00, mtaylor@solace.(none) +96 -0
  Removed debian dir. It was a mistake to embed it in the tree in the first place. 

  BitKeeper/deleted/.del-Makefile.am~2cb643bedd5f474@1.5, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/Makefile.am

  BitKeeper/deleted/.del-POTFILES.in.in@1.4, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/POTFILES.in.in

  BitKeeper/deleted/.del-README.Maintainer@1.2, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/README.Maintainer

  BitKeeper/deleted/.del-ca.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/ca.po

  BitKeeper/deleted/.del-changelog@1.3.1.1, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/changelog

  BitKeeper/deleted/.del-compat@1.2, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/compat

  BitKeeper/deleted/.del-control.in@1.6, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/control.in

  BitKeeper/deleted/.del-copyright@1.2, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/copyright

  BitKeeper/deleted/.del-copyright.more@1.2, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/copyright.more

  BitKeeper/deleted/.del-cs.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/cs.po

  BitKeeper/deleted/.del-da.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/da.po

  BitKeeper/deleted/.del-de.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/de.po

  BitKeeper/deleted/.del-defs.mk.in@1.6, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/defs.mk.in

  BitKeeper/deleted/.del-es.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/es.po

  BitKeeper/deleted/.del-eu.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/eu.po

  BitKeeper/deleted/.del-fr.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/fr.po

  BitKeeper/deleted/.del-gl.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/gl.po

  BitKeeper/deleted/.del-it.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/it.po

  BitKeeper/deleted/.del-ja.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/ja.po

  BitKeeper/deleted/.del-libmysqlclientSLIB-dev.README.Maintainer.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIB-dev.README.Maintainer.in

  BitKeeper/deleted/.del-libmysqlclientSLIB-dev.dirs.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIB-dev.dirs.in

  BitKeeper/deleted/.del-libmysqlclientSLIB-dev.docs.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIB-dev.docs.in

  BitKeeper/deleted/.del-libmysqlclientSLIB-dev.examples.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIB-dev.examples.in

  BitKeeper/deleted/.del-libmysqlclientSLIB-dev.files.in@1.2.1.1, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIB-dev.files.in

  BitKeeper/deleted/.del-libmysqlclientSLIB-dev.links.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIB-dev.links.in

  BitKeeper/deleted/.del-libmysqlclientSLIBoff.README.Debian.in@1.4, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIBoff.README.Debian.in

  BitKeeper/deleted/.del-libmysqlclientSLIBoff.dirs.in@1.4, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIBoff.dirs.in

  BitKeeper/deleted/.del-libmysqlclientSLIBoff.docs.in@1.4, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIBoff.docs.in

  BitKeeper/deleted/.del-libmysqlclientSLIBoff.files.in@1.4, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIBoff.files.in

  BitKeeper/deleted/.del-libmysqlclientSLIBoff.postinst.in@1.4, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIBoff.postinst.in

  BitKeeper/deleted/.del-libndbclientNLIB-dev.dirs.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libndbclientNLIB-dev.dirs.in

  BitKeeper/deleted/.del-libndbclientNLIB-dev.files.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libndbclientNLIB-dev.files.in

  BitKeeper/deleted/.del-libndbclientNLIB-dev.links.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libndbclientNLIB-dev.links.in

  BitKeeper/deleted/.del-libndbclientNLIB.README.Debian.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libndbclientNLIB.README.Debian.in

  BitKeeper/deleted/.del-libndbclientNLIB.dirs.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libndbclientNLIB.dirs.in

  BitKeeper/deleted/.del-libndbclientNLIB.files.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libndbclientNLIB.files.in

  BitKeeper/deleted/.del-libndbclientNLIB.postinst.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libndbclientNLIB.postinst.in

  BitKeeper/deleted/.del-my.cnf@1.2, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/additions/my.cnf

  BitKeeper/deleted/.del-mysql-client-BASE.NEWS.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-client-BASE.NEWS.in

  BitKeeper/deleted/.del-mysql-client-BASE.README.Debian.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-client-BASE.README.Debian.in

  BitKeeper/deleted/.del-mysql-client-BASE.dirs.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-client-BASE.dirs.in

  BitKeeper/deleted/.del-mysql-client-BASE.docs.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-client-BASE.docs.in

  BitKeeper/deleted/.del-mysql-client-BASE.files.in@1.4.1.1, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-client-BASE.files.in

  BitKeeper/deleted/.del-mysql-client-BASE.lintian-overrides.in@1.5, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-client-BASE.lintian-overrides.in

  BitKeeper/deleted/.del-mysql-common.README.Debian.in@1.2, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-common.README.Debian.in

  BitKeeper/deleted/.del-mysql-common.dirs.in@1.2, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-common.dirs.in

  BitKeeper/deleted/.del-mysql-common.files.in@1.2, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-common.files.in

  BitKeeper/deleted/.del-mysql-common.postrm.in@1.2, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-common.postrm.in

  BitKeeper/deleted/.del-mysql-common.preinst.in@1.2, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-common.preinst.in

  BitKeeper/deleted/.del-mysql-extra-BASE.dirs.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-extra-BASE.dirs.in

  BitKeeper/deleted/.del-mysql-extra-BASE.files.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-extra-BASE.files.in

  BitKeeper/deleted/.del-mysql-management-BASE.dirs.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-management-BASE.dirs.in

  BitKeeper/deleted/.del-mysql-management-BASE.files.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-management-BASE.files.in

  BitKeeper/deleted/.del-mysql-management-BASE.mysql-management.init.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-management-BASE.mysql-management.init.in

  BitKeeper/deleted/.del-mysql-server-BASE.NEWS.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.NEWS.in

  BitKeeper/deleted/.del-mysql-server-BASE.README.Debian.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.README.Debian.in

  BitKeeper/deleted/.del-mysql-server-BASE.config.in@1.5, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.config.in

  BitKeeper/deleted/.del-mysql-server-BASE.dirs.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.dirs.in

  BitKeeper/deleted/.del-mysql-server-BASE.docs.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.docs.in

  BitKeeper/deleted/.del-mysql-server-BASE.files.in@1.4.1.1, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.files.in

  BitKeeper/deleted/.del-mysql-server-BASE.links.in@1.3, 2007-10-12 02:14:02-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.links.in

  BitKeeper/deleted/.del-mysql-server-BASE.lintian-overrides.in@1.5, 2007-10-12 02:14:02-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.lintian-overrides.in

  BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.paranoid.in@1.3, 2007-10-12 02:14:02-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.logcheck.ignore.paranoid.in

  BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.server.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.logcheck.ignore.server.in

  BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.workstation.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.logcheck.ignore.workstation.in

  BitKeeper/deleted/.del-mysql-server-BASE.mysql-server.logrotate.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.mysql-server.logrotate.in

  BitKeeper/deleted/.del-mysql-server-BASE.postinst.in@1.5, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.postinst.in

  BitKeeper/deleted/.del-mysql-server-BASE.postrm.in@1.5, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.postrm.in

  BitKeeper/deleted/.del-mysql-server-BASE.preinst.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.preinst.in

  BitKeeper/deleted/.del-mysql-server-BASE.prerm.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.prerm.in

  BitKeeper/deleted/.del-mysql-server-BASE.templates.in@1.5, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.templates.in

  BitKeeper/deleted/.del-mysql-server-PREV.preinst.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-PREV.preinst.in

  BitKeeper/deleted/.del-mysql-server.lintian-overrides@1.2, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/additions/mysql-server.lintian-overrides

  BitKeeper/deleted/.del-mysql-server.preinst.in@1.2, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server.preinst.in

  BitKeeper/deleted/.del-mysql-storage-BASE.dirs.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-storage-BASE.dirs.in

  BitKeeper/deleted/.del-mysql-storage-BASE.files.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-storage-BASE.files.in

  BitKeeper/deleted/.del-mysql-storage-BASE.mysql-storage.init.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-storage-BASE.mysql-storage.init.in

  BitKeeper/deleted/.del-mysql-test-BASE.dirs.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-test-BASE.dirs.in

  BitKeeper/deleted/.del-mysql-test-BASE.files.in@1.2.1.1, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-test-BASE.files.in

  BitKeeper/deleted/.del-mysql-tools-BASE.dirs.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-tools-BASE.dirs.in

  BitKeeper/deleted/.del-mysql-tools-BASE.files.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-tools-BASE.files.in

  BitKeeper/deleted/.del-nb.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/nb.po

  BitKeeper/deleted/.del-ndb_mgmd.cnf@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/additions/ndb_mgmd.cnf

  BitKeeper/deleted/.del-nl.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/nl.po

  BitKeeper/deleted/.del-pt.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/pt.po

  BitKeeper/deleted/.del-pt_BR.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/pt_BR.po

  BitKeeper/deleted/.del-ro.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/ro.po

  BitKeeper/deleted/.del-ru.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/ru.po

  BitKeeper/deleted/.del-rules@1.5.1.1, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/rules

  BitKeeper/deleted/.del-source.lintian-overrides.in@1.4, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/source.lintian-overrides.in

  BitKeeper/deleted/.del-sv.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/sv.po

  BitKeeper/deleted/.del-templates.pot@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/templates.pot

  BitKeeper/deleted/.del-tr.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/tr.po

  BitKeeper/deleted/.del-watch@1.2, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/watch

  Makefile.am@1.68.1.40, 2007-10-12 02:15:29-07:00, mtaylor@solace.(none) +1 -2
    Removed debian dir. It was a mistake to embed it in the tree in the first place. 

  configure.in@1.245.77.43, 2007-10-12 02:15:29-07:00, mtaylor@solace.(none) +0 -1
    Removed debian dir. It was a mistake to embed it in the tree in the first place. 

ChangeSet@1.2476.525.1, 2007-10-12 10:22:49+02:00, serg@janus.mylan +11 -0
  make maria more pluggable

  BitKeeper/etc/ignore@1.262, 2007-10-12 10:22:45+02:00, serg@janus.mylan +3 -0
    Added sql/link_sources ylwrap libmysql_r/link_sources to the ignore list

  mysql-test/r/maria.result@1.19.1.1, 2007-10-12 10:22:44+02:00, serg@janus.mylan +20 -0
    test for maria variables

  mysql-test/t/maria.test@1.19.1.1, 2007-10-12 10:22:44+02:00, serg@janus.mylan +4 -0
    test for maria variables

  sql/handler.cc@1.323, 2007-10-12 10:22:44+02:00, serg@janus.mylan +0 -95
    make maria more pluggable

  sql/handler.h@1.255.1.1, 2007-10-12 10:22:44+02:00, serg@janus.mylan +0 -18
    make maria more pluggable

  sql/mysql_priv.h@1.527.1.1, 2007-10-12 10:22:44+02:00, serg@janus.mylan +3 -3
    make maria more pluggable

  sql/mysqld.cc@1.603.1.1, 2007-10-12 10:22:44+02:00, serg@janus.mylan +0 -76
    make maria more pluggable

  sql/set_var.cc@1.245, 2007-10-12 10:22:45+02:00, serg@janus.mylan +0 -167
    make maria more pluggable

  sql/set_var.h@1.94, 2007-10-12 10:22:45+02:00, serg@janus.mylan +0 -39
    make maria more pluggable

  sql/sql_delete.cc@1.226.1.2, 2007-10-12 10:22:45+02:00, serg@janus.mylan +1 -1
    fix incorrect check

  storage/maria/ha_maria.cc@1.51.1.1, 2007-10-12 10:22:45+02:00, serg@janus.mylan +46 -5
    maria status and pagecache variables

ChangeSet@1.2476.479.16, 2007-10-12 01:16:55-07:00, mtaylor@solace.(none) +1 -0
  Fixed a typo. We have NdbTransactions not NdbTransations. 

  storage/ndb/include/ndbapi/NdbOperation.hpp@1.48, 2007-10-12 01:16:54-07:00, mtaylor@solace.(none) +1 -1
    Fixed a typo. We have NdbTransactions not NdbTransations. 

ChangeSet@1.2476.513.5, 2007-10-12 10:10:54+03:00, bell@desktop.sanja.is.com.ua +1 -0
  int->my_bool transformation fixed (thanks Guilhem)
  Mutex owner checks added.

  storage/maria/ma_loghandler.c@1.64, 2007-10-12 10:10:52+03:00, bell@desktop.sanja.is.com.ua +9 -4
    int->my_bool transformation fixed (thanks Guilhem)
    Mutex owner checks added.

ChangeSet@1.2476.479.15, 2007-10-12 00:10:07-07:00, mtaylor@solace.(none) +3 -0
  Added SKIP_INTERNAL wrappers to mark new methods as not part of the public API.

  storage/ndb/include/ndbapi/NdbOperation.hpp@1.47, 2007-10-12 00:10:05-07:00, mtaylor@solace.(none) +1 -2
    Added SKIP_INTERNAL wrappers to mark new methods as not part of the public API.

  storage/ndb/include/ndbapi/NdbScanFilter.hpp@1.12, 2007-10-12 00:10:05-07:00, mtaylor@solace.(none) +2 -1
    Added SKIP_INTERNAL wrappers to mark new methods as not part of the public API.

  storage/ndb/include/ndbapi/NdbTransaction.hpp@1.59, 2007-10-12 00:10:05-07:00, mtaylor@solace.(none) +3 -1
    Added SKIP_INTERNAL wrappers to mark new methods as not part of the public API.

ChangeSet@1.2476.524.1, 2007-10-11 23:46:25-07:00, mtaylor@solace.(none) +6 -0
  Fixed header to reflect the implementation. 
  Added accessor method to help out the NDB/Connectors.

  storage/ndb/include/ndbapi/NdbOperation.hpp@1.46, 2007-10-11 23:46:21-07:00, mtaylor@solace.(none) +3 -0
    Added accessor method to help out the NDB/Connectors.

  storage/ndb/include/ndbapi/NdbPool.hpp@1.4, 2007-10-11 23:46:21-07:00, mtaylor@solace.(none) +2 -1
    Fixed header to reflect the implementation. 

  storage/ndb/include/ndbapi/NdbScanFilter.hpp@1.11, 2007-10-11 23:46:22-07:00, mtaylor@solace.(none) +1 -0
    Added accessor method to help out the NDB/Connectors.

  storage/ndb/include/ndbapi/NdbTransaction.hpp@1.58, 2007-10-11 23:46:22-07:00, mtaylor@solace.(none) +7 -0
    Added accessor method to help out the NDB/Connectors.

  storage/ndb/src/ndbapi/NdbOperation.cpp@1.24, 2007-10-11 23:46:22-07:00, mtaylor@solace.(none) +6 -0
    Added accessor method to help out the NDB/Connectors.

  storage/ndb/src/ndbapi/NdbScanFilter.cpp@1.17, 2007-10-11 23:46:22-07:00, mtaylor@solace.(none) +4 -0
    Added accessor method to help out the NDB/Connectors.

ChangeSet@1.2476.513.4, 2007-10-12 08:11:28+03:00, bell@desktop.sanja.is.com.ua +1 -0
  translog_next_LSN() changed to support pointer to the page end
    which can happen when you save address of horizon

  storage/maria/ma_loghandler.c@1.63, 2007-10-12 08:11:25+03:00, bell@desktop.sanja.is.com.ua +19 -2
    translog_next_LSN() changed to support pointer to the page end
      which can happen when you save address of horizon

ChangeSet@1.2476.523.1, 2007-10-11 17:55:18-06:00, malff@weblab.(none) +3 -0
  Bug#27858 (Failing to log to a log table doesn't log anything to error log)
  
  Before this patch, failures to write to the log tables (mysql.slow_log
  and mysql.general_log) were improperly printed (the time was printed twice),
  or not printed at all.
  
  With this patch, failures to write to the log tables is reported in the
  error log, for all cases of failures.

  mysql-test/r/log_tables.result@1.21.1.1, 2007-10-11 17:55:16-06:00, malff@weblab.(none) +4 -0
    Bug#27858 (Failing to log to a log table doesn't log anything to error log)

  mysql-test/t/log_tables.test@1.20, 2007-10-11 17:55:16-06:00, malff@weblab.(none) +56 -0
    Bug#27858 (Failing to log to a log table doesn't log anything to error log)

  sql/log.cc@1.297.3.1, 2007-10-11 17:55:16-06:00, malff@weblab.(none) +21 -22
    Bug#27858 (Failing to log to a log table doesn't log anything to error log)

ChangeSet@1.2476.504.20, 2007-10-11 17:38:40-03:00, davi@moksha.com.br +4 -0
  Bug#29223 declare cursor c for SHOW .....
  
  "DECLARE CURSOR FOR SHOW ..." is a syntax that currently appears to work,
  but is untested for some SHOW commands and does not work for other SHOW
  commands.
  
  Since this is an un-intended feature that leaked as a result of a coding bug
  (in the parser grammar), the correct fix is to fix the grammar to not accept
  this construct.
  
  In other words, "DECLARE CURSOR FOR SHOW <other commands that don't work>"
  is not considered a bug, and we will not implement other features to make all
  the SHOW commands usable inside a cursor just because someone exploited a bug.

  mysql-test/r/sp-error.result@1.130, 2007-10-11 17:38:36-03:00, davi@moksha.com.br +20 -1
    Only allow declaring cursors for SELECT statements to avoid
    possible further confusion/problems.

  mysql-test/t/information_schema.test@1.98.3.1, 2007-10-11 17:38:36-03:00, davi@moksha.com.br +1 -1
    Only SELECT statements are allowed in cursors.

  mysql-test/t/sp-error.test@1.126, 2007-10-11 17:38:36-03:00, davi@moksha.com.br +22 -1
    Add test case for Bug#29223. Non-SELECT statements in cursors now
    yields a parser error.

  sql/sql_yacc.yy@1.601.1.5, 2007-10-11 17:38:36-03:00, davi@moksha.com.br +3 -15
    Rework DECLARE CURSOR statement to not allow non-SELECT statements.

ChangeSet@1.2476.512.3, 2007-10-11 14:37:45-04:00, cmiller@zippy.cornsilk.net +11 -0
  Doxygenized comments.

  sql/net_serv.cc@1.113.1.2, 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.240.13.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.1.102, 2007-10-11 19:39:18+02:00, mleich@four.local.lan +7 -0
  Fix for
  Bug#31411 funcs_1: ndb_<every test> fail because of changed server error number
  = Adjust the files with expected results 

  mysql-test/suite/funcs_1/r/ndb_cursors.result@1.4, 2007-10-11 19:39:15+02:00, mleich@four.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_0102.result@1.5, 2007-10-11 19:39:16+02:00, mleich@four.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_03.result@1.4, 2007-10-11 19:39:16+02:00, mleich@four.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_0407.result@1.4, 2007-10-11 19:39:16+02:00, mleich@four.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_08.result@1.5, 2007-10-11 19:39:16+02:00, mleich@four.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_09.result@1.4, 2007-10-11 19:39:16+02:00, mleich@four.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result@1.4, 2007-10-11 19:39:16+02:00, mleich@four.local.lan +1 -1
    Updated result

ChangeSet@1.2476.512.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.126.1.9, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +155 -151
    Doxygenization of comments.

  sql/gen_lex_hash.cc@1.76.1.2, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +11 -6
    Doxygenization of comments.

  sql/ha_ndbcluster.cc@1.461.1.9, 2007-10-11 13:29:05-04:00, cmiller@zippy.cornsilk.net +246 -223
    Doxygenization of comments.

  sql/handler.cc@1.315.16.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.409.1.11, 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.2.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.12.1, 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.583.114.1, 2007-10-11 13:29:06-04:00, cmiller@zippy.cornsilk.net +113 -133
    Doxygenization of comments.

ChangeSet@1.2476.522.1, 2007-10-11 18:18:05+02:00, mats@kindahl-laptop.dnsalias.net +20 -0
  BUG#29549 (Endians: test failures on Solaris):
  
  Refactoring code to add parameter to pack() and unpack() functions with
  purpose of indicating if data should be packed in little-endian or
  native order. Using new functions to always pack data for binary log
  in little-endian order. The purpose of this refactoring is to allow
  proper implementation of endian-agnostic pack() and unpack() functions.
  
  Eliminating several versions of virtual pack() and unpack() functions
  in favor for one single virtual function which is overridden in
  subclasses.
  
  Implementing pack() and unpack() functions for some field types that
  packed data in native format regardless of the value of the
  st_table_share::db_low_byte_first flag.
  
  The field types that were packed in native format regardless are:
  Field_real, Field_decimal, Field_tiny, Field_short, Field_medium,
  Field_long, Field_longlong, and Field_blob.
  
  Before the patch, row-based logging wrote the rows incorrectly on
  big-endian machines where the storage engine defined its own
  low_byte_first() to be FALSE on big-endian machines (the default
  is TRUE), while little-endian machines wrote the fields in correct
  order. The only known storage engine that does this is NDB. In effect,
  this means that row-based replication from or to a big-endian
  machine where the table was using NDB as storage engine failed if the
  other engine was either non-NDB or on a little-endian machine.
  
  With this patch, row-based logging is now always done in little-endian
  order, while ORDER BY uses the native order if the storage engine
  defines low_byte_first() to return FALSE for big-endian machines.
  
  In addition, the max_data_length() function available in Field_blob
  was generalized to the entire Field hierarchy to give the maximum
  number of bytes that Field::pack() will write.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result@1.1, 2007-10-11 18:18:00+02:00, mats@kindahl-laptop.dnsalias.net +855 -0
    New BitKeeper file ``mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result''

  mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result@1.0, 2007-10-11 18:18:00+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result@1.1, 2007-10-11 18:18:00+02:00, mats@kindahl-laptop.dnsalias.net +855 -0
    New BitKeeper file ``mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result''

  mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result@1.0, 2007-10-11 18:18:00+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result@1.2.1.1, 2007-10-11 18:17:56+02:00, mats@kindahl-laptop.dnsalias.net +3 -3
    Result change.

  mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@1.2.1.1, 2007-10-11 18:17:55+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Sorting by columns that produces deterministic order.

  mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@1.2.1.1, 2007-10-11 18:17:56+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result change.

  mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@1.2.1.1, 2007-10-11 18:17:56+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result change.

  mysql-test/suite/rpl/t/disabled.def@1.8.2.1, 2007-10-11 18:17:56+02:00, mats@kindahl-laptop.dnsalias.net +0 -1
    Enabling tests.

  mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test@1.8, 2007-10-11 18:17:56+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Adding missing sync_slave_with_master causing slave to keep tables
    after shutdown.

  mysql-test/suite/rpl_ndb/t/disabled.def@1.6.2.1, 2007-10-11 18:17:57+02:00, mats@kindahl-laptop.dnsalias.net +0 -2
    Enabling tests.

  mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt@1.6.1.1, 2007-10-11 18:17:57+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Adding --new option

  mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test@1.4.1.1, 2007-10-11 18:17:57+02:00, mats@kindahl-laptop.dnsalias.net +6 -4
    Adding have_log_bin.

  mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt@1.6.1.1, 2007-10-11 18:17:58+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Adding --new option

  mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test@1.4.1.1, 2007-10-11 18:17:58+02:00, mats@kindahl-laptop.dnsalias.net +5 -2
    Adding have_log_bin

  mysql-test/t/partition.test@1.62.2.1, 2007-10-11 18:17:58+02:00, mats@kindahl-laptop.dnsalias.net +2 -1
    Adding have_archive, since that is used in the test.

  sql/field.cc@1.408.6.1, 2007-10-11 18:17:58+02:00, mats@kindahl-laptop.dnsalias.net +263 -144
    Eliminating all two-argument pack() and unpack() functions and moving
    functionality into the four-argument version. The four argument version
    is introduced so that it is possible to avoid using the storage engine
    default when writing and reading the packed format (the unpacked format
    still uses the storage engine's default). This is used by row-based
    replication to write the fields in a storage engine- and endian-agnostic
    format.
    
    Packing integral and floating-point numbers in little-endian format
    (if requested).
    
    Using pad_char for the field instead of spaces (0x20) when unpacking.
    
    Adding some Doxygen documentation.
    ---
    Adding max_data_length() to denote the maximum number of bytes that
    pack() will write.
    
    Adding casts to remove warnings for debug printouts.

  sql/field.h@1.243.3.1, 2007-10-11 18:17:59+02:00, mats@kindahl-laptop.dnsalias.net +231 -40
    Eliminating all virtual pack() and unpack() functions except the four-
    argument version, which now is the function that shall be overridden.
    The two-argument versions are convenience functions, to prevent changes
    to code that uses these.
    
    Adding code to pack integer numbers and floating-point numbers in
    little-endian format, if requested.
    ---
    Adding max_data_length() to denote the maximum number of bytes that
    pack() will write.

  sql/log.cc@1.293.3.1, 2007-10-11 18:17:59+02:00, mats@kindahl-laptop.dnsalias.net +0 -3
    Removing debug printout causing crash when starting NDB on Solaris.

  sql/log_event.cc@1.277.33.1, 2007-10-11 18:17:59+02:00, mats@kindahl-laptop.dnsalias.net +4 -0
    Adding missing #ifndef causing compile failure. Adding debug printouts.

  sql/rpl_record.cc@1.7.3.2, 2007-10-11 18:18:00+02:00, mats@kindahl-laptop.dnsalias.net +22 -32
    Debriding code. Using new pack() and unpack() functions to always pack
    fields little-endian. Adding debug printouts.
    ---
    Using max_data_length() when packing field into row.
    
    Adding casts to debug printouts.

  sql/sql_show.cc@1.432.1.1, 2007-10-11 18:18:00+02:00, mats@kindahl-laptop.dnsalias.net +4 -2
    Adding code that causes crash on Solaris machines since printf() cannot
    handle NULL values for strings properly.

ChangeSet@1.2476.521.1, 2007-10-11 18:45:42+03:00, bell@desktop.sanja.is.com.ua +4 -0
  Compiler warnings removed.
  Added ability top change empty space filler of the loghandler.
  Fixed end of log reaction.
  Fixed memory corruprion bug caused by reading non-filled hage header.
  Added debug output.

  storage/maria/ma_bitmap.c@1.21.1.1, 2007-10-11 18:45:39+03:00, bell@desktop.sanja.is.com.ua +4 -0
    Compiler warnings removed.

  storage/maria/ma_blockrec.c@1.50.1.1, 2007-10-11 18:45:39+03:00, bell@desktop.sanja.is.com.ua +1 -0
    Compiler warnings removed.

  storage/maria/ma_loghandler.c@1.62, 2007-10-11 18:45:39+03:00, bell@desktop.sanja.is.com.ua +133 -61
    Added ability top change empty space filler of the loghandler.
    Fixed end of log reaction.
    Fixed memory corruprion bug caused by reading non-filled hage header.
    Added debug output.

  storage/maria/ma_loghandler_lsn.h@1.15, 2007-10-11 18:45:39+03:00, bell@desktop.sanja.is.com.ua +1 -1
    Compiler warnings removed.

ChangeSet@1.2476.501.7, 2007-10-11 15:28:10+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    decrease test time

  storage/ndb/test/run-test/daily-basic-tests.txt@1.105, 2007-10-11 15:28:07+02:00, jonas@perch.ndb.mysql.com +1 -1
    decrease test time

ChangeSet@1.2476.504.19, 2007-10-11 17:11:12+04:00, anozdrin@station. +2 -0
  A patch for BUG#31418: User locks misfunctioning after
  mysql_change_user().
  
  The problem was that THD::ull was not reset in THD::cleanup().
  
  The fix is to reset it.

  sql/sql_class.cc@1.347.2.2, 2007-10-11 17:11:10+04:00, anozdrin@station. +1 -0
    Reset THD::ull after cleanup to prevent memory corruption.

  tests/mysql_client_test.c@1.252.1.4, 2007-10-11 17:11:10+04:00, anozdrin@station. +134 -32
    Add test case for BUG#31418.

ChangeSet@1.2403.18.92, 2007-10-11 14:54:05+02:00, jonas@perch.ndb.mysql.com +4 -0
  ndb - bug#31525
    Fix bug regarding node that missed 2 LCP's (that was not included in next LCP after SR)

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.32.1.8, 2007-10-11 14:54:02+02:00, jonas@perch.ndb.mysql.com +4 -1
    add new error codes for bug#31525

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.100.3.10, 2007-10-11 14:54:03+02:00, jonas@perch.ndb.mysql.com +4 -0
    add new error codes for bug#31525
    fix bug, i.e include missing_2 in LCP

  storage/ndb/test/ndbapi/testNodeRestart.cpp@1.38.1.13, 2007-10-11 14:54:03+02:00, jonas@perch.ndb.mysql.com +77 -0
    add testcase for bug#31525

  storage/ndb/test/run-test/daily-basic-tests.txt@1.63.2.11, 2007-10-11 14:54:03+02:00, jonas@perch.ndb.mysql.com +4 -0
    add testcase for bug#31525

ChangeSet@1.1810.3376.5, 2007-10-11 17:20:34+05:00, ramil@mysql.com +3 -0
  Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
  
  Problem: GROUP_CONCAT(DISTINCT BIT_FIELD...) uses a tree to store keys;
  which are constructed using a temporary table fields,
  see Item_func_group_concat::setup().
  As a) we don't store null bits in the tree where the bit fields store parts 
  of their data and b) there's no method to properly compare two table records
  we've got problem.
  
  Fix: convert BIT fields to INT in the temporary table used.

  mysql-test/r/func_gconcat.result@1.52.1.20, 2007-10-11 17:20:32+05:00, ramil@mysql.com +42 -0
    Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
      - test result.

  mysql-test/t/func_gconcat.test@1.44.1.15, 2007-10-11 17:20:32+05:00, ramil@mysql.com +28 -0
    Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
      - test case.

  sql/item_sum.cc@1.170.28.1, 2007-10-11 17:20:32+05:00, ramil@mysql.com +25 -6
    Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
      - force the create_tmp_table() to convert BIT columns to INT 
        in order to be able to compare records containing BIT fields.

ChangeSet@1.2476.514.4, 2007-10-11 16:41:05+05:00, gluh@mysql.com +1 -0
  after merge fix

  sql/sql_yacc.yy@1.601.4.2, 2007-10-11 16:41:03+05:00, gluh@mysql.com +1 -1
    after merge fix

ChangeSet@1.1810.3395.1, 2007-10-11 16:07:10+05:00, gluh@mysql.com +9 -0
  Bug#30981 CHAR(0x41 USING ucs2) doesn't add leading zero
  Bug#30982 CHAR(..USING..) can return a not-well-formed string
  Bug#30986 Character set introducer followed by a HEX string can return bad result
  check_well_formed_result moved to Item from Item_str_func
  fixed Item_func_char::val_str for proper ucs symbols converting
  added check for well formed strings for correct conversion of constants with underscore
  charset

  mysql-test/r/ctype_ucs.result@1.39.3.1, 2007-10-11 16:07:08+05:00, gluh@mysql.com +3 -0
    test result

  mysql-test/r/ctype_utf8.result@1.85.11.1, 2007-10-11 16:07:08+05:00, gluh@mysql.com +64 -2
    test result

  mysql-test/t/ctype_ucs.test@1.36.4.1, 2007-10-11 16:07:08+05:00, gluh@mysql.com +5 -0
    test case

  mysql-test/t/ctype_utf8.test@1.84.10.1, 2007-10-11 16:07:08+05:00, gluh@mysql.com +19 -0
    test case

  sql/item.cc@1.113.100.1, 2007-10-11 16:07:09+05:00, gluh@mysql.com +35 -0
    check_well_formed_result() moved from Item_str_func

  sql/item.h@1.183.1.58, 2007-10-11 16:07:09+05:00, gluh@mysql.com +1 -0
    check_well_formed_result() moved from Item_str_func

  sql/item_strfunc.cc@1.261.1.45, 2007-10-11 16:07:09+05:00, gluh@mysql.com +3 -32
    check_well_formed_result moved to Item
    fixed Item_func_char::val_str for proper ucs symbols converting

  sql/item_strfunc.h@1.101.1.23, 2007-10-11 16:07:09+05:00, gluh@mysql.com +0 -1
    check_well_formed_result moved to Item

  sql/sql_yacc.yy@1.371.135.1, 2007-10-11 16:07:09+05:00, gluh@mysql.com +18 -4
    added check for well formed string

ChangeSet@1.1616.3107.1, 2007-10-11 14:28:12+04:00, kaa@polly.(none) +3 -0
  Fix for bug #31174: "Repair" command on MyISAM crashes with small
  myisam_sort_buffer_size.
  
  An incorrect length of the sort buffer was used when calculating the
  maximum number of keys. When myisam_sort_buffer_size is small enough,
  this could result in the number of keys < number of
  BUFFPEK structures which in turn led to use of uninitialized BUFFPEKs.
  
  Fixed by correcting the buffer length calculation.

  mysql-test/r/repair.result@1.14.1.8, 2007-10-11 14:28:09+04:00, kaa@polly.(none) +27 -0
    Added a test case for bug #31174.

  mysql-test/t/repair.test@1.12.1.6, 2007-10-11 14:28:09+04:00, kaa@polly.(none) +30 -1
    Added a test case for bug #31174.

  myisam/sort.c@1.35.1.17, 2007-10-11 14:28:08+04:00, kaa@polly.(none) +4 -2
    Use a correct buffer length when calculating the maximum number of keys.
    Assert that for each BUFFPEK structure there is at least one
    corresponding key. Otherwise we would fail earlier and not reach
    merge_buffers().

ChangeSet@1.2476.513.2, 2007-10-11 10:57:27+02:00, guilhem@gbichot4.local +1 -0
  WL#3072 Maria recovery. Bugfix (segfault of maria_read_log)

  storage/maria/ma_recovery.c@1.41, 2007-10-11 10:57:25+02:00, guilhem@gbichot4.local +2 -5
    bugfix ("count" is meaningul only if printing messages)

ChangeSet@1.1810.3394.1, 2007-10-11 11:29:26+03:00, gkodinov@magare.gmz +3 -0
  Bug #31440: 'select 1 regex null' asserts debug server
  
  The special case with NULL as a regular expression
  was handled at prepare time. But in this special case
  the item was not marked as fixed. This caused an assertion
  at execution time.
  Fixed my marking the item as fixed even when known to 
  return NULL at prepare time.

  mysql-test/r/func_regexp.result@1.10.2.1, 2007-10-11 11:29:24+03:00, gkodinov@magare.gmz +5 -0
    Bug #31440: test case

  mysql-test/t/func_regexp.test@1.9.1.1, 2007-10-11 11:29:24+03:00, gkodinov@magare.gmz +10 -1
    Bug #31440: test case

  sql/item_cmpfunc.cc@1.187.49.1, 2007-10-11 11:29:24+03:00, gkodinov@magare.gmz +1 -0
    Bug #31440: mark the item as fixed even when 
    known to return NULL.

ChangeSet@1.2476.504.18, 2007-10-10 21:39:22-03:00, davi@moksha.com.br +3 -0
  Post-merge test case for Bug 31409

  mysql-test/include/handler.inc@1.39, 2007-10-10 21:39:19-03:00, davi@moksha.com.br +33 -0
    Add test case for Bug 31409

  mysql-test/r/handler_innodb.result@1.21, 2007-10-10 21:39:19-03:00, davi@moksha.com.br +18 -0
    Add test case result for InnoDB run of the handler test for Bug 31409

  mysql-test/r/handler_myisam.result@1.34, 2007-10-10 21:39:20-03:00, davi@moksha.com.br +18 -0
    Add test case result for MyISAM run of the handler test for Bug 31409

ChangeSet@1.2476.504.16, 2007-10-10 21:07:23-03:00, davi@moksha.com.br +1 -0
  Mismerge broken 5.1-runtime compilation because do_command was defined
  static but it's still used by another compilation unit.
  
  Remove static qualifier from do_command definition.

  sql/sql_parse.cc@1.683.19.7, 2007-10-10 21:07:20-03:00, davi@moksha.com.br +1 -1
    do_command is also used by sql_connect.c in 5.1

ChangeSet@1.2476.504.10, 2007-10-10 19:06:53-03:00, davi@moksha.com.br +3 -0
  Post-merge test case for Bug 21587

  mysql-test/include/handler.inc@1.38, 2007-10-10 19:06:47-03:00, davi@moksha.com.br +35 -0
    Add test case for Bug 21587

  mysql-test/r/handler_innodb.result@1.20, 2007-10-10 19:06:47-03:00, davi@moksha.com.br +22 -0
    Add test case result for InnoDB run of the handler test for Bug 21587

  mysql-test/r/handler_myisam.result@1.33, 2007-10-10 19:06:47-03:00, davi@moksha.com.br +22 -0
    Add test case result for MyISAM run of the handler test for Bug 21587

ChangeSet@1.2476.519.1, 2007-10-10 22:03:10+02:00, mleich@four.local.lan +19 -0
  Combined fix for
     Bug#31481 test suite parts: Many tests fail because of changed server error codes
     Bug#31243 Test "partition_basic_myisam" truncates path names
  + minor cleanup

  mysql-test/suite/parts/inc/partition.pre@1.4, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +9 -9
    - Blow column file_list up to VARBINARY(10000)
       = Fix for Bug#31243 Test "partition_basic_myisam" truncates path names
    - Minor cleanup
      = remove reference to fixed bugs #17455, #19305

  mysql-test/suite/parts/inc/partition_alter_1.inc@1.6, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +11 -9
    Adjust expected server error codes

  mysql-test/suite/parts/inc/partition_check.inc@1.6, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +12 -8
    Adjust expected server error codes

  mysql-test/suite/parts/inc/partition_syntax.inc@1.6, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +19 -19
    Minor cleanup
    = replace error numbers with error names

  mysql-test/suite/parts/inc/partition_syntax_1.inc@1.6, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +15 -13
    Adjust expected server error codes

  mysql-test/suite/parts/r/partition_alter1_innodb.result@1.3, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_alter1_myisam.result@1.3, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_alter2_innodb.result@1.3, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_alter2_myisam.result@1.3, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_alter3_innodb.result@1.4, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_alter3_myisam.result@1.4, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_alter4_innodb.result@1.3, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_alter4_myisam.result@1.3, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_basic_innodb.result@1.4, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_basic_myisam.result@1.4, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_engine_innodb.result@1.3, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_engine_myisam.result@1.3, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_syntax_innodb.result@1.4, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_syntax_myisam.result@1.4, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

ChangeSet@1.1810.3393.1, 2007-10-10 14:00:57-06:00, tsmith@ramayana.hindu.god +1 -0
  Bug #31517: Potential crash due to access of NULL thd in mark_transaction_to_rollback()
  
  Introduced in mark_transaction_to_rollback(), part of fix for bug 24989;
  fix is to check thd for NULL before using it.

  sql/sql_class.cc@1.223.20.22, 2007-10-10 14:00:56-06:00, tsmith@ramayana.hindu.god +5 -2
    It is possible that mark_transaction_to_rollback() may be
    called in rare circumstances when thd is NULL (e.g., from
    some calls to convert_error_code_to_mysql()).  Don't use thd
    if it is NULL.

ChangeSet@1.2476.515.1, 2007-10-10 18:10:54+02:00, sven@murkla.(none) +2 -0
  BUG#29046: rpl_stm_mystery22 unstable
  
  Problem: rpl_stm_mystery22 is unstable.
  
  Reason: At one place, the test case *should* wait until the SQL thread on the
  slave receives an error, but instead it waits until the SQL thread stops. The
  SQL thread may stop before the error flag is set, so that when the test case
  continues to execute, the error flag is not set.
  
  Fix: Introduce the subroutine mysql-test/include/wait_for_slave_sql_error.inc,
  which waits until there is an error in the sql thread of the slave.
  
  Re-commit: fixed one logical error and two smaller things noted by Mats.

  mysql-test/include/wait_for_slave_sql_error.inc@1.1, 2007-10-10 18:10:51+02:00, sven@murkla.(none) +33 -0
    New BitKeeper file ``mysql-test/include/wait_for_slave_sql_error.inc''
    This is a subroutine that waits until the sql thread on the slave receives an
    error, as indicated by Last_SQL_Errno in "SHOW SLAVE STATUS".

  mysql-test/include/wait_for_slave_sql_error.inc@1.0, 2007-10-10 18:10:51+02:00, sven@murkla.(none) +0 -0

  mysql-test/suite/rpl/t/rpl_stm_mystery22.test@1.12, 2007-10-10 18:10:51+02:00, sven@murkla.(none) +1 -1
    Use the new wait_for_slave_sql_error.inc instead of wait_for_slave_to_stop.
    There may be a delay from when the slave stops to when Last_SQL_Errno is set,
    so it is not safe to merely wait until the slave stops.

ChangeSet@1.2476.479.12, 2007-10-10 17:22:21+02:00, jmiller@mysql.com +2 -0
  rpl_ndb_extraColMaster.test, rpl_ndb_extraColMaster.result:
    Back porting NDB test case

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result@1.1, 2007-10-10 17:22:06+02:00, jmiller@mysql.com +2286 -0
    Back porting NDB test case

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result@1.0, 2007-10-10 17:22:06+02:00, jmiller@mysql.com +0 -0

  mysql-test/suite/rpl_ndb/t/rpl_ndb_extraColMaster.test@1.1, 2007-10-10 17:21:54+02:00, jmiller@mysql.com +14 -0
    Back porting NDB test case

  mysql-test/suite/rpl_ndb/t/rpl_ndb_extraColMaster.test@1.0, 2007-10-10 17:21:54+02:00, jmiller@mysql.com +0 -0

ChangeSet@1.1810.3391.1, 2007-10-10 20:14:29+05:00, gshchepa@gleb.loc +4 -0
  Fixed bug #31471: decimal_bin_size: Assertion `scale >= 0 &&
                    precision > 0 && scale <= precision'.
  
  A sign of a resulting item of the IFNULL function was not
  updated and the maximal length of this result was calculated
  improperly. Correct algorithm was copy&pasted from the IF
  function implementation.

  mysql-test/r/create.result@1.107.1.29, 2007-10-10 19:50:45+05:00, gshchepa@gleb.loc +1 -1
    Update test case after the bugfix of bug #31471.

  mysql-test/r/null.result@1.33.1.4, 2007-10-10 19:50:35+05:00, gshchepa@gleb.loc +24 -1
    Added test case for bug #31471.

  mysql-test/t/null.test@1.22, 2007-10-10 19:50:26+05:00, gshchepa@gleb.loc +25 -2
    Added test case for bug #31471.

  sql/item_cmpfunc.cc@1.187.47.8, 2007-10-10 19:49:55+05:00, gshchepa@gleb.loc +14 -4
    Fixed bug #31471.
    The Item_func_ifnull::fix_length_and_dec method has been
    modified to update the Item_func_ifnull::unsigned_flag field
    and to take this field into account when calculating the
    Item_func_ifnull::max_length value.
    (See Item_func_if::fix_length_and_dec for reference).

ChangeSet@1.2476.479.11, 2007-10-10 16:43:20+02:00, jmiller@mysql.com +8 -0
  .del-rpl_stm_extraColmaster_ndb.test~5ac81fa1ec366ba:
    Delete: mysql-test/suite/rpl/t/rpl_stm_extraColmaster_ndb.test
  .del-rpl_row_extraColmaster_ndb.result~a2c64bae75b49d2:
    Delete: mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result
  .del-rpl_row_extraColmaster_ndb.test~523b0954869c4423:
    Delete: mysql-test/suite/rpl/t/rpl_row_extraColmaster_ndb.test
  Many files:
    merged and cleanup of test cases

  BitKeeper/deleted/.del-rpl_row_extraColmaster_ndb.result~a2c64bae75b49d2@1.3, 2007-10-10 14:44:14+02:00, jmiller@mysql.com +0 -0
    Delete: mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result

  BitKeeper/deleted/.del-rpl_row_extraColmaster_ndb.test~523b0954869c4423@1.2, 2007-10-10 14:42:04+02:00, jmiller@mysql.com +0 -0
    Delete: mysql-test/suite/rpl/t/rpl_row_extraColmaster_ndb.test

  BitKeeper/deleted/.del-rpl_stm_extraColmaster_ndb.test~5ac81fa1ec366ba@1.2, 2007-10-10 14:42:14+02:00, jmiller@mysql.com +0 -0
    Delete: mysql-test/suite/rpl/t/rpl_stm_extraColmaster_ndb.test

  mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@1.3, 2007-10-10 16:43:08+02:00, jmiller@mysql.com +692 -150
    merged and cleanup of test cases

  mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@1.3, 2007-10-10 16:42:40+02:00, jmiller@mysql.com +2092 -762
    merged and cleanup of test cases

  mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@1.3, 2007-10-10 16:42:40+02:00, jmiller@mysql.com +2092 -762
    merged and cleanup of test cases

  mysql-test/suite/rpl/t/rpl_extraColmaster_innodb.test@1.2, 2007-10-10 16:42:52+02:00, jmiller@mysql.com +2 -1
    merged and cleanup of test cases

  mysql-test/suite/rpl/t/rpl_extraColmaster_myisam.test@1.2, 2007-10-10 16:42:52+02:00, jmiller@mysql.com +2 -0
    merged and cleanup of test cases

ChangeSet@1.2476.504.8, 2007-10-10 17:57:01+04:00, anozdrin@station. +4 -0
  Fix for BUG#20023: mysql_change_user() resets the value
  of SQL_BIG_SELECTS.
  
  The bug was that SQL_BIG_SELECTS was not properly set
  in COM_CHANGE_USER.
  
  The fix is to update SQL_BIG_SELECTS properly.

  sql/mysql_priv.h@1.523.1.19, 2007-10-10 17:56:58+04:00, anozdrin@station. +0 -1
    Cleanup: make prepare_new_connection_state() private for module.

  sql/sql_class.cc@1.347.2.1, 2007-10-10 17:56:58+04:00, anozdrin@station. +6 -0
    Update THD::options with the respect to SQL_BIG_SELECTS
    in COM_CHANGE_USER.

  sql/sql_connect.cc@1.11, 2007-10-10 17:56:58+04:00, anozdrin@station. +2 -2
    Cleanup: make prepare_new_connection_state() private for module.

  tests/mysql_client_test.c@1.252.1.3, 2007-10-10 17:56:59+04:00, anozdrin@station. +171 -0
    Add a test case BUG#20023.

ChangeSet@1.2476.1.100, 2007-10-10 15:37:33+02:00, mleich@four.local.lan +5 -0
  Fix for
    Bug#31407 funcs_1: <engine>__datadict tests broken because of wrong expected results

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.12, 2007-10-10 15:37:30+02:00, mleich@four.local.lan +86 -254
    Updated expected results

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.12, 2007-10-10 15:37:31+02:00, mleich@four.local.lan +86 -254
    Updated expected results

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.12, 2007-10-10 15:37:31+02:00, mleich@four.local.lan +86 -254
    Updated expected results

  mysql-test/suite/funcs_1/r/ndb__datadict.result@1.6, 2007-10-10 15:37:31+02:00, mleich@four.local.lan +151 -403
    Updated expected results
    Attention:
       The update does not prevent that the test has to be disabled.
       Reason: Bug#31421 funcs_1: ndb__datadict fails, discrepancy between scripts and expected results

  mysql-test/suite/funcs_1/t/disabled.def@1.5, 2007-10-10 15:37:31+02:00, mleich@four.local.lan +1 -0
    Disable ndb__datadict because of
    Bug#31421 funcs_1: ndb__datadict fails, discrepancy between scripts and expected results
    which will be fixed later.

ChangeSet@1.1810.3389.2, 2007-10-10 16:26:02+03:00, gkodinov@magare.gmz +14 -0
  Bug #30825: Problems when putting a non-spatial index on a GIS column
   Fixed the usage of spatial data (and Point in specific) with 
   non-spatial indexes.
   Several problems :
     - The length of the Point class was not updated to include the 
       spatial reference system identifier. Fixed by increasing with 4 
       bytes.
     - The storage length of the spatial columns was not accounting for
       the length that is prepended to it. Fixed by treating the 
       spatial data columns as blobs (and thus increasing the storage
       length)
     - When creating the key image for comparison in index read wrong
       key image was created (the one needed for and r-tree search,
       not the one for b-tree/other search). Fixed by treating the
       spatial data columns as blobs (and creating the correct kind of
       image based on the index type). 

  mysql-test/r/bdb_gis.result@1.2.7.1, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +39 -0
    Bug #30825: bdb tests

  mysql-test/t/bdb_gis.test@1.2.1.1, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +1 -0
    Bug #30825: bdb tests

  mysql-test/include/gis_keys.inc@1.1, 2007-10-10 16:26:01+03:00, gkodinov@magare.gmz +46 -0
    Bug #30825: Test file for spatial data and non-spatial indexes

  mysql-test/include/gis_keys.inc@1.0, 2007-10-10 16:26:01+03:00, gkodinov@magare.gmz +0 -0

  mysql-test/r/gis-rtree.result@1.14.1.15, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +2 -2
    Bug #30825: key length changed

  mysql-test/r/gis.result@1.35.1.13, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +39 -0
    Bug #30825: MyISAM tests

  mysql-test/r/innodb_gis.result@1.2.2.7, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +39 -0
    Bug #30825: InnoDB tests

  mysql-test/t/gis.test@1.29.1.11, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +2 -0
    Bug #30825: MyISAM tests

  mysql-test/t/innodb_gis.test@1.2.1.1, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +1 -0
    Bug #30825: InnoDB tests

  sql/field.cc@1.256.1.106, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +0 -30
    Bug #30825: Removed Field_geom::get_key_image as Field_blog::get_key_image 
      takes type parameter into consideration and is a superset of 
      Field_geom::get_key_image()

  sql/field.h@1.153.27.10, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +0 -1
    Bug #30825: Removed Field_geom::get_key_image as Field_blog::get_key_image 
      takes type parameter into consideration and is a superset of 
      Field_geom::get_key_image()

  sql/sql_select.h@1.92.1.31, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +6 -2
    Bug #30825: Geometry data are a blob derivate

  sql/sql_table.cc@1.239.70.1, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +1 -1
    Bug #30825: Increased key length to accomodate for
      spatial reference system identifier (srid)

  sql/sql_yacc.yy@1.371.134.1, 2007-10-10 16:26:01+03:00, gkodinov@magare.gmz +1 -1
    Bug #30825: Increased key length to accomodate for
      spatial reference system identifier (srid)

  sql/table.cc@1.160.1.99, 2007-10-10 16:26:01+03:00, gkodinov@magare.gmz +4 -2
    Bug #30825: It stores a length for spatial data
     as well, so increase the storage length (as it's
     done for blobs).

ChangeSet@1.1810.3323.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.479.10, 2007-10-10 14:18:34+02:00, jmiller@mysql.com +2 -0
  rpl_bug31076.test, rpl_bug31076.result:
    Correcting test bug

  mysql-test/suite/rpl/r/rpl_bug31076.result@1.1.2.1, 2007-10-10 14:18:14+02:00, jmiller@mysql.com +1 -0
    Correcting test bug

  mysql-test/suite/rpl/t/rpl_bug31076.test@1.1.2.1, 2007-10-10 14:18:24+02:00, jmiller@mysql.com +3 -0
    Correcting test bug

ChangeSet@1.1810.3387.3, 2007-10-10 14:42:29+04:00, anozdrin@station. +2 -0
  Cleanup sp.test.

  mysql-test/r/sp.result@1.170.50.2, 2007-10-10 14:42:27+04:00, anozdrin@station. +3 -3
    Update result file.

  mysql-test/t/sp.test@1.174.50.2, 2007-10-10 14:42:27+04:00, anozdrin@station. +3 -7
    Cleanup sp.test.

ChangeSet@1.2476.504.7, 2007-10-10 13:53:24+04:00, anozdrin@station. +1 -0
  Fix automerge.

  mysql-test/r/sp.result@1.299, 2007-10-10 13:53:21+04:00, anozdrin@station. +176 -0
    Fix automerge.

ChangeSet@1.2476.513.1, 2007-10-10 11:30:36+02:00, guilhem@gbichot4.local +1 -0
  WL#3072 Maria recovery. Improving the progress message (small fixes
  plus printing a downcount of tables to flush).

  storage/maria/ma_recovery.c@1.40, 2007-10-10 11:30:34+02:00, guilhem@gbichot4.local +68 -25
    improving the progress message of recovery; it used to assume that
    if there is a non-zero UNDO phase then there was a non-REDO phase,
    and if there are tables to flush there was an UNDO phase,
    which is not always true. We now print a downcount of tables to flush
    (4 3 2 1 0).

ChangeSet@1.2476.384.49, 2007-10-10 14:22:21+05:00, gluh@mysql.com +2 -0
  after merge fix

  mysql-test/r/view.result@1.235.1.9, 2007-10-10 14:22:19+05:00, gluh@mysql.com +6 -6
    after merge fix

  sql/sql_repl.cc@1.174.1.1, 2007-10-10 14:22:19+05:00, gluh@mysql.com +3 -0
    after merge fix

ChangeSet@1.1810.3324.34, 2007-10-10 12:21:11+05:00, gluh@mysql.com +3 -0
  Bug#28893 --relay-log variable is not exposed with SHOW VARIABLES
  added variables relay_log, relay_log_index, relay_log_info_file to init_vars[]
  to make them visible within SHOW VARIABLES

  mysql-test/r/rpl_flush_log_loop.result@1.24.1.1, 2007-10-10 12:21:10+05:00, gluh@mysql.com +7 -0
    test result

  mysql-test/t/rpl_flush_log_loop.test@1.14.1.1, 2007-10-10 12:21:10+05:00, gluh@mysql.com +3 -0
    test case

  sql/set_var.cc@1.125.38.1, 2007-10-10 12:21:10+05:00, gluh@mysql.com +3 -0
    added variables relay_log, relay_log_index, relay_log_info_file to init_vars[]
    to make them visible within SHOW VARIABLES

ChangeSet@1.1810.3324.33, 2007-10-10 12:16:13+05:00, gluh@mysql.com +2 -0
  Bug#25359 Test 'view' is dependent on current year to be 2006
  removed now() call to make the test to be year independent

  mysql-test/r/view.result@1.138.1.71, 2007-10-10 12:16:12+05:00, gluh@mysql.com +8 -7
    result fix

  mysql-test/t/view.test@1.126.1.64, 2007-10-10 12:16:12+05:00, gluh@mysql.com +7 -6
    removed now() call to make the test to be year independent

ChangeSet@1.2476.471.13, 2007-10-09 18:45:29-06:00, tsmith@ramayana.hindu.god +1 -0
  Fix compiler warning (use correct data type)

  client/mysqltest.c@1.318, 2007-10-09 18:45:27-06:00, tsmith@ramayana.hindu.god +2 -1
    Use correct data type for dummy variable passed to dirname_part()

ChangeSet@1.2476.504.5, 2007-10-09 18:12:13-06:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  Fixed packet length for embedded tests

  libmysqld/lib_sql.cc@1.140, 2007-10-09 18:12:09-06:00, malff@lambda.hsd1.co.comcast.net. +1 -1
    Fixed packet length for embedded

ChangeSet@1.1810.3388.1, 2007-10-09 20:46:33-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +8 -0
  Bug#28318 CREATE FUNCTION (UDF) requires a schema
  Bug#29816 Syntactically wrong query fails with misleading error message
  
  The core problem is that an SQL-invoked function name can be a <schema
  qualified routine name> that contains no <schema name>, but the mysql
  parser insists that all stored procedures (function, procedures and
  triggers) must have a <schema name>, which is not true for functions.
  This problem is especially visible when trying to create a function
  or when a query contains a syntax error after a function call (in the
  same query), both will fail with a "No database selected" message if
  the session is not attached to a particular schema, but the first
  one should succeed and the second fail with a "syntax error" message.
  
  Part of the fix is to revamp the sp name handling so that a schema
  name may be omitted for functions -- this means that the internal
  function name representation may not have a dot, which represents
  that the function doesn't have a schema name. The other part is
  to place schema checks after the type (function, trigger or procedure)
  of the routine is known.

  mysql-test/r/sp-error.result@1.102.1.13, 2007-10-09 20:45:04-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +13 -0
    Add test case result for Bug#29816

  mysql-test/r/udf.result@1.3.4.1, 2007-10-09 20:45:05-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +7 -0
    Add test case result for Bug#28318

  mysql-test/t/sp-error.test@1.100.1.16, 2007-10-09 20:45:05-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +20 -0
    Add test case for Bug#29816

  mysql-test/t/udf.test@1.8.3.1, 2007-10-09 20:45:29-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +14 -0
    Add test case for Bug#28318

  sql/sp.cc@1.82.1.54, 2007-10-09 20:45:30-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +3 -10
    Copy the (last) nul byte of the stored routine key and move name parsing
    code to the sp_name class constructor.

  sql/sp_head.cc@1.200.29.1, 2007-10-09 20:45:39-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +28 -3
    Revamp routine name parsing for when no schema is specified and
    omit dot from the qualified name if the routine is not associated
    with a scheme name.

  sql/sp_head.h@1.79.1.21, 2007-10-09 20:45:48-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +1 -10
    Name parsing got bigger, uninline by moving to a single unit -- the sp_head.cc
    file.

  sql/sql_yacc.yy@1.371.133.1, 2007-10-09 20:45:56-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +26 -5
    Only copy the schema name if one is actually set and check for schema
    name presence only where it's necessary.

ChangeSet@1.2476.512.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.2476.511.1, 2007-10-09 21:09:50+03:00, monty@mysql.com +64 -0
  Moved randomize and my_rnd under mysys
  Added my_uuid
  Added pre-support for PAGE_CHECKSUM
  Added syntax for CREATE ... PAGE_CHECKSUM=# TABLE_CHECKSUM=#
  Reserved place for page checksums on index, bitmap and block pages
  Added index number to header of index pages
  Added linked list for free directory entries (speeds up inserts with BLOCK format)
  Calculate checksums in original column order (fixes bug with checksum on rows with BLOCK format)
  Cleaned up all index handling to use 'info->s->keypage_header' (variable size) as the header for index pages (before this was '2')
  Added 0xffffffff to end of index and block data bases and 0xfffffffe at end of bitmap pages when page checksums are not enabled
  Added _ma_get_page_used() and _ma_get_used_and_node() to simplify index page header handling
  rec_per_key_part is now in double precision
  Reserved place in index file for my_guid and nulls_per_key_part
  Give error HA_ERR_NEW_FILE if trying to open a Maria file with new, not yet supported extensions
  
  Lots of renames to increase readability:
  
  randomize() -> my_rnd_init()
  st_maria_info -> st_maria_handler
  st_maria_info -> MARIA_HA
  st_maria_isaminfo -> st_maria_info
  rand_struct -> my_rand_struct
  rec_per_key_rows -> records_at_analyze

  client/mysqladmin.cc@1.121.2.1, 2007-10-09 21:08:44+03:00, monty@mysql.com +2 -2
    rand_struct -> my_rrnd_struct

  include/maria.h@1.15.1.1, 2007-10-09 21:08:44+03:00, monty@mysql.com +38 -37
    st_maria_info -> MARIA_HA
    st_maria_isaminfo -> st_maria_info
    Changed analyze statistics to be of double precission
    Changed offset to field to be 32bits instead of 64 (safe as a record without blobs can't be that big)

  include/my_base.h@1.99.1.1, 2007-10-09 21:08:44+03:00, monty@mysql.com +29 -19
    Added HA_OPTION_PAGE_CHECKSUM & HA_CREATE_PAGE_CHECKSUM
    Fixed comments
    Added HA_ERR_NEW_FILE

  include/my_sys.h@1.218.1.1, 2007-10-09 21:08:44+03:00, monty@mysql.com +12 -0
    Added prototypes and structures for my_uuid() and my_rnd()

  include/myisamchk.h@1.5, 2007-10-09 21:08:44+03:00, monty@mysql.com +3 -2
    Changed some buffers to size_t
    Added possibility to have key statistics with double precission
    

  include/mysql_com.h@1.122.1.1, 2007-10-09 21:08:44+03:00, monty@mysql.com +3 -9
    Move rand functions to mysys

  libmysql/Makefile.shared@1.72.1.1, 2007-10-09 21:08:44+03:00, monty@mysql.com +1 -1
    Added my_rnd

  mysql-test/r/maria.result@1.18.1.1, 2007-10-09 21:08:44+03:00, monty@mysql.com +52 -4
    Updated results

  mysql-test/t/maria.test@1.20, 2007-10-09 21:08:45+03:00, monty@mysql.com +25 -0
    More tests for checksum

  mysys/Makefile.am@1.94, 2007-10-09 21:08:45+03:00, monty@mysql.com +1 -0
    Added my_rnd.c and my_uuid.c

  mysys/my_rnd.c@1.1, 2007-10-09 21:09:46+03:00, monty@mysql.com +55 -0
    New BitKeeper file ``mysys/my_rnd.c''

  mysys/my_rnd.c@1.0, 2007-10-09 21:09:46+03:00, monty@mysql.com +0 -0

  mysys/my_uuid.c@1.1, 2007-10-09 21:09:46+03:00, monty@mysql.com +169 -0
    New BitKeeper file ``mysys/my_uuid.c''

  mysys/my_uuid.c@1.0, 2007-10-09 21:09:46+03:00, monty@mysql.com +0 -0

  server-tools/instance-manager/listener.cc@1.42.1.1, 2007-10-09 21:08:45+03:00, monty@mysql.com +3 -3
    Fixed include order (my_global.h should always be first)

  server-tools/instance-manager/mysql_connection.cc@1.31, 2007-10-09 21:08:45+03:00, monty@mysql.com +4 -5
    Fixed include order (my_global.h should always be first)
    Use my_rnd_init()

  server-tools/instance-manager/mysql_connection.h@1.11, 2007-10-09 21:08:45+03:00, monty@mysql.com +1 -2
    rand_struct -> my_rand_struct

  sql/handler.h@1.254.1.1, 2007-10-09 21:08:45+03:00, monty@mysql.com +2 -0
    Added flag for page checksums

  sql/item_func.cc@1.410.1.1, 2007-10-09 21:08:45+03:00, monty@mysql.com +2 -2
    Use new my_rnd() interface

  sql/item_func.h@1.160.1.1, 2007-10-09 21:08:45+03:00, monty@mysql.com +1 -1
    Use new my_rnd() interface

  sql/item_strfunc.cc@1.325.1.1, 2007-10-09 21:08:45+03:00, monty@mysql.com +4 -4
    Use new my_rnd() interface

  sql/lex.h@1.174.1.2, 2007-10-09 21:08:45+03:00, monty@mysql.com +3 -1
    Added PAGE_CHECKSUM and TABLE_CHECKSUM

  sql/mysql_priv.h@1.526.1.1, 2007-10-09 21:08:45+03:00, monty@mysql.com +1 -1
    Use new my_rnd() interface

  sql/mysqld.cc@1.601.1.1, 2007-10-09 21:08:45+03:00, monty@mysql.com +2 -2
    Use new my_rnd() interface

  sql/password.c@1.45, 2007-10-09 21:08:45+03:00, monty@mysql.com +7 -35
    Move my_rnd() to mysys
    Use new my_rnd() interface

  sql/sql_class.cc@1.335.9.2, 2007-10-09 21:08:46+03:00, monty@mysql.com +1 -1
    Use new my_rnd() interface

  sql/sql_class.h@1.377.2.2, 2007-10-09 21:08:46+03:00, monty@mysql.com +1 -1
    Use new my_rnd() interface

  sql/sql_crypt.cc@1.14, 2007-10-09 21:08:46+03:00, monty@mysql.com +1 -1
    Use new my_rnd() interface

  sql/sql_crypt.h@1.8, 2007-10-09 21:08:46+03:00, monty@mysql.com +1 -1
    Use new my_rnd() interface

  sql/sql_show.cc@1.416.2.2, 2007-10-09 21:08:46+03:00, monty@mysql.com +21 -3
    Simpler handling of ha_choice_values
    Added PAGE_CHECKSUM

  sql/sql_table.cc@1.441.1.1, 2007-10-09 21:08:46+03:00, monty@mysql.com +2 -3
    Enable correct checksum handling (for now) if not running in compatible mode

  sql/sql_yacc.yy@1.586.1.2, 2007-10-09 21:08:46+03:00, monty@mysql.com +20 -3
    Added table option PAGE_CHECKSUM
    Added future compatible table option TABLE_CHECKSUM (alias for CHECKSUM)
    Added 'choice' target to simplify code

  sql/table.cc@1.299.1.1, 2007-10-09 21:08:46+03:00, monty@mysql.com +4 -2
    Store flag for PAGE_CHECKSUM

  sql/table.h@1.176.1.1, 2007-10-09 21:08:46+03:00, monty@mysql.com +1 -0
    Added support for PAGE_CHECKSUM

  storage/maria/ha_maria.cc@1.45.2.1, 2007-10-09 21:08:46+03:00, monty@mysql.com +29 -61
    Remove protection for incompatbile frm and MAI
    (Slow, not needed test)
    Rec_per_key is now in double
    Remember row type for table
    Give warning if one Maria uses another row type than requested
    Removed some old ASK_MONTY entries (added comments instead)
    Added handling of PAGE_CHECKSUM flags

  storage/maria/ma_bitmap.c@1.20.1.1, 2007-10-09 21:08:46+03:00, monty@mysql.com +36 -13
    Added page checksums to bitmap pages
    Added special bitmap marker for bitmap pages
    (Used to find bugs when running without page checksums)

  storage/maria/ma_blockrec.c@1.49.1.1, 2007-10-09 21:08:46+03:00, monty@mysql.com +203 -89
    Added a free-link list over directory entries. This makes insert of small rows faster as we don't
    have to scan the whole directory to find a not used entry.
    Moved SANITY_CHECKS to maria_def.h
    Simplify code by introducing dir_entry_pos()
    Added support for PAGE_CHECKSUM

  storage/maria/ma_blockrec.h@1.14.1.1, 2007-10-09 21:08:46+03:00, monty@mysql.com +18 -8
    Added DIR_FREE_SIZE (linked list of free directory entries)
    Added PAGE_CHECKSUM
    Added 'dir_entry_pos()'

  storage/maria/ma_check.c@1.43.2.1, 2007-10-09 21:08:46+03:00, monty@mysql.com +123 -55
    Check that index pages has correct index number
    Calculate rec_per_key with double precission
    Simplify code by using '_ma_get_used_and_node()'
    Check free directory list
    Remove wrong end \n from messages
    maria_data_on_page() -> _ma_get_page_used()
    maria_putint() -> _ma_store_page_used()
    rec_per_key_rows -> records_at_analyze

  storage/maria/ma_checksum.c@1.8, 2007-10-09 21:08:46+03:00, monty@mysql.com +21 -4
    Calculate checksum in original column order

  storage/maria/ma_create.c@1.29.2.1, 2007-10-09 21:08:46+03:00, monty@mysql.com +38 -14
    Store original column order in index file
    Reserve place for nulls_per_key_part (future)
    Added support for PAGE_CHECKSUM

  storage/maria/ma_dbug.c@1.6, 2007-10-09 21:08:46+03:00, monty@mysql.com +1 -1
    Fixed wrong debug output of key of type 'ulong'

  storage/maria/ma_delete.c@1.13.2.1, 2007-10-09 21:08:46+03:00, monty@mysql.com +93 -73
    maria_data_on_page() -> _ma_get_used_and_node()
    maria_data_on_page() -> _ma_get_page_used()
    maria_putint() -> _ma_store_page_used()
    Added page header (index key number) to all index pages
    Reserved page for checksum on index pages
    Use keypage_header

  storage/maria/ma_ft_update.c@1.7, 2007-10-09 21:08:47+03:00, monty@mysql.com +4 -3
    maria_putint() -> _ma_store_page_used()
    Store key number at start of page

  storage/maria/ma_loghandler.h@1.26.1.1, 2007-10-09 21:08:47+03:00, monty@mysql.com +7 -5
    st_maria_info -> MARIA_HA

  storage/maria/ma_open.c@1.31.1.1, 2007-10-09 21:09:27+03:00, monty@mysql.com +76 -23
    rec_per_key is now in double precission
    Added 'nulls_per_key_part'
    Added 'extra_options' (flags for future)
    Added support for PAGE_CHECKSUM
    Give error HA_ERR_NEW_FILE when using unsupported maria extensions
    Added comments
    Add maria_uuid to index file
    Added functions to store and read column_nr map.
    Changed some functions to return my_bool instead of uint
    

  storage/maria/ma_page.c@1.12.1.1, 2007-10-09 21:09:27+03:00, monty@mysql.com +27 -12
    Added checks that pages has correct key nr
    Store 0xffffffff in checksum position if page checksums are not enabled
    Moved key-page-delete link to take into account keypage header

  storage/maria/ma_preload.c@1.7, 2007-10-09 21:09:27+03:00, monty@mysql.com +18 -48
    Remove old MyISAM dependent code
    When scanning pages, only add pages to page cache for the requested index

  storage/maria/ma_range.c@1.11, 2007-10-09 21:09:27+03:00, monty@mysql.com +6 -6
    maria_data_on_page() -> _ma_get_used_and_node()
    Use keypage_header

  storage/maria/ma_rt_index.c@1.10, 2007-10-09 21:09:27+03:00, monty@mysql.com +174 -169
    Fixed indentation

  storage/maria/ma_rt_index.h@1.6, 2007-10-09 21:09:27+03:00, monty@mysql.com +3 -3
    Added support for dynamic index page header
    Reserved place for PAGE_CHECKSUM

  storage/maria/ma_rt_key.c@1.7, 2007-10-09 21:09:27+03:00, monty@mysql.com +11 -10
    Fixed indentation
    maria_data_on_page() -> _ma_get_page_used()
    maria_putint() -> maria_store_page_used()

  storage/maria/ma_rt_mbr.c@1.6, 2007-10-09 21:09:27+03:00, monty@mysql.com +60 -60
    Fixed indentation

  storage/maria/ma_rt_split.c@1.8, 2007-10-09 21:09:27+03:00, monty@mysql.com +86 -81
    Fixed indentation
    maria_data_on_page () -> _ma_get_page_used()

  storage/maria/ma_rt_test.c@1.4, 2007-10-09 21:09:27+03:00, monty@mysql.com +4 -2
    Fixed indentation

  storage/maria/ma_search.c@1.11.1.1, 2007-10-09 21:09:27+03:00, monty@mysql.com +77 -52
    Remove support of using -1 as 'last used index' to _ma_check_index()
    maria_data_on_page() -> _ma_get_page_used()
    maria_data_on_page() -> _ma_get_used_and_node()
    Use keypage_header

  storage/maria/ma_sort.c@1.10.1.1, 2007-10-09 21:09:27+03:00, monty@mysql.com +13 -12
    Changed some buffers to size_t
    Changed rec_per_key_part to double

  storage/maria/ma_static.c@1.9, 2007-10-09 21:09:27+03:00, monty@mysql.com +6 -4
    Removed NEAR
    Added maria_uuid

  storage/maria/ma_test2.c@1.22.1.1, 2007-10-09 21:09:27+03:00, monty@mysql.com +7 -6
    Moevd testflag == 2 to correct place
    Remove test of reading with index number -1 (not supported anymore)

  storage/maria/ma_test_recovery@1.13, 2007-10-09 21:09:27+03:00, monty@mysql.com +6 -6
    Changed tmp table names so that one can run maria_chk on them

  storage/maria/ma_write.c@1.17.2.1, 2007-10-09 21:09:45+03:00, monty@mysql.com +135 -95
    Fixed indentation
    Use keypage_header
    Store index number on index pages
    maria_putint() -> _ma_store_page_used()
    maria_data_on_page() -> ma_get_used_and_node()
    maria_data_on_page() -> _ma_get_page_used()
    Added PAGE_CHECKSUM
    Added Maria handler to some functions
    Removed some not needed casts

  storage/maria/maria_chk.c@1.22.1.1, 2007-10-09 21:09:45+03:00, monty@mysql.com +11 -6
    Added error handling for HA_ERR_NEW_FILE
    Added information about page checksums
    rec_per_key_part changed to double
    maria_data_on_page() -> _ma_get_page_used()
    Use keypage_header

  storage/maria/maria_def.h@1.39.1.1, 2007-10-09 21:09:45+03:00, monty@mysql.com +76 -40
    Added IDENTICAL_PAGES_AFTER_RECOVERY and SANITY_CHECKS
    Changed rec_per_key_part to double
    Added nulls_per_key_part
    rec_per_key_rows -> records_at_analyze
    st_maria_info -> MARIA_HA
    Reserve place for new statistics variables, uuid, checksums per page etc.
    Removed NEAR tags
    Changed some prototypes to use my_bool and size_t

  storage/maria/maria_pack.c@1.14.1.1, 2007-10-09 21:09:45+03:00, monty@mysql.com +3 -3
    st_maria_info -> MARIA_HA
    Fixed indentation

  storage/maria/ma_test_recovery.expected@1.7.1.1, 2007-10-09 21:09:27+03:00, monty@mysql.com +26 -26
    Updated results

  storage/myisam/mi_dbug.c@1.19, 2007-10-09 21:09:45+03:00, monty@mysql.com +1 -1
    Fix wrong debug output for ULONG

ChangeSet@1.2476.479.9, 2007-10-09 19:51:57+02:00, jmiller@mysql.com +8 -0
  Updated NDB test to run for both RBR and MBR testing. In addition added test for Innodb and updated results files for all tests.

  mysql-test/extra/rpl_tests/rpl_row_charset.test@1.8, 2007-10-09 19:48:04+02:00, jmiller@mysql.com +4 -2
    Updated test to specify the engine in the create. In addition had to add BIG SQL for NDB

  mysql-test/suite/rpl/r/rpl_row_charset.result@1.10, 2007-10-09 19:48:37+02:00, jmiller@mysql.com +5 -3
    Updated results file

  mysql-test/suite/rpl/r/rpl_row_charset_innodb.result@1.1, 2007-10-09 19:50:55+02:00, jmiller@mysql.com +215 -0
    New results file for innodb test case

  mysql-test/suite/rpl/r/rpl_row_charset_innodb.result@1.0, 2007-10-09 19:50:55+02:00, jmiller@mysql.com +0 -0

  mysql-test/suite/rpl/t/rpl_row_charset_innodb-master.opt@1.1, 2007-10-09 19:50:00+02:00, jmiller@mysql.com +1 -0
    Option file to ensure innodb on master

  mysql-test/suite/rpl/t/rpl_row_charset_innodb-master.opt@1.0, 2007-10-09 19:50:00+02:00, jmiller@mysql.com +0 -0

  mysql-test/suite/rpl/t/rpl_row_charset_innodb-slave.opt@1.1, 2007-10-09 19:50:16+02:00, jmiller@mysql.com +1 -0
    Option file to ensure innodb on slave

  mysql-test/suite/rpl/t/rpl_row_charset_innodb-slave.opt@1.0, 2007-10-09 19:50:16+02:00, jmiller@mysql.com +0 -0

  mysql-test/suite/rpl/t/rpl_row_charset_innodb.test@1.1, 2007-10-09 19:49:17+02:00, jmiller@mysql.com +9 -0
    Created a wrapper to test innodb storage engine as well

  mysql-test/suite/rpl/t/rpl_row_charset_innodb.test@1.0, 2007-10-09 19:49:17+02:00, jmiller@mysql.com +0 -0

  mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result@1.10, 2007-10-09 19:46:45+02:00, jmiller@mysql.com +17 -17
    Updated results file

  mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test@1.5, 2007-10-09 19:46:09+02:00, jmiller@mysql.com +2 -2
    Updated test to run for both row and mixed replication testing

ChangeSet@1.1810.3376.4, 2007-10-09 22:40:22+05:00, ramil@mysql.com +2 -0
  metadata test of bug # 31249: problem with convert(..., datetime) removed 
  as PS protocol gives slightly different metadata.

  mysql-test/r/type_datetime.result@1.30.8.3, 2007-10-09 22:40:20+05:00, ramil@mysql.com +0 -7
    metadata test of bug # 31249: problem with convert(..., datetime) removed 
    as PS protocol gives slightly different metadata.

  mysql-test/t/type_datetime.test@1.18.8.3, 2007-10-09 22:40:20+05:00, ramil@mysql.com +0 -3
    metadata test of bug # 31249: problem with convert(..., datetime) removed 
    as PS protocol gives slightly different metadata.

ChangeSet@1.1810.3371.3, 2007-10-09 12:02:59-03:00, davi@moksha.local +2 -0
  Bug#31409 RENAME TABLE causes server crash or deadlock when used with HANDLER statements
  
  This deadlock occurs when a client issues a HANDLER ... OPEN statement
  that tries to open a table that has a pending name-lock on it by another
  client that also needs a name-lock on some other table which is already
  open and associated to a HANDLER instance owned by the first client.
  The deadlock happens because the open_table() function will back-off
  and wait until the name-lock goes away, causing a circular wait if some
  other name-lock is also pending for one of the open HANDLER tables.
  
  Such situation, for example, can be easily repeated by issuing a RENAME
  TABLE command in such a way that the existing table is already open
  as a HANDLER table by another client and this client tries to open
  a HANDLER to the new table name.
  
  The solution is to allow handler tables with older versions (marked for
  flush) to be closed before waiting for the name-lock completion. This is
  safe because no other name-lock can be issued between the flush and the
  check for pending name-locks.
  
  The test case for this bug is going to be committed into 5.1 because it
  requires a test feature only avaiable in 5.1 (wait_condition).

  sql/sql_base.cc@1.235.115.1, 2007-10-09 12:02:57-03:00, davi@moksha.local +11 -1
    Improve comments in the open_table() function, stating the importance
    of the handler tables flushing for the back-off process.

  sql/sql_handler.cc@1.72.1.21, 2007-10-09 12:02:57-03:00, davi@moksha.local +28 -19
    Allows handler tables flushes when opening new tables in order to avoid
    potential deadlocks. Add comments explaining the importance of the flush.

ChangeSet@1.2476.510.1, 2007-10-09 19:16:39+05:00, ramil@mysql.com +6 -0
  Fix for bug #29444: crash with partition refering to table in create-select
  
  Problem: creating a partitioned table during name resolution for the 
  partition function we search for column names in all parts of the
  CREATE TABLE query. It is superfluous (and wrong) sometimes.
  
  Fix: launch name resolution for the partition function against
  the table we're creating.

  mysql-test/r/partition.result@1.68.1.1, 2007-10-09 19:16:36+05:00, ramil@mysql.com +20 -0
    Fix for bug #29444: crash with partition refering to table in create-select
      - test result.

  mysql-test/t/partition.test@1.62.1.1, 2007-10-09 19:16:36+05:00, ramil@mysql.com +20 -0
    Fix for bug #29444: crash with partition refering to table in create-select
      - test result.

  sql/item.cc@1.289, 2007-10-09 19:16:36+05:00, ramil@mysql.com +3 -1
    Fix for bug #29444: crash with partition refering to table in create-select
      - LEX::use_only_table_context introduced, which is used in the 
        Item_field::fix_fields() to resolve names only against
        context->first_name_resolution_table/last_name_resolution_table.

  sql/sql_lex.cc@1.255.1.11, 2007-10-09 19:16:36+05:00, ramil@mysql.com +1 -0
    Fix for bug #29444: crash with partition refering to table in create-select
      - LEX::use_only_table_context introduced, which is used in the 
        Item_field::fix_fields() to resolve names only against
        context->first_name_resolution_table/last_name_resolution_table.

  sql/sql_lex.h@1.296.2.1, 2007-10-09 19:16:36+05:00, ramil@mysql.com +8 -0
    Fix for bug #29444: crash with partition refering to table in create-select
      - LEX::use_only_table_context introduced, which is used in the 
        Item_field::fix_fields() to resolve names only against
        context->first_name_resolution_table/last_name_resolution_table.

  sql/sql_partition.cc@1.116, 2007-10-09 19:16:37+05:00, ramil@mysql.com +7 -0
    Fix for bug #29444: crash with partition refering to table in create-select
      - set the lex->use_only_table_context before the func_expr->fix_fields()
        call to ensure we're resolving names against the table we're creating;
        then restore it back after the call.

ChangeSet@1.1810.3386.1, 2007-10-09 14:58:09+02:00, mhansson@linux-st28.site +4 -0
  Bug#31160: MAKETIME() crashes server when returning NULL in ORDER BY using filesort
  
  Even though it returns NULL, the MAKETIME function did not have this property set,
  causing a failed assertion (designed to catch exactly this).
  Fixed by setting the nullability property of MAKETIME().

  mysql-test/r/func_sapdb.result@1.15.7.2, 2007-10-09 14:58:07+02:00, mhansson@linux-st28.site +1 -1
    Bug#31160: Changed test result.

  mysql-test/r/func_time.result@1.47.1.37, 2007-10-09 14:58:07+02:00, mhansson@linux-st28.site +9 -0
    Bug#31160: Test result.

  mysql-test/t/func_time.test@1.41.1.30, 2007-10-09 14:58:07+02:00, mhansson@linux-st28.site +10 -0
    Bug#31160: Test case.

  sql/item_timefunc.h@1.63.7.1, 2007-10-09 14:58:07+02:00, mhansson@linux-st28.site +4 -1
    Bug#31160: The fix: Initializing maybe_null to true

ChangeSet@1.1810.3385.1, 2007-10-09 13:10:51+02:00, istruewing@stella.local +2 -0
  Bug#15522 - create ... select and with merge tables
  Added test case.
  The fix for Bug#20662 does also fix this one.

  mysql-test/r/merge.result@1.43.1.20, 2007-10-09 13:10:50+02:00, istruewing@stella.local +5 -0
    Bug#15522 - create ... select and with merge tables
    Added test result.

  mysql-test/t/merge.test@1.37.1.15, 2007-10-09 13:10:50+02:00, istruewing@stella.local +14 -0
    Bug#15522 - create ... select and with merge tables
    Added test case.

ChangeSet@1.2476.504.3, 2007-10-09 14:53:15+04:00, anozdrin@station. +3 -0
  Fix merge.

  sql/mysql_priv.h@1.523.1.18, 2007-10-09 14:53:12+04:00, anozdrin@station. +1 -0
    Fix merge.

  sql/sql_connect.cc@1.10, 2007-10-09 14:53:12+04:00, anozdrin@station. +12 -4
    Fix merge.

  sql/sql_parse.cc@1.683.19.3, 2007-10-09 14:53:13+04:00, anozdrin@station. +0 -2
    Fix merge.

ChangeSet@1.1810.3364.3, 2007-10-09 14:37:21+05:00, ramil@mysql.com +4 -0
  Fix for bug #31249: Assertion `!table || (!table->write_set || 
  bitmap_is_set(table->write_set, fiel
  
  Problem: creating a temporary table we allocate the group buffer if needed
  followed by table bitmaps (see create_tmp_table()). Reserving less memory for 
  the group buffer than actually needed (used) for values retrieval may lead 
  to overlapping with followed bitmaps in the memory pool that in turn leads 
  to unpredictable consequences.
  
  As we use Item->max_length sometimes to calculate group buffer size,
  it must be set to proper value. In this particular case 
  Item_datetime_typecast::max_length is too small.
  
  Another problem is that we use max_length to calculate the group buffer
  key length for items represented as DATE/TIME fields which is superfluous.
  
  Fix: set Item_datetime_typecast::max_length properly,
  accurately calculate the group buffer key length for items 
  represented as DATE/TIME fields in the buffer.

  mysql-test/r/type_datetime.result@1.30.9.1, 2007-10-09 14:37:19+05:00, ramil@mysql.com +14 -0
    Fix for bug #31249: Assertion `!table || (!table->write_set || 
    bitmap_is_set(table->write_set, fiel
      - test result.

  mysql-test/t/type_datetime.test@1.18.9.1, 2007-10-09 14:37:19+05:00, ramil@mysql.com +13 -0
    Fix for bug #31249: Assertion `!table || (!table->write_set || 
    bitmap_is_set(table->write_set, fiel
      - test case.

  sql/item_timefunc.h@1.63.6.1, 2007-10-09 14:37:19+05:00, ramil@mysql.com +3 -1
    Fix for bug #31249: Assertion `!table || (!table->write_set || 
    bitmap_is_set(table->write_set, fiel
      - set Item_datetime_typecast::max_length properly.

  sql/sql_select.cc@1.312.1.237, 2007-10-09 14:37:19+05:00, ramil@mysql.com +22 -4
    Fix for bug #31249: Assertion `!table || (!table->write_set || 
    bitmap_is_set(table->write_set, fiel
      - the group buffer key length for items represented as 
    DATE/TIME fields in the buffer should be calculated using
    the maximum pack length of such fields (== 8), using 
    max_length here is redundant.

ChangeSet@1.1810.3384.1, 2007-10-09 11:36:05+02:00, mhansson@linux-st28.site +3 -0
  Bug#30832:Assertion + crash with select name_const('test',now());
  Completion of previous patch. Negative number were denied
  as the second argument to NAME_CONST.

  mysql-test/r/func_misc.result@1.21.1.8, 2007-10-09 11:36:00+02:00, mhansson@linux-st28.site +6 -0
    Bug#30832 completion: test result

  mysql-test/t/func_misc.test@1.21.2.2, 2007-10-09 11:36:00+02:00, mhansson@linux-st28.site +2 -0
    Bug#30832 completion: test case
    added negative numbers

  sql/item_func.h@1.136.3.39, 2007-10-09 11:36:00+02:00, mhansson@linux-st28.site +1 -0
    Bug#30832 completion
    The function that represents unary minus is considered a constant if the argument is.

ChangeSet@1.2476.478.7, 2007-10-09 13:53:39+05:00, bar@mysql.com +1 -0
  Bug#27287 extractvalue() (and updatexml()) extremely slow for large XML
  Performance improvements made.
  ExtractValue for large XML values is now much faster
  (about 2000 times faster of 1Mb-long XML values).

  sql/item_xmlfunc.cc@1.30.2.1, 2007-10-09 13:53:38+05:00, bar@mysql.com +24 -36
    Performance improvement for huge XML values:
    1. Avoid reallocs - reserve extra memory:
    using String::reserve() + String::q_append()
    instead of String::append()
    2. Parent is now not searched through the all previous
    nodes in backward direction. Instead, we do the following:
    - we introduce data->parent - a new member in MY_XML_USER_DATA
    - when entering a new tag/attribute node, we remember offset
      of the current node in data->parent
    - when leaving a tag/attribute node, we change data->parent
      to offset of the parent of the current node.

ChangeSet@1.2403.18.91, 2007-10-09 10:41:26+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - more test prg fixes (due to small change in scanUpdates impl.)
    (autotest tests)

  storage/ndb/test/ndbapi/testDict.cpp@1.34.2.1, 2007-10-09 10:41:24+02:00, jonas@perch.ndb.mysql.com +2 -2
    more test prg fixes

  storage/ndb/test/ndbapi/testIndex.cpp@1.21.1.1, 2007-10-09 10:41:24+02:00, jonas@perch.ndb.mysql.com +2 -2
    more test prg fixes

  storage/ndb/test/ndbapi/test_event.cpp@1.27, 2007-10-09 10:41:24+02:00, jonas@perch.ndb.mysql.com +1 -1
    more test prg fixes

ChangeSet@1.2476.505.8, 2007-10-09 10:38:31+02:00, guilhem@gbichot4.local +6 -0
  WL#3071 - Maria checkpoint
  * Preparation for having a background checkpoint thread:
  frequency of checkpoint taken by that thread is now configurable
  by the user: global variable maria_checkpoint_frequency, in seconds,
  default 30 (checkpoint every 30th second); 0 means no checkpoints
  (and thus no background thread, thus no background flushing, that
  will probably only be used for testing).
  * Don't take checkpoints in Recovery if it didn't do anything
  significant; thus no checkpoint after a clean shutdown/restart. The
  only checkpoint which is never skipped is the one at shutdown.
  * fix for a test failure (after-merge fix)

  include/maria.h@1.17, 2007-10-09 10:38:07+02:00, guilhem@gbichot4.local +1 -1
    new variable

  mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result@1.10, 2007-10-09 10:38:07+02:00, guilhem@gbichot4.local +2 -2
    result update

  mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test@1.10, 2007-10-09 10:38:07+02:00, guilhem@gbichot4.local +1 -1
    position update (=after merge fix, as this position was already changed
    into 5.1 and not merged here, causing test to fail)

  storage/maria/ha_maria.cc@1.51, 2007-10-09 10:38:07+02:00, guilhem@gbichot4.local +32 -1
    Checkpoint's frequency is now configurable by the user:
    global variable maria_checkpoint_frequency. Changing it on the fly
    requires us to shutdown/restart the background checkpoint thread,
    as the loop done in that thread assumes a constant checkpoint
    interval. Default value is 30: a checkpoint every 30 seconds (yes, I
    know, physicists will remind that it should be named "period" then).
    ha_maria now asks for a background checkpoint thread when it starts,
    but this is still overruled (disabled) in ma_checkpoint_init().

  storage/maria/ma_checkpoint.c@1.24, 2007-10-09 10:38:30+02:00, guilhem@gbichot4.local +23 -10
    Checkpoint's frequency is now configurable by the user: background thread
    takes a checkpoint every maria_checkpoint_interval-th second.
    If that variable is 0, no checkpoints are taken.
    Note, I will enable the background thread only in a later changeset.

  storage/maria/ma_recovery.c@1.39, 2007-10-09 10:38:30+02:00, guilhem@gbichot4.local +10 -4
    Don't take checkpoints at the end of the REDO phase and at the end of
    Recovery if Recovery didn't make anything significant (didn't open
    any tables, didn't rollback any transactions).
    With this, after a clean shutdown, Recovery shouldn't take any
    checkpoint, which makes starting faster (we save a few fsync()s of
    the log and control file).

ChangeSet@1.2403.18.90, 2007-10-09 09:55:30+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - testSystemRestart -n SR_UNDO
    yet another test prg bug

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.13.1.4, 2007-10-09 09:55:28+02:00, jonas@perch.ndb.mysql.com +1 -1
    yet another test prg bug

ChangeSet@1.2476.501.4, 2007-10-09 09:39:39+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  Bug #31470 ndb table with special characters in name are not discovered correctly

  mysql-test/suite/ndb/r/ndb_multi.result@1.17, 2007-10-09 09:39:36+02:00, tomas@whalegate.ndb.mysql.com +21 -0
    Bug #31470 ndb table with special characters in name are not discovered correctly

  mysql-test/suite/ndb/t/ndb_multi.test@1.25, 2007-10-09 09:39:36+02:00, tomas@whalegate.ndb.mysql.com +27 -0
    Bug #31470 ndb table with special characters in name are not discovered correctly

  sql/handler.cc@1.315.9.2, 2007-10-09 09:39:36+02:00, tomas@whalegate.ndb.mysql.com +1 -2
    Bug #31470 ndb table with special characters in name are not discovered correctly

ChangeSet@1.1810.3383.1, 2007-10-08 22:30:41-04:00, iggy@alf.(none) +1 -0
  Bug#28774 mysql_upgrade creates tempfiles in root-dir (C:\) and 
  doesn't clean them up
  - Make sure to cleanup temporary files after use.

  client/mysql_upgrade.c@1.6.1.22, 2007-10-08 22:30:39-04:00, iggy@alf.(none) +4 -0
    Bug#28774 mysql_upgrade creates tempfiles in root-dir (C:\) and 
    doesn't clean them up
    - Close file handle and delete temporary file when write fails.

ChangeSet@1.2476.506.1, 2007-10-08 17:43:32-04:00, iggy@alf.(none) +1 -0
  Bug#28535 mistake in mysqldump error message
  - Fixed error message.

  client/mysqldump.c@1.268.31.1, 2007-10-08 17:43:30-04:00, iggy@alf.(none) +1 -1
    Bug#28535 mistake in mysqldump error message
    - Corrected parameter order.

ChangeSet@1.2476.486.6, 2007-10-09 01:07:15+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #31310.
  Locked rows of the InnoDB storage was silently skipped in the read-committed
  isolation level.
  
  QUICK_RANGE_SELECT for unique ranges lacks second (blocking) read
  of the record that was read semi-consistently and just skip it.
  
  The handler::read_multi_range_next method has been modified
  to retry previous unique range if the previous read was
  semi-consistent.

  mysql-test/include/mix1.inc@1.54.1.1, 2007-10-09 01:03:44+05:00, gshchepa@gleb.loc +125 -0
    Added test case for bug #31310.

  mysql-test/r/innodb_mysql.result@1.57.1.1, 2007-10-09 01:03:59+05:00, gshchepa@gleb.loc +80 -0
    Added test case for bug #31310.

  sql/handler.cc@1.315.15.1, 2007-10-09 01:03:36+05:00, gshchepa@gleb.loc +5 -3
    Fixed bug #31310.
    The handler::read_multi_range_next method has been modified
    to retry previous unique range if the previous read was
    semi-consistent.

ChangeSet@1.2476.505.3, 2007-10-08 20:57:37+02:00, serg@janus.mylan +3 -0
  sql_plugin.cc:
    fixed uninit memory access in SET pluginvar=DEFAULT
  innodb_mysql.test, innodb_mysql.result:
    test case for SET pluginvar=DEFAULT

  mysql-test/r/innodb_mysql.result@1.58.1.1, 2007-10-08 20:57:24+02:00, serg@janus.mylan +2 -0
    test case for SET pluginvar=DEFAULT

  mysql-test/t/innodb_mysql.test@1.4, 2007-10-08 20:57:28+02:00, serg@janus.mylan +2 -1
    test case for SET pluginvar=DEFAULT

  sql/sql_plugin.cc@1.73.2.1, 2007-10-08 20:57:28+02:00, serg@janus.mylan +8 -2
    fixed uninit memory access in SET pluginvar=DEFAULT

ChangeSet@1.2476.505.2, 2007-10-08 20:56:43+02:00, serg@janus.mylan +1 -0
  rpl_mixed_dml.inc:
    use mysqltest builtins instead of --exec. Fixes a failing test too :)

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@1.5.1.2, 2007-10-08 20:56:27+02:00, serg@janus.mylan +2 -2
    use mysqltest builtins instead of --exec. Fixes a failing test too :)

ChangeSet@1.2476.505.1, 2007-10-08 20:55:44+02:00, serg@janus.mylan +2 -0
  Makefile.am:
    do link_sources only once

  libmysql_r/Makefile.am@1.34, 2007-10-08 20:55:22+02:00, serg@janus.mylan +1 -0
    do link_sources only once

  sql/Makefile.am@1.161.1.32, 2007-10-08 20:55:16+02:00, serg@janus.mylan +1 -0
    do link_sources only once

ChangeSet@1.2476.499.2, 2007-10-08 20:52:06+02:00, serg@janus.mylan +1 -0
  mtr_report.pl:
    InnoDB errors are no less important for pushbuild to monitor
    than InnoDB warnings

  mysql-test/lib/mtr_report.pl@1.61.2.1, 2007-10-08 20:51:33+02:00, serg@janus.mylan +10 -4
    InnoDB errors are no less important for pushbuild to monitor
    than InnoDB warnings

ChangeSet@1.2476.504.1, 2007-10-08 12:37:57-06:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  Test cleanup, the upgrade test script assumes a unix like environment

  mysql-test/t/upgrade.test@1.7, 2007-10-08 12:37:55-06:00, malff@lambda.hsd1.co.comcast.net. +5 -1
    Test cleanup, --exec mkdir does not work on windows platforms

ChangeSet@1.2476.503.1, 2007-10-08 21:10:18+03:00, bell@desktop.sanja.is.com.ua +1 -0
  Comments added.
  moved debugging defines.
  Fixed buffer flushing (we copied last page
  content before it was actually written, now
  we abvance pointer in new buffer and unlock
  it while waiting for filling old buffer)

  storage/maria/ma_loghandler.c@1.59.1.1, 2007-10-08 21:10:16+03:00, bell@desktop.sanja.is.com.ua +46 -18
    Comments added.
    moved debugging defines.
    Fixed buffer flushing (we copied last page
    content before it was actually written, now
    we abvance pointer in new buffer and unlock
    it while waiting for filling old buffer)

ChangeSet@1.2476.464.9, 2007-10-08 19:08:25+02:00, guilhem@gbichot4.local +9 -0
  WL#3072 Maria recovery
  Misc changes:
  - fix for benign Valgrind error, compiler warnings
  - fix for a segfault in execution of maria_delete_all_rows() and one
  when taking multiple checkpoints
  - fix for too paranoid assertion
  - adding ability to take checkpoints at the end of the REDO phase
  and at the end of recovery.
  - other minor changes

  storage/maria/ha_maria.cc@1.50, 2007-10-08 19:07:49+02:00, guilhem@gbichot4.local +1 -3
    The checkpoint done after Recovery is finished, is moved to
    maria_recover().

  storage/maria/ma_bitmap.c@1.21, 2007-10-08 19:07:49+02:00, guilhem@gbichot4.local +3 -0
    fix for Valgrind error: the "shadow debug copy" of the bitmap page
    started unitialized and so ma_print_bitmap() would use it uninitialized

  storage/maria/ma_checkpoint.c@1.23, 2007-10-08 19:07:50+02:00, guilhem@gbichot4.local +4 -0
    * reset pointers to NULL after freeing them, or we segfault at
    next checkpoint in my_realloc().
    * fix for compiler warnings.

  storage/maria/ma_delete_all.c@1.21, 2007-10-08 19:07:50+02:00, guilhem@gbichot4.local +2 -1
    info->trn is NULL for non-transactional tables

  storage/maria/ma_locking.c@1.17, 2007-10-08 19:07:50+02:00, guilhem@gbichot4.local +7 -2
    correct assertion (it fired wrongly in execution of REDO_DROP_TABLE
    due to the maria_extra(HA_PREPARE_FOR_DROP)->_ma_decrement_open_count()
    ->maria_lock_database(F_UNLCK); another solution would have been to
    not call _ma_decrement_open_count() (it's ok to have a wrong open
    count in a table which we are dropping), but the same problem
    would still exist for REDO_RENAME_TABLE.

  storage/maria/ma_loghandler.c@1.60, 2007-10-08 19:07:50+02:00, guilhem@gbichot4.local +1 -0
    fail early if UNRECOVERABLE_ERROR

  storage/maria/ma_recovery.c@1.38, 2007-10-08 19:08:21+02:00, guilhem@gbichot4.local +92 -91
    * new argument to maria_apply_log(): should it take checkpoints
    (at end of REDO phase and at the very end) or no.
    * moving the call to translog_next_LSN() into
    parse_checkpoint_record() ("hide the details").
    * Refining an error detection for something which could happen
    if there is a checkpoint record in the log.
    * Using close_one_table() instead of maria_extra(HA_EXTRA_PREPARE_FOR_DROP|RENAME),
    as it looks safer, and also changing how close_one_table() works:
    it now limits itself to scanning all_tables[], thus having one loopp
    instead of two, which should be faster (as a result, it does not
    close tables not registered in this array, which is ok as there
    should not be any).

  storage/maria/ma_recovery.h@1.10, 2007-10-08 19:08:21+02:00, guilhem@gbichot4.local +2 -1
    new parameter

  storage/maria/maria_read_log.c@1.23, 2007-10-08 19:08:21+02:00, guilhem@gbichot4.local +1 -1
    update to new prototype

ChangeSet@1.1810.3382.1, 2007-10-08 13:00:01-04:00, iggy@alf.(none) +1 -0
  Bug#31289 vm-win2003-64-b build failures on PushBuild due to manifest
  tool error
  - Move disable manifest generation commands to more global location.

  CMakeLists.txt@1.1.30.1, 2007-10-08 13:00:00-04:00, iggy@alf.(none) +9 -8
    Bug#31289 vm-win2003-64-b build failures on PushBuild due to manifest
    tool error
    - Disable Manifests by default for VS 7 and 8.

ChangeSet@1.2476.501.3, 2007-10-08 16:10:41+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - post merge fixes

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp@1.26, 2007-10-08 16:10:39+02:00, jonas@perch.ndb.mysql.com +0 -4
    merge

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.42, 2007-10-08 16:10:39+02:00, jonas@perch.ndb.mysql.com +1 -1
    merge

ChangeSet@1.2403.18.89, 2007-10-08 16:02:21+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - fix dd drop table race condition
    add list of pages being unmaped, so we can wait for it to be empty before dropping extents

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.55.2.11, 2007-10-08 16:02:19+02:00, jonas@perch.ndb.mysql.com +2 -0
    add list of pages being unmaped

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp@1.21.2.3, 2007-10-08 16:02:19+02:00, jonas@perch.ndb.mysql.com +6 -0
    add list of pages being unmaped

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.33.2.6, 2007-10-08 16:02:19+02:00, jonas@perch.ndb.mysql.com +13 -0
    wait for unmap pages

ChangeSet@1.2403.18.88, 2007-10-08 16:00:18+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - Fix disk scan (backup)
    (introduced by only updating extent pages after pageout)

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@1.18.1.6, 2007-10-08 16:00:17+02:00, jonas@perch.ndb.mysql.com +1 -1
    Fix disk scan (backup)

ChangeSet@1.1810.3353.6, 2007-10-08 17:59:23+04:00, anozdrin@station. +1 -0
  Get rid of compilation warning.

  sql/sql_parse.cc@1.426.169.3, 2007-10-08 17:59:21+04:00, anozdrin@station. +2 -0
    Get rid of compilation warning.

ChangeSet@1.2403.18.87, 2007-10-08 15:58:08+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - remove extra ;
    (in test framework)

  storage/ndb/test/src/NDBT_Thread.cpp@1.2.1.1, 2007-10-08 15:58:06+02:00, jonas@perch.ndb.mysql.com +1 -1
    remove extra ;

ChangeSet@1.2403.18.86, 2007-10-08 15:57:01+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#31257
      handle partially complete LCP better in SR

  storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.25.2.5, 2007-10-08 15:56:59+02:00, jonas@perch.ndb.mysql.com +1 -0
    remove partially complete LCP from "node" when doign removeNodeFromTable

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.100.3.9, 2007-10-08 15:56:59+02:00, jonas@perch.ndb.mysql.com +34 -1
    remove partially complete LCP from "node" when doign removeNodeFromTable

ChangeSet@1.2403.18.85, 2007-10-08 15:53:29+02:00, jonas@perch.ndb.mysql.com +8 -0
  ndb - bug#30975 (recommit to 51-telco-gca)
      - only update extent pages *after* flush of real page has been done
      - sync both create/drop of table into undolog (for disk tables)

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.130.2.18, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +8 -3
    inform TUP which LCP to restore each fragment to

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.55.2.10, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +5 -4
    1) inform TUP which LCP to restore each fragment to
    2) inform TUP both before/after a page has been written

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp@1.21.2.2, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +191 -63
    1) inform TUP which LCP to restore each fragment to
    2) inform TUP both before/after a page has been written

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.33.2.5, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +21 -11
    log both create/drop table

  storage/ndb/src/kernel/blocks/lgman.cpp@1.23.1.2, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +10 -2
    let TUP know about all LCPs

  storage/ndb/src/kernel/blocks/pgman.cpp@1.20.1.9, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +32 -4
    add "when" argument to disk_page_unmap_callback so that TUP gets informed both before and after page writeout
      so that extent pages can be updated only *after* page has been written

  storage/ndb/src/kernel/blocks/tsman.cpp@1.13.1.2, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +38 -24
    remove lsn from update page free bits
    use wal for page vs extent relation

  storage/ndb/src/kernel/blocks/tsman.hpp@1.9, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +9 -15
    remove lsn from update page free bits
    use wal for page vs extent relation

ChangeSet@1.2403.18.84, 2007-10-08 15:11:47+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - Set usable timeout for atrt
    (problem introduced by stew's timeout handling)

  storage/ndb/src/cw/cpcd/APIService.cpp@1.10.1.1, 2007-10-08 15:11:45+02:00, jonas@perch.ndb.mysql.com +1 -1
    Set usable timeout for atrt

ChangeSet@1.1810.3353.5, 2007-10-08 17:09:28+04:00, anozdrin@station. +1 -0
  Fix compilation warning.

  sql/sql_parse.cc@1.426.169.2, 2007-10-08 17:09:26+04:00, anozdrin@station. +1 -1
    Fix compilation warning.

ChangeSet@1.2403.18.83, 2007-10-08 15:07:58+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - fix bug in old test prg(s)
    fix SR1 and SR2

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.13.1.3, 2007-10-08 15:07:56+02:00, jonas@perch.ndb.mysql.com +3 -3
    fix SR1 and SR2

ChangeSet@1.2476.490.11, 2007-10-08 16:52:15+05:00, ramil@mysql.com +3 -0
  Fix for bug #31438: updatexml still crashes
  
  Problem: check missed if the second updatexml() argument is valid.
  
  Fix: check it.

  mysql-test/r/xml.result@1.28, 2007-10-08 16:52:13+05:00, ramil@mysql.com +11 -0
    Fix for bug #31438: updatexml still crashes
      - test result.

  mysql-test/t/xml.test@1.23, 2007-10-08 16:52:13+05:00, ramil@mysql.com +11 -0
    Fix for bug #31438: updatexml still crashes
      - test case.

  sql/item_xmlfunc.cc@1.30.1.4, 2007-10-08 16:52:13+05:00, ramil@mysql.com +2 -1
    Fix for bug #31438: updatexml still crashes
      - check if the second argument passed to the updatexml() is valid.

ChangeSet@1.1810.3381.1, 2007-10-08 12:57:43+03:00, gkodinov@magare.gmz +3 -0
  Bug #31156: mysqld: item_sum.cc:918: virtual bool 
    Item_sum_distinct::setup(THD*): Assertion
  
  There was an assertion to detect a bug in ROLLUP
  implementation. However the assertion is not true
  when used in a subquery context with non-cacheable
  statements.
  Fixed by turning the assertion to accepted case
  (just like it's done for the other aggregate functions). 

  mysql-test/r/func_group.result@1.49.1.13, 2007-10-08 12:57:41+03:00, gkodinov@magare.gmz +10 -0
    Bug #31156: test case

  mysql-test/t/func_group.test@1.48.1.9, 2007-10-08 12:57:41+03:00, gkodinov@magare.gmz +13 -0
    Bug #31156: test case

  sql/item_sum.cc@1.170.1.43, 2007-10-08 12:57:41+03:00, gkodinov@magare.gmz +4 -1
    Bug #31156: make it OK to call setup() several times:
     done for (e.g.) scalar subquery 

ChangeSet@1.1810.3380.1, 2007-10-08 03:48:59+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #31019: the MOD() function and the % operator crash the server
  when a divisor is less than 1 and its fractional part is very long.
  For example:
  1 % .123456789123456789123456789123456789123456789123456789123456789123456789123456789;
  
  Stack buffer overflow has been fixed in the do_div_mod function.

  mysql-test/r/type_decimal.result@1.38.2.1, 2007-10-08 03:43:23+05:00, gshchepa@gleb.loc +6 -0
    Added test case for bug #31019.

  mysql-test/t/type_decimal.test@1.33.1.1, 2007-10-08 03:43:15+05:00, gshchepa@gleb.loc +8 -0
    Added test case for bug #31019.

  strings/decimal.c@1.65.1.16, 2007-10-08 03:43:04+05:00, gshchepa@gleb.loc +2 -1
    Fixed bug #31019.
    Stack buffer overflow has been fixed in the do_div_mod function:
    a value of the upper bound of the buffer was increased where
    a decrement is required.

ChangeSet@1.2476.464.8, 2007-10-08 01:07:50+03:00, bell@desktop.sanja.is.com.ua +1 -0
  Comments fixed and added.

  storage/maria/ma_loghandler.c@1.59, 2007-10-08 01:07:49+03:00, bell@desktop.sanja.is.com.ua +2 -1
    Comments fixed and added.

ChangeSet@1.2476.464.7, 2007-10-07 23:27:03+03:00, bell@desktop.sanja.is.com.ua +2 -0
  Optimisation todo for loghandler added.
  Debug output information fixed.
  Fixed direct page referencing in write mode.

  storage/maria/ma_loghandler.c@1.58, 2007-10-07 23:26:59+03:00, bell@desktop.sanja.is.com.ua +3 -3
    TODO added.

  storage/maria/ma_pagecache.c@1.49, 2007-10-07 23:26:59+03:00, bell@desktop.sanja.is.com.ua +7 -1
    Debug output information fixed.
    Fixed direct page referencing in write mode.

ChangeSet@1.2476.464.6, 2007-10-06 17:56:52+02:00, serg@janus.mylan +5 -0
  remove maria_* variables from the server, declare them in ha_maria.cc
  note: this does *not* move pagecache* variables.

  sql/mysqld.cc@1.603, 2007-10-06 17:56:49+02:00, serg@janus.mylan +5 -45
    remove maria_* variables from the server, declare them in ha_maria.cc

  sql/set_var.cc@1.244, 2007-10-06 17:56:49+02:00, serg@janus.mylan +2 -23
    remove maria_* variables from the server, declare them in ha_maria.cc

  sql/sql_class.h@1.399.2.2, 2007-10-06 17:56:49+02:00, serg@janus.mylan +32 -36
    remove maria_* variables from the server, declare them in ha_maria.cc

  sql/sql_plugin.cc@1.73.1.1, 2007-10-06 17:56:49+02:00, serg@janus.mylan +2 -0
    bugfix: support for ENUM/SET thd local plugin variables

  storage/maria/ha_maria.cc@1.49, 2007-10-06 17:56:49+02:00, serg@janus.mylan +46 -13
    remove maria_* variables from the server, declare them in ha_maria.cc

ChangeSet@1.2476.464.5, 2007-10-06 11:39:26+02:00, serg@janus.mylan +3 -0
  after-merge fixes for 64bit

  storage/maria/ma_test1.c@1.25, 2007-10-06 11:39:21+02:00, serg@janus.mylan +1 -1
    typo (?) fixed

  storage/maria/maria_def.h@1.42, 2007-10-06 11:39:21+02:00, serg@janus.mylan +2 -2
    after-merge fixes for 64bit

  storage/myisam/myisamdef.h@1.97, 2007-10-06 11:39:22+02:00, serg@janus.mylan +6 -6
    after-merge fixes for 64bit

ChangeSet@1.2476.493.2, 2007-10-06 03:01:30+02:00, tnurnberg@sin.intern.azundris.com +1 -0
  Bug #31253: crash comparing datetime to double
  
  after-merge fixies

  mysql-test/r/type_datetime.result@1.52.1.2, 2007-10-06 03:01:25+02:00, tnurnberg@sin.intern.azundris.com +1 -1
    adjust to 5.1 warning message

ChangeSet@1.2476.1.98, 2007-10-05 20:06:41+02:00, mleich@four.local.lan +5 -0
  1. Fix for Bug#31237 Test "ndb_views" fails because of differing order of select results
  2. Cleanup of test

  mysql-test/suite/funcs_1/r/innodb_views.result@1.10, 2007-10-05 20:06:35+02:00, mleich@four.local.lan +162 -112
    Updated expected results

  mysql-test/suite/funcs_1/r/memory_views.result@1.10, 2007-10-05 20:06:35+02:00, mleich@four.local.lan +162 -112
    Updated expected results

  mysql-test/suite/funcs_1/r/myisam_views.result@1.10, 2007-10-05 20:06:35+02:00, mleich@four.local.lan +9315 -8531
    Updated expected results

  mysql-test/suite/funcs_1/r/ndb_views.result@1.5, 2007-10-05 20:06:35+02:00, mleich@four.local.lan +184 -134
    Updated expected results

  mysql-test/suite/funcs_1/views/views_master.inc@1.9, 2007-10-05 20:06:35+02:00, mleich@four.local.lan +294 -290
    1. Fix for Bug#31237
       Typical changes:
          - Move LIMIT .... from CREATE VIEW statement to the SELECT checking the VIEW content
          - Partially refine the SELECT on the VIEW to get a reproducible result
    2. Cleanup of test
          - replace error numbers by names
          - remove comments and workarounds dedicated to now fixed bugs
          - minor fixes or improvements in comments
          - remove trailing spaces

ChangeSet@1.1810.3379.1, 2007-10-05 19:55:00+02:00, msvensson@pilot.mysql.com +1 -0
  Fixed Bug #27789 "Wrong permissions of sql/share/language directories"

  extra/comp_err.c@1.23.1.8, 2007-10-05 19:54:58+02:00, msvensson@pilot.mysql.com +1 -0
    Override my_mkdir() umask setting. The default is 0700 which perfectly 
    makes sense for the server but leads to Bug #27789 when applied to comp_err
    generated directories in the souce tree. Generated directories and the
    files within won't be accessible to other users, sometimes including root 
    if on a non-local filesystem, making "sudo make install" fail.

ChangeSet@1.1810.3320.14, 2007-10-05 19:28:09+02:00, msvensson@shellback.(none) +1 -0
  Update test case to allow the .reject file to be in either var/log or r/

  mysql-test/t/mysqltest.test@1.24.1.45, 2007-10-05 19:28:07+02:00, msvensson@shellback.(none) +3 -0
    Update test case to allow the .reject file to be in either var/log or r/

ChangeSet@1.1810.3320.13, 2007-10-05 19:23:44+02:00, msvensson@shellback.(none) +2 -0
  Bug#27753 enable mysql-test-run.pl to ignore tests based on wildcard

  mysql-test/lib/mtr_cases.pl@1.12.1.30, 2007-10-05 19:23:42+02:00, msvensson@shellback.(none) +25 -3
    Allow --skip-test and --do-test to take a perl regex

  mysql-test/mysql-test-run.pl@1.30.49.106, 2007-10-05 19:23:42+02:00, msvensson@shellback.(none) +6 -2
    Update usage for --skip-test and --do-test

ChangeSet@1.1810.3376.2, 2007-10-05 13:16:54-04:00, cmiller@zippy.cornsilk.net +14 -0
  Change URLs.
  
  Our web server has been restructured several times, and references
  to it in our source code has stayed the same.  This patch from Paul
  DuBois updates all URLs to modern semantics.

  debian/po/ca.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  debian/po/cs.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  debian/po/da.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  debian/po/gl.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  debian/po/ja.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  debian/po/pt_BR.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  debian/po/sv.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  debian/po/tr.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  mysql-test/lib/mtr_report.pl@1.21.3.6, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +1 -1
    Change URLs.

  mysql-test/mysql-test-run-shell.sh@1.262.22.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +1 -1
    Change URLs.

  netware/mysql_test_run.c@1.18.2.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +1 -1
    Change URLs.

  scripts/mysqld_safe.sh@1.80.1.4, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +1 -1
    Change URLs.

  sql/mysqld.cc@1.439.135.1, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  ndb/include/ndbapi/Ndb.hpp@1.39.15.1, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +1 -1
    Change URLs.

ChangeSet@1.1810.3320.12, 2007-10-05 18:36:23+02:00, msvensson@shellback.(none) +1 -0
  Bug#30560 Valgrind option to mysql-test-run with spaces in cause strange error

  mysql-test/mysql-test-run.pl@1.30.49.105, 2007-10-05 18:36:18+02:00, msvensson@shellback.(none) +1 -1
    Just pass the $opt_valgrind_options to mtr_add_arg - it does a
    "push(@$args, sprintf($format, @fargs));" behind the scenes 

ChangeSet@1.2476.490.6, 2007-10-05 18:24:48+02:00, msvensson@shellback.(none) +1 -0
  Remove printout

  mysql-test/lib/mtr_cases.pl@1.61.1.6, 2007-10-05 18:24:42+02:00, msvensson@shellback.(none) +0 -2
    Remove printout

ChangeSet@1.2476.490.5, 2007-10-05 18:22:28+02:00, msvensson@shellback.(none) +1 -0
  Update for 5.1 format of dirname_part

  client/mysqltest.c@1.317, 2007-10-05 18:22:24+02:00, msvensson@shellback.(none) +2 -2
    Update for 5.1 format of dirname_part

ChangeSet@1.1810.3320.11, 2007-10-05 18:18:50+02:00, msvensson@shellback.(none) +1 -0
  Bug#31398 problems with mysql-test-run, part2
  Write .reject file to r/ if it's writable else use opt_logdir 

  client/mysqltest.c@1.155.9.118, 2007-10-05 18:18:47+02:00, msvensson@shellback.(none) +15 -4
    Write .reject file to r/ if it's writable else use opt_logdir 

ChangeSet@1.1810.3320.10, 2007-10-05 17:54:19+02:00, msvensson@shellback.(none) +1 -0
  Bug#31398 problems with mysql-test-run
   - "mysqld --verbose --help" need to be started in a writable directory 

  mysql-test/mysql-test-run.pl@1.30.49.104, 2007-10-05 17:54:16+02:00, msvensson@shellback.(none) +3 -2
    Create a tmpdir where mysqld can peform it's lowercase or uppercase test

ChangeSet@1.2476.497.1, 2007-10-05 17:28:34+03:00, gkodinov@magare.gmz +7 -0
  Bug #31094: Forcing index-based sort doesn't work anymore if joins are done
  
  A rule was introduced by the 5.1 part of the fix for bug 27531 to 
  prefer filesort over indexed ORDER BY when accessing all of the rows of a 
  table (because it's faster). This new rule was not accounting for the 
  presence of a LIMIT clause.
  Fixed the condition for this rule so it will prefer filesort over 
  indexed ORDER BY only if no LIMIT.

  mysql-test/r/compress.result@1.12, 2007-10-05 17:28:31+03:00, gkodinov@magare.gmz +2 -2
    Bug #31094: LIMIT is not considered a full index scan

  mysql-test/r/join.result@1.50, 2007-10-05 17:28:31+03:00, gkodinov@magare.gmz +164 -0
    Bug #31094: test case

  mysql-test/r/select.result@1.167, 2007-10-05 17:28:31+03:00, gkodinov@magare.gmz +2 -2
    Bug #31094: LIMIT is not considered a full index scan

  mysql-test/r/ssl.result@1.10, 2007-10-05 17:28:31+03:00, gkodinov@magare.gmz +2 -2
    Bug #31094: LIMIT is not considered a full index scan

  mysql-test/r/ssl_compress.result@1.10, 2007-10-05 17:28:31+03:00, gkodinov@magare.gmz +2 -2
    Bug #31094: LIMIT is not considered a full index scan

  mysql-test/t/join.test@1.43, 2007-10-05 17:28:31+03:00, gkodinov@magare.gmz +29 -0
    Bug #31094: test case

  sql/sql_select.cc@1.541.23.6, 2007-10-05 17:28:31+03:00, gkodinov@magare.gmz +6 -6
    Bug #31094: prefer filesort over indexed ORDER BY only if no LIMIT

ChangeSet@1.2476.496.1, 2007-10-05 14:42:38+02:00, msvensson@shellback.(none) +1 -0
  Bug#31400 mysql-test-run inconvenience problems running a certain test
   - Allow test case names to be specied in various different ways

  mysql-test/lib/mtr_cases.pl@1.61.1.5, 2007-10-05 14:42:34+02:00, msvensson@shellback.(none) +83 -63
    Allow test name to be specified in all sorts of ways:
    mysql-test-run alias
    mysql-test-run alias.test
    mysql-test-run main.alias
    mysql-test-run main.alias.test
    mysql-test-run t/alias
    mysql-test-run t/alias.test

ChangeSet@1.2476.495.1, 2007-10-05 16:35:01+04:00, anozdrin@station. +4 -0
  Fix for BUG#20550: Stored function: wrong RETURN type metadata
  when used in a VIEW.
  
  The problem was that wrong function (create_tmp_from_item())
  was used to create a temporary field for Item_func_sp.
  
  The fix is to use create_tmp_from_field().

  mysql-test/r/sp.result@1.292.1.1, 2007-10-05 16:34:58+04:00, anozdrin@station. +49 -1
    Update result file.

  mysql-test/t/sp.test@1.256.1.1, 2007-10-05 16:34:58+04:00, anozdrin@station. +84 -0
    Add a test case for BUG#20550.

  sql/item_func.h@1.157.16.1, 2007-10-05 16:34:58+04:00, anozdrin@station. +5 -0
    Add a getter for Item_func_sp::sp_result_field.

  sql/sql_select.cc@1.541.28.1, 2007-10-05 16:34:58+04:00, anozdrin@station. +30 -0
    Use create_tmp_from_field() to create a temporary field
    for Item_func_sp.

ChangeSet@1.1810.3306.7, 2007-10-05 16:33:15+05:00, ramil@mysql.com +3 -0
  Fix for bug #30885: MEMORY returns incorrect data if BTREE index is used for NULL lookup
  
  Problem: creating an rb-tree key we store length (2 bytes) before the actual data for 
  varchar key parts. The fact was missed for NULL key parts, when we set NULL byte and 
  skip the rest.
  
  Fix: take into account the length of the varchar key parts for NULLs.

  mysql-test/r/heap_btree.result@1.18.3.1, 2007-10-05 16:33:14+05:00, ramil@mysql.com +8 -0
    Fix for bug #30885: MEMORY returns incorrect data if BTREE index is used for NULL lookup
      -test result.

  mysql-test/t/heap_btree.test@1.20.3.1, 2007-10-05 16:33:14+05:00, ramil@mysql.com +9 -0
    Fix for bug #30885: MEMORY returns incorrect data if BTREE index is used for NULL lookup
      - test case.

  heap/hp_hash.c@1.38.11.1, 2007-10-05 16:33:14+05:00, ramil@mysql.com +6 -0
    Fix for bug #30885: MEMORY returns incorrect data if BTREE index is used for NULL lookup
      - skip varchar key parts length (2 byte) for null key parts.

ChangeSet@1.1616.3104.1, 2007-10-05 15:40:32+05:00, holyfoot@mysql.com +4 -0
  Bug #30286 spatial index cause corruption and server crash!
  
  As the result of DOUBLE claculations can be bigger
  than DBL_MAX constant we use in code, we shouldn't use this constatn
  as a biggest possible value.
  Particularly the rtree_pick_key function set 'min_area= DBL_MAX' relying
  that any rtree_area_increase result will be less so we return valid
  key. Though in rtree_area_increase function we calculate the area
  of the rectangle, so the result can be 'inf' if the rectangle is
  huge enough, which is bigger than DBL_MAX.
  
  Code of the rtree_pick_key modified so we always return a valid key.

  mysql-test/r/gis-rtree.result@1.8.1.8, 2007-10-05 15:40:31+05:00, holyfoot@mysql.com +31 -0
    Bug #30286 spatial index cause corruption and server crash!
    test result

  mysql-test/t/gis-rtree.test@1.9.1.7, 2007-10-05 15:40:31+05:00, holyfoot@mysql.com +36 -0
    Bug #30286 spatial index cause corruption and server crash!
    test case

  myisam/rt_index.c@1.16.6.4, 2007-10-05 15:40:31+05:00, holyfoot@mysql.com +5 -13
    Bug #30286 spatial index cause corruption and server crash!
    
    always set the best_key with the first key we get, so we always return
    somthing valid.

  myisam/rt_mbr.c@1.9.4.1, 2007-10-05 15:40:31+05:00, holyfoot@mysql.com +4 -1
    Bug #30286 spatial index cause corruption and server crash!
    
    function comment extended

ChangeSet@1.1810.3377.1, 2007-10-05 12:08:38+02:00, tnurnberg@sin.intern.azundris.com +3 -0
  Bug #31253: crash comparing datetime to double
  
  convert(<invalid time>, datetime) in WHERE caused crash as function
  returned (void*)NULL, but did not flag SQL NULL. It does now.

  mysql-test/r/type_datetime.result@1.30.8.1, 2007-10-05 12:08:36+02:00, tnurnberg@sin.intern.azundris.com +9 -0
    show that convert() to datetime in a WHERE-clause will no longer crash
    the server on invalid input.

  mysql-test/t/type_datetime.test@1.18.8.1, 2007-10-05 12:08:36+02:00, tnurnberg@sin.intern.azundris.com +10 -0
    show that convert() to datetime in a WHERE-clause will no longer crash
    the server on invalid input.

  sql/item.cc@1.113.98.1, 2007-10-05 12:08:36+02:00, tnurnberg@sin.intern.azundris.com +1 -0
    When failing to process time values, do not just return (void*)NULL,
    but flag SQL NULL as well so no caller will try to process the 0x0L.
    This makes behaviour for Item::Item::val_decimal_from_date() and
    Item::Item::val_decimal_from_time() identical.

ChangeSet@1.1810.3375.1, 2007-10-05 09:38:57+02:00, tnurnberg@sin.intern.azundris.com +3 -0
  Bug#31227: memory overrun with decimal (6,6) and zerofill and group_concat
  
  Reserve the space for the leading 0 (before the decimal point) in DECIMAL(a,a) ZEROFILL.

  mysql-test/r/type_decimal.result@1.38.1.6, 2007-10-05 09:38:55+02:00, tnurnberg@sin.intern.azundris.com +8 -0
    show that we allocate a large enough buffer for output of DECIMAL(a,a) [ZEROFILL].

  mysql-test/t/type_decimal.test@1.34, 2007-10-05 09:38:55+02:00, tnurnberg@sin.intern.azundris.com +12 -1
    show that we allocate a large enough buffer for output of DECIMAL(a,a) [ZEROFILL].
    without patch for bug#31227, valgrind will complain here; so will a
    debug build.

  sql/my_decimal.cc@1.11.3.2, 2007-10-05 09:38:55+02:00, tnurnberg@sin.intern.azundris.com +29 -10
    Reserve the space for the leading 0 (before the decimal point) in DECIMAL(a,a) ZEROFILL.
    Doxygenise preamble of my_decimal2string().

ChangeSet@1.1810.3370.2, 2007-10-05 12:29:02+05:00, gluh@mysql.com +2 -0
  test fix(to satisfy WIN)

  mysql-test/r/information_schema.result@1.87.4.10, 2007-10-05 12:29:01+05:00, gluh@mysql.com +4 -4
    result fix

  mysql-test/t/information_schema.test@1.65.4.8, 2007-10-05 12:29:01+05:00, gluh@mysql.com +2 -2
    test fix(to satisfy WIN)

ChangeSet@1.1810.3374.1, 2007-10-05 12:15:11+05:00, bar@mysql.com +11 -0
  Bug#31081 server crash in regexp function
  Problem: The "regex" library written by Henry Spencer
  does not support tricky character sets like UCS2.
  Fix: convert tricky character sets to UTF8 before calling
  regex functions.

  mysql-test/include/ctype_regex.inc@1.1, 2007-10-05 12:15:09+05:00, bar@mysql.com +42 -0
    New BitKeeper file ``mysql-test/include/ctype_regex.inc''
    
    Moving common regular expression tests into a separate
    file and uncluding it into func_regexp and into many ctype_xxx tests.
    

  mysql-test/include/ctype_regex.inc@1.0, 2007-10-05 12:15:09+05:00, bar@mysql.com +0 -0

  mysql-test/r/ctype_uca.result@1.19.1.1, 2007-10-05 12:15:09+05:00, bar@mysql.com +45 -0
    Adding tests

  mysql-test/r/ctype_ucs.result@1.39.1.17, 2007-10-05 12:15:09+05:00, bar@mysql.com +45 -0
    Adding tests

  mysql-test/r/ctype_utf8.result@1.85.1.23, 2007-10-05 12:15:09+05:00, bar@mysql.com +45 -0
    Adding tests

  mysql-test/r/func_regexp.result@1.10.1.2, 2007-10-05 12:15:09+05:00, bar@mysql.com +13 -1
    Adding tests

  mysql-test/t/ctype_uca.test@1.17.2.1, 2007-10-05 12:15:09+05:00, bar@mysql.com +4 -0
    Adding tests

  mysql-test/t/ctype_ucs.test@1.36.1.18, 2007-10-05 12:15:09+05:00, bar@mysql.com +4 -0
    Adding tests

  mysql-test/t/ctype_utf8.test@1.84.1.15, 2007-10-05 12:15:09+05:00, bar@mysql.com +7 -0
    Adding tests

  mysql-test/t/func_regexp.test@1.10, 2007-10-05 12:15:09+05:00, bar@mysql.com +2 -21
    Adding tests

  sql/item_cmpfunc.cc@1.187.48.1, 2007-10-05 12:15:09+05:00, bar@mysql.com +72 -50
    - Adding new method Item_func_regex::regcomp()
    to share more code between fix_fields() and val_int()
    - Adding conversion from ASCII-incompatible charsets like UCS2
    to UTF8, because the "regexp" does not support these charsets
    - Additional optimization: calculate flags for regcomp only
      once in fix_fields, instead of every regcomp()

  sql/item_cmpfunc.h@1.122.22.1, 2007-10-05 12:15:09+05:00, bar@mysql.com +4 -0
    Adding prototypes for new members and methods

ChangeSet@1.2476.487.2, 2007-10-04 17:34:28-07:00, acurtis@xiphis.org +1 -0
  fix undefined variable which can lead to crash

  sql/sql_plugin.cc@1.75, 2007-10-04 17:34:23-07:00, acurtis@xiphis.org +3 -2
    fix undefined variable which can lead to crash

ChangeSet@1.1810.3373.1, 2007-10-04 17:34:41-03:00, davi@moksha.local +1 -0
  Bug#21587 FLUSH TABLES causes server crash when used with HANDLER statements
  
  This bug is a symptom of the way handler's tables are managed. The
  most different aspect, compared to the conventional behavior, is that
  the handler's tables are long lived, meaning that their lifetimes are
  not bounded by the duration of the command that opened them. For this
  effect the handler code uses its own list (handler_tables instead of
  open_tables) to hold open handler tables so that the tables won't be
  closed at the end of the command/statement. Besides the handler_tables
  list, there is a hash (handler_tables_hash) which is used to associate
  handler aliases to tables and to refresh the tables upon demand (flush
  tables).
  
  The current implementation doesn't work properly with refreshed tables
  -- more precisely when flush commands are issued by other initiators.
  This happens because when a handler open or read statement is being
  processed, the associated table has to be opened or locked and, for this
  matter, the open_tables and handler_tables lists are swapped so that the
  new table being opened is inserted into the handler_tables list. But when
  opening or locking the table, if the refresh version is different from the
  thread refresh version then all used tables in the open_tables list (now
  handler_tables) are refreshed. In the "refreshing" process the handler
  tables are flushed (closed) without being properly unlinked from the
  handler hash.
  
  The current implementation also fails to properly discard handlers of
  dropped tables, but this and other problems are going to be addressed
  in the fixes for bugs 31397 and 31409.
  
  The chosen approach tries to properly save and restore the table state
  so that no table is flushed during the table open and lock operations.
  The logic is almost the same as before with the list swapping, but with
  a working glue code.
  
  The test case for this bug is going to be committed into 5.1 because it
  requires a test feature only avaiable in 5.1 (wait_condition).

  sql/sql_handler.cc@1.72.1.20, 2007-10-04 17:34:38-03:00, davi@moksha.local +41 -12
    Backup and reset the open_tables and handler_table lists when opening
    a new handler table and merge the opened table into the handler_tables
    list afterwards. When locking, do the same but possibly close the table
    if a refresh is pending.

ChangeSet@1.2476.487.1, 2007-10-04 10:55:08-07:00, acurtis@xiphis.org +3 -0
  Bug#31382
    "Disabled plugin is provoking Valgrind error"
    If there are any auto-alloced string plug-in options, memory is
    allocated during the call for handle_options(). We must free this
    memory if we are not installing the plug-in.

  include/my_getopt.h@1.24, 2007-10-04 10:55:05-07:00, acurtis@xiphis.org +1 -0
    bug31382
      new function: my_cleanup_options()

  mysys/my_getopt.c@1.73.1.1, 2007-10-04 10:55:05-07:00, acurtis@xiphis.org +43 -3
    bug31382
      new function: my_cleanup_options(), fini_one_value()
      alter init_variables() to take an extra option.
      forward declare init_one_value() and fini_one_value()

  sql/sql_plugin.cc@1.74, 2007-10-04 10:55:05-07:00, acurtis@xiphis.org +7 -3
    bug31382
      after calling handle_options(), make sure to call my_cleanup_options()
      if we are not installing the plug-in.

ChangeSet@1.2476.479.7, 2007-10-04 19:46:01+02:00, pekka@sama.ndb.mysql.com +1 -0
  ndb - wl#29390 post-merge 5.0 to 5.1

  storage/ndb/src/ndbapi/ndberror.c@1.96, 2007-10-04 19:44:53+02:00, pekka@sama.ndb.mysql.com +1 -0
    wl#29390 post-merge 5.0 to 5.1

ChangeSet@1.2476.464.3, 2007-10-04 20:33:42+03:00, jani@hynda.mysql.fi +32 -0
  After merge fixes. Applied changes made in myisam manually to maria.
  

  include/maria.h@1.16, 2007-10-04 20:28:44+03:00, jani@hynda.mysql.fi +4 -4
    After merge fixes. Applied changes made in myisam manually to maria.
    

  mysql-test/r/maria.result@1.19, 2007-10-04 20:28:44+03:00, jani@hynda.mysql.fi +4 -4
    After merge fixes. Applied changes made in myisam manually to maria.
    

  storage/maria/CMakeLists.txt@1.4, 2007-10-04 20:28:44+03:00, jani@hynda.mysql.fi +64 -1
    After merge fixes. Applied changes made in myisam manually to maria.
    

  storage/maria/ha_maria.cc@1.47, 2007-10-04 20:28:44+03:00, jani@hynda.mysql.fi +90 -11
    After merge fixes. Applied changes made in myisam manually to maria.
    

  storage/maria/ha_maria.h@1.16, 2007-10-04 20:28:44+03:00, jani@hynda.mysql.fi +14 -7
    After merge fixes. Applied changes made in myisam manually to maria.
    

  storage/maria/ma_check.c@1.43.1.1, 2007-10-04 20:28:44+03:00, jani@hynda.mysql.fi +7 -6
    After merge fixes. Applied changes made in myisam manually to maria.
    

  storage/maria/ma_create.c@1.29.1.1, 2007-10-04 20:28:44+03:00, jani@hynda.mysql.fi +3 -2
    After merge fixes. Applied changes made in myisam manually to maria.
    

  storage/maria/ma_delete.c@1.13.1.1, 2007-10-04 20:28:44+03:00, jani@hynda.mysql.fi +7 -5
    After merge fixes. Applied changes made in myisam manually to maria.
    

  storage/maria/ma_dynrec.c@1.18, 2007-10-04 20:28:44+03:00, jani@hynda.mysql.fi +18 -18
    After merge fixes. Applied changes made in myisam manually to maria.
    

  storage/maria/ma_extra.c@1.19, 2007-10-04 20:28:44+03:00, jani@hynda.mysql.fi +6 -39
    After merge fixes. Applied changes made in myisam manually to maria.
    

  storage/maria/ma_init.c@1.14, 2007-10-04 20:28:44+03:00, jani@hynda.mysql.fi +1 -0
    After merge fixes. Applied changes made in myisam manually to maria.
    

  storage/maria/ma_key.c@1.10, 2007-10-04 20:28:44+03:00, jani@hynda.mysql.fi +3 -2
    After merge fixes. Applied changes made in myisam manually to maria.
    

  storage/maria/ma_keycache.c@1.6, 2007-10-04 20:28:44+03:00, jani@hynda.mysql.fi +2 -1
    After merge fixes. Applied changes made in myisam manually to maria.
    

  storage/maria/ma_locking.c@1.16, 2007-10-04 20:28:44+03:00, jani@hynda.mysql.fi +2 -2
    After merge fixes. Applied changes made in myisam manually to maria.
    

  storage/maria/ma_open.c@1.30.1.1, 2007-10-04 20:28:44+03:00, jani@hynda.mysql.fi +11 -10
    After merge fixes. Applied changes made in myisam manually to maria.
    

  storage/maria/ma_packrec.c@1.14, 2007-10-04 20:28:44+03:00, jani@hynda.mysql.fi +4 -4
    After merge fixes. Applied changes made in myisam manually to maria.
    

  storage/maria/ma_page.c@1.13, 2007-10-04 20:28:44+03:00, jani@hynda.mysql.fi +3 -2
    After merge fixes. Applied changes made in myisam manually to maria.
    

  storage/maria/ma_pagecache.c@1.43.1.1, 2007-10-04 20:28:44+03:00, jani@hynda.mysql.fi +1 -2
    After merge fixes. Applied changes made in myisam manually to maria.
    

  storage/maria/ma_rkey.c@1.10, 2007-10-04 20:28:44+03:00, jani@hynda.mysql.fi +52 -31
    After merge fixes. Applied changes made in myisam manually to maria.
    

  storage/maria/ma_search.c@1.12, 2007-10-04 20:28:44+03:00, jani@hynda.mysql.fi +1 -1
    After merge fixes. Applied changes made in myisam manually to maria.
    

  storage/maria/ma_sort.c@1.11, 2007-10-04 20:28:44+03:00, jani@hynda.mysql.fi +51 -52
    After merge fixes. Applied changes made in myisam manually to maria.
    

  storage/maria/ma_sp_key.c@1.6, 2007-10-04 20:33:38+03:00, jani@hynda.mysql.fi +30 -43
    After merge fixes. Applied changes made in myisam manually to maria.

  storage/maria/ma_sp_test.c@1.5, 2007-10-04 20:33:38+03:00, jani@hynda.mysql.fi +17 -17
    After merge fixes. Applied changes made in myisam manually to maria.

  storage/maria/ma_statrec.c@1.9, 2007-10-04 20:33:38+03:00, jani@hynda.mysql.fi +15 -19
    After merge fixes. Applied changes made in myisam manually to maria.

  storage/maria/ma_test1.c@1.24, 2007-10-04 20:33:38+03:00, jani@hynda.mysql.fi +38 -36
    After merge fixes. Applied changes made in myisam manually to maria.
    
    Fixed memory leak.

  storage/maria/ma_test2.c@1.23, 2007-10-04 20:33:38+03:00, jani@hynda.mysql.fi +26 -20
    After merge fixes. Applied changes made in myisam manually to maria.
    
    Fixed memory leak.

  storage/maria/ma_test3.c@1.10, 2007-10-04 20:33:38+03:00, jani@hynda.mysql.fi +10 -10
    After merge fixes. Applied changes made in myisam manually to maria.

  storage/maria/ma_update.c@1.12.1.1, 2007-10-04 20:33:38+03:00, jani@hynda.mysql.fi +3 -3
    After merge fixes. Applied changes made in myisam manually to maria.

  storage/maria/ma_write.c@1.17.1.1, 2007-10-04 20:33:38+03:00, jani@hynda.mysql.fi +4 -4
    After merge fixes. Applied changes made in myisam manually to maria.

  storage/maria/maria_chk.c@1.21.1.1, 2007-10-04 20:33:38+03:00, jani@hynda.mysql.fi +2 -2
    After merge fixes. Applied changes made in myisam manually to maria.

  storage/maria/maria_def.h@1.37.1.1, 2007-10-04 20:33:38+03:00, jani@hynda.mysql.fi +14 -14
    After merge fixes. Applied changes made in myisam manually to maria.

  storage/maria/maria_pack.c@1.15, 2007-10-04 20:33:38+03:00, jani@hynda.mysql.fi +3 -3
    After merge fixes. Applied changes made in myisam manually to maria.

ChangeSet@1.1810.3372.1, 2007-10-04 18:46:31+03:00, aelkin@koti.dsl.inet.fi +5 -0
  Bug #29309 Incorrect "Seconds_Behind_Master" value in SHOW SLAVE STATUS after FLUSH LOGS
  
  Report claims that Seconds_behind_master behaves unexpectedly. 
  
  Code analysis shows that there is an evident flaw in that treating of FormatDescription event is wrong
  so  that after FLUSH LOGS on slave the Seconds_behind_master's calculation slips and incorrect
  value can be reported to SHOW SLAVE STATUS. 
  Even worse is that the gap between the correct and incorrect deltas grows with time.
  
  Fixed with prohibiting changes to rpl->last_master_timestamp by artifical events (any kind of).
  suggestion as comments is added how to fight with lack of info on the slave side by means of
  new heartbeat feature coming.
  
  The test can not be done ealily fully determistic.

  mysql-test/suite/manual/r/rpl_replication_delay.result@1.1, 2007-10-04 18:46:29+03:00, aelkin@koti.dsl.inet.fi +121 -0
    result are not deterministic though there are comments saying the most probable expected
    value for Seconds_behind_master

  mysql-test/suite/manual/r/rpl_replication_delay.result@1.0, 2007-10-04 18:46:29+03:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/suite/manual/t/rpl_replication_delay-slave.opt@1.1, 2007-10-04 18:46:29+03:00, aelkin@koti.dsl.inet.fi +1 -0
    bug emulation

  mysql-test/suite/manual/t/rpl_replication_delay-slave.opt@1.0, 2007-10-04 18:46:29+03:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/suite/manual/t/rpl_replication_delay.test@1.1, 2007-10-04 18:46:29+03:00, aelkin@koti.dsl.inet.fi +71 -0
    specic test for bug#29309. It's hard to make it reliable as it deals with timestamps.
    (a way to automate the test like this is to have I_S table for show slave status' fields)
    
    A possible way to check results is to run
    grep -i 'show\|seconds' < suite/manual/r/rpl_replication_delay.reject and to get the lines like these:
    
    show slave status /* Second_behind reports 0 */;;
    Seconds_Behind_Master   0
    show slave status /* bug emulated: reports slave threads starting time about 3*3 not 3 secs */;;
    Seconds_Behind_Master   9
    show slave status /* reports the correct diff with master query time about 3+3 secs */;;
    Seconds_Behind_Master   6
    
    Due to time discreteness of time the reported numbers may slightly vary. That's why the test is not reliable.
     

  mysql-test/suite/manual/t/rpl_replication_delay.test@1.0, 2007-10-04 18:46:29+03:00, aelkin@koti.dsl.inet.fi +0 -0

  sql/log_event.cc@1.174.27.1, 2007-10-04 18:46:28+03:00, aelkin@koti.dsl.inet.fi +31 -1
    changing timestamp is affirmed only by non-artificial events. Artifical FD won't change it anymore.
    The simulation code is off unless server is started with the args from the opt-file.
    The simulation code assumes that it will execute specific schedule generated by rpl_replication_delay.test.

  sql/slave.cc@1.241.28.3, 2007-10-04 18:46:29+03:00, aelkin@koti.dsl.inet.fi +10 -1
    Comments are changed to announce a new possibility to cope with
    Seconds_behind_master jumping due to EOF special treatment (reset of the timestamp)

ChangeSet@1.1810.3323.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.1810.3355.2, 2007-10-04 16:08:13+02:00, df@pippilotta.erinye.com +3 -0
  apply patch for bug#31035 to 5.0.50 release clone

  mysql-test/r/sp.result@1.170.28.29, 2007-10-04 16:08:11+02:00, df@pippilotta.erinye.com +176 -0
    apply patch for bug#31035

  mysql-test/t/sp.test@1.174.28.26, 2007-10-04 16:08:12+02:00, df@pippilotta.erinye.com +290 -0
    apply patch for bug#31035

  sql/item_func.cc@1.270.87.1, 2007-10-04 16:08:12+02:00, df@pippilotta.erinye.com +11 -2
    apply patch for bug#31035

ChangeSet@1.1810.3371.1, 2007-10-04 17:19:14+04:00, anozdrin@station. +3 -0
  Fix for BUG#31035: select from function, group by result crasher.
  
  This actually, fix for the patch for bug-27354. The problem with
  the patch was that Item_func_sp::used_tables() was updated, but
  Item_func_sp::const_item() was not. So, for Item_func_sp, we had
  the following inconsistency:
    - used_tables() returned RAND_TABLE, which means that the item
      can produce "random" results;
    - but const_item() returned TRUE, which means that the item is
      a constant one.
  
  The fix is to change Item_func_sp::const_item() behaviour: it must
  return TRUE (an item is a constant one) only if a stored function
  is deterministic and each of its arguments (if any) is a constant
  item.

  mysql-test/r/sp.result@1.170.49.1, 2007-10-04 17:19:13+04:00, anozdrin@station. +176 -0
    Update result file.

  mysql-test/t/sp.test@1.174.49.1, 2007-10-04 17:19:13+04:00, anozdrin@station. +290 -0
    Add test cases for BUG-31035, BUG-31191, BUG-31226

  sql/item_func.cc@1.270.86.1, 2007-10-04 17:19:13+04:00, anozdrin@station. +11 -2
    Make Item::const_item() be consistent with Item::used_tables().

ChangeSet@1.2476.468.4, 2007-10-04 14:56:33+02:00, mattiasj@mattiasj-laptop.(none) +3 -0
  Bug #30484: Partitions: crash with self-referencing trigger
  
  Two cases in ha_partition::extra() was missing
  (HA_EXTRA_DELETE_CANNOT_BATCH and HA_EXTRA_UPDATE_CANNOT_BATCH)
  which only is currently used by NDB (which not uses ha_partition)

  mysql-test/r/partition.result@1.69, 2007-10-04 14:56:29+02:00, mattiasj@mattiasj-laptop.(none) +4 -0
    Added result for test of Bug #30484

  mysql-test/t/partition.test@1.63, 2007-10-04 14:56:29+02:00, mattiasj@mattiasj-laptop.(none) +9 -0
    Added test for Bug #30484

  sql/ha_partition.cc@1.103.2.2, 2007-10-04 14:56:29+02:00, mattiasj@mattiasj-laptop.(none) +18 -0
    Added HA_EXTRA_DELETE_CANNOT_BATCH and HA_EXTRA_UPDATE_CANNOT_BATCH
    in ha_partition::extra to do nothing
    (Only currently used in NDB, which is not dependent of ha_partition)

ChangeSet@1.2476.484.4, 2007-10-04 17:08:59+05:00, gluh@mysql.com +1 -0
  after merge fix

  sql/sql_parse.cc@1.683.18.2, 2007-10-04 17:08:57+05:00, gluh@mysql.com +2 -2
    after merge fix

ChangeSet@1.1810.3370.1, 2007-10-04 16:20:56+05:00, gluh@mysql.com +3 -0
  Bug#30079 A check for "hidden" I_S tables is flawed
  added check for hidden I_S tables for 'show columns|keys' commands

  mysql-test/r/information_schema.result@1.87.4.9, 2007-10-04 16:20:54+05:00, gluh@mysql.com +4 -0
    test result

  mysql-test/t/information_schema.test@1.65.4.7, 2007-10-04 16:20:54+05:00, gluh@mysql.com +9 -0
    test case

  sql/sql_parse.cc@1.426.168.1, 2007-10-04 16:20:54+05:00, gluh@mysql.com +6 -1
    added check for hidden I_S tables for 'show columns|keys' commands

ChangeSet@1.2476.484.2, 2007-10-04 15:35:45+05:00, gluh@mysql.com +4 -0
  after merge fix

  client/client_priv.h@1.74.2.2, 2007-10-04 15:35:43+05:00, gluh@mysql.com +2 -3
    after merge fix

  client/mysqldump.c@1.268.29.2, 2007-10-04 15:35:43+05:00, gluh@mysql.com +1 -1
    after merge fix

  mysql-test/r/mysqldump.result@1.159.3.2, 2007-10-04 15:35:43+05:00, gluh@mysql.com +29 -146
    after merge fix

  mysql-test/r/view_grant.result@1.36.1.2, 2007-10-04 15:35:43+05:00, gluh@mysql.com +13 -11
    after merge fix

ChangeSet@1.1616.3103.1, 2007-10-04 14:22:35+04:00, kaa@polly.(none) +3 -0
  Backport of the 5.0 patch to 4.1
  
  Bug#28878: InnoDB tables with UTF8 character set and indexes cause  wrong result for DML
  When making key reference buffers over CHAR fields whitespace (0x20) must be used to fill in the remaining space in the field's buffer. This is what Field_string::store() does. Fixed Field_string::get_key_image() to do the same.

  mysql-test/t/innodb_mysql.test@1.3.3.7, 2007-10-04 14:22:30+04:00, kaa@polly.(none) +32 -0
    Bug#28878: test case

  mysql-test/r/innodb_mysql.result@1.3.3.7, 2007-10-04 14:22:30+04:00, kaa@polly.(none) +36 -0
    Bug#28878: test case

  sql/field.cc@1.197.1.40, 2007-10-04 14:22:30+04:00, kaa@polly.(none) +2 -1
    Bug#28878: Fill with space instead of binary zeros.

ChangeSet@1.2476.478.6, 2007-10-04 13:13:04+03:00, aelkin@koti.dsl.inet.fi +1 -0
  manual merge

  sql/log.h@1.31, 2007-10-04 13:12:58+03:00, aelkin@koti.dsl.inet.fi +7 -1
    manual merge: moving 5.0 hunk into the correct file.

ChangeSet@1.1810.3217.16, 2007-10-04 11:32:49+02:00, pekka@sama.ndb.mysql.com +10 -0
  ndb - bug#29390: if ScanFilter is too large, abort or optionally discard it

  mysql-test/r/ndb_condition_pushdown.result@1.15.1.8, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +22 -0
    if ScanFilter is too large, abort or optionaly discard it

  mysql-test/t/ndb_condition_pushdown.test@1.16.1.5, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +1025 -0
    if ScanFilter is too large, abort or optionaly discard it

  sql/ha_ndbcluster_cond.cc@1.4.1.2, 2007-10-04 10:52:14+02:00, pekka@sama.ndb.mysql.com +17 -3
    if ScanFilter is too large, abort or optionaly discard it

  ndb/include/kernel/signaldata/ScanTab.hpp@1.13.3.1, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +1 -0
    if ScanFilter is too large, abort or optionaly discard it

  ndb/include/ndbapi/Ndb.hpp@1.39.14.1, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +1 -0
    if ScanFilter is too large, abort or optionaly discard it

  ndb/include/ndbapi/NdbScanFilter.hpp@1.7.2.1, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +27 -2
    if ScanFilter is too large, abort or optionaly discard it

  ndb/include/ndbapi/ndbapi_limits.h@1.7.3.1, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +2 -0
    if ScanFilter is too large, abort or optionaly discard it

  ndb/src/ndbapi/NdbScanFilter.cpp@1.8.8.1, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +187 -21
    if ScanFilter is too large, abort or optionaly discard it

  ndb/src/ndbapi/NdbScanOperation.cpp@1.66.33.1, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +4 -0
    if ScanFilter is too large, abort or optionaly discard it

  ndb/src/ndbapi/ndberror.c@1.30.41.1, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +2 -1
    if ScanFilter is too large, abort or optionaly discard it

ChangeSet@1.1810.3369.1, 2007-10-04 11:30:30+02:00, jperkin@production.mysql.com +3 -0
  Restore creation of test databases and the anonymous user which
  were accidentally removed during a previous rototill of this
  code.  Fixes bug#27692.
    
  While it can be argued we should strive to provide a 'secure by
  default' installation, this happens to be the setup currently
  documented in the manual as the default, so defer changes that
  improve security out of the box to a co-ordinated effort later
  on.
    
  For now, make a note about the test databases and anonymous user
  in mysql_install_db and recommend that mysql_secure_installation
  be ran for users wishing to remove these defaults.
  
  [..re-commit of previously lost change..]

  mysql-test/mysql-test-run.pl@1.30.94.1, 2007-10-04 11:28:01+02:00, jperkin@production.mysql.com +1 -0
    Add a comment where removing anonymous users.

  scripts/mysql_install_db.sh@1.64.1.36, 2007-09-24 15:40:38+02:00, jperkin@production.mysql.com +9 -0
    Point users at the mysql_secure_installation script.

  scripts/mysql_system_tables_data.sql@1.1.1.3, 2007-09-24 15:36:05+02:00, jperkin@production.mysql.com +2 -0
    Add anonymous accounts.

ChangeSet@1.1810.3306.6, 2007-10-04 12:34:00+04:00, kaa@polly.(none) +4 -0
  Issue a warning if a user sets an option or a variable to a value that is greater than a defined maximum for the option/variable.
  
  This is for bug #29446 "Specifying a myisam_sort_buffer > 4GB on 64 bit machines not possible". Support for myisam_sort_buffer_size > 4 GB on 64-bit Windows will be looked at later in 5.2.

  mysql-test/r/variables.result@1.76.1.17, 2007-10-04 12:33:56+04:00, kaa@polly.(none) +2 -0
    Fixed the test.

  mysql-test/t/variables.test@1.51.1.17, 2007-10-04 12:33:56+04:00, kaa@polly.(none) +1 -0
    Fixed the test.

  mysys/my_getopt.c@1.55.1.8, 2007-10-04 12:33:56+04:00, kaa@polly.(none) +16 -0
    Print a warning to the error log if a user sets an option to a value greater than the option's maximum value.

  sql/set_var.cc@1.125.37.1, 2007-10-04 12:33:56+04:00, kaa@polly.(none) +15 -0
    Issue an SQL warning if a user assignes a value greater than the variable's maximum value.

ChangeSet@1.1810.3352.8, 2007-10-04 13:06:01+05:00, bar@mysql.com +3 -0
  Bug#29323 mysql client only accetps ANSI encoded files
  Fix: ignore BOM marker in the first line.

  client/mysql.cc@1.199.29.1, 2007-10-04 13:05:59+05:00, bar@mysql.com +11 -0
    Skip BOM marker in the very first line.

  mysql-test/r/mysql.result@1.17.2.15, 2007-10-04 13:05:59+05:00, bar@mysql.com +2 -0
    Adding test

  mysql-test/t/mysql.test@1.4.1.29, 2007-10-04 13:05:59+05:00, bar@mysql.com +9 -0
    Adding test

ChangeSet@1.1810.3296.2, 2007-10-04 09:15:26+02:00, mhansson@linux-st28.site +3 -0
  Bug #30942: select str_to_date from derived table returns varying results
  
  The function str_to_date has a field to say whether it's invoked constant 
  arguments. But this member was not initialized, causing the function to
  think that it could use a cache of the format type when said cache was in 
  fact not initialized.
  Fixed by initializing the field to false.

  mysql-test/r/type_date.result@1.13.4.2, 2007-10-04 09:15:24+02:00, mhansson@linux-st28.site +10 -0
    Bug#30942: Test result

  mysql-test/t/type_date.test@1.14.3.2, 2007-10-04 09:15:25+02:00, mhansson@linux-st28.site +13 -0
    Bug#30942: Test case

  sql/item_timefunc.h@1.63.5.2, 2007-10-04 09:15:25+02:00, mhansson@linux-st28.site +1 -1
    Bug#30942: Initialized const_item to false

ChangeSet@1.1810.3364.2, 2007-10-04 12:09:22+05:00, ramil@mysql.com +5 -0
  merging: results adjusted

  mysql-test/r/ctype_big5.result@1.15, 2007-10-04 12:09:20+05:00, ramil@mysql.com +2 -0
    merging: results adjusted

  mysql-test/r/ctype_euckr.result@1.2.1.2, 2007-10-04 12:09:20+05:00, ramil@mysql.com +2 -0
    merging: results adjusted

  mysql-test/r/ctype_gb2312.result@1.4, 2007-10-04 12:09:20+05:00, ramil@mysql.com +2 -0
    merging: results adjusted

  mysql-test/r/ctype_gbk.result@1.6, 2007-10-04 12:09:20+05:00, ramil@mysql.com +2 -0
    merging: results adjusted

  mysql-test/r/ctype_uca.result@1.21, 2007-10-04 12:09:20+05:00, ramil@mysql.com +2 -0
    merging: results adjusted

ChangeSet@1.1810.3366.1, 2007-10-04 12:01:28+05:00, holyfoot@mysql.com +4 -0
  Bug #31155 gis types in union'd select cause crash.
  
  We use get_geometry_type() call to decide the exact type
  of a geometry field to be created (POINT, POLYGON etc)
  Though this function was only implemented for few items.
  In the bug's case we need to call this function for the
  Item_sum instance, where it was not implemented, what is
  the reason of the crash.
  Fixed by implementing virtual Item::get_geometry_type(),
  so it can be called for any Item.

  sql/item.cc@1.113.1.170, 2007-10-04 12:01:26+05:00, holyfoot@mysql.com +3 -8
    Bug #31155 gis types in union'd select cause crash.
    
    Unified virtual ::get_geometry_type() function used

  sql/item.h@1.183.40.1, 2007-10-04 11:51:56+05:00, holyfoot@mysql.com +4 -2
    Bug #31155 gis types in union'd select cause crash.
    virtual Item::geometry_type() added instead of
    various geometry_type() fucntions.

  sql/item_geofunc.cc@1.27.1.5, 2007-10-04 12:01:26+05:00, holyfoot@mysql.com +7 -11
    Bug #31155 gis types in union'd select cause crash.
    
    virtual Item::geometry_type() implemented for geo-Items.
    Mostly previous ::get_geometry_type() implementation changed

  sql/item_geofunc.h@1.13.1.3, 2007-10-04 12:01:26+05:00, holyfoot@mysql.com +3 -4
    Bug #31155 gis types in union'd select cause crash.
    
    get_geometry_type() declarations unified

ChangeSet@1.1616.3101.1, 2007-10-04 08:27:03+02:00, tnurnberg@sin.intern.azundris.com +1 -0
  Bug #30444: 5.0 mysqldump silently allows wrong backup to be taken against a 4.0 database
  
  The combination of --single-transaction and --master-data requires
  START TRANSACTION WITH CONSISTENT SNAPSHOT which is available from
  mysqld 4.1 on. When trying this against an older server, print
  diagnostic, then, if --force is not given, abort.
  
  No test-case given since it would require a mysqld < 4.1.

  client/mysqldump.c@1.143.15.1, 2007-10-04 08:27:01+02:00, tnurnberg@sin.intern.azundris.com +12 -0
    Bug #30444: 5.0 mysqldump silently allows wrong backup to be taken against a 4.0 database
    
    The combination of --single-transaction and --master-data requires
    START TRANSACTION WITH CONSISTENT SNAPSHOT which is available from
    mysqld 4.1 on. When trying this against an older server, print
    diagnostic, then, if --force is not given, abort.

ChangeSet@1.1616.3100.1, 2007-10-04 10:20:00+05:00, ramil@mysql.com +11 -0
  Fix for bug #31069: crash in 'sounds like'
  and for bug #31070: crash during conversion of charsets
  
  Problem: passing a 0 byte length string to some my_mb_wc_XXX() 
  functions leads to server crash due to improper argument check.
  
  Fix: properly check arguments passed to my_mb_wc_XXX() functions.

  strings/ctype-cp932.c@1.1.9.1, 2007-10-04 10:19:59+05:00, ramil@mysql.com +2 -2
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - check the string length before testing its first byte.

  mysql-test/include/ctype_common.inc@1.3, 2007-10-04 10:19:59+05:00, ramil@mysql.com +9 -0
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - test case.

  mysql-test/r/ctype_big5.result@1.11.1.1, 2007-10-04 10:19:59+05:00, ramil@mysql.com +11 -0
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - test result.

  mysql-test/r/ctype_euckr.result@1.2.1.1, 2007-10-04 10:19:59+05:00, ramil@mysql.com +11 -0
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - test result.

  mysql-test/r/ctype_gb2312.result@1.3, 2007-10-04 10:19:59+05:00, ramil@mysql.com +11 -0
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - test result.

  mysql-test/r/ctype_gbk.result@1.3.1.1, 2007-10-04 10:19:59+05:00, ramil@mysql.com +11 -0
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - test result.

  mysql-test/r/ctype_uca.result@1.13.1.2, 2007-10-04 10:19:59+05:00, ramil@mysql.com +11 -0
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - test result.

  strings/ctype-big5.c@1.67.1.14, 2007-10-04 10:19:59+05:00, ramil@mysql.com +2 -2
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - check the string length before testing its first byte.

  strings/ctype-euc_kr.c@1.59.1.4, 2007-10-04 10:19:59+05:00, ramil@mysql.com +2 -2
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - check the string length before testing its first byte.

  strings/ctype-gb2312.c@1.56.1.4, 2007-10-04 10:19:59+05:00, ramil@mysql.com +1 -3
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - check the string length before testing its first byte.

  strings/ctype-sjis.c@1.72.1.11, 2007-10-04 10:19:59+05:00, ramil@mysql.com +2 -2
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - check the string length before testing its first byte.

ChangeSet@1.1810.3363.1, 2007-10-03 21:38:32+02:00, msvensson@pilot.mysql.com +2 -0
  Bug#30992 Wrong implementation of pthread_mutex_trylock()
  It's not possible to use WaitForSingleObject to wait
  on a CRITICAL_SECTION, instead use the TryEnterCriticalSection function.
   - if "mutex" was already taken => return EBUSY
   - if "mutex" was aquired => return 0

  include/config-win.h@1.71.7.1, 2007-10-03 21:38:30+02:00, msvensson@pilot.mysql.com +3 -0
    Make windows.h define TryEnterCriticalSection

  mysys/my_winthread.c@1.15, 2007-10-03 21:38:30+02:00, msvensson@pilot.mysql.com +10 -12
    Use the TryEnterCriticalSection function to implement pthread_mutex_trylock
    Prevent recursive behaviour by looking at the RecursionCount variable
    in the CRITICAL_SECTION struct and return EBUSY from function if
    the mutex was already locked once.

ChangeSet@1.2476.197.78, 2007-10-03 18:10:32+02:00, guilhem@gbichot4.local +6 -0
  WL#3072 Maria recovery.
  * Thanks to Serg's tip, we fix here the compilation issue of
  REDO_REPAIR_TABLE's execution, by defining versions of
  _ma_killed_ptr() and _ma_check_print_info|warning|error()
  in maria_read_log.c (we move those of maria_chk.c into an include
  file and include it in maria_chk.c and maria_read_log.c).
  Execution of such record looks like working from my tests (it only
  happens in maria_read_log; recovery-from-mysqld skips DDLs and
  REPAIR is considered DDL here as it bypasses logging): tested
  ALTER TABLE ENABLE KEYS and then remove table, apply log: that
  did a repair.
  * Recent changes broke maria_read_log a bit: -a became default
  and -o caused error; fixing this.

  storage/maria/Makefile.am@1.20, 2007-10-03 18:10:30+02:00, guilhem@gbichot4.local +1 -1
    addind new file

  storage/maria/ma_check_standalone.h@1.1, 2007-10-03 18:10:31+02:00, guilhem@gbichot4.local +106 -0
    All standalone programs which need to use functions from ma_check.c
    (like maria_repair()) must define their version of _ma_killed_ptr()
    and _ma_check_print_info|warning|error(). Indeed, linking with ma_check.o
    brings in the dependencies of ma_check.o which are definitions of the above
    functions; if the program does not define them then the ones of
    ha_maria.o are used i.e. ha_maria.o is linked into the program, and this
    brings dependencies of ha_maria.o on mysqld.o into the program's linking
    which thus fails, as the program is not linked with mysqld.o.
    We put in this file the functions which maria_chk.c uses, so that
    they can be reused by maria_read_log (when it replays REDO_REPAIR_TABLE)
    as they are good enough (they just print to stdout/stderr like
    maria_read_log already does).

  storage/maria/ma_check_standalone.h@1.0, 2007-10-03 18:10:31+02:00, guilhem@gbichot4.local +0 -0

  storage/maria/ma_recovery.c@1.37, 2007-10-03 18:10:30+02:00, guilhem@gbichot4.local +1 -11
    enable execution of REDO_REPAIR_TABLE by maria_read_log now that
    it compiles. Now reason to keep only T_QUICK from testflag.

  storage/maria/maria_chk.c@1.23, 2007-10-03 18:10:30+02:00, guilhem@gbichot4.local +1 -81
    moving these functions to ma_check_standalone.h for reusability

  storage/maria/maria_def.h@1.40, 2007-10-03 18:10:30+02:00, guilhem@gbichot4.local +4 -1
    comment

  storage/maria/maria_read_log.c@1.22, 2007-10-03 18:10:30+02:00, guilhem@gbichot4.local +11 -8
    ma_check_standalone.h needs my_progname_short.
    Fixing bug where "maria_read_log" would default to -a and
    "maria_read_log -o" would throw an error. Implemented behaviour is:
    - no options: usage()
    - -a : applys, applys UNDOs by default unless --disable-undo
    - -o : only prints

ChangeSet@1.2476.384.40, 2007-10-03 15:49:51+05:00, gshchepa@gleb.loc +1 -0
  mysqldump.c:
    Post-merge fix.

  client/mysqldump.c@1.268.27.2, 2007-10-03 15:49:31+05:00, gshchepa@gleb.loc +1 -1
    Post-merge fix.

ChangeSet@1.1810.3352.6, 2007-10-03 11:57:14+02:00, sven@murkla.(none) +2 -0
  BUG#30752 rpl_dual_pos_advance valgrind (jump depends on uninitialized LOG_INFO)
  Problem: one thread could read uninitialized memory from (the stack of) another
  thread.
  Fix: swapped order of initializing the memory and making it available to the
  other thread.
  Fix: put lock around the statement that makes the memory available to the other
  thread.
  Fix: all fields of the struct are now initialized in the constructor, to avoid
  future problems.

  sql/sql_class.h@1.230.83.1, 2007-10-03 11:57:12+02:00, sven@murkla.(none) +7 -1
    Initialize all members in constructor for more safe future code.

  sql/sql_repl.cc@1.133.7.8, 2007-10-03 11:57:12+02:00, sven@murkla.(none) +8 -2
    Swap order so that linfo is first initialized, then assigned, instead of the
    other way around.
    Put a lock around the assignment. We use LOCK_thread_count since log_in_use
    uses it: log_in_use may be running concurrently, called from
    MYSQL_LOG::purge_logs.

ChangeSet@1.1616.3099.1, 2007-10-03 13:35:35+05:00, holyfoot@mysql.com +3 -0
  Bug #30955 geomfromtext() crasher.
  
  end-of-line check missed in Gis_read_stream::get_next_word,
  what can lead to crashes (expecially with NULL strings).
  
  End-of-line check added

  mysql-test/r/gis.result@1.15.1.11, 2007-10-03 13:35:33+05:00, holyfoot@mysql.com +6 -0
    Bug #30955 geomfromtext() crasher.
    
    test result

  mysql-test/t/gis.test@1.17.1.7, 2007-10-03 13:35:33+05:00, holyfoot@mysql.com +8 -0
    Bug #30955 geomfromtext() crasher.
    
    test case

  sql/gstream.cc@1.7.1.1, 2007-10-03 13:30:31+05:00, holyfoot@mysql.com +1 -1
    Bug #30955 geomfromtext() crasher

ChangeSet@1.2476.433.11, 2007-10-03 09:54:33+02:00, mskold@mysql.com +1 -0
  Bug#25817  UPDATE IGNORE doesn't check write_set when checking unique indexes: Post merge 5.0->5.1

  sql/ha_ndbcluster.cc@1.461.9.4, 2007-10-03 09:53:49+02:00, mskold@mysql.com +8 -7
    Bug#25817  UPDATE IGNORE doesn't check write_set when checking unique indexes: Post merge 5.0->5.1

ChangeSet@1.1810.3358.2, 2007-10-03 09:29:10+02:00, mskold@mysql.com +1 -0
  Removed tabs

  sql/ha_ndbcluster.cc@1.175.91.2, 2007-10-03 09:28:09+02:00, mskold@mysql.com +2 -2
    Removed tabs

ChangeSet@1.2476.479.5, 2007-10-03 17:26:17+10:00, stewart@flamingspork.com +1 -0
  [PATCH] BUG#29509 ndb_mgm help needs to list the -a option for DN restart
  
  Index: ndb/storage/ndb/src/mgmclient/CommandInterpreter.cpp
  ===================================================================

  storage/ndb/src/mgmclient/CommandInterpreter.cpp@1.98, 2007-08-14 14:58:43+10:00, stewart@flamingspork.com +7 -5
    BUG#29509 ndb_mgm help needs to list the -a option for DN restart

ChangeSet@1.2476.479.4, 2007-10-03 17:26:03+10:00, stewart@flamingspork.com +1 -0
  [PATCH] BUG#25064 make formatting of key=value consistent in getTextTransReportCounters
  
  Index: ndb/storage/ndb/src/common/debugger/EventLogger.cpp
  ===================================================================

  storage/ndb/src/common/debugger/EventLogger.cpp@1.45, 2007-08-14 14:49:39+10:00, stewart@flamingspork.com +1 -1
    BUG#25064 make formatting of key=value consistent in getTextTransReportCounters

ChangeSet@1.2476.479.3, 2007-10-03 17:25:46+10:00, stewart@flamingspork.com +1 -0
  [PATCH] BUG#25064 Remove newlines from cluster log
  
  Index: ndb/storage/ndb/src/common/debugger/EventLogger.cpp
  ===================================================================

  storage/ndb/src/common/debugger/EventLogger.cpp@1.44, 2007-08-14 14:47:54+10:00, stewart@flamingspork.com +5 -5
    BUG#25064 Remove newlines from cluster log

ChangeSet@1.1810.3356.3, 2007-10-03 11:36:42+05:00, gshchepa@gleb.loc +2 -0
  mysqldump.test, mysqldump.result:
    Bug #31077: post-commit fix.

  mysql-test/r/mysqldump.result@1.83.1.49, 2007-10-03 11:36:20+05:00, gshchepa@gleb.loc +2 -2
    Bug #31077: post-commit fix.

  mysql-test/t/mysqldump.test@1.76.1.48, 2007-10-03 11:36:18+05:00, gshchepa@gleb.loc +2 -2
    Bug #31077: post-commit fix.

ChangeSet@1.1810.3217.15, 2007-10-03 16:16:48+10:00, stewart@flamingspork.com +1 -0
  [PATCH] BUG#29565 managment server can log entries multiple times after mgmd restart
  
  Close the event log on shutdown of mgmd (in stopEventLog())
  
  Index: ndb-work/ndb/src/mgmsrv/MgmtSrvr.cpp
  ===================================================================

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.73.54.1, 2007-10-03 16:09:34+10:00, stewart@flamingspork.com +3 -3
    BUG#29565 managment server can log entries multiple times after mgmd restart

ChangeSet@1.1810.3361.1, 2007-10-02 23:47:30-06:00, tsmith@sita.local +4 -0
  Bug #20358: InnoDB hang on the adaptive hash index latch in btr0sea.c
  
  Add --skip-innodb-adaptive-hash-index option, which is a way to
  work around the bug (by disabling the adaptive hash feature entirely).
  
  This may be useful even once the bug is fixed, for benchmarking purposes.
  There are some workloads for which the adaptive hash index is not effective.

  sql/mysqld.cc@1.439.134.1, 2007-10-02 23:47:26-06:00, tsmith@sita.local +8 -1
    Add --skip-innodb-adaptive-hash-index option.

  sql/set_var.cc@1.125.36.1, 2007-10-02 23:47:26-06:00, tsmith@sita.local +1 -0
    Add --skip-innodb-adaptive-hash-index option.

  sql/ha_innodb.cc@1.202.52.1, 2007-10-02 23:47:25-06:00, tsmith@sita.local +3 -0
    Add --skip-innodb-adaptive-hash-index option.

  sql/ha_innodb.h@1.93.7.1, 2007-10-02 23:47:25-06:00, tsmith@sita.local +2 -1
    Add --skip-innodb-adaptive-hash-index option.

ChangeSet@1.1810.3356.2, 2007-10-03 02:50:38+05:00, gshchepa@gleb.loc +3 -0
  mysqldump.c, mysqldump.test, mysqldump.result:
    Bug #31077: post-commit fix.

  client/mysqldump.c@1.214.29.2, 2007-10-03 02:48:31+05:00, gshchepa@gleb.loc +1 -1
    Bug #31077: post-commit fix.

  mysql-test/r/mysqldump.result@1.83.1.48, 2007-10-03 02:49:24+05:00, gshchepa@gleb.loc +14 -2
    Bug #31077: post-commit fix.

  mysql-test/t/mysqldump.test@1.76.1.47, 2007-10-03 02:48:44+05:00, gshchepa@gleb.loc +6 -3
    Bug #31077: post-commit fix.

ChangeSet@1.1810.3360.1, 2007-10-02 21:21:45+02:00, jmiller@mysql.com +1 -0
  testScanFilter.cpp:
     Updated variable size arrays to use vector like Jonas did for 5.1 so that my build would not break

  ndb/test/ndbapi/testScanFilter.cpp@1.1.4.1, 2007-10-02 21:21:37+02:00, jmiller@mysql.com +7 -5
     Updated variable size arrays to use vector like Jonas did for 5.1 so that my build would not break

ChangeSet@1.1810.3344.5, 2007-10-02 20:44:37+02:00, msvensson@pilot.mysql.com +1 -0
  Bug#27597 mysqld-debug broken
   - "on" -> "restore" to avoid warning in MSVC when compiling with debug

  mysys/my_init.c@1.44.1.6, 2007-10-02 20:44:35+02:00, msvensson@pilot.mysql.com +1 -1
    Fix spelling error that cause MSVC to throw a warning
    when compiling with debug.
    Use "restore" instaed of "on" to turn runtime checks back on

ChangeSet@1.2476.197.77, 2007-10-02 19:16:20+02:00, guilhem@gbichot4.local +2 -0
  Fix for pushbuild failure (noticable only on 64-bit)

  storage/maria/ma_pagecache.c@1.47, 2007-10-02 19:16:19+02:00, guilhem@gbichot4.local +5 -5
    pagecache->blocks is now long, takes 8 bytes on some platforms.
    The cast to ulonglong in int8store is for those platforms where
    ulong is 32-bit and int8store uses some << shifts, if there are
    (x<<40 is undefined if x is 32-bit).

  storage/maria/ma_recovery.c@1.36, 2007-10-02 19:16:19+02:00, guilhem@gbichot4.local +4 -4
    this change corresponds to the one done in ma_pagecache.c: number
    of dirty pages is stored in 8 bytes.

ChangeSet@1.2476.197.76, 2007-10-02 18:02:09+02:00, guilhem@gbichot4.local +28 -0
  WL#3072 - Maria recovery.
  * Recovery of the table's live checksum (CREATE TABLE ... CHECKSUM=1)
  is achieved in this patch. The table's live checksum
  (info->s->state.state.checksum) is updated in inwrite_rec_hook's
  under the log mutex when writing UNDO_ROW_INSERT|UPDATE|DELETE
  and REDO_DELETE_ALL. The checksum variation caused by the operation
  is stored in these UNDOs, so that the REDO phase, when it sees such
  UNDOs, can update the live checksum if it is older (state.is_of_lsn is
  lower) than the record. It is also used, as a nice add-on with no
  cost, to do less row checksum computation during the UNDO phase
  (as we have it in the record already).
  Doing this work, it became pressing to move in-write hooks
  (write_hook_for_redo() et al) to ma_blockrec.c.
  The 'parts' argument of inwrite_rec_hook is unpredictable (it comes
  mangled at this stage, for example by LSN compression) so it is
  replaced by a 'void* hook_arg', which is used to pass down information,
  currently only to write_hook_for_clr_end() (previous undo_lsn and
  type of undone record).
  * If from ha_maria, we print to stderr how many seconds (with one
  fractional digit) the REDO phase took, same for UNDO phase and for
  final table close. Just to give an indication for debugging and maybe
  also for Support.

  storage/maria/ha_maria.cc@1.45.1.1, 2007-10-02 18:02:04+02:00, guilhem@gbichot4.local +3 -0
    question for Monty

  storage/maria/ma_blockrec.c@1.50, 2007-10-02 18:02:05+02:00, guilhem@gbichot4.local +399 -64
    * log in-write hooks (write_hook_for_redo() etc) move from
    ma_loghandler.c to here; this is natural: the hooks are coupled
    to their callers (functions in ma_blockrec.c).
    * translog_write_record() now has a new argument "hook_arg";
    using it to pass down to write_hook_for_clr_end() the transaction's
    previous_undo_lsn and the type of the being undone record, and also
    to pass down to all UNDOs the live checksum variation caused by the
    operation.
    * If table has live checksum, store in UNDO_ROW_INSERT|UPDATE|DELETE
    and in CLR_END the checksum variation ("delta") caused by the
    operation. For example if a DELETE caused the table's live checksum
    to change from 123 to 456, we store in the UNDO_ROW_DELETE, in 4 bytes,
    the value 333 (456-123).
    * Instead of hard-coded "1" as length of the place where we store
    the undone record's type in CLR_END, use a symbol CLR_TYPE_STORE_SIZE;
    use macros clr_type_store and clr_type_korr.
    * write_block_record() has a new parameter 'old_record_checksum'
    which is the pre-computed checksum of old_record; that value is used
    to update the table's live checksum when writing UNDO_ROW_UPDATE|CLR_END.
    * In allocate_write_block_record(), if we are executing UNDO_ROW_DELETE
    the row's checksum is already computed.
    * _ma_update_block_record2() now expect the new row's checksum into
    cur_row.checksum (was already true) and the old row's checksum into
    new_row.checksum (that's new). Its two callers, maria_update() and
    _ma_apply_undo_row_update(), honour this.
    * When executing an UNDO_ROW_INSERT|UPDATE|DELETE in UNDO phase, pick
    up the checksum delta from the log record. It is then used to update
    the table's live checksum when writing CLR_END, and saves us a
    computation of record.

  storage/maria/ma_blockrec.h@1.15, 2007-10-02 18:02:05+02:00, guilhem@gbichot4.local +25 -0
    in-write hooks move from ma_loghandler.c

  storage/maria/ma_check.c@1.44, 2007-10-02 18:02:05+02:00, guilhem@gbichot4.local +4 -6
    more straightforward size of buffer

  storage/maria/ma_checkpoint.c@1.22, 2007-10-02 18:02:05+02:00, guilhem@gbichot4.local +3 -3
    <= is enough

  storage/maria/ma_commit.c@1.4, 2007-10-02 18:02:05+02:00, guilhem@gbichot4.local +1 -1
    new prototype of translog_write_record()

  storage/maria/ma_create.c@1.30, 2007-10-02 18:02:05+02:00, guilhem@gbichot4.local +1 -1
    new prototype of translog_write_record()

  storage/maria/ma_delete.c@1.14, 2007-10-02 18:02:05+02:00, guilhem@gbichot4.local +21 -20
    The row's checksum must be computed before calling(*delete_record)(),
    not after, because it must be known inside _ma_delete_block_record()
    (to update the table's live checksum when writing UNDO_ROW_DELETE).
    If deleting from a transactional table, live checksum was already updated
    when writing UNDO_ROW_DELETE.

  storage/maria/ma_delete_all.c@1.20, 2007-10-02 18:02:05+02:00, guilhem@gbichot4.local +3 -6
    @todo is now done (in ma_loghandler.c)

  storage/maria/ma_delete_table.c@1.10, 2007-10-02 18:02:05+02:00, guilhem@gbichot4.local +1 -1
    new prototype of translog_write_record()

  storage/maria/ma_loghandler.c@1.57, 2007-10-02 18:02:05+02:00, guilhem@gbichot4.local +101 -323
    * in-write hooks move to ma_blockrec.c.
    * translog_write_record() gets a new argument 'hook_arg' which is
    passed down to pre|inwrite_rec_hook. It is more useful that 'parts'
    for those hooks, because when those hooks are called, 'parts' has
    possibly been mangled (like with LSN compression) and is so
    unpredictable.
    * fix for compiler warning (unused buffer_start when compiling without
    debug support)
    * Because checksum delta is stored into UNDO_ROW_INSERT|UPDATE|DELETE
    and CLR_END, but only if the table has live checksum, these records
    are not PSEUDOFIXEDLENGTH anymore, they are now VARIABLE_LENGTH (their
    length is X if no live checksum and X+4 otherwise).
    * add an inwrite_rec_hook for UNDO_ROW_UPDATE, which updates the
    table's live checksum. Update it also in hooks of UNDO_ROW_INSERT|
    DELETE and REDO_DELETE_ALL and CLR_END.
    * Bugfix: when reading a record in translog_read_record(), it happened
    that "length" became negative, because the function assumed that
    the record extended beyond the page's end, whereas it may be shorter.

  storage/maria/ma_loghandler.h@1.27, 2007-10-02 18:02:05+02:00, guilhem@gbichot4.local +12 -4
    * Instead of hard-coded "1" and "4", use symbols and macros
    to store/retrieve the type of record which the CLR_END corresponds
    to, and the checksum variation caused by the operation which logs the
    record
    * translog_write_record() gets a new argument 'hook_arg' which is
    passed down to pre|inwrite_rec_hook. It is more useful that 'parts'
    for those hooks, because when those hooks are called, 'parts' has
    possibly been mangled (like with LSN compression) and is so
    unpredictable.

  storage/maria/ma_open.c@1.32, 2007-10-02 18:02:05+02:00, guilhem@gbichot4.local +1 -1
    fix for "empty body in if() statement" (when compiling without safemutex)

  storage/maria/ma_pagecache.c@1.46, 2007-10-02 18:02:05+02:00, guilhem@gbichot4.local +3 -3
    <= is enough

  storage/maria/ma_recovery.c@1.35, 2007-10-02 18:02:05+02:00, guilhem@gbichot4.local +115 -30
    * print the time that each recovery phase (REDO/UNDO/flush) took;
    this is enabled only when recovering from ha_maria. Is it printed
    n seconds with a fractional part of one digit (like 123.4 seconds).
    * In the REDO phase, update the table's live checksum by using
    the checksum delta stored in UNDO_ROW_INSERT|DELETE|UPDATE and CLR_END.
    Update it too when seeing REDO_DELETE_ALL.
    * In the UNDO phase, when executing UNDO_ROW_INSERT, if the table does
    not have live checksum then reading the record's header (as done by
    the master loop of run_undo_phase()) is enough; otherwise we
    do a translog_read_record() to have the checksum delta ready
    for _ma_apply_undo_row_insert().
    * When at the end of the REDO phase we notice that there is an unfinished
    group of REDOs, don't assert in debug binaries, as I verified that it
    can happen in real life (with kill -9)
    * removing ' in #error as it confuses gcc3

  storage/maria/ma_rename.c@1.12, 2007-10-02 18:02:05+02:00, guilhem@gbichot4.local +1 -1
    new prototype of translog_write_record()

  storage/maria/ma_update.c@1.13, 2007-10-02 18:02:05+02:00, guilhem@gbichot4.local +19 -32
    * It's useless to put up HA_STATE_CHANGED in 'key_changed',
    as we put up HA_STATE_CHANGED in info->update anyway.
    * We need to compute the old and new rows' checksum before calling
    (*update_record)(), as checksum delta must be known when logging
    UNDO_ROW_UPDATE which is done by _ma_update_block_record(). Note that
    some functions change the 'newrec' record (at least _ma_check_unique()
    does) so we cannot move the checksum computation too early in the
    function.

  storage/maria/ma_write.c@1.18, 2007-10-02 18:02:05+02:00, guilhem@gbichot4.local +2 -5
    If inserting into a transactional table, live's checksum was
    already updated when writing UNDO_ROW_INSERT. The multiplication
    is a trick to save an if().

  storage/maria/unittest/ma_test_loghandler-t.c@1.19, 2007-10-02 18:02:05+02:00, guilhem@gbichot4.local +11 -10
    new prototype of translog_write_record()

  storage/maria/unittest/ma_test_loghandler_first_lsn-t.c@1.5, 2007-10-02 18:02:06+02:00, guilhem@gbichot4.local +1 -1
    new prototype of translog_write_record()

  storage/maria/unittest/ma_test_loghandler_max_lsn-t.c@1.5, 2007-10-02 18:02:06+02:00, guilhem@gbichot4.local +1 -1
    new prototype of translog_write_record()

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.18, 2007-10-02 18:02:06+02:00, guilhem@gbichot4.local +11 -13
    new prototype of translog_write_record()

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.18, 2007-10-02 18:02:06+02:00, guilhem@gbichot4.local +3 -3
    new prototype of translog_write_record()

  storage/maria/unittest/ma_test_loghandler_noflush-t.c@1.5, 2007-10-02 18:02:06+02:00, guilhem@gbichot4.local +1 -1
    new prototype of translog_write_record()

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.15, 2007-10-02 18:02:06+02:00, guilhem@gbichot4.local +1 -1
    new prototype of translog_write_record()

  storage/maria/unittest/ma_test_loghandler_purge-t.c@1.3, 2007-10-02 18:02:06+02:00, guilhem@gbichot4.local +4 -4
    new prototype of translog_write_record()

  storage/maria/ma_test_recovery.expected@1.8, 2007-10-02 18:02:05+02:00, guilhem@gbichot4.local +0 -176
    Change in output of ma_test_recovery: now all live checksums of
    original tables equal those of tables recreated by the REDO phase
    and those of tables fixed by the UNDO phase. I.e. recovery of
    the live checksum looks like working (which was after all the only
    goal of this changeset).
    I checked by hand that it's not just all live checksums which are
    now 0 and that's why they match. They are the old values like
    3757530372. maria.test has hard-coded checksum values in its result
    file so checks this too.

  storage/myisam/sort.c@1.60.1.1, 2007-10-02 18:02:06+02:00, guilhem@gbichot4.local +7 -8
    fix for compiler warnings in pushbuild (write_merge_key* functions
    didn't have their declaration match MARIA_HA::write_key).

ChangeSet@1.1810.3324.24, 2007-10-02 17:45:49+03:00, gkodinov@magare.gmz +1 -0
  fixed a warning in the fix for bug 28702

  sql/sql_select.cc@1.312.174.11, 2007-10-02 17:45:48+03:00, gkodinov@magare.gmz +1 -1
    fixed a warning in the fix for bug 28702

ChangeSet@1.1810.3324.22, 2007-10-02 14:57:10+03:00, gkodinov@magare.gmz +1 -0
  Fixed a valgrind warning with the fix for bug 28702.

  sql/sql_select.cc@1.312.174.10, 2007-10-02 14:57:09+03:00, gkodinov@magare.gmz +10 -2
    Fixed a valgrind warning with the fix for bug 28702.

ChangeSet@1.1810.3358.1, 2007-10-02 13:36:13+02:00, mskold@mysql.com +4 -0
  Bug#25817  UPDATE IGNORE doesn't check write_set when checking unique indexes: Added checks

  mysql-test/r/ndb_update.result@1.5.1.8, 2007-10-02 13:35:47+02:00, mskold@mysql.com +8 -0
    Bug#25817  UPDATE IGNORE doesn't check write_set when checking unique indexes: Added checks

  mysql-test/t/ndb_update.test@1.9.1.1, 2007-10-02 13:35:47+02:00, mskold@mysql.com +5 -0
    Bug#25817  UPDATE IGNORE doesn't check write_set when checking unique indexes: Added checks

  sql/ha_ndbcluster.cc@1.175.91.1, 2007-10-02 13:35:47+02:00, mskold@mysql.com +36 -4
    Bug#25817  UPDATE IGNORE doesn't check write_set when checking unique indexes: Added checks

  sql/ha_ndbcluster.h@1.82.4.19, 2007-10-02 13:35:47+02:00, mskold@mysql.com +8 -1
    Bug#25817  UPDATE IGNORE doesn't check write_set when checking unique indexes: Added checks

ChangeSet@1.1810.3352.4, 2007-10-02 15:20:45+05:00, bar@mysql.com +1 -0
  Bug#29675 collation_connection is defined twice for the same value
  Removing redundant initialization.

  sql/mysqld.cc@1.439.133.1, 2007-10-02 15:20:43+05:00, bar@mysql.com +0 -1
    Removing redundant variable initialization.

ChangeSet@1.1810.3352.3, 2007-10-02 13:28:58+05:00, bar@mysql.com +2 -0
  Fixing comments to use "#" instead of "--"

  mysql-test/t/ctype_uca.test@1.17.1.1, 2007-10-02 13:28:57+05:00, bar@mysql.com +1 -1
    Fixing comments to use "#" instead of "--"

  mysql-test/t/subselect.test@1.129.1.29, 2007-10-02 13:28:57+05:00, bar@mysql.com +1 -1
    Fixing comments to use "#" instead of "--"

ChangeSet@1.2476.463.7, 2007-10-01 23:51:57+03:00, bell@desktop.sanja.is.com.ua +1 -0
  Fixed problem with scanner destruction (unpinned page in the cache).

  storage/maria/ma_loghandler.c@1.56, 2007-10-01 23:51:55+03:00, bell@desktop.sanja.is.com.ua +9 -2
    Debug output adder to control scanner freeing.
    Fixed problem with scanner destruction (unpinned page in the cache).

ChangeSet@1.1810.3357.1, 2007-10-01 20:03:50+00:00, evgen@moonbone.local +3 -0
  Bug#31095: Unexpected NULL constant caused server crash.
  
  The Item_func_rollup_const class is used for wrapping constants to avoid
  wrong result for ROLLUP queries with DISTINCT and a constant in the select
  list. This class is also used to wrap up a NULL constant but its null_value
  wasn't set accordingly. This led to a server crash.
  
  Now the null_value of an object of the Item_func_rollup_const class is set
  by its fix_length_and_dec member function.

  mysql-test/r/olap.result@1.33.1.7, 2007-10-01 20:02:07+00:00, evgen@moonbone.local +11 -0
    Added a test case for the bug#31095: Unexpected NULL constant caused server crash.

  mysql-test/t/olap.test@1.29, 2007-10-01 20:02:05+00:00, evgen@moonbone.local +9 -0
    Added a test case for the bug#31095: Unexpected NULL constant caused server crash.

  sql/item_func.h@1.136.3.38, 2007-10-01 20:02:14+00:00, evgen@moonbone.local +2 -0
    Bug#31095: Unexpected NULL constant caused server crash. 
    Now the null_value of an object of the Item_func_rollup_const class is set
    by its fix_length_and_dec member function.

ChangeSet@1.2476.197.74, 2007-10-01 19:39:16+02:00, guilhem@gbichot4.local +1 -0
  Fix for "innodb_mysql" and "events" failures: we can disable transactionality
  in CREATE SELECT only if the table is not temporary (because
  re-enabling causes a commit). In the future we should disable
  again for temporary tables; that will probably require changing
  ha_enable_transaction().

  sql/sql_insert.cc@1.281.3.2, 2007-10-01 19:39:14+02:00, guilhem@gbichot4.local +11 -7
    When we disable transactionality in CREATE SELECT, we re-enable it
    at the end and this causes a commit (inside ha_enable_transaction());
    but this is undesired if the created table is temporary (we don't
    want CREATE TEMPORARY TABLE SELECT to commit all previous statements).
    So we disable logging only if the table is not temporary.
    Ideally in the future we would want to lift this restriction which
    sounds stupid, but for Maria it does not matter now (temporary
    tables are not transactional yet).

ChangeSet@1.2476.1.94, 2007-10-01 18:41:38+02:00, kent@mysql.com +1 -0
  make_binary_distribution.sh:
    Added special handling of "mysql_install_db" and "mysql.server" scripts,
    find executables relative to the current directory.

  scripts/make_binary_distribution.sh@1.162, 2007-10-01 18:40:40+02:00, kent@mysql.com +29 -0
    Added special handling of "mysql_install_db" and "mysql.server" scripts,
    find executables relative to the current directory.

ChangeSet@1.2476.463.6, 2007-10-01 18:48:20+03:00, bell@desktop.sanja.is.com.ua +2 -0
  fater way to detect last page address for the last log file.
  gprof build for amd64.

  BUILD/compile-amd64-gprof-no-ndb@1.1, 2007-10-01 18:48:19+03:00, bell@desktop.sanja.is.com.ua +7 -0
    New BitKeeper file ``BUILD/compile-amd64-gprof-no-ndb''

  BUILD/compile-amd64-gprof-no-ndb@1.0, 2007-10-01 18:48:19+03:00, bell@desktop.sanja.is.com.ua +0 -0

  storage/maria/ma_loghandler.c@1.55, 2007-10-01 18:48:19+03:00, bell@desktop.sanja.is.com.ua +8 -0
    fater way to detect last page address for the last log file.

ChangeSet@1.1810.3356.1, 2007-10-01 20:35:51+05:00, gshchepa@gleb.loc +4 -0
  Fixed bug #31077.
  mysqldump adds the "-- Dump completed on YYYY-MM-DD hh:mm:ss" string
  to the end of output if the --comments switch is on.
  The only way to suppress this line is to use --skip-comments/--compact
  switch.
  
  New switch has been added to the mysqldump client command line:
  --dump-date.
  
  For the compatibility with previous releases, by default the --dump-date
  is on.
  The --dump-date switch forces mysqldump to add date to the
  "-- Dump completed on ..." string at the end of output.
  The --skip-dump-date switch supresses the output of date string
  and uses short form of that commentary: "-- Dump completed".
  --skip-comments or --compact switches disable the whole commentary
  as usual.

  client/client_priv.h@1.43.2.6, 2007-10-01 20:32:32+05:00, gshchepa@gleb.loc +1 -1
    Fixed bug #31077.
    New OPT_DUMP_DATE option has been added to implement
    the mysqldump client --dump-date switch.

  client/mysqldump.c@1.214.29.1, 2007-10-01 20:32:34+05:00, gshchepa@gleb.loc +13 -5
    Fixed bug #31077.
    The opt_dump_date variable has been added to imlements
    the mysqldump cliemt --dump-date switch.
    By default this switch is on (for compatibility with previous
    releases).
    The --dump-date switch forces mysqldump to add date to the
    "-- Dump completed on ..." string at the end of output.
    The --skip-dump-date switch supresses the output of date string
    and uses short form of that commentary: "-- Dump completed".
    --skip-comments or --compact switches disable the whole commentary
    as usual.

  mysql-test/r/mysqldump.result@1.83.1.47, 2007-10-01 20:33:05+05:00, gshchepa@gleb.loc +10 -0
    Added test case for bug #31077.

  mysql-test/t/mysqldump.test@1.76.1.46, 2007-10-01 20:33:01+05:00, gshchepa@gleb.loc +14 -0
    Added test case for bug #31077.

ChangeSet@1.2476.384.37, 2007-10-01 17:37:48+03:00, gkodinov@magare.gmz +1 -0
  merge 5.0-opt -> 5.1-opt

  mysql-test/r/view_grant.result@1.38, 2007-10-01 17:37:46+03:00, gkodinov@magare.gmz +13 -11
    merge 5.0-opt -> 5.1-opt

ChangeSet@1.1810.3260.3, 2007-10-01 15:11:15+02:00, mats@kindahl-laptop.dnsalias.net +3 -0
  BUG#30992 (Wrong implementation of pthread_mutex_trylock()):
  
  Adding support for correct handling of pthread_mutex_trylock() on Win32
  systems as well as when using the safe mutexes. 

  include/my_pthread.h@1.90.7.1, 2007-10-01 15:11:12+02:00, mats@kindahl-laptop.dnsalias.net +5 -4
    Adding win_pthread_mutex_trylock() function as wrapper function for
    Windows implementation of pthread_mutex_trylock().
    
    Adding flag to safe_mutex_lock() that is shall not abort if the mutex
    is already locked and instead return EBUSY since this is the POSIX
    behaviour.

  mysys/my_winthread.c@1.14, 2007-10-01 15:11:12+02:00, mats@kindahl-laptop.dnsalias.net +25 -0
    Added Win32 wrappper function to handle pthread_mutex_trylock().

  mysys/thr_mutex.c@1.27.1.3, 2007-10-01 15:11:12+02:00, mats@kindahl-laptop.dnsalias.net +42 -7
    Added parameter 'try_lock' to safe_mutex_lock() to allow it to do double-
    duty as a pthread_mutex_trylock() in addition to working as
    pthread_mutex_lock().
    
    The code needs to return EBUSY instead of throwing an error in the event
    that the mutex is re-locked (we do not have recursive mutexes), but it
    also requires some special handling to avoid race conditions when
    calling the real pthread_mutex_{lock,trylock}().

ChangeSet@1.2476.345.57, 2007-10-01 15:41:18+04:00, anozdrin@station. +2 -0
  BUG#30472: libmysql doesn't reset charset, insert_id after
  succ. mysql_change_user() call.
  
  Use 2 bytes for character set number.

  libmysql/libmysql.c@1.290.4.3, 2007-10-01 15:41:16+04:00, anozdrin@station. +2 -2
    BUG#30472: libmysql doesn't reset charset, insert_id after
    succ. mysql_change_user() call.
    
    Use 2 bytes for character set number.

  sql/sql_parse.cc@1.683.17.5, 2007-10-01 15:41:16+04:00, anozdrin@station. +11 -2
    BUG#30472: libmysql doesn't reset charset, insert_id after
    succ. mysql_change_user() call.
    
    Use 2 bytes for character set number.

ChangeSet@1.1810.3355.1, 2007-10-01 12:44:29+02:00, thek@adventure.(none) +1 -0
  Bug #30768 query cache patch for bug #21074 crashes on windows
  
  "pthread_mutex_trylock" isn't implemented correctly for the Windows platform.
  
  This temporary patch reverts the patch for bug#21074 for Windows until
  pthread_mutex_trylock is properly implemented. 

  sql/sql_cache.cc@1.76.10.12, 2007-10-01 12:44:28+02:00, thek@adventure.(none) +6 -0
    Added code branch for the Windows platform to avoid a faulty pthread_mutex_trylock
    implementation.

ChangeSet@1.1810.3354.1, 2007-10-01 15:35:42+05:00, bar@mysql.com +3 -0
  Bug#30315 Character sets: insertion of euckr code value 0xa141 fails
  
  Problem: some valid euc-kr characters were rejected because
  condition checking multi-byte tail didn't allow 
  multi-byte characters having the second byte in the ranges
  [0x41..0x5A]  and [0x61..0x7A].
  
  Fix: allow these byte ranges for mb tails

  mysql-test/r/ctype_euckr.result@1.3, 2007-10-01 15:35:41+05:00, bar@mysql.com +41 -0
    Adding tests

  mysql-test/t/ctype_euckr.test@1.2, 2007-10-01 15:35:41+05:00, bar@mysql.com +23 -0
    Adding tests

  strings/ctype-euc_kr.c@1.65.1.5, 2007-10-01 15:35:41+05:00, bar@mysql.com +23 -4
    Fixing wrong tail character pattern

ChangeSet@1.2476.460.6, 2007-10-01 12:10:46+02:00, joerg@trift2. +2 -0
  Fix bug#31150 "Test case does not cleanup":
  Add the cleanup by dropping the database 'track' in test "rpl_bug31076".

  mysql-test/suite/rpl/r/rpl_bug31076.result@1.1.1.1, 2007-10-01 12:10:41+02:00, joerg@trift2. +2 -0
    Fix bug#31150 "Test case does not cleanup":
    Drop the database 'track' which was newly created for this test.

  mysql-test/suite/rpl/t/rpl_bug31076.test@1.1.1.1, 2007-10-01 12:10:41+02:00, joerg@trift2. +4 -0
    Fix bug#31150 "Test case does not cleanup":
    Drop the database 'track' which was newly created for this test.

ChangeSet@1.1810.3324.20, 2007-10-01 12:51:59+03:00, gkodinov@magare.gmz +2 -0
  removed undeterministic test result from the fux for bug 30587

  mysql-test/r/func_math.result@1.33.1.6, 2007-10-01 12:51:58+03:00, gkodinov@magare.gmz +0 -8
    removed undeterministic test result from the fux for bug 30587

  mysql-test/t/func_math.test@1.27.1.3, 2007-10-01 12:51:58+03:00, gkodinov@magare.gmz +0 -2
    removed undeterministic test result from the fux for bug 30587

ChangeSet@1.1810.3324.19, 2007-10-01 11:32:29+03:00, gkodinov@magare.gmz +1 -0
  fixed pb problem with the fix for bug 30587

  mysql-test/r/func_math.result@1.33.1.5, 2007-10-01 11:32:27+03:00, gkodinov@magare.gmz +4 -4
    fixed pb problem with the fix for bug 30587

ChangeSet@1.2476.463.5, 2007-10-01 09:59:05+03:00, bell@desktop.sanja.is.com.ua +1 -0
  Incorrect function call fixed.

  storage/maria/ma_recovery.c@1.32.1.3, 2007-10-01 09:59:03+03:00, bell@desktop.sanja.is.com.ua +1 -1
    Incorrect function call fixed.

ChangeSet@1.1810.3217.14, 2007-10-01 14:32:22+10:00, stewart@willster.(none) +1 -0
  remove debug printout

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.73.52.1, 2007-10-01 14:32:19+10:00, stewart@willster.(none) +0 -1
    remove accidently left in printout

ChangeSet@1.2476.345.56, 2007-10-01 00:16:50+04:00, anozdrin@station. +1 -0
  Fix compilation warnings.

  client/mysqltest.c@1.313.2.2, 2007-10-01 00:16:47+04:00, anozdrin@station. +3 -5
    Fix compilation warnings.

ChangeSet@1.2476.345.55, 2007-09-29 23:31:08+04:00, anozdrin@station. +4 -0
  Fix compile warnings.

  client/client_priv.h@1.76, 2007-09-29 23:31:05+04:00, anozdrin@station. +0 -4
    Fix compile warnings.

  client/mysqltest.c@1.313.2.1, 2007-09-29 23:31:05+04:00, anozdrin@station. +6 -4
    Fix compile warnings.

  libmysql/client_settings.h@1.39, 2007-09-29 23:31:05+04:00, anozdrin@station. +4 -0
    Fix compile warnings.

  libmysql/libmysql.c@1.290.4.2, 2007-09-29 23:31:05+04:00, anozdrin@station. +3 -3
    Fix compile warnings.

ChangeSet@1.2476.473.3, 2007-09-29 16:04:31-03:00, davi@moksha.local +1 -0
  The fix for BUG 21136 (ChangeSet@1.2611.1.1) introduced a regression that
  caused a few tests to fail because the thd->extra_lock wasn't being set to
  NULL after the table was unlocked. This poses a serious problem because later
  attempts to access thd->extra_lock (now a dangling pointer) will probably
  result in a crash (undefined behavior) -- and that's what actually happens
  in some test cases.
  
  The solution is to set the select_create::m_plock pointee to NULL, which
  means that thd->extra_lock is set to NULL when the lock data is not for a
  temporary table.

  sql/sql_insert.cc@1.298, 2007-09-29 16:04:24-03:00, davi@moksha.local +4 -2
    Set the m_plock pointee to NULL, thus avoiding a dangling thd->extra_lock pointer
    in some cases.

ChangeSet@1.2403.18.82, 2007-09-29 11:10:12+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#30975
    add even more tests

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.13.1.2, 2007-09-29 11:10:09+02:00, jonas@perch.ndb.mysql.com +109 -21
    add more tests...

  storage/ndb/test/run-test/daily-basic-tests.txt@1.63.2.10, 2007-09-29 11:10:09+02:00, jonas@perch.ndb.mysql.com +32 -0
    add more tests

ChangeSet@1.2476.474.1, 2007-09-29 09:26:33+02:00, df@pippilotta.erinye.com +1 -0
  align types

  storage/ndb/include/portlib/NdbThread.h@1.8, 2007-09-29 09:26:26+02:00, df@pippilotta.erinye.com +1 -1
    align types

ChangeSet@1.1810.3324.18, 2007-09-29 01:07:29+00:00, evgen@moonbone.local +2 -0
  view_grant.result, view_grant.test:
    Corrected test case for the bug#29908.

  mysql-test/r/view_grant.result@1.8.1.19, 2007-09-29 01:06:40+00:00, evgen@moonbone.local +6 -5
    Corrected test case for the bug#29908.

  mysql-test/t/view_grant.test@1.8.1.17, 2007-09-29 01:06:22+00:00, evgen@moonbone.local +3 -2
    Corrected test case for the bug#29908.

ChangeSet@1.1810.3351.1, 2007-09-28 23:24:40+00:00, evgen@moonbone.local +3 -0
  Bug#27990: Wrong info in MYSQL_FIELD struct members when a tmp table was used.
  
  The change_to_use_tmp_fields function leaves the orig_table member of an
  expression's tmp table field filled for the new Item_field being created.
  Later orig_table is used by the Field::make_field function to provide some
  info about original table and field name to a user. This is ok for a field
  but for an expression it should be empty.
  
  The change_to_use_tmp_fields function now resets orig_table member of
  an expression's tmp table field to prevent providing a wrong info to a user.
  The Field::make_field function now resets the table_name and the org_col_name
  variables when the orig_table is set to 0.

  sql/field.cc@1.256.59.1, 2007-09-28 23:22:29+00:00, evgen@moonbone.local +13 -3
    Bug#27990: Wrong info in MYSQL_FIELD struct members when a tmp table was used.
    The Field::make_field function now resets the table_name and the org_col_name
    variables when the orig_table is set to 0.

  sql/sql_select.cc@1.312.180.1, 2007-09-28 23:22:32+00:00, evgen@moonbone.local +3 -0
    Bug#27990: Wrong info in MYSQL_FIELD struct members when a tmp table was used.
    The change_to_use_tmp_fields function now resets orig_table member of
    an expression's tmp table field to prevent providing a wrong info to a user.

  tests/mysql_client_test.c@1.167.36.1, 2007-09-28 23:22:32+00:00, evgen@moonbone.local +26 -19
    The test case for the bug#21635 is altered to test behavior on both const and
    non-const tables.

ChangeSet@1.2476.473.2, 2007-09-28 19:11:26-03:00, davi@moksha.local +1 -0
  Post-merge fix for Bug 21136, initial merge missed the modifications for
  the sql_class.h file.

  sql/sql_class.h@1.399.3.1, 2007-09-28 19:11:24-03:00, davi@moksha.local +6 -1
    Add pointers for holding lock data for temporary tables.

ChangeSet@1.2476.473.1, 2007-09-28 18:25:47-03:00, davi@moksha.local +3 -0
  Bug#21136 CREATE TABLE SELECT within CREATE TABLE SELECT causes server crash
  
  When CREATE TEMPORARY TABLE .. SELECT is invoked from a stored function
  which in turn is called from CREATE TABLE SELECT causes a memory leak
  because the inner create temporary table overrides the outter extra_lock
  reference when locking the table.
  
  The solution is to simply not overrride the extra_lock by only using the
  extra_lock for a non-temporary table lock.

  mysql-test/r/create.result@1.154, 2007-09-28 18:25:42-03:00, davi@moksha.local +14 -0
    Add test case result for Bug#21136

  mysql-test/t/create.test@1.105, 2007-09-28 18:25:42-03:00, davi@moksha.local +25 -0
    Add test case for Bug#21136

  sql/sql_insert.cc@1.297, 2007-09-28 18:25:42-03:00, davi@moksha.local +20 -7
    For temporary tables, store the lock data within the select_create class
    since tmp tables contents are not replicated. For "real" tables, store
    the lock data in the thread extra_lock pointer.

ChangeSet@1.1810.3350.1, 2007-09-28 17:13:35-04:00, dkatz@damien-katzs-computer.local +1 -0
  Bug #29589	sys_innodb_max_purge_lag is defined twice in sys_variables
  
  Removed duplicate innodb variable from sys_variables array.

  sql/set_var.cc@1.125.35.1, 2007-09-28 17:13:30-04:00, dkatz@damien-katzs-computer.local +0 -1
    Removed duplicate innodb variable from sys_variables array.

ChangeSet@1.1810.3349.1, 2007-09-28 17:10:14-04:00, dkatz@damien-katzs-computer.local +1 -0
  Bug #29772  Error compiling with option --without-geometry
  
  Added #ifdef HAVE_SPATIAL around geometry related code.

  sql/item.cc@1.113.97.1, 2007-09-28 17:10:06-04:00, dkatz@damien-katzs-computer.local +4 -0
    Added #ifdef HAVE_SPATIAL around geometry related code.

ChangeSet@1.1616.3098.1, 2007-09-28 22:35:48+02:00, kent@mysql.com +1 -0
  ctype-simple.c:
    Avoid undefined value when negating (bug#30069)

  strings/ctype-simple.c@1.57.1.12, 2007-09-28 22:33:23+02:00, kent@mysql.com +2 -2
    Avoid undefined value when negating (bug#30069)

ChangeSet@1.2476.345.52, 2007-09-28 23:30:54+04:00, anozdrin@station. +5 -0
  Patch for BUG#30472: libmysql doesn't reset charset,
  insert_id after succ. mysql_change_user() call.
  
  See also WL 4066.
    
  This bug reveals two problems:
    - the problem on the client side which was described originally;
    - the problem in protocol / the server side: connection context
      on client and server should be like after mysql_real_connect()
      and be consistent. The server however just resets character
      set variables to the global defaults.
  
  The fix seems to be as follows:
    - extend the protocol so that the client be able to send
      character set information in COM_CHANGE_USER command;
    - change the server so that it understands client character set
      in the command;
    - change the client:
      - reset character set to the default value (which has been
        read from the configuration);
      - send character set in COM_CHANGE_USER command.

  client/client_priv.h@1.75, 2007-09-28 23:30:52+04:00, anozdrin@station. +4 -0
    Declare a function, used in libmysql.c and client.c.

  libmysql/libmysql.c@1.290.4.1, 2007-09-28 23:30:52+04:00, anozdrin@station. +25 -1
    1. Reset character set on the client in mysql_change_user().
    2. Send character set to the server in COM_CHANGE_USER command.

  mysql-test/t/mysql_client_test.test@1.24, 2007-09-28 23:30:52+04:00, anozdrin@station. +2 -2
    mysql_client_test.log is used by the test suite.
    
    Use mysql_client_test.out.log to collect mysql_client_test
    real output.

  sql/sql_parse.cc@1.683.17.4, 2007-09-28 23:30:52+04:00, anozdrin@station. +13 -1
    Switch character set in COM_CHANGE_USER.

  tests/mysql_client_test.c@1.252.1.2, 2007-09-28 23:30:52+04:00, anozdrin@station. +174 -2
    Test case for BUG#30472.

ChangeSet@1.1810.3325.7, 2007-09-28 18:05:23+02:00, mhansson@linux-st28.site +3 -0
  Bug #30832: Assertion + crash with select name_const('test', now());
  
  The NAME_CONST function is required to work correctly with constants only.
  When executed with functions that return types other than those returned by
  Item::field_type (string, int, decimal, or real), the result gets cast to
  one of those types. This cannot happen for constants.
  Fixed by only allowing constants as arguments to NAME_CONST.

  mysql-test/r/func_misc.result@1.21.1.7, 2007-09-28 18:05:20+02:00, mhansson@linux-st28.site +16 -0
    Bug#30832: Test result

  mysql-test/t/func_misc.test@1.21.2.1, 2007-09-28 18:05:20+02:00, mhansson@linux-st28.site +14 -0
    Bug#30832: Test case

  sql/item.h@1.183.1.57, 2007-09-28 18:05:20+02:00, mhansson@linux-st28.site +2 -0
    Bug#30832: The fix

ChangeSet@1.1810.3348.1, 2007-09-28 16:46:05+03:00, gkodinov@macbook.gmz +3 -0
  Bug #30587: mysql crashes when trying to group by TIME div NUMBER
  
  When calculating the result length of an integer DIV function 
  the number of decimals was used without checking the result type
  first. Thus an uninitialized number of decimals was used for some 
  types. This caused an excessive amount of memory to be allocated 
  for the field's buffer and crashed the server.
  
   
  Fixed by using the number of decimals only for data types that 
  can have decimals and thus have valid decimals number.

  mysql-test/r/func_math.result@1.33.1.4, 2007-09-28 16:45:57+03:00, gkodinov@macbook.gmz +46 -0
    Bug #30587: test case

  mysql-test/t/func_math.test@1.27.1.2, 2007-09-28 16:45:58+03:00, gkodinov@macbook.gmz +27 -0
    Bug #30587: test case

  sql/item_func.cc@1.270.85.1, 2007-09-28 16:45:58+03:00, gkodinov@macbook.gmz +5 -1
    Bug #30587: Don't use decimals on a type that doesn't have them.

ChangeSet@1.2476.470.2, 2007-09-28 17:33:30+05:00, gluh@mysql.com +3 -0
  Bug#30795 Query on INFORMATION_SCHEMA.SCHEMATA, wrong result
  skip the check of directory presence for 'information_schema' name

  mysql-test/r/information_schema.result@1.151.1.13, 2007-09-28 17:33:28+05:00, gluh@mysql.com +4 -0
    test result

  mysql-test/t/information_schema.test@1.98.1.9, 2007-09-28 17:33:28+05:00, gluh@mysql.com +6 -0
    test case

  sql/sql_show.cc@1.438.1.1, 2007-09-28 17:33:29+05:00, gluh@mysql.com +2 -1
    skip the check of directory presence for 'information_schema' name

ChangeSet@1.2476.345.51, 2007-09-28 15:42:37+04:00, anozdrin@station. +4 -0
  Prerequisite patch for BUG#30472: libmysql doesn't reset charset,
  insert_id after succ. mysql_change_user() call.
  
  Supply a correct packet length to dispatch command.

  sql/sp_head.cc@1.292.1.1, 2007-09-28 15:42:35+04:00, anozdrin@station. +1 -1
    Fix packet length.

  sql/sql_parse.cc@1.683.17.3, 2007-09-28 15:42:35+04:00, anozdrin@station. +65 -47
    Fix packet length.

  sql/sql_prepare.cc@1.233, 2007-09-28 15:42:35+04:00, anozdrin@station. +6 -5
    Fix packet length.

  tests/mysql_client_test.c@1.252.1.1, 2007-09-28 15:42:35+04:00, anozdrin@station. +200 -1
    Test case for COM_CHANGE_USER.

ChangeSet@1.2476.470.1, 2007-09-28 16:02:43+05:00, gluh@mysql.com +5 -0
  Bug#30689 Wrong content in I_S.VIEWS.VIEW_DEFINITION if VIEW is based on I_S
  view_body_utf8 attribute type is changed to 'escaped string'

  mysql-test/r/ddl_i18n_koi8r.result@1.3, 2007-09-28 16:02:41+05:00, gluh@mysql.com +4 -2
    result fix

  mysql-test/r/ddl_i18n_utf8.result@1.3, 2007-09-28 16:02:41+05:00, gluh@mysql.com +4 -2
    result fix

  mysql-test/r/information_schema.result@1.151.1.12, 2007-09-28 16:02:41+05:00, gluh@mysql.com +16 -4
    result fix

  mysql-test/t/information_schema.test@1.98.1.8, 2007-09-28 16:02:41+05:00, gluh@mysql.com +10 -0
    test case

  sql/sql_view.cc@1.153, 2007-09-28 16:02:41+05:00, gluh@mysql.com +1 -1
    Bug#30689 Wrong content in I_S.VIEWS.VIEW_DEFINITION if VIEW is based on I_S
    view_body_utf8 attribute type is changed to 'escaped string'

ChangeSet@1.2476.384.33, 2007-09-28 12:30:55+02:00, mhansson@dl145s.mysql.com +1 -0
  Bug#30665: Post-merge fix

  mysql-test/r/group_by.result@1.91, 2007-09-28 12:30:52+02:00, mhansson@dl145s.mysql.com +1 -1
    Bug#30665: Post-merge fix

ChangeSet@1.2476.469.2, 2007-09-28 10:22:54+02:00, jonas@perch.ndb.mysql.com +1 -0
  post merge

  storage/ndb/test/src/HugoTransactions.cpp@1.38, 2007-09-28 10:22:52+02:00, jonas@perch.ndb.mysql.com +0 -180
    post merge

ChangeSet@1.2403.18.81, 2007-09-28 09:58:56+02:00, jonas@perch.ndb.mysql.com +10 -0
  ndb - add new testcases/error insert bug#30975
    (recommit for correct merge order)

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.32.1.7, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +3 -1
    new error code

  storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@1.40.1.5, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +32 -0
    add error inserts

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.131.2.6, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +1 -0
    add error insert

  storage/ndb/src/kernel/blocks/pgman.cpp@1.20.1.8, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +24 -2
    add error inserts

  storage/ndb/test/include/HugoTransactions.hpp@1.16, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +18 -0
    add 
    - loadTableStartFrom
    - scanUpdate with scanflags
    - fillTableStartFrom

  storage/ndb/test/include/UtilTransactions.hpp@1.10, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +5 -0
    add
    - clearTable with scan flags

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.13.1.1, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +180 -0
    add new testcases

  storage/ndb/test/run-test/daily-basic-tests.txt@1.63.2.9, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +32 -0
    add new testcases

  storage/ndb/test/src/HugoTransactions.cpp@1.31.2.2, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +83 -48
    add new functions

  storage/ndb/test/src/UtilTransactions.cpp@1.24.1.2, 2007-09-28 09:58:54+02:00, jonas@perch.ndb.mysql.com +41 -33
    add new functions

ChangeSet@1.2476.467.1, 2007-09-28 09:36:05+02:00, mhansson@linux-st28.site +5 -0
  Bug#30665: Inconsistent optimization of IGNORE INDEX FOR {ORDER BY|GROUP BY}
  
  The optimizer takes different execution paths during EXPLAIN than SELECT,
  this fix relates only to EXPLAIN, hence no behavior changes.
  The test of sort keys for ORDER BY was prohibited from considering keys
  that were mentioned in IGNORE KEYS FOR ORDER BY. This led to two 
  inconsistencies: One was that IGNORE INDEX FOR GROUP BY and 
  IGNORE INDEX FOR ORDER BY gave apparently different EXPLAINs; the latter 
  erroneously claimed to do filesort. The second inconsistency 
  is that the test of sort keys is called twice, finding a sort key the first
  time but not the second time, leading to the mentioned filesort.
  
  Fixed by making the test of sort keys consider all enabled 
  keys on the table. This test rejects keys that are not covering, and for 
  covering keys the hint should be ignored anyway. 

  mysql-test/r/group_by.result@1.90, 2007-09-28 09:36:01+02:00, mhansson@linux-st28.site +147 -1
    Bug#30665: Changed test result. The plan gets more efficient here. 
    The output is included in order to show that it is still correct.

  mysql-test/r/order_by.result@1.71, 2007-09-28 09:36:01+02:00, mhansson@linux-st28.site +285 -0
    Bug#30665: Test result

  mysql-test/t/group_by.test@1.71, 2007-09-28 09:36:01+02:00, mhansson@linux-st28.site +1 -0
    Bug#30665: Changed test case to show correctness of changed plan

  mysql-test/t/order_by.test@1.55, 2007-09-28 09:36:01+02:00, mhansson@linux-st28.site +57 -0
    Bug#30665: Test case

  sql/sql_select.cc@1.541.24.1, 2007-09-28 09:36:01+02:00, mhansson@linux-st28.site +3 -1
    Bug#30665: 
    - the fix: Give test_if_skip_sort_order all keys not the subset of non-disabled keys.
    - Added comment to test_if_skip_sort_order

ChangeSet@1.2476.466.1, 2007-09-27 21:39:23+02:00, kent@mysql.com +3 -0
  Makefile.am, configure.in:
    Handle pstack like other optional directories
    Check if a directory exists relative to $srcdir

  Makefile.am@1.118.4.1, 2007-09-27 21:22:07+02:00, kent@mysql.com +1 -1
    Handle pstack like other optional directories
    Check if a directory exists relative to $srcdir

  configure.in@1.355.76.1, 2007-09-27 21:22:40+02:00, kent@mysql.com +6 -7
    Handle pstack like other optional directories
    Check if a directory exists relative to $srcdir

  pstack/Makefile.am@1.9, 2007-09-27 21:22:49+02:00, kent@mysql.com +5 -8
    Handle pstack like other optional directories
    Check if a directory exists relative to $srcdir

ChangeSet@1.2476.463.4, 2007-09-27 21:45:45+03:00, bell@pwbook.sanja.is.com.ua +1 -0
  fix typo

  storage/maria/ma_loghandler.c@1.54, 2007-09-27 21:45:37+03:00, bell@pwbook.sanja.is.com.ua +1 -1
    fix typo

ChangeSet@1.2476.464.2, 2007-09-27 20:00:40+03:00, jani@hynda.mysql.fi +6 -0
  Fixed merge problems.

  BitKeeper/etc/ignore@1.261, 2007-09-27 20:00:37+03:00, jani@hynda.mysql.fi +4 -0
    Added libmysql_r/client_settings.h libmysqld/scheduler.cc libmysqld/sql_connect.cc libmysqld/sql_tablespace.cc to the ignore list

  client/mysqltest.c@1.313.1.2, 2007-09-27 20:00:36+03:00, jani@hynda.mysql.fi +0 -1
    Fixed merge problems.

  sql/slave.cc@1.315.1.3, 2007-09-27 20:00:36+03:00, jani@hynda.mysql.fi +0 -2
    Fixed merge problems.

  sql/sql_yacc.yy@1.601.3.4, 2007-09-27 20:00:36+03:00, jani@hynda.mysql.fi +0 -7
    Fixed merge problems.

  storage/maria/ha_maria.cc@1.46, 2007-09-27 20:00:37+03:00, jani@hynda.mysql.fi +0 -35
    Fixed merge problems.

  storage/maria/ha_maria.h@1.15, 2007-09-27 20:00:37+03:00, jani@hynda.mysql.fi +0 -5
    Fixed merge problems.

ChangeSet@1.1810.3324.14, 2007-09-27 17:56:50+03:00, gkodinov@magare.gmz +1 -0
  Fixed a warning cased by the fix for bug 30468

  sql/sql_acl.cc@1.128.45.3, 2007-09-27 17:56:49+03:00, gkodinov@magare.gmz +2 -1
    Fixed a warning cased by the fix for bug 30468

ChangeSet@1.2476.465.1, 2007-09-27 17:41:21+03:00, monty@mysql.com +5 -0
  Faster translog_filename_by_fileno
  Fixed compiler warning
  PAGECACHE_PAGE_LINK -> PAGECACHE_BLOCK_LINK*

  storage/maria/ma_loghandler.c@1.53, 2007-09-27 17:41:19+03:00, monty@mysql.com +17 -13
    Faster translog_filename_by_fileno
    Fixed compiler warning
    PAGECACHE_PAGE_LINK -> PAGECACHE_BLOCK_LINK*

  storage/maria/ma_loghandler.h@1.26, 2007-09-27 17:41:19+03:00, monty@mysql.com +2 -2
    PAGECACHE_PAGE_LINK -> PAGECACHE_BLOCK_LINK*

  storage/maria/ma_pagecache.c@1.45, 2007-09-27 17:41:19+03:00, monty@mysql.com +6 -7
    PAGECACHE_PAGE_LINK -> PAGECACHE_BLOCK_LINK*

  storage/maria/ma_pagecache.h@1.24, 2007-09-27 17:41:19+03:00, monty@mysql.com +2 -4
    PAGECACHE_PAGE_LINK -> PAGECACHE_BLOCK_LINK*

  storage/maria/maria_def.h@1.39, 2007-09-27 17:41:19+03:00, monty@mysql.com +1 -1
    PAGECACHE_PAGE_LINK -> PAGECACHE_BLOCK_LINK*

ChangeSet@1.2476.463.2, 2007-09-27 17:36:03+03:00, bell@pwbook.sanja.is.com.ua +2 -0
  Use direct memory access for the log scan

  BUILD/SETUP.sh@1.70.1.1, 2007-09-27 17:35:55+03:00, bell@pwbook.sanja.is.com.ua +1 -0
    compile maria by default

  storage/maria/ma_recovery.c@1.32.1.2, 2007-09-27 17:35:55+03:00, bell@pwbook.sanja.is.com.ua +21 -11
    Use direct memory access for the log scan

ChangeSet@1.1810.3324.13, 2007-09-27 14:29:46+03:00, gkodinov@magare.gmz +1 -0
  separated an assertion from the assignment (bug 30468)

  sql/sql_acl.cc@1.128.45.2, 2007-09-27 14:29:45+03:00, gkodinov@magare.gmz +2 -1
    separated an assertion from the assignment (bug 30468)

ChangeSet@1.2476.463.1, 2007-09-27 14:18:28+03:00, monty@mysql.com +15 -0
  Remove SAFE_MODE for opt_range as it disables UPDATE to use keys
  REDO optimization (Bascily avoid moving blocks from/to pagecache)
  More command line arguments to maria_read_log
  Fixed recovery bug when recreating table

  sql/opt_range.cc@1.275.1.1, 2007-09-27 14:18:22+03:00, monty@mysql.com +0 -3
    Remove SAFE_MODE for opt_range as it disables UPDATE to use keys

  storage/maria/ma_blockrec.c@1.49, 2007-09-27 14:18:22+03:00, monty@mysql.com +54 -24
    REDO optimization
    Use new interface for pagecache_reads to avoid copying page buffers
    

  storage/maria/ma_loghandler.c@1.52, 2007-09-27 14:18:22+03:00, monty@mysql.com +154 -48
    Patch from Sanja:
    - Added new parameter to translog_get_page to use direct links to pagecache
    - Changed scanner to be able to use direct links
    
    This avoids a lot of calls to bmove512() in page cache.

  storage/maria/ma_loghandler.h@1.25, 2007-09-27 14:18:22+03:00, monty@mysql.com +7 -1
    Added direct link to pagecache objects

  storage/maria/ma_open.c@1.31, 2007-09-27 14:18:22+03:00, monty@mysql.com +3 -1
    Added const to parameter
    Added missing braces

  storage/maria/ma_pagecache.c@1.44, 2007-09-27 14:18:22+03:00, monty@mysql.com +74 -49
    From Sanja:
    - Added direct links to pagecache (from pagecache_read())
      Dirrect link means that on pagecache_read we get back a pointer to the pagecache buffer
    
    
    From Monty:
    - Fixed arguments to init_page_cache to handle big page caches
    - Fixed compiler warnings
    - Replaced PAGECACHE_PAGE_LINK with PAGECACHE_BLOCK_LINK * to catch errors

  storage/maria/ma_pagecache.h@1.23, 2007-09-27 14:18:23+03:00, monty@mysql.com +21 -21
    Changed block numbers from int to long to be able to handle big page caches
    Changed some PAGECACHE_PAGE_LINK to PAGECACHE_BLOCK_LINK

  storage/maria/ma_recovery.c@1.32.1.1, 2007-09-27 14:18:23+03:00, monty@mysql.com +62 -15
    Fixed recovery bug when recreating table (table was kept open)
    Moved some variables to function start (portability)
    Added space to some print messages

  storage/maria/maria_chk.c@1.22, 2007-09-27 14:18:23+03:00, monty@mysql.com +2 -2
    key_buffer_size -> page_buffer_size

  storage/maria/maria_def.h@1.38, 2007-09-27 14:18:23+03:00, monty@mysql.com +2 -2
    Changed default page_buffer_size to 10M

  storage/maria/maria_read_log.c@1.21, 2007-09-27 14:18:23+03:00, monty@mysql.com +33 -14
    Added more startup options:
    --version
    --undo (apply undo)
    --page_cache_size (to run with big cache sizes)
    --silent (to not get any output from --apply)

  storage/maria/unittest/ma_control_file-t.c@1.16, 2007-09-27 14:18:23+03:00, monty@mysql.com +1 -1
    Fixed compiler warning

  storage/maria/unittest/ma_test_loghandler-t.c@1.18, 2007-09-27 14:18:23+03:00, monty@mysql.com +1 -1
    Added new argument to translog_init_scanner()

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.17, 2007-09-27 14:18:23+03:00, monty@mysql.com +1 -1
    Added new argument to translog_init_scanner()

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.17, 2007-09-27 14:18:23+03:00, monty@mysql.com +1 -1
    Added new argument to translog_init_scanner()

ChangeSet@1.2476.1.93, 2007-09-27 12:21:56+02:00, kent@mysql.com +3 -0
  Makefile.am, make_binary_distribution.sh:
    Use custom 'pkgduppdir'
  mysql.server.sh:
    The server is installed in 'libexecdir'

  scripts/Makefile.am@1.72.1.2, 2007-09-27 10:33:27+02:00, kent@mysql.com +4 -0
    Use custom 'pkgduppdir'

  scripts/make_binary_distribution.sh@1.161, 2007-09-27 10:33:27+02:00, kent@mysql.com +3 -1
    Use custom 'pkgduppdir'

  support-files/mysql.server.sh@1.57, 2007-09-27 11:06:35+02:00, kent@mysql.com +1 -1
    The server is installed in 'libexecdir'

ChangeSet@1.1810.3347.1, 2007-09-27 12:15:19+03:00, gkodinov@magare.gmz +6 -0
  Bug #30468: column level privileges not respected when joining tables
  
  When expanding a * in a USING/NATURAL join the check for table access
  for both tables in the join was done using the grant information of the
  first one.
  Fixed by getting the grant information for the current table while 
  iterating through the columns of the join.

  mysql-test/r/grant2.result@1.25.2.11, 2007-09-27 12:15:18+03:00, gkodinov@magare.gmz +18 -0
    Bug #30468: test case

  mysql-test/t/grant2.test@1.31.2.10, 2007-09-27 12:15:18+03:00, gkodinov@magare.gmz +32 -0
    Bug #30468: test case

  sql/sql_acl.cc@1.128.45.1, 2007-09-27 12:15:18+03:00, gkodinov@magare.gmz +68 -37
    Bug #30468: correctly check column grants

  sql/sql_acl.h@1.28.1.27, 2007-09-27 12:15:18+03:00, gkodinov@magare.gmz +2 -3
    Bug #30468: correctly check column grants

  sql/sql_base.cc@1.235.114.2, 2007-09-27 12:15:18+03:00, gkodinov@magare.gmz +1 -4
    Bug #30468: correctly check column grants

  sql/sql_insert.cc@1.146.71.1, 2007-09-27 12:15:18+03:00, gkodinov@magare.gmz +3 -5
    Bug #30468: correctly check column grants

ChangeSet@1.2476.384.28, 2007-09-27 13:15:15+05:00, gshchepa@gleb.loc +2 -0
  mysqlslap.result, mysqlslap.test:
    Post-commit fix.

  mysql-test/r/mysqlslap.result@1.15, 2007-09-27 13:14:45+05:00, gshchepa@gleb.loc +1 -0
    Post-commit fix.

  mysql-test/t/mysqlslap.test@1.19, 2007-09-27 13:14:37+05:00, gshchepa@gleb.loc +2 -0
    Post-commit fix.

ChangeSet@1.1810.3345.1, 2007-09-27 08:56:06+02:00, df@pippilotta.erinye.com +1 -0
  avoid using GetTempFileName in a way it's documented to not work on windows

  mysys/mf_tempfile.c@1.24.1.3, 2007-09-27 08:56:04+02:00, df@pippilotta.erinye.com +14 -0
    Try to avoid passing null as first parameter to GetTempFileName, since it's documented that it won't work.

ChangeSet@1.1810.3344.1, 2007-09-27 08:48:39+02:00, msvensson@pilot.(none) +1 -0
  Move DBUG_ENTER to begining of function to avoid build failure with debug on windows

  libmysql/libmysql.c@1.233.25.1, 2007-09-27 08:48:37+02:00, msvensson@pilot.(none) +2 -2
    Move DBUG_ENTER to begining of function to avoid build failure with debug on windows

ChangeSet@1.1810.3319.5, 2007-09-26 21:59:17+02:00, aelkin@koti.dsl.inet.fi +1 -0
  Bug #26000 SHOW SLAVE STATUS can crash mysqld during shutdown process
  
  active_mi has been reset (shutdown) at the time of quering with 
  SHOW SLAVE STATUS so that 
  at handling of SHOW an attempt to read its members segfaults.
  
  Fixed with checking the value of active_mi before to call show_master_info()
  Merely send_ok() is invoked when active_mi does not exist.
  A test can not be easiely written.
  
  Notice, there are more analogical cases in the code which require a similar
  treatment (to be reported as a bug separately). 

  sql/sql_parse.cc@1.426.167.1, 2007-09-26 21:59:11+02:00, aelkin@koti.dsl.inet.fi +10 -1
    Ignore reporting and send only OK if master info struct has been destoyed.
    As this must be at shutdown merely a warning is sent to the client.

ChangeSet@1.2476.458.1, 2007-09-26 20:19:33+02:00, kent@mysql.com +5 -0
  make_binary_distribution.sh:
    Use 'make install' to create the package
  Makefile.am:
    Added 'pkgsuppdir' to control location separately
    Pass on mandir and infodir
    Don't install headers

  cmd-line-utils/libedit/Makefile.am@1.17, 2007-09-26 20:19:19+02:00, kent@mysql.com +3 -3
    Don't install headers

  cmd-line-utils/readline/Makefile.am@1.16, 2007-09-26 20:19:00+02:00, kent@mysql.com +4 -4
    Don't install headers

  scripts/Makefile.am@1.71.2.1, 2007-09-26 20:15:47+02:00, kent@mysql.com +2 -0
    Pass on mandir and infodir

  scripts/make_binary_distribution.sh@1.158.1.1, 2007-09-26 20:16:29+02:00, kent@mysql.com +201 -240
    Use 'make install' to create the package

  support-files/Makefile.am@1.39, 2007-09-26 20:18:00+02:00, kent@mysql.com +5 -2
    Added 'pkgsuppdir' to control location separately

ChangeSet@1.2476.1.90, 2007-09-26 19:41:46+02:00, kent@mysql.com +1 -0
  Makefile.am:
    Corrected typo

  libmysql_r/Makefile.am@1.33, 2007-09-26 19:41:40+02:00, kent@mysql.com +1 -1
    Corrected typo

ChangeSet@1.1810.3318.11, 2007-09-26 19:15:42+02:00, dfischer@mysql.com +1 -0
  Raise version number after cloning 5.0.50

  configure.in@1.245.107.1, 2007-09-26 19:15:33+02:00, dfischer@mysql.com +2 -2
    Raise version number after cloning 5.0.50

ChangeSet@1.2476.457.1, 2007-09-26 18:47:55+02:00, kent@mysql.com +13 -0
  Makefile.am:
    Always include all sub directories in "make dist"
    Removed incorrect comment
  configure.in:
    Unconditionally list make files in AC_CONFIG_FILES
    Removed 'thread_dirs', it is not used
    Minor cleanup
  compile-dist:
    Simplified the configure line needed for "make dist" to get it all
  zlib.m4, ssl.m4:
    Unconditionally list make files in AC_CONFIG_FILES
  Makefile.am:
    Removed DIST_SUBDIRS not needed
    Don't copy soft links as files into source package

  BUILD/compile-dist@1.18, 2007-08-31 01:17:26+02:00, kent@mysql.com +1 -12
    Simplified the configure line needed for "make dist" to get it all

  Makefile.am@1.118.1.22, 2007-08-31 01:21:32+02:00, kent@mysql.com +10 -3
    Always include all sub directories in "make dist"

  config/ac-macros/ssl.m4@1.6, 2007-08-31 01:18:56+02:00, kent@mysql.com +9 -8
    Unconditionally list make files in AC_CONFIG_FILES

  config/ac-macros/zlib.m4@1.14, 2007-08-31 01:18:56+02:00, kent@mysql.com +3 -4
    Unconditionally list make files in AC_CONFIG_FILES

  configure.in@1.355.52.31, 2007-08-31 01:24:12+02:00, kent@mysql.com +61 -68
    Unconditionally list make files in AC_CONFIG_FILES
    Removed 'thread_dirs', it is not used
    Minor cleanup

  extra/Makefile.am@1.46, 2007-08-31 01:23:48+02:00, kent@mysql.com +1 -0
    Always include all sub directories in "make dist"

  libmysql/Makefile.am@1.57, 2007-08-31 01:20:05+02:00, kent@mysql.com +0 -1
    Removed incorrect comment

  libmysql_r/Makefile.am@1.32, 2007-08-31 01:23:07+02:00, kent@mysql.com +1 -2
    Don't copy soft links as files into source package

  libmysqld/Makefile.am@1.91.1.26, 2007-08-31 01:23:07+02:00, kent@mysql.com +2 -1
    Don't copy soft links as files into source package

  libmysqld/examples/Makefile.am@1.41, 2007-08-31 01:23:07+02:00, kent@mysql.com +5 -5
    Don't copy soft links as files into source package

  mysql-test/Makefile.am@1.113.1.1, 2007-08-31 01:22:02+02:00, kent@mysql.com +0 -1
    Removed DIST_SUBDIRS not needed

  plugin/Makefile.am@1.8, 2007-08-31 01:23:48+02:00, kent@mysql.com +1 -0
    Always include all sub directories in "make dist"

  sql/Makefile.am@1.161.1.31, 2007-08-31 01:23:07+02:00, kent@mysql.com +5 -2
    Don't copy soft links as files into source package

ChangeSet@1.2476.384.25, 2007-09-26 19:06:54+03:00, gkodinov@magare.gmz +6 -0
  merge of the fix for bug 27802 & 27216 to 5.1-opt

  mysql-test/r/view.result@1.235.1.7, 2007-09-26 19:06:51+03:00, gkodinov@magare.gmz +6 -6
    merge of the fix for bug 27802 to 5.1

  sql/item_cmpfunc.h@1.169, 2007-09-26 19:06:51+03:00, gkodinov@magare.gmz +2 -0
    merge of the fix for bug 27216 to 5.1

  sql/sql_insert.cc@1.295.2.2, 2007-09-26 19:06:51+03:00, gkodinov@magare.gmz +1 -1
    merge of the fix for bug 27216 to 5.1

  sql/sql_lex.h@1.296.1.2, 2007-09-26 19:06:51+03:00, gkodinov@magare.gmz +2 -0
    merge of the fix for bug 27802 to 5.1

  sql/sql_select.cc@1.541.23.2, 2007-09-26 19:06:51+03:00, gkodinov@magare.gmz +24 -27
    merge of the fix for bug 27802 to 5.1

  sql/table.h@1.175.5.6, 2007-09-26 19:06:51+03:00, gkodinov@magare.gmz +0 -2
    merge of the fix for bug 27802 to 5.1

ChangeSet@1.2476.454.4, 2007-09-26 17:28:20+02:00, msvensson@pilot.(none) +2 -0
  Update result file(s) for 5.1

  mysql-test/r/named_pipe.result@1.2, 2007-09-26 17:28:18+02:00, msvensson@pilot.(none) +7 -7
    Update result file for 5.1

  mysql-test/r/shm.result@1.5, 2007-09-26 17:28:18+02:00, msvensson@pilot.(none) +7 -7
    Update result file for 5.1

ChangeSet@1.1810.3302.12, 2007-09-26 17:04:41+02:00, msvensson@pilot.(none) +1 -0
  Bug#31167 Introduction of @@hostname breaks replication in a ring
   - Use a local uservariable to avoid @@hostname in binlog

  scripts/mysql_system_tables_data.sql@1.1.3.1, 2007-09-26 17:04:39+02:00, msvensson@pilot.(none) +2 -1
    Load @@hostname into a local user variable to avoid
    writing @@hostname to the binary log that potentially
    would be replicated to a slave server that not yet was upgraded
    to have @@hostname.

ChangeSet@1.2476.456.1, 2007-09-26 12:45:08+02:00, gshchepa@devsrv-b.mysql.com +3 -0
  Fixed bug #31075.
  The `SELECT col FROM t WHERE col NOT IN (col, ...) GROUP BY col'
  crashed in the range optimizer.
  
  The get_func_mm_tree function has been modified to check the
  Item_func_in::array field for the NULL value before using of that
  value.

  mysql-test/r/func_in.result@1.40.1.5, 2007-09-26 12:43:38+02:00, gshchepa@devsrv-b.mysql.com +5 -0
    Added test case for bug #31075.

  mysql-test/t/func_in.test@1.31.1.2, 2007-09-26 12:43:37+02:00, gshchepa@devsrv-b.mysql.com +8 -0
    Added test case for bug #31075.

  sql/opt_range.cc@1.274.1.10, 2007-09-26 12:43:35+02:00, gshchepa@devsrv-b.mysql.com +1 -1
    Fixed bug #31075.
    The get_func_mm_tree function has been modified to check the
    Item_func_in::array field for the NULL value before using of that
    value.

ChangeSet@1.2476.197.72, 2007-09-25 15:52:01+02:00, guilhem@gbichot4.local +1 -0
  WL#3072 Maria recovery
  Minor change: decouple the writing of a recovery trace from
  compilation with --with-debug; that writing happens if and only
  if EXTRA_DEBUG. So one can enable (by defining EXTRA_DEBUG) a recovery trace
  in a non-debug build.

  storage/maria/ma_recovery.c@1.33, 2007-09-25 15:51:59+02:00, guilhem@gbichot4.local +5 -2
    Small optimization. Decouple recovery trace from --with-debug.

ChangeSet@1.2476.447.3, 2007-09-25 12:16:39+02:00, stewart@willster.(none) +2 -0
  ndb_rand.c:
    Rename: ndb/src/common/util/ndb_rand.c -> storage/ndb/src/common/util/ndb_rand.c
  ndb_rand.h:
    Rename: ndb/include/util/ndb_rand.h -> storage/ndb/include/util/ndb_rand.h

  storage/ndb/include/util/ndb_rand.h@1.2, 2007-09-25 12:16:03+02:00, stewart@willster.(none) +0 -0
    Rename: ndb/include/util/ndb_rand.h -> storage/ndb/include/util/ndb_rand.h

  storage/ndb/src/common/util/ndb_rand.c@1.2, 2007-09-25 12:16:22+02:00, stewart@willster.(none) +0 -0
    Rename: ndb/src/common/util/ndb_rand.c -> storage/ndb/src/common/util/ndb_rand.c

ChangeSet@1.1810.3217.13, 2007-09-25 12:01:23+02:00, stewart@flamingspork.com +4 -0
  [PATCH] BUG#30379 Better randomise time before retry in timeout check (DBTC)
  
  timoOutLoopStartLab() checks if any transactions have been delayed
  for so long that we are forced to perform some action (e.g. abort,
  resend etc).
  
  It is *MEANT* to (according to the comment):
  > To avoid aborting both transactions in a deadlock detected by time-out
  > we insert a random extra time-out of upto 630 ms by using the lowest
  > six bits of the api connect reference.
  > We spread it out from 0 to 630 ms if base time-out is larger than 3 sec,
  > we spread it out from 0 to 70 ms if base time-out is smaller than 300 msec,
  > and otherwise we spread it out 310 ms.
  
  The comment (as all do) lies.
  
  the API connect reference is not very random, producing incredibly
  predictable "random" numbers. This could lead to both txns being
  aborted instead of just one.
  
  Before:
  timeout value: 123 3
  timeout value: 122 2
  timeout value: 122 2
  timeout value: 122 2
  timeout value: 123 3
  
  After:
  timeout value: 127 7
  timeout value: 126 6
  timeout value: 129 9
  timeout value: 139 19
  timeout value: 137 17
  timeout value: 151 31
  timeout value: 130 10
  timeout value: 132 12
  
  Index: ndb-work/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
  ===================================================================

  ndb/include/util/ndb_rand.h@1.1, 2007-09-25 11:02:59+02:00, stewart@flamingspork.com +33 -0
    BUG#30379 Better randomise time before retry in timeout check (DBTC)

  ndb/include/util/ndb_rand.h@1.0, 2007-09-25 11:02:59+02:00, stewart@flamingspork.com +0 -0

  ndb/src/common/util/Makefile.am@1.10.3.1, 2007-09-25 11:02:59+02:00, stewart@flamingspork.com +2 -1
    BUG#30379 Better randomise time before retry in timeout check (DBTC)

  ndb/src/common/util/ndb_rand.c@1.1, 2007-09-25 11:02:59+02:00, stewart@flamingspork.com +40 -0
    BUG#30379 Better randomise time before retry in timeout check (DBTC)

  ndb/src/common/util/ndb_rand.c@1.0, 2007-09-25 11:02:59+02:00, stewart@flamingspork.com +0 -0

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.73.51.1, 2007-09-25 11:02:59+02:00, stewart@flamingspork.com +3 -1
    BUG#30379 Better randomise time before retry in timeout check (DBTC)

ChangeSet@1.2476.197.71, 2007-09-25 11:54:35+02:00, guilhem@gbichot4.local +4 -0
  WL#3072 Maria recovery
  Progress reports on stderr if doing recovery from ha_maria;
  don't do checkpoints if activity since last checkpoint < 2MB
  (no change in fact as background thread is disabled for now);
  recovery trace is only if EXTRA_DEBUG now (better for benchmarks).

  storage/maria/ma_checkpoint.c@1.21, 2007-09-25 11:54:33+02:00, guilhem@gbichot4.local +9 -6
    don't do checkpoints if activity (log writes plus page flushes)
    since last checkpoint was < 2MB.

  storage/maria/ma_recovery.c@1.32, 2007-09-25 11:54:33+02:00, guilhem@gbichot4.local +269 -205
    progress reports in recovery (10%, transactions left to rollback etc);
    that is only if from ha_maria and is displayed on stderr.
    Recovery trace is now created only if EXTRA_DEBUG.

  storage/maria/ma_test_recovery@1.12, 2007-09-25 11:54:33+02:00, guilhem@gbichot4.local +1 -1
    don't use --debug, as it can absent from binary

  storage/maria/ma_test_recovery.expected@1.7, 2007-09-25 11:54:33+02:00, guilhem@gbichot4.local +24 -24
    update (--debug gone)

ChangeSet@1.1810.3324.11, 2007-09-24 15:34:10+03:00, gkodinov@magare.gmz +4 -0
  Bug #28702: VIEWs defined with USE/FORCE KEY ignore that request
  When storing the VIEW the CREATE VIEW command is reconstructed 
  from the parse tree. While constructing the command string
  the index hints specified should also be printed.
  Fixed by adding code to print the index hints when printing a 
  table in the FROM clause.

  mysql-test/r/view.result@1.138.1.70, 2007-09-24 15:34:09+03:00, gkodinov@magare.gmz +28 -0
    Bug #28702: test case

  mysql-test/t/view.test@1.126.1.63, 2007-09-24 15:34:09+03:00, gkodinov@magare.gmz +21 -0
    Bug #28702: test case

  sql/sql_select.cc@1.312.174.8, 2007-09-24 15:34:09+03:00, gkodinov@magare.gmz +52 -0
    Bug #28702: preserve index hints in a VIEW definition.

  sql/table.h@1.102.16.10, 2007-09-24 15:34:09+03:00, gkodinov@magare.gmz +2 -0
    Bug #28702: preserve index hints in a VIEW definition.

ChangeSet@1.2476.384.22, 2007-09-24 13:02:59+02:00, gkodinov@macbook.local +2 -0
  merging bug 28701 to 5.1-opt

  mysql-test/r/view.result@1.235.1.5, 2007-09-24 13:02:48+02:00, gkodinov@macbook.local +4 -4
    merging bug 28701 to 5.1-opt

  sql/sql_view.cc@1.151, 2007-09-24 13:02:49+02:00, gkodinov@macbook.local +2 -5
    merging bug 28701 to 5.1-opt

ChangeSet@1.1810.3320.9, 2007-09-24 12:42:44+02:00, msvensson@shellback.(none) +7 -0
  Add test for named pipes on windows
  Improve test for  shm on windows

  mysql-test/include/windows.inc@1.1.1.1, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +5 -4
    improve "skip message" and don't require a result file

  mysql-test/r/named_pipe.result@1.1, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +2153 -0
    New BitKeeper file ``mysql-test/r/named_pipe.result''

  mysql-test/r/named_pipe.result@1.0, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +0 -0

  mysql-test/r/shm.result@1.4, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +2153 -0
    Update result after adding more tests

  mysql-test/r/shm.result@1.3, 2007-09-24 12:27:21+02:00, msvensson@shellback.(none) +0 -0
    Rename: mysql-test/t/shm.result -> mysql-test/r/shm.result

  mysql-test/t/shm.result@1.2, 2007-09-24 12:25:34+02:00, msvensson@shellback.(none) +0 -0
    Rename: mysql-test/r/windows_shm.result -> mysql-test/t/shm.result

  mysql-test/t/named_pipe-master.opt@1.1, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +1 -0
    New BitKeeper file ``mysql-test/t/named_pipe-master.opt''

  mysql-test/t/named_pipe-master.opt@1.0, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +0 -0

  mysql-test/t/named_pipe.test@1.1, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +14 -0
    New BitKeeper file ``mysql-test/t/named_pipe.test''

  mysql-test/t/named_pipe.test@1.0, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +0 -0

  mysql-test/t/shm-master.opt@1.3, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +1 -1
    Add $MTR_BUILD_THREAD to get a unique shared memory base name

  mysql-test/t/shm-master.opt@1.2, 2007-09-24 12:25:04+02:00, msvensson@shellback.(none) +0 -0
    Rename: mysql-test/t/windows_shm-master.opt -> mysql-test/t/shm-master.opt

  mysql-test/t/shm.test@1.4, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +11 -1
    Run a bunch of more test to check shm

  mysql-test/t/shm.test@1.3, 2007-09-24 12:24:43+02:00, msvensson@shellback.(none) +0 -0
    Rename: mysql-test/t/windows_shm.test -> mysql-test/t/shm.test

ChangeSet@1.2476.197.70, 2007-09-24 10:24:51+02:00, guilhem@gbichot4.local +1 -0
  Optimization (useful at least for the Maria engine): we disable
  logging of insertions made by CREATE SELECT.

  sql/sql_insert.cc@1.281.3.1, 2007-09-24 10:24:47+02:00, guilhem@gbichot4.local +10 -0
    If error during the CREATE SELECT we drop the table, so no need for
    engines to do logging of the insertions (optimization). Engines
    require that disabling is done before locking and re-enabling is done
    before unlocking; as table creation and locking is done as one
    function (create_table_from_items()) we disable before calling
    this function and re-enable before unlocking, in send_eof() (called
    if success) and abort() (called if error).
    Question for reviewer: would it be better to do the disabling between
    creation and locking, so inside create_table_from_items(), given
    that this function is used only by CREATE SELECT?

ChangeSet@1.1810.3318.9, 2007-09-22 16:29:15+02:00, jonathan@bagpuss.adsl.perkin.org.uk +1 -0
  Revert previous attempt to fix bug#27693, the files removed from the
  cmake list are auto-generated and thus still required.  Correct fix
  not yet known.

  bdb/CMakeLists.txt@1.1.3.1, 2007-09-22 16:25:56+02:00, jonathan@bagpuss.adsl.perkin.org.uk +7 -7
    Revert previous change, it is incorrect as those files are automatically
    generated.

ChangeSet@1.1810.3320.8, 2007-09-22 12:17:14+02:00, msvensson@shellback.(none) +2 -0
  Bug#30843  Bad Test addition to t/archive.test

  mysql-test/r/archive.result@1.13.1.7, 2007-09-22 12:17:09+02:00, msvensson@shellback.(none) +4 -5
    Don't care about the "after insert delayed" record when since
    we can't guarantee the order it's been inserted   

  mysql-test/t/archive.test@1.14.1.7, 2007-09-22 12:17:09+02:00, msvensson@shellback.(none) +3 -3
    Don't care about the "after insert delayed" record when since
    we can't guarantee the order it's been inserted   

ChangeSet@1.1810.3341.1, 2007-09-22 11:49:27+04:00, evgen@sunlight.local +12 -0
  Bug#27216: functions with parameters of different date types may return wrong
  type of the result.
  
  There are several functions that accept parameters of different types.
  The result field type of such functions was determined based on
  the aggregated result type of its arguments. As the DATE and the DATETIME
  types are represented by the STRING type, the result field type
  of the affected functions was always STRING for DATE/DATETIME arguments.
  The affected functions are COALESCE, IF, IFNULL, CASE, LEAST/GREATEST, CASE.
  
  Now the affected functions aggregate the field types of their arguments rather
  than their result types and return the result of aggregation as their result
  field type.
  The cached_field_type member variable is added to the number of classes to
  hold the aggregated result field type.
  The str_to_date() function's result field type now defaults to the
  MYSQL_TYPE_DATETIME.
  The agg_field_type() function is added. It aggregates field types with help
  of the Field::field_type_merge() function.
  The create_table_from_items() function now uses the 
  item->tmp_table_field_from_field_type() function to get the proper field
  when the item is a function with a STRING result type.

  libmysql/libmysql.c@1.233.24.1, 2007-09-22 11:44:40+04:00, evgen@sunlight.local +2 -0
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The client library now accepts the NEWDATE type as a string.

  mysql-test/r/date_formats.result@1.18.12.2, 2007-09-22 11:48:37+04:00, evgen@sunlight.local +1 -1
    A test case result corrected after fixing bug#27216.

  mysql-test/r/type_datetime.result@1.30.1.17, 2007-09-22 11:48:39+04:00, evgen@sunlight.local +61 -0
    Added a test case for the bug#27216: functions with parameters of different
    date types may return wrong type of the result.

  mysql-test/t/type_datetime.test@1.18.1.15, 2007-09-22 11:48:40+04:00, evgen@sunlight.local +38 -0
    Added a test case for the bug#27216: functions with parameters of different
    date types may return wrong type of the result.

  sql/item_cmpfunc.cc@1.187.47.7, 2007-09-22 11:45:40+04:00, evgen@sunlight.local +36 -4
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    Now the fix_length_and_dec functions of the
    Item_func_ifnull,Item_func_if, Item_func_case, Item_func_coalesce
    classes are use agg_field_type function to find out the type of their 
    result field.

  sql/item_cmpfunc.h@1.122.2.32, 2007-09-22 11:48:32+04:00, evgen@sunlight.local +7 -1
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The cached_field type is added to the Item_func_case, Item_func_if and
    Item_func_coalesce classes.
    The field_type function is added to the Item_func_ifnull, Item_func_if,
    Item_func_coalesce, Item_func_case classes.

  sql/item_func.cc@1.270.84.1, 2007-09-22 11:48:33+04:00, evgen@sunlight.local +1 -0
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The Item_func_min_max::fix_length_and_dec function now uses the agg_field_type
    function to find out the correct type of the result field.

  sql/item_func.h@1.136.3.37, 2007-09-22 11:48:34+04:00, evgen@sunlight.local +3 -1
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The cached_field_type variable is added to the Item_func_min_max class.

  sql/item_timefunc.cc@1.100.31.6, 2007-09-22 11:48:34+04:00, evgen@sunlight.local +1 -1
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The result of the str_to_date function now defaults to the
    DATETIME type.

  sql/mysql_priv.h@1.290.130.1, 2007-09-22 11:48:35+04:00, evgen@sunlight.local +1 -0
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The prototype of the agg_field_type function is added.

  sql/protocol.cc@1.111.6.2, 2007-09-22 11:48:36+04:00, evgen@sunlight.local +1 -0
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The Protocol_simple::store function is now used to store fields of NEWDATE type.

  sql/sql_insert.cc@1.146.70.1, 2007-09-22 11:48:36+04:00, evgen@sunlight.local +4 -1
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The create_table_from_items function now uses the
    tmp_table_field_from_field_type function to get field for items with the
    STRING result type.

ChangeSet@1.2476.453.2, 2007-09-21 12:05:54-04:00, iggy@alf.(none) +1 -0
  Bug #15327: configure: --with-tcp-port option being partially ignored
      
  make sure that if builder configured with a non-standard (!= 3306)
  default TCP port that value actually gets used throughout.

  win/configure.js@1.11, 2007-09-21 12:05:50-04:00, iggy@alf.(none) +35 -2
    Bug #15327: configure: --with-tcp-port option being partially ignored
            
    If MYSQL_TCP_PORT defaulted in configure (factory default 3306
    at the time of this writing), set MYSQL_TCP_PORT to factory
    default, then clear factory default after. That way, we lose no
    information, and we can distinguish between "defaulted" and the
    pathological case "builder specifically configured a port that
    coincides with factory default." This can in theory happen if
    builder configures and builds several servers from a script
    (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326).
    Not all that probable, but much preferable to having more "magic"
    happen in the server when we can solve this without any guesswork.

ChangeSet@1.1810.3320.6, 2007-09-21 17:52:02+02:00, msvensson@shellback.(none) +1 -0
  - Increase default connect_timeout to avoid intermittent
  disconnects when test servers are put under load

  mysql-test/mysql-test-run.pl@1.30.49.103, 2007-09-21 17:51:59+02:00, msvensson@shellback.(none) +5 -0
    - Increase default connect_timeout to avoid intermittent
    disconnects when test servers are put under load

ChangeSet@1.1810.3330.2, 2007-09-21 11:38:23-04:00, iggy@alf.(none) +1 -0
  Bug #15327: configure: --with-tcp-port option being partially ignored
    
  make sure that if builder configured with a non-standard (!= 3306)
  default TCP port that value actually gets used throughout.

  win/configure.js@1.1.10.1, 2007-09-21 11:38:19-04:00, iggy@alf.(none) +35 -2
    Bug #15327: configure: --with-tcp-port option being partially ignored
        
    If MYSQL_TCP_PORT defaulted in configure (factory default 3306
    at the time of this writing), set MYSQL_TCP_PORT to factory
    default, then clear factory default after. That way, we lose no
    information, and we can distinguish between "defaulted" and the
    pathological case "builder specifically configured a port that
    coincides with factory default." This can in theory happen if
    builder configures and builds several servers from a script
    (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326).
    Not all that probable, but much preferable to having more "magic"
    happen in the server when we can solve this without any guesswork.

ChangeSet@1.1810.3320.5, 2007-09-21 17:10:45+02:00, msvensson@shellback.(none) +1 -0
  Bug#28359 Intermitted lost connection at 'reading authorization packet' errors
   - Increase default 'connect_timeout' value to 10 seconds

  sql/mysql_priv.h@1.290.129.1, 2007-09-21 17:10:40+02:00, msvensson@shellback.(none) +6 -1
    Increase the default connect_timeout value to 10 seconds

ChangeSet@1.2476.452.1, 2007-09-21 13:48:57+03:00, bell@pwbook.sanja.is.com.ua +1 -0
  Transaction log flush serialization.

  storage/maria/ma_loghandler.c@1.49.1.1, 2007-09-21 13:48:45+03:00, bell@pwbook.sanja.is.com.ua +21 -6
    Transaction log flush serialization.

ChangeSet@1.2476.384.20, 2007-09-21 12:17:09+02:00, gkodinov@macbook.local +1 -0
  fixed warnings by bug 30639

  sql/opt_range.cc@1.274.1.9, 2007-09-21 12:17:00+02:00, gkodinov@macbook.local +3 -3
    fixed warnings by bug 30639

ChangeSet@1.2476.384.19, 2007-09-21 10:15:16+02:00, gkodinov@macbook.local +10 -0
  fixed type conversion warnings revealed by bug 30639

  sql/opt_range.cc@1.274.1.8, 2007-09-21 10:14:57+02:00, gkodinov@macbook.local +9 -9
    fixed type conversion warnings revealed by bug 30639 

  sql/sql_map.cc@1.24, 2007-09-21 10:14:58+02:00, gkodinov@macbook.local +3 -3
    fixed type conversion warnings revealed by bug 30639 

  sql/sql_select.cc@1.541.1.21, 2007-09-21 10:14:59+02:00, gkodinov@macbook.local +1 -1
    fixed type conversion warnings revealed by bug 30639 

  sql/sql_update.cc@1.239.9.1, 2007-09-21 10:15:00+02:00, gkodinov@macbook.local +1 -1
    fixed type conversion warnings revealed by bug 30639 

  storage/federated/ha_federated.cc@1.111, 2007-09-21 10:15:01+02:00, gkodinov@macbook.local +3 -3
    fixed type conversion warnings revealed by bug 30639 

  storage/heap/ha_heap.cc@1.118, 2007-09-21 10:15:02+02:00, gkodinov@macbook.local +1 -1
    fixed type conversion warnings revealed by bug 30639 

  storage/innobase/handler/ha_innodb.cc@1.360, 2007-09-21 10:15:02+02:00, gkodinov@macbook.local +1 -1
    fixed type conversion warnings revealed by bug 30639 

  storage/myisam/ha_myisam.cc@1.175.1.56, 2007-09-21 10:15:03+02:00, gkodinov@macbook.local +1 -1
    fixed type conversion warnings revealed by bug 30639 

  storage/myisam/mi_write.c@1.57.1.13, 2007-09-21 10:15:04+02:00, gkodinov@macbook.local +1 -1
    fixed type conversion warnings revealed by bug 30639 

  storage/myisam/sort.c@1.51.1.21, 2007-09-21 10:15:05+02:00, gkodinov@macbook.local +2 -2
    fixed type conversion warnings revealed by bug 30639 

ChangeSet@1.1810.3324.8, 2007-09-21 12:09:00+04:00, evgen@sunlight.local +4 -0
  Bug#30384: Having SQL_BUFFER_RESULT option in the CREATE .. KEY(..) .. SELECT
  led to creating corrupted index.
  
  While execution of the  CREATE .. SELECT SQL_BUFFER_RESULT statement the 
  engine->start_bulk_insert function was called twice. On the first call
  On the first call MyISAM disabled all non-unique indexes and on the second
  call it decides to not re-enable them because all indexes was disabled.
  Due to this no indexes was actually created during CREATE TABLE thus
  producing crashed table.
  
  Now the select_inset class has is_bulk_insert_mode flag which prevents
  calling the start_bulk_insert function twice.
  The flag is set in the select_create::prepare, select_insert::prepare2
  functions and the select_insert class constructor.
  The flag is reset in the select_insert::send_eof function.

  mysql-test/r/insert_select.result@1.35.1.16, 2007-09-21 12:05:56+04:00, evgen@sunlight.local +12 -0
    A test case is added for the bug#30384: Having SQL_BUFFER_RESULT option in the 
    CREATE .. KEY(..) .. SELECT led to creating corrupted index.

  mysql-test/t/insert_select.test@1.34.1.7, 2007-09-21 12:05:22+04:00, evgen@sunlight.local +12 -0
    A test case is added for the bug#30384: Having SQL_BUFFER_RESULT option in the
    CREATE .. KEY(..) .. SELECT led to creating corrupted index.

  sql/sql_class.h@1.230.55.32, 2007-09-21 12:06:30+04:00, evgen@sunlight.local +1 -1
    Bug#30384: Having SQL_BUFFER_RESULT option in the CREATE .. KEY(..) .. SELECT
    led to creating corrupted index.
    The is_bulk_insert_mode flag is added to the select_insert class.

  sql/sql_insert.cc@1.146.69.2, 2007-09-21 12:07:40+04:00, evgen@sunlight.local +10 -2
    Bug#30384: Having SQL_BUFFER_RESULT option in the CREATE .. KEY(..) .. SELECT
    led to creating corrupted index.
    The is_bulk_insert_mode is set in the select_create::prepare, select_insert::prepare2
    functions and the select_insert class constructor.
    The flag is reset in the select_insert::send_eof function.

ChangeSet@1.1810.3340.1, 2007-09-21 09:48:30+02:00, msvensson@shellback.(none) +2 -0
  Bug#30843 Bad Test addition to t/archive.test
   - Add extra insert

  mysql-test/r/archive.result@1.13.1.6, 2007-09-21 09:48:27+02:00, msvensson@shellback.(none) +3 -1
    Add an extra insert to guarantee that the delayed
    insert shows up in the table 

  mysql-test/t/archive.test@1.14.1.6, 2007-09-21 09:48:28+02:00, msvensson@shellback.(none) +9 -1
    Add an extra insert to guarantee that the delayed
    insert shows up in the table 

ChangeSet@1.2476.183.48, 2007-09-21 08:13:52+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
  Fixing bug in test in that a database was not dropped and was visible
  in following tests.

  mysql-test/suite/rpl/r/rpl_bug31076.result@1.2, 2007-09-21 08:13:25+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Result file change.

  mysql-test/suite/rpl/t/rpl_bug31076.test@1.2, 2007-09-21 08:13:28+02:00, mats@kindahl-laptop.dnsalias.net +3 -0
    Dropping database so that following tests don't see it.

ChangeSet@1.1810.3339.1, 2007-09-20 18:10:35+02:00, tnurnberg@sin.intern.azundris.com +5 -0
  Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
  
  clean up SHOW GRANTS so it will show host-names with case as entered.
  make REVOKE and friends case-sensitive to make things more intuitive.
  Patch by Martin Friebe.

  mysql-test/r/grant.result@1.37.14.1, 2007-09-20 18:10:34+02:00, tnurnberg@sin.intern.azundris.com +3 -0
    Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
    
    clean up after test so random order of tests is possible

  mysql-test/r/grant3.result@1.4, 2007-09-20 18:10:34+02:00, tnurnberg@sin.intern.azundris.com +122 -0
    Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
    
    Show that REVOKE, SHOW GRANTS etc. are now consistently case-sensitive.

  mysql-test/t/grant.test@1.41.1.17, 2007-09-20 18:10:34+02:00, tnurnberg@sin.intern.azundris.com +3 -0
    Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
    
    clean up after test so random order of tests is possible

  mysql-test/t/grant3.test@1.5, 2007-09-20 18:10:34+02:00, tnurnberg@sin.intern.azundris.com +100 -0
    Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
    
    Show that REVOKE, SHOW GRANTS etc. are now consistently case-sensitive.

  sql/sql_acl.cc@1.128.1.95, 2007-09-20 18:10:34+02:00, tnurnberg@sin.intern.azundris.com +31 -10
    Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
    
    clean up SHOW GRANTS so it will show host-names with case as entered.
    make REVOKE and friends case-sensitive to make things more intuitive.
    Patch by Martin Friebe.

ChangeSet@1.2476.197.68, 2007-09-20 18:02:36+02:00, guilhem@gbichot4.local +1 -0
  In non-debug builds, the log handler failed to read any log
  record (for example in ma_test_loghandler-t). Reason was
  wrongly matched () in DBUG.

  storage/maria/ma_loghandler.c@1.50, 2007-09-20 18:02:34+02:00, guilhem@gbichot4.local +2 -2
    Wrongly matched parenthesis:
    DBUG_PRINT(keyword, argslist) expands to roughly
    _db_doprnt arglist;
    So DBUG_PRINT("enter",(a);
    b;
    c);
    expands to roughly
    _db_doprnt(a);b;c;
    which is valid code. Except that in non-debug builds, DBUG_PRINT(
    expands to nothing so the wrongly "included" code is thrown away,
    leading to some members of "scanner" to not be initialized.

ChangeSet@1.2476.197.67, 2007-09-20 16:11:46+02:00, guilhem@gbichot4.local +5 -0
  fix for non-debug compilation errors.
  Note that non-debug build fails in log handler functions, mail sent.

  storage/maria/ma_blockrec.c@1.48, 2007-09-20 16:11:44+02:00, guilhem@gbichot4.local +2 -0
    fix for compiler warning

  storage/maria/ma_checkpoint.c@1.20, 2007-09-20 16:11:44+02:00, guilhem@gbichot4.local +6 -5
    Debug build does not catch this situation
    static int f();
    ...
    f(2);
    ...
    static int f(int a, int b);
    Maybe this is because it believes the declaration is K&R. Non-debug
    build catches it. Adding (void) as an habit to avoid such errors.

  storage/maria/ma_checkpoint.h@1.8, 2007-09-20 16:11:44+02:00, guilhem@gbichot4.local +1 -1
    adding (void)

  storage/maria/ma_recovery.c@1.31, 2007-09-20 16:11:44+02:00, guilhem@gbichot4.local +4 -4
    adding (void)

  storage/maria/ma_recovery.h@1.9, 2007-09-20 16:11:44+02:00, guilhem@gbichot4.local +1 -1
    adding (void)

ChangeSet@1.1810.3338.1, 2007-09-20 18:05:09+04:00, evgen@sunlight.local +3 -0
  Bug#29908: A user can gain additional access through the ALTER VIEW.
  
  Non-definer of a view was allowed to alter that view. Due to this the alterer
  can elevate his access rights to access rights of the view definer and thus
  modify data which he wasn't allowed to modify. A view defined with
  SQL SECURITY INVOKER can't be used directly for access rights elevation.
  But a user can first alter the view SQL code and then alter the view to 
  SQL SECURITY DEFINER and thus elevate his access rights. Due to this
  altering a view with SQL SECURITY INVOKER is also prohibited.
  
  Now the mysql_create_view function allows ALTER VIEW only to the view
  definer or a super user. 

  mysql-test/r/view_grant.result@1.8.1.18, 2007-09-20 17:48:10+04:00, evgen@sunlight.local +47 -3
    Added a test case for the bug#29908: A user can gain additional access through the
    ALTER VIEW.

  mysql-test/t/view_grant.test@1.8.1.16, 2007-09-20 17:46:26+04:00, evgen@sunlight.local +47 -2
    Added a test case for the bug#29908: A user can gain additional access through the
    ALTER VIEW.
    A test case was adjusted after fixfing bug#29908.

  sql/sql_view.cc@1.78.1.40, 2007-09-20 18:03:16+04:00, evgen@sunlight.local +1 -4
    Bug#29908: A user can gain additional access through the ALTER VIEW.
    Now the mysql_create_view function allows ALTER VIEW only to the view
    definer or a super user. 

ChangeSet@1.2476.449.3, 2007-09-20 16:27:58+05:00, gluh@mysql.com +3 -0
  result fix

  mysql-test/r/alter_table.result@1.83.1.4, 2007-09-20 16:27:56+05:00, gluh@mysql.com +4 -4
    result fix

  mysql-test/r/log_tables.result@1.22, 2007-09-20 16:27:56+05:00, gluh@mysql.com +6 -6
    result fix

  mysql-test/r/show_check.result@1.132, 2007-09-20 16:27:56+05:00, gluh@mysql.com +8 -248
    result fix

ChangeSet@1.1810.3324.7, 2007-09-20 14:38:41+05:00, gluh@mysql.com +1 -0
  result fix

  mysql-test/r/grant.result@1.37.1.31, 2007-09-20 14:38:39+05:00, gluh@mysql.com +1 -1
    result fix

ChangeSet@1.1810.3324.6, 2007-09-20 13:54:46+05:00, gluh@mysql.com +17 -0
  Bug#27747 database metadata doesn't return sufficient column default info
  added get_field_default_value() function which obtains default value from the field
  (used in store_create_info() & get_schema_column_record() functions)

  mysql-test/r/alter_table.result@1.49.1.19, 2007-09-20 13:54:44+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/create.result@1.107.1.28, 2007-09-20 13:54:44+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/ctype_collate.result@1.31.1.3, 2007-09-20 13:54:44+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/ctype_recoding.result@1.30.1.5, 2007-09-20 13:54:44+05:00, gluh@mysql.com +3 -3
    result fix

  mysql-test/r/default.result@1.3.1.3, 2007-09-20 13:54:44+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/gis.result@1.35.1.11, 2007-09-20 13:54:44+05:00, gluh@mysql.com +9 -9
    result fix

  mysql-test/r/grant.result@1.37.1.30, 2007-09-20 13:54:44+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/information_schema.result@1.87.4.8, 2007-09-20 13:54:44+05:00, gluh@mysql.com +32 -1
    result fix

  mysql-test/r/key.result@1.28.1.11, 2007-09-20 13:54:44+05:00, gluh@mysql.com +11 -11
    result fix

  mysql-test/r/mysql.result@1.17.2.14, 2007-09-20 13:54:44+05:00, gluh@mysql.com +2 -2
    result fix

  mysql-test/r/ps_1general.result@1.50.1.8, 2007-09-20 13:54:44+05:00, gluh@mysql.com +3 -3
    result fix

  mysql-test/r/show_check.result@1.75.1.13, 2007-09-20 13:54:44+05:00, gluh@mysql.com +2 -2
    result fix

  mysql-test/r/sp.result@1.170.28.28, 2007-09-20 13:54:44+05:00, gluh@mysql.com +2 -2
    result fix

  mysql-test/r/type_enum.result@1.27.1.7, 2007-09-20 13:54:44+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/type_ranges.result@1.38.1.8, 2007-09-20 13:54:44+05:00, gluh@mysql.com +11 -11
    result fix

  mysql-test/t/information_schema.test@1.65.4.6, 2007-09-20 13:54:44+05:00, gluh@mysql.com +17 -0
    test case

  sql/sql_show.cc@1.253.59.7, 2007-09-20 13:54:44+05:00, gluh@mysql.com +64 -64
    Bug#27747 database metadata doesn't return sufficient column default info
    added get_field_default_value() function which obtains default value from the field
    (used in store_create_info() & get_schema_column_record() functions)

ChangeSet@1.2476.197.66, 2007-09-20 10:31:25+02:00, guilhem@gbichot4.local +4 -0
  Fix for segmentation fault when updating a record having a small
  BLOB whose size didn't change. Fix for probably impossible problem
  in Recovery.

  mysql-test/r/maria.result@1.18, 2007-09-20 10:31:23+02:00, guilhem@gbichot4.local +7 -0
    result for new test

  mysql-test/t/maria.test@1.19, 2007-09-20 10:31:23+02:00, guilhem@gbichot4.local +8 -0
    testcase for a bug (used to segfault)

  storage/maria/ma_blockrec.c@1.47, 2007-09-20 10:31:23+02:00, guilhem@gbichot4.local +2 -1
    When writing a record, we put BLOBs into the head part if there is
    room for them. "Is there room" was first decided by
    !(tmp_data + length > end_of_data) (line 1894)
    but then was tested again as
    *blob_lengths < (ulong)(end_of_data - data). We see that in case of
    equality, the first condition was true but the second was not,
    so it was inconsistent and crashed later.

  storage/maria/ma_recovery.c@1.30, 2007-09-20 10:31:23+02:00, guilhem@gbichot4.local +4 -4
    When wondering if recovery should update the state (like state.records):
    if table was closed, its is_of_horizon was set to X, then
    table was reopened and a REDO was written. If this REDO had LSN
    X (as horizon is just a lower bound of the LSN of the next record),
    we have to apply it. In practice this equality probably could not
    happen because of LOGREC_FILE_ID would be written before the REDO.

ChangeSet@1.2476.448.1, 2007-09-19 17:47:52+03:00, gkodinov@magare.gmz +4 -0
  Bug #30639: limit offset,rowcount wraps when rowcount >= 2^32 in windows
  
   The parser uses ulonglong to store the LIMIT number. This number
   then is stored into a variable of type ha_rows. ha_rows is either
   4 or 8 byte depending on the BIG_TABLES define from config.h
   So an overflow may occur (and LIMIT becomes zero) while storing an
   ulonglong value in ha_rows.
   Fixed by :
    1. Using the maximum possible value for ha_rows on overflow
    2. Defining BIG_TABLES for the windows builds (to match the others) 

  include/config-win.h@1.99.1.5, 2007-09-19 17:47:50+03:00, gkodinov@magare.gmz +2 -0
    Bug #30639: turn on BIG_TABLES for windows

  mysql-test/r/select.result@1.163.1.1, 2007-09-19 17:47:50+03:00, gkodinov@magare.gmz +17 -0
    Bug #30639: test case

  mysql-test/t/select.test@1.129.1.1, 2007-09-19 17:47:50+03:00, gkodinov@magare.gmz +10 -0
    Bug #30639: test case

  sql/sql_lex.cc@1.255.9.1, 2007-09-19 17:47:50+03:00, gkodinov@magare.gmz +11 -2
    Bug #30639: Use the maximum possible number on overflow 
     of LIMIT. This is valid because there won't be more rows
     anyway.

ChangeSet@1.2476.447.1, 2007-09-19 11:20:30+02:00, jmiller@mysql.com +1 -0
  NDBT_Thread.cpp:
    Removed semicolon causing build syntax issues per pekka

  storage/ndb/test/src/NDBT_Thread.cpp@1.3, 2007-09-19 11:20:22+02:00, jmiller@mysql.com +1 -1
    Removed semicolon causing build syntax issues per pekka

ChangeSet@1.2476.446.1, 2007-09-17 21:39:07+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #29985.
  Multiple-result processing is required during the execution
  of CALL statements for stored procedures, however the mysqlslap
  client lacked that processing.
  

  client/mysqlslap.c@1.63, 2007-09-17 21:23:40+05:00, gshchepa@gleb.loc +11 -7
    Fixed bug #29985.
    1. Connection flags have been changed: the CLIENT_MULTI_STATEMENTS
    flag has been added.
    2. The run_task function has been modified to process multiple
    result sets.

  mysql-test/r/mysqlslap.result@1.14, 2007-09-17 21:24:50+05:00, gshchepa@gleb.loc +5 -0
    Added test case for bug #29985.

  mysql-test/t/mysqlslap.test@1.18, 2007-09-17 21:24:02+05:00, gshchepa@gleb.loc +11 -0
    Added test case for bug #29985.

ChangeSet@1.2476.443.5, 2007-09-17 12:31:10+02:00, aelkin@dl145j.mysql.com +5 -0
  Merge: bug@27417,23333 and bug#28960 tests with 5.1

  mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test@1.1, 2007-09-17 12:29:37+02:00, aelkin@dl145j.mysql.com +234 -0
    sourced part for bugs with SF() etc having side effects of midifying
    non-transactional tables.
    

  mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test@1.0, 2007-09-17 12:29:37+02:00, aelkin@dl145j.mysql.com +0 -0

  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result@1.24, 2007-09-17 12:29:36+02:00, aelkin@dl145j.mysql.com +186 -0
    results changed

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.49, 2007-09-17 12:29:36+02:00, aelkin@dl145j.mysql.com +18 -27
    results changed

  mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test@1.13.1.1, 2007-09-17 12:29:37+02:00, aelkin@dl145j.mysql.com +2 -0
    calling included file with testing bug#27417,23333. bug#28960 is not an rbr bug.

  mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test@1.16, 2007-09-17 12:29:37+02:00, aelkin@dl145j.mysql.com +3 -231
    moved SF() with side effects bugs to a separate includable file.
    This test verifies STMT format whereas binlog_row test is reposible for
    ROW format.

ChangeSet@1.2476.443.4, 2007-09-16 18:16:40+02:00, aelkin@dl145j.mysql.com +3 -0
  Merge: bug#27417,23333 manual work for fixing tests and a source code.

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.48, 2007-09-16 18:15:35+02:00, aelkin@dl145j.mysql.com +53 -24
    results changed due to 
    1. tt table made temporary is it's supposed to; 
    2. show master status is turned into binlog pos masking-out macro
    3. merge defect for select_insert::abort()

  mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test@1.15, 2007-09-16 18:15:35+02:00, aelkin@dl145j.mysql.com +8 -8
    masking-out binlog postions in the results via 
    source include/show_binlog_events.inc;

  sql/sql_insert.cc@1.292.2.3, 2007-09-16 18:15:35+02:00, aelkin@dl145j.mysql.com +10 -9
    merging defect in not applied hunk for select_insert::abort() is fixed

ChangeSet@1.2476.443.3, 2007-09-16 12:07:00+02:00, aelkin@dl145j.mysql.com +5 -0
  Manual merge fixes/tests for bugs_28960,27417,23333.

  mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test@1.47, 2007-09-16 12:06:56+02:00, aelkin@dl145j.mysql.com +0 -250
    follow-up of the previous manual resolve. The snippet is moved into the heading
    file.

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.47, 2007-09-16 12:06:56+02:00, aelkin@dl145j.mysql.com +89 -19
    results changed

  mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test@1.14, 2007-09-16 12:06:56+02:00, aelkin@dl145j.mysql.com +126 -12
    removing explicit offsets from report;
    appending bug#27417,23333,28960 related snippet, addressing left TODO:s.

  mysql-test/suite/rpl/r/rpl_packet.result@1.10, 2007-09-16 12:06:56+02:00, aelkin@dl145j.mysql.com +7 -2
    results changed

  mysql-test/suite/rpl/t/rpl_packet.test@1.13, 2007-09-16 12:06:57+02:00, aelkin@dl145j.mysql.com +1 -1
    fixing row/stmt compatibility with #-ing out unneeded values

ChangeSet@1.2476.433.3, 2007-09-15 23:33:04+02:00, mikael@dator6.(none) +1 -0
  Fixed ndbcluster_rollback

  sql/ha_ndbcluster.cc@1.461.9.2, 2007-09-15 23:33:02+02:00, mikael@dator6.(none) +6 -1
    Fixed ndbcluster_rollback

ChangeSet@1.2476.197.65, 2007-09-15 14:45:26+02:00, guilhem@gbichot4.local +4 -0
  WL#3072 Maria Recovery
  * recovery from ha_maria now skips replaying DDLs (too dangerous)
  * maria_read_log still replays DDLs, print warning about issues
  * fixes to replaying of REDO_RENAME
  * don't replay DDLs on corrupted tables (safer)
  * print a one-line message when really doing a recovery (applies to
  ha_maria, not maria_read_log) i.e. some REDOs or UNDOs are read.

  storage/maria/ma_checkpoint.c@1.19, 2007-09-15 14:44:40+02:00, guilhem@gbichot4.local +7 -1
    fix for assertion failure

  storage/maria/ma_recovery.c@1.29, 2007-09-15 14:45:24+02:00, guilhem@gbichot4.local +218 -22
    * Recovery from ha_maria now skips replaying DDLs (as the initial
    plan said) as this is unsafe in case of crashes during the DDL;
    applying the records may do harm (destroy important files)
    so we prefer to leave the "mess" of files untouched. A proper
    recovery of DDLs requires very careful thinking, probably testing
    separately the existence of the data and index file instead of
    using maria_open() which tests the existence of both, and maybe
    storing create_rename_lsn in the data file too.
    * maria_read_log still replays DDLs, we print a warning about dangers
    (due to ALTER TABLE not logging insertions into the tmp table; we
    will maybe need an option to have logging of those insertions).
    * fixes to replaying of REDO_RENAME (test create_rename_lsn of 'new_name'
    table if it exists; if that table exists and is more recent than the
    record, remove the 'old_name' table).
    * don't replay DDLs on corrupted tables (play safe)
    * fail also in non-debug builds if table is open when it should not be
    (when creating it for example, it should not be already open).
    * when the trace file is not stdout (i.e. when this is ha_maria),
    if really doing a recovery (reading REDOs or UNDOs), print a one-line
    message to stderr to inform about start and end of recovery
    (useful to know what mysqld is doing, especially if it takes long
    or crashes).

  storage/maria/ma_recovery.h@1.8, 2007-09-15 14:45:24+02:00, guilhem@gbichot4.local +1 -1
    parameter to replay DDLs or not

  storage/maria/maria_read_log.c@1.20, 2007-09-15 14:45:24+02:00, guilhem@gbichot4.local +1 -1
    replay DDLs in maria_read_log, to be able to recreate tables from
    scratch.

ChangeSet@1.2476.431.12, 2007-09-15 07:39:58+02:00, gshchepa@devsrv-b.mysql.com +5 -0
  Many files:
    Post-merge fix.

  mysql-test/suite/rpl/r/rpl_extraCol_innodb.result@1.12, 2007-09-15 07:34:41+02:00, gshchepa@devsrv-b.mysql.com +16 -16
    Post-merge fix.

  mysql-test/suite/rpl/r/rpl_extraCol_myisam.result@1.12, 2007-09-15 07:35:48+02:00, gshchepa@devsrv-b.mysql.com +16 -16
    Post-merge fix.

  mysql-test/suite/rpl/r/rpl_row_colSize.result@1.3, 2007-09-15 07:27:14+02:00, gshchepa@devsrv-b.mysql.com +26 -26
    Post-merge fix.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result@1.23.2.1, 2007-09-15 07:33:35+02:00, gshchepa@devsrv-b.mysql.com +6 -6
    Post-merge fix.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result@1.20.2.1, 2007-09-15 07:37:28+02:00, gshchepa@devsrv-b.mysql.com +6 -6
    Post-merge fix.

ChangeSet@1.1810.3325.6, 2007-09-15 07:04:32+02:00, gshchepa@devsrv-b.mysql.com +1 -0
  select.test:
    Post-fix for bug#27695.

  mysql-test/t/select.test@1.102.1.31, 2007-09-15 07:02:02+02:00, gshchepa@devsrv-b.mysql.com +4 -0
    Post-fix for bug#27695.

ChangeSet@1.2476.445.2, 2007-09-15 04:59:46+02:00, tnurnberg@mysql.com +1 -0
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  after merge fix :-/

  client/mysqlbinlog.cc@1.157.2.2, 2007-09-15 04:59:32+02:00, tnurnberg@mysql.com +0 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    after merge fix :-/

ChangeSet@1.2476.444.1, 2007-09-14 21:15:57+04:00, sergefp@mysql.com +1 -0
  Fix compile failure on windows

  sql/item.h@1.260, 2007-09-14 21:15:53+04:00, sergefp@mysql.com +1 -1
    Fix compile failure on windows

ChangeSet@1.2476.442.1, 2007-09-14 11:22:41-04:00, cbell@mysql_cab_desk. +4 -0
  BUG#30790 : Suspicious code in rpl_utility.cc
  
  This patch clarifies some of the coding choices with documentationa and
  removes a limitation in the code for future expansion of the CHAR and
  BINARY fields to length > 255.

  sql/field.cc@1.410.3.2, 2007-09-14 11:22:36-04:00, cbell@mysql_cab_desk. +1 -0
    BUG#30790 : Suspicious code in rpl_utility.cc
    
    This patch adds an assertion to ensure we are not attempting to encode
    negative values.

  sql/log_event.cc@1.277.24.5, 2007-09-14 11:22:37-04:00, cbell@mysql_cab_desk. +10 -0
    BUG#30790 : Suspicious code in rpl_utility.cc
    
    This patch adds comments to help explain the choice of variable types.

  sql/rpl_utility.cc@1.15.3.1, 2007-09-14 11:22:38-04:00, cbell@mysql_cab_desk. +23 -13
    BUG#30790 : Suspicious code in rpl_utility.cc
    
    This patch removes code from the calc_field_size that is not needed and
    was ambiguous. Originally intended to future expansion, the code was
    not needed.
    
    Also added are comments to help explain some portions of the code.
    
    A change was made to the korr method to use the unsigned version to 
    avoid extended sign problems.

  sql/rpl_utility.h@1.12.4.1, 2007-09-14 11:22:38-04:00, cbell@mysql_cab_desk. +7 -7
    BUG#30790 : Suspicious code in rpl_utility.cc
    
    This patch corrects some type discrepencies and removes an extra cast.

ChangeSet@1.2476.431.8, 2007-09-14 17:21:50+02:00, gshchepa@devsrv-b.mysql.com +15 -0
  Many files:
    Merge with 5.0-opt.

  mysql-test/r/events_bugs.result@1.42, 2007-09-14 11:03:19+02:00, gshchepa@devsrv-b.mysql.com +8 -8
    Merge with 5.0-opt.

  mysql-test/r/events_trans.result@1.5, 2007-09-14 11:04:19+02:00, gshchepa@devsrv-b.mysql.com +1 -1
    Merge with 5.0-opt.

  mysql-test/r/sp.result@1.295, 2007-09-14 15:36:07+02:00, gshchepa@devsrv-b.mysql.com +4 -4
    Merge with 5.0-opt.

  mysql-test/r/sp_gis.result@1.10, 2007-09-14 15:37:12+02:00, gshchepa@devsrv-b.mysql.com +2 -2
    Merge with 5.0-opt.

  mysql-test/r/xml.result@1.27, 2007-09-14 15:38:25+02:00, gshchepa@devsrv-b.mysql.com +9 -9
    Merge with 5.0-opt.

  mysql-test/r/binlog_unsafe.result@1.5, 2007-09-14 11:00:34+02:00, gshchepa@devsrv-b.mysql.com +2 -2
    Merge with 5.0-opt.

  mysql-test/suite/ndb/r/ndb_dd_basic.result@1.22.1.1, 2007-09-14 17:01:45+02:00, gshchepa@devsrv-b.mysql.com +3 -3
    Merge with 5.0-opt.

  mysql-test/suite/ndb/r/ndb_dd_ddl.result@1.20, 2007-09-14 17:02:37+02:00, gshchepa@devsrv-b.mysql.com +1 -1
    Merge with 5.0-opt.

  mysql-test/suite/ndb/r/ndb_gis.result@1.26, 2007-09-14 17:03:18+02:00, gshchepa@devsrv-b.mysql.com +2 -2
    Merge with 5.0-opt.

  mysql-test/suite/ndb/r/ndb_row_format.result@1.8, 2007-09-14 17:04:20+02:00, gshchepa@devsrv-b.mysql.com +1 -1
    Merge with 5.0-opt.

  mysql-test/suite/ndb/r/ndb_single_user.result@1.14, 2007-09-14 17:05:10+02:00, gshchepa@devsrv-b.mysql.com +5 -5
    Merge with 5.0-opt.

  mysql-test/suite/rpl/r/rpl_incident.result@1.12, 2007-09-14 15:39:51+02:00, gshchepa@devsrv-b.mysql.com +2 -2
    Merge with 5.0-opt.

  mysql-test/suite/rpl/r/rpl_loaddata_fatal.result@1.7, 2007-09-14 16:57:31+02:00, gshchepa@devsrv-b.mysql.com +2 -2
    Merge with 5.0-opt.

  mysql-test/suite/rpl/r/rpl_udf.result@1.11, 2007-09-14 16:58:24+02:00, gshchepa@devsrv-b.mysql.com +4 -4
    Merge with 5.0-opt.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result@1.13, 2007-09-14 17:00:03+02:00, gshchepa@devsrv-b.mysql.com +16 -16
    Merge with 5.0-opt.

ChangeSet@1.1810.3337.1, 2007-09-14 17:43:14+03:00, gkodinov@magare.gmz +3 -0
  Bug #31001: ORDER BY DESC in InnoDB not working
  
  The optimizer sets index traversal in reverse order only if there are 
   used key parts that are not compared to a constant.
  However using the primary key as an ORDER BY suffix rendered the check
  incomplete : going in reverse order must still be used even if 
  all the parts of the secondary key are compared to a constant.
  
  Fixed by relaxing the check and set reverse traversal even when all
  the secondary index keyparts are compared to a const.
  Also account for the case when all the primary keys are compared to a
  constant.

  mysql-test/t/innodb_mysql.test@1.3.48.1, 2007-09-14 17:43:12+03:00, gkodinov@magare.gmz +23 -0
    Bug #31001: test case

  mysql-test/r/innodb_mysql.result@1.3.22.4, 2007-09-14 17:43:12+03:00, gkodinov@magare.gmz +97 -0
    Bug #31001: test case

  sql/sql_select.cc@1.312.174.7, 2007-09-14 17:43:12+03:00, gkodinov@magare.gmz +7 -1
    Bug #31001: 
     - account for the case when all the primary key parts are compared
       to a constant
     - force test_if_skip_sort_order to go backwards over the key even 
       when the number of keyparts used is the same as the number of 
       keyparts equal to a constant. (because of the primary key 
       suffix).

ChangeSet@1.2476.197.63, 2007-09-14 15:01:44+03:00, bell@desktop.sanja.is.com.ua +3 -0
  Fixes problem with getting not LSN address gotten from
  horizon addres.

  storage/maria/ma_loghandler.c@1.49, 2007-09-14 15:01:41+03:00, bell@desktop.sanja.is.com.ua +50 -24
    New function to get correct LSN from chunk address.

  storage/maria/ma_loghandler.h@1.24, 2007-09-14 15:01:41+03:00, bell@desktop.sanja.is.com.ua +1 -0
    New function to get correct LSN from chunk address.

  storage/maria/ma_recovery.c@1.28, 2007-09-14 15:01:41+03:00, bell@desktop.sanja.is.com.ua +10 -2
    Fixes problem with getting not LSN address gotten from
    horizon addres.

ChangeSet@1.1810.3335.1, 2007-09-14 14:53:13+04:00, sergefp@mysql.com +3 -0
  BUG#30324: Grouping queries with COUNT(DISTINCT bit column) return wrong results
  - The bug was caused by COUNT(DISTINCT ...) code using Unique object in 
    a way that assumed that BIT(N) column occupies a contiguous space in
    temp_table->record[0] buffer. 
  - The fix is to make COUNT(DISTINCT ...) code instruct create_tmp_table to
    create temporary table with column of type BIGINT, not BIT(N).

  mysql-test/r/type_bit.result@1.14.1.10, 2007-09-14 14:53:11+04:00, sergefp@mysql.com +15 -0
    BUG#30324: Grouping queries with COUNT(DISTINCT bit column) return wrong results
    - Testcase

  mysql-test/t/type_bit.test@1.18.1.4, 2007-09-14 14:53:11+04:00, sergefp@mysql.com +14 -0
    BUG#30324: Grouping queries with COUNT(DISTINCT bit column) return wrong results
    - Testcase

  sql/item_sum.cc@1.170.1.42, 2007-09-14 14:53:11+04:00, sergefp@mysql.com +17 -0
    BUG#30324: Grouping queries with COUNT(DISTINCT bit column) return wrong results
    - Make COUNT(DISTINCT ...) code instruct create_tmp_table to create 
      temporary table with BIGINT, not BIT(N) column.

ChangeSet@1.2476.440.1, 2007-09-14 14:18:42+04:00, sergefp@mysql.com +8 -0
  BUG#27927:Partition pruning not optimal with TO_DAYS and YEAR functions
  - Introduced val_int_endpoint() function which converts between func 
    argument intervals and func value intervals for monotonic functions.
  - Made partition interval analyzer use part_expr->val_int_endpoint()
    to check if the edge values should be included.

  mysql-test/r/partition_pruning.result@1.27.1.1, 2007-09-14 14:17:38+04:00, sergefp@mysql.com +28 -0
    BUG#27927: Partition pruning not optimal with TO_DAYS and YEAR functions
    - Testcase

  mysql-test/t/partition_pruning.test@1.22, 2007-09-14 14:17:39+04:00, sergefp@mysql.com +31 -0
    BUG#27927: Partition pruning not optimal with TO_DAYS and YEAR functions
    - Testcase

  sql/item.cc@1.285.1.1, 2007-09-14 14:17:39+04:00, sergefp@mysql.com +5 -0
    BUG#27927: Partition pruning not optimal with TO_DAYS and YEAR functions
    - Added Item_field::val_int_endpoint() implementation

  sql/item.h@1.259, 2007-09-14 14:17:40+04:00, sergefp@mysql.com +38 -0
    BUG#27927: Partition pruning not optimal with TO_DAYS and YEAR functions
    - Added Item::val_int_endpoint() which converts intervals from argument
      space to function value space for unary monotonic functions.

  sql/item_timefunc.cc@1.173, 2007-09-14 14:17:40+04:00, sergefp@mysql.com +70 -1
    BUG#27927: Partition pruning not optimal with TO_DAYS and YEAR functions
    - Added val_int_endpoint() for TO_DAYS and YEAR functions.

  sql/item_timefunc.h@1.89, 2007-09-14 14:17:40+04:00, sergefp@mysql.com +2 -0
    BUG#27927: Partition pruning not optimal with TO_DAYS and YEAR functions
    - Added val_int_endpoint() for TO_DAYS and YEAR functions.

  sql/partition_info.h@1.25, 2007-09-14 14:17:40+04:00, sergefp@mysql.com +0 -14
    BUG#27927: Partition pruning not optimal with TO_DAYS and YEAR functions
    - Removed partition_info::range_analysis_include_bounds as it is no longer 
      needed.

  sql/sql_partition.cc@1.115, 2007-09-14 14:17:40+04:00, sergefp@mysql.com +8 -12
    BUG#27927: Partition pruning not optimal with TO_DAYS and YEAR functions
    - Make partition interval analyzer use part_expr->val_int_endpoint() to 
      check if the edge values should be included.

ChangeSet@1.2476.197.62, 2007-09-14 09:17:36+03:00, bell@desktop.sanja.is.com.ua +1 -0
  Check of log initialization added.

  storage/maria/ma_loghandler.c@1.48, 2007-09-14 09:17:32+03:00, bell@desktop.sanja.is.com.ua +20 -3
    Check of log initialization added.
    Function descriptions fixed.

ChangeSet@1.2476.345.50, 2007-09-13 19:22:08-03:00, davi@moksha.local +3 -0
  Bug#30747 Create table with identical constraint names behaves incorrectly
  
  MySQL provides what appears to be a non standard extension to the
  FOREIGN KEY syntax which let users name (label/tag) a foreign key
  to more easily identify a specific foreign key if any problems show
  up later during the query parsing or execution. But the foreign key
  name was not being properly set to the right key, possible leaving
  the foreign key with no name.

  mysql-test/include/mix1.inc@1.51.1.1, 2007-09-13 19:22:04-03:00, davi@moksha.local +34 -0
    Add test case for Bug#30747

  mysql-test/r/innodb_mysql.result@1.54.1.1, 2007-09-13 19:22:05-03:00, davi@moksha.local +36 -0
    Add test case result for Bug#30747

  sql/sql_yacc.yy@1.601.1.3, 2007-09-13 19:22:05-03:00, davi@moksha.local +3 -2
    Set the foreign key name to the constraint name if a specific name was
    not provided. As for the constraint name, only use the foreign name if
    a specific name was not provided.

ChangeSet@1.2476.433.2, 2007-09-14 00:10:47+02:00, mikael@dator6.(none) +4 -0
  BUG#30996: Committed too early when autocommit and lock table
  Moved out a lot of code into functions from external_lock and
  start_stmt
  Fixed a crashing bug at memory alloc failure
  Merged the stmt and all variables into one trans variable
  Always register start of statement as according to the
  interface of the handlers.
  Also register for start of transaction when not statement commit
  == not autocommit AND no begin - commit ongoing
  Now that we registered in a proper manner we also needed to handle
  the commit call when end of statement and transaction is ongoing
  Added start_stmt_count to know when we have start of statement
  for first table

  mysql-test/suite/ndb/r/ndb_lock_table.result@1.2, 2007-09-14 00:10:44+02:00, mikael@dator6.(none) +11 -0
    Added a new test case for bug30996

  mysql-test/suite/ndb/r/ndb_lock_table.result@1.1, 2007-09-13 13:07:17+02:00, mikael@dator6.(none) +0 -0
    BitKeeper file /home/mikael/mysql_clones/bug30996/mysql-test/suite/ndb/r/ndb_lock_table.result

  mysql-test/suite/ndb/r/ndb_lock_table.result@1.0, 2007-09-13 13:07:17+02:00, mikael@dator6.(none) +0 -0

  mysql-test/suite/ndb/t/ndb_lock_table.test@1.2, 2007-09-14 00:10:44+02:00, mikael@dator6.(none) +5 -1
    Added a new test case for bug30996

  mysql-test/suite/ndb/t/ndb_lock_table.test@1.1, 2007-09-13 13:07:27+02:00, mikael@dator6.(none) +11 -0
    BitKeeper file /home/mikael/mysql_clones/bug30996/mysql-test/suite/ndb/t/ndb_lock_table.test

  mysql-test/suite/ndb/t/ndb_lock_table.test@1.0, 2007-09-13 13:07:27+02:00, mikael@dator6.(none) +0 -0

  sql/ha_ndbcluster.cc@1.461.9.1, 2007-09-14 00:10:44+02:00, mikael@dator6.(none) +166 -163
    Moved out a lot of code into functions from external_lock and
    start_stmt
    Fixed a crashing bug at memory alloc failure
    Merged the stmt and all variables into one trans variable
    Always register start of statement as according to the
    interface of the handlers.
    Also register for start of transaction when not statement commit
    == not autocommit AND no begin - commit ongoing
    Now that we registered in a proper manner we also needed to handle
    the commit call when end of statement and transaction is ongoing
    Added start_stmt_count to know when we have start of statement
    for first table

  sql/ha_ndbcluster.h@1.187, 2007-09-14 00:10:44+02:00, mikael@dator6.(none) +6 -2
    New functions and merged variables

ChangeSet@1.2476.435.1, 2007-09-13 21:05:17+02:00, guilhem@gbichot4.local +1 -0
  Bugfix: --pagecache* options were ignored; with --key-cache*=# --pagecache*=#,
  the latter wrote into the settings of the key cache! Problem was that
  --pagecache* options reused OPT_KEY_CACHE* enum values.

  sql/mysqld.cc@1.601, 2007-09-13 21:05:15+02:00, guilhem@gbichot4.local +27 -15
    --pagecache* options should not reuse the OPT_KEY_CACHE* enum values, it
    confuses my_getopt. Making handling of page caches similar to handling
    of key caches, in mysqld.cc.

ChangeSet@1.2476.321.45, 2007-09-13 09:34:21-07:00, antony@pcg5ppc.xiphis.org +2 -0
  fix intermittant timing-related test failure

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@1.6, 2007-09-13 09:34:17-07:00, antony@pcg5ppc.xiphis.org +1 -1
    fix intermittant timing-related test failure

  mysql-test/suite/rpl/t/rpl_innodb_bug28430.test@1.5, 2007-09-13 09:34:17-07:00, antony@pcg5ppc.xiphis.org +1 -1
    fix intermittant timing-related test failure

ChangeSet@1.1810.3330.1, 2007-09-13 16:19:46+02:00, tnurnberg@mysql.com +26 -0
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  make sure that if builder configured with a non-standard (!= 3306)
  default TCP port that value actually gets used throughout. if they
  didn't configure a value, assume "use a sensible default", which
  will be read from /etc/services or, failing that, from the factory
  default. That makes the order of preference
  - command-line option
  - my.cnf, where applicable
  - $MYSQL_TCP_PORT environment variable
  - /etc/services (unless configured --with-tcp-port)
  - default port (--with-tcp-port=... or factory default)

  scripts/mysqld_safe-watch.sh@1.5.2.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    account for non-standard default port-no. configured at build-time

  client/mysqlmanagerc.c@1.13.2.1, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +6 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysql.cc@1.199.27.1, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +8 -3
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysql_upgrade.c@1.6.11.1, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +7 -2
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysqladmin.cc@1.115.1.3, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysqlbinlog.cc@1.123.1.17, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +8 -3
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysqlcheck.c@1.55.2.1, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysqldump.c@1.214.27.1, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysqlimport.c@1.58.1.5, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysqlshow.c@1.49.1.3, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysqltest.c@1.155.36.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  configure.in@1.245.106.1, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +28 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    If MYSQL_TCP_PORT defaulted in configure (factory default 3306
    at the time of this writing), set MYSQL_TCP_PORT to factory
    default, then clear factory default after. That way, we lose no
    information, and we can distinguish between "defaulted" and the
    pathological case "builder specifically configured a port that
    coincides with factory default." This can in theory happen if
    builder configures and builds several servers from a script
    (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326).
    Not all that probable, but much preferable to having more "magic"
    happen in the server when we can solve this without any guesswork.

  include/mysql_version.h.in@1.20, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -0
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make factory default for TCP port available as MYSQL_PORT_DEFAULT
    if build-time configured with a different default.  (0 if unchanged)

  libmysql/libmysql.c@1.233.22.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +17 -4
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    initialize default tcp port for client, like so:
    - if user configured --with-tcp-port, use that value as default
    - otherwise assume "use a good default": search mysqld/tcp in
      /etc/services; if that doesn't exist, use factory default (3306)
    - environment variable MYSQL_TCP_PORT overrides this default
    - command-line option overrides all of the above

  mysql-test/Makefile.am@1.66.7.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -0
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make factory default for TCP port available as MYSQL_TCP_PORT_DEFAULT
    if build-time configured with a different default.  (0 if unchanged)

  mysql-test/mysql-test-run-shell.sh@1.262.22.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +10 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    set up MYSQL_TCP_PORT if not already set in environment:
    - if user configured --with-tcp-port, use that value as default
    - otherwise assume "use a good default": search mysqld/tcp in
      /etc/services; if that doesn't exist, use factory default (3306)

  netware/mysql_test_run.c@1.18.2.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +2 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    account for non-standard default port-no. configured at build-time

  netware/mysqld_safe.c@1.11, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    account for non-standard default port-no. configured at build-time

  scripts/Makefile.am@1.43.3.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -0
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make factory default for TCP port available as MYSQL_TCP_PORT_DEFAULT
    if build-time configured with a different default.  (0 if unchanged)

  scripts/mysql_config.sh@1.27.1.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +6 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    set up MYSQL_TCP_PORT if not already set in environment:
    - if user configured --with-tcp-port, use that value as default
    - otherwise assume "use a good default": search mysqld/tcp in
      /etc/services; if that doesn't exist, use factory default (3306)

  scripts/mysql_fix_privilege_tables.sh@1.35.1.4, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -0
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    clarifying notice only

  server-tools/instance-manager/priv.h@1.10.1.3, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    account for non-standard default port-no. configured at build-time

  sql/mysqld.cc@1.439.130.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +20 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    if builder specifically requested a default port, use that
    (even if it coincides with our factory default).
    only if they didn't do we check /etc/services (and, failing
    on that, fall back to the factory default of 3306).
    either default can be overridden by the environment variable
    MYSQL_TCP_PORT, which in turn can be overridden with command
    line options.

  tests/mysql_client_test.c@1.167.35.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  tests/ssl_test.c@1.11, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    account for non-standard default port-no. configured at build-time

  tests/thread_test.c@1.17.1.1, 2007-09-13 16:19:45+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

ChangeSet@1.1810.3329.1, 2007-09-13 18:41:50+05:00, gshchepa@gleb.loc +4 -0
  Fixed bug #27695.
  Declaring an all space column name in the SELECT FROM DUAL or in a view
  leads to misleading warning message:
  "Leading spaces are removed from name ' '".
  
  The Item::set_name method has been modified to raise warnings like
  "Name ' ' has become ''" in case of the truncation of an all
  space identifier to an empty string identifier instead of the
  "Leading spaces are removed from name ' '" warning message.

  mysql-test/r/select.result@1.121.1.37, 2007-09-13 18:31:07+05:00, gshchepa@gleb.loc +34 -0
    Added test case for bug #27695.

  mysql-test/t/select.test@1.102.1.30, 2007-09-13 18:31:03+05:00, gshchepa@gleb.loc +20 -0
    Added test case for bug #27695.

  sql/item.cc@1.113.1.169, 2007-09-13 18:30:28+05:00, gshchepa@gleb.loc +10 -4
    Fixed bug #27695.
    The Item::set_name method has been modified to raise warnings like
    "Name ' ' has become ''" in case of the truncation of an all
    space identifier to an empty string identifier instead of the
    "Leading spaces are removed from name ' '" warning message.

  sql/share/errmsg.txt@1.42.1.39, 2007-09-13 18:30:34+05:00, gshchepa@gleb.loc +2 -0
    Fixed bug #27695.

ChangeSet@1.2476.434.1, 2007-09-13 18:33:40+05:00, svoj@mysql.com +3 -0
  BUG#30583 - Partition on DOUBLE key + INNODB + count(*) == crash
  
  Issuing SELECT COUNT(*) against partitioned InnoDB table may cause
  server crash.
  
  Fixed that not all required fields were included into read_set.

  mysql-test/r/partition_innodb.result@1.7, 2007-09-13 18:33:37+05:00, svoj@mysql.com +7 -0
    A test case for BUG#30583.

  mysql-test/t/partition_innodb.test@1.6, 2007-09-13 18:33:37+05:00, svoj@mysql.com +8 -0
    A test case for BUG#30583.

  sql/ha_partition.cc@1.97.2.1, 2007-09-13 18:33:37+05:00, svoj@mysql.com +16 -0
    Ensure that all fields of current key are included into read_set,
    as partitioning requires them for sorting
    (see ha_partition::handle_ordered_index_scan).

ChangeSet@1.1810.3328.1, 2007-09-13 17:30:44+04:00, anozdrin@station. +2 -0
  Bug#16918: Aborted_clients > Connections.
  
  The problem was that aborted_threads variable was updated
  twice when a client connection had been aborted.
  
  The fix is to refactor a code to have aborted_threads updated
  only in one place.

  sql/mysql_priv.h@1.290.127.5, 2007-09-13 17:30:42+04:00, anozdrin@station. +0 -1
    Make do_command() a private function.

  sql/sql_parse.cc@1.426.166.1, 2007-09-13 17:30:43+04:00, anozdrin@station. +17 -10
    1. Make do_command() a private function;
    2. Update aborted_threads in the only one place.

ChangeSet@1.1616.3097.1, 2007-09-13 15:39:16+05:00, svoj@mysql.com +5 -0
  BUG#30590 - delete from memory table with composite btree primary key
  
  DELETE query against memory table with btree index may remove
  not all matching rows. This happens only when DELETE uses
  index read method to find matching rows. E.g. for queries
  like DELETE FROM t1 WHERE a=1.
  
  Fixed by reverting fix for BUG9719 and applying proper solution.

  mysql-test/r/heap_btree.result@1.13.2.5, 2007-09-13 15:39:15+05:00, svoj@mysql.com +7 -0
    A test case for BUG#30590.

  mysql-test/t/heap_btree.test@1.12.1.6, 2007-09-13 15:39:15+05:00, svoj@mysql.com +9 -0
    A test case for BUG#30590.

  heap/hp_delete.c@1.12.2.1, 2007-09-13 15:39:15+05:00, svoj@mysql.com +0 -3
    Reverted fix for BUG9719 as it makes queries like
    DELETE FROM t1 WHERE a=1 to remove not all matching
    rows (assuming this is memory table and there is btree
    key over `a`).
    
    This happens because we calculate info->lastkey_len in
    heap_rkey(). When we enter heap_rnext(), info->lastkey_len
    is 0 (set by hp_rb_delete_key()). We need to preserve
    info->lastkey_len in this situation, otherwise
    tree_search_key() will always return smallest value in
    a tree.

  heap/hp_rfirst.c@1.13.3.1, 2007-09-13 15:39:15+05:00, svoj@mysql.com +11 -0
    If we're performing index_first on a table that was taken from
    table cache, info->lastkey_len is initialized to previous query.
    Thus we set info->lastkey_len to proper value for subsequent
    heap_rnext() calls.
    This is needed for DELETE queries only, otherwise this variable is
    not used.
    Note that the same workaround may be needed for heap_rlast(), but
    for now heap_rlast() is never used for DELETE queries.

  heap/hp_rnext.c@1.11.3.1, 2007-09-13 15:39:15+05:00, svoj@mysql.com +29 -0
    An optimization for DELETE queries that use index_first()/index_next().
    Use faster tree_search_edge() instead of tree_search_key().

ChangeSet@1.1810.3326.1, 2007-09-13 09:47:21+02:00, mskold@mysql.com +1 -0
  bug#27494  An invalid subselect crashes mysql server: Added check for missing arguments

  sql/ha_ndbcluster_cond.cc@1.4.1.1, 2007-09-13 09:46:53+02:00, mskold@mysql.com +8 -0
    bug#27494  An invalid subselect crashes mysql server: Added check for missing arguments

ChangeSet@1.2476.197.61, 2007-09-13 10:37:51+03:00, bell@desktop.sanja.is.com.ua +12 -0
  Fixes of the empty log problem.

  storage/maria/ma_checkpoint.c@1.18, 2007-09-13 10:37:47+03:00, bell@desktop.sanja.is.com.ua +1 -2
    The new macro for easier printing LSN added.

  storage/maria/ma_loghandler.c@1.47, 2007-09-13 10:37:47+03:00, bell@desktop.sanja.is.com.ua +72 -145
    The assertion returned.
    The new macro for easier printing LSN added.

  storage/maria/ma_loghandler_lsn.h@1.14, 2007-09-13 10:37:47+03:00, bell@desktop.sanja.is.com.ua +3 -0
    The new macro for easier printing LSN added.

  storage/maria/ma_pagecache.c@1.43, 2007-09-13 10:37:47+03:00, bell@desktop.sanja.is.com.ua +1 -2
    The new macro for easier printing LSN added.

  storage/maria/ma_recovery.c@1.27, 2007-09-13 10:37:47+03:00, bell@desktop.sanja.is.com.ua +25 -20
    Recovery checks empty log state.
    RECHEADER_READ_ERROR means some real error.

  storage/maria/maria_read_log.c@1.19, 2007-09-13 10:37:47+03:00, bell@desktop.sanja.is.com.ua +12 -5
    Read log starts from real beggining of the log and precess
    error and empty log states.
    The new macro for easier printing LSN added.

  storage/maria/unittest/ma_test_loghandler-t.c@1.17, 2007-09-13 10:37:47+03:00, bell@desktop.sanja.is.com.ua +14 -21
    The new macro for easier printing LSN added.

  storage/maria/unittest/ma_test_loghandler_first_lsn-t.c@1.4, 2007-09-13 10:37:47+03:00, bell@desktop.sanja.is.com.ua +2 -6
    The new macro for easier printing LSN added.

  storage/maria/unittest/ma_test_loghandler_max_lsn-t.c@1.4, 2007-09-13 10:37:47+03:00, bell@desktop.sanja.is.com.ua +2 -6
    The new macro for easier printing LSN added.

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.16, 2007-09-13 10:37:47+03:00, bell@desktop.sanja.is.com.ua +12 -17
    The new macro for easier printing LSN added.

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.16, 2007-09-13 10:37:47+03:00, bell@desktop.sanja.is.com.ua +5 -10
    The new macro for easier printing LSN added.

  storage/maria/unittest/ma_test_loghandler_noflush-t.c@1.4, 2007-09-13 10:37:47+03:00, bell@desktop.sanja.is.com.ua +1 -2
    The new macro for easier printing LSN added.

ChangeSet@1.2476.321.44, 2007-09-12 18:16:50-07:00, antony@pcg5ppc.xiphis.org +4 -0
  Changes for pushbuild test runs and VSC compile warnings

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@1.5, 2007-09-12 18:16:45-07:00, antony@pcg5ppc.xiphis.org +1 -1
    Fix test results for pushbuild

  mysql-test/suite/rpl/t/rpl_innodb_bug28430.test@1.4, 2007-09-12 18:16:46-07:00, antony@pcg5ppc.xiphis.org +2 -0
    Fix test results for pushbuild

  mysql-test/suite/rpl/t/rpl_innodb_bug30888.test@1.4, 2007-09-12 18:16:46-07:00, antony@pcg5ppc.xiphis.org +1 -0
    Fix test results for pushbuild

  storage/innobase/handler/ha_innodb.cc@1.355.1.8, 2007-09-12 18:16:46-07:00, antony@pcg5ppc.xiphis.org +1 -1
    resolve a VSC++ typecast compile warning.

ChangeSet@1.2476.431.2, 2007-09-13 02:09:29+05:00, gshchepa@gleb.loc +1 -0
  sql_view.cc:
    Post-merge fix.

  sql/sql_view.cc@1.149, 2007-09-13 02:08:41+05:00, gshchepa@gleb.loc +2 -1
    Post-merge fix.

ChangeSet@1.2476.321.43, 2007-09-12 13:35:39-07:00, antony@pcg5ppc.xiphis.org +7 -0
  undo unneccessary change to ha_innodb.cc
  remove 'drop database' from new tests.

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@1.4, 2007-09-12 13:35:33-07:00, antony@pcg5ppc.xiphis.org +4 -6
    remove "DROP DATABASE test"

  mysql-test/suite/rpl/r/rpl_innodb_bug30888.result@1.3, 2007-09-12 13:35:33-07:00, antony@pcg5ppc.xiphis.org +0 -2
    remove "DROP DATABASE test"

  mysql-test/suite/rpl/r/rpl_innodb_bug30919.result@1.2, 2007-09-12 13:35:33-07:00, antony@pcg5ppc.xiphis.org +0 -2
    remove "DROP DATABASE test"

  mysql-test/suite/rpl/t/rpl_innodb_bug28430.test@1.3, 2007-09-12 13:35:34-07:00, antony@pcg5ppc.xiphis.org +2 -6
    remove "DROP DATABASE test"

  mysql-test/suite/rpl/t/rpl_innodb_bug30888.test@1.3, 2007-09-12 13:35:34-07:00, antony@pcg5ppc.xiphis.org +2 -6
    remove "DROP DATABASE test"

  mysql-test/suite/rpl/t/rpl_innodb_bug30919.test@1.2, 2007-09-12 13:35:34-07:00, antony@pcg5ppc.xiphis.org +2 -4
    remove "DROP DATABASE test"

  storage/innobase/handler/ha_innodb.cc@1.355.1.7, 2007-09-12 13:35:34-07:00, antony@pcg5ppc.xiphis.org +2 -7
    undo unneccessary edits.

ChangeSet@1.2476.430.1, 2007-09-12 12:42:02-06:00, malff@lambda.weblab +1 -0
  Cleanup of sql_yacc.yy

  sql/sql_yacc.yy@1.601.2.1, 2007-09-12 12:41:57-06:00, malff@lambda.weblab +15 -15
    Remove useless actions from the grammar.
    Empty {} actions in the middle of a rule caused an extra reduce,
    which is affecting the parser complexity and performances.

ChangeSet@1.2476.197.60, 2007-09-12 19:18:52+02:00, guilhem@gbichot4.local +1 -0
  MY_ALLOW_ZERO_PTR in my_realloc() to fix safemalloc errors in pushbuild

  storage/maria/ma_recovery.c@1.26, 2007-09-12 19:18:49+02:00, guilhem@gbichot4.local +9 -6
    MY_ALLOW_ZERO_PTR needed as log_record_buffer.str is initially NULL.

ChangeSet@1.1810.3322.5, 2007-09-12 18:13:19+04:00, sergefp@mysql.com +1 -0
  Better wording in comments

  sql/opt_range.cc@1.159.1.94, 2007-09-12 18:13:15+04:00, sergefp@mysql.com +2 -2
    Better wording in comments

ChangeSet@1.2476.197.59, 2007-09-12 15:10:41+02:00, guilhem@gbichot4.local +3 -0
  fix for pushbuild test failures

  mysql-test/r/rpl_row_flsh_tbls.result@1.5.3.1, 2007-09-12 15:10:39+02:00, guilhem@gbichot4.local +4 -4
    result update

  mysql-test/r/rpl_row_insert_delayed.result@1.1.1.1, 2007-09-12 15:10:39+02:00, guilhem@gbichot4.local +1 -1
    result update

  mysql-test/t/rpl_row_flsh_tbls.test@1.5.3.1, 2007-09-12 15:10:39+02:00, guilhem@gbichot4.local +1 -1
    CREATE TABLE statement got an ENGINE clause so became longer

ChangeSet@1.2476.197.58, 2007-09-12 14:46:05+02:00, guilhem@gbichot4.local +1 -0
  fix for pushbuild test failure (my_realloc() failed => checkpoint
  failed => Maria didn't start => tables were created as MyISAM).

  storage/maria/ma_checkpoint.c@1.17, 2007-09-12 14:46:03+02:00, guilhem@gbichot4.local +2 -2
    safemalloc complains if my_realloc() is passed NULL and
    MY_ALLOW_ZERO_PTR is not used.

ChangeSet@1.1810.3217.10, 2007-09-12 13:53:32+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  BUG#23354 revert

  ndb/src/common/debugger/EventLogger.cpp@1.21.17.1, 2007-09-12 13:53:30+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    BUG#23354 revert

  ndb/src/mgmclient/CommandInterpreter.cpp@1.49.45.2, 2007-09-12 13:53:30+02:00, tomas@whalegate.ndb.mysql.com +1 -9
    BUG#23354 revert

ChangeSet@1.2476.197.57, 2007-09-12 12:39:04+02:00, guilhem@gbichot4.local +3 -0
  WL#3072 Maria Recovery
  * added replaying of REDO_REPAIR_TABLE, but disabled it as
  mysterious linker errors appear.
  * after replaying RENAME/REPAIR, we must bump create_rename_lsn
  for idempotency of maria_read_log.

  sql/mysqld.cc@1.600, 2007-09-12 12:39:03+02:00, guilhem@gbichot4.local +1 -1
    typo

  storage/maria/ma_checkpoint.c@1.16, 2007-09-12 12:39:03+02:00, guilhem@gbichot4.local +1 -1
    silence compiler warning

  storage/maria/ma_recovery.c@1.25, 2007-09-12 12:39:03+02:00, guilhem@gbichot4.local +56 -12
    * added replaying of REDO_REPAIR_TABLE, but disabled it as
    mysterious linker errors appear.
    * after replaying RENAME/REPAIR, we must bump create_rename_lsn
    for idempotency of maria_read_log.

ChangeSet@1.2476.197.56, 2007-09-12 11:27:34+02:00, guilhem@gbichot4.local +25 -0
  WL#3071 Maria checkpoint
  Finally this is the real checkpoint code.
  It however exhibits unstabilities when a checkpoint runs concurrently
  with data-modifying clients (table corruption, transaction log's
  assertions) so for now a checkpoint is taken only at startup after
  recovery and at shutdown, i.e. not in concurrent situations. Later
  we will let it run periodically, as well as flush dirty pages
  periodically (almost all needed code is there already, only pagecache
  code is written but not committed).
  WL#3072 Maria recovery
  * replacing UNDO_ROW_PURGE with CLR_END; testing of those CLR_END via
  ma_test2 which has INSERTs failing with duplicate keys.
  * replaying of REDO_RENAME_TABLE
  Now, off to test Recovery in ha_maria :)

  BitKeeper/deleted/.del-ma_least_recently_dirtied.c@1.10, 2007-09-12 09:53:30+02:00, guilhem@gbichot4.local +0 -0
    Delete: storage/maria/ma_least_recently_dirtied.c

  BitKeeper/deleted/.del-ma_least_recently_dirtied.h@1.5, 2007-09-12 09:53:31+02:00, guilhem@gbichot4.local +0 -0
    Delete: storage/maria/ma_least_recently_dirtied.h

  storage/maria/Makefile.am@1.19, 2007-09-12 11:25:28+02:00, guilhem@gbichot4.local +3 -2
    compile Checkpoint module

  storage/maria/ha_maria.cc@1.45, 2007-09-12 11:25:28+02:00, guilhem@gbichot4.local +7 -1
    When ha_maria starts, do a recovery from last checkpoint.
    Take a checkpoint when that recovery has ended and when ha_maria
    shuts down cleanly.

  storage/maria/ma_blockrec.c@1.46, 2007-09-12 11:25:28+02:00, guilhem@gbichot4.local +32 -32
    * even if my_sync() fails we have to my_close() (otherwise we leak
    a descriptor)
    * UNDO_ROW_PURGE is replaced by a simple CLR_END for UNDO_ROW_INSERT,
    as promised in the old comment; it gives us skipping during the
    UNDO phase.

  storage/maria/ma_check.c@1.43, 2007-09-12 11:25:28+02:00, guilhem@gbichot4.local +15 -10
    All REDOs before create_rename_lsn are ignored by Recovery. So
    create_rename_lsn must be set only after all data/index has been
    flushed and forced to disk. We thus move write_log_record_for_repair()
    to after _ma_flush_tables_files_after_repair().

  storage/maria/ma_checkpoint.c@1.15, 2007-09-12 11:27:28+02:00, guilhem@gbichot4.local +995 -324
    Checkpoint module.

  storage/maria/ma_checkpoint.h@1.7, 2007-09-12 11:27:29+02:00, guilhem@gbichot4.local +1 -1
    optional argument if caller wants a thread to periodically take
    checkpoints and flush dirty pages.

  storage/maria/ma_create.c@1.29, 2007-09-12 11:27:29+02:00, guilhem@gbichot4.local +26 -12
    * no need to init some vars as the initial bzero(share) takes care of this.
    * update to new function's name
    * even if we fail in my_sync() we have to my_close()

  storage/maria/ma_extra.c@1.18, 2007-09-12 11:27:29+02:00, guilhem@gbichot4.local +5 -2
    Checkpoint reads share->last_version under intern_lock, so we make
    maria_extra() update it under intern_lock. THR_LOCK_maria still needed
    because of _ma_test_if_reopen().

  storage/maria/ma_init.c@1.13, 2007-09-12 11:27:29+02:00, guilhem@gbichot4.local +2 -0
    destroy checkpoint module when Maria shuts down.

  storage/maria/ma_loghandler.c@1.46, 2007-09-12 11:27:29+02:00, guilhem@gbichot4.local +68 -57
    * UNDO_ROW_PURGE gone (see ma_blockrec.c)
    * we need to remember the LSN of the LOGREC_FILE_ID for a share,
    because this LSN is needed into the checkpoint record (Recovery wants
    to know the validity domain of an id->name mapping)
    * translog_get_horizon_no_lock() needed for Checkpoint
    * comment about failing assertion (Sanja knows)
    * translog_init_reader_data() thought that translog_read_record_header_scan()
    returns 0 in case of error, but 0 just means "0-length header".
    * translog_assign_id_to_share() now needs the MARIA_HA because
    LOGREC_FILE_ID uses a log-write hook.
    * Verify that (de)assignment of share->id happens only under intern_lock,
    as Checkpoint reads this id with intern_lock.
    * translog_purge() can accept TRANSLOG_ADDRESS, not necessarily
    a real LSN.

  storage/maria/ma_loghandler.h@1.23, 2007-09-12 11:27:29+02:00, guilhem@gbichot4.local +3 -3
    prototype updates

  storage/maria/ma_open.c@1.30, 2007-09-12 11:27:29+02:00, guilhem@gbichot4.local +13 -13
    no need to initialize "res"

  storage/maria/ma_pagecache.c@1.42, 2007-09-12 11:27:29+02:00, guilhem@gbichot4.local +7 -12
    When taking a checkpoint, we don't need to know the maximum rec_lsn
    of dirty pages; this LSN was intended to be used in the two-checkpoint
    rule, but last_checkpoint_lsn is as good.
    4 bytes for stored_list_size is enough as PAGECACHE::blocks (number
    of blocks which the pagecache can contain) is int.

  storage/maria/ma_pagecache.h@1.22, 2007-09-12 11:27:29+02:00, guilhem@gbichot4.local +1 -2
    new prototype

  storage/maria/ma_recovery.c@1.24, 2007-09-12 11:27:29+02:00, guilhem@gbichot4.local +190 -108
    * added replaying of REDO_RENAME_TABLE
    * UNDO_ROW_PURGE gone (see ma_blockrec.c), replaced by CLR_END
    * Recovery from the last checkpoint record now possible
    * In new_table() we skip the table if the id->name mapping is older than
    create_rename_lsn (mapping dates from lsn_of_file_id).
    * in get_MARIA_HA_from_REDO_record() we skip the record
    if the id->name mapping is newer than the record (can happen if processing
    a record which is before the checkpoint record).
    * parse_checkpoint_record() has to return a LSN, that's what caller expects

  storage/maria/ma_rename.c@1.11, 2007-09-12 11:27:29+02:00, guilhem@gbichot4.local +8 -13
    new function's name; log end zeroes of tables' names (ease recovery)

  storage/maria/ma_test2.c@1.22, 2007-09-12 11:27:30+02:00, guilhem@gbichot4.local +45 -9
    * equivalent of ma_test1's --test-undo added (named -u here).
    * -t=1 now stops right after creating the table, so that
    we can test undoing of INSERTs with duplicate keys (which tests the
    CLR_END logged by _ma_write_abort_block_record()).

  storage/maria/ma_test_recovery@1.11, 2007-09-12 11:27:30+02:00, guilhem@gbichot4.local +8 -5
    Test undoing of INSERTs with duplicate keys, using ma_test2;
    when such INSERT happens, it logs REDO_INSERT, UNDO_INSERT, REDO_DELETE,
    CLR_END; we abort after that, and test that CLR_END causes recovery
    to jump over UNDO_INSERT.

  storage/maria/ma_write.c@1.17, 2007-09-12 11:27:30+02:00, guilhem@gbichot4.local +10 -0
    comment

  storage/maria/maria_chk.c@1.21, 2007-09-12 11:27:30+02:00, guilhem@gbichot4.local +3 -1
    comment

  storage/maria/maria_def.h@1.37, 2007-09-12 11:27:30+02:00, guilhem@gbichot4.local +8 -5
    * a new bit in MARIA_SHARE::in_checkpoint, used to build a list
    of unique shares during Checkpoint.
    * MARIA_SHARE::lsn_of_file_id added: the LSN of the last LOGREC_FILE_ID
    for this share; needed to know to which LSN domain the mappings
    found in the Checkpoint record apply (new mappings should not apply
    to old REDOs).

  storage/maria/trnman.c@1.29, 2007-09-12 11:27:30+02:00, guilhem@gbichot4.local +18 -23
    * small changes to how trnman_collect_transactions() fills its buffer;
    it also uses a non-dummy lsn_read_non_atomic() found in ma_checkpoint.h

  storage/maria/ma_test_recovery.expected@1.6, 2007-09-12 11:27:30+02:00, guilhem@gbichot4.local +246 -0
    Result of testing undoing of INSERTs with duplicate keys; there are
    some differences in maria_chk -dvv but they are normal (removing
    records does not shrink data/index file, does not put back the
    "analyzed, optimized keys"(etc) index state.

ChangeSet@1.1810.3322.4, 2007-09-12 01:52:27+04:00, sergefp@mysql.com +1 -0
  Post-merge fixes

  mysql-test/r/delete.result@1.31, 2007-09-12 01:52:24+04:00, sergefp@mysql.com +0 -1
    Post-merge fixes

ChangeSet@1.2476.416.5, 2007-09-11 20:47:17+05:00, holyfoot@mysql.com +1 -0
  merging

  mysql-test/r/partition_pruning.result@1.28, 2007-09-11 20:47:15+05:00, holyfoot@mysql.com +2 -2
    merging

ChangeSet@1.2403.18.80, 2007-09-11 16:45:22+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#30914
    Dont add insert+delete tuple(s) to lcp-keep-list

  storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp@1.21.2.5, 2007-09-11 16:45:20+02:00, jonas@perch.ndb.mysql.com +2 -1
    ndb - bug#30914
      Dont add insert+delete tuple(s) to lcp-keep-list

ChangeSet@1.2476.427.1, 2007-09-11 15:00:52+02:00, msvensson@pilot.(none) +1 -0
  Add support for specifying suites not located in mysql-test/suite/
  Example otions that will all run binlog_stm_binlog.test in suite/binlog:
   --suite=binlog binlog.binlog_stm_binlog
   --suite=binlog binlog_stm_binlog
   binlog_stm_binlog
   --suite=suite/binlog binlog.binlog_stm_binlog
   --suite=suite/binlog binlog_stm_binlog
   

  mysql-test/lib/mtr_cases.pl@1.61.1.4, 2007-09-11 15:00:50+02:00, msvensson@pilot.(none) +10 -13
    Add support for specifying suites not located in mysql-test/suite/
    Example otions that will all run binlog_stm_binlog.test in suite/binlog:
     --suite=binlog binlog.binlog_stm_binlog
     --suite=binlog binlog_stm_binlog
     binlog_stm_binlog
     --suite=suite/binlog binlog.binlog_stm_binlog
     --suite=suite/binlog binlog_stm_binlog
     

ChangeSet@1.2476.426.1, 2007-09-11 11:11:22+02:00, guilhem@gbichot4.local +6 -0
  WL#3072 Maria recovery
  * testing of execution of UNDO_ROW_UPDATE
  * when executing an UNDO_ROW_UPDATE, store "UNDO_ROW_UPDATE" as
  "type of undone record" into the CLR_END record.

  storage/maria/ma_blockrec.c@1.45, 2007-09-11 11:11:19+02:00, guilhem@gbichot4.local +2 -2
    When logging a CLR_END in write_block_record(), it can be for
    a DELETE or for an UPDATE (now that Monty has coded execution of
    UNDO_UPDATE)

  storage/maria/ma_loghandler.c@1.45, 2007-09-11 11:11:19+02:00, guilhem@gbichot4.local +2 -0
    UNDO_ROW_UPDATE's execution coded, so no crash

  storage/maria/ma_recovery.c@1.23, 2007-09-11 11:11:20+02:00, guilhem@gbichot4.local +2 -0
    UNDO_ROW_UPDATE's execution now coded, so no crash

  storage/maria/ma_test1.c@1.23, 2007-09-11 11:11:20+02:00, guilhem@gbichot4.local +3 -3
    upper case letter

  storage/maria/ma_test_recovery@1.10, 2007-09-11 11:11:20+02:00, guilhem@gbichot4.local +1 -1
    Test execution of UNDO_ROW_UPDATE: first we stop ma_test1 after
    deletes and commit, then we stop ma_test1 after updates and abort;
    we verify that updates are rolled back by comparing tables

  storage/maria/ma_test_recovery.expected@1.5, 2007-09-11 11:11:20+02:00, guilhem@gbichot4.local +348 -18
    output of testing execution of UNDO_ROW_UPDATE. Table's checksum
    not recovered (known issue not specific to UPDATE).

ChangeSet@1.2476.197.54, 2007-09-11 09:37:17+03:00, bell@desktop.sanja.is.com.ua +1 -0
  Absence of test_file.h fixed.

  storage/maria/unittest/Makefile.am@1.16, 2007-09-11 09:37:15+03:00, bell@desktop.sanja.is.com.ua +2 -2
    Absence of test_file.h fixed.

ChangeSet@1.2476.197.52, 2007-09-11 01:58:15+03:00, monty@mysql.com +12 -0
  Fixed some bugs when using undo of VARCHAR fields
  Fixed bug in undo_delete
  Fixed wrong error output from maria_check

  include/my_base.h@1.99, 2007-09-11 01:58:10+03:00, monty@mysql.com +1 -0
    Added marker if we have null fields in table

  mysql-test/r/maria.result@1.17, 2007-09-11 01:58:10+03:00, monty@mysql.com +2 -2
    checksum in maria now ignore null fields that are null

  sql/sql_table.cc@1.441, 2007-09-11 01:58:10+03:00, monty@mysql.com +4 -0
    Ignore null fields that are now
    (Before enabling this, we have to change MyISAM to also skip null fields)

  storage/maria/ma_blockrec.c@1.44, 2007-09-11 01:58:11+03:00, monty@mysql.com +21 -17
    More logging
    After merge fixes
    Fixed some bugs when using undo of VARCHAR fields
    Fixed bug in undo_delete (We can't use info->rec_buff here as this is used in write_block_record())

  storage/maria/ma_blockrec.h@1.14, 2007-09-11 01:58:11+03:00, monty@mysql.com +2 -2
    ma_recordpos_to_dir_entry changed to return uint

  storage/maria/ma_check.c@1.42, 2007-09-11 01:58:11+03:00, monty@mysql.com +2 -2
    Fixed wrong output in case of errors

  storage/maria/ma_create.c@1.28, 2007-09-11 01:58:11+03:00, monty@mysql.com +14 -13
    Set share.base.pack_reclength more correct for block record
    Delete support for RAID

  storage/maria/ma_open.c@1.29, 2007-09-11 01:58:11+03:00, monty@mysql.com +8 -3
    Don't calculate checksum fields with value NULL

  storage/maria/ma_test1.c@1.22, 2007-09-11 01:58:11+03:00, monty@mysql.com +4 -3
    Fixed output from -v for VARCHAR keys

  storage/maria/ma_test_recovery.expected@1.4, 2007-09-11 01:58:11+03:00, monty@mysql.com +24 -18
    Update results after adding new printf
    New checksums (because we now ignore nulls)
    Some file lengths are different, but think they are ok (didn't have time to investigate)

  storage/myisam/ha_myisam.cc@1.189, 2007-09-11 01:58:11+03:00, monty@mysql.com +2 -1
    Fixed comment

  storage/myisam/mi_test1.c@1.35, 2007-09-11 01:58:11+03:00, monty@mysql.com +5 -2
    Fixed bug

ChangeSet@1.1810.3322.3, 2007-09-11 02:41:42+04:00, sergefp@mysql.com +1 -0
  Post-merge fixes

  mysql-test/t/delete.test@1.29, 2007-09-11 02:41:38+04:00, sergefp@mysql.com +0 -1
    Post-merge fixes

ChangeSet@1.2476.345.48, 2007-09-10 16:10:37-06:00, malff@lambda.weblab +18 -0
  WL#4030 (Deprecate RENAME DATABASE: replace with ALTER DATABASE <name>
    UPGRADE)
  
  Bug 17565 (RENAME DATABASE destroys events)
  Bug#28360 (RENAME DATABASE destroys routines)
  
  Removed the
    RENAME DATABASE db1 TO db2
  statement.
  
  Implemented the
    ALTER DATABASE db UPGRADE DATA DIRECTORY NAME
  statement, which has the same function.

  client/mysqlcheck.c@1.63.1.5, 2007-09-10 12:53:15-06:00, malff@omega.weblab +21 -4
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/r/create.result@1.153, 2007-09-10 12:53:15-06:00, malff@omega.weblab +0 -8
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/r/query_cache.result@1.103, 2007-09-10 12:53:15-06:00, malff@omega.weblab +0 -49
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/r/renamedb.result@1.3, 2007-09-10 12:53:15-06:00, malff@omega.weblab +11 -32
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/r/sp-code.result@1.17, 2007-09-10 12:53:15-06:00, malff@omega.weblab +2 -2
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/r/sp-error.result@1.129, 2007-09-10 12:53:15-06:00, malff@omega.weblab +13 -0
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/r/upgrade.result@1.6, 2007-09-10 12:53:15-06:00, malff@omega.weblab +25 -0
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/t/create.test@1.104, 2007-09-10 12:53:15-06:00, malff@omega.weblab +11 -8
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/t/query_cache.test@1.84, 2007-09-10 12:53:15-06:00, malff@omega.weblab +39 -41
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/t/renamedb.test@1.3, 2007-09-10 12:53:15-06:00, malff@omega.weblab +49 -22
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/t/sp-error.test@1.125, 2007-09-10 12:53:15-06:00, malff@omega.weblab +28 -0
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/t/upgrade.test@1.6, 2007-09-10 12:53:15-06:00, malff@omega.weblab +31 -0
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  sql/mysql_priv.h@1.523.1.16, 2007-09-10 12:53:16-06:00, malff@omega.weblab +1 -1
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  sql/sql_db.cc@1.163, 2007-09-10 16:10:32-06:00, malff@lambda.weblab +42 -80
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  sql/sql_lex.h@1.297, 2007-09-10 12:53:16-06:00, malff@omega.weblab +1 -2
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  sql/sql_parse.cc@1.683.17.2, 2007-09-10 12:53:16-06:00, malff@omega.weblab +11 -15
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  sql/sql_prepare.cc@1.232, 2007-09-10 12:53:17-06:00, malff@omega.weblab +1 -1
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  sql/sql_yacc.yy@1.601.1.1, 2007-09-10 12:53:17-06:00, malff@omega.weblab +12 -20
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

ChangeSet@1.2476.425.3, 2007-09-10 23:20:39+02:00, guilhem@gbichot4.local +1 -0
  fix for pushbuild failure, include trnman_public.h in source tarball (make dist)

  storage/maria/Makefile.am@1.18, 2007-09-10 23:20:37+02:00, guilhem@gbichot4.local +1 -1
    include trnman_public.h in source tarball

ChangeSet@1.2476.425.2, 2007-09-10 21:14:46+02:00, serg@janus.mylan +1 -0
  fix a typo in #ifdef

  storage/maria/maria_read_log.c@1.16.1.1, 2007-09-10 21:14:43+02:00, serg@janus.mylan +1 -1
    fix a typo in #ifdef

ChangeSet@1.2476.425.1, 2007-09-10 20:19:27+02:00, serg@janus.mylan +1 -0
  include maria in pushbuild's 'make dist'

  BUILD/compile-dist@1.17.1.1, 2007-09-10 20:19:23+02:00, serg@janus.mylan +1 -0
    include maria in pushbuild's 'make dist'

ChangeSet@1.1616.3096.1, 2007-09-10 16:26:51+04:00, sergefp@mysql.com +3 -0
  BUG#30385: Server crash when deleting with ORDER BY and LIMIT
  in get_index_for_order(), don't walk over the end of the index key parts
  when matching index description and needed ordering.

  mysql-test/r/delete.result@1.21.1.4, 2007-09-10 16:26:49+04:00, sergefp@mysql.com +11 -0
    BUG#30385: Testcase

  mysql-test/t/delete.test@1.19.1.5, 2007-09-10 16:26:49+04:00, sergefp@mysql.com +13 -0
    BUG#30385: Testcase

  sql/opt_range.cc@1.98.12.4, 2007-09-10 16:26:49+04:00, sergefp@mysql.com +2 -1
    BUG#30385: Server crash when deleting with ORDER BY and LIMIT
    in get_index_for_order(), don't walk over the end of the index key parts
    when matching index description and needed ordering.

ChangeSet@1.2476.423.1, 2007-09-09 19:15:10+03:00, monty@mysql.com +16 -0
  Added applying of undo for updates
  Fixed bug in duplicate key handling for block records during repair
  All read-row methods now return error number in case of error
  Don't calculate checksum for null fields
  Fixed bug when running maria_read_log with -o

  BUILD/SETUP.sh@1.70, 2007-09-09 19:10:12+03:00, monty@mysql.com +3 -3
    Added STACK_DIRECTION

  BUILD/compile-pentium-debug-max@1.24, 2007-09-09 19:10:12+03:00, monty@mysql.com +1 -1
    Moved STACK_DIRECTION to SETUP

  include/myisam.h@1.87, 2007-09-09 19:10:12+03:00, monty@mysql.com +1 -1
    Added extra parameter to write_key

  storage/maria/ma_blockrec.c@1.40.1.1, 2007-09-09 19:14:07+03:00, monty@mysql.com +251 -58
    Added applying of undo for updates
    Fixed indentation
    Removed some not needed casts
    Fixed wrong logging of CLR record
    Split ma_update_block_record to two functions to be able to reuse it from undo-applying
    Simplify filling of packed fields
    ma_record_block_record) now returns error number on failure
    Sligtly changed log record information for undo-update

  storage/maria/ma_check.c@1.37.1.1, 2007-09-09 19:14:07+03:00, monty@mysql.com +12 -2
    Fixed bug in duplicate key handling for block records during repair

  storage/maria/ma_checksum.c@1.7, 2007-09-09 19:14:07+03:00, monty@mysql.com +5 -2
    Don't calculate checksum for null fields

  storage/maria/ma_dynrec.c@1.17, 2007-09-09 19:15:05+03:00, monty@mysql.com +99 -96
    _ma_read_dynamic_reocrd() now returns error number on error
    Rest of the changes are code simplification and indentation fixes

  storage/maria/ma_locking.c@1.12.1.1, 2007-09-09 19:15:05+03:00, monty@mysql.com +3 -0
    Added comment

  storage/maria/ma_loghandler.c@1.40.1.1, 2007-09-09 19:15:05+03:00, monty@mysql.com +3 -5
    More debugging
    Removed printing of total_record_length as this was always same as record_length

  storage/maria/ma_open.c@1.25.1.1, 2007-09-09 19:15:05+03:00, monty@mysql.com +5 -0
    Allocate bitmap for changed fields

  storage/maria/ma_packrec.c@1.13, 2007-09-09 19:15:05+03:00, monty@mysql.com +6 -6
    read_record now returns error number on error

  storage/maria/ma_recovery.c@1.17.1.1, 2007-09-09 19:15:05+03:00, monty@mysql.com +2 -8
    Fixed wrong arguments to undo_row_update

  storage/maria/ma_statrec.c@1.8, 2007-09-09 19:15:05+03:00, monty@mysql.com +7 -14
    read_record now returns error number on error (not 1)
    Code simplification

  storage/maria/ma_test1.c@1.17.1.1, 2007-09-09 19:15:05+03:00, monty@mysql.com +17 -2
    Added exit possibility after update phase (to test undo of updates)

  storage/maria/maria_def.h@1.33.1.1, 2007-09-09 19:15:06+03:00, monty@mysql.com +3 -1
    Include bitmap header file

  storage/maria/maria_read_log.c@1.15.1.1, 2007-09-09 19:15:06+03:00, monty@mysql.com +2 -1
    Fixed bug when running with -o

ChangeSet@1.2476.197.50, 2007-09-07 19:45:33+02:00, serg@janus.mylan +1 -0
  enable --with-maria-storage-engine

  storage/maria/plug.in@1.4, 2007-09-07 19:45:31+02:00, serg@janus.mylan +1 -1
    enable --with-maria-storage-engine

ChangeSet@1.2476.197.49, 2007-09-07 17:03:36+02:00, guilhem@gbichot4.local +1 -0
  Fix for pushbuild maria.test failure, where directory syncing failed at the
  end of translog_flush() when datadir was in /dev/shm.

  storage/maria/ma_loghandler.c@1.43, 2007-09-07 17:03:34+02:00, guilhem@gbichot4.local +1 -1
    directory syncing can fail on shared memory devices (/dev/shm on Linux
    in this case); see my_sync_dir().

ChangeSet@1.2476.197.48, 2007-09-07 16:59:12+02:00, guilhem@gbichot4.local +2 -0
  If Maria engine is not compiled in, don't use page caches (fix
  for compiler errors in pushbuild). Small bugfix.

  sql/handler.h@1.254, 2007-09-07 16:59:10+02:00, guilhem@gbichot4.local +6 -0
    don't use pagecaches if no Maria

  storage/maria/ma_check.c@1.40, 2007-09-07 16:59:10+02:00, guilhem@gbichot4.local +4 -0
    correcting mistake in previous push; need to call this function
    otherwise create_rename_lsn would not be updated at end of REPAIR.

ChangeSet@1.2476.197.47, 2007-09-07 15:52:25+02:00, guilhem@gbichot4.local +7 -0
  WL#3072 - Maria Recovery
  At the end of recovery, we initialize the transaction manager's
  trid generator with the maximum trid seen during the REDO phase.
  This ensures that trids always grow (needed for versioning),
  even after a crash.
  This patch is only preparation, as ma_recover() is not called
  from ha_maria yet.

  storage/maria/ha_maria.cc@1.44, 2007-09-07 15:52:23+02:00, guilhem@gbichot4.local +1 -1
    trnman_init() needs argument now (soon trnman_init() will rather
    be done via ma_recover() and thus it will not be 0)

  storage/maria/ma_recovery.c@1.21, 2007-09-07 15:52:23+02:00, guilhem@gbichot4.local +6 -8
    During the REDO phase, remember the max long trid of transactions
    which we have seen (both in the checkpoint record and the
    LOGREC_LONG_TRANSACTION_ID records)

  storage/maria/ma_test1.c@1.20, 2007-09-07 15:52:23+02:00, guilhem@gbichot4.local +1 -1
    trnman_init() needs argument now 

  storage/maria/ma_test2.c@1.21, 2007-09-07 15:52:23+02:00, guilhem@gbichot4.local +1 -1
    trnman_init() needs argument now 

  storage/maria/trnman.c@1.28, 2007-09-07 15:52:23+02:00, guilhem@gbichot4.local +13 -2
    new argument to trnman_init() so that caller can decide which
    value the generator of trids starts from.

  storage/maria/trnman_public.h@1.5, 2007-09-07 15:52:23+02:00, guilhem@gbichot4.local +1 -1
    trnman_init() needs argument now 

  storage/maria/unittest/trnman-t.c@1.12, 2007-09-07 15:52:23+02:00, guilhem@gbichot4.local +1 -1
    trnman_init() needs argument now 

ChangeSet@1.2476.422.1, 2007-09-07 18:41:49+05:00, holyfoot@mysql.com +4 -0
  Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
  
  In the ha_partition::position() we don't calculate the number
  of the partition of the record, but use m_last_part value instead,
  relying on that it's previously set by some other call like ::write_row().
  Delete_rows_log_event::do_exec_row() calls find_and_fetch_row(),
  where we used position() + rnd_pos() call for the InnoDB-based PARTITION-ed
  table as there HA_PRIMARY_KEY_REQUIRED_FOR_POSITION enabled.
  
  fixed by introducing new handler::rnd_pos_by_record() method to be
  used for random record-based positioning

  sql/ha_partition.cc@1.100.1.1, 2007-09-07 18:41:46+05:00, holyfoot@mysql.com +32 -6
    Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
    
    ha_partition::rnd_pos_by_record() implemented

  sql/ha_partition.h@1.41.1.1, 2007-09-07 18:41:46+05:00, holyfoot@mysql.com +1 -0
    Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
    
    ha_partition::rnd_pos_by_record() declared

  sql/handler.h@1.244.1.33, 2007-09-07 18:41:46+05:00, holyfoot@mysql.com +6 -0
    Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
    
    handler::rnd_pos_by_record() introduced

  sql/handler.h@1.244.1.32, 2007-09-07 18:25:06+05:00, holyfoot@mysql.com +5 -0
    Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
    handler::rnd_pos_by_record() declared

  sql/log_event.cc@1.277.29.1, 2007-09-07 18:41:46+05:00, holyfoot@mysql.com +1 -2
    Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
    
    handler::rnd_pos_by_record used instead of position() + rnd_pos() call

ChangeSet@1.2476.197.46, 2007-09-07 15:02:30+02:00, guilhem@gbichot4.local +22 -0
  - WL#3072 Maria Recovery:
  Recovery of state.records (the count of records which is stored into
  the header of the index file). For that, state.is_of_lsn is introduced;
  logic is explained in ma_recovery.c (look for "Recovery of the state").
  The net gain is that in case of crash, we now recover state.records,
  and it is idempotent (ma_test_recovery tests it).
  state.checksum is not recovered yet, mail sent for discussion.
  - WL#3071 Maria Checkpoint: preparation for it, by protecting
  all modifications of the state in memory or on disk with intern_lock
  (with the exception of the really-often-modified state.records,
  which is now protected with the log's lock, see ma_recovery.c
  (look for "Recovery of the state"). Also, if maria_close() sees that
  Checkpoint is looking at this table it will not my_free() the share.
  - don't compute row's checksum twice in case of UPDATE (correction
  to a bugfix I made yesterday).

  storage/maria/ha_maria.cc@1.43, 2007-09-07 15:01:55+02:00, guilhem@gbichot4.local +2 -0
    protect state write with intern_lock (against Checkpoint)

  storage/maria/ma_blockrec.c@1.42, 2007-09-07 15:01:55+02:00, guilhem@gbichot4.local +28 -12
    * don't reset trn->rec_lsn in _ma_unpin_all_pages(), because it
    should wait until we have corrected the allocation in the bitmap
    (as the REDO can serve to correct the allocation during Recovery);
    introducing _ma_finalize_row() for that.
    * In a changeset yesterday I moved computation of the checksum
    into write_block_record(), to fix a bug in UPDATE. Now I notice
    that maria_update() already computes the checksum, it's just that
    it puts it into info->cur_row while _ma_update_block_record()
    uses info->new_row; so, removing the checksum computation from
    write_block_record(), putting it back into allocate_and_write_block_record()
    (which is called only by INSERT and UNDO_DELETE), and copying
    cur_row->checksum into new_row->checksum in _ma_update_block_record().

  storage/maria/ma_check.c@1.39, 2007-09-07 15:01:55+02:00, guilhem@gbichot4.local +15 -13
    new prototypes, they will take intern_lock when writing the state;
    also take intern_lock when changing share->kfile. In both cases
    this is to protect against Checkpoint reading/writing the state or reading
    kfile at the same time.
    Not updating create_rename_lsn directly at end of write_log_record_for_repair()
    as it wouldn't have intern_lock.

  storage/maria/ma_close.c@1.20, 2007-09-07 15:01:55+02:00, guilhem@gbichot4.local +33 -10
    Checkpoint builds a list of shares (under THR_LOCK_maria), then it
    handles each such share (under intern_lock) (doing flushing etc);
    if maria_close() freed this share between the two, Checkpoint
    would see a bad pointer. To avoid this, when building the list Checkpoint
    marks each share, so that maria_close() knows it should not free it
    and Checkpoint will free it itself.
    Extending the zone covered by intern_lock to protect against
    Checkpoint reading kfile, writing state.

  storage/maria/ma_create.c@1.27, 2007-09-07 15:01:55+02:00, guilhem@gbichot4.local +44 -13
    When we update create_rename_lsn, we also update is_of_lsn to
    the same value: it is logical, and allows us to test in maria_open()
    that the former is not bigger than the latter (the contrary is a sign
    of index header corruption, or severe logging bug which hinders
    Recovery, table needs a repair).
    _ma_update_create_rename_lsn_on_disk() also writes is_of_lsn;
    it now operates under intern_lock (protect against Checkpoint),
    a shortcut function is available for cases where acquiring
    intern_lock is not needed (table's creation or first open).

  storage/maria/ma_delete.c@1.13, 2007-09-07 15:01:55+02:00, guilhem@gbichot4.local +1 -1
    if table is transactional, "records" is already decremented
    when logging UNDO_ROW_DELETE.

  storage/maria/ma_delete_all.c@1.19, 2007-09-07 15:01:55+02:00, guilhem@gbichot4.local +8 -0
    comments

  storage/maria/ma_extra.c@1.17, 2007-09-07 15:02:27+02:00, guilhem@gbichot4.local +25 -4
    Protect modifications of the state, in memory and/or on disk,
    with intern_lock, against a concurrent Checkpoint.
    When state goes to disk, update it's is_of_lsn (by calling
    the new _ma_state_info_write()).
    In HA_EXTRA_FORCE_REOPEN, don't set share->changed to 0 (undoing
    a change I made a few days ago) and ASK_MONTY

  storage/maria/ma_locking.c@1.14, 2007-09-07 15:02:28+02:00, guilhem@gbichot4.local +10 -8
    no real code change here.

  storage/maria/ma_loghandler.c@1.42, 2007-09-07 15:02:28+02:00, guilhem@gbichot4.local +102 -4
    Log-write-hooks for updating "state.records" under log's mutex
    when writing/updating/deleting a row or deleting all rows.

  storage/maria/ma_loghandler_lsn.h@1.13, 2007-09-07 15:02:28+02:00, guilhem@gbichot4.local +1 -1
    merge (make LSN_ERROR and LSN_REPAIRED_BY_MARIA_CHK different)

  storage/maria/ma_open.c@1.27, 2007-09-07 15:02:28+02:00, guilhem@gbichot4.local +72 -17
    When opening a table verify that is_of_lsn >= create_rename_lsn; if
    false the header must be corrupted.
    _ma_state_info_write() is split in two: _ma_state_info_write_sub()
    which is the old _ma_state_info_write(), and _ma_state_info_write()
    which additionally takes intern_lock if requested (to protect
    against Checkpoint) and updates is_of_lsn.
    _ma_open_keyfile() should change kfile.file under intern_lock
    to protect Checkpoint from reading a wrong kfile.file.

  storage/maria/ma_recovery.c@1.20, 2007-09-07 15:02:28+02:00, guilhem@gbichot4.local +132 -9
    Recovery of state.records: when the REDO phase sees UNDO_ROW_INSERT
    which has a LSN > state.is_of_lsn it increments state.records.
    Same for UNDO_ROW_DELETE and UNDO_ROW_PURGE.
    When closing a table during Recovery, we know its state is at least
    as new as the current log record we are looking at, so increase
    is_of_lsn to the LSN of the current log record.

  storage/maria/ma_rename.c@1.10, 2007-09-07 15:02:28+02:00, guilhem@gbichot4.local +4 -4
    update for new behaviour of _ma_update_create_rename_lsn_on_disk().

  storage/maria/ma_test1.c@1.19, 2007-09-07 15:02:28+02:00, guilhem@gbichot4.local +1 -1
    update to new prototype

  storage/maria/ma_test2.c@1.20, 2007-09-07 15:02:28+02:00, guilhem@gbichot4.local +1 -1
    update to new prototype (actually prototype was changed days ago,
    but compiler does not complain about the extra argument??)

  storage/maria/ma_test_recovery@1.9, 2007-09-07 15:02:28+02:00, guilhem@gbichot4.local +3 -3
    "rm" fails if file does not exist. Redirect stderr of script.

  storage/maria/ma_write.c@1.16, 2007-09-07 15:02:28+02:00, guilhem@gbichot4.local +9 -1
    if table is transactional, "records" is already incremented when
    logging UNDO_ROW_INSERT. Comments.

  storage/maria/maria_chk.c@1.20, 2007-09-07 15:02:28+02:00, guilhem@gbichot4.local +2 -1
    update is_of_lsn too

  storage/maria/maria_def.h@1.35, 2007-09-07 15:02:28+02:00, guilhem@gbichot4.local +11 -3
    - MARIA_STATE_INFO::is_of_lsn which is used by Recovery. It is stored
    into the index file's header.
    - Checkpoint can now mark a table as "don't free this", and maria_close()
    can reply "ok then you will free it".
    - new functions

  storage/maria/maria_pack.c@1.14, 2007-09-07 15:02:28+02:00, guilhem@gbichot4.local +3 -2
    update for new name

  storage/maria/ma_test_recovery.expected@1.3, 2007-09-07 15:02:28+02:00, guilhem@gbichot4.local +9 -107
    new result file of ma_test_recovery. Improvements: record
    count read from index's header is now always correct.

ChangeSet@1.2476.399.11, 2007-09-07 11:15:07+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  Bug #11313 confusing/erroneous 4006 message

  sql/ha_ndbcluster_binlog.cc@1.131, 2007-09-07 11:15:04+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug #11313 confusing/erroneous 4006 message

  storage/ndb/src/ndbapi/Ndb.cpp@1.98, 2007-09-07 11:15:04+02:00, tomas@whalegate.ndb.mysql.com +3 -2
    Bug #11313 confusing/erroneous 4006 message

  storage/ndb/src/ndbapi/ndberror.c@1.94, 2007-09-07 11:15:04+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    Bug #11313 confusing/erroneous 4006 message

ChangeSet@1.2476.183.42, 2007-09-07 12:04:57+04:00, skozlov@mysql.com +1 -0
  replaced '--exec rm' to '--remove_file'

  mysql-test/suite/rpl/t/rpl_invoked_features.test@1.7, 2007-09-07 12:04:48+04:00, skozlov@mysql.com +2 -2
    replaced '--exec rm' to '--remove_file'

ChangeSet@1.1810.2589.3, 2007-09-07 11:58:04+04:00, kaa@polly.(none) +2 -0
  This patch is a part of work on bug #5731 "key_buffer_size not properly restricted to 4GB".
    
  The patch limits read_buffer_size and read_rnd_buffer_size by 2 GB on all platforms for the following reasons:
    
  - I/O code in mysys, code in mf_iocache.c and in some storage engines do not currently work with sizes > 2 GB for those buffers
  - even if the above had been fixed, Windows POSIX read() and write() calls are not 2GB-safe, so setting those buffer to sizes > 2GB would not work correctly on 64-bit Windows.

  include/my_global.h@1.96.10.3, 2007-09-07 11:57:48+04:00, kaa@polly.(none) +0 -3
    Removed SSIZE_MAX definition because it's not neeeded anymore.

  sql/mysqld.cc@1.439.128.1, 2007-09-07 11:57:48+04:00, kaa@polly.(none) +3 -3
    Limit read_buffer_size and read_rnd_buffer_size by 2 GB on all platforms.

ChangeSet@1.2476.345.46, 2007-09-06 12:06:22-06:00, malff@omega.weblab +2 -0
  Test cleanup in rpl_binlog_grant: XID values are unpredictable

  mysql-test/suite/rpl/r/rpl_binlog_grant.result@1.2, 2007-09-06 12:06:20-06:00, malff@omega.weblab +3 -3
    Test cleanup in rpl_binlog_grant: XID values are unpredictable

  mysql-test/suite/rpl/t/rpl_binlog_grant.test@1.2, 2007-09-06 12:06:20-06:00, malff@omega.weblab +2 -0
    Test cleanup in rpl_binlog_grant: XID values are unpredictable

ChangeSet@1.2476.348.24, 2007-09-06 21:56:46+05:00, gshchepa@gleb.loc +1 -0
  sql_parse.cc:
    Post-merge fix.

  sql/sql_parse.cc@1.683.15.6, 2007-09-06 21:56:03+05:00, gshchepa@gleb.loc +0 -1
    Post-merge fix.

ChangeSet@1.2476.421.1, 2007-09-06 13:22:34-03:00, davi@moksha.local +4 -0
  The test case for bug 28587 doesn't work with the embedded version,
  the first query is not running while we are doing wait queries on
  a second connection.

  mysql-test/r/insert_notembedded.result@1.2, 2007-09-06 13:22:31-03:00, davi@moksha.local +19 -0
    Test case result for bug 28587 moved from insert_update.result

  mysql-test/r/insert_update.result@1.35, 2007-09-06 13:22:31-03:00, davi@moksha.local +0 -19
    Remove test case result for bug 28587, moving to insert_notembedded.result

  mysql-test/t/insert_notembedded.test@1.2, 2007-09-06 13:22:31-03:00, davi@moksha.local +35 -0
    Test case result for bug 28587, moved from insert_update.test

  mysql-test/t/insert_update.test@1.31, 2007-09-06 13:22:31-03:00, davi@moksha.local +0 -35
    Remove test case for bug 28587, moving to insert_notembedded.test

ChangeSet@1.2476.348.23, 2007-09-06 20:42:36+05:00, gshchepa@gleb.loc +1 -0
  sp.result:
    Post-merge fix.

  mysql-test/r/sp.result@1.288.2.2, 2007-09-06 19:21:16+05:00, gshchepa@gleb.loc +2 -2
    Post-merge fix.

ChangeSet@1.2476.197.45, 2007-09-06 16:53:26+02:00, guilhem@gbichot4.local +13 -0
  - speed optimization:
  minimize writes to transactional Maria tables: don't write
  data pages, state, and open_count at the end of each statement.
  Data pages will be written by a background thread periodically.
  State will be written by Checkpoint periodically.
  open_count serves to detect when a table is potentially damaged
  due to an unclean mysqld stop, but thanks to recovery an unclean
  mysqld stop will be corrected and so open_count becomes useless.
  As state is written less often, it is often obsolete on disk,
  we thus should avoid to read it from disk.
  - by removing the data page writes above, it is necessary to put
  it back at the start of some statements like check, repair and
  delete_all. It was already necessary in fact (see ma_delete_all.c).
  - disabling CACHE INDEX on Maria tables for now (fixes crash
  of test 'key_cache' when run with --default-storage-engine=maria).
  - correcting some fishy code in maria_extra.c (we possibly could lose
  index pages when doing a DROP TABLE under Windows, in theory).

  storage/maria/ha_maria.cc@1.42, 2007-09-06 16:53:24+02:00, guilhem@gbichot4.local +3 -0
    disable CACHE INDEX in Maria for now (there is a single cache for now),
    it crashes and it's not a priority

  storage/maria/ma_bitmap.c@1.20, 2007-09-06 16:53:24+02:00, guilhem@gbichot4.local +2 -1
    debug message

  storage/maria/ma_check.c@1.38, 2007-09-06 16:53:24+02:00, guilhem@gbichot4.local +44 -31
    The statement before maria_repair() may not flush state,
    so it needs to be done by maria_repair() (indeed this function
    uses maria_open(HA_OPEN_COPY) so reads state from disk,
    so needs to find it up-to-date on disk).
    For safety (but normally this is not needed) we remove index blocks
    out of the cache before repairing.
    _ma_flush_blocks() becomes _ma_flush_table_files_after_repair():
    it now additionally flushes the data file and state and syncs files.
    As a side effect, the assertion "no WRITE_CACHE_USED" from
    _ma_flush_table_files() fired so we move all end_io_cache() done
    at the end of repair to before the calls to _ma_flush_table_files_after_repair().

  storage/maria/ma_close.c@1.19, 2007-09-06 16:53:24+02:00, guilhem@gbichot4.local +16 -12
    when closing a transactional table, we fsync it. But we need to
    do this only after writing its state.
    We need to write the state at close time only for transactional
    tables (the other tables do that at last unlock).
    Putting back the O_RDONLY||crashed condition which I had
    removed earlier.
    Unmap the file before syncing it (does not matter now as Maria
    does not use mmap)

  storage/maria/ma_delete_all.c@1.18, 2007-09-06 16:53:24+02:00, guilhem@gbichot4.local +6 -4
    need to flush data pages before chsize-ing it. Was needed even when
    we flushed data pages at the end of each statement, because we didn't
    anyway do it if under LOCK TABLES: the change here thus fixes this bug:
    create table t(a int) engine=maria;lock tables t write;
    insert into t values(1);delete from t;unlock tables;check table t;
    "Size of datafile is: 16384       Should be: 8192"
    (an obsolete page went to disk after the chsize(), at unlock time).

  storage/maria/ma_extra.c@1.16, 2007-09-06 16:53:24+02:00, guilhem@gbichot4.local +85 -37
    When doing share->last_version=0, we make the MARIA_SHARE-in-memory
    invisible to future openers, so need to have an up-to-date state
    on disk for them. The same way, future openers will reopen the data
    and index file, so they will not find our cached blocks, so we
    need to flush them to disk.
    In HA_EXTRA_FORCE_REOPEN, this probably happens naturally as all
    tables normally get closed, we however add a safety flush.
    In HA_EXTRA_PREPARE_FOR_RENAME, we need to do the flushing. On
    Windows we additionally need to close files.
    In HA_EXTRA_PREPARE_FOR_DROP, we don't need to flush anything but
    remove dirty cached blocks from memory. On Windows we need to close
    files.
    Closing files forces us to sync them before (requirement for transactional
    tables).
    For mutex reasons (don't lock intern_lock twice), we move
    maria_lock_database() and _ma_decrement_open_count() first in the list
    of operations.
    Flush also data file in HA_EXTRA_FLUSH.

  storage/maria/ma_locking.c@1.13, 2007-09-06 16:53:25+02:00, guilhem@gbichot4.local +67 -31
    For transactional tables:
      - don't write data pages / state at unlock time;
      as a consequence, "share->changed=0" cannot be done.
      - don't write state in _ma_writeinfo()
      - don't maintain open_count on disk (Recovery corrects the table in case of crash
      anyway, and we gain speed by not writing open_count to disk),
    For non-transactional tables, flush the state at unlock only
    if the table was changed (optimization).
    Code which read the state from disk is relevant only with
    external locking, we disable it (if want to re-enable it, it shouldn't
    for transactional tables as state on disk may be obsolete (such tables
    does not flush state at unlock anymore).
    The comment "We have to flush the write cache" is now wrong because
    maria_lock_database(F_UNLCK) now happens before thr_unlock(), and
    we are not using external locking.

  storage/maria/ma_open.c@1.26, 2007-09-06 16:53:25+02:00, guilhem@gbichot4.local +7 -2
    _ma_state_info_read() is only used in ma_open.c, making it static

  storage/maria/ma_recovery.c@1.19, 2007-09-06 16:53:25+02:00, guilhem@gbichot4.local +2 -4
    set MARIA_SHARE::changed to TRUE when we are going to apply a
    REDO/UNDO, so that the state gets flushed at close.

  storage/maria/ma_test_recovery@1.8, 2007-09-06 16:53:25+02:00, guilhem@gbichot4.local +5 -5
    for repeatable output, no names of varying directories.

  storage/maria/maria_chk.c@1.19, 2007-09-06 16:53:25+02:00, guilhem@gbichot4.local +2 -3
    function renamed

  storage/maria/maria_def.h@1.34, 2007-09-06 16:53:25+02:00, guilhem@gbichot4.local +1 -3
    Function became local to ma_open.c. Function renamed.

  storage/maria/ma_test_recovery.expected@1.2, 2007-09-06 16:53:25+02:00, guilhem@gbichot4.local +129 -165
    Changes introduced by this patch:
    - good: the "open" (table open, not properly closed) is gone,
    it was pointless for a recovered table
    - bad: stemming from different moments of writing the index's state
    probably (_ma_writeinfo() used to write the state after every row
    write in ma_test* programs, doesn't anymore as the table is
    transactional): some differences in indexes (not relevant as we don't
    yet have recovery for them); some differences in count of records
    (changed from a wrong value to another wrong value) (not relevant
    as we don't recover this count correctly yet anyway, though
    a patch will be pushed soon).

ChangeSet@1.2476.197.44, 2007-09-06 16:04:36+02:00, guilhem@gbichot4.local +7 -0
  WL#3072 Maria Recovery
  misc fixes of execution of UNDOs in the UNDO phase:
  - into the CLR_END, store the LSN of the _previous_ UNDO (we debated
  what was best, so far we're going with "previous"; later we can change
  to "current" if needed), and store the type of record which is being
  undone (needed to know how to update state.records when we see the
  CLR_END during the REDO phase).
  - declaring all UNDOs and CLR_END as "compressed"
  - when executing an UNDO in the UNDO phase, state.records is updated
  as a hook when writing CLR_END (needed for "recovery of the state"),
  and so is trn->undo_lsn (needed for when we have checkpoints).
  - bugfix (execution of UNDO_ROW_DELETE didn't store the correct checksum
  into the re-inserted row, maria_chk -r thus threw the row away).
  - modifications of ma_test1: where to stop is now driven by --testflag;
  --test-undo just tells how to stop (flush data, flush log, nothing).
  - ma_test_recovery: testing of the UNDO phase, more testing of the
  REDO phase, identification of a bug.

  storage/maria/ma_blockrec.c@1.41, 2007-09-06 16:04:32+02:00, guilhem@gbichot4.local +23 -15
    - bugfix: execution of UNDO_ROW_DELETE didn't store the correct
    checksum into the row (leading to "maria_chk -r" eliminating the
    re-inserted row, net effect was that rollback appeared to have
    rolled back no deletion). Reason was that write_block_record() used
    info->cur_row.checksum, while "row" can be != &info->cur_row
    (case of UNDO_ROW_DELETE). After fixing this, problems with
    _ma_update_block_record() appeared; indeed checksum was computed
    by  allocate_and_write_block_record() while _ma_update_block_record()
    directly calls write_block_record(). Solution is to compute checksum
    in write_block_record() instead.
    - when executing an UNDO, we now pass the LSN of the _previous_ UNDO
    to block_format functions. This LSN can be 0 (if the being-executed UNDO
    was the transaction's first UNDO), so "undo_lsn==0" cannot work
    anymore to indicate "this is not UNDO work". Using undo_lsn==LSN_ERROR
    instead (this is an impossible LSN).
    - store into CLR_END the type of log record which was undone
    (INSERT/UPDATE/DELETE); needed for Recovery to know if/how it has
    to update state.records if it sees this CLR_END in the REDO phase.
    - when writing the CLR_END in _ma_apply_undo_row_insert(),
    the place to store file's id is log_data+LSN_STORE_SIZE.
    - in _ma_apply_undo_row_insert(), the records-- is moved
    to a hook when writing the CLR_END (this way it is under log's mutex
    which is needed for "recovery of the state")

  storage/maria/ma_loghandler.c@1.41, 2007-09-06 16:04:32+02:00, guilhem@gbichot4.local +60 -6
    - all UNDOs, and CLR_END, start with the LSN of another UNDO; so
    we can declare them "compressed".
    - write_hook_for_clr_end() to set trn->undo_lsn (to the previous
    UNDO's LSN) under log's lock (like UNDOs set trn->undo_lsn under log's
    lock), and also update, if appropriate, state.records.
    - reset share->id to 0 when deassigning; not useful for now but
    sounds logical.

  storage/maria/ma_recovery.c@1.18, 2007-09-06 16:04:32+02:00, guilhem@gbichot4.local +91 -44
    - if no table is found for a REDO, it's not an error; for an UNDO, it is
    - in the REDO phase, when we see a CLR_END we must update trn->undo_lsn
    and sometimes state.records.
    - in the UNDO phase, when we execute an UNDO_ROW_INSERT:
      * update trn->undo_lsn only after executing the record
      * store the _previous_ undo_lsn into the CLR_END
    - at the end of the REDO phase, when we recreate TRN objects, they
    have already their long id in the log (either via a
    LOGREC_LONG_TRANSACTION_ID, or in a checkpoint record), don't write
    a new, useless LOGREC_LONG_TRANSACTION_ID for them.

  storage/maria/ma_test1.c@1.18, 2007-09-06 16:04:32+02:00, guilhem@gbichot4.local +60 -30
    * where to stop execution is now driven by --testflag and not --test-undo
    (ma_test2 already has --testflag for the same purpose). This allows
    us to do a clean stop (with commit) at any point.
    * --test-undo=# tells how to abort (flush all pages (which implies
    flushing log) or only log or nothing); all such "ways of crashing"
    are tested in ma_test_recovery

  storage/maria/ma_test_recovery@1.7, 2007-09-06 16:04:32+02:00, guilhem@gbichot4.local +173 -30
    * Testing execution of UNDOs, with and without BLOBs.
    * Testing idempotency of REDOs.
    * See @todo for a probable bug with BLOBs.
    * maria_chk -rq instead of -r, as with -q it nicely stops on any
    problem in the data file (like the checksum bug see comment of
    ma_blockrec.c).
    * Testing if log was written by UNDO phase (often expected),
    not written by REDO phase (always expected).
    * Less output on the screen, compares with expected output in the end.
    * some shell thingies like "set --" and $# are courtesy of
    Danny and Pekka.

  storage/maria/maria_read_log.c@1.16, 2007-09-06 16:04:33+02:00, guilhem@gbichot4.local +2 -1
    when only displaying the records, don't do an UNDO phase

  storage/maria/ma_test_recovery.expected@1.1, 2007-09-06 16:04:33+02:00, guilhem@gbichot4.local +675 -0
    This is the expected output of a great part of ma_test_recovery.
    ma_test_recovery compares its output to the expected output
    and tells if different.
    If we look at this file it mentions differences in checksum
    (normal, it's not recovered yet) and in records count
    (getting a correct records' count when recovery starts on an
    already existing table, like when testing rollback,
    is coded but not yet pushed).

  storage/maria/ma_test_recovery.expected@1.0, 2007-09-06 16:04:33+02:00, guilhem@gbichot4.local +0 -0

ChangeSet@1.2476.345.44, 2007-09-06 15:57:36+04:00, dlenev@mockturtle.local +1 -0
  Make events.test more robust against timing issues.

  mysql-test/t/events.test@1.53, 2007-09-06 15:57:32+04:00, dlenev@mockturtle.local +2 -1
    Wait until event scheduler thread reaches exactly the same state
    which later appears in the results of select from processlist.

ChangeSet@1.1810.3321.1, 2007-09-05 16:30:38-05:00, rburnett@xp64. +3 -0
  Adding batch files for building with nmake make files

  libmysql/libmysql.c@1.233.21.1, 2007-09-05 16:25:25-05:00, 'rburnett'@xp64. +0 -1
    remove the duplicate call to DBUG_ENTER

  win/build-nmake-x64.bat@1.1, 2007-09-05 16:30:31-05:00, rburnett@xp64. +21 -0
    New BitKeeper file ``win/build-nmake-x64.bat''

  win/build-nmake-x64.bat@1.0, 2007-09-05 16:30:31-05:00, rburnett@xp64. +0 -0

  win/build-nmake.bat@1.1, 2007-09-05 16:30:32-05:00, rburnett@xp64. +21 -0
    New BitKeeper file ``win/build-nmake.bat''

  win/build-nmake.bat@1.0, 2007-09-05 16:30:32-05:00, rburnett@xp64. +0 -0

ChangeSet@1.1810.3261.2, 2007-09-05 15:06:10-04:00, dkatz@damien-katzs-computer.local +5 -0
  Bug #29804  UDF parameters don't contain correct string length
    
  Previously, UDF *_init functions were passed constant strings with erroneous lengths.
  The length came from the containing variable's size, not the length of the value itself.
    
  Now the *_init functions get the constant as a null terminated string with the correct
  length supplied too.

  mysql-test/r/udf.result@1.3.1.11, 2007-09-05 15:06:06-04:00, dkatz@damien-katzs-computer.local +24 -0
    Test case to check constants passed UDFs.

  mysql-test/t/udf.test@1.8.1.6, 2007-09-05 15:06:06-04:00, dkatz@damien-katzs-computer.local +36 -0
    Test case to check constants passed UDFs.

  sql/item_func.cc@1.270.82.1, 2007-09-05 15:06:06-04:00, dkatz@damien-katzs-computer.local +2 -1
    UDF _init functions are now passed the length of the constants, rather than the max
    length of the var containing the constant.

  sql/udf_example.c@1.29.1.7, 2007-09-05 15:06:07-04:00, dkatz@damien-katzs-computer.local +35 -0
    Added check_const_len functions. The check_const_len_init functions checks that the
    lengths of constants are correctly passed.

  sql/udf_example.def@1.3.1.1, 2007-09-05 15:06:07-04:00, dkatz@damien-katzs-computer.local +2 -0
    Add new example functions to windows dll export list.

ChangeSet@1.2476.420.1, 2007-09-05 12:14:43-06:00, malff@omega.weblab +2 -0
  Test events_logs_tests cleanup
  Fixed test failure under heavy load, in case truncate table is slow.

  mysql-test/r/events_logs_tests.result@1.15.1.5, 2007-09-05 12:13:17-06:00, malff@omega.weblab +4 -2
    Fixed test failure under heavy load, in case truncate table is slow.

  mysql-test/t/events_logs_tests.test@1.15.1.6, 2007-09-05 12:13:17-06:00, malff@omega.weblab +4 -2
    Fixed test failure under heavy load, in case truncate table is slow.

ChangeSet@1.2476.345.41, 2007-09-05 15:03:02-03:00, davi@moksha.local +4 -0
  The test case for Bug#29936 doesn't work with the embedded version,
  the first query is not running while we are doing wait queries on
  a second connection.

  mysql-test/r/sp.result@1.292, 2007-09-05 15:02:59-03:00, davi@moksha.local +0 -23
    Remove test case result for Bug#29936, moving to sp_notembedded.result

  mysql-test/r/sp_notembedded.result@1.9, 2007-09-05 15:02:59-03:00, davi@moksha.local +23 -0
    Test case result for Bug#29936, moved from sp.result

  mysql-test/t/sp.test@1.256, 2007-09-05 15:02:59-03:00, davi@moksha.local +0 -65
    Remove test case for Bug#29936, moving to sp_notembedded.test

  mysql-test/t/sp_notembedded.test@1.9, 2007-09-05 15:02:59-03:00, davi@moksha.local +65 -0
    Test case result for Bug#29936, moved from sp.test

ChangeSet@1.2476.414.8, 2007-09-05 19:39:13+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  change printout to be a warning

  sql/ha_ndbcluster.cc@1.461.8.4, 2007-09-05 19:39:11+02:00, tomas@whalegate.ndb.mysql.com +3 -3
    change printout to be a warning

ChangeSet@1.2476.414.7, 2007-09-05 19:13:36+02:00, tomas@whalegate.ndb.mysql.com +9 -0
  moving these tests to suite ndb_team

  mysql-test/suite/ndb/t/disabled.def@1.5, 2007-09-05 19:13:33+02:00, tomas@whalegate.ndb.mysql.com +0 -4
    moving these tests to suite ndb_team

  mysql-test/suite/ndb_team/r/ndb_autodiscover.result@1.34, 2007-09-05 19:04:13+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/ndb/r/ndb_autodiscover.result -> mysql-test/suite/ndb_team/r/ndb_autodiscover.result

  mysql-test/suite/ndb_team/r/ndb_autodiscover2.result@1.7, 2007-09-05 19:04:13+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/ndb/r/ndb_autodiscover2.result -> mysql-test/suite/ndb_team/r/ndb_autodiscover2.result

  mysql-test/suite/ndb_team/r/ndb_autodiscover3.result@1.7, 2007-09-05 19:04:13+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/ndb/r/ndb_autodiscover3.result -> mysql-test/suite/ndb_team/r/ndb_autodiscover3.result

  mysql-test/suite/ndb_team/t/disabled.def@1.1, 2007-09-05 19:13:00+02:00, tomas@whalegate.ndb.mysql.com +17 -0
    BitKeeper file /home/tomas/mysql-5.1-new-ndb/mysql-test/suite/ndb_team/t/disabled.def

  mysql-test/suite/ndb_team/t/disabled.def@1.0, 2007-09-05 19:13:00+02:00, tomas@whalegate.ndb.mysql.com +0 -0

  mysql-test/suite/ndb_team/t/ndb_autodiscover.test@1.30, 2007-09-05 19:03:58+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/ndb/t/ndb_autodiscover.test -> mysql-test/suite/ndb_team/t/ndb_autodiscover.test

  mysql-test/suite/ndb_team/t/ndb_autodiscover2-master.opt@1.3, 2007-09-05 19:03:57+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/ndb/t/ndb_autodiscover2-master.opt -> mysql-test/suite/ndb_team/t/ndb_autodiscover2-master.opt

  mysql-test/suite/ndb_team/t/ndb_autodiscover2.test@1.14, 2007-09-05 19:03:57+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/ndb/t/ndb_autodiscover2.test -> mysql-test/suite/ndb_team/t/ndb_autodiscover2.test

  mysql-test/suite/ndb_team/t/ndb_autodiscover3.test@1.18, 2007-09-05 19:03:58+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/ndb/t/ndb_autodiscover3.test -> mysql-test/suite/ndb_team/t/ndb_autodiscover3.test

ChangeSet@1.2476.414.6, 2007-09-05 18:44:47+02:00, tomas@whalegate.ndb.mysql.com +18 -0
  tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test@1.18, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test@1.9, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test@1.6, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test@1.6, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test@1.10, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test@1.10, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test@1.8, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test@1.7, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test@1.9, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test@1.7, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test@1.8, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test@1.8, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test@1.7, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test@1.7, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test@1.6, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test@1.6, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test@1.7, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test@1.6, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

ChangeSet@1.2476.414.5, 2007-09-05 18:02:46+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  correct include file

  mysql-test/include/ndb_master-slave.inc@1.4, 2007-09-05 18:02:44+02:00, tomas@whalegate.ndb.mysql.com +3 -0
    correct include file

ChangeSet@1.2476.414.4, 2007-09-05 17:31:26+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  correct include file

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test@1.2, 2007-09-05 17:31:23+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    correct include file

ChangeSet@1.2476.384.7, 2007-09-05 13:01:30+00:00, lzhou@dev3-63.(none) +16 -0
  BUG#27543 Backup and restore can compatible with different endians for blob attribute

  mysql-test/Makefile.am@1.115, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +8 -0
    Add install data for new test case

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.1.Data@1.1, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +959 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.1.Data@1.0, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.2.Data@1.1, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +674 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.2.Data@1.0, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.ctl@1.1, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +756 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.ctl@1.0, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.log@1.1, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +2 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.log@1.0, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.ctl@1.1, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +756 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.ctl@1.0, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.log@1.1, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +2 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.log@1.0, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.1.Data@1.1, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +530 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.1.Data@1.0, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.2.Data@1.1, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +1103 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.2.Data@1.0, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.ctl@1.1, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +756 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.ctl@1.0, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.log@1.1, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +2 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.log@1.0, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.ctl@1.1, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +756 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.ctl@1.0, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.log@1.1, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +2 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.log@1.0, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result@1.1, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +200 -0
    test result for endian test

  mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result@1.0, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/suite/ndb/t/ndb_restore_different_endian_data.test@1.1, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +185 -0
    test case for endian test

  mysql-test/suite/ndb/t/ndb_restore_different_endian_data.test@1.0, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +0 -0

  storage/ndb/tools/restore/Restore.cpp@1.51.1.4, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +14 -0
    Convert blob(text) length stored in main table

ChangeSet@1.2476.414.3, 2007-09-05 11:43:42+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  getting rid of flush altogether, fix with post_epoch hendeling and/or changes in Rows_log_event
  - problem is the database name accessed in Rows_log_event write... get_db() which is a pointer to the share string...
  - point to table map instead?
  - or copy it?
  - or make sure that anything interacting with the share happens _after_ the epoch
  
  Problem with flush is that STMT_END_F may not be included as it shoudld...

  sql/ha_ndbcluster_binlog.cc@1.130, 2007-09-05 11:43:39+02:00, tomas@whalegate.ndb.mysql.com +0 -5
    getting rid of flush altogether, fix with post_epoch hendeling and/or changes in Rows_log_event
    - problem is the database name accessed in Rows_log_event write... get_db() which is a pointer to the share string...
    - point to table map instead?
    - or copy it?
    - or make sure that anything interacting with the share happens _after_ the epoch
    
    Problem with flush is that STMT_END_F may not be included as it shoudld...

ChangeSet@1.1810.3318.3, 2007-09-05 09:30:50+02:00, joerg@trift2. +1 -0
  libmysql/libmysql.c  :    Correct a wrong automerge: Don't duplicate "DBUG_ENTER()".

  libmysql/libmysql.c@1.233.5.22, 2007-09-05 09:30:47+02:00, joerg@trift2. +0 -1
    Correct a wrong automerge: Don't duplicate "DBUG_ENTER()".

ChangeSet@1.2476.414.2, 2007-09-05 09:22:58+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  this flush with flag TRUE causes spurious errors in the binlog... as it will insert a STMT_END_F... and hence an invalid binlog (missing table mappings)

  sql/ha_ndbcluster_binlog.cc@1.129, 2007-09-05 09:22:56+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    this flush with flag TRUE causes spurious errors in the binlog... as it will insert a STMT_END_F... and hence an invalid binlog (missing table mappings)

ChangeSet@1.2476.417.1, 2007-09-05 11:35:29+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #29938.
  mysqldump --skip-events --all-databases dumped data of the mysqld.event table,
  and during the restoration from this dump events were created in spite
  of the --skip-events option.
  
  The mysqldump client has been modified to ignore mysql.event table data
  in case of --skip-events options.

  client/mysqldump.c@1.268.23.2, 2007-09-05 11:35:01+05:00, gshchepa@gleb.loc +12 -0
    Fixed bug #29938.
    The dump_table function has been modified to skip dumping of
    the mysql.event table data in case of the --skip-event mysqldump
    client option.

  mysql-test/r/mysqldump.result@1.159.1.1, 2007-09-05 11:35:15+05:00, gshchepa@gleb.loc +13 -0
    Updated test case for bug #29938.

  mysql-test/t/mysqldump.test@1.148.1.1, 2007-09-05 11:35:13+05:00, gshchepa@gleb.loc +16 -0
    Updated test case for bug #29938.

ChangeSet@1.2476.416.1, 2007-09-04 20:03:12-07:00, brian@zim.(none) +1 -0
  Discovered a bug while working with backup. Since it is possible to execute a statement in a pre/post statment clause that can return a result, we need to test for that and free it. 

  client/mysqlslap.c@1.62, 2007-09-04 20:03:09-07:00, brian@zim.(none) +6 -0
    Cleanup resuls if rows are returned.

ChangeSet@1.2476.415.1, 2007-09-05 02:57:53+03:00, monty@mysql.com +8 -0
  Added undo of deleted row
  Added part of undo of update row
  Extended ma_test1 for recovery testing
  Some bug fixes

  storage/maria/ha_maria.cc@1.41, 2007-09-05 02:57:20+03:00, monty@mysql.com +3 -1
    Ignore 'state.split' in case of block records

  storage/maria/ma_bitmap.c@1.19, 2007-09-05 02:57:20+03:00, monty@mysql.com +5 -0
    Added return value for _ma_bitmap_find_place() for how much data we should put on head page

  storage/maria/ma_blockrec.c@1.40, 2007-09-05 02:57:51+03:00, monty@mysql.com +405 -100
    Added undo of deleted row.
    - Added logging of CLR_END records in write_block_record()
    - Split ma_write_init_block_record() to two functions to get better code reuse
    - Added _ma_apply_undo_row_delete()
    - Added ma_get_length()
    
    Added 'empty' prototype for undo_row_update()
    
    Fixed bug when moving data withing a head/tail page.
    Fixed bug when reading a page with bigger LSN but of different type than was expected.
    Store undo_lsn first in CLR_END record
    
    Simplified some code by adding local variables.
    Changed log format for UNDO_ROW_DELETE to store total length of used blobs

  storage/maria/ma_blockrec.h@1.13, 2007-09-05 02:57:51+03:00, monty@mysql.com +4 -0
    Added prototypes for undo code.

  storage/maria/ma_pagecache.c@1.41, 2007-09-05 02:57:51+03:00, monty@mysql.com +3 -1
    Allow plain page to change to LSN page (needed in recovery to apply UNDO)

  storage/maria/ma_recovery.c@1.17, 2007-09-05 02:57:51+03:00, monty@mysql.com +86 -0
    Added undo handling of UNDO_ROW_DELETE and UNDO_ROW_UPDATE

  storage/maria/ma_test1.c@1.17, 2007-09-05 02:57:51+03:00, monty@mysql.com +32 -7
    Extended --test-undo option to allow us to die after insert or after delete.
    Fixed bug in printing key values when using -v

  storage/maria/maria_def.h@1.33, 2007-09-05 02:57:51+03:00, monty@mysql.com +5 -3
    Moved some variables around to be getter alignment
    Added length_buff buffer to be used during undo handling

ChangeSet@1.1810.3319.2, 2007-09-04 16:40:27-06:00, malff@weblab.(none) +1 -0
  Fixed whitespace

  sql/sql_trigger.cc@1.35.1.35, 2007-09-04 16:40:25-06:00, malff@weblab.(none) +1 -1
    Fixed whitespace

ChangeSet@1.2476.197.42, 2007-09-04 22:52:32+03:00, bell@desktop.sanja.is.com.ua +10 -0
  Check of transaction log descriptor table consistance added.
  Small fixes made.

  storage/maria/ma_loghandler.c@1.40, 2007-09-04 22:52:30+03:00, bell@desktop.sanja.is.com.ua +94 -2
    Check of transaction log descriptor table consistance added.\
    Incorrect record description fixed.
    Compiler warning fixed.

  storage/maria/ma_loghandler.h@1.22, 2007-09-04 22:52:30+03:00, bell@desktop.sanja.is.com.ua +1 -1
    fixed ident.

  storage/maria/unittest/ma_test_loghandler-t.c@1.16, 2007-09-04 22:52:30+03:00, bell@desktop.sanja.is.com.ua +2 -0
    Suppressing of automatic record writing

  storage/maria/unittest/ma_test_loghandler_first_lsn-t.c@1.3, 2007-09-04 22:52:30+03:00, bell@desktop.sanja.is.com.ua +2 -0
    Suppressing of automatic record writing

  storage/maria/unittest/ma_test_loghandler_max_lsn-t.c@1.3, 2007-09-04 22:52:30+03:00, bell@desktop.sanja.is.com.ua +2 -0
    Suppressing of automatic record writing

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.15, 2007-09-04 22:52:30+03:00, bell@desktop.sanja.is.com.ua +2 -0
    Suppressing of automatic record writing

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.15, 2007-09-04 22:52:30+03:00, bell@desktop.sanja.is.com.ua +2 -0
    Suppressing of automatic record writing

  storage/maria/unittest/ma_test_loghandler_noflush-t.c@1.3, 2007-09-04 22:52:30+03:00, bell@desktop.sanja.is.com.ua +2 -1
    Suppressing of automatic record writing

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.14, 2007-09-04 22:52:30+03:00, bell@desktop.sanja.is.com.ua +2 -0
    Suppressing of automatic record writing

  storage/maria/unittest/ma_test_loghandler_purge-t.c@1.2, 2007-09-04 22:52:30+03:00, bell@desktop.sanja.is.com.ua +2 -0
    Suppressing of automatic record writing

ChangeSet@1.2476.183.41, 2007-09-04 15:24:04+02:00, rafal@quant.(none) +1 -0
  Disabling rpl_ndb_2other test.

  mysql-test/suite/rpl_ndb/t/disabled.def@1.6.1.1, 2007-09-04 15:24:01+02:00, rafal@quant.(none) +1 -0
    The rpl_ndb_2other test must be disabled until replication correctly
    handles endianess issues.

ChangeSet@1.2476.412.1, 2007-09-04 10:53:52+03:00, monty@mysql.com +8 -0
  Added UNDO handling of insert during recovery

  storage/maria/ma_blockrec.c@1.39, 2007-09-04 10:53:49+03:00, monty@mysql.com +180 -7
    Added UNDO handling of insert during recovery
    To do this, I also had to add write locking of tail pages during undo phase (As we need to access the same page twice if extents are split over two pages)
    Another way to handle the undo of insert would be to store the extent information as part of the UNDO_INSERT block.

  storage/maria/ma_blockrec.h@1.12, 2007-09-04 10:53:49+03:00, monty@mysql.com +2 -0
    Added new prototype

  storage/maria/ma_loghandler.c@1.39, 2007-09-04 10:53:49+03:00, monty@mysql.com +1 -3
    Changed type of CLR_END (to avoid crash in log handler)
    Removed not used variable

  storage/maria/ma_loghandler.h@1.21, 2007-09-04 10:53:49+03:00, monty@mysql.com +3 -3
    Added TRN argument to record_execute_in_undo_phase()

  storage/maria/ma_pagecache.c@1.37.1.1, 2007-09-04 10:53:49+03:00, monty@mysql.com +1 -0
    Hack for undo phase of recovery.  During REDO we work with PLAIN pages, but UNDO works with LSN pages, which caused an abort when trying to access a cached page.

  storage/maria/ma_recovery.c@1.16, 2007-09-04 10:53:49+03:00, monty@mysql.com +113 -65
    Added execution of UNDO_ROW_INSERT

  storage/maria/ma_test1.c@1.16, 2007-09-04 10:53:49+03:00, monty@mysql.com +36 -1
    Added option --test-undo for testing recovery with undo

  storage/maria/maria_read_log.c@1.15, 2007-09-04 10:53:49+03:00, monty@mysql.com +1 -2
    Added processing of undos

ChangeSet@1.2476.197.40, 2007-09-04 08:38:52+03:00, bell@desktop.sanja.is.com.ua +1 -0
  Spelling of comments fixed.

  storage/maria/ma_pagecache.c@1.39, 2007-09-04 08:38:50+03:00, bell@desktop.sanja.is.com.ua +4 -4
    Spelling of comments fixed.

ChangeSet@1.2476.197.39, 2007-09-03 16:55:46+03:00, bell@desktop.sanja.is.com.ua +1 -0
  fixed possible problem with multiply write locking (write counter added).

  storage/maria/ma_pagecache.c@1.38, 2007-09-03 16:55:44+03:00, bell@desktop.sanja.is.com.ua +18 -18
    fixed possible problem with multiply write locking (write counter added).

ChangeSet@1.1810.3315.2, 2007-09-03 13:42:32+02:00, thek@adventure.(none) +1 -0
  - Fix cross compatibility issues by exchanging pthread_yield with my_sleep(0)

  sql/sql_cache.cc@1.76.14.2, 2007-09-03 13:42:30+02:00, thek@adventure.(none) +1 -1
    - Fix cross compatibility issues by exchanging pthread_yield with my_sleep(0) 

ChangeSet@1.2476.411.2, 2007-09-03 15:13:34+04:00, anozdrin@station. +2 -0
  Rewrite test case for BUG 25843 to avoid SHOW BINLOG EVENTS
  statement.

  mysql-test/suite/rpl/r/rpl_ps.result@1.6, 2007-09-03 15:13:32+04:00, anozdrin@station. +25 -14
    Update result file.

  mysql-test/suite/rpl/t/rpl_ps.test@1.7, 2007-09-03 15:13:32+04:00, anozdrin@station. +37 -10
    Rewrite test case for BUG 25843 to avoid SHOW BINLOG EVENTS
    statement.

ChangeSet@1.2476.411.1, 2007-09-03 15:12:28+04:00, anozdrin@station. +1 -0
  Make mysql compilable on gcc-4.2.1.
  
  c++config.h now has the following code:
  // For example, <windows.h> is known to #define min and max as macros...
  #undef min
  #undef max
  
  So, our defines in my_global.h are undefined when <new> header
  is included.
  
  Move definitions of min()/max() to the end of my_global.h.

  include/my_global.h@1.138.20.1, 2007-09-03 15:12:25+04:00, anozdrin@station. +6 -6
    Make mysql compilable on gcc-4.2.1.
    
    c++config.h now has the following code:
    // For example, <windows.h> is known to #define min and max as macros...
    #undef min
    #undef max
    
    So, our defines in my_global.h are undefined when <new> header
    is included.
    
    Move definitions of min()/max() to the end of my_global.h.

ChangeSet@1.1810.3317.1, 2007-09-03 11:55:35+02:00, mhansson@linux-st28.site +3 -0
  Bug #30234: Unexpected behavior using DELETE with AS and USING
    
  DELETE FROM ... USING ... statements with the following type of 
  ambiguous aliasing gave unexpected results:
  DELETE FROM t1 AS alias USING t1, t2 AS alias WHERE t1.a = alias.a;
  This query would leave table t1 intact but delete rows from t2.
  Fixed by changing DELETE FROM ... USING syntax so that only alias 
  references (as opposed to alias declarations) may be used in FROM.

  mysql-test/r/delete.result@1.29, 2007-09-03 11:55:33+02:00, mhansson@linux-st28.site +37 -0
    Bug#30234: Test Result

  mysql-test/t/delete.test@1.27, 2007-09-03 11:55:33+02:00, mhansson@linux-st28.site +44 -0
    Bug#30234: Test Case

  sql/sql_yacc.yy@1.371.130.1, 2007-09-03 11:55:33+02:00, mhansson@linux-st28.site +17 -2
    Bug#30234:
    - Added parser rule table_alias_ref_list that contains a list of table 
      aliases only.
    - Added parser rule table_alias_ref that sets the TL_OPTION_ALIAS in 
      order to turn off semantic checking that applies only for table names.

ChangeSet@1.2476.399.8, 2007-09-03 11:32:48+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - merge error code
    forgot to update next TC no

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.45, 2007-09-03 11:32:46+02:00, jonas@perch.ndb.mysql.com +1 -1
    ndb - merge error code
      forgot to update next TC no

ChangeSet@1.2476.399.7, 2007-09-03 11:29:58+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - merge error code(s)

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.44, 2007-09-03 11:29:55+02:00, jonas@perch.ndb.mysql.com +1 -1
    merge error code(s)

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.152, 2007-09-03 11:29:55+02:00, jonas@perch.ndb.mysql.com +1 -1
    merge error code(s)

  storage/ndb/test/ndbapi/testIndex.cpp@1.24, 2007-09-03 11:29:55+02:00, jonas@perch.ndb.mysql.com +1 -1
    merge error code(s)

ChangeSet@1.2476.403.2, 2007-09-03 12:05:17+03:00, monty@mysql.com +21 -0
  Fixed several bugs found by running *.test with maria engine
  Renamed HA_EXTRA_PREAPRE_FOR_DELETE to HA_EXTRA_PERPARE_FOR_DROP
  Added HA_EXTRA_PREPARE_FOR_RENAME (as we in the code before used HA_EXTRA_PREPARE_FOR_DELETE also for renames which confused things)
  Allow multiple write locks for same page by same file handle
  Don't write table state if table is not changed

  include/my_base.h@1.98, 2007-09-03 12:05:12+03:00, monty@mysql.com +4 -2
    Renamed HA_EXTRA_PREAPRE_FOR_DELETE to HA_EXTRA_PERPARE_FOR_DROP
    Added HA_EXTRA_PREPARE_FOR_RENAME (as we in the code before used HA_EXTRA_PREPARE_FOR_DELETE also for renames which confused things)

  mysql-test/r/maria.result@1.16, 2007-09-03 12:05:12+03:00, monty@mysql.com +73 -1
    More tests of things that failed in other tests

  mysql-test/t/maria.test@1.18, 2007-09-03 12:05:12+03:00, monty@mysql.com +89 -1
    More tests of things that failed in other tests

  sql/ha_partition.cc@1.92.3.1, 2007-09-03 12:05:12+03:00, monty@mysql.com +12 -8
    HA_EXTRA_PREPARE_FOR_DELETE -> HA_EXTRA_PREPARE_FOR_DROP
    Use HA_EXTRA_PREPARE_FOR_RENAME for renames

  sql/ha_partition.h@1.38.2.1, 2007-09-03 12:05:12+03:00, monty@mysql.com +1 -1
    HA_EXTRA_PREPARE_FOR_DELETE -> HA_EXTRA_PREPARE_FOR_DROP
    Use HA_EXTRA_PREPARE_FOR_RENAME for renames

  sql/lock.cc@1.106.5.2, 2007-09-03 12:05:12+03:00, monty@mysql.com +2 -2
    Fixed comment

  sql/sql_table.cc@1.440, 2007-09-03 12:05:12+03:00, monty@mysql.com +4 -3
    Fixed wrong usage of HA_EXTRA_PREAPRE_FOR_DELETE

  storage/maria/ha_maria.cc@1.40, 2007-09-03 12:05:13+03:00, monty@mysql.com +7 -7
    Added missing _ma_renable_logging_for_table()  (When using with ALTER TABLE + repair index)
    Enabled fast generation of index
    

  storage/maria/ma_bitmap.c@1.18, 2007-09-03 12:05:13+03:00, monty@mysql.com +14 -6
    Fixed bug when resetting full pages when page was a tail page

  storage/maria/ma_blockrec.c@1.38, 2007-09-03 12:05:13+03:00, monty@mysql.com +66 -30
    Fixed several bugs found by running *.test with maria engine:
    During update we keep old changed pages locked with a write lock to be able to reuse them.
    - Fixed bug with allocated but not used tail part
    - Fixed bug with blob that only had tail part
    - Fixed bug when update reused a page (needed multiple write locks for same page)
    - Fixed bug when first extent was a tail block

  storage/maria/ma_check.c@1.37, 2007-09-03 12:05:13+03:00, monty@mysql.com +6 -1
    Better error message when bitmap is destroyed

  storage/maria/ma_close.c@1.18, 2007-09-03 12:05:13+03:00, monty@mysql.com +2 -1
    Only write status if file was changed.
    Fixed bug when maria_chk -e file_name changed the file.

  storage/maria/ma_dynrec.c@1.16, 2007-09-03 12:05:13+03:00, monty@mysql.com +1 -1
    Removed not used argument to _ma_state_info_read_dsk

  storage/maria/ma_extra.c@1.15, 2007-09-03 12:05:13+03:00, monty@mysql.com +4 -3
    HA_EXTRA_PREPARE_FOR_DELETE -> HA_EXTRA_PREPARE_FOR_DROP
    Use HA_EXTRA_PREPARE_FOR_RENAME for renames
    Only ignore flushing of pages for DROP (not rename)

  storage/maria/ma_locking.c@1.12, 2007-09-03 12:05:13+03:00, monty@mysql.com +3 -3
    Removed not used argument to _ma_state_info_read_dsk

  storage/maria/ma_open.c@1.25, 2007-09-03 12:05:13+03:00, monty@mysql.com +2 -7
    Removed not used argument to _ma_state_info_read_dsk

  storage/maria/ma_pagecache.c@1.37, 2007-09-03 12:05:13+03:00, monty@mysql.com +34 -25
    Allow multiple write locks for same page by same file handle
    (Not yet complete, Sanja will fix)

  storage/maria/ma_recovery.c@1.15, 2007-09-03 12:05:13+03:00, monty@mysql.com +1 -1
    HA_EXTRA_PREPARE_FOR_DELETE -> HA_EXTRA_PREPARE_FOR_DROP

  storage/maria/maria_def.h@1.32, 2007-09-03 12:05:13+03:00, monty@mysql.com +1 -2
    Removed not used argument to _ma_state_info_read_dsk

  storage/myisam/mi_extra.c@1.55.1.1, 2007-09-03 12:05:13+03:00, monty@mysql.com +4 -3
    HA_EXTRA_PREPARE_FOR_DELETE -> HA_EXTRA_PREPARE_FOR_DROP
    Use HA_EXTRA_PREPARE_FOR_RENAME for renames
    Only ignore flushing of pages for DROP (not rename)

  storage/myisammrg/ha_myisammrg.cc@1.126, 2007-09-03 12:05:13+03:00, monty@mysql.com +2 -1
    HA_EXTRA_PREPARE_FOR_DELETE -> HA_EXTRA_PREPARE_FOR_DROP
    Use HA_EXTRA_PREPARE_FOR_RENAME for renames

ChangeSet@1.2476.387.2, 2007-09-03 12:57:47+04:00, kaa@polly.(none) +2 -0
  Use SIZE_T_MAX instead of ulong as a limit for key_buffer_size to allow key_bufer_size > 4G on Windows in 5.1. This is for bug #5731.

  include/my_global.h@1.138.1.38, 2007-09-03 12:57:40+04:00, kaa@polly.(none) +3 -0
    Added SIZE_T_MAX.

  sql/mysqld.cc@1.583.1.87, 2007-09-03 12:57:40+04:00, kaa@polly.(none) +1 -1
    Use SIZE_T_MAX instead of ulong as a limit for key_buffer_size to allow key_bufer_size > 4G on Windows in 5.1.

ChangeSet@1.1810.3315.1, 2007-09-03 10:47:24+02:00, thek@adventure.(none) +1 -0
  Bug #21074 Large query_cache freezes mysql server sporadically under heavy load
  
  Invaldating a subset of a sufficiently large query cache can take a long time.
  During this time the server is efficiently frozen and no other operation can
  be executed. This patch addresses this problem by setting a time limit on
  how long time a dictionary access request can take before giving up on the 
  attempt. This patch does not work for query cache invalidations issued by
  DROP, ALTER or RENAME TABLE operations.

  sql/sql_cache.cc@1.76.14.1, 2007-09-03 10:47:23+02:00, thek@adventure.(none) +30 -1
    Changed mutex locking to a timed spinn lock. If access to query cache dictionary
    takes "a long time" (currently more than 0.1 seconds) the system fall backs on
    ordinary statement execution.

ChangeSet@1.1810.3294.10, 2007-09-03 12:22:56+05:00, gluh@mysql.com +4 -0
  Bug#29408 Cannot find view in columns table if the selection contains a function
  Use view db name as thread default database, in order to ensure
  that the view is parsed and prepared correctly.

  mysql-test/r/sp.result@1.170.47.1, 2007-09-03 12:22:54+05:00, gluh@mysql.com +22 -0
    test result

  mysql-test/t/sp.test@1.174.47.1, 2007-09-03 12:22:54+05:00, gluh@mysql.com +33 -0
    test case

  sql/sql_parse.cc@1.426.138.44, 2007-09-03 12:22:54+05:00, gluh@mysql.com +1 -1
    copy thd->db_length to table_list->db_length

  sql/sql_view.cc@1.78.1.39, 2007-09-03 12:22:54+05:00, gluh@mysql.com +14 -0
    Use view db name as thread default database, in order to ensure
    that the view is parsed and prepared correctly.

ChangeSet@1.2476.399.6, 2007-09-03 08:15:59+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#30764
    When adding a read to lock queue, where there is a X-lock ahead, upgrade to X-lock
    (found by pekkas blob changes)

  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@1.87, 2007-09-03 08:15:56+02:00, jonas@perch.ndb.mysql.com +1 -0
    When adding a read to lock queue, where there is a X-lock ahead, upgrade to X-lock
    (found by pekkas blob changes)

ChangeSet@1.1616.3093.4, 2007-09-01 11:41:38+02:00, msvensson@pilot.(none) +1 -0
  Use eval around "rmtree" and use our own version of rmtree if it fails

  mysql-test/lib/mtr_misc.pl@1.5.1.10, 2007-09-01 11:41:37+02:00, msvensson@pilot.(none) +6 -13
    Use eval around "rmtree" and use our own version of rmtree if it fails

ChangeSet@1.2476.373.10, 2007-08-31 15:51:57-06:00, malff@weblab.(none) +1 -0
  Fixed timing issues in events.test

  mysql-test/t/events.test@1.52, 2007-08-31 15:51:55-06:00, malff@weblab.(none) +11 -2
    
    Wait for the select get_lock() to actually get the lock
    wait for release_lock() to actually release the lock

ChangeSet@1.2476.373.9, 2007-09-01 00:12:00+04:00, anozdrin@ibm.opbmk +1 -0
  Eliminate compile warnings.

  sql/sp.cc@1.170, 2007-09-01 00:11:58+04:00, anozdrin@ibm.opbmk +2 -1
    Eliminate compile warnings.

ChangeSet@1.2476.345.37, 2007-08-31 10:53:51-06:00, tsmith@ramayana.hindu.god +1 -0
  Correct fix for test result.

  mysql-test/r/strict.result@1.55, 2007-08-31 10:53:49-06:00, tsmith@ramayana.hindu.god +37 -0
    Correct fix for test result.

ChangeSet@1.2476.407.1, 2007-08-31 20:42:14+04:00, anozdrin@ibm.opbmk +13 -0
  Fix for BUG#25843: changing default database between PREPARE and EXECUTE
  of statement breaks binlog.
  
  There were two problems discovered by this bug:
  
    1. Default (current) database is not fixed at the creation time.
       That leads to wrong output of DATABASE() function.
  
    2. Database attributes (@@collation_database) are not fixed at
       the creation time. That leads to wrong resultset.
  
  Binlog breakage and Query Cache wrong output happened because of
  the first problem.
  
  The fix is to remember the current database at the PREPARE-time and
  set it each time at EXECUTE.

  mysql-test/include/query_cache_sql_prepare.inc@1.7, 2007-08-31 20:42:11+04:00, anozdrin@ibm.opbmk +218 -0
    The first part of the test case for BUG#25843.

  mysql-test/r/query_cache_ps_no_prot.result@1.5, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +158 -0
    Update result file.

  mysql-test/r/query_cache_ps_ps_prot.result@1.3, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +158 -0
    Update result file.

  mysql-test/suite/rpl/r/rpl_ps.result@1.5, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +39 -0
    Update result file.

  mysql-test/suite/rpl/t/rpl_ps.test@1.6, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +68 -0
    The second part of the test case for BUG#25843.

  sql/mysql_priv.h@1.523.14.2, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +7 -0
    Added mysql_opt_change_db() prototype.

  sql/sp.cc@1.164.1.3, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +42 -106
    1. Polishing;
    2. sp_use_new_db() has been removed;
    3. Use mysql_opt_change_db() instead of sp_use_new_db().

  sql/sp.h@1.41, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +0 -11
    sp_use_new_db() has been removed.
    This function has nothing to do with a) sp and b) *new* database.
    It was merely "switch the current database if needed".

  sql/sp_head.cc@1.288.3.2, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +13 -9
    1. Polishing.
    2. Use mysql_opt_change_db() instead of sp_use_new_db().

  sql/sql_class.cc@1.344.2.1, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +4 -3
    Move THD::{db, db_length} into Statement.

  sql/sql_class.h@1.395.3.2, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +38 -22
    Move THD::{db, db_length} into Statement.

  sql/sql_db.cc@1.157.1.3, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +97 -1
    Introduce mysql_opt_change_db() as a replacement (and inspired by)
    sp_use_new_db().

  sql/sql_prepare.cc@1.231, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +48 -0
    1. Remember the current database in Prepared_statement::prepare().
    2. Switch/restore the current database in Prepared_statement::execute().

ChangeSet@1.2476.399.5, 2007-08-31 16:55:59+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - autotest 
    remove more "extra mysql-"

  storage/ndb/test/run-test/autotest-run.sh@1.4, 2007-08-31 16:55:57+02:00, jonas@perch.ndb.mysql.com +2 -2
    remove more "extra mysql-"

ChangeSet@1.2476.406.1, 2007-08-31 08:49:49-06:00, malff@weblab.(none) +2 -0
  Test cleanup for events.test

  mysql-test/r/events.result@1.55, 2007-08-31 08:49:39-06:00, malff@weblab.(none) +18 -8
    Fixed all the select on information_schema.processlist to be more reliable.

  mysql-test/t/events.test@1.51, 2007-08-31 08:49:40-06:00, malff@weblab.(none) +31 -10
    Fixed all the select on information_schema.processlist to be more reliable.

ChangeSet@1.2476.399.4, 2007-08-31 16:12:51+02:00, jonas@perch.ndb.mysql.com +5 -0
  ndb autotest
   add --tag
   remove prepended mysql-
    add conf-test.cnf
    add embryo upgrade-boot.sh

  storage/ndb/test/run-test/Makefile.am@1.30, 2007-08-31 16:12:49+02:00, jonas@perch.ndb.mysql.com +1 -1
    add test test conf

  storage/ndb/test/run-test/autotest-boot.sh@1.2, 2007-08-31 16:12:49+02:00, jonas@perch.ndb.mysql.com +29 -6
    add --tag to autotest
    remove "extra" appended mysql- to all scripts

  storage/ndb/test/run-test/autotest-run.sh@1.3, 2007-08-31 16:12:49+02:00, jonas@perch.ndb.mysql.com +1 -1
    remove extra "mysql-"

  storage/ndb/test/run-test/conf-test.cnf@1.1, 2007-08-31 16:12:49+02:00, jonas@perch.ndb.mysql.com +26 -0
    New BitKeeper file ``storage/ndb/test/run-test/conf-test.cnf''

  storage/ndb/test/run-test/conf-test.cnf@1.0, 2007-08-31 16:12:49+02:00, jonas@perch.ndb.mysql.com +0 -0

  storage/ndb/test/run-test/upgrade-boot.sh@1.1, 2007-08-31 16:12:49+02:00, jonas@perch.ndb.mysql.com +218 -0
    New BitKeeper file ``storage/ndb/test/run-test/upgrade-boot.sh''

  storage/ndb/test/run-test/upgrade-boot.sh@1.0, 2007-08-31 16:12:49+02:00, jonas@perch.ndb.mysql.com +0 -0

ChangeSet@1.2476.399.3, 2007-08-31 16:09:48+02:00, jonas@perch.ndb.mysql.com +1 -0
  merge

  storage/ndb/test/ndbapi/testIndex.cpp@1.23, 2007-08-31 16:09:45+02:00, jonas@perch.ndb.mysql.com +2 -1
    merge

ChangeSet@1.1810.3314.1, 2007-08-31 16:59:07+05:00, gshchepa@gleb.loc +5 -0
  Fixed bug #30126.
  When dumping database from a 4.x server, the mysqldump client
  inserted a delimiter sign inside special commentaries of the form:
    /*!... CREATE DATABASE IF NOT EXISTS ... ;*/
  During restoration that dump file was splitten by delimiter signs on
  the client side, and the rest of some commentary strings was prepended
  to following statements.
  
  The 4x_server_emul test case option has been added for use with the
  DBUG_EXECUTE_IF debugging macro. This option affects debug server
  builds only to emulate particular behavior of a 4.x server for
  the mysqldump client testing. Non-debugging builds are not affected.

  client/mysqldump.c@1.214.1.57, 2007-08-31 16:53:54+05:00, gshchepa@gleb.loc +1 -1
    Fixed bug #30126.
    The init_dumping_tables function has been modified to output semicolon
    outside of commentaries.

  mysql-test/r/mysqldump-compat.result@1.1, 2007-08-31 16:49:46+05:00, gshchepa@gleb.loc +4 -0
    Added test case for bug #30126.

  mysql-test/r/mysqldump-compat.result@1.0, 2007-08-31 16:49:45+05:00, gshchepa@gleb.loc +0 -0

  mysql-test/t/mysqldump-compat.opt@1.1, 2007-08-31 16:49:46+05:00, gshchepa@gleb.loc +1 -0
    Added test case for bug #30126.

  mysql-test/t/mysqldump-compat.opt@1.0, 2007-08-31 16:49:46+05:00, gshchepa@gleb.loc +0 -0

  mysql-test/t/mysqldump-compat.test@1.1, 2007-08-31 16:49:46+05:00, gshchepa@gleb.loc +13 -0
    Added test case for bug #30126.

  mysql-test/t/mysqldump-compat.test@1.0, 2007-08-31 16:49:46+05:00, gshchepa@gleb.loc +0 -0

  sql/sql_parse.cc@1.426.138.43, 2007-08-31 16:53:51+05:00, gshchepa@gleb.loc +2 -0
    Fixed bug #30126.
    The mysqldump client uses the "SHOW CREATE DATABASE" query to
    obtain the "CREATE DATABASE" statement from that database.
    The 4.x server doesn't recognise that query, and mysqldump
    forms the "CREATE DATABASE" statement from scratch.
    That statement was formed incorrectly.
    
    To enforce the mysqldump client to create that statement from
    scratch, debugging code has been added to the mysql_execute_command
    function: in tcase of the --loose-debug=d,4x_server_emul option,
    the server returns parse error to client to emulate old behaviour.
    
    The 4x_server_emul test case option has been added for use with the
    DBUG_EXECUTE_IF debugging macro. This option affects debug server
    builds only to emulate particular behavior of a 4.x server for
    the mysqldump client testing. Non-debugging builds are not affected.

ChangeSet@1.2476.345.36, 2007-08-31 05:21:12-06:00, tsmith@ramayana.hindu.god +1 -0
  Correct test result file for bug #27014

  mysql-test/r/strict.result@1.54, 2007-08-31 05:21:11-06:00, tsmith@ramayana.hindu.god +15 -52
    Correct test result file for bug #27014

ChangeSet@1.2476.345.35, 2007-08-31 01:28:42-06:00, tsmith@ramayana.hindu.god +1 -0
  Fix test results for bug #27014

  mysql-test/r/date_formats.result@1.45, 2007-08-31 01:28:40-06:00, tsmith@ramayana.hindu.god +32 -32
    Fix test results for bug #27014

ChangeSet@1.2476.402.1, 2007-08-31 10:19:54+03:00, monty@mysql.com +6 -0
  Generalized the way update and redo extends the size of a directory record.

  storage/maria/ma_blockrec.c@1.35.1.1, 2007-08-31 10:19:52+03:00, monty@mysql.com +163 -81
    Generalized the way update and redo extends the size of a directory record.
    This will (for now) ensure that data files are idenitical after normal run and after a apply-log run.

  storage/maria/ma_open.c@1.22.1.1, 2007-08-31 10:19:52+03:00, monty@mysql.com +2 -0
    Disabled reservation of transid on rows (for now) as these are not yet used.
    (I had to disable this as otherwise update thougth rows had grown in size when they hadn't and we had thus different row sizes on update and redo, which caused different block information)

  storage/maria/ma_test1.c@1.15, 2007-08-31 10:19:52+03:00, monty@mysql.com +1 -1
    Added comment

  storage/maria/ma_test2.c@1.19, 2007-08-31 10:19:52+03:00, monty@mysql.com +8 -0
    Do commit on error/abort

  storage/maria/ma_test_all.sh@1.11, 2007-08-31 10:19:52+03:00, monty@mysql.com +4 -0
    Some more testing (to cover a bug that was not found in previous runs)

  storage/maria/ma_test_recovery@1.6, 2007-08-31 10:19:52+03:00, monty@mysql.com +4 -2
    More tests

ChangeSet@1.2476.388.5, 2007-08-31 09:22:15+03:00, bell@desktop.sanja.is.com.ua +1 -0
  Fixed bug in log "in progress" marking.

  storage/maria/ma_loghandler.c@1.36.1.3, 2007-08-31 09:22:12+03:00, bell@desktop.sanja.is.com.ua +3 -3
    Comments fixed.
    Fixed loop starting value.

ChangeSet@1.2476.401.2, 2007-08-31 10:19:52+04:00, kostja@bodhi.(none) +6 -0
  Never access thd->ha_data directly, use getters/setters from the plugin
  API instead.
  This is a pre-requisite of the fix for Bug 12713, which changes the
  data type of thd->ha_data from void * to struct Ha_data.

  include/mysql/plugin.h@1.41, 2007-08-31 10:19:49+04:00, kostja@bodhi.(none) +23 -0
    Provide accessors to thd->ha_data for simple and robust code.

  sql/ha_ndbcluster_binlog.h@1.25.1.1, 2007-08-31 10:19:49+04:00, kostja@bodhi.(none) +4 -2
    Use getters/setters of thd->ha_data, instead of direct access.

  sql/handler.cc@1.315.14.1, 2007-08-31 10:19:49+04:00, kostja@bodhi.(none) +2 -2
    Use a getter of thd->ha_data instead of direct access.

  sql/log.cc@1.291.2.1, 2007-08-31 10:19:49+04:00, kostja@bodhi.(none) +23 -23
    Use getters/setters of thd->ha_data, instead of direct access.

  sql/rpl_utility.h@1.12.3.1, 2007-08-31 10:19:49+04:00, kostja@bodhi.(none) +1 -1
    Fix a compilation warning (declaration order must match initialization
    order in constructor).

  storage/federated/ha_federated.cc@1.110, 2007-08-31 10:19:49+04:00, kostja@bodhi.(none) +6 -6
    Use interface accessors to thd->ha_data, instead of direct access.

ChangeSet@1.2476.345.34, 2007-08-30 23:57:39-06:00, tsmith@ramayana.hindu.god +1 -0
  Bug #27014: Imperfect error/warning message for STR_TO_DATE for invalid datetime value
  
  Fix name of function in warning message.

  sql/item_timefunc.cc@1.172, 2007-08-30 23:57:35-06:00, tsmith@ramayana.hindu.god +1 -1
    Fix error message in extract_date_time(); ("str_to_time" -> "str_to_date")

ChangeSet@1.2476.400.8, 2007-08-30 16:19:23-03:00, davi@moksha.local +2 -0
  Post-merge test case with wait_condition for Bug#28587

  mysql-test/r/insert_update.result@1.34, 2007-08-30 16:19:21-03:00, davi@moksha.local +19 -0
    Post-merge: add test case result for Bug#28587.

  mysql-test/t/insert_update.test@1.30, 2007-08-30 16:19:21-03:00, davi@moksha.local +35 -0
    Post-merge: add test case for Bug#28587.

ChangeSet@1.1810.3290.10, 2007-08-30 16:11:53-03:00, davi@moksha.local +1 -0
  Bug#28587 SELECT is blocked by INSERT waiting on read lock, even with low_priority_updates
  
  The problem is that a SELECT on one thread is blocked by INSERT ... ON
  DUPLICATE KEY UPDATE on another thread even when low_priority_updates is
  activated.
  
  The solution is to possibly downgrade the lock type to the setting of
  low_priority_updates if the INSERT cannot be concurrent.

  sql/sql_insert.cc@1.146.69.1, 2007-08-30 16:11:50-03:00, davi@moksha.local +1 -1
    Possibly downgrade lock type to the the setting of low_priority_updates if
    if the INSERT cannot be concurrent.

ChangeSet@1.2476.400.5, 2007-08-30 12:57:05-06:00, malff@weblab.(none) +3 -0
  Bug#28779 (mysql_query() allows execution of statements with unbalanced
  comments)
  
  This change set is for 5.1 (manually merged)
  
  Before this fix, the server would accept queries that contained comments,
  even when the comments were not properly closed with a '*' '/' marker.
  
  For example,
    select 1 /* + 2 <EOF>
  would be accepted as
    select 1 /* + 2 */ <EOF>
  and executed as
    select 1
  
  With this fix, the server now rejects queries with unclosed comments
  as syntax errors.
  Both regular comments ('/' '*') and special comments ('/' '*' '!') must be
  closed with '*' '/' to be parsed correctly.

  mysql-test/r/comments.result@1.9, 2007-08-30 12:57:00-06:00, malff@weblab.(none) +15 -0
    Unbalanced comments are a syntax error.

  mysql-test/t/comments.test@1.9, 2007-08-30 12:57:00-06:00, malff@weblab.(none) +31 -0
    Unbalanced comments are a syntax error.

  sql/sql_lex.cc@1.255.3.5, 2007-08-30 12:57:00-06:00, malff@weblab.(none) +35 -8
    Unbalanced comments are a syntax error.

ChangeSet@1.2476.401.1, 2007-08-30 21:19:05+04:00, kostja@bodhi.(none) +1 -0
  Add -Wno-unused to --warning-mode=pedantic, otherwise sql/ compilation
  generated so many warnings that the mode was unusable.

  BUILD/SETUP.sh@1.60.1.17, 2007-08-30 21:19:00+04:00, kostja@bodhi.(none) +1 -1
    Add -Wno-unused to --warning-mode=pedantic, otherwise sql/ compilation
    generated so many warnings that the mode was unusable.

ChangeSet@1.2476.400.3, 2007-08-30 20:06:19+04:00, anozdrin@ibm.opbmk +3 -0
  Cleanup-patch for BUG#25843: changing default database between
  PREPARE and EXECUTE of statement breaks binlog.

  sql/sp.cc@1.164.1.2, 2007-08-30 20:06:17+04:00, anozdrin@ibm.opbmk +32 -25
    - Polishing sp_use_new_db():
      - renamed no_access_check to force_switch to be more adequate;
      - fixed comment;

  sql/sql_class.h@1.395.3.1, 2007-08-30 20:06:17+04:00, anozdrin@ibm.opbmk +34 -5
    Polishing: fixed comment.

  sql/sql_db.cc@1.157.1.2, 2007-08-30 20:06:17+04:00, anozdrin@ibm.opbmk +65 -22
    1. Use mysql_change_db_impl() to reset current database instead of
    THD::set_db() in mysql_rm_db(). THD::set_db() does not take care of
    THD::db_access and database attributes (@@collation_database).
    2. Polishing: add, fix comments.

ChangeSet@1.1810.3312.2, 2007-08-30 17:21:43+04:00, kaa@polly.(none) +1 -0
  Use double quotes instead of single ones which make the test fail on Windows. This is for bug #30164.

  mysql-test/t/mysql.test@1.4.13.2, 2007-08-30 17:21:40+04:00, kaa@polly.(none) +1 -1
    Use double quotes instead of single ones which make the test fail on Windows.

ChangeSet@1.2476.399.2, 2007-08-30 11:46:30+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  Bug#20872 master*.err: miscellaneous error messages

  sql/ha_ndbcluster.cc@1.461.8.3, 2007-08-30 11:46:27+02:00, tomas@whalegate.ndb.mysql.com +9 -1
    Bug#20872 master*.err: miscellaneous error messages
    - only allocate share if fully successfull

  sql/ha_ndbcluster_binlog.cc@1.128, 2007-08-30 11:46:27+02:00, tomas@whalegate.ndb.mysql.com +7 -10
    Bug#20872 master*.err: miscellaneous error messages
    - only allocate share if fully successfull
    - no need to print error, my_errno is set

  sql/ha_ndbcluster_binlog.h@1.26, 2007-08-30 11:46:28+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug#20872 master*.err: miscellaneous error messages
    - only allocate share if fully successfull

ChangeSet@1.1810.3312.1, 2007-08-30 12:53:24+04:00, kaa@polly.(none) +3 -0
  Bug #30164: Using client side macro inside server side comments generates broken queries
    
  Problem:
    
  In cases when a client-side macro appears inside a server-side comment, the add_line() function in mysql.cc discarded all characters until the next delimiter to remove macro arguments from the query string. This resulted in broken queries being sent to the server when the next delimiter character appeared past the comment's boundaries, because the comment closing sequence ('*/') was discarded.
    
  Fix:
    
  If a client-side macro appears inside a server-side comment, discard all characters in the comment after the macro (that is, until the end of the comment rather than the next delimiter).
  This is a minimal fix to allow only simple cases used by the mysqlbinlog utility. Limitations that are worth documenting:
    
  - Nested server-side and/or client-side comments are not supported by mysql.cc
  - Using client-side macros in multi-line server-side comments is not supported
  - All characters after a client-side macro in a server-side comment will be omitted from the query string (and thus, will not be sent to server).

  client/mysql.cc@1.199.1.41, 2007-08-30 12:53:20+04:00, kaa@polly.(none) +37 -17
    If a client-side macro appears inside a server-side comment, discard all characters in the comment after the macro.

  mysql-test/r/mysql.result@1.17.2.13, 2007-08-30 12:53:20+04:00, kaa@polly.(none) +2 -0
    Added a test case for bug #30164.

  mysql-test/t/mysql.test@1.4.13.1, 2007-08-30 12:53:20+04:00, kaa@polly.(none) +5 -0
    Added a test case for bug #30164.

ChangeSet@1.2476.398.1, 2007-08-30 10:41:19+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  Bug#20872 master*.err: miscellaneous error messages

  sql/ha_ndbcluster.cc@1.461.8.1, 2007-08-30 10:41:16+02:00, tomas@whalegate.ndb.mysql.com +3 -0
    remove warning for table exists in mysqld error log

  sql/ha_ndbcluster_binlog.cc@1.127, 2007-08-30 10:41:16+02:00, tomas@whalegate.ndb.mysql.com +11 -4
    remove warning for table exists in mysqld error log

ChangeSet@1.2476.358.17, 2007-08-29 18:56:00-06:00, malff@weblab.(none) +2 -0
  Bug#30712 (open_performance_schema_table() cause an open table leak on
  failures)
  
  Fixed open_performance_schema_table() and close_performance_schema_table()
  implementation and callers, to always execute balanced calls to:
    thd->reset_n_backup_open_tables_state(backup);
    thd->restore_backup_open_tables_state(backup);
  

  sql/log.cc@1.291.1.2, 2007-08-29 18:55:55-06:00, malff@weblab.(none) +8 -2
    Balanced calls to reset_n_backup_open_tables_state() / restore_backup_open_tables_state()

  sql/sql_base.cc@1.421.5.1, 2007-08-29 18:55:55-06:00, malff@weblab.(none) +21 -17
    Balanced calls to reset_n_backup_open_tables_state() / restore_backup_open_tables_state()

ChangeSet@1.2476.358.16, 2007-08-29 17:27:38-06:00, malff@weblab.(none) +2 -0
  Manual merge

  mysql-test/r/sp.result@1.288.1.3, 2007-08-29 17:27:34-06:00, malff@weblab.(none) +52 -0
    Manual merge

  mysql-test/t/sp.test@1.251.1.3, 2007-08-29 17:27:34-06:00, malff@weblab.(none) +54 -0
    Manual merge

ChangeSet@1.2476.397.2, 2007-08-29 16:58:00-06:00, tsmith@sita.local +2 -0
  Post-merge fixes, and disable buggy test case on embedded

  mysql-test/t/query_cache.test@1.82, 2007-08-29 16:57:55-06:00, tsmith@sita.local +5 -0
    Disable query_cache test on embedded, due to bug 30710.

  sql/log_event_old.cc@1.9, 2007-08-29 16:57:55-06:00, tsmith@sita.local +12 -12
    Post-merge fix, change RELAY_LOG_INFO to Relay_log_info.

ChangeSet@1.2476.396.3, 2007-08-30 00:02:53+02:00, kent@mysql.com +3 -0
  libmysqld/sql_tablespace.cc
  libmysqld/scheduler.cc
  libmysqld/sql_connect.cc
    Deleted BitKeeper soft links not needed

  BitKeeper/deleted/.del-scheduler.cc@1.2, 2007-08-29 22:52:42+02:00, kent@mysql.com +0 -0
    Delete: libmysqld/scheduler.cc

  BitKeeper/deleted/.del-sql_connect.cc@1.2, 2007-08-29 22:52:42+02:00, kent@mysql.com +0 -0
    Delete: libmysqld/sql_connect.cc

  BitKeeper/deleted/.del-sql_tablespace.cc@1.2, 2007-08-29 22:52:42+02:00, kent@mysql.com +0 -0
    Delete: libmysqld/sql_tablespace.cc

ChangeSet@1.1810.3311.4, 2007-08-30 00:01:02+02:00, kent@mysql.com +4 -0
  server-tools/instance-manager/sql_state.c
  server-tools/instance-manager/pack.c
  server-tools/instance-manager/password.c
  server-tools/instance-manager/net_serv.cc
    Deleted BitKeeper soft links not needed

  BitKeeper/deleted/.del-net_serv.cc@1.1.1.1, 2007-08-29 22:52:41+02:00, kent@mysql.com +0 -0
    Delete: server-tools/instance-manager/net_serv.cc

  BitKeeper/deleted/.del-pack.c@1.1.1.1, 2007-08-29 22:52:42+02:00, kent@mysql.com +0 -0
    Delete: server-tools/instance-manager/pack.c

  BitKeeper/deleted/.del-password.c@1.1.1.1, 2007-08-29 22:52:42+02:00, kent@mysql.com +0 -0
    Delete: server-tools/instance-manager/password.c

  BitKeeper/deleted/.del-sql_state.c@1.1.1.1, 2007-08-29 22:52:42+02:00, kent@mysql.com +0 -0
    Delete: server-tools/instance-manager/sql_state.c

ChangeSet@1.2476.358.14, 2007-08-29 19:00:49-03:00, davi@moksha.local +2 -0
  Post-merge fixes for Bug#30632

  mysql-test/r/handler_innodb.result@1.19, 2007-08-29 19:00:46-03:00, davi@moksha.local +13 -0
    Post-merge: add Bug#30632 test case result

  mysql-test/r/handler_myisam.result@1.32, 2007-08-29 19:00:46-03:00, davi@moksha.local +2 -2
    Post-merge fix of error number

ChangeSet@1.1616.3094.2, 2007-08-29 23:58:15+02:00, kent@mysql.com +2 -0
  libmysql_r/client_settings.h libmysqld/ha_blackhole.cc
    Deleted BitKeeper soft links not needed

  BitKeeper/deleted/.del-client_settings.h@1.2, 2007-08-29 22:52:41+02:00, kent@mysql.com +0 -0
    Delete: libmysql_r/client_settings.h

  BitKeeper/deleted/.del-ha_blackhole.cc@1.1.4.1, 2007-08-29 22:52:41+02:00, kent@mysql.com +0 -0
    Delete: libmysqld/ha_blackhole.cc

ChangeSet@1.2476.373.3, 2007-08-29 14:36:08-07:00, brian@piggy.tangent.org +2 -0
  Added ORDER BY to udf select so that results are ordered. 

  mysql-test/include/rpl_udf.inc@1.4, 2007-08-29 14:36:06-07:00, brian@piggy.tangent.org +10 -10
    ORDER BY to force order

  mysql-test/suite/rpl/r/rpl_udf.result@1.10, 2007-08-29 14:36:06-07:00, brian@piggy.tangent.org +22 -22
    Fix for ORDER BY

ChangeSet@1.1810.3290.8, 2007-08-29 14:50:32-06:00, malff@weblab.(none) +3 -0
  Bug#28779 (mysql_query() allows execution of statements with unbalanced
  comments)
  
  Before this fix, the server would accept queries that contained comments,
  even when the comments were not properly closed with a '*' '/' marker.
  
  For example,
    select 1 /* + 2 <EOF>
  would be accepted as
    select 1 /* + 2 */ <EOF>
  and executed as
    select 1
  
  With this fix, the server now rejects queries with unclosed comments
  as syntax errors.
  Both regular comments ('/' '*') and special comments ('/' '*' '!') must be
  closed with '*' '/' to be parsed correctly.

  mysql-test/r/comments.result@1.6.1.1, 2007-08-29 14:50:29-06:00, malff@weblab.(none) +15 -0
    Unbalanced comments are a syntax error.

  mysql-test/t/comments.test@1.6.1.1, 2007-08-29 14:50:29-06:00, malff@weblab.(none) +33 -0
    Unbalanced comments are a syntax error.

  sql/sql_lex.cc@1.142.49.1, 2007-08-29 14:50:29-06:00, malff@weblab.(none) +30 -7
    Unbalanced comments are a syntax error.

ChangeSet@1.1810.3311.2, 2007-08-29 22:29:07+02:00, kent@mysql.com +2 -0
  CMakeLists.txt:
    Link with library "udf_example" depends on, needed for nmake
  libmysql.c:
    DBUG_ENTER need to be in declaration section

  libmysql/libmysql.c@1.233.20.1, 2007-08-29 22:28:09+02:00, kent@mysql.com +1 -2
    DBUG_ENTER need to be in declaration section

  sql/CMakeLists.txt@1.1.12.3, 2007-08-29 22:28:33+02:00, kent@mysql.com +1 -1
    Link with library "udf_example" depends on, needed for nmake

ChangeSet@1.1616.3094.1, 2007-08-29 22:24:11+02:00, kent@mysql.com +1 -0
  mysql_config.sh:
    Flag changed name in icc 10

  scripts/mysql_config.sh@1.23.1.3, 2007-08-29 22:24:05+02:00, kent@mysql.com +1 -1
    Flag changed name in icc 10

ChangeSet@1.2476.388.4, 2007-08-29 22:02:30+02:00, guilhem@gbichot4.local +1 -0
  WL#3072 Maria recovery
  manual merge of ma_recovery.c (too big conflict to resolve in fmtool);
  the merged Monty's code allows correct replaying of REDO_PURGE_BLOCKS
  and was originally in
  monty@mysql.com/narttu.mysql.fi|ChangeSet|20070829060310|44058

  storage/maria/ma_recovery.c@1.14, 2007-08-29 22:02:27+02:00, guilhem@gbichot4.local +54 -13
    * manually merging Monty's and Sanja's changes of the two last weeks
    to my massively modified version of this file. The merged Monty's
    code allows correct replaying of REDO_PURGE_BLOCKS and was originally
    in monty@mysql.com/narttu.mysql.fi|ChangeSet|20070829060310|44058 .
    * Setting the state to "STATE_CHANGED|etc" in Recovery is more
    logically done when we update the state in memory (for example
    records++).

ChangeSet@1.2476.358.12, 2007-08-29 16:59:38-03:00, davi@moksha.local +6 -0
  Bug#21975 Grant and revoke statements are non-transactional
  Bug#21422 GRANT/REVOKE possible inside stored function, probably in a trigger
  Bug#17244 GRANT gives strange error message when used in a stored function
  
  GRANT/REVOKE statements are non-transactional (no explicit transaction
  boundaries) in nature and hence are forbidden inside stored functions and
  triggers, but they weren't being effectively forbidden. Furthermore, the
  absence of implict commits makes changes made by GRANT/REVOKE statements to
  not be rolled back.
  
  The implemented fix is to issue a implicit commit with every GRANT/REVOKE
  statement, effectively prohibiting these statements in stored functions
  and triggers. The implicit commit also fixes the replication bug, and looks
  like being in concert with the behavior of DDL and administrative statements.
  
  Since this is a incompatible change, the following sentence should be
  added to the Manual in the very end of the 3rd paragraph, subclause
  13.4.3 "Statements That Cause an Implicit Commit": "Beginning with
  MySQL 5.0.??, the GRANT and REVOKE statements cause an implicit commit."
  
  Patch contributed by Vladimir Shebordaev

  mysql-test/r/sp-error.result@1.128, 2007-08-29 16:59:32-03:00, davi@moksha.local +12 -0
    Test case result for Bug#17244

  mysql-test/suite/rpl/r/rpl_binlog_grant.result@1.1, 2007-08-29 16:59:33-03:00, davi@moksha.local +50 -0
    Add test case result for Bug#21975

  mysql-test/suite/rpl/r/rpl_binlog_grant.result@1.0, 2007-08-29 16:59:33-03:00, davi@moksha.local +0 -0

  mysql-test/suite/rpl/t/rpl_binlog_grant.test@1.1, 2007-08-29 16:59:34-03:00, davi@moksha.local +41 -0
    Add test case for Bug#21975

  mysql-test/suite/rpl/t/rpl_binlog_grant.test@1.0, 2007-08-29 16:59:34-03:00, davi@moksha.local +0 -0

  mysql-test/t/sp-error.test@1.124, 2007-08-29 16:59:32-03:00, davi@moksha.local +15 -0
    Test case for Bug#17244

  sql/sp_head.cc@1.288.3.1, 2007-08-29 16:59:33-03:00, davi@moksha.local +3 -0
    Set that a procedure with GRANT/REVOKE command has a (implicit or explicit)
    commit.

  sql/sql_parse.cc@1.683.17.1, 2007-08-29 16:59:33-03:00, davi@moksha.local +5 -0
    End active transaction in SQLCOM_GRANT and SQLCOM_REVOKE, and thus effectively
    prohibit these statements in stored functions and triggers. An implicit commit
    also fixes a bug in replication, when GRANT or REVOKE would disappear from the
    binary log in case of a subsequent ROLLBACK, since they were considered
    transactional statements.

ChangeSet@1.2476.1.71, 2007-08-29 21:36:45+02:00, mleich@four.local.lan +10 -0
  Post merge fix 2 for
       ChangeSet@1.2509, 2007-08-28
       http://lists.mysql.com/commits/33239
    Fixes for the funcs_1 datadict test bugs
    #30418 "datadict" tests (all engines) fail:
           Dependency on the host name for ordering
    #30420 "datadict" tests (all engines) fail:
           Release build has help tables loaded
    #30438 "{memory,myisam,ndb}__datadict" tests fail:
           Use "InnoDB" without checking
    #30440 "datadict" tests (all engines) fail:
           Character sets depend on
                     configuration

  mysql-test/suite/funcs_1/README.txt@1.8, 2007-08-29 21:36:43+02:00, mleich@four.local.lan +9 -2
    Improved README

  mysql-test/suite/funcs_1/datadict/datadict_load.inc@1.5, 2007-08-29 21:36:43+02:00, mleich@four.local.lan +16 -1
    Additions for the NDB variant (currently not in use)

  mysql-test/suite/funcs_1/datadict/datadict_master.inc@1.8, 2007-08-29 21:36:43+02:00, mleich@four.local.lan +11 -0
    Write a comment about Bug#30689 into the test protocols.

  mysql-test/suite/funcs_1/datadict/processlist_priv.inc@1.2, 2007-08-29 21:36:43+02:00, mleich@four.local.lan +2 -0
    Fix for a not reported bug.
    The missing revoke usage and drop user harmed the next test.

  mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result@1.2, 2007-08-29 21:36:43+02:00, mleich@four.local.lan +2 -0
    Updated results

  mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result@1.2, 2007-08-29 21:36:43+02:00, mleich@four.local.lan +2 -0
    Updated results

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.10, 2007-08-29 21:36:43+02:00, mleich@four.local.lan +18 -8
    Updated results

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.10, 2007-08-29 21:36:43+02:00, mleich@four.local.lan +18 -8
    Updated results

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.10, 2007-08-29 21:36:43+02:00, mleich@four.local.lan +18 -8
    Updated results

  mysql-test/suite/funcs_1/r/ndb__datadict.result@1.4, 2007-08-29 21:36:43+02:00, mleich@four.local.lan +484 -618
    Updated results as far as they could be corrected.
    Attention:
       This test failed even before the current bug fixes.
       The updated expected results are now better than before,
       but they do not prevent that the test fails.
       It looks like one script is "damaged" and treats
       this NDB test different than expected within the
       file with expected results.
               

ChangeSet@1.1810.3310.1, 2007-08-29 21:45:53+03:00, pekka@sama.ndb.mysql.com +1 -0
  ndb - bug#29102 : use locked read even for blob parts

  ndb/src/ndbapi/NdbBlob.cpp@1.22.16.1, 2007-08-29 21:43:41+03:00, pekka@sama.ndb.mysql.com +6 -1
    race condition : s/committedRead/readTuple/ when reading parts since TUP commits tuples separately

ChangeSet@1.2476.395.1, 2007-08-29 19:02:33+02:00, msvensson@pilot.(none) +25 -0
  Move instance manager tests to it's own suite

  mysql-test/suite/im/r/im_cmd_line.result@1.4, 2007-08-29 16:34:51+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/im_cmd_line.result -> mysql-test/suite/im/r/im_cmd_line.result

  mysql-test/suite/im/r/im_daemon_life_cycle.result@1.16, 2007-08-29 16:34:51+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/im_daemon_life_cycle.result -> mysql-test/suite/im/r/im_daemon_life_cycle.result

  mysql-test/suite/im/r/im_instance_conf.result@1.7, 2007-08-29 16:34:51+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/im_instance_conf.result -> mysql-test/suite/im/r/im_instance_conf.result

  mysql-test/suite/im/r/im_life_cycle.result@1.19, 2007-08-29 16:34:51+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/im_life_cycle.result -> mysql-test/suite/im/r/im_life_cycle.result

  mysql-test/suite/im/r/im_options.result@1.7, 2007-08-29 16:34:51+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/im_options.result -> mysql-test/suite/im/r/im_options.result

  mysql-test/suite/im/r/im_utils.result@1.16, 2007-08-29 16:34:51+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/im_utils.result -> mysql-test/suite/im/r/im_utils.result

  mysql-test/suite/im/t/disabled.def@1.1, 2007-08-29 19:02:31+02:00, msvensson@pilot.(none) +20 -0
    New BitKeeper file ``mysql-test/suite/im/t/disabled.def''

  mysql-test/suite/im/t/disabled.def@1.0, 2007-08-29 19:02:31+02:00, msvensson@pilot.(none) +0 -0

  mysql-test/suite/im/t/im_check_env.inc@1.4, 2007-08-29 18:18:05+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/include/im_check_env.inc -> mysql-test/suite/im/t/im_check_env.inc

  mysql-test/suite/im/t/im_cmd_line.imtest@1.6, 2007-08-29 19:02:31+02:00, msvensson@pilot.(none) +1 -1
    Update location of im_check_env.inc

  mysql-test/suite/im/t/im_cmd_line.imtest@1.5, 2007-08-29 16:34:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/im_cmd_line.imtest -> mysql-test/suite/im/t/im_cmd_line.imtest

  mysql-test/suite/im/t/im_daemon_life_cycle-im.opt@1.5, 2007-08-29 16:34:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/im_daemon_life_cycle-im.opt -> mysql-test/suite/im/t/im_daemon_life_cycle-im.opt

  mysql-test/suite/im/t/im_daemon_life_cycle.imtest@1.18, 2007-08-29 19:02:31+02:00, msvensson@pilot.(none) +25 -23
    Update location of im_check_env.inc
    Add variable UTIL that points to the "ugly" .sh scripts

  mysql-test/suite/im/t/im_daemon_life_cycle.imtest@1.17, 2007-08-29 16:34:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/im_daemon_life_cycle.imtest -> mysql-test/suite/im/t/im_daemon_life_cycle.imtest

  mysql-test/suite/im/t/im_instance_conf-im.opt@1.2, 2007-08-29 16:34:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/im_instance_conf-im.opt -> mysql-test/suite/im/t/im_instance_conf-im.opt

  mysql-test/suite/im/t/im_instance_conf.imtest@1.8, 2007-08-29 19:02:31+02:00, msvensson@pilot.(none) +1 -1
    Update location of im_check_env.inc

  mysql-test/suite/im/t/im_instance_conf.imtest@1.7, 2007-08-29 16:34:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/im_instance_conf.imtest -> mysql-test/suite/im/t/im_instance_conf.imtest

  mysql-test/suite/im/t/im_life_cycle-im.opt@1.2, 2007-08-29 16:34:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/im_life_cycle-im.opt -> mysql-test/suite/im/t/im_life_cycle-im.opt

  mysql-test/suite/im/t/im_life_cycle.imtest@1.14, 2007-08-29 19:02:31+02:00, msvensson@pilot.(none) +8 -6
    Update location of im_check_env.inc
    Add variable UTIL that points to the "ugly" .sh scripts

  mysql-test/suite/im/t/im_life_cycle.imtest@1.13, 2007-08-29 16:34:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/im_life_cycle.imtest -> mysql-test/suite/im/t/im_life_cycle.imtest

  mysql-test/suite/im/t/im_options-im.opt@1.2, 2007-08-29 16:34:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/im_options-im.opt -> mysql-test/suite/im/t/im_options-im.opt

  mysql-test/suite/im/t/im_options.imtest@1.7, 2007-08-29 19:02:31+02:00, msvensson@pilot.(none) +1 -1
    Update location of im_check_env.inc

  mysql-test/suite/im/t/im_options.imtest@1.6, 2007-08-29 16:34:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/im_options.imtest -> mysql-test/suite/im/t/im_options.imtest

  mysql-test/suite/im/t/im_utils-im.opt@1.2, 2007-08-29 16:34:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/im_utils-im.opt -> mysql-test/suite/im/t/im_utils-im.opt

  mysql-test/suite/im/t/im_utils.imtest@1.8, 2007-08-29 19:02:31+02:00, msvensson@pilot.(none) +5 -3
    Update location of im_check_env.inc
    Add variable UTIL that points to the "ugly" .sh scripts

  mysql-test/suite/im/t/im_utils.imtest@1.7, 2007-08-29 16:34:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/im_utils.imtest -> mysql-test/suite/im/t/im_utils.imtest

  mysql-test/suite/im/t/kill_n_check.sh@1.7, 2007-08-29 16:43:08+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/kill_n_check.sh -> mysql-test/suite/im/t/kill_n_check.sh

  mysql-test/suite/im/t/log.sh@1.4, 2007-08-29 16:42:41+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/log.sh -> mysql-test/suite/im/t/log.sh

  mysql-test/suite/im/t/utils.sh@1.2, 2007-08-29 16:42:16+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/utils.sh -> mysql-test/suite/im/t/utils.sh

  mysql-test/suite/im/t/wait_for_process.sh@1.4, 2007-08-29 16:42:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/wait_for_process.sh -> mysql-test/suite/im/t/wait_for_process.sh

  mysql-test/suite/im/t/wait_for_socket.sh@1.6, 2007-08-29 16:42:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/wait_for_socket.sh -> mysql-test/suite/im/t/wait_for_socket.sh

  mysql-test/t/disabled.def@1.266.21.2, 2007-08-29 19:02:31+02:00, msvensson@pilot.(none) +0 -9
    Move disabled im test to suite/im/t/disabled.def

ChangeSet@1.1810.3309.1, 2007-08-29 19:57:10+03:00, aelkin@koti.dsl.inet.fi +2 -0
  Bug #30209  	rpl_packet.test: Slave_running mismatch (timing bug?)
  
  explicit --sleep is removed in favor of wait_for_slave_io_to_stop.inc.
  The status reporting uses `SHOW SLAVE STATUS' *not* possibly buggy "SHOW STATUS LIKE 'Slave_running'".

  mysql-test/r/rpl_packet.result@1.4.2.1, 2007-08-29 19:57:07+03:00, aelkin@koti.dsl.inet.fi +34 -3
    Recording the necessary Slave_IO_Running status at the end of the bug test.
    It must be No.

  mysql-test/t/rpl_packet.test@1.4.2.2, 2007-08-29 19:57:07+03:00, aelkin@koti.dsl.inet.fi +6 -4
    Removing sleep; wait_for_slave_io_to_stop.inc instead;
    Original "SHOW STATUS LIKE 'Slave_running'" seems to be buggy (to be reported) as with the macro above
    there were evidence slave IO was stopped indeed but "SHOW STATUS" did not find that (see failures in pb)

ChangeSet@1.1810.3308.1, 2007-08-29 20:45:04+04:00, kaa@polly.local +2 -0
  Backport of the keycache changes from http://lists.mysql.com/commits/31517 to make keycache 64-bit safe in 5.0. This is for bug #5731.

  include/keycache.h@1.6.3.2, 2007-08-29 20:45:00+04:00, kaa@polly.local +5 -5
    Backport of the keycache changes from http://lists.mysql.com/commits/31517 to make keycache 64-bit safe in 5.0.

  mysys/mf_keycache.c@1.55.1.9, 2007-08-29 20:45:00+04:00, kaa@polly.local +13 -12
    Backport of the keycache changes from http://lists.mysql.com/commits/31517 to make keycache 64-bit safe in 5.0.

ChangeSet@1.1810.3307.1, 2007-08-29 20:33:44+04:00, kaa@polly.local +1 -0
  Limit join_buffer_size, sort_buffer_size and myisam_sort_buffer_size to 4GB on all platforms, since the related code in 5.0 is not 64-bit safe. This is patch is a part of work on bug #5731 and will be null-merged to 5.1.

  sql/mysqld.cc@1.439.1.184, 2007-08-29 20:33:37+04:00, kaa@polly.local +3 -3
    Limit join_buffer_size, sort_buffer_size and myisam_sort_buffer_size to 4GB on all platforms.

ChangeSet@1.1616.3093.3, 2007-08-29 17:54:02+02:00, msvensson@pilot.(none) +1 -0
  Remove any old pidfile before starting mysqld to make sure that
  'mysqld_wait_started' don't return prematurely because of an old
  pidfile

  mysql-test/mysql-test-run.pl@1.8.21.15, 2007-08-29 17:54:01+02:00, msvensson@pilot.(none) +3 -0
    Remove any old pidfile before starting mysqld to make sure that
    'mysqld_wait_started' don't return prematurely because of an old
    pidfile

ChangeSet@1.2476.388.2, 2007-08-29 17:28:44+02:00, guilhem@gbichot4.local +2 -0
  cleanups

  storage/maria/ma_commit.c@1.3, 2007-08-29 17:28:40+02:00, guilhem@gbichot4.local +0 -1
    theoretically unneeded, and could cause problems (when trnman_commit_trn()
    ends the TRN may have been recycled and be in use by another thread
    already, we cannot touch it).

  storage/maria/maria_def.h@1.31, 2007-08-29 17:28:41+02:00, guilhem@gbichot4.local +1 -1
    just include the existing file

ChangeSet@1.1810.3306.2, 2007-08-29 19:20:18+04:00, kaa@polly.local +4 -0
  Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms.
  
  This is required to allow key_buffer_size > 4 GB (bug #5731).

  include/my_sys.h@1.178.2.20, 2007-08-29 19:20:12+04:00, kaa@polly.local +13 -13
    Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms.

  mysys/my_largepage.c@1.2.1.1, 2007-08-29 19:20:12+04:00, kaa@polly.local +6 -6
    Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms.

  mysys/my_malloc.c@1.9.1.6, 2007-08-29 19:20:12+04:00, kaa@polly.local +8 -8
    Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms.

  mysys/safemalloc.c@1.24.1.6, 2007-08-29 19:20:12+04:00, kaa@polly.local +13 -14
    Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms.

ChangeSet@1.2476.393.1, 2007-08-29 16:43:01+02:00, guilhem@gbichot4.local +19 -0
  WL#3072 Maria recovery
  * create page cache before initializing engine and not after, because
  Maria's recovery needs a page cache
  * make the creation of a bitmap page more crash-resistent
  * bugfix (see ma_blockrec.c)
  * back to old way: create an 8k bitmap page when creating table
  * preparations for the UNDO phase: recreate TRNs
  * preparations for Checkpoint: list of dirty pages, testing
  of rec_lsn to know if page should be skipped during Recovery
  (unused in this patch as no Checkpoint module pushed yet)
  * maria_chk tags repaired table with a special LSN
  * reworking all around in ma_recovery.c (less duplication)

  mysys/my_realloc.c@1.13, 2007-08-29 16:41:29+02:00, guilhem@gbichot4.local +11 -0
    noted an issue in my_realloc()

  sql/mysqld.cc@1.599, 2007-08-29 16:41:30+02:00, guilhem@gbichot4.local +11 -6
    page cache needs to be created before engines are initialized,
    because Maria's initialization may do a recovery which needs
    the page cache.

  storage/maria/ha_maria.cc@1.36.1.1, 2007-08-29 16:41:30+02:00, guilhem@gbichot4.local +5 -1
    update to new prototype

  storage/maria/ma_bitmap.c@1.17, 2007-08-29 16:41:31+02:00, guilhem@gbichot4.local +9 -4
    when creating the first bitmap page we used chsize to 8192 bytes then 
    pwrite (overwrite) the last 2 bytes (8191-8192). If crash between
    the two operations, this leaves a bitmap page full without its end
    marker. A later recovery may try to read this page and find it
    exists and misses a marker and conclude it's corrupted and fail.
    Changing the chsize to only 8190 bytes: recovery will then find
    the page is too short and recreate it entirely.

  storage/maria/ma_blockrec.c@1.33.1.1, 2007-08-29 16:41:31+02:00, guilhem@gbichot4.local +10 -3
    Fix for a bug: when executing a REDO, if the data page is created,
    data_file_length was increased before _ma_bitmap_set():
    _ma_bitmap_set() called _ma_read_bitmap_page() which, due to the
    increased data_file_length, expected to find a bitmap page on disk
    with a correct end marker; if the bitmap page didn't exist already
    in fact, this failed. Fixed by increasing data_file_length only after
    _ma_read_bitmap_page() has created the new bitmap page correctly.
    This bug could happen every time a REDO is about creating a new
    bitmap page.

  storage/maria/ma_check.c@1.36, 2007-08-29 16:41:32+02:00, guilhem@gbichot4.local +0 -7
    empty data file has a bitmap page

  storage/maria/ma_control_file.c@1.18, 2007-08-29 16:41:33+02:00, guilhem@gbichot4.local +9 -4
    useless parameter to ma_control_file_create_or_open(), just
    test if this is recovery.

  storage/maria/ma_control_file.h@1.19, 2007-08-29 16:41:33+02:00, guilhem@gbichot4.local +1 -1
    new prototype

  storage/maria/ma_create.c@1.26, 2007-08-29 16:41:33+02:00, guilhem@gbichot4.local +8 -28
    Back to how it was before: maria_create() creates an 8k bitmap page.
    Thus (bugfix) data_file_length needs to reflect this instead of being 0.

  storage/maria/ma_loghandler.c@1.33.1.1, 2007-08-29 16:41:35+02:00, guilhem@gbichot4.local +13 -2
    as ma_test1 and ma_test2 now use real transactions and not
    dummy_transaction_object, REDO for INSERT/UPDATE/DELETE are always
    about real transactions, can assert this.
    A function for Recovery to assign a short id to a table.

  storage/maria/ma_loghandler.h@1.16.1.1, 2007-08-29 16:41:35+02:00, guilhem@gbichot4.local +3 -0
    new function

  storage/maria/ma_loghandler_lsn.h@1.10.1.1, 2007-08-29 16:41:35+02:00, guilhem@gbichot4.local +3 -0
    maria_chk tags repaired tables with this LSN

  storage/maria/ma_open.c@1.23, 2007-08-29 16:42:29+02:00, guilhem@gbichot4.local +48 -12
    * enforce that DMLs on transactional tables use real transactions
    and not dummy_transaction_object.
    * test if table was repaired with maria_chk (which has to been
    seen as an import of an external table into the server), test
    validity of create_rename_lsn (header corruption detection)
    * comments.

  storage/maria/ma_recovery.c@1.10.1.1, 2007-08-29 16:42:58+02:00, guilhem@gbichot4.local +640 -322
    * preparations for the UNDO phase: recreate TRNs
    * preparations for Checkpoint: list of dirty pages, testing
    of rec_lsn to know if page should be skipped during Recovery
    (unused in this patch as no Checkpoint module pushed yet)
    * reworking all around (less duplication)

  storage/maria/ma_recovery.h@1.7, 2007-08-29 16:42:58+02:00, guilhem@gbichot4.local +2 -1
    a parameter to say if the UNDO phase should be skipped

  storage/maria/maria_chk.c@1.16.1.1, 2007-08-29 16:42:58+02:00, guilhem@gbichot4.local +1 -1
    tag repaired tables with a special LSN

  storage/maria/maria_read_log.c@1.11.1.1, 2007-08-29 16:42:58+02:00, guilhem@gbichot4.local +3 -2
    * update to new prototype
    * no UNDO phase in maria_read_log for now

  storage/maria/trnman.c@1.27, 2007-08-29 16:42:58+02:00, guilhem@gbichot4.local +27 -0
    * a function for Recovery to create a transaction (TRN), needed
    in the UNDO phase
    * a function for Recovery to grab an existing transaction, needed
    in the UNDO phase (rollback all existing transactions)

  storage/maria/trnman_public.h@1.4, 2007-08-29 16:42:59+02:00, guilhem@gbichot4.local +2 -0
    new functions

ChangeSet@1.1810.3302.9, 2007-08-29 14:44:23+02:00, msvensson@pilot.(none) +1 -0
  Remove unportable use of "system rm"

  mysql-test/t/myisam.test@1.55.1.26, 2007-08-29 14:44:21+02:00, msvensson@pilot.(none) +3 -3
    Remove unportable use of "system rm"

ChangeSet@1.1616.3093.2, 2007-08-29 14:39:40+02:00, msvensson@pilot.(none) +1 -0
  Fix typo: '$$' => '$'

  mysql-test/lib/mtr_misc.pl@1.5.1.9, 2007-08-29 14:39:39+02:00, msvensson@pilot.(none) +1 -1
    Fix typo: '$$' => '$'

ChangeSet@1.2476.391.1, 2007-08-29 14:54:32+03:00, gkodinov@magare.gmz +3 -0
  Bug #30244: row_count/found_rows does not replicate well
  
   The functions ROW_COUNT/FOUND_ROWS are indeed not safe to be used in 
   statement based replication.
   Added code to declare them as such and switch the statement they're in
   to row based logging for mixed mode.

  mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result@1.1, 2007-08-29 14:54:30+03:00, gkodinov@magare.gmz +22 -0
    BitKeeper file /home/kgeorge/mysql/work/B30244-5.1-opt/mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result

  mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result@1.0, 2007-08-29 14:54:30+03:00, gkodinov@magare.gmz +0 -0

  mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test@1.1, 2007-08-29 14:54:30+03:00, gkodinov@magare.gmz +35 -0
    BitKeeper file /home/kgeorge/mysql/work/B30244-5.1-opt/mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test

  mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test@1.0, 2007-08-29 14:54:30+03:00, gkodinov@magare.gmz +0 -0

  sql/item_create.cc@1.90.1.1, 2007-08-29 14:54:30+03:00, gkodinov@magare.gmz +2 -0
    Bug #30244: row_count/found_rows does not replicate well
     - add the functions to the set of "unsafe functions" 
       for statement based replication

ChangeSet@1.2476.390.1, 2007-08-29 14:46:49+03:00, gkodinov@magare.gmz +2 -0
  Bug #30393: Test "group_by" fails with a difference in "row count" 
      and strategy (explain)
    
  The fix for WL3527 adds tests that test if the index usage hints
  combinations don't cause syntax errors.
  The EXPLAIN for one of these tests can be affected by the size of the
  rowid on the disk (affected by the presence of large file support). 
  Fixed to avoid the platform dependent test result by removing the 
  irrelevant columns from the EXPLAIN result.

  mysql-test/r/group_by.result@1.88, 2007-08-29 14:46:46+03:00, gkodinov@magare.gmz +1 -1
    Bug #30393: ignore columns irrelevant to the test

  mysql-test/t/group_by.test@1.69, 2007-08-29 14:46:46+03:00, gkodinov@magare.gmz +5 -0
    Bug #30393: ignore columns irrelevant to the test

ChangeSet@1.1810.3290.7, 2007-08-29 14:57:59+04:00, anozdrin@ibm. +2 -0
  Test case for Bug#13675: DATETIME/DATE type in store proc param
  seems to be converted as varbinary.
  
  The bug has been already fixed. This CS just adds a test case for it.

  mysql-test/r/sp.result@1.170.46.1, 2007-08-29 14:57:57+04:00, anozdrin@ibm. +52 -0
    Update result file.

  mysql-test/t/sp.test@1.174.46.1, 2007-08-29 14:57:57+04:00, anozdrin@ibm. +54 -0
    Test case for BUG#13675.

ChangeSet@1.1810.3302.7, 2007-08-29 12:47:00+02:00, msvensson@pilot.(none) +1 -0
  Remove unportable use of "system rm"

  mysql-test/t/ps.test@1.56.1.38, 2007-08-29 12:46:59+02:00, msvensson@pilot.(none) +0 -3
    Remove unportable use of "system rm"

ChangeSet@1.1810.3302.6, 2007-08-29 12:44:43+02:00, msvensson@pilot.(none) +1 -0
  Remove unportable "system rm"

  mysql-test/t/backup.test@1.16.2.6, 2007-08-29 12:44:42+02:00, msvensson@pilot.(none) +10 -1
    Remove unportable "system rm"

ChangeSet@1.1810.3302.3, 2007-08-29 11:53:15+02:00, msvensson@pilot.(none) +1 -0
  Remove unportable use of "exec chmod"

  mysql-test/t/information_schema_chmod.test@1.4, 2007-08-29 11:53:14+02:00, msvensson@pilot.(none) +1 -1
    Remove unportable use of "exec chmod"

ChangeSet@1.1616.3093.1, 2007-08-29 11:51:34+02:00, msvensson@pilot.(none) +2 -0
  Add 'mtr_rmtree'

  mysql-test/lib/mtr_misc.pl@1.5.1.8, 2007-08-29 11:51:33+02:00, msvensson@pilot.(none) +60 -0
    Add function 'mtr_rmtree' it will try 'rmtree' and if that fails (most likely
    due to permission problems we will fun File::find to chmod all files and dirs
    to 0777 and then delete.

  mysql-test/mysql-test-run.pl@1.8.21.14, 2007-08-29 11:51:33+02:00, msvensson@pilot.(none) +10 -10
    Use 'mtr_rmtree' in favour of 'rmtree'

ChangeSet@1.2476.348.16, 2007-08-29 12:39:42+03:00, gkodinov@magare.gmz +1 -0
  Addendum to the 5.1 merge of the fix
  for bug 30377: use the function instead of
  the complex condition.

  sql/sql_parse.cc@1.683.15.3, 2007-08-29 12:39:40+03:00, gkodinov@magare.gmz +1 -2
    Addendum to the 5.1 merge of the fix
    for bug 30377: use the function instead of
    the complex condition.

ChangeSet@1.2476.388.1, 2007-08-29 09:03:10+03:00, monty@mysql.com +13 -0
  Added maria_commit() and maria_begin() to be used with external tests
  Now ma_test1 -M -T and ma_test2 -M -T produces readable, applyable logs
  
  Note: The .MAD file is not binary identical after applying redo compare to a an original file.
  (This is becasue we don't have full information which function called PURGE_REDO_BLOCKS).
  To verify if a file was correctly applied, we now instead compare row checksums

  BitKeeper/etc/ignore@1.259, 2007-08-29 08:24:54+03:00, monty@mysql.com +1 -0
    added storage/maria/tmp/*

  BitKeeper/etc/ignore@1.258, 2007-08-29 08:24:44+03:00, monty@mysql.com +1 -0
    added storage/maria/tmp/*

  BitKeeper/etc/ignore@1.257, 2007-08-29 08:14:55+03:00, monty@mysql.com +1 -0
    added maria_log_control

  include/maria.h@1.15, 2007-08-29 09:01:57+03:00, monty@mysql.com +2 -1
    Added maria_commit() and maria_begin() to be used with external tests

  storage/maria/ha_maria.cc@1.38, 2007-08-29 09:01:57+03:00, monty@mysql.com +2 -1
    Ensure maria_def. is read in C mode

  storage/maria/ma_blockrec.c@1.35, 2007-08-29 09:01:57+03:00, monty@mysql.com +81 -95
    Fixed redo handling.
    _ma_apply_redo_purge_blocks() updated to handle any number of purged blocks
    Removed code to make data file idenitcal after redo (can't easily be done). See changeset comments
    
    Now ma_test1 -M -T and ma_test2 -M -T produces readable, applyable logs

  storage/maria/ma_commit.c@1.2, 2007-08-29 09:03:08+03:00, monty@mysql.com +63 -9
    More DBUG statements
    Moved variable declaration to start of function (portability fix)
    Added helper functions 'maria_commit()' and 'maria_begin()'

  storage/maria/ma_loghandler.c@1.36.1.1, 2007-08-29 09:03:08+03:00, monty@mysql.com +5 -9
    Fixed wrong REDO_PURGE_BLOCKS initialization

  storage/maria/ma_recovery.c@1.12, 2007-08-29 09:03:08+03:00, monty@mysql.com +34 -5
    Added UNDO_ROW_UPDATE
    Removed wrong setting of lsn (there was no lsn at the used position)
    Fixed REDO_PURGE_BLOCKS to handle any number of blocks

  storage/maria/ma_test1.c@1.14, 2007-08-29 09:03:08+03:00, monty@mysql.com +14 -3
    Added transaction support (via maria_begin() & maria_commit()) to get a log that can be applied with maria_read_log

  storage/maria/ma_test2.c@1.18, 2007-08-29 09:03:08+03:00, monty@mysql.com +5 -1
    Added transaction support (via maria_begin() & maria_commit()) to get a log that can be applied with maria_read_log

  storage/maria/ma_test_recovery@1.5, 2007-08-29 09:03:08+03:00, monty@mysql.com +31 -10
    Create temporary files in maria/tmp
    Verify files with checksums instead of byte comparisons

  storage/maria/ma_test_recovery@1.4, 2007-08-29 08:17:51+03:00, monty@mysql.com +0 -0
    Change mode to -rwxrwxr-x

  storage/maria/maria_chk.c@1.17, 2007-08-29 09:03:08+03:00, monty@mysql.com +13 -2
    When using with -dss we only get  filename, records and checksum.
    This is useful to do a quick comparision if a files is identical to another one.

  storage/maria/maria_def.h@1.30, 2007-08-29 09:03:08+03:00, monty@mysql.com +1 -0
    Added ma_commit()

  storage/maria/maria_read_log.c@1.13, 2007-08-29 09:03:08+03:00, monty@mysql.com +5 -0
    Added --help

ChangeSet@1.2476.380.4, 2007-08-29 14:30:21+10:00, stewart@flamingspork.com +1 -0
  [PATCH] Bug#30681 mgmapi CHECK_TIMEDOUT_RET should be DBUG_CHECK_TIMEDOUT_RET
  
  Index: ndb/storage/ndb/src/mgmapi/mgmapi.cpp
  ===================================================================

  storage/ndb/src/mgmapi/mgmapi.cpp@1.87.1.9, 2007-08-29 10:51:05+10:00, stewart@flamingspork.com +1 -1
    Bug#30681 mgmapi CHECK_TIMEDOUT_RET should be DBUG_CHECK_TIMEDOUT_RET

ChangeSet@1.2476.358.11, 2007-08-28 15:56:12-06:00, malff@weblab.(none) +1 -0
  Manual merge

  sql/sql_yacc.yy@1.597.1.8, 2007-08-28 15:56:10-06:00, malff@weblab.(none) +44 -56
    Manual merge

ChangeSet@1.2476.1.70, 2007-08-28 20:59:40+02:00, mleich@four.local.lan +4 -0
  Post merge fix 1 for
     ChangeSet@1.2509, 2007-08-28
     http://lists.mysql.com/commits/33239
  Fixes for the funcs_1 datadict test bugs
  #30418 "datadict" tests (all engines) fail:
         Dependency on the host name for ordering
  #30420 "datadict" tests (all engines) fail:
         Release build has help tables loaded
  #30438 "{memory,myisam,ndb}__datadict" tests fail:
         Use "InnoDB" without checking
  #30440 "datadict" tests (all engines) fail:
         Character sets depend on
                   configuration
  There are more post merge fixes needed.

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.9, 2007-08-28 20:59:38+02:00, mleich@four.local.lan +14 -176
    Post merge fix for
       ChangeSet@1.2509, 2007-08-28

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.9, 2007-08-28 20:59:38+02:00, mleich@four.local.lan +14 -176
    Updated results

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.9, 2007-08-28 20:59:38+02:00, mleich@four.local.lan +7 -175
    Updated results

  mysql-test/suite/funcs_1/t/ndb__datadict.test@1.2, 2007-08-28 20:59:38+02:00, mleich@four.local.lan +4 -0
    Adjusted script

ChangeSet@1.1810.3305.1, 2007-08-28 11:16:03-06:00, malff@weblab.(none) +3 -0
  Bug#30625 (Performance, reduce depth for expressions)
  
  This is a performance bug, affecting in particular the bison generated code
  for the parser.
  
  Prior to this fix, the grammar used a long chain of reduces to parse an
  expression, like:
    bit_expr -> bit_term
    bit_term -> bit_factor
    bit_factor -> value_expr
    value_expr -> term
    term -> factor
  etc
  
  This chain of reduces cause the internal state automaton in the generated
  parser to execute more state transitions and more reduces, so that the
  generated MySQLParse() function would spend a lot of time looping to execute
  all the grammar reductions.
  
  With this patch, the grammar has been reorganized so that rules are more
  "flat", limiting the depth of reduces needed to parse <expr>.
  
  Tests have been written to enforce that relative priorities and properties
  of operators have not changed while changing the grammar.
  
  See the bug report for performance data.

  mysql-test/r/parser_precedence.result@1.2, 2007-08-28 11:16:02-06:00, malff@weblab.(none) +391 -0
    Improved test coverage for operator precedence

  mysql-test/t/parser_precedence.test@1.2, 2007-08-28 11:16:02-06:00, malff@weblab.(none) +240 -0
    Improved test coverage for operator precedence

  sql/sql_yacc.yy@1.371.1.162, 2007-08-28 11:16:02-06:00, malff@weblab.(none) +55 -60
    Simplified the grammar to improve performances

ChangeSet@1.1810.3304.1, 2007-08-28 18:37:17+02:00, mleich@four.local.lan +12 -0
  Fixes for
       Bug#30418 "datadict" tests (all engines) fail: Dependency on the host name
                  for ordering
       Bug#30420 "datadict" tests (all engines) fail: Release build has help tables loaded
       Bug#30438 "{memory,myisam,ndb}__datadict" tests fail: Use "InnoDB" without checking
       Bug#30440 "datadict" tests (all engines) fail: Character sets depend on configuration
  Attention: Only the build team can check if Bug#30440 is really fixed.

  mysql-test/suite/funcs_1/README.txt@1.1.1.1, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +22 -0
    Update README

  mysql-test/suite/funcs_1/datadict/datadict_master.inc@1.1.2.2, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +242 -206
    1. Exclude the help tables from the INFORMATION_SCHEMA.TABLES
       and the INFORMATION_SCHEMA.STATISTICS selects.
    2. Replace error numbers with error names
    3. Sort some results with mysqltest builtin function
    4. Some other minor changes

  mysql-test/suite/funcs_1/r/datadict_help_tables_build.result@1.1, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +22 -0
    File with expected results

  mysql-test/suite/funcs_1/r/datadict_help_tables_build.result@1.0, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/r/datadict_help_tables_dev.result@1.1, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +18 -0
    File with expected results

  mysql-test/suite/funcs_1/r/datadict_help_tables_dev.result@1.0, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.1.2.2, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +31 -209
    Updated expected results

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.1.2.2, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +31 -209
    Updated expected results

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.1.2.2, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +31 -209
    Updated expected results

  mysql-test/suite/funcs_1/t/datadict_help_tables_build.test@1.1, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +73 -0
    Additional test checking the information about the help tables within
           INFORMATION_SCHEMA.TABLES/INFORMATION_SCHEMA.STATISTICS
    as compensation for the removed checks within datadict_master.inc.
    Variant for use during build tests (non empty help tables)

  mysql-test/suite/funcs_1/t/datadict_help_tables_build.test@1.0, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/t/datadict_help_tables_dev.test@1.1, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +27 -0
    Additional test checking the information about the help tables within
           INFORMATION_SCHEMA.TABLES/INFORMATION_SCHEMA.STATISTICS
    as compensation for the removed checks within datadict_master.inc.
    Variant for use during development tests (empty help tables)

  mysql-test/suite/funcs_1/t/datadict_help_tables_dev.test@1.0, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/t/innodb__datadict.test@1.1.1.1, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +4 -0
    Add $OTHER_ENGINE_TYPE variable which is used in data_dict_master.inc.

  mysql-test/suite/funcs_1/t/memory__datadict.test@1.1.1.1, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +4 -0
    Add $OTHER_ENGINE_TYPE variable which is used in data_dict_master.inc.

  mysql-test/suite/funcs_1/t/myisam__datadict.test@1.1.1.1, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +5 -0
    Add $OTHER_ENGINE_TYPE variable which is used in data_dict_master.inc.

ChangeSet@1.2476.385.1, 2007-08-28 18:01:29+02:00, mhansson@linux-st28.site +6 -0
  Bug #30596  	GROUP BY optimization gives wrong result order
    
  The optimization that uses a unique index to remove GROUP BY did not 
  ensure that the index was actually used, thus violating the ORDER BY
  that is implied by GROUP BY.
  Fixed by replacing GROUP BY with ORDER BY if the GROUP BY clause contains
  a unique index over non-nullable field(s). In case GROUP BY ... ORDER BY 
  null is used, GROUP BY is simply removed.

  mysql-test/include/mix1.inc@1.52, 2007-08-28 18:01:26+02:00, mhansson@linux-st28.site +27 -0
    Bug#30596: Test case for InnoDB
    Here, as opposed to for MyISAM, row lookup is done using index 
    whenever the index covers the group list.

  mysql-test/r/distinct.result@1.57, 2007-08-28 18:01:26+02:00, mhansson@linux-st28.site +3 -3
    Bug#30596: Changed test case. 
    Prior to Bug#16458, These queries use temp table and filesort. The
    bug was that they used a temp table. However, that patch removed
    filesort also, in which case we can no longer gurantee correct ordering.

  mysql-test/r/group_by.result@1.87, 2007-08-28 18:01:26+02:00, mhansson@linux-st28.site +92 -1
    Bug#30596: Correct result
    The test case for IGNORE INDEX FOR GROUP BY gets degraded performance 
    (unneccesary filesort). This is due to Bug#30665, which will be fixed separately.

  mysql-test/r/innodb_mysql.result@1.55, 2007-08-28 18:01:26+02:00, mhansson@linux-st28.site +49 -0
    Bug#30596: Test result

  mysql-test/t/group_by.test@1.68, 2007-08-28 18:01:26+02:00, mhansson@linux-st28.site +44 -0
    Bug#30596: Test case

  sql/sql_select.cc@1.541.21.1, 2007-08-28 18:01:26+02:00, mhansson@linux-st28.site +14 -0
    Bug#30596: The fix: 
    - replace GROUP BY with ORDER BY unless ORDER BY [NULL|<constant>]
    - make sure to use the keys for GROUP BY in this ORDER BY.

ChangeSet@1.1810.3303.1, 2007-08-28 18:51:03+03:00, gkodinov@magare.gmz +4 -0
  Bug #30377: EXPLAIN loses last_query_cost when used with UNION
  
  Currently the Last_query_cost session status variable shows
  only the cost of a single flat subselect. For complex queries
  (with subselects or unions etc) Last_query_cost is not valid
  as it was showing the cost for the last optimized subselect.
  Fixed by reseting to zero Last_query_cost when the complete
  cost of the query cannot be determined.
  Last_query_cost will be non-zero only for single flat queries.

  mysql-test/r/status.result@1.10.1.1, 2007-08-28 18:51:02+03:00, gkodinov@magare.gmz +48 -0
    Bug #30377: test case

  mysql-test/t/status.test@1.15.1.5, 2007-08-28 18:51:02+03:00, gkodinov@magare.gmz +32 -0
    Bug #30377: test case

  sql/sql_lex.h@1.175.41.12, 2007-08-28 18:51:02+03:00, gkodinov@magare.gmz +22 -0
    Bug #30377: helper function

  sql/sql_select.cc@1.312.178.1, 2007-08-28 18:51:02+03:00, gkodinov@magare.gmz +6 -2
    Bug #30377: don't assign cost if not on single level statement

ChangeSet@1.1810.3302.2, 2007-08-28 16:47:05+02:00, msvensson@pilot.(none) +1 -0
  Streamline "do_close_connection" and "do_send_quit"
  Fix typo, "next_con" -> "con"

  client/mysqltest.c@1.155.9.116, 2007-08-28 16:47:04+02:00, msvensson@pilot.(none) +58 -66
    Reuse "find_connection_by_name" both from "do_close_connection" and "do_send_quit"
    Adjust alignment of comment
    Fix typo in "do_close_connection", it used the global variable "next_con" instead
    of local variable "con"

ChangeSet@1.1810.3302.1, 2007-08-28 16:44:31+02:00, msvensson@pilot.(none) +1 -0
  Remove unportable constructs in loaddata.test

  mysql-test/t/loaddata.test@1.15.2.1, 2007-08-28 16:44:30+02:00, msvensson@pilot.(none) +10 -12
    Remove unportable constructs in loaddata.test

ChangeSet@1.1810.3301.2, 2007-08-28 16:06:08+02:00, df@pippilotta.erinye.com +1 -0
  fix bug in test case for bug#25714
  TAG: mysql-5.0.48

  mysql-test/include/have_bug25714.inc@1.1.2.1, 2007-08-28 16:06:06+02:00, df@pippilotta.erinye.com +1 -1
    this is not how you access variables

ChangeSet@1.2476.380.3, 2007-08-28 15:44:20+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #30667 result file

  mysql-test/r/ndb_restore.result@1.26.1.1, 2007-08-28 15:44:17+02:00, tomas@whalegate.ndb.mysql.com +5 -0
    Bug #30667 result file

ChangeSet@1.2476.380.2, 2007-08-28 15:43:06+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  Bug #30667 ndb table discovery does not work correcly with information schema
  - the listed file_names are not necessarily on disk, so we need to discover them if they aren't

  mysql-test/t/ndb_restore.test@1.26.2.1, 2007-08-28 15:43:02+02:00, tomas@whalegate.ndb.mysql.com +5 -0
    Bug #30667 ndb table discovery does not work correcly with information schema

  sql/ha_ndbcluster.cc@1.457.3.1, 2007-08-28 15:43:03+02:00, tomas@whalegate.ndb.mysql.com +18 -1
    Bug #30667 ndb table discovery does not work correcly with information schema
    - the listed file_names are not necessarily on disk, so we need to discover them if they aren't

ChangeSet@1.2476.345.21, 2007-08-28 15:35:42+02:00, msvensson@pilot.(none) +1 -0
  Remove unportable construct in loaddata.test

  mysql-test/t/loaddata.test@1.31, 2007-08-28 15:35:41+02:00, msvensson@pilot.(none) +1 -1
    Remove unportable construct in loaddata.test

ChangeSet@1.1810.2885.71, 2007-08-28 15:32:44+02:00, msvensson@pilot.(none) +1 -0
  Remove unportable constructs in loaddata.test

  mysql-test/t/loaddata.test@1.15.1.12, 2007-08-28 15:32:43+02:00, msvensson@pilot.(none) +10 -12
    Remove unportable constructs in loaddata.test

ChangeSet@1.1810.2885.70, 2007-08-28 15:32:13+02:00, msvensson@pilot.(none) +2 -0
  Move "analyze_testcase_failure" to mysqltest(since it knows best when
  to perform this analyzis)

  client/mysqltest.c@1.155.9.115, 2007-08-28 15:32:12+02:00, msvensson@pilot.(none) +69 -0
    Add function 'show_query' and use it to output some debug queries when
    "sync_with_master" has failed.

  mysql-test/mysql-test-run.pl@1.30.49.100, 2007-08-28 15:32:12+02:00, msvensson@pilot.(none) +0 -54
    Move "analyze_testcase_failure" to mysqltest

ChangeSet@1.1810.3301.1, 2007-08-28 15:22:14+02:00, df@pippilotta.erinye.com +1 -0
  build fix for aix and others

  libmysql/libmysql.c@1.233.5.20, 2007-08-28 15:22:12+02:00, df@pippilotta.erinye.com +3 -3
    build fix: DBUG_ENTER can't be this late

ChangeSet@1.2476.345.19, 2007-08-28 12:41:25+02:00, msvensson@pilot.(none) +1 -0
  Temp disable of icheck

  include/Makefile.am@1.67.2.19, 2007-08-28 12:41:24+02:00, msvensson@pilot.(none) +1 -1
    Temp disable of icheck

ChangeSet@1.2476.345.18, 2007-08-28 11:39:29+02:00, msvensson@pilot.(none) +1 -0
  Fix warning

  client/mysqltest.c@1.311, 2007-08-28 11:39:27+02:00, msvensson@pilot.(none) +1 -1
    Fix warning

ChangeSet@1.1810.3300.1, 2007-08-28 11:34:43+02:00, msvensson@pilot.(none) +2 -0
  Bug#28812 rpl_ssl fails due to assert in extra/yassl/src/socket_wrapper.cpp:117
   - Merge sslaccept and sslconnect.
   - Atomically "reset" vio to VIO_TYPE_SSL when the SSL connection has
     succeeded, this avoids having to revert anything and thus protects
     against "close_active_vio" in the middle.
   - Add some variance to the testcase

  mysql-test/t/rpl_ssl.test@1.1.1.4, 2007-08-28 11:34:42+02:00, msvensson@pilot.(none) +15 -0
    Add some variance by running two selects before stopping the slave
    Check that number of records in t1 are equal on master and slave

  vio/viossl.c@1.34.2.10, 2007-08-28 11:34:42+02:00, msvensson@pilot.(none) +46 -96
    Rewrite sslconnect and sslaccept to automically "reset" the vio
    to VIO_TYPE_SSL. Also use the fd from 'SSL_get_fd' to avoid
    setting vio->sd to -1, that previously occured when "close_active_vio"
    was called during connect/accept.
    
    Merge the two function since they were exactly the same except for one line.
    
    Update the DBUG printouts to be generic(i.e use peer instead of client/server).

ChangeSet@1.1810.3276.10, 2007-08-28 10:35:55+02:00, msvensson@pilot.(none) +15 -0
  Import yaSSL version 1.7.2
  - Fix bug#27265
  - Support for fixing bug#18441

  extra/yassl/include/openssl/crypto.h@1.3.1.1, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +1 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/des_old.h@1.1, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +1 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/des_old.h@1.0, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +0 -0

  extra/yassl/include/openssl/evp.h@1.1, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +10 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/evp.h@1.0, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +0 -0

  extra/yassl/include/openssl/hmac.h@1.1, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +1 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/hmac.h@1.0, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +0 -0

  extra/yassl/include/openssl/objects.h@1.1, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +1 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/objects.h@1.0, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +0 -0

  extra/yassl/include/openssl/prefix_ssl.h@1.5, 2007-08-28 10:35:54+02:00, msvensson@pilot.(none) +3 -0
    Update prefixes

  extra/yassl/include/openssl/sha.h@1.1, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +1 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/sha.h@1.0, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +0 -0

  extra/yassl/include/openssl/ssl.h@1.14.1.11, 2007-08-28 09:45:25+02:00, msvensson@pilot.(none) +2 -1
    Import patch yassl.diff

  extra/yassl/include/yassl_int.hpp@1.11.1.10, 2007-08-06 10:02:27+02:00, msvensson@pilot.(none) +1 -1
    Import patch yassl.diff

  extra/yassl/src/handshake.cpp@1.16, 2007-08-28 09:57:52+02:00, msvensson@pilot.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/src/socket_wrapper.cpp@1.16, 2007-08-28 10:03:04+02:00, msvensson@pilot.(none) +0 -4
    Import patch yassl.diff

  extra/yassl/src/ssl.cpp@1.16.1.16, 2007-08-28 09:45:26+02:00, msvensson@pilot.(none) +6 -0
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp@1.19.1.8, 2007-08-20 21:54:45+02:00, msvensson@pilot.(none) +1 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/coding.cpp@1.9, 2007-05-03 19:31:49+02:00, msvensson@pilot.(none) +3 -2
    Import patch yassl.diff

  extra/yassl/taocrypt/src/crypto.cpp@1.3, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +5 -0
    Import patch yassl.diff

ChangeSet@1.2476.382.4, 2007-08-28 01:02:57-06:00, tsmith@sita.local +2 -0
  Post-merge fixes

  sql/ha_partition.cc@1.102, 2007-08-28 01:02:52-06:00, tsmith@sita.local +0 -7
    Post-merge fix (remove duplicate definition of ::column_bitmaps_signal)

  sql/mysqld.cc@1.583.1.86, 2007-08-28 01:02:53-06:00, tsmith@sita.local +5 -4
    Post-merge fix (cast away some compiler warnings in DBUG_PRINT, remove
    duplicate definition of OPT_KEEP_FILES_ON_CREATE).

ChangeSet@1.2476.380.1, 2007-08-27 21:58:49+03:00, pekka@sama.ndb.mysql.com +2 -0
  ndb - bug#30646 fsync on close only if file is open for write

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp@1.40, 2007-08-27 21:57:18+03:00, pekka@sama.ndb.mysql.com +8 -1
    AsyncFile: fsync on close only if file is open for write (for AIX)

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp@1.12, 2007-08-27 21:57:18+03:00, pekka@sama.ndb.mysql.com +2 -0
    AsyncFile: fsync on close only if file is open for write (for AIX)

ChangeSet@1.2476.197.36, 2007-08-27 21:55:39+03:00, bell@desktop.sanja.is.com.ua +4 -0
  Very simple log files purger added.
  File number types fixed.

  storage/maria/ma_loghandler.c@1.37, 2007-08-27 21:55:38+03:00, bell@desktop.sanja.is.com.ua +138 -35
    Very simple log files purger added.
    File number types fixed.

  storage/maria/ma_loghandler.h@1.19, 2007-08-27 21:55:38+03:00, bell@desktop.sanja.is.com.ua +3 -1
    Very simple log files purger added.
    File number types fixed.

  storage/maria/unittest/Makefile.am@1.15, 2007-08-27 21:55:38+03:00, bell@desktop.sanja.is.com.ua +3 -1
    Test of purger added.

  storage/maria/unittest/ma_test_loghandler_purge-t.c@1.1, 2007-08-27 21:55:38+03:00, bell@desktop.sanja.is.com.ua +174 -0
    New BitKeeper file ``storage/maria/unittest/ma_test_loghandler_purge-t.c''

  storage/maria/unittest/ma_test_loghandler_purge-t.c@1.0, 2007-08-27 21:55:38+03:00, bell@desktop.sanja.is.com.ua +0 -0

ChangeSet@1.1810.3299.1, 2007-08-27 17:33:41+02:00, mhansson@linux-st28.site +7 -0
  Bug #30596  	GROUP BY optimization gives wrong result order
  
  The optimization that uses a unique index to remove GROUP BY, did not 
  ensure that the index was actually used, thus violating the ORDER BY
  that is impled by GROUP BY.
  Fixed by replacing GROUP BY with ORDER BY if the GROUP BY clause contains
  a unique index. In case GROUP BY ... ORDER BY null is used, GROUP BY is
  simply removed.

  BitKeeper/etc/ignore@1.210.1.43, 2007-08-27 17:33:38+02:00, mhansson@linux-st28.site +5 -0
    Added support-files/mysqld_multi.server tests/bug25714 cscope.in.out cscope.out cscope.po.out to the ignore list

  mysql-test/t/innodb_mysql.test@1.3.46.1, 2007-08-27 17:33:38+02:00, mhansson@linux-st28.site +27 -0
    Bug#30596: Test case

  mysql-test/r/distinct.result@1.46.1.8, 2007-08-27 17:33:38+02:00, mhansson@linux-st28.site +3 -3
    Bug#30596: Changed test case. 
    Prior to Bug#16458, These queries use temp table and filesort. The
    bug was that they used a temp table. However, that patch removed
    filesort also, in which case we can no longer gurantee correct ordering.

  mysql-test/r/group_by.result@1.69.1.11, 2007-08-27 17:33:38+02:00, mhansson@linux-st28.site +49 -0
    Bug#30596: Correct result

  mysql-test/r/innodb_mysql.result@1.3.24.1, 2007-08-27 17:33:38+02:00, mhansson@linux-st28.site +49 -0
    Bug#30596: Test case for innodb. Here, as opposed to for MyISAM, row 
    lookup is done using index whenever the index covers the group list.

  mysql-test/t/group_by.test@1.59.1.6, 2007-08-27 17:33:38+02:00, mhansson@linux-st28.site +27 -0
    Bug#30596: Test case

  sql/sql_select.cc@1.312.177.1, 2007-08-27 17:33:38+02:00, mhansson@linux-st28.site +8 -0
    Bug#30596: The fix, replacing GROUP BY with ORDER BY unless 
    ORDER BY [NULL|<constant>]

ChangeSet@1.2476.379.1, 2007-08-27 18:44:13+04:00, skozlov@mysql.com +3 -0
  WL#3694 Replication of Invocation and Invoked Features Testing.
  Bug#29020 Event results not correctly replicated to slave in RBR: partially.

  mysql-test/suite/rpl/r/rpl_invoked_features.result@1.5, 2007-08-27 18:44:03+04:00, skozlov@mysql.com +14 -16
    Updated result file.

  mysql-test/suite/rpl/t/disabled.def@1.13, 2007-08-27 18:44:03+04:00, skozlov@mysql.com +0 -3
    removed test cases: rpl_invoked_features and rpl_innodb_mixed_* (alreade were commented out)

  mysql-test/suite/rpl/t/rpl_invoked_features.test@1.6, 2007-08-27 18:44:03+04:00, skozlov@mysql.com +49 -31
    Added comments, implemented the waiting via include/wait_condition, minor fixes.

ChangeSet@1.2476.183.37, 2007-08-27 16:17:17+02:00, rafal@quant.(none) +5 -0
  Post merge fixes.

  sql/log_event.cc@1.277.24.3, 2007-08-27 16:17:12+02:00, rafal@quant.(none) +23 -18
    - Rename RELAY_LOG_INFO -> Relay_log_info.
    - Rows_log_event fields which are used for event application not 
      included when compiling in MYSQL_CLIENT mode.

  sql/log_event.h@1.155.3.2, 2007-08-27 16:17:12+02:00, rafal@quant.(none) +12 -12
    - Rename RELAY_LOG_INFO -> Relay_log_info.
    - Rows_log_event fields which are used for event application not 
      included when compiling in MYSQL_CLIENT mode.

  sql/log_event_old.cc@1.5.2.3, 2007-08-27 16:17:12+02:00, rafal@quant.(none) +12 -12
    - Rename RELAY_LOG_INFO -> Relay_log_info.

  sql/log_event_old.h@1.7, 2007-08-27 16:17:12+02:00, rafal@quant.(none) +8 -8
    - Rename RELAY_LOG_INFO -> Relay_log_info.

  sql/sql_yacc.yy@1.598.2.1, 2007-08-27 16:17:13+02:00, rafal@quant.(none) +1 -12
    Reverting to version used in the rpl tree.

ChangeSet@1.1810.3290.5, 2007-08-27 10:37:12-03:00, davi@moksha.local +3 -0
  Bug#30632 HANDLER read failure causes hang
  
  If, after the tables are locked, one of the conditions to read from a
  HANDLER table is not met, the handler code wrongly jumps to a error path
  that won't unlock the tables.
  
  The user-visible effect is that after a error in a handler read command,
  all subsequent handler operations on the same table will hang.
  
  The fix is simply to correct the code to jump to the (same) error path that
  unlocks the tables.

  mysql-test/t/handler.test@1.25.2.1, 2007-08-27 10:37:10-03:00, davi@moksha.local +19 -0
    Bug#30632 test case

  mysql-test/r/handler.result@1.25.3.1, 2007-08-27 10:37:10-03:00, davi@moksha.local +13 -0
    Bug#30632 test case result

  sql/sql_handler.cc@1.72.1.19, 2007-08-27 10:37:10-03:00, davi@moksha.local +3 -3
    Always unlock the internal and external table level locks if any of the conditions
    (including errors) to read from a HANDLER table are not met.

ChangeSet@1.1810.3290.4, 2007-08-27 10:13:54-03:00, davi@moksha.local +3 -0
  Bug#25164 create table `a` as select * from `A` hangs
  
  The problem from a user's perspective: user creates table A, and then tries
  to CREATE TABLE a SELECT from A - and this causes a deadlock error, a hang,
  or fails with a debug assert, but only if the storage engine is InnoDB.
  
  The origin of the problem: InnoDB uses case-insensitive collation
  (system_charset_info) when looking up the internal table share, thus returning
  the same share for 'a' and 'A'.
  
  Cause of the user-visible behavior: since the same share is returned to SQL
  locking subsystem, it assumes that the same table is first locked (within the
  same session) for WRITE, and then for READ, and returns a deadlock error.
  However, the code is wrong in not properly cleaning up upon an error, leaving
  external locks in place, which leads to assertion failures and hangs.
  
  Fix that has been implemented: the SQL layer should properly propagate the
  deadlock error, cleaning up and freeing all resources.
  
  Further work towards a more complete solution: InnoDB should not use case
  insensitive collation for table share hash if table names on disk honor the case.

  mysql-test/t/innodb-deadlock.test@1.11.4.1, 2007-08-27 10:13:52-03:00, davi@moksha.local +26 -1
    Bug#25164 test case. The CREATE TABLE may fail depending on the character set
    of the system and filesystem, but it should never hang.

  mysql-test/r/innodb-deadlock.result@1.5.1.1, 2007-08-27 10:13:52-03:00, davi@moksha.local +11 -0
    Bug#25164 test case result

  sql/lock.cc@1.64.5.7, 2007-08-27 10:13:52-03:00, davi@moksha.local +2 -0
    Unlock the storage engine "external" table level locks, if the MySQL thr_lock
    locking subsystem detects a deadlock error.

ChangeSet@1.2476.345.15, 2007-08-27 13:55:45+02:00, msvensson@pilot.(none) +2 -0
  Enable abi_check for 5.1
   - Run icheck on all files in HEADERS_ABI list 
   - Update reference 

  include/Makefile.am@1.67.2.18, 2007-08-27 13:55:43+02:00, msvensson@pilot.(none) +5 -7
    Enable abi_check for external API header files

  include/mysql_h.ic@1.12, 2007-08-27 13:55:43+02:00, msvensson@pilot.(none) +471 -268
    Update abi_check reference

ChangeSet@1.2476.345.14, 2007-08-27 13:39:34+02:00, msvensson@pilot.(none) +1 -0
  Bug#28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE
   - Set sql_mode to default when creating system tables

  scripts/mysql_system_tables.sql@1.15, 2007-08-27 13:39:32+02:00, msvensson@pilot.(none) +1 -0
    set sql_mode = "" when creating the system tables

ChangeSet@1.2476.345.13, 2007-08-27 13:16:39+02:00, msvensson@pilot.(none) +1 -0
  Cset exclude: msvensson@pilot.(none)|ChangeSet|20070827092310|49459

  scripts/mysql_system_tables.sql@1.14, 2007-08-27 13:16:38+02:00, msvensson@pilot.(none) +0 -0
    Exclude

ChangeSet@1.1810.2885.67, 2007-08-27 11:38:32+02:00, df@pippilotta.erinye.com +1 -0
  adjust version number

  configure.in@1.245.77.40, 2007-08-27 11:38:31+02:00, df@pippilotta.erinye.com +2 -2
    adjust version number after 5.0.48 clone-off

ChangeSet@1.1810.3276.9, 2007-08-27 11:31:49+02:00, msvensson@pilot.(none) +1 -0
  Bug#29805 mysql_upgrade test fail if ~/.my.cnf contain a password
   - "mysql" and "mysqlcheck" should not read defaults file

  client/mysql_upgrade.c@1.6.1.20, 2007-08-27 11:31:48+02:00, msvensson@pilot.(none) +2 -0
    Instruct "mysql" and "mysqlcheck" that is invoked by "mysql_upgrade" not
    to read defaults file, they should get all the parameters they need from
    mysql_upgrade(that read the default file)

ChangeSet@1.2476.345.11, 2007-08-27 11:27:03+02:00, msvensson@pilot.(none) +1 -0
  Bug#30487 mysql_upgrade reports misleading errors
   - Update result file to include these "misleading errors", better to 
  run mysql_upgrade with them than not at all.

  mysql-test/r/mysql_upgrade.result@1.14, 2007-08-27 11:27:02+02:00, msvensson@pilot.(none) +24 -8
    Update result file for mysql_upgrade after removing it's disabling

ChangeSet@1.2476.345.9, 2007-08-27 11:20:31+02:00, msvensson@pilot.(none) +1 -0
  Bug#28560 mysql_upgrade test links /usr/local/mysql/lib libraries
   - Remove disabling of mysql_upgrade

  mysql-test/t/disabled.def@1.266.21.1, 2007-08-27 11:20:29+02:00, msvensson@pilot.(none) +0 -1
    Remove disabling of mysql_upgrade

ChangeSet@1.1810.3276.8, 2007-08-27 10:25:34+02:00, msvensson@pilot.(none) +1 -0
  Bug#28560 mysql_upgrade test links /usr/local/mysql/lib libraries
   - Chop off .libs/ part of path if running in non installed builddir
     using libtool

  client/mysql_upgrade.c@1.6.1.19, 2007-08-27 10:25:33+02:00, msvensson@pilot.(none) +41 -32
    Chop off .libs part of path to avoid executing "non relinked" binaries
    that would use the system installed dynamic libraries instead of the
    newly built ones.

ChangeSet@1.1810.3297.2, 2007-08-25 17:32:17+00:00, evgen@moonbone.local +1 -0
  sql_select.cc:
    Additional fix for the bug#30245.

  sql/sql_select.cc@1.312.174.4, 2007-08-25 17:11:45+00:00, evgen@moonbone.local +1 -1
    Additional fix for the bug#30245.

ChangeSet@1.2476.358.8, 2007-08-24 19:17:29-03:00, davi@moksha.local +2 -0
  Add test case for bug 29936 Stored Procedure DML ignores low_priority_updates setting.
  
  This test case uses the wait_condition helper (only available in 5.1) in order to wait till the select/update opens and locks the table.

  mysql-test/r/sp.result@1.288.1.1, 2007-08-24 19:17:25-03:00, davi@moksha.local +23 -0
    Test case result for bug 29936

  mysql-test/t/sp.test@1.251.1.1, 2007-08-24 19:17:26-03:00, davi@moksha.local +65 -0
    Test case for bug 29936

ChangeSet@1.2476.367.1, 2007-08-24 09:08:11-06:00, malff@weblab.(none) +1 -0
  
  Whitespace cleanup

  sql/sql_yacc.yy@1.597.1.6, 2007-08-24 09:08:07-06:00, malff@weblab.(none) +12 -11
    
    Whitespace cleaup

ChangeSet@1.2476.363.4, 2007-08-24 18:06:44+03:00, gkodinov@magare.gmz +3 -0
  Bug #28284: Test "mysqlslap" reports "out of memory"
  
  When locking a "fast" mutex a static variable cpu_count 
  was used as a flag to initialize itself on the first usage 
  by calling sysconf() and setting non-zero value.
  This is not thread and optimization safe on some 
  platforms. That's why the global initialization needs 
  to be done once in a designated function.
  This will also speed up the usage (by a small bit) 
  because it won't have to check if it's initialized on
  every call.
  
  Fixed by moving the fast mutexes initialization out of 
  my_pthread_fastmutex_lock() to fastmutex_global_init()
  and call it from my_init()

  include/my_pthread.h@1.116.1.1, 2007-08-24 18:06:42+03:00, gkodinov@magare.gmz +1 -0
    Bug #28284: move the fast mutexes initialization out of 
    my_pthread_fastmutex_lock() to fastmutex_global_init()
    and call it from my_init()

  mysys/my_init.c@1.52.1.10, 2007-08-24 18:06:42+03:00, gkodinov@magare.gmz +3 -0
    Bug #28284: move the fast mutexes initialization out of 
    my_pthread_fastmutex_lock() to fastmutex_global_init()
    and call it from my_init()

  mysys/thr_mutex.c@1.32, 2007-08-24 18:06:42+03:00, gkodinov@magare.gmz +11 -6
    Bug #28284: move the fast mutexes initialization out of 
    my_pthread_fastmutex_lock() to fastmutex_global_init()
    and call it from my_init()

ChangeSet@1.2476.357.11, 2007-08-24 16:40:26+02:00, jperkin@production.mysql.com +1 -0
  Finish up last syslog -> want_syslog change missed in r1.91,
  fixing bug#30624

  scripts/mysqld_safe.sh@1.93, 2007-08-24 16:39:16+02:00, jperkin@production.mysql.com +1 -1
    Fix last syslog -> want_syslog.

ChangeSet@1.1810.3276.7, 2007-08-24 15:43:45+02:00, msvensson@pilot.(none) +2 -0
  Remove unsued variable $glob_hostname, unused functions
  'mtr_short_hostname' and 'mtr_full_hostname'

  mysql-test/lib/mtr_misc.pl@1.12.1.11, 2007-08-24 15:43:44+02:00, msvensson@pilot.(none) +0 -26
    Remove unsued variable $glob_hostname, unused functions
    'mtr_short_hostname' and 'mtr_full_hostname'

  mysql-test/mysql-test-run.pl@1.30.49.99, 2007-08-24 15:43:44+02:00, msvensson@pilot.(none) +4 -4
    Remove unsued variable $glob_hostname, unused functions
    'mtr_short_hostname' and 'mtr_full_hostname'

ChangeSet@1.1810.3276.5, 2007-08-24 13:10:34+02:00, msvensson@pilot.(none) +1 -0
  Remove unecessary use of "Socket"

  mysql-test/lib/mtr_timer.pl@1.7.1.8, 2007-08-24 13:10:32+02:00, msvensson@pilot.(none) +0 -1
    Remove unecessary use of "Socket"

ChangeSet@1.1810.3292.2, 2007-08-24 10:47:13+02:00, joerg@trift2. +1 -0
  NetWare packages were missing the scripts to initialize the database: add them.

  netware/Makefile.am@1.15.1.10, 2007-08-24 10:47:10+02:00, joerg@trift2. +1 -1
    NetWare packages were missing the scripts to initialize the database: add them.

ChangeSet@1.2476.362.1, 2007-08-23 23:34:48+05:00, holyfoot@mysql.com +3 -0
  Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
  
  In the ha_partition::position() we didn't calculate the number
  of the partition of the record. We used m_last_part value instead,
  relying on that it is set in other place like previous call of a method
  like ::write_row(). In replication we don't call any of these befor
  position(). Delete_rows_log_event::do_exec_row calls find_and_fetch_row.
  In case of InnoDB-based PARTITION table, we have HA_PRIMARY_KEY_REQUIRED_FOR_POSITION
  enabled, so use position() / rnd_pos() calls to fetch the record.
  
  Fixed by adding partition_id calculation to the ha_partition::position()

  mysql-test/r/partition_pruning.result@1.26, 2007-08-23 23:32:38+05:00, holyfoot@mysql.com +2 -2
    Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
    test result fixed

  sql/ha_partition.cc@1.97.1.2, 2007-08-23 23:31:10+05:00, holyfoot@mysql.com +13 -1
    Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
    Calculate the number of the partition in ha_partition::position().
    ha_partition::column_bitmaps_signal() implemented

  sql/ha_partition.h@1.38.1.1, 2007-08-23 23:29:49+05:00, holyfoot@mysql.com +1 -0
     Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
    column_bitmaps_signal interface added

ChangeSet@1.1810.3231.32, 2007-08-23 20:24:48+02:00, msvensson@pilot.(none) +1 -0
  Bug#30593 No cipher list returned for "SHOW STATUS LIKE 'Ssl_cipher_list'"
   - Move increment of "i" to "increment section" of for loop
   - Protect against writing after end of "buff"(backport from 5.1)

  sql/sql_show.cc@1.253.61.1, 2007-08-23 20:24:47+02:00, msvensson@pilot.(none) +3 -2
    - Move the increment of i to "increment" section of for loop. Since "i"
    was initially 0 the for loop exited immediately
    - Add protection for writing after end of "buff"

ChangeSet@1.2476.359.1, 2007-08-23 15:37:55+02:00, thek@adventure.(none) +2 -0
  Bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist"
  
  Test case contains possible race conditions. This patch fixes these race
  conditions and also adjust the test to execute according to its documentation.

  mysql-test/r/events.result@1.54, 2007-08-23 15:37:53+02:00, thek@adventure.(none) +3 -0
    Modified test case to fit test documentation

  mysql-test/t/events.test@1.50, 2007-08-23 15:37:53+02:00, thek@adventure.(none) +6 -2
    Modified test case to fit test documentation

ChangeSet@1.1810.3293.1, 2007-08-23 10:22:20+02:00, thek@adventure.(none) +3 -0
  Bug#27358 INSERT DELAYED does not honour SQL_MODE of the client
  
  SQL_MODE was ignored when a client issued INSERT DELAYED.
  
  Some system settings weren't copied as intended when a record was saved for
  a delayed insert. 

  mysql-test/r/delayed.result@1.12.1.3, 2007-08-23 10:22:18+02:00, thek@adventure.(none) +29 -0
    Added test case

  mysql-test/t/delayed.test@1.11.1.8, 2007-08-23 10:22:18+02:00, thek@adventure.(none) +31 -0
    Added test case

  sql/sql_insert.cc@1.146.68.1, 2007-08-23 10:22:18+02:00, thek@adventure.(none) +8 -0
    - Added two new variables (sql_mode, auto_increment_field_not_null) to support
      SQL_MODE in INSERT DELAYED statements.

ChangeSet@1.1810.3290.3, 2007-08-22 18:11:01-06:00, malff@weblab.(none) +1 -0
  Do not use $static_link for GCOV builds,
  since this flag was explicitly removed in pushbuild for GCOV builds.
  
   BUILD_CMD => ['sh', '-c', 'perl -i.bak -pe "s/ \\\\\$static_link//" ' .
                'BUILD/compile-pentium-gcov; BUILD/compile-pentium-gcov'],
  
  Moving $static_link to SETUP.sh broke this, and is now fixed.
  
  Should this flag be needed on some platforms,
  the proper location is compile-<platform>-gcov
  
  Tested the amd64 and pentium64 build fine without it, and can run NDB tests.

  BUILD/SETUP.sh@1.44.1.22, 2007-08-22 18:10:58-06:00, malff@weblab.(none) +1 -1
    Removed $static_link from GCOV builds.

ChangeSet@1.2476.358.4, 2007-08-22 15:38:32-06:00, malff@weblab.(none) +3 -0
  Bug#30333 (Performance, expressions lists in the parser)
  
  Before this patch, the parser would execute:
  - Select->expr_list.push_front()
  - Select->expr_list.pop()
  when parsing expressions lists, in the following rules:
  - udf_expr_list
  - expr_list
  - ident_list
  
  This is unnecessary, and introduces overhead due to the memory allocations
  performed with Select->expr_list
  
  With this patch, this code has been removed.
  The list being parsed is maintained in the parser stack instead.
  
  Also, 'udf_expr_list' has been renamed 'opt_udf_expr_list', since this
  production can be empty.

  sql/sql_lex.cc@1.255.3.3, 2007-08-22 15:38:28-06:00, malff@weblab.(none) +0 -2
    Removed unused attribute expr_list

  sql/sql_lex.h@1.294, 2007-08-22 15:38:28-06:00, malff@weblab.(none) +0 -1
    Removed unused attribute expr_list

  sql/sql_yacc.yy@1.597.1.5, 2007-08-22 15:38:28-06:00, malff@weblab.(none) +41 -37
    Improved performances when parsing expression lists

ChangeSet@1.2476.358.3, 2007-08-22 14:25:36-06:00, malff@weblab.(none) +1 -0
  Manual merge

  sql/sql_yacc.yy@1.597.1.4, 2007-08-22 14:25:33-06:00, malff@weblab.(none) +98 -45
    Manual merge

ChangeSet@1.1810.3292.1, 2007-08-22 22:04:31+02:00, joerg@trift2. +4 -0
  Cleanup in the "netware" subdirectory:
  
  1) We do not provide the "isam" table handler in 5.0 and up (different from "myisam" !),
     so we do not need the ".def" files for the "isam"-specific tools.
  
  2) Use "basename" to get the base name of a file, not a harder-to-read sed expression.

  BitKeeper/deleted/.del-isamchk.def@1.8.1.2, 2007-08-22 21:29:58+02:00, joerg@trift2. +0 -0
    Delete: netware/isamchk.def

  BitKeeper/deleted/.del-isamlog.def@1.7.1.2, 2007-08-22 21:29:58+02:00, joerg@trift2. +0 -0
    Delete: netware/isamlog.def

  BitKeeper/deleted/.del-pack_isam.def@1.9.1.2, 2007-08-22 21:29:58+02:00, joerg@trift2. +0 -0
    Delete: netware/pack_isam.def

  netware/Makefile.am@1.15.1.9, 2007-08-22 22:04:28+02:00, joerg@trift2. +1 -1
    Use a plain "basename" showing the purpose, not a sed command which is harder to read.

ChangeSet@1.2476.358.2, 2007-08-22 12:02:23-06:00, malff@weblab.(none) +1 -0
  Manual merge

  BUILD/compile-pentium-gcov@1.23, 2007-08-22 12:02:18-06:00, malff@weblab.(none) +3 -10
    Manual merge

ChangeSet@1.1810.3243.6, 2007-08-22 11:05:35-06:00, malff@weblab.(none) +4 -0
  Bug#30237 (Performance regression in boolean expressions)
  
  This is a performance bug, related to the parsing or 'OR' and 'AND' boolean
  expressions.
  
  Let N be the number of expressions involved in a OR (respectively AND).
  
  When N=1
  
  For example, "select 1" involve only 1 term: there is no OR operator.
  
  In 4.0 and 4.1, parsing expressions not involving OR had no overhead.
  In 5.0, parsing adds some overhead, with Select->expr_list.
  
  With this patch, the overhead introduced in 5.0 has been removed,
  so that performances for N=1 should be identical to the 4.0 performances,
  which are optimal (there is no code executed at all)
  
  The overhead in 5.0 was in fact affecting significantly some operations.
  For example, loading 1 Million rows into a table with INSERTs,
  for a table that has 100 columns, leads to parsing 100 Millions of
  expressions, which means that the overhead related to Select->expr_list
  is executed 100 Million times ...
  
  Considering that N=1 is by far the most probable expression,
  this case should be optimal.
  
  When N=2
  
  For example, "select a OR b" involves 2 terms in the OR operator.
  
  In 4.0 and 4.1, parsing expressions involving 2 terms created 1 Item_cond_or
  node, which is the expected result.
  In 5.0, parsing these expression also produced 1 node, but with some extra
  overhead related to Select->expr_list : creating 1 list in Select->expr_list
  and another in Item_cond::list is inefficient.
  
  With this patch, the overhead introduced in 5.0 has been removed
  so that performances for N=2 should be identical to the 4.0 performances.
  Note that the memory allocation uses the new (thd->mem_root) syntax
  directly.
  The cost of "is_cond_or" is estimated to be neglectable: the real problem
  of the performance degradation comes from unneeded memory allocations.
  
  When N>=3
  
  For example, "select a OR b OR c ...", which involves 3 or more terms.
  
  In 4.0 and 4.1, the parser had no significant cost overhead, but produced
  an Item tree which is difficult to evaluate / optimize during runtime.
  In 5.0, the parser produces a better Item tree, using the Item_cond
  constructor that accepts a list of children directly, but at an extra cost
  related to Select->expr_list.
  
  With this patch, the code is implemented to take the best of the two
  implementations:
  - there is no overhead with Select->expr_list
  - the Item tree generated is optimized and flattened.
  
  This is achieved by adding children nodes into the Item tree directly,
  with Item_cond::add(), which avoids the need for temporary lists and memory
  allocation
  
  Note that this patch also provide an extra optimization, that the previous
  code in 5.0 did not provide: expressions are flattened in the Item tree,
  based on what the expression already parsed is, and not based on the order
  in which rules are reduced.
  
  For example : "(a OR b) OR c", "a OR (b OR c)" would both be represented
  with 2 Item_cond_or nodes before this patch, and with 1 node only with this
  patch. The logic used is based on the mathematical properties of the OR
  operator (it's associative), and produces a simpler tree.

  mysql-test/r/parser_precedence.result@1.1, 2007-08-22 11:05:33-06:00, malff@weblab.(none) +356 -0
    Added test cases to cover boolean operator precedence
    

  mysql-test/r/parser_precedence.result@1.0, 2007-08-22 11:05:33-06:00, malff@weblab.(none) +0 -0

  mysql-test/t/parser_precedence.test@1.1, 2007-08-22 11:05:33-06:00, malff@weblab.(none) +93 -0
    Added test cases to cover boolean operator precedence
    

  mysql-test/t/parser_precedence.test@1.0, 2007-08-22 11:05:33-06:00, malff@weblab.(none) +0 -0

  sql/item_cmpfunc.h@1.122.21.1, 2007-08-22 11:05:33-06:00, malff@weblab.(none) +18 -0
    Improved performances for parsing boolean expressions

  sql/sql_yacc.yy@1.371.129.1, 2007-08-22 11:05:33-06:00, malff@weblab.(none) +97 -43
    Improved performances for parsing boolean expressions

ChangeSet@1.2476.357.3, 2007-08-22 17:32:35+02:00, joerg@trift2. +1 -0
  Raise the version number to 5.1.23,
  because we already split off a tree for 5.1.22 to receive only selected fixes.

  configure.in@1.355.52.28, 2007-08-22 17:32:30+02:00, joerg@trift2. +1 -1
    Raise the version number to 5.1.23,
    because we already split off a tree for 5.1.22 to receive only selected fixes.

ChangeSet@1.2476.357.2, 2007-08-22 17:25:31+02:00, joerg@trift2. +1 -0
  Correct an erroneous manual merge.

  sql/sql_yacc.yy@1.598.1.2, 2007-08-22 17:25:25+02:00, joerg@trift2. +0 -1
    Correct an erroneous manual merge, which had brought a duplicate line - remove one.

ChangeSet@1.1810.3282.2, 2007-08-22 16:08:40+02:00, jperkin@production.mysql.com +1 -0
  Remove deleted files from bdb CMake configuration.  Fixes bug#27693.

  bdb/CMakeLists.txt@1.1.2.1, 2007-08-22 16:05:41+02:00, jperkin@production.mysql.com +7 -7
    Update file list to match reality.

ChangeSet@1.2476.354.3, 2007-08-22 16:18:27+03:00, jani@hynda.mysql.fi +2 -0
  Removed a test which output may differ depending on machine load.

  mysql-test/r/status.result@1.20, 2007-08-22 16:18:24+03:00, jani@hynda.mysql.fi +0 -2
    Removed a test which output may differ depending on machine load.

  mysql-test/t/status.test@1.28, 2007-08-22 16:18:24+03:00, jani@hynda.mysql.fi +0 -4
    Removed a test which output may differ depending on machine load.

ChangeSet@1.1810.3289.1, 2007-08-22 18:15:54+05:00, gshchepa@gleb.loc +1 -0
  Fixed bug #30201.
  Killing a SELECT query with KILL QUERY or KILL CONNECTION
  causes a server crash if the query cache is enabled.
  
  Normal evaluation of a query may be interrupted by the
  KILL QUERY/CONNECTION statement, in this case the mysql_execute_command
  function returns TRUE, and the thd->killed flag has true value.
  In this case the result of the query may
  be cached incompletely (omitting call to query_cache_insert inside
  the net_real_write function), and next call to query_cache_end_of_result
  may lead to server crash.
  Thus, the query_cache_end_of_result function has been modified to abort
  query cache in the case of killed thread.
  

  sql/sql_cache.cc@1.76.12.1, 2007-08-22 18:15:47+05:00, gshchepa@gleb.loc +23 -14
    Fixed bug #30201.
    The  query_cache_end_of_result function has been modified to abort query
    cache in the case of query execution failure. Also this function has been
    modified to remove incomplete query block.

ChangeSet@1.1810.3287.3, 2007-08-22 15:43:16+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +2 -0
  bug#23333
  
  fixing the test due a to different offsets in binlog with ps-protocol (a possible bug to be reported)

  mysql-test/r/sp_trans_log.result@1.1.1.2, 2007-08-22 15:43:13+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +4 -3
    results changed as prescribed

  mysql-test/t/sp_trans_log.test@1.1.1.2, 2007-08-22 15:43:13+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +2 -1
    Replacing the reporting pattern
    
    ### a possible bug: 
    #show master status /* the offset must denote there is the query */|
    # displays different offests in ps-protocol
    
    with 
      show binlog events

ChangeSet@1.2476.197.35, 2007-08-22 10:56:10+03:00, monty@mysql.com +4 -0
  Fixed compiler warnings
  Fixed wrong hash function prototype (causes failure on 64 bit systems)

  mysql-test/r/rpl_events.result@1.7.1.2, 2007-08-22 10:56:08+03:00, monty@mysql.com +2 -4
    Removed wrong merge (result file is now identical as in 5.1 tree)

  mysys/lf_hash.c@1.18, 2007-08-22 10:56:08+03:00, monty@mysql.com +4 -4
    Fixed compiler warning

  mysys/my_safehash.c@1.4, 2007-08-22 10:56:08+03:00, monty@mysql.com +1 -1
    Fixed wrong hash function prototype (causes failure on 64 bit systems)

  storage/maria/unittest/ma_test_loghandler_max_lsn-t.c@1.2, 2007-08-22 10:56:08+03:00, monty@mysql.com +0 -1
    Fixed compiler warning

ChangeSet@1.1810.3287.2, 2007-08-22 10:40:38+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +2 -0
  bug#27417
  
  refining of cleanup of the tests.

  mysql-test/t/mix_innodb_myisam_binlog.test@1.20.14.2, 2007-08-22 10:40:35+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +1 -1
    proper cleanup.

  mysql-test/r/mix_innodb_myisam_binlog.result@1.24.11.2, 2007-08-22 10:40:35+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +1 -1
    results changed.

ChangeSet@1.2476.356.1, 2007-08-21 20:54:11+03:00, monty@mysql.com +9 -0
  Fixes for bugs found by maria.test and event*tests:
  Fixed bug when doing rnd_read followed by update.
  Don't duplicate error messages in log
  Initialize transaction object properly. Fixed failure in event*tests when running with maria

  mysql-test/mysql-test-run.pl@1.316, 2007-08-21 20:54:08+03:00, monty@mysql.com +5 -2
    Removed warning when running with --external

  mysql-test/r/maria.result@1.15, 2007-08-21 20:54:08+03:00, monty@mysql.com +23 -1
    Added back disabled test
    Verified that the result changes are correct

  mysql-test/t/maria.test@1.17, 2007-08-21 20:54:08+03:00, monty@mysql.com +3 -5
    Added back disabled test

  sql/handler.cc@1.320, 2007-08-21 20:54:08+03:00, monty@mysql.com +3 -3
    More debugging.
    Simple style change

  sql/sql_class.cc@1.335.9.1, 2007-08-21 20:54:08+03:00, monty@mysql.com +1 -0
    Initialize transaction object properly. Fixed failure in event*tests when running with maria

  storage/maria/ha_maria.cc@1.37, 2007-08-21 20:54:08+03:00, monty@mysql.com +1 -0
    More dbug info

  storage/maria/ma_blockrec.c@1.34, 2007-08-21 20:54:08+03:00, monty@mysql.com +0 -1
    Removed not needed line

  storage/maria/ma_rrnd.c@1.6, 2007-08-21 20:54:08+03:00, monty@mysql.com +1 -9
    Removed not used code
    Ensure that cur_row.lastpos is always set when reading record with rnd. (Fixes failure in maria.test)

  storage/maria/maria_def.h@1.29, 2007-08-21 20:54:08+03:00, monty@mysql.com +5 -0
    Don't call maria_print_error() except with EXTRA_DEBUG
    (Removes duplicate error messages when somethings goes wrong)

ChangeSet@1.2476.1.62, 2007-08-21 16:26:00+02:00, tomas@whalegate.ndb.mysql.com +13 -0
  rpl_ndb_dd_partitions-slave.opt:
    Rename: mysql-test/t/rpl_ndb_dd_partitions-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt
  .del-rpl_stm_extraColmaster_ndb.result:
    Delete: mysql-test/r/rpl_stm_extraColmaster_ndb.result
  .del-rpl_extraColmaster_myisam.test:
    Delete: mysql-test/t/rpl_extraColmaster_myisam.test
  ndb_bug26793.result:
    Rename: mysql-test/r/ndb_bug26793.result -> mysql-test/suite/ndb/r/ndb_bug26793.result
  .del-rpl_extraColmaster_innodb-slave.opt:
    Delete: mysql-test/t/rpl_extraColmaster_innodb-slave.opt
  .del-rpl_extraColmaster_innodb-master.opt:
    Delete: mysql-test/t/rpl_extraColmaster_innodb-master.opt
  .del-rpl_row_extraColmaster_ndb.test:
    Delete: mysql-test/t/rpl_row_extraColmaster_ndb.test
  .del-rpl_row_extraColmaster_ndb.result:
    Delete: mysql-test/r/rpl_row_extraColmaster_ndb.result
  .del-rpl_stm_extraColmaster_ndb.test:
    Delete: mysql-test/t/rpl_stm_extraColmaster_ndb.test
  .del-rpl_extraColmaster_innodb.test:
    Delete: mysql-test/t/rpl_extraColmaster_innodb.test
  ndb_bug26793.test:
    Rename: mysql-test/t/ndb_bug26793.test -> mysql-test/suite/ndb/t/ndb_bug26793.test
  rpl_ndb_dd_partitions-master.opt:
    Rename: mysql-test/t/rpl_ndb_dd_partitions-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt
  .del-rpl_colSize.test~d9690ba9ffd2b048:
    Delete: mysql-test/t/rpl_colSize.test

  BitKeeper/deleted/.del-rpl_colSize.test~d9690ba9ffd2b048@1.2, 2007-08-21 15:58:50+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Delete: mysql-test/t/rpl_colSize.test

  BitKeeper/deleted/.del-rpl_extraColmaster_innodb-master.opt@1.2, 2007-08-21 15:59:10+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Delete: mysql-test/t/rpl_extraColmaster_innodb-master.opt

  BitKeeper/deleted/.del-rpl_extraColmaster_innodb-slave.opt@1.2, 2007-08-21 15:59:10+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Delete: mysql-test/t/rpl_extraColmaster_innodb-slave.opt

  BitKeeper/deleted/.del-rpl_extraColmaster_innodb.test@1.2, 2007-08-21 15:59:11+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Delete: mysql-test/t/rpl_extraColmaster_innodb.test

  BitKeeper/deleted/.del-rpl_extraColmaster_myisam.test@1.2, 2007-08-21 15:59:11+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Delete: mysql-test/t/rpl_extraColmaster_myisam.test

  BitKeeper/deleted/.del-rpl_row_extraColmaster_ndb.result@1.3, 2007-08-21 16:04:52+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Delete: mysql-test/r/rpl_row_extraColmaster_ndb.result

  BitKeeper/deleted/.del-rpl_row_extraColmaster_ndb.test@1.2, 2007-08-21 16:02:59+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Delete: mysql-test/t/rpl_row_extraColmaster_ndb.test

  BitKeeper/deleted/.del-rpl_stm_extraColmaster_ndb.result@1.2, 2007-08-21 16:04:52+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Delete: mysql-test/r/rpl_stm_extraColmaster_ndb.result

  BitKeeper/deleted/.del-rpl_stm_extraColmaster_ndb.test@1.2, 2007-08-21 16:02:59+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Delete: mysql-test/t/rpl_stm_extraColmaster_ndb.test

  mysql-test/suite/ndb/r/ndb_bug26793.result@1.5, 2007-08-21 16:04:23+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/r/ndb_bug26793.result -> mysql-test/suite/ndb/r/ndb_bug26793.result

  mysql-test/suite/ndb/t/ndb_bug26793.test@1.5, 2007-08-21 16:04:01+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/t/ndb_bug26793.test -> mysql-test/suite/ndb/t/ndb_bug26793.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt@1.2, 2007-08-21 16:25:18+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/t/rpl_ndb_dd_partitions-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt

  mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt@1.2, 2007-08-21 16:25:24+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/t/rpl_ndb_dd_partitions-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt

ChangeSet@1.1810.2885.59, 2007-08-21 18:59:42+05:00, gluh@mysql.com +1 -0
  compiler warning fix

  sql/sql_show.cc@1.253.59.5, 2007-08-21 18:59:41+05:00, gluh@mysql.com +2 -0
    compiler warning fix

ChangeSet@1.2476.327.11, 2007-08-21 17:55:49+05:00, gluh@mysql.com +2 -0
  Bug#27629 Possible security flaw in INFORMATION_SCHEMA and SHOW statements(addon for 5.1)
  added TRIGGER_ACL check for I_S.TRIGGERS

  mysql-test/r/information_schema.result@1.151.2.2, 2007-08-21 17:55:47+05:00, gluh@mysql.com +3 -3
    result fix

  sql/sql_show.cc@1.429.3.2, 2007-08-21 17:55:47+05:00, gluh@mysql.com +1 -1
    Bug#27629 Possible security flaw in INFORMATION_SCHEMA and SHOW statements(addon for 5.1)
    added TRIGGER_ACL check for I_S.TRIGGERS

ChangeSet@1.1810.3287.1, 2007-08-21 15:16:55+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +8 -0
  Bug #23333 stored function + non-transac table + transac table = breaks stmt-based binlog
  
  Binlogging of the statement with a side effect like a modified non-trans table did not happen.
  The artifact involved all binloggable dml queries.
  
  Fixed with changing the binlogging conditions all over the code to exploit thd->transaction.stmt.modified_non_trans_table
  introduced by the patch for bug@27417.
  
  Multi-delete case has own specific addressed by another bug@29136. Multi-update case has been addressed by bug#27716 and
  patch and will need merging.

  mysql-test/r/sp_trans_log.result@1.1.1.1, 2007-08-21 15:16:51+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +3 -2
    results changed

  mysql-test/t/sp_trans_log.test@1.1.1.1, 2007-08-21 15:16:52+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +1 -2
    refining of the proof of that there is an event in binlog

  mysql-test/t/mix_innodb_myisam_binlog.test@1.20.14.1, 2007-08-21 15:16:51+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +119 -1
    specific to the bug tests added

  mysql-test/r/mix_innodb_myisam_binlog.result@1.24.11.1, 2007-08-21 15:16:51+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +71 -2
    results changed

  sql/sql_delete.cc@1.144.22.12, 2007-08-21 15:16:52+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +3 -3
    deploying the binlogging check with thd->transaction.stmt.modified_non_trans_table

  sql/sql_insert.cc@1.146.44.39, 2007-08-21 15:16:52+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +39 -39
    binlogging when thd->transaction.stmt.modified_non_trans_table is TRUE. Merge with Bug#29571.

  sql/sql_load.cc@1.78.1.39, 2007-08-21 15:16:52+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +1 -1
    binlogging when thd->transaction.stmt.modified_non_trans_table is true

  sql/sql_update.cc@1.154.38.8, 2007-08-21 15:16:52+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +1 -1
    binlogging when thd->transaction.stmt.modified_non_trans_table is true

ChangeSet@1.1810.3223.3, 2007-08-21 13:43:09+02:00, thek@adventure.(none) +5 -0
  Bug#30269 Query cache eats memory
  
  Although the query cache doesn't support retrieval of statements containing
  column level access control, it was still possible to cache such statements
  thus wasting memory.
    
  This patch extends the access control check on the target tables to avoid
  caching a statement with column level restrictions. 
  
  Views are excepted and can be cached but only retrieved by super user account.

  mysql-test/r/query_cache.result@1.65.10.2, 2007-08-21 13:43:07+02:00, thek@adventure.(none) +7 -2
    Modified test case to allow caching of views

  mysql-test/r/query_cache_with_views.result@1.6, 2007-08-21 12:29:11+02:00, thek@adventure.(none) +0 -0
    Rename: mysql-test/r/view_query_cache.result -> mysql-test/r/query_cache_with_views.result

  mysql-test/t/query_cache.test@1.49.7.2, 2007-08-21 13:43:07+02:00, thek@adventure.(none) +4 -1
    Modified test case to allow caching of views

  mysql-test/t/query_cache_with_views.test@1.5, 2007-08-21 12:28:27+02:00, thek@adventure.(none) +0 -0
    Rename: mysql-test/t/view_query_cache.test -> mysql-test/t/query_cache_with_views.test

  sql/sql_cache.cc@1.76.10.7, 2007-08-21 13:43:07+02:00, thek@adventure.(none) +12 -1
    Allow caching of views

ChangeSet@1.2476.348.3, 2007-08-20 17:50:42-06:00, malff@weblab.(none) +2 -0
  Fixed 5.0 -> 5.1 merge

  mysql-test/include/handler.inc@1.36, 2007-08-20 17:50:39-06:00, malff@weblab.(none) +1 -1
    Fixed 5.0 -> 5.1 merge

  mysql-test/r/handler_innodb.result@1.18, 2007-08-20 17:50:39-06:00, malff@weblab.(none) +7 -0
    Fixed 5.0 -> 5.1 merge

ChangeSet@1.1810.3285.1, 2007-08-21 01:39:39+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #30287.
  The server created temporary tables for filesort in the working directory
  instead of the specified tmpdir directory.

  sql/item.cc@1.113.1.168, 2007-08-21 01:09:20+05:00, gshchepa@gleb.loc +2 -0
    Fixed bug #30287.
    The Item_field::set_field method has been modified to reset the any_privileges
    flag to false in case of system temporary table. This modification prevents the
    server from unnecessary checking of user privileges to access system temporary
    tables.

  sql/sql_select.cc@1.312.176.1, 2007-08-21 01:09:43+05:00, gshchepa@gleb.loc +8 -11
    Fixed bug #30287.
    Bugfix for #29015 has been removed: TABLE_SHARE::table_name of system
    temporary tables contains full path to table file basename again.

  sql/sql_view.cc@1.78.1.38, 2007-08-21 01:09:50+05:00, gshchepa@gleb.loc +6 -0
    Fixed bug #30287.
    Commentary has been added.

ChangeSet@1.2476.290.3, 2007-08-20 13:03:50-07:00, brian@piggy.tangent.org +2 -0
  Extending tests for detach (found a memory issue in it, this fixes that and now tests it).

  client/mysqlslap.c@1.57.1.2, 2007-08-20 13:03:48-07:00, brian@piggy.tangent.org +7 -0
    Fix memory allocation

  mysql-test/t/mysqlslap.test@1.17, 2007-08-20 13:03:48-07:00, brian@piggy.tangent.org +2 -0
    Extend test for --detach

ChangeSet@1.1810.3284.1, 2007-08-20 11:00:51-06:00, tsmith@ramayana.hindu.god +1 -0
  Bug #27694: mysqlhotcopy & p5-DBD-mysql51-4.003
  
  Use "SHOW TABLES FROM `db`" instead of $dbh->tables() in the
  get_list_of_tables() routine.
  
  The symptom is that, when used with recent versions of DBD::mysql,
  mysqlhotcopy uses a double-qualified table name, for example:
  
  Invalid db.table name 'test.test`.`x' at /usr/bin/mysqlhotcopy line 855.
  
  This is caused by a change in DBD::mysql.  See this diff:
  
  http://svn.perl.org/viewcvs/modules/DBD-mysql/trunk/lib/DBD/mysql.pm?r1=9183&r2=9188
  
  Basically, older DBD::mysql implemented a limited ->table_info method;
  now the full method is implemented, and as a result DBI's ->tables()
  method has access to the schema value, so it uses it.

  scripts/mysqlhotcopy.sh@1.53, 2007-08-20 11:00:49-06:00, tsmith@ramayana.hindu.god +7 -23
    Use "SHOW TABLES FROM `db`" instead of $dbh->tables() in
    get_list_of_tables().  DBI's ->tables() method calls
    "SHOW TABLES" under the hood, and then quotes the
    names and (depending on DBD::mysql version) adds the schema
    name, too.  mysqlhotcopy doesn't want the schema name
    or the quotes, so it's all around better to just call
    "SHOW TABLES" itself.

ChangeSet@1.1810.3271.3, 2007-08-20 14:57:04+00:00, lzhou@dev3-63.(none) +1 -0
  BUG#29674 Remove warning in pushbuild in 5.0

  ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.74.36.1, 2007-08-20 14:56:57+00:00, lzhou@dev3-63.(none) +1 -1
    Remove warning in pushbuild

ChangeSet@1.1810.3282.1, 2007-08-20 16:14:35+02:00, jperkin@production.mysql.com +1 -0
  Fix bug#27520.  For some unknown reason, libtool.m4 attempts
  to find "ar" but if it cannot be found sets AR=false.  This
  leads to confusing failures during the build rather than at
  configure time.
  
  We have our own checks for ar, but as AR was already set
  earlier by the libtool tests they were never exectuted.
  
  Therefore, update the tests so that we catch any libtool
  failures, and run AC_CHECK_PROG explicitly to ensure that we
  see sensible output from configure prior to any potential
  failure.

  config/ac-macros/misc.m4@1.12.1.4, 2007-08-20 15:53:29+02:00, jperkin@production.mysql.com +1 -4
    AC_CHECK_PROG does nothing if the first argument (variable) is
    already set, so remove redundant check for the empty string.
    This also ensures that a 'checking for ar' message is printed
    prior to any failure, which is far less confusing.

  config/ac-macros/misc.m4@1.12.1.3, 2007-08-20 15:52:42+02:00, jperkin@production.mysql.com +1 -1
    libtool.m4 sets AR=false if "ar" is not found in $PATH, so
    match that as well for failure.

ChangeSet@1.2476.347.1, 2007-08-20 15:12:14+02:00, msvensson@shellback.(none) +1 -0
  Make it possible to pass mysql-test-run.pl test cases to run
  also on the <suite>.<testname> format

  mysql-test/lib/mtr_cases.pl@1.61.1.3, 2007-08-20 15:12:12+02:00, msvensson@shellback.(none) +7 -2
    Make it possible to pass mysql-test-run.pl test cases to run
    also on the <suite>.<testname> format

ChangeSet@1.1810.3269.2, 2007-08-20 13:46:42+02:00, msvensson@pilot.(none) +1 -0
  Only install second master db if using second master

  mysql-test/mysql-test-run.pl@1.30.92.2, 2007-08-20 13:46:41+02:00, msvensson@pilot.(none) +1 -1
    Only install second master db if using second master

ChangeSet@1.1810.3271.2, 2007-08-20 10:47:09+00:00, lzhou@dev3-63.(none) +1 -0
  BUG#29674 add install data of the new test case in makefile.am

  mysql-test/Makefile.am@1.66.6.1, 2007-08-20 10:47:02+00:00, lzhou@dev3-63.(none) +9 -1
    Add install info of new test case data in makefile.am

ChangeSet@1.2476.346.2, 2007-08-20 13:24:37+04:00, skozlov@mysql.com +2 -0
  Bug#29363

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@1.6, 2007-08-20 13:24:20+04:00, skozlov@mysql.com +2 -2
    removed file_id,block_len from SHOW BINLOG EVENTS

  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result@1.6, 2007-08-20 13:24:21+04:00, skozlov@mysql.com +2 -2
    updated result file

ChangeSet@1.2476.346.1, 2007-08-20 12:31:21+04:00, skozlov@mysql.com +1 -0
  rpl.rpl_innodb_mixed_dml enabled

  mysql-test/suite/rpl/t/disabled.def@1.12, 2007-08-20 12:31:11+04:00, skozlov@mysql.com +1 -1
    rpl.rpl_innodb_mixed_dml enabled

ChangeSet@1.1810.3281.1, 2007-08-20 11:23:08+05:00, gluh@mysql.com +4 -0
  Bug#27629 Possible security flaw in INFORMATION_SCHEMA and SHOW statements
  added SUPER_ACL check for I_S.TRIGGERS

  mysql-test/r/information_schema.result@1.87.4.7, 2007-08-20 11:23:06+05:00, gluh@mysql.com +25 -1
    result fix

  mysql-test/r/information_schema_db.result@1.1.2.3, 2007-08-20 11:23:06+05:00, gluh@mysql.com +0 -2
    result fix

  mysql-test/t/information_schema.test@1.65.4.5, 2007-08-20 11:23:06+05:00, gluh@mysql.com +26 -0
    test case

  sql/sql_show.cc@1.253.59.4, 2007-08-20 11:23:06+05:00, gluh@mysql.com +8 -2
    added SUPER_ACL check for I_S.TRIGGERS

ChangeSet@1.2476.197.33, 2007-08-19 22:27:43+03:00, bell@desktop.sanja.is.com.ua +6 -0
  Storing/getting maximum LSN of the record which parts written
  in the file to the file header.

  storage/maria/ma_loghandler.c@1.36, 2007-08-19 22:27:40+03:00, bell@desktop.sanja.is.com.ua +353 -25
    Storing/getting maximum LSN of the record which parts written
    in the file to the file header.

  storage/maria/ma_loghandler.h@1.18, 2007-08-19 22:27:40+03:00, bell@desktop.sanja.is.com.ua +1 -0
    Getting maximum LSN of the record which parts written
    in the file to the file header.

  storage/maria/unittest/Makefile.am@1.14, 2007-08-19 22:27:40+03:00, bell@desktop.sanja.is.com.ua +3 -1
    Test suite for getting max LSN added.

  storage/maria/unittest/ma_test_loghandler_first_lsn-t.c@1.2, 2007-08-19 22:27:40+03:00, bell@desktop.sanja.is.com.ua +3 -4
    Spelling fixed.
    Cleanup fixed.

  storage/maria/unittest/ma_test_loghandler_max_lsn-t.c@1.1, 2007-08-19 22:27:40+03:00, bell@desktop.sanja.is.com.ua +143 -0
    New BitKeeper file ``storage/maria/unittest/ma_test_loghandler_max_lsn-t.c''

  storage/maria/unittest/ma_test_loghandler_max_lsn-t.c@1.0, 2007-08-19 22:27:40+03:00, bell@desktop.sanja.is.com.ua +0 -0

  storage/maria/unittest/ma_test_loghandler_noflush-t.c@1.2, 2007-08-19 22:27:40+03:00, bell@desktop.sanja.is.com.ua +2 -2
    Cleanup fixed.

ChangeSet@1.2476.345.3, 2007-08-18 02:28:08-06:00, tsmith@ramayana.hindu.god +2 -0
  Bug #29307: status.test fails with different Table_locks_immediate
  
  Finish premature patch which was accidentally pushed; remove debugging
  info and correct the test.

  mysql-test/r/status.result@1.17.1.1, 2007-08-18 02:28:06-06:00, tsmith@ramayana.hindu.god +3 -6
    Correct test results

  mysql-test/t/status.test@1.25.1.2, 2007-08-18 02:28:06-06:00, tsmith@ramayana.hindu.god +7 -5
    Disable query log for one statement, and correct some comments

ChangeSet@1.2476.330.9, 2007-08-17 19:29:08-06:00, tsmith@ramayana.hindu.god +2 -0
  Bug #29307: status.test fails with different Table_locks_immediate
  
  When using --log --log-output=table, we increment Table_locks_immediate
  with every query.  The wait_condition.inc runs a query a variable number
  of times, depending on server load, etc.  This is a problem, when the
  test is checking the Table_locks_immediate value.
  
  Fix is to adjust the Table_locks_immediate value based on how many times
  the wait_condition query was executed.

  mysql-test/include/wait_condition.inc@1.3, 2007-08-17 19:29:06-06:00, tsmith@ramayana.hindu.god +5 -0
    Add a $wait_condition_reps variable, which lets the caller check how
    many times the wait_condition query was executed.
    
    This is used in the main.status test to adjust the value of
    Table_locks_immediate (it gets incremented with each query
    when --log --log-output=table).

  mysql-test/t/status.test@1.25.1.1, 2007-08-17 19:29:06-06:00, tsmith@ramayana.hindu.god +28 -2
    Adjust Table_locks_immediate value based on how many times the
    wait_condition query had to run.

ChangeSet@1.2476.344.1, 2007-08-17 17:11:08-03:00, davi@moksha.local +2 -0
  Bug#29936 (Stored Procedure DML ignores low_priority_updates setting)
  
  This is a follow up for the patch for Bug#26162 "Trigger DML ignores low_priority_updates setting", where the stored procedure ignores the session setting of low_priority_updates.

  sql/lock.cc@1.106.11.3, 2007-08-17 17:11:05-03:00, davi@moksha.local +1 -0
    Add late lock_type assertion.

  sql/sql_base.cc@1.421.1.3, 2007-08-17 17:11:05-03:00, davi@moksha.local +2 -7
    Possibly downgrade lock type to the the session setting of low_priority_updates and also remove early assertion.

ChangeSet@1.2476.343.1, 2007-08-17 19:51:25+02:00, jmiller@mysql.com +1 -0
  rpl_packet.test:
    Removed sleep from test per lars request

  mysql-test/suite/rpl/t/rpl_packet.test@1.11, 2007-08-17 19:51:05+02:00, jmiller@mysql.com +0 -1
    Removed sleep from test per lars request

ChangeSet@1.1810.3223.2, 2007-08-17 16:55:20+02:00, thek@adventure.(none) +4 -0
  Bug #30269 Query cache eats memory
  
  Although the query cache doesn't support retrieval of statements containing
  column level access control, it was still possible to cache such statements
  thus wasting memory.
  
  This patch extends the access control check on the target tables to avoid
  caching a statement with column level restrictions. 

  mysql-test/r/query_cache.result@1.65.10.1, 2007-08-17 16:55:19+02:00, thek@adventure.(none) +24 -0
    Added test

  mysql-test/t/query_cache.test@1.49.7.1, 2007-08-17 16:55:19+02:00, thek@adventure.(none) +29 -1
    Added test

  sql/sql_cache.cc@1.76.10.6, 2007-08-17 16:55:19+02:00, thek@adventure.(none) +21 -3
    The function check_table_access leaves the artifact
    grant.want_privileges= 1, if a statement refers to tables with column level
    privileges. To avoid the statement from being stored into the query cache,
    it is enough to check this flag and set 'safe_to_cache_query' to zero.

  sql/sql_cache.h@1.30.1.7, 2007-08-17 16:55:19+02:00, thek@adventure.(none) +5 -3
    - Removed 'static' attribute or class methods
    - Added THD parameter to process_and_count_tables

ChangeSet@1.2476.323.13, 2007-08-17 11:34:12-03:00, davi@moksha.local +3 -0
  Bug#25856 (HANDLER table OPEN in one connection lock DROP TABLE in another one)
  
  mysql_ha_open calls mysql_ha_close on the error path (unsupported) to close the (opened) table before inserting it into the tables hash list handler_tables_hash) but mysql_ha_close only closes tables which are on the hash list, causing the table to be left open and locked.
  
  This change moves the table close logic into a separate function that is always called on the error path of mysql_ha_open or on a normal handler close (mysql_ha_close).

  mysql-test/r/lock_multi.result@1.30, 2007-08-17 11:34:08-03:00, davi@moksha.local +7 -0
    Bug#25856 test result

  mysql-test/t/lock_multi.test@1.32, 2007-08-17 11:34:08-03:00, davi@moksha.local +15 -0
    Bug#25856 test case

  sql/sql_handler.cc@1.95.2.1, 2007-08-17 11:34:08-03:00, davi@moksha.local +47 -33
    Move the table close logic into a separate function that is always called on the error path of mysql_ha_open or on a normal handler close.

ChangeSet@1.1810.3280.1, 2007-08-17 18:30:41+04:00, evgen@moonbone.local +3 -0
  Bug#30245: A wrong type of a BIT field is reported when grouped by it.
  
  HEAP tables can't index BIT fields. Due to this when grouping by such fields is
  needed they are converted to a fields of the LONG type when temporary table
  is being created. But a side effect of this is that a wrong type of BIT
  fields is returned to a client.
  
  Now the JOIN::prepare and the create_distinct_group functions are create
  additional hidden copy of BIT fields to preserve original fields untouched.
  New hidden fields are used for grouping instead.

  mysql-test/r/type_bit.result@1.14.1.9, 2007-08-17 18:29:10+04:00, evgen@moonbone.local +15 -0
    Added a test case for the bug#30245: A wrong type of a BIT field is reported when grouped by it.

  mysql-test/t/type_bit.test@1.18.1.3, 2007-08-17 18:28:48+04:00, evgen@moonbone.local +13 -0
    Added a test case for the bug#30245: A wrong type of a BIT field is reported when grouped by it.

  sql/sql_select.cc@1.312.175.1, 2007-08-17 18:29:30+04:00, evgen@moonbone.local +53 -9
    Bug#30245: A wrong type of a BIT field is reported when grouped by it.
    Now the JOIN::prepare and the create_distinct_group functions are create
    additional hidden copy of BIT fields to preserve original fields untouched.
    New hidden fields are used for grouping instead.

ChangeSet@1.2476.183.33, 2007-08-17 13:22:31+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Minor fix to let the build proceed.

  sql/rpl_rli.h@1.21, 2007-08-17 13:22:25+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Adding missing forward declaration.

ChangeSet@1.2476.340.1, 2007-08-17 11:41:32+08:00, gni@dev3-221.dev.cn.tlan +8 -0
  BUG#22240 Add a test case into ndb_restore_compat

  mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data@1.2, 2007-08-17 11:41:29+08:00, gni@dev3-221.dev.cn.tlan +325 -325
    new data file

  mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data@1.2, 2007-08-17 11:41:29+08:00, gni@dev3-221.dev.cn.tlan +365 -416
    new data file

  mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl@1.2, 2007-08-17 11:41:29+08:00, gni@dev3-221.dev.cn.tlan +8 -8
    new ctl file

  mysql-test/std_data/ndb_backup50/BACKUP-2.1.log@1.2, 2007-08-17 11:41:29+08:00, gni@dev3-221.dev.cn.tlan +1 -1
    new log file

  mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl@1.2, 2007-08-17 11:41:29+08:00, gni@dev3-221.dev.cn.tlan +8 -8
    new ctl file

  mysql-test/std_data/ndb_backup50/BACKUP-2.2.log@1.2, 2007-08-17 11:41:29+08:00, gni@dev3-221.dev.cn.tlan +1 -1
    new log file

  mysql-test/r/ndb_restore_compat.result@1.5.1.2, 2007-08-17 11:41:29+08:00, gni@dev3-221.dev.cn.tlan +1 -2
    add "order by" to select clause

  mysql-test/t/ndb_restore_compat.test@1.4.1.2, 2007-08-17 11:41:29+08:00, gni@dev3-221.dev.cn.tlan +1 -1
    add "order by" to select clause

ChangeSet@1.2476.327.7, 2007-08-16 19:27:44-07:00, igor@olga.mysql.com +2 -0
  Post-merge fix.

  mysql-test/r/select.result@1.163, 2007-08-16 19:27:35-07:00, igor@olga.mysql.com +2 -2
    Post-merge fix.

  tests/mysql_client_test.c@1.249.1.2, 2007-08-16 19:27:35-07:00, igor@olga.mysql.com +73 -0
    Post-merge fix.

ChangeSet@1.2476.183.31, 2007-08-17 00:10:46+02:00, lars@mysql.com +1 -0
  Empty changeset to restart pushbuild

  sql/log_event.cc@1.277.20.2, 2007-08-17 00:10:43+02:00, lars@mysql.com +1 -1
    Empty changeset to restart pushbuild

ChangeSet@1.2476.339.1, 2007-08-16 14:00:35-07:00, antony@pcg5ppc.xiphis.org +1 -0
  Bug#30359
    "Test federated_bug_25714 issues non-existing shell command"
    Problem caused by missing '$' symbol in eval statement causing it
    to always attempt to run test even if the test was not compiled.

  mysql-test/include/have_bug25714.inc@1.2, 2007-08-16 14:00:32-07:00, antony@pcg5ppc.xiphis.org +1 -1
    bug30359
      missing '$' in eval statement

ChangeSet@1.2476.323.12, 2007-08-16 21:54:41+04:00, kostja@bodhi.(none) +1 -0
  Last tweak for doxygen cleanup. The number of doxygen warnings is 0 now.

  sql/log_event.h@1.153.2.3, 2007-08-16 21:54:38+04:00, kostja@bodhi.(none) +14 -1
    Add doxygen documentation.
    Restore a text which had no influence on doxygen.

ChangeSet@1.1810.3274.3, 2007-08-16 14:51:37-03:00, davi@moksha.local +2 -0
  Bug#29936 (Stored Procedure DML ignores low_priority_updates setting)
  
  This is a follow up for the patch for Bug#26162 "Trigger DML ignores low_priority_updates setting", where the stored procedure ignores the session setting of low_priority_updates.
  
  For every table open operation with default write (TL_WRITE_DEFAULT) lock_type, downgrade the lock type to the session setting of low_priority_updates.

  sql/lock.cc@1.64.5.6, 2007-08-16 14:51:30-03:00, davi@moksha.local +1 -0
    Add late lock_type assertion.

  sql/sql_base.cc@1.235.113.1, 2007-08-16 14:51:31-03:00, davi@moksha.local +2 -7
    Possibly downgrade lock type to the the session setting of low_priority_updates and also remove early assertion.

ChangeSet@1.2476.323.11, 2007-08-16 21:14:47+04:00, kostja@bodhi.(none) +4 -0
  Fix doxygen warnings.

  include/mysql/plugin.h@1.40, 2007-08-16 21:14:41+04:00, kostja@bodhi.(none) +1 -1
    Fix doxygen warnings.

  sql/field.h@1.243.1.1, 2007-08-16 21:14:41+04:00, kostja@bodhi.(none) +6 -1
    Fix doxygen warnings - too complex return value type, it choked on it.

  sql/field_conv.cc@1.75, 2007-08-16 21:14:41+04:00, kostja@bodhi.(none) +2 -1
    Fix doxygen warnings - too complex return value type, it choked on it.

  sql/log_event.h@1.153.2.2, 2007-08-16 21:14:41+04:00, kostja@bodhi.(none) +2 -2
    Fix doxygen warnings.

ChangeSet@1.1810.3277.3, 2007-08-16 10:56:09-06:00, tsmith@ramayana.hindu.god +3 -0
  Bug #29474: 21587 Regression Ever increasing open tables/fd when using HANDLER READ + DELETE
  
  Revert the fix for bug 21587.  That bug will be re-opened, and a new
  fix must be created.

  sql/mysql_priv.h@1.290.127.4, 2007-08-16 10:56:08-06:00, tsmith@ramayana.hindu.god +0 -1
    Bug #29474: 21587 Regression Ever increasing open tables/fd when using HANDLER READ + DELETE
    
    Revert the fix for bug 21587.  That bug will be re-opened, and a new
    fix must be created.

  sql/sql_base.cc@1.235.112.1, 2007-08-16 10:56:08-06:00, tsmith@ramayana.hindu.god +0 -8
    Bug #29474: 21587 Regression Ever increasing open tables/fd when using HANDLER READ + DELETE
    
    Revert the fix for bug 21587.  That bug will be re-opened, and a new
    fix must be created.

  sql/sql_handler.cc@1.72.4.1, 2007-08-16 10:56:08-06:00, tsmith@ramayana.hindu.god +0 -45
    Bug #29474: 21587 Regression Ever increasing open tables/fd when using HANDLER READ + DELETE
    
    Revert the fix for bug 21587.  That bug will be re-opened, and a new
    fix must be created.

ChangeSet@1.2476.323.10, 2007-08-16 19:52:55+04:00, kostja@bodhi.(none) +6 -0
  Doxygen warnings.

  include/mysql/plugin.h@1.39, 2007-08-16 19:52:52+04:00, kostja@bodhi.(none) +1 -1
    Doxygen warnings.

  sql/field.cc@1.408.2.1, 2007-08-16 19:52:52+04:00, kostja@bodhi.(none) +1 -1
    Doxygen warnings.

  sql/log_event.h@1.153.2.1, 2007-08-16 19:52:52+04:00, kostja@bodhi.(none) +1 -1
    Doxygen warnings.

  sql/rpl_record.cc@1.7.1.1, 2007-08-16 19:52:52+04:00, kostja@bodhi.(none) +1 -0
    Doxygen warnings.

  sql/sql_lex.cc@1.255.3.2, 2007-08-16 19:52:52+04:00, kostja@bodhi.(none) +3 -3
    Doxygen warnings.

  sql/sql_lex.h@1.293, 2007-08-16 19:52:52+04:00, kostja@bodhi.(none) +2 -2
    Doxygen warnings.

ChangeSet@1.2476.183.30, 2007-08-16 17:26:32+02:00, lars@mysql.com +4 -0
  Post-merge fix of error number

  mysql-test/suite/rpl/r/rpl_extraCol_innodb.result@1.11, 2007-08-16 17:26:29+02:00, lars@mysql.com +2 -2
    Post-merge fix of error number

  mysql-test/suite/rpl/r/rpl_extraCol_myisam.result@1.11, 2007-08-16 17:26:29+02:00, lars@mysql.com +2 -2
    Post-merge fix of error number

  mysql-test/suite/rpl/r/rpl_row_colSize.result@1.2, 2007-08-16 17:26:29+02:00, lars@mysql.com +26 -26
    Post-merge fix of error number

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result@1.12, 2007-08-16 17:26:29+02:00, lars@mysql.com +2 -2
    Post-merge fix of error number

ChangeSet@1.1810.3279.1, 2007-08-16 17:25:48+03:00, jani@hynda.mysql.fi +3 -0
  Fix for Bug#27970 "Fix for bug 24507 makes mysql_install_db fail"

  include/my_pthread.h@1.90.1.10, 2007-08-16 17:25:45+03:00, jani@hynda.mysql.fi +9 -23
    Fix for Bug#27970 "Fix for bug 24507 makes mysql_install_db fail".
    
    Removed macro NPTL_PTHREAD_EXIT_BUG, because it doesn't work in dynamic
    environment. One can switch between NPTL and LT on the fly on Linux.
    
    Added pthread_dummy(ESRCH) for those platforms that don't have pthread_kill.
    This ensures that there won't be an error in mysqld.cc where the return value 
    is being checked from the function call.

  mysys/my_thr_init.c@1.31.1.15, 2007-08-16 17:25:45+03:00, jani@hynda.mysql.fi +12 -5
    Check for a Linux is enough. There is an additional test if
    NPTL is in use before spwaning the extra thread.

  sql/mysqld.cc@1.439.1.183, 2007-08-16 17:25:45+03:00, jani@hynda.mysql.fi +1 -1
    Fix for Bug#27970 "Fix for bug 24507 makes mysql_install_db fail"

ChangeSet@1.2476.323.9, 2007-08-16 18:07:48+04:00, kostja@bodhi.(none) +1 -0
  Fix doxygen warning.

  sql/sql_class.cc@1.342.2.1, 2007-08-16 18:07:46+04:00, kostja@bodhi.(none) +4 -0
    Fix doxygen warning.

ChangeSet@1.2476.323.8, 2007-08-16 17:59:12+04:00, kostja@bodhi.(none) +1 -0
  Fix doxygen warning (declaration and definition mismatch).

  sql/item.cc@1.280.1.1, 2007-08-16 17:59:10+04:00, kostja@bodhi.(none) +1 -1
    Fix doxygen warning (declaration and definition mismatch).

ChangeSet@1.2476.314.7, 2007-08-16 11:43:03+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Minor code fixes to help Doxygen generate good documentation.

  sql/rpl_rli.h@1.20, 2007-08-16 11:42:58+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Removing redundant "class" keyword.

ChangeSet@1.2476.314.6, 2007-08-16 08:52:50+02:00, mats@kindahl-laptop.dnsalias.net +11 -0
  Renaming MASTER_INFO to Master_info in order to follow the coding
  standards (and help Doxygen generating good documentation).

  sql/ha_ndbcluster.cc@1.461.5.1, 2007-08-16 08:52:42+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Renaming MASTER_INFO to Master_info.

  sql/log_event.cc@1.277.17.3, 2007-08-16 08:52:42+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Renaming MASTER_INFO to Master_info.

  sql/repl_failsafe.cc@1.76.1.2, 2007-08-16 08:52:43+02:00, mats@kindahl-laptop.dnsalias.net +3 -3
    Renaming MASTER_INFO to Master_info.

  sql/repl_failsafe.h@1.15, 2007-08-16 08:52:43+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Renaming MASTER_INFO to Master_info.

  sql/rpl_mi.cc@1.6, 2007-08-16 08:52:43+02:00, mats@kindahl-laptop.dnsalias.net +6 -6
    Renaming MASTER_INFO to Master_info.

  sql/rpl_mi.h@1.8, 2007-08-16 08:52:43+02:00, mats@kindahl-laptop.dnsalias.net +9 -9
    Renaming MASTER_INFO to Master_info.

  sql/rpl_rli.h@1.19, 2007-08-16 08:52:43+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Renaming MASTER_INFO to Master_info.

  sql/slave.cc@1.308.2.6, 2007-08-16 08:52:44+02:00, mats@kindahl-laptop.dnsalias.net +42 -42
    Renaming MASTER_INFO to Master_info.

  sql/slave.h@1.108.2.2, 2007-08-16 08:52:44+02:00, mats@kindahl-laptop.dnsalias.net +16 -16
    Renaming MASTER_INFO to Master_info.

  sql/sql_repl.cc@1.174, 2007-08-16 08:52:44+02:00, mats@kindahl-laptop.dnsalias.net +4 -4
    Renaming MASTER_INFO to Master_info.

  sql/sql_repl.h@1.46, 2007-08-16 08:52:44+02:00, mats@kindahl-laptop.dnsalias.net +5 -5
    Renaming MASTER_INFO to Master_info.

ChangeSet@1.2476.314.5, 2007-08-16 07:37:50+02:00, mats@kindahl-laptop.dnsalias.net +20 -0
  Renaming RELAY_LOG_INFO and st_relay_log_info to follow coding standards
  (and be more friendly to Doxygen by removing unnecessary typedefs).

  sql/log.cc@1.282.1.23, 2007-08-16 07:37:39+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Renaming struct st_relay_log_info to class Relay_log_info.

  sql/log.h@1.28.1.1, 2007-08-16 07:37:39+02:00, mats@kindahl-laptop.dnsalias.net +3 -3
    Renaming struct st_relay_log_info to class Relay_log_info.

  sql/log_event.cc@1.277.17.2, 2007-08-16 07:37:39+02:00, mats@kindahl-laptop.dnsalias.net +70 -70
    Renaming RELAY_LOG_INFO to Relay_log_info.

  sql/log_event.h@1.155, 2007-08-16 07:37:40+02:00, mats@kindahl-laptop.dnsalias.net +49 -51
    Renaming struct st_relay_log_info to class Relay_log_info.
    Renaming RELAY_LOG_INFO to Relay_log_info.
    Removing typedef RELAY_LOG_INFO.

  sql/log_event_old.cc@1.4.1.1, 2007-08-16 07:37:40+02:00, mats@kindahl-laptop.dnsalias.net +7 -7
    Renaming RELAY_LOG_INFO to Relay_log_info.

  sql/log_event_old.h@1.5, 2007-08-16 07:37:40+02:00, mats@kindahl-laptop.dnsalias.net +3 -3
    Renaming RELAY_LOG_INFO to Relay_log_info.

  sql/rpl_mi.h@1.7, 2007-08-16 07:37:40+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Renaming RELAY_LOG_INFO to Relay_log_info.

  sql/rpl_record.cc@1.8, 2007-08-16 07:37:40+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Renaming RELAY_LOG_INFO to Relay_log_info.

  sql/rpl_record.h@1.3, 2007-08-16 07:37:41+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Renaming RELAY_LOG_INFO to Relay_log_info.

  sql/rpl_record_old.cc@1.5, 2007-08-16 07:37:41+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Renaming RELAY_LOG_INFO to Relay_log_info.

  sql/rpl_record_old.h@1.4, 2007-08-16 07:37:41+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Renaming RELAY_LOG_INFO to Relay_log_info.

  sql/rpl_rli.cc@1.13, 2007-08-16 07:37:41+02:00, mats@kindahl-laptop.dnsalias.net +32 -32
    Renaming struct st_relay_log_info to class Relay_log_info.
    Renaming RELAY_LOG_INFO to Relay_log_info.
    

  sql/rpl_rli.h@1.18, 2007-08-16 07:37:41+02:00, mats@kindahl-laptop.dnsalias.net +10 -9
    Renaming struct st_relay_log_info to class Relay_log_info.
    Renaming RELAY_LOG_INFO to Relay_log_info.
    Removing typedef RELAY_LOG_INFO.

  sql/rpl_utility.cc@1.15, 2007-08-16 07:37:41+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Renaming RELAY_LOG_INFO to Relay_log_info.

  sql/rpl_utility.h@1.12, 2007-08-16 07:37:42+02:00, mats@kindahl-laptop.dnsalias.net +2 -3
    Renaming struct st_relay_log_info to class Relay_log_info.
    Renaming RELAY_LOG_INFO to Relay_log_info.
    Removing typedef RELAY_LOG_INFO.

  sql/slave.cc@1.308.2.5, 2007-08-16 07:37:42+02:00, mats@kindahl-laptop.dnsalias.net +30 -30
    Renaming RELAY_LOG_INFO to Relay_log_info.

  sql/slave.h@1.108.2.1, 2007-08-16 07:37:42+02:00, mats@kindahl-laptop.dnsalias.net +15 -16
    Renaming struct st_relay_log_info to class Relay_log_info.
    Renaming RELAY_LOG_INFO to Relay_log_info.
    Removing typedef RELAY_LOG_INFO.

  sql/sql_binlog.cc@1.14, 2007-08-16 07:37:42+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Renaming RELAY_LOG_INFO to Relay_log_info.

  sql/sql_class.h@1.392.2.1, 2007-08-16 07:37:43+02:00, mats@kindahl-laptop.dnsalias.net +2 -3
    Renaming struct st_relay_log_info to class Relay_log_info.
    Renaming RELAY_LOG_INFO to Relay_log_info.
    Removing typedef RELAY_LOG_INFO.

  sql/sql_repl.cc@1.173, 2007-08-16 07:37:43+02:00, mats@kindahl-laptop.dnsalias.net +4 -4
    Renaming RELAY_LOG_INFO to Relay_log_info.

ChangeSet@1.1810.3278.1, 2007-08-15 18:10:16-06:00, malff@weblab.(none) +7 -0
  Bug#23062 (GCOV build: helper scripts missing in the BUILD directory)
  
  This patch provides compile helper scripts only,
  no server logic is affected.
  
  Before this patch, GCOV and GPROF build scripts were only provided for
  pentium platforms.
  
  With this patch, pentium, pentium64 and amd64 platforms have associated
  helper build scripts.
  
  The GCOV and GPROF specific compilation flags are set once in SETUP.sh,
  to avoid code duplication.

  BUILD/SETUP.sh@1.44.1.21, 2007-08-15 18:10:13-06:00, malff@weblab.(none) +25 -0
    Moved GCOV and GPROF flags to compile-pentium-{gcov,gprof) to SETUP.sh

  BUILD/compile-amd64-gcov@1.1, 2007-08-15 18:10:13-06:00, malff@weblab.(none) +17 -0
    Added helper scripts for GCOV and GPROF builds.
    

  BUILD/compile-amd64-gcov@1.0, 2007-08-15 18:10:13-06:00, malff@weblab.(none) +0 -0

  BUILD/compile-amd64-gprof@1.1, 2007-08-15 18:10:13-06:00, malff@weblab.(none) +9 -0
    Added helper scripts for GCOV and GPROF builds.
    

  BUILD/compile-amd64-gprof@1.0, 2007-08-15 18:10:13-06:00, malff@weblab.(none) +0 -0

  BUILD/compile-pentium-gcov@1.14.2.3, 2007-08-15 18:10:13-06:00, malff@weblab.(none) +3 -10
    Moved GCOV and GPROF flags to compile-pentium-{gcov,gprof) to SETUP.sh

  BUILD/compile-pentium-gprof@1.4, 2007-08-15 18:10:13-06:00, malff@weblab.(none) +2 -2
    Moved GCOV and GPROF flags to compile-pentium-{gcov,gprof) to SETUP.sh

  BUILD/compile-pentium64-gcov@1.1, 2007-08-15 18:10:13-06:00, malff@weblab.(none) +17 -0
    Added helper scripts for GCOV and GPROF builds.
    

  BUILD/compile-pentium64-gcov@1.0, 2007-08-15 18:10:13-06:00, malff@weblab.(none) +0 -0

  BUILD/compile-pentium64-gprof@1.1, 2007-08-15 18:10:13-06:00, malff@weblab.(none) +9 -0
    Added helper scripts for GCOV and GPROF builds.
    

  BUILD/compile-pentium64-gprof@1.0, 2007-08-15 18:10:13-06:00, malff@weblab.(none) +0 -0

ChangeSet@1.1810.3277.2, 2007-08-15 17:20:54-06:00, tsmith@ramayana.hindu.god +8 -0
  NULL MERGE this ChangeSet to 5.1
  
  Apply innodb-5.0-ss1696 snapshot
  
  Fixes:
  - Bug#20090: InnoDB: Error: trying to declare trx to enter InnoDB
  - Bug#23710: crash_commit_before fails if innodb_file_per_table=1
    At InnoDB startup consider the case where log scan went beyond
    checkpoint_lsn as a crash and initiate crash recovery code path.
  - Bug#28781: InnoDB increments auto-increment value incorrectly with ON DUPLICATE KEY UPDATE
    We need to do some special AUTOINC handling for the following case:
    INSERT INTO t (c1,c2) VALUES(x,y) ON DUPLICATE KEY UPDATE ...
    We need to use the AUTOINC counter that was actually used by
    MySQL in the UPDATE statement, which can be different from the
    value used in the INSERT statement.
  - Bug#29097: fsp_get_available_space_in_free_extents() is capped at 4TB
    Fix by typecasting the variables before multiplying them, so that the
    result of the multiplication is of type "unsigned long long".
  - Bug#29155: Innodb "Parallel recovery" is not prevented
    Fix by enabling file locking on FreeBSD.  It has been disabled because
    InnoDB has refused to start on FreeBSD & LinuxThreads, but now it
    starts just fine.

  innobase/fsp/fsp0fsp.c@1.25.6.1, 2007-08-15 16:54:19-06:00, tsmith@ramayana.hindu.god +4 -3
    Apply innodb-5.0-ss1696 snapshot
    
    Revision r1614:
    branches/5.0:
    
    Merge r1605 from trunk:
    
    Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
    by typecasting the variables before multiplying them, so that the result of
    the multiplication is of type "unsigned long long".
    
    I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
    use it without overwriting it with zeroes (by commenting the code that
    overwrites :newraw files).
    
    New type ullint is introduced with the sole purpose of shortening
    "unsigned long long", please do not define it to something else than
    "unsigned long long".
    
    Approved by:	Heikki

  sql/ha_innodb.cc@1.202.51.1, 2007-08-15 16:54:19-06:00, tsmith@ramayana.hindu.god +24 -5
    Apply innodb-5.0-ss1696 snapshot
    
    Revision r1614:
    branches/5.0:
    
    Merge r1605 from trunk:
    
    Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
    by typecasting the variables before multiplying them, so that the result of
    the multiplication is of type "unsigned long long".
    
    I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
    use it without overwriting it with zeroes (by commenting the code that
    overwrites :newraw files).
    
    New type ullint is introduced with the sole purpose of shortening
    "unsigned long long", please do not define it to something else than
    "unsigned long long".
    
    Approved by:	Heikki
    
    
    Revision r1695:
    branches/5.0: Merge a change from MySQL AB:
    
    ChangeSet@1.2463.166.1  2007-06-20 19:22:27+03:00  monty@mysql.fi
    
    Allow multiple calls to mysql_server_end()
    (Part of fix for Bug 25621 Error in my_thread_global_end(): 1 threads
    didn't exit)
    Give correct error message if InnoDB table is not found
    (This allows us to drop a an innodb table that is not in the InnoDB registery)
    
    ha_innodb.cc:
      Give correct error message if InnoDB table is not found.
      (This allows us to drop a an innodb table that is not in the InnoDB
      registery)
    
    
    Revision r1606:
    branches/5.0: Formatting corrections.
    
    spotted by: Vasil
    
    
    Revision r1691:
    branches/5.0: Merge a change from MySQL AB:
    
    ChangeSet@1.2463.261.1  2007-07-20 14:17:15+03:00  gkodinov@magare.gmz
      Bug 29644: alter table hangs if records locked in share mode 
      by long running transaction
      
      On Windows opened files can't be deleted. There was a special
      upgraded lock mode (TL_WRITE instead of TL_WRITE_ALLOW_READ) 
      in ALTER TABLE to make sure nobody has the table opened
      when deleting the old table in ALTER TABLE. This special mode
      was causing ALTER TABLE to hang waiting on a lock inside InnoDB.
      This special lock is no longer necessary as the server is 
      closing the tables it needs to delete in ALTER TABLE.
      Fixed by removing the special lock.
      Note that this also reverses the fix for bug 17264 that deals with
      another consequence of this special lock mode being used.
    
    sql/ha_innodb.cc: Bug 29644: reverse the (now excessive) fix
    for bug 17264 (but leave the test case).
    
    
    Revision r1601:
    branches/5.0: Fix for bug#28781
    We need to do some special AUTOINC handling for the following case:
    
    INSERT INTO t (c1,c2) VALUES(x,y) ON DUPLICATE KEY UPDATE ...
    
    We need to use the AUTOINC counter that was actually used by
    MySQL in the UPDATE statement, which can be different from the
    value used in the INSERT statement.
    
    approved by: Sunny
    
    
    Revision r1692:
    branches/5.0: Merge a change from MySQL AB:
    
    ChangeSet@1.2463.267.1  2007-07-30 17:14:34+04:00  evgen@local
      Bug 24989: The DEADLOCK error is improperly handled by InnoDB.
      
      When innodb detects a deadlock it calls ha_rollback_trans() to rollback the 
      main transaction. But such action isn't allowed from inside of triggers and
      functions. When it happen the 'Explicit or implicit commit' error is thrown
      even if there is no commit/rollback statements in the trigger/function. This
      leads to the user confusion.
      
      Now the convert_error_code_to_mysql() function doesn't call the 
      ha_rollback_trans() function directly but rather calls the
      mark_transaction_to_rollback function and returns an error.
      The sp_rcontext::find_handler() now doesn't allow errors to be caught by the
      trigger/function error handlers when the thd->is_fatal_sub_stmt_error flag
      is set. Procedures are still allowed to catch such errors.
      The sp_rcontext::find_handler function now accepts a THD handle as a parameter.
      The transaction_rollback_request and the is_fatal_sub_stmt_error flags are 
      added to the THD class. The are initialized by the THD class constructor.
      Now the ha_autocommit_or_rollback function rolls back main transaction
      when not in a sub statement and the thd->transaction_rollback_request
      is set.
      The THD::restore_sub_statement_state function now resets the 
      thd->is_fatal_sub_stmt_error flag on exit from a sub-statement.
    
    innodb-big.test, innodb-big.result:
      Added a test case for the bug 24989: The DEADLOCK error is improperly
      handled by InnoDB.
    
    sql/ha_innodb.cc:
      Bug 24989: The DEADLOCK error is improperly handled by InnoDB.
      Now the convert_error_code_to_mysql() function doesn't call the
      ha_rollback_trans() function directly but rather calls the
      mark_transaction_to_rollback function and returns an error.
    
    
    Revision r1693:
    branches/5.0: Merge a change from MySQL AB:
    
    ChangeSet@1.2489.5.1  2007-07-31 17:42:48+04:00  evgen@local
      ha_innodb.cc:
        Warning fixed.

  innobase/include/fsp0fsp.h@1.10.1.1, 2007-08-15 16:54:19-06:00, tsmith@ramayana.hindu.god +1 -1
    Apply innodb-5.0-ss1696 snapshot
    
    Revision r1614:
    branches/5.0:
    
    Merge r1605 from trunk:
    
    Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
    by typecasting the variables before multiplying them, so that the result of
    the multiplication is of type "unsigned long long".
    
    I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
    use it without overwriting it with zeroes (by commenting the code that
    overwrites :newraw files).
    
    New type ullint is introduced with the sole purpose of shortening
    "unsigned long long", please do not define it to something else than
    "unsigned long long".
    
    Approved by:	Heikki

  innobase/include/univ.i@1.40.8.1, 2007-08-15 16:54:19-06:00, tsmith@ramayana.hindu.god +2 -0
    Apply innodb-5.0-ss1696 snapshot
    
    Revision r1614:
    branches/5.0:
    
    Merge r1605 from trunk:
    
    Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
    by typecasting the variables before multiplying them, so that the result of
    the multiplication is of type "unsigned long long".
    
    I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
    use it without overwriting it with zeroes (by commenting the code that
    overwrites :newraw files).
    
    New type ullint is introduced with the sole purpose of shortening
    "unsigned long long", please do not define it to something else than
    "unsigned long long".
    
    Approved by:	Heikki

  innobase/log/log0recv.c@1.46.14.1, 2007-08-15 16:54:19-06:00, tsmith@ramayana.hindu.god +148 -77
    Apply innodb-5.0-ss1696 snapshot
    
    Revision r1608:
    branches/5.0: Bug#23710
    Back port of r1607 from trunk
    
    At InnoDB startup consider the case where log scan went beyond checkpoint_lsn as a crash and initiate crash recovery code path.
    
    reviewed by: Heikki

  innobase/os/os0file.c@1.103.18.1, 2007-08-15 16:54:19-06:00, tsmith@ramayana.hindu.god +1 -2
    Apply innodb-5.0-ss1696 snapshot
    
    Revision r1615:
    branches/5.0:
    
    Merge r1613 from trunk:
    
    Fix Bug#29155 by enabling file locking on FreeBSD.
    It has been disabled because InnoDB has refused to start on
    FreeBSD & LinuxThreads, but now it starts just fine.
    
    Approved by:	Heikki

  innobase/srv/srv0srv.c@1.87.12.1, 2007-08-15 16:54:19-06:00, tsmith@ramayana.hindu.god +1 -1
    Apply innodb-5.0-ss1696 snapshot
    
    Revision r1552:
    branches/5.0:
    Fix Bug#20090 as suggested in the bug followup by Heikki.
    
    Approved by:	Heikki

  innobase/trx/trx0trx.c@1.54.10.1, 2007-08-15 16:54:19-06:00, tsmith@ramayana.hindu.god +7 -5
    Apply innodb-5.0-ss1696 snapshot
    
    Revision r1596:
    branches/5.0: Merge r1595 from trunk:
    
    trx_commit_for_mysql(): Avoid acquiring and releasing kernel_mutex when
    trx->sess or trx_dummy_sess is non-NULL.

ChangeSet@1.1810.3274.2, 2007-08-15 17:12:09-03:00, davi@moksha.local +1 -0
  Rework doxygen documentation for the function mysql_ha_close_table.

  sql/sql_handler.cc@1.72.1.17, 2007-08-15 17:12:07-03:00, davi@moksha.local +9 -9
    Add missing parameter to the @param tag and fix style.

ChangeSet@1.2476.337.1, 2007-08-15 21:46:44+02:00, mleich@four.local.lan +11 -0
  This changeset is result of
       WL#3982 Test information_schema.processlist
  and replaces the corresponding tests pushed to
       mysql-test-extra-5.1/mysql-test/qa-suite/info_schema 

  mysql-test/suite/funcs_1/datadict/datadict_priv.inc@1.1, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +107 -0
    Auxiliary script

  mysql-test/suite/funcs_1/datadict/datadict_priv.inc@1.0, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/datadict/processlist_priv.inc@1.1, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +432 -0
    Test of privileges

  mysql-test/suite/funcs_1/datadict/processlist_priv.inc@1.0, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/datadict/processlist_val.inc@1.1, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +333 -0
    Test of values

  mysql-test/suite/funcs_1/datadict/processlist_val.inc@1.0, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result@1.1, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +469 -0
    Expected results

  mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result@1.0, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result@1.1, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +174 -0
    Expected results

  mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result@1.0, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result@1.1, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +469 -0
    Expected results

  mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result@1.0, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/r/b_processlist_val_ps.result@1.1, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +174 -0
    Expected results

  mysql-test/suite/funcs_1/r/b_processlist_val_ps.result@1.0, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/t/a_processlist_priv_no_prot.test@1.1, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +36 -0
    Test of privileges - variant without ps/sp/cursor/view-protocol

  mysql-test/suite/funcs_1/t/a_processlist_priv_no_prot.test@1.0, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/t/a_processlist_val_no_prot.test@1.1, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +31 -0
    Test of values - variant without ps/sp/cursor/view-protocol

  mysql-test/suite/funcs_1/t/a_processlist_val_no_prot.test@1.0, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/t/b_processlist_priv_ps.test@1.1, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +35 -0
    Test of privileges - variant with ps-protocol

  mysql-test/suite/funcs_1/t/b_processlist_priv_ps.test@1.0, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/t/b_processlist_val_ps.test@1.1, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +30 -0
    Test of values - variant with ps-protocol

  mysql-test/suite/funcs_1/t/b_processlist_val_ps.test@1.0, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +0 -0

ChangeSet@1.1810.3275.1, 2007-08-15 10:24:18-07:00, igor@olga.mysql.com +7 -0
  Fixed bug #30396.
  The bug caused memory corruption for some queries with top OR level
  in the WHERE condition if they contained equality predicates and 
  other sargable predicates in disjunctive parts of the condition.
  
  The corruption happened because the upper bound of the memory
  allocated for KEY_FIELD and SARGABLE_PARAM internal structures
  containing info about potential lookup keys was calculated incorrectly
  in some cases. In particular it was calculated incorrectly when the
  WHERE condition was an OR formula with disjuncts being AND formulas
  including equalities and other sargable predicates.

  mysql-test/r/select.result@1.121.1.36, 2007-08-15 10:24:05-07:00, igor@olga.mysql.com +57 -0
    Added a test case for bug #30396.

  mysql-test/t/select.test@1.102.1.29, 2007-08-15 10:24:05-07:00, igor@olga.mysql.com +60 -0
    Added a test case for bug #30396.

  sql/item_cmpfunc.h@1.122.2.30, 2007-08-15 10:24:05-07:00, igor@olga.mysql.com +0 -1
    Removed max_members from the COND_EQUAL class as not useful anymore. 

  sql/sql_base.cc@1.235.79.29, 2007-08-15 10:24:05-07:00, igor@olga.mysql.com +1 -0
    Added the max_equal_elems field to the st_select_lex structure.

  sql/sql_lex.cc@1.142.42.13, 2007-08-15 10:24:05-07:00, igor@olga.mysql.com +1 -0
    Added the max_equal_elems field to the st_select_lex structure.

  sql/sql_lex.h@1.175.41.11, 2007-08-15 10:24:06-07:00, igor@olga.mysql.com +2 -1
    Added the max_equal_elems field to the st_select_lex structure.
    The field contains the maximal number of elements in multiple equalities
    built for the query conditions.

  sql/sql_select.cc@1.312.174.1, 2007-08-15 10:24:06-07:00, igor@olga.mysql.com +12 -26
    Fixed bug #30396.
    The bug caused memory corruption for some queries with top OR level
    in the WHERE condition if they contained equality predicates and 
    other sargable predicates in disjunctive parts of the condition.
    
    The corruption happened because the upper bound of the memory
    allocated for KEY_FIELD and SARGABLE_PARAM internal structures
    containing info about potential lookup keys was calculated incorrectly
    in some cases. In particular it was calculated incorrectly when the
    WHERE condition was an OR formula with disjuncts being AND formulas
    including equalities and other sargable predicates.
     
    The max_equal_elems field to the st_select_lex structure is used now
    to calculate the above mentioned upper bound. The field contains the
    maximal number of elements in multiple equalities built for the query
    conditions.
     

ChangeSet@1.2476.323.7, 2007-08-15 20:11:16+04:00, kostja@bodhi.(none) +1 -0
  Add replication group (comments).

  sql/slave.h@1.108.1.1, 2007-08-15 20:11:14+04:00, kostja@bodhi.(none) +10 -2
    Add replication group (comments).

ChangeSet@1.2476.319.6, 2007-08-15 15:40:56+00:00, lzhou@dev3-63.(none) +14 -0
  Remove the extra files for the bug29674 exist only in 5.0

  BitKeeper/deleted/.del-BACKUP-1-0.1.Data@1.2, 2007-08-15 15:37:31+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.1.Data

  BitKeeper/deleted/.del-BACKUP-1-0.1.Data~a57077b1652462e@1.2, 2007-08-15 15:37:52+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.1.Data

  BitKeeper/deleted/.del-BACKUP-1-0.2.Data@1.2, 2007-08-15 15:37:32+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.2.Data

  BitKeeper/deleted/.del-BACKUP-1-0.2.Data~7ded385bca6b1f64@1.2, 2007-08-15 15:37:52+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.2.Data

  BitKeeper/deleted/.del-BACKUP-1.1.ctl@1.2, 2007-08-15 15:37:32+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.ctl

  BitKeeper/deleted/.del-BACKUP-1.1.ctl~f95f9b1922013c1f@1.2, 2007-08-15 15:37:52+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.ctl

  BitKeeper/deleted/.del-BACKUP-1.1.log@1.2, 2007-08-15 15:37:32+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.log

  BitKeeper/deleted/.del-BACKUP-1.1.log~a9759ef97cd15f92@1.2, 2007-08-15 15:37:52+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.log

  BitKeeper/deleted/.del-BACKUP-1.2.ctl@1.2, 2007-08-15 15:37:32+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.ctl

  BitKeeper/deleted/.del-BACKUP-1.2.ctl~3ebf846a47d4cc6c@1.2, 2007-08-15 15:37:52+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.ctl

  BitKeeper/deleted/.del-BACKUP-1.2.log@1.2, 2007-08-15 15:37:32+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.log

  BitKeeper/deleted/.del-BACKUP-1.2.log~6c37168b3738d195@1.2, 2007-08-15 15:37:52+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.log

  BitKeeper/deleted/.del-ndb_restore_different_endian_data.result@1.2, 2007-08-15 15:35:11+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/r/ndb_restore_different_endian_data.result

  BitKeeper/deleted/.del-ndb_restore_different_endian_data.test@1.2, 2007-08-15 15:38:17+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/t/ndb_restore_different_endian_data.test

ChangeSet@1.1810.3274.1, 2007-08-15 12:13:34-03:00, davi@moksha.local +3 -0
  Bug#25856 (HANDLER table OPEN in one connection lock DROP TABLE in another one)
  
  mysql_ha_open calls mysql_ha_close on the error path (unsupported) to close the (opened) table before inserting it into the tables hash list handler_tables_hash) but mysql_ha_close only closes tables which are on the hash list, causing the table to be left open and locked.
  
  This change moves the table close logic into a separate function that is always called on the error path of mysql_ha_open or on a normal handler close (mysql_ha_close).

  mysql-test/t/handler.test@1.25.1.6, 2007-08-15 12:13:31-03:00, davi@moksha.local +14 -0
    Bug#25856 test case

  mysql-test/r/handler.result@1.25.2.1, 2007-08-15 12:13:30-03:00, davi@moksha.local +7 -0
    Bug#25856 test result

  sql/sql_handler.cc@1.72.1.16, 2007-08-15 12:13:31-03:00, davi@moksha.local +47 -33
    Move the table close logic into a separate function that is always called on the error path of mysql_ha_open or on a normal handler close

ChangeSet@1.2476.323.6, 2007-08-15 19:08:44+04:00, kostja@bodhi.(none) +17 -0
  Provide initial module structure to Doxygen.

  sql/event_data_objects.cc@1.110, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +8 -0
    Add module comments.

  sql/event_data_objects.h@1.27, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +9 -0
    Add module comments.

  sql/event_db_repository.cc@1.33.1.2, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +9 -0
    Add module comments.

  sql/event_db_repository.h@1.18, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +11 -2
    Add module comments.

  sql/event_queue.cc@1.38.1.1, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +8 -0
    Add module comments.

  sql/event_queue.h@1.19, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +17 -0
    Add module comments.

  sql/event_scheduler.cc@1.47, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +9 -0
    Add module comments.

  sql/event_scheduler.h@1.24, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +15 -3
    Add module comments.

  sql/events.cc@1.84, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +9 -0
    Add module comments.

  sql/events.h@1.57, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +6 -3
    Add module comments.

  sql/lock.cc@1.106.11.2, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +8 -1
    Add module comments.

  sql/sp_head.h@1.114, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +9 -0
    Add module comments.

  sql/sql_base.cc@1.421.1.2, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +7 -0
    Add module comments.

  sql/sql_lex.h@1.292, 2007-08-15 19:08:41+04:00, kostja@bodhi.(none) +7 -0
    Add module comments.

  sql/sql_parse.cc@1.683.16.2, 2007-08-15 19:08:41+04:00, kostja@bodhi.(none) +9 -0
    Add module comments.

  sql/sql_select.cc@1.541.11.1, 2007-08-15 19:08:41+04:00, kostja@bodhi.(none) +8 -0
    Add module comments.

  sql/sql_yacc.yy@1.597.1.2, 2007-08-15 19:08:41+04:00, kostja@bodhi.(none) +8 -0
    Add module comments.

ChangeSet@1.2476.183.27, 2007-08-15 18:41:18+04:00, skozlov@mysql.com +1 -0
  fixed diff

  mysql-test/suite/rpl/include/rpl_mixed_ddl.inc@1.3, 2007-08-15 18:41:11+04:00, skozlov@mysql.com +1 -1
    fixed diff

ChangeSet@1.1810.2885.54, 2007-08-15 18:21:58+04:00, evgen@moonbone.local +1 -0
  mysql_client_test.c:
    Post fix for the bug#29948.

  tests/mysql_client_test.c@1.167.1.70, 2007-08-15 18:21:36+04:00, evgen@moonbone.local +3 -3
    Post fix for the bug#29948.

ChangeSet@1.2476.336.1, 2007-08-15 17:43:08+04:00, kostja@bodhi.(none) +24 -0
  Fix doxygen warnings.

  client/mysqldump.c@1.268.23.1, 2007-08-15 17:42:54+04:00, kostja@bodhi.(none) +2 -2
    Fix doxygen warnings

  mysys/test_charset.c@1.19, 2007-08-15 17:42:54+04:00, kostja@bodhi.(none) +1 -1
    Fix doxygen warnings

  sql/event_db_repository.cc@1.33.1.1, 2007-08-15 17:42:54+04:00, kostja@bodhi.(none) +3 -3
    Fix doxygen warnings

  sql/events.cc@1.83, 2007-08-15 17:42:54+04:00, kostja@bodhi.(none) +1 -2
    Fix doxygen warnings

  sql/events.h@1.56, 2007-08-15 17:42:54+04:00, kostja@bodhi.(none) +7 -2
    Fix doxygen warnings

  sql/item_create.cc@1.91, 2007-08-15 17:42:55+04:00, kostja@bodhi.(none) +165 -165
    Fix doxygen warnings, style.

  sql/item_create.h@1.51, 2007-08-15 17:42:55+04:00, kostja@bodhi.(none) +4 -4
    Fix coding style.

  sql/item_subselect.cc@1.159.1.1, 2007-08-15 17:42:56+04:00, kostja@bodhi.(none) +1 -1
    Fix doxygen warnings

  sql/lock.cc@1.106.11.1, 2007-08-15 17:42:56+04:00, kostja@bodhi.(none) +9 -4
    Fix doxygen warnings

  sql/sp.cc@1.164.1.1, 2007-08-15 17:42:56+04:00, kostja@bodhi.(none) +1 -1
    Fix doxygen warnings

  sql/sp_head.h@1.113, 2007-08-15 17:42:56+04:00, kostja@bodhi.(none) +1 -1
    Fix doxygen warnings

  sql/sql_analyse.cc@1.77, 2007-08-15 17:42:56+04:00, kostja@bodhi.(none) +1 -1
    Fix doxygen warnings

  sql/sql_analyse.h@1.25, 2007-08-15 17:42:57+04:00, kostja@bodhi.(none) +1 -1
    Fix doxygen warnings

  sql/sql_base.cc@1.421.1.1, 2007-08-15 17:42:58+04:00, kostja@bodhi.(none) +3 -3
    Fix doxygen warnings

  sql/sql_db.cc@1.157.1.1, 2007-08-15 17:42:58+04:00, kostja@bodhi.(none) +1 -1
    Fix doxygen warnings

  sql/sql_lex.cc@1.255.3.1, 2007-08-15 17:42:58+04:00, kostja@bodhi.(none) +14 -1
    Fix doxygen warnings

  sql/sql_lex.h@1.291, 2007-08-15 17:42:58+04:00, kostja@bodhi.(none) +6 -13
    Fix doxygen warnings

  sql/sql_parse.cc@1.683.16.1, 2007-08-15 17:42:59+04:00, kostja@bodhi.(none) +6 -5
    Fix doxygen warnings

  sql/sql_plugin.cc@1.70.1.1, 2007-08-15 17:42:59+04:00, kostja@bodhi.(none) +1 -1
    Fix doxygen warnings

  sql/sql_prepare.cc@1.230, 2007-08-15 17:42:59+04:00, kostja@bodhi.(none) +0 -1
    Fix doxygen warnings

  sql/sql_show.cc@1.429.2.1, 2007-08-15 17:42:59+04:00, kostja@bodhi.(none) +2 -2
    Fix doxygen warnings

  sql/sql_trigger.cc@1.104, 2007-08-15 17:43:00+04:00, kostja@bodhi.(none) +8 -8
    Fix doxygen warnings

  sql/sql_update.cc@1.239.1.15, 2007-08-15 17:43:00+04:00, kostja@bodhi.(none) +4 -4
    Fix doxygen warnings

  sql/table.h@1.175.7.1, 2007-08-15 17:43:01+04:00, kostja@bodhi.(none) +5 -5
    Fix doxygen warnings

ChangeSet@1.2476.183.26, 2007-08-15 15:51:27+04:00, skozlov@mysql.com +2 -0
  disabled rpl_innodb_mixed_dml

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@1.5, 2007-08-15 15:51:18+04:00, skozlov@mysql.com +1 -1
    fix for tmp directory

  mysql-test/suite/rpl/t/disabled.def@1.11, 2007-08-15 15:51:18+04:00, skozlov@mysql.com +1 -1
    disabled rpl_innodb_mixed_dml

ChangeSet@1.2476.183.25, 2007-08-15 14:53:14+04:00, skozlov@mysql.com +1 -0
  Fixed path to tmp directory for rpl_mixed_dml.inc

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@1.4, 2007-08-15 14:53:05+04:00, skozlov@mysql.com +1 -1
    Fixed path to tmp directory

ChangeSet@1.2476.330.4, 2007-08-15 02:18:41-06:00, tsmith@ramayana.hindu.god +2 -0
  Update result formatting for embedded runs of ps_1general and
  trigger tests, to match build_table_filename behavior.

  mysql-test/t/ps_1general.test@1.43, 2007-08-15 02:18:40-06:00, tsmith@ramayana.hindu.god +1 -1
    Adjust how the datadir file name is normalized, to match new
    build_table_filename behavior.  This fixes the test result
    when run with the embedded server.

  mysql-test/t/trigger.test@1.82, 2007-08-15 02:18:40-06:00, tsmith@ramayana.hindu.god +2 -1
    Adjust how the datadir file name is normalized, to match new
    build_table_filename behavior.  This fixes the test result
    when run with the embedded server.

ChangeSet@1.1810.3264.2, 2007-08-15 09:23:44+02:00, mhansson@linux-st28.site +4 -0
  bug#28570: handler::index_read() is called with different find_flag when 
  ORDER BY is used
  
  The range analysis module did not correctly signal to the 
  handler that a range represents a ref (EQ_RANGE flag). This causes 
  non-range queries like 
  SELECT ... FROM ... WHERE keypart_1=const, ..., keypart_n=const 
  ORDER BY ... FOR UPDATE
  to wait for a lock unneccesarily if another running transaction uses
  SELECT ... FOR UPDATE on the same table.
  
  Fixed by setting EQ_RANGE for all range accesses that represent 
  an equality predicate. 

  mysql-test/t/innodb_mysql.test@1.3.44.1, 2007-08-15 09:23:42+02:00, mhansson@linux-st28.site +29 -0
    bug#28570: Test Case

  mysql-test/r/innodb_mysql.result@1.3.23.1, 2007-08-15 09:23:42+02:00, mhansson@linux-st28.site +18 -0
    bug#28570: Test Result

  sql/handler.cc@1.167.1.72, 2007-08-15 09:23:42+02:00, mhansson@linux-st28.site +2 -1
    bug#28570: Updated comment

  sql/opt_range.cc@1.159.40.1, 2007-08-15 09:23:43+02:00, mhansson@linux-st28.site +1 -2
    bug#28570: Removed the criterion that key has to be unique (HA_NOSAME) in 
    order for the EQ_RANGE flag to be set. It is sufficient that the range 
    represent a ref access.

ChangeSet@1.2476.334.1, 2007-08-14 20:31:06-06:00, malff@weblab.(none) +1 -0
  Changed whitespace and indentation only, no logic change.

  sql/sql_yacc.yy@1.597.1.1, 2007-08-14 20:31:01-06:00, malff@weblab.(none) +6991 -6536
    Changed whitespace and indentation only, no logic change.

ChangeSet@1.2476.12.81, 2007-08-15 12:12:59+10:00, stewart@flamingspork.com +1 -0
  [PATCH] BUG#28253 ndb_size.pl: cannot set socket
  
  Index: ndb-work/storage/ndb/tools/ndb_size.pl
  ===================================================================

  storage/ndb/tools/ndb_size.pl@1.11, 2007-08-15 11:49:49+10:00, stewart@flamingspork.com +20 -8
    BUG#28253 ndb_size.pl: cannot set socket

ChangeSet@1.2476.12.80, 2007-08-15 12:12:46+10:00, stewart@flamingspork.com +1 -0
  [PATCH] Bug#29228 ndb_size.pl borks on float columns with comma in ()
  
  Index: ndb-work/storage/ndb/tools/ndb_size.pl
  ===================================================================

  storage/ndb/tools/ndb_size.pl@1.10, 2007-08-15 11:49:46+10:00, stewart@flamingspork.com +2 -0
    Bug#29228 ndb_size.pl borks on float columns with comma in ()

ChangeSet@1.2476.12.79, 2007-08-15 12:12:31+10:00, stewart@flamingspork.com +1 -0
  [PATCH] BUG#28683 - ndb_size.pl should support more than one database
  
  Patch by: Monty Taylor <mtaylor@mysql.com>
  Fixes by: Stewart Smith
  
    Added the ability to run ndb_size.pl on mulitple databases and also to exclude lists of databases and tables from analysis.
    ---
    Added schema name information to index table calculations as well.
    ---
    Made database an optional parameter, the exclusion of which causes all databases to be examined.
    If selecting from information_schema fails, attempt to fall back to show tables from
    ---
    Added support for setting an optional "real_table_name" for a table to deal with unique indexe size calcs.
    ---
    Fixed report title for the case where we are using operating on more than one database.
    ---
    Fixed some perl style concerns timothy had.
    Cull the list of databases in perl rather than passing both an in and a not in list to MySQL
    Get this full list of databases from show databases if needed.
  
    storage/ndb/tools/ndb_size.pl@stripped, 2007-05-25 13:45:44-07:00, mtaylor@qualinost.(none) +102 -28
      Added the ability to run ndb_size.pl on mulitple databases and also to exclude lists of databases and tables from analysis.
      ---
      Added schema name information to index table calculations as well.
      ---
      Made database an optional parameter, the exclusion of which causes all databases to be examined.
      If selecting from information_schema fails, attempt to fall back to show tables from
      ---
      Added support for setting an optional "real_table_name" for a table to deal with unique indexe size calcs.
      ---
      Fixed report title for the case where we are using operating on more than one database.
      ---
      Fixed some perl style concerns timothy had. 
      Cull the list of databases in perl rather than passing both an in and a not in list to MySQL
      Get this full list of databases from show databases if needed.
  
  Index: ndb-work/storage/ndb/tools/ndb_size.pl
  ===================================================================

  storage/ndb/tools/ndb_size.pl@1.9, 2007-08-15 11:46:19+10:00, stewart@flamingspork.com +110 -29
    BUG#28683 - ndb_size.pl should support more than one database

ChangeSet@1.2476.330.3, 2007-08-14 15:35:19-06:00, tsmith@ramayana.hindu.god +6 -0
  Updates to allow innodb.test to be run with --embedded-server,
  including a small change to build_table_filename().

  mysql-test/mysql-test-run.pl@1.313.5.1, 2007-08-14 15:35:16-06:00, tsmith@ramayana.hindu.god +0 -20
    Remove unused bad merge bitrot code.  This chunk of code is a repeat
    copy of an earlier chunk, and should never have been here.

  mysql-test/r/innodb.result@1.199.1.1, 2007-08-14 15:35:16-06:00, tsmith@ramayana.hindu.god +3 -36
    Updates to allow innodb.test to be run with --embedded-server

  mysql-test/suite/binlog/r/binlog_innodb.result@1.6, 2007-08-14 15:35:16-06:00, tsmith@ramayana.hindu.god +33 -0
    Updates to allow innodb.test to be run with --embedded-server

  mysql-test/suite/binlog/t/binlog_innodb.test@1.5, 2007-08-14 15:35:16-06:00, tsmith@ramayana.hindu.god +39 -0
    Updates to allow innodb.test to be run with --embedded-server

  mysql-test/t/innodb.test@1.171, 2007-08-14 15:35:16-06:00, tsmith@ramayana.hindu.god +11 -52
    Updates to allow innodb.test to be run with --embedded-server

  sql/sql_table.cc@1.437.18.1, 2007-08-14 15:35:16-06:00, tsmith@ramayana.hindu.god +14 -4
    build_table_filename(): Don't add FN_ROOTDIR to mysql_data_home if
    it's already there.  This is done to make it easier to write tests
    which check the output of various error messages, and work with
    both the embedded server (mysql_data_home is full path, including
    trailing FN_ROOTDIR) and normal server (mysql_data_home is just ".").

ChangeSet@1.1810.3272.1, 2007-08-14 17:28:51+04:00, evgen@moonbone.local +2 -0
  Bug#29948: Unchecked NULL pointer caused server crash.
  
  The cli_read_binary_rows function is used to fetch data from the server
  after a prepared statement execution. It accepts a statement handler and gets
  the connection handler from it. But when the auto-reconnect option is set
  the connection handler is reset to NULL after reconnection because the
  prepared statement is lost and the handler became useless. This case
  wasn't checked in the cli_read_binary_rows function and caused server crash.
  
  Now the cli_read_binary_rows function checks the connection handler to be
  not NULL and returns an error if it is.

  libmysql/libmysql.c@1.233.5.19, 2007-08-14 17:27:56+04:00, evgen@moonbone.local +9 -1
    Bug#29948: Unchecked NULL pointer caused server crash.
    Now the cli_read_binary_rows function checks the connection handler to be
    not NULL and returns an error if it is.

  tests/mysql_client_test.c@1.167.34.1, 2007-08-14 17:27:37+04:00, evgen@moonbone.local +75 -0
    Added a test case for the bug#29948: Unchecked NULL pointer caused server crash.

ChangeSet@1.1810.3231.30, 2007-08-14 11:10:23+02:00, msvensson@pilot.(none) +1 -0
  Remove unused variable

  mysql-test/mysql-test-run.pl@1.30.49.97, 2007-08-14 11:10:21+02:00, msvensson@pilot.(none) +0 -1
    Remove unused variable

ChangeSet@1.1810.3231.29, 2007-08-14 11:05:42+02:00, msvensson@pilot.(none) +1 -0
  Remove unused variables

  mysql-test/mysql-test-run.pl@1.30.49.96, 2007-08-14 11:05:40+02:00, msvensson@pilot.(none) +0 -3
    Remove unused variables

ChangeSet@1.2476.12.77, 2007-08-14 10:29:00+02:00, mskold@mysql.com +1 -0
  bug#30337  DELETE ... WHERE PK IN (..) and AFTER DELETE trigger crashes API node: Regenerated result

  mysql-test/r/ndb_read_multi_range.result@1.13.2.2, 2007-08-14 10:28:31+02:00, mskold@mysql.com +19 -0
    bug#30337  DELETE ... WHERE PK IN (..) and AFTER DELETE trigger crashes API node: Regenerated result

ChangeSet@1.1810.3271.1, 2007-08-14 15:07:17+10:00, stewart@willster.(none) +2 -0
   Backport Magnus' fix from 5.1
  
  ChangeSet@1.2575, 2007-08-07 19:16:06+02:00, msvensson@pilot.(none) +2 -0
    Bug#26793 mysqld crashes when doing specific query on information_schema
     - Drop the newly created user user1@localhost
     - Cleanup testcase

  mysql-test/r/ndb_bug26793.result@1.2.1.1, 2007-08-14 15:07:15+10:00, stewart@willster.(none) +1 -6
      mysql-test/r/ndb_bug26793.result@1.3, 2007-08-07 19:16:04+02:00, msvensson@pilot.(none)
    +1 -6
        Update test result

  mysql-test/t/ndb_bug26793.test@1.2.1.1, 2007-08-14 15:07:15+10:00, stewart@willster.(none) +8 -11
      mysql-test/t/ndb_bug26793.test@1.3, 2007-08-07 19:16:04+02:00, msvensson@pilot.(none) +8
    -11
        - Remove the drop/restore of anonymous users - there are no such users
        by default anymore(if there were, they would probably be in mysql.user)
        - Switch back to default connection before cleanup 
        - Drop user1@localhost as part of cleanup

ChangeSet@1.1810.3270.1, 2007-08-14 00:03:05+02:00, kent@mysql.com +2 -0
  make_win_src_distribution_old.sh:
    Rename: scripts/make_win_src_distribution.sh -> scripts/make_win_src_distribution_old.sh
  Makefile.am, make_win_src_distribution_old.sh:
    Rename and put in note not to be used

  scripts/make_win_src_distribution_old.sh@1.37.4.2, 2007-08-14 00:02:41+02:00, kent@mysql.com +8 -0
    Rename and put in note not to be used

  scripts/make_win_src_distribution_old.sh@1.37.4.1, 2007-08-13 23:48:53+02:00, kent@mysql.com +0 -0
    Rename: scripts/make_win_src_distribution.sh -> scripts/make_win_src_distribution_old.sh

  scripts/Makefile.am@1.43.1.23, 2007-08-14 00:02:56+02:00, kent@mysql.com +3 -3
    Rename and put in note not to be used

ChangeSet@1.2476.197.32, 2007-08-13 22:54:29+03:00, bell@desktop.sanja.is.com.ua +8 -0
  First LSN calls added for transaction log.

  storage/maria/ma_checkpoint.c@1.14, 2007-08-13 22:54:26+03:00, bell@desktop.sanja.is.com.ua +1 -1
    Definitions of LSN should be collected in
    the one file (ma_loghandler_lsn.h)

  storage/maria/ma_loghandler.c@1.35, 2007-08-13 22:54:26+03:00, bell@desktop.sanja.is.com.ua +117 -3
    New calls to get first theoretical and first real LSN.

  storage/maria/ma_loghandler.h@1.17, 2007-08-13 22:54:26+03:00, bell@desktop.sanja.is.com.ua +2 -1
    New calls to get first theoretical and first real LSN.

  storage/maria/ma_loghandler_lsn.h@1.11, 2007-08-13 22:54:26+03:00, bell@desktop.sanja.is.com.ua +2 -0
    Defined yet another impossible LSN to indicate error.

  storage/maria/ma_recovery.c@1.11, 2007-08-13 22:54:26+03:00, bell@desktop.sanja.is.com.ua +13 -1
    The first LSN call changed.

  storage/maria/maria_read_log.c@1.12, 2007-08-13 22:54:26+03:00, bell@desktop.sanja.is.com.ua +6 -1
    The first LSN call changed.

  storage/maria/unittest/Makefile.am@1.13, 2007-08-13 22:54:26+03:00, bell@desktop.sanja.is.com.ua +3 -1
    New unittest added.

  storage/maria/unittest/ma_test_loghandler_first_lsn-t.c@1.1, 2007-08-13 22:54:26+03:00, bell@desktop.sanja.is.com.ua +150 -0
    New BitKeeper file ``storage/maria/unittest/ma_test_loghandler_first_lsn-t.c''

  storage/maria/unittest/ma_test_loghandler_first_lsn-t.c@1.0, 2007-08-13 22:54:26+03:00, bell@desktop.sanja.is.com.ua +0 -0

ChangeSet@1.1810.3268.2, 2007-08-13 15:59:08+02:00, mskold@mysql.com +2 -0
  bug#30337  DELETE ... WHERE PK IN (..) and AFTER DELETE trigger crashes API node: Added testcase

  mysql-test/r/ndb_read_multi_range.result@1.3.2.4, 2007-08-13 15:58:22+02:00, mskold@mysql.com +19 -0
    bug#30337  DELETE ... WHERE PK IN (..) and AFTER DELETE trigger crashes API node: Added testcase

  mysql-test/t/ndb_read_multi_range.test@1.4.2.4, 2007-08-13 15:58:22+02:00, mskold@mysql.com +22 -0
    bug#30337  DELETE ... WHERE PK IN (..) and AFTER DELETE trigger crashes API node: Added testcase

ChangeSet@1.1810.3231.28, 2007-08-13 15:46:11+02:00, msvensson@pilot.(none) +4 -0
  Improve error messages
  Write test results to var/log
  Add test for "source" and variable expansion

  client/mysqltest.c@1.155.9.114, 2007-08-13 15:46:10+02:00, msvensson@pilot.(none) +21 -15
    Improve error messages
    Write .reject file to the location specified by --logdir

  mysql-test/mysql-test-run.pl@1.30.49.95, 2007-08-13 15:46:10+02:00, msvensson@pilot.(none) +1 -0
    Pass logdir to mysqltest, to get test results written to var/log

  mysql-test/r/mysqltest.result@1.24.1.32, 2007-08-13 15:46:10+02:00, msvensson@pilot.(none) +5 -3
    Update test results

  mysql-test/t/mysqltest.test@1.24.1.44, 2007-08-13 15:46:10+02:00, msvensson@pilot.(none) +15 -2
    Add test for "source" and variable expansion
    Update test after writing result in var/log

ChangeSet@1.2476.329.1, 2007-08-13 15:17:49+03:00, bell@desktop.sanja.is.com.ua +7 -0
  Ability to read unflushed data added (only problem with CRC left and have to be fixed).
  Already written pages injection to the cache fixed.

  storage/maria/ma_loghandler.c@1.27.1.1, 2007-08-13 15:17:46+03:00, bell@desktop.sanja.is.com.ua +271 -73
    Ability to read unflushed data added.

  storage/maria/ma_page.c@1.12, 2007-08-13 15:17:46+03:00, bell@desktop.sanja.is.com.ua +1 -1
    Parameters added

  storage/maria/ma_pagecache.c@1.32.1.1, 2007-08-13 15:17:46+03:00, bell@desktop.sanja.is.com.ua +13 -3
    Already written pages injection to the cache fixed.
    Validator for case of page content injection added.

  storage/maria/ma_pagecache.h@1.19.1.1, 2007-08-13 15:17:46+03:00, bell@desktop.sanja.is.com.ua +9 -3
    Validator for case of page content injection added.

  storage/maria/unittest/Makefile.am@1.12, 2007-08-13 15:17:46+03:00, bell@desktop.sanja.is.com.ua +3 -1
    Test of reading unflushed data

  storage/maria/unittest/ma_test_loghandler-t.c@1.12.1.1, 2007-08-13 15:17:46+03:00, bell@desktop.sanja.is.com.ua +3 -25
    Define fixed.
    Restart of the log removed.

  storage/maria/unittest/ma_test_loghandler_noflush-t.c@1.1, 2007-08-13 15:17:46+03:00, bell@desktop.sanja.is.com.ua +132 -0
    New BitKeeper file ``storage/maria/unittest/ma_test_loghandler_noflush-t.c''

  storage/maria/unittest/ma_test_loghandler_noflush-t.c@1.0, 2007-08-13 15:17:46+03:00, bell@desktop.sanja.is.com.ua +0 -0

ChangeSet@1.1810.3268.1, 2007-08-13 11:36:30+02:00, mskold@mysql.com +1 -0
  bug#30337  DELETE ... WHERE PK IN (..) and AFTER DELETE trigger crashes API node: Disable multi_read_range if there are after delete/update triggers

  sql/ha_ndbcluster.cc@1.175.89.1, 2007-08-13 11:35:52+02:00, mskold@mysql.com +2 -1
    bug#30337  DELETE ... WHERE PK IN (..) and AFTER DELETE trigger crashes API node: Disable multi_read_range if there are after delete/update triggers

ChangeSet@1.2476.299.17, 2007-08-13 09:46:09+02:00, msvensson@pilot.(none) +1 -0
  Bug#29804 UDF parameters don't contain correct string length
   - Export 'check_const_len_init' from udf_example.dll

  sql/udf_example.def@1.6, 2007-08-13 09:46:07+02:00, msvensson@pilot.(none) +1 -0
    - Export 'check_const_len_init' from udf_example.dll

ChangeSet@1.1810.3217.4, 2007-08-13 09:22:42+02:00, jonas@perch.ndb.mysql.com +8 -0
  ndb - bug#28804
    Handle out of transaction buffer in TC for INDX lookups

  sql/ha_ndbcluster.cc@1.175.1.140, 2007-08-13 09:22:40+02:00, jonas@perch.ndb.mysql.com +8 -2
    Set correct status

  ndb/src/kernel/blocks/ERROR_codes.txt@1.9.22.1, 2007-08-13 09:22:39+02:00, jonas@perch.ndb.mysql.com +5 -1
    Add new error codes for simulating out of transaction buffer memory

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp@1.26.26.1, 2007-08-13 09:22:39+02:00, jonas@perch.ndb.mysql.com +5 -5
    Change signature to handle out of buffer

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.73.50.1, 2007-08-13 09:22:40+02:00, jonas@perch.ndb.mysql.com +122 -41
    Handle otu of transaction buffers in index operations
      (TCINDXREQ++)

  ndb/src/ndbapi/NdbTransaction.cpp@1.43.29.1, 2007-08-13 09:22:40+02:00, jonas@perch.ndb.mysql.com +32 -6
    Give more info on 4012

  ndb/src/ndbapi/ndberror.c@1.30.40.1, 2007-08-13 09:22:40+02:00, jonas@perch.ndb.mysql.com +2 -0
    Add new error code

  ndb/test/ndbapi/testIndex.cpp@1.14.6.1, 2007-08-13 09:22:40+02:00, jonas@perch.ndb.mysql.com +117 -0
    add tests

  ndb/test/run-test/daily-basic-tests.txt@1.27.50.1, 2007-08-13 09:22:40+02:00, jonas@perch.ndb.mysql.com +8 -0
    add tests

ChangeSet@1.2476.314.3, 2007-08-11 00:07:11+02:00, jmiller@mysql.com +2 -0
  rpl_packet.test:
    Changed patch to Mats suggestion from review. Patch is for Bug#30209
  .del-wait_for_slave_running_off.inc:
    Delete: mysql-test/include/wait_for_slave_running_off.inc

  BitKeeper/deleted/.del-wait_for_slave_running_off.inc@1.2, 2007-08-11 00:05:12+02:00, jmiller@mysql.com +0 -0
    Delete: mysql-test/include/wait_for_slave_running_off.inc

  mysql-test/suite/rpl/t/rpl_packet.test@1.10, 2007-08-11 00:06:07+02:00, jmiller@mysql.com +1 -1
    Changed patch to Mats suggestion

ChangeSet@1.2476.324.1, 2007-08-10 12:48:01-04:00, cbell@mysql_cab_desk. +13 -0
  BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
  
  This patch adds functionality to row-based replication to ensure the
  slave's column sizes are >= to that of the master.
  
  It also includes some refactoring for the code from WL#3228.

  mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test@1.3.1.1, 2007-08-10 12:46:35-04:00, cbell@mysql_cab_desk. +49 -40
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    Removed commented out portion of test referenced in bug report. This
    test supports the original request of the bug report.

  mysql-test/include/test_fieldsize.inc@1.1, 2007-08-10 12:46:42-04:00, cbell@mysql_cab_desk. +40 -0
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    Sub unit file to test each variable type that relies on field
    metadata from the master.

  mysql-test/include/test_fieldsize.inc@1.0, 2007-08-10 12:46:42-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/suite/rpl/r/rpl_extraCol_innodb.result@1.8.1.1, 2007-08-10 12:46:35-04:00, cbell@mysql_cab_desk. +99 -32
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    New result file for additional test.

  mysql-test/suite/rpl/r/rpl_extraCol_myisam.result@1.8.1.1, 2007-08-10 12:46:36-04:00, cbell@mysql_cab_desk. +99 -32
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    New result file for additional test.

  mysql-test/suite/rpl/r/rpl_row_colSize.result@1.1, 2007-08-10 12:46:41-04:00, cbell@mysql_cab_desk. +754 -0
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    New result file for additional test.

  mysql-test/suite/rpl/r/rpl_row_colSize.result@1.0, 2007-08-10 12:46:41-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/suite/rpl/t/rpl_row_colSize.test@1.1, 2007-08-10 12:46:41-04:00, cbell@mysql_cab_desk. +168 -0
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    Added a test file to test each variable type that relies on field
    metadata from the master.

  mysql-test/suite/rpl/t/rpl_row_colSize.test@1.0, 2007-08-10 12:46:41-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result@1.9.1.1, 2007-08-10 12:46:37-04:00, cbell@mysql_cab_desk. +99 -32
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    New result file for additional test.

  sql/field.cc@1.402.2.2, 2007-08-10 12:46:37-04:00, cbell@mysql_cab_desk. +271 -1
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    This patch refactors the additions made by this bug patch and those
    made by WL#3228. The effort consolidates the large switches on type()
    into functions within the field classes. 

  sql/field.h@1.238.1.2, 2007-08-10 12:46:38-04:00, cbell@mysql_cab_desk. +66 -2
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    This patch refactors the additions made by this bug patch and those
    made by WL#3228. The effort consolidates the large switches on type()
    into functions within the field classes. 

  sql/log_event.cc@1.277.16.1, 2007-08-10 12:46:39-04:00, cbell@mysql_cab_desk. +29 -126
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    This patch refactors the calc_field_size() method to use the new
    methods implemented in the field classes. It also corrects comments 
    concerning how replication of field metadata works. 

  sql/log_event.h@1.154, 2007-08-10 12:46:39-04:00, cbell@mysql_cab_desk. +1 -2
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    This patch refactors out the calc_field_size() method into the method
    save_field_metadata(). 

  sql/rpl_utility.cc@1.11.1.1, 2007-08-10 12:46:40-04:00, cbell@mysql_cab_desk. +19 -0
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    This patch adds a method to check the size of the field on the master 
    using the field metadata from WL#3228. Each column is checked to ensure 
    the slave's column is >= to the master's column in size.

  sql/rpl_utility.h@1.9.1.1, 2007-08-10 12:46:40-04:00, cbell@mysql_cab_desk. +3 -2
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    This patch changes the table_def class so that it records the size of
    the metadata. This is a result of refactoring out the calc_field_size()
    method into the method save_field_metadata(). Prevents access via 
    field_metadata(col) to unitialized memory when there is no metadata
    transmitted from the master.

ChangeSet@1.2476.197.30, 2007-08-10 15:53:41+02:00, guilhem@gbichot4.local +1 -0
  code of the "mysqltest --global-subst" hack made a bit less horrible.

  client/mysqltest.c@1.301.4.2, 2007-08-10 15:53:39+02:00, guilhem@gbichot4.local +30 -36
    making code a bit less horrible (no system()). Removing bad free().

ChangeSet@1.2476.323.1, 2007-08-09 17:31:00-06:00, malff@weblab.(none) +2 -0
  Bug#25930 (CREATE TABLE x SELECT ... parses columns wrong when ran with
             ANSI_QUOTES mode)
  
  This patch contains a test case only, showing that the bug has been fixed.
  
  The issue was related to parsing <"blah">, where the lexical analyser
  would not properly delimit the start and end of the token.
  
  Properly making the token boundaries has been fixed in sql_lex.cc
  with the patch for bug 25411 : see the Lex_input_stream class.

  mysql-test/r/parser.result@1.6, 2007-08-09 17:30:56-06:00, malff@weblab.(none) +10 -0
    Test case for Bug#25930, which was fixed by Bug#25411

  mysql-test/t/parser.test@1.6, 2007-08-09 17:30:56-06:00, malff@weblab.(none) +22 -0
    Test case for Bug#25930, which was fixed by Bug#25411

ChangeSet@1.2476.314.2, 2007-08-09 23:18:44+02:00, jmiller@mysql.com +3 -0
  rpl_packet.test:
    Updated test to use new include function
  wait_for_slave_running_off.inc:
    Created new include to resolve the timing issue recorded by Bug#30209
  rpl_events.inc:
    The issue shown in Bug#30128 is that 'from er' shows up in a part of the test that it should not show up in. This event really is not created until later in the test, yet since the test runs row and then turns around and runs statement, I am guessing that the first run may not have cleaned up like it should, so I am adding a sync with master after the drop of table t1 to ensure that both master and slave are clean.

  mysql-test/include/wait_for_slave_running_off.inc@1.1, 2007-08-09 23:18:18+02:00, jmiller@mysql.com +35 -0
    Created new include to resolve the timing issue recorded by Bug#30209

  mysql-test/include/wait_for_slave_running_off.inc@1.0, 2007-08-09 23:18:18+02:00, jmiller@mysql.com +0 -0

  mysql-test/include/rpl_events.inc@1.7, 2007-08-09 23:18:31+02:00, jmiller@mysql.com +2 -0
    The issue shown in Bug#30128 is that 'from er' shows up in a part of the test that it should not show up in. This event really is not created until later in the test, yet since the test runs row and then turns around and runs statement, I am guessing that the first run may not have cleaned up like it should, so I am adding a sync with master after the drop of table t1 to ensure that both master and slave are clean.

  mysql-test/suite/rpl/t/rpl_packet.test@1.9, 2007-08-09 23:17:59+02:00, jmiller@mysql.com +1 -0
    Updated test to use new include function

ChangeSet@1.2476.290.2, 2007-08-09 13:01:29-07:00, brian@piggy.tangent.org +2 -0
  Two bugs in one! The count call was duplicating internally the counts for loaded tests (not autosql tests, just loaded). This could manifest itself by executing by file, or by executing a pre statement.
  BUG#29803

  client/mysqlslap.c@1.57.1.1, 2007-08-09 13:01:27-07:00, brian@piggy.tangent.org +9 -10
    1) Declared VOID on pre/post statement return values (we were not using the return value and I prefer to see this declared explicitly)
    2) Removed extra count call which was causing duplication of rows with parsed files examples.

  mysql-test/r/mysqlslap.result@1.13, 2007-08-09 13:01:27-07:00, brian@piggy.tangent.org +2 -2
    The additional selects come from fixing the pre return count call. Dropping the final select is a result of fixing the true count.

ChangeSet@1.2476.197.29, 2007-08-09 15:00:32+02:00, guilhem@gbichot4.local +10 -0
  * tests which use MERGE or INSERT DELAYED should run only
  with engines which support that
  * temporarily adding option --global-subst to mysqltest so that
  the full testsuite can be run using Maria tables without failing
  on trivial differences (like diff in the engine clause of
  SHOW CREATE TABLE)
  * using recognizable tags for todos of the Maria team

  client/mysqltest.c@1.301.4.1, 2007-08-09 15:00:28+02:00, guilhem@gbichot4.local +55 -1
    temporarily adding option --global-subst: its argument is X,Y.
    It replaces all occurrences of X by Y into mysqltest's result
    before the comparison with the expected result is done.
    This serves for when a test is run with --default-storage-engine=X
    where X is not MyISAM: tests using SHOW CREATE TABLE will always fail
    because SHOW CREATE TABLE prints X instead of MyISAM. With
    --global-subst=X,MyISAM , such trivial differences are eliminated and
    test may be reported as passing.
    For example, --global-subst=MARIA,MyISAM
    This is not good enough for merging into main trees! just for running
    many tests and finding bugs now!

  mysql-test/mysql-test-run.pl@1.315, 2007-08-09 15:00:28+02:00, guilhem@gbichot4.local +9 -0
    new option --mysqltest to pass options to mysqltest (like we have
    --mysqld). Used for example like this:
    ./mtr --mysqltest=--global-subst=MARIA,MyISAM

  mysql-test/r/merge.result@1.66.1.1, 2007-08-09 15:00:28+02:00, guilhem@gbichot4.local +2 -0
    update

  mysql-test/t/delayed.test@1.21, 2007-08-09 15:00:28+02:00, guilhem@gbichot4.local +9 -0
    run test only with engines which support INSERT DELAYED

  mysql-test/t/merge.test@1.56, 2007-08-09 15:00:28+02:00, guilhem@gbichot4.local +11 -0
    run test only with MyISAM tables, as they are required by MERGE

  sql/sql_delete.cc@1.223.2.2, 2007-08-09 15:00:28+02:00, guilhem@gbichot4.local +5 -5
    recognizable tag

  sql/table.cc@1.299, 2007-08-09 15:00:28+02:00, guilhem@gbichot4.local +4 -3
    recognizable tag

  storage/maria/ha_maria.cc@1.36, 2007-08-09 15:00:29+02:00, guilhem@gbichot4.local +4 -2
    recognizable tag

  storage/maria/ma_check.c@1.35, 2007-08-09 15:00:29+02:00, guilhem@gbichot4.local +16 -16
    recognizable tag

  storage/maria/ma_create.c@1.25, 2007-08-09 15:00:29+02:00, guilhem@gbichot4.local +2 -1
    recognizable tag

ChangeSet@1.2476.197.28, 2007-08-09 10:51:15+02:00, guilhem@gbichot4.local +5 -0
  * "transactionality" needs to be preserved by TRUNCATE TABLE:
  a table with TRANSACTIONAL=x needs to still have it after TRUNCATE.
  No testcase, but without this fix, the frm and the Maria table
  got "out of sync" in this case:
  create table t1 (a int) row_format=page transactional=0;
  truncate table t1;
  After TRUNCATE, the Maria table (not the frm) was transactional
  (thus logging records, which is wrong).
  * fix for non-closed file at end of "maria_chk -r"

  sql/table.cc@1.298, 2007-08-09 10:51:13+02:00, guilhem@gbichot4.local +6 -0
    "transactionality" needs to be preserved when truncating.
    It's behind a if() to not cancel the hack added to mysql_truncate()
    today for temporary Maria tables.

  storage/maria/ha_maria.cc@1.35, 2007-08-09 10:51:13+02:00, guilhem@gbichot4.local +11 -0
    question for Monty (he also has a big mail from me on the same subject)

  storage/maria/ma_check.c@1.34, 2007-08-09 10:51:13+02:00, guilhem@gbichot4.local +14 -0
    question for Monty (likely bugs)

  storage/maria/ma_create.c@1.24, 2007-08-09 10:51:13+02:00, guilhem@gbichot4.local +3 -0
    debugging info

  storage/maria/ma_open.c@1.22, 2007-08-09 10:51:13+02:00, guilhem@gbichot4.local +3 -2
    fix for datafile left open at end of "maria_chk -r":
    ma_open_datafile() happens after _ma_bitmap_init(), it sets dfile.file
    so needs to set share->bitmap.file.file too (they are copies of
    each other). Otherwise it breaks how closing of files works in
    BLOCK_RECORD (which is that info.dfile.file is not closed
    but share->bitmap.file.file is closed): not setting share->bitmap.file.file
    can lead to forgetting to close a file or closing a wrong file.

ChangeSet@1.2476.308.6, 2007-08-09 10:21:28+02:00, msvensson@pilot.(none) +2 -0
  Bug#29804 UDF parameters don't contain correct string length
   - Fix warnings
   - Export 'check_const_len' from udf_example.dll

  sql/udf_example.c@1.36.1.4, 2007-08-09 10:21:26+02:00, msvensson@pilot.(none) +3 -3
    Fix warnings

  sql/udf_example.def@1.5, 2007-08-09 10:21:26+02:00, msvensson@pilot.(none) +1 -0
    Add 'check_const_len' function to be exported from udf_example.dll 

ChangeSet@1.2476.316.5, 2007-08-08 17:16:26-07:00, omer@linux.site +18 -0
  Updated to result files for cluster tests for version 5.1.21 
  Updared to 'views' test - forcing sort order
  Updateds included masked results as a result of bug 30322

  mysql-test/suite/funcs_1/include/ndb_tb2.inc@1.2, 2007-08-08 17:16:21-07:00, omer@linux.site +1 -1
    Correction to test file creating an ndb table

  mysql-test/suite/funcs_1/r/innodb_views.result@1.8, 2007-08-08 17:16:21-07:00, omer@linux.site +265 -273
    Updated resut file - forcing order by

  mysql-test/suite/funcs_1/r/memory_views.result@1.8, 2007-08-08 17:16:21-07:00, omer@linux.site +265 -273
    Updated resut file - forcing order by

  mysql-test/suite/funcs_1/r/myisam_views.result@1.8, 2007-08-08 17:16:21-07:00, omer@linux.site +8009 -8012
    Updated resut file - forcing order by

  mysql-test/suite/funcs_1/r/ndb_cursors.result@1.2, 2007-08-08 17:16:21-07:00, omer@linux.site +1 -1
    updated result file

  mysql-test/suite/funcs_1/r/ndb_func_view.result@1.3, 2007-08-08 17:16:21-07:00, omer@linux.site +4672 -4507
    updated result file

  mysql-test/suite/funcs_1/r/ndb_storedproc_07.result@1.2, 2007-08-08 17:16:21-07:00, omer@linux.site +4 -4
    updated result file

  mysql-test/suite/funcs_1/r/ndb_storedproc_08.result@1.2, 2007-08-08 17:16:21-07:00, omer@linux.site +108 -0
    updated result file

  mysql-test/suite/funcs_1/r/ndb_trig_0102.result@1.3, 2007-08-08 17:16:21-07:00, omer@linux.site +2 -2
    updated result file

  mysql-test/suite/funcs_1/r/ndb_trig_03.result@1.2, 2007-08-08 17:16:22-07:00, omer@linux.site +1 -1
    updated result file

  mysql-test/suite/funcs_1/r/ndb_trig_03e.result@1.2, 2007-08-08 17:16:22-07:00, omer@linux.site +13 -13
    updated result file

  mysql-test/suite/funcs_1/r/ndb_trig_0407.result@1.2, 2007-08-08 17:16:22-07:00, omer@linux.site +1 -1
    updated result file

  mysql-test/suite/funcs_1/r/ndb_trig_08.result@1.3, 2007-08-08 17:16:22-07:00, omer@linux.site +3 -4
    updated result file

  mysql-test/suite/funcs_1/r/ndb_trig_09.result@1.2, 2007-08-08 17:16:22-07:00, omer@linux.site +1 -1
    updated result file

  mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result@1.2, 2007-08-08 17:16:22-07:00, omer@linux.site +1 -1
    updated result file

  mysql-test/suite/funcs_1/r/ndb_views.result@1.3, 2007-08-08 17:16:22-07:00, omer@linux.site +318 -325
    updated result file

  mysql-test/suite/funcs_1/views/views_master.inc@1.7, 2007-08-08 17:16:22-07:00, omer@linux.site +70 -66
    updated test file - forcing sort order 

  mysql-test/suite/funcs_2/r/ndb_charset.result@1.5, 2007-08-08 17:16:22-07:00, omer@linux.site +124 -124
    Updated result file

ChangeSet@1.2476.197.27, 2007-08-08 22:27:01+02:00, guilhem@gbichot4.local +1 -0
  as I disabled creation of the first empty bitmap at creation time,
  I disable it too for repair time.

  storage/maria/ma_check.c@1.33, 2007-08-08 22:27:00+02:00, guilhem@gbichot4.local +6 -0
    as I disabled creation of the first empty bitmap at creation time,
    I disable it too for repair time.

ChangeSet@1.2476.197.26, 2007-08-08 18:59:57+02:00, guilhem@gbichot4.local +3 -0
  Fix for
  ./mtr --mysqld=--default-storage-engine=maria --mem ps:
  I got "can't sync on file UNOPENED" among the messages of REPAIR TABLE;
  due to a missing setting of bitmap.file.file to -1.
  Maria had two names "Maria" and "MARIA", using one now: "MARIA".

  storage/maria/ha_maria.cc@1.34, 2007-08-08 18:59:55+02:00, guilhem@gbichot4.local +1 -1
    plug.in uses "MARIA". Some code apparently picks the name from
    plug.in (SHOW CREATE TABLE, run ps.test on Maria tables), other from
    mysql_declare_plugin (SHOW CREATE TABLE on partitioned tables, run
    partition.test with Maria tables), better make names identical.

  storage/maria/ma_check.c@1.32, 2007-08-08 18:59:55+02:00, guilhem@gbichot4.local +3 -3
    running ps.test on Maria tables I got "can't sync on file UNOPENED"
    among the messages of REPAIR TABLE. That was due to maria_repair()
    closing the data file, setting info->dfile.file to -1 to prevent
    a wrong double close, but forgetting to also set
    info->s->bitmap.file.file to -1; it left it unchanged and so,
    when close_thread_tables() closed the old version of the repaired
    table, _ma_once_end_block_record() tried to fsync the closed
    descriptor, resulting in a message.
    Basically, when setting info->dfile.file to something it's always
    safe and recommended to set bitmap.file.file to the same value
    as it's just a copy of the same descriptor see _ma_bitmap_init().
    Using change_data_file_descriptor() for that.
    Changing that function to use MY_WME as it looks safe.

  storage/maria/ma_close.c@1.17, 2007-08-08 18:59:56+02:00, guilhem@gbichot4.local +1 -1
    no need to make the index file durable if table is not transactional

ChangeSet@1.2476.299.15, 2007-08-08 12:21:04-04:00, cmiller@zippy.cornsilk.net +3 -0
  Correct bad merge, and remove version numbers from test case.

  mysql-test/r/mysqlbinlog2.result@1.15, 2007-08-08 12:20:59-04:00, cmiller@zippy.cornsilk.net +1 -1
    Change test case to remove server version number.

  mysql-test/t/mysqlbinlog2.test@1.18, 2007-08-08 12:20:59-04:00, cmiller@zippy.cornsilk.net +1 -1
    Change test case to remove server version number.

  mysys/mf_iocache2.c@1.37, 2007-08-08 12:20:59-04:00, cmiller@zippy.cornsilk.net +1 -0
    Correcting bad merge.

ChangeSet@1.1810.3262.8, 2007-08-08 18:03:44+02:00, msvensson@shellback.(none) +2 -0
  Don't require a space between "if" and "(". This should
  also fix "while" and "connect"
  It's now possible to write "if("

  client/mysqltest.c@1.155.35.7, 2007-08-08 18:03:36+02:00, msvensson@shellback.(none) +6 -2
    Don't require a space between for example "if" and "(". This should
    also fix "while" and "connect"

  mysql-test/t/mysqltest.test@1.24.15.2, 2007-08-08 18:03:36+02:00, msvensson@shellback.(none) +1 -1
    Remove space between if and ( to check it works

ChangeSet@1.2476.197.25, 2007-08-08 17:56:15+02:00, guilhem@gbichot4.local +14 -0
  Tests which use INSERT DELAYED or MERGE tables should explicitely
  specify that they want a MyISAM table, otherwise they fail
  when run with --default-storage-engine=maria.

  mysql-test/extra/rpl_tests/rpl_flsh_tbls.test@1.18, 2007-08-08 17:56:13+02:00, guilhem@gbichot4.local +2 -2
    uses INSERT DELAYED so has to specify MyISAM        

  mysql-test/extra/rpl_tests/rpl_insert_delayed.test@1.5.1.1, 2007-08-08 17:56:13+02:00, guilhem@gbichot4.local +1 -1
    uses INSERT DELAYED so has to specify MyISAM

  mysql-test/r/query_cache.result@1.93.1.1, 2007-08-08 17:56:13+02:00, guilhem@gbichot4.local +3 -3
    result update

  mysql-test/r/subselect.result@1.195.1.1, 2007-08-08 17:56:13+02:00, guilhem@gbichot4.local +3 -3
    result update

  mysql-test/r/rpl_insert.result@1.3.1.1, 2007-08-08 17:56:13+02:00, guilhem@gbichot4.local +1 -1
    result update

  mysql-test/r/rpl_stm_flsh_tbls.result@1.17.1.1, 2007-08-08 17:56:13+02:00, guilhem@gbichot4.local +4 -4
    result update

  mysql-test/r/rpl_stm_insert_delayed.result@1.1.1.1, 2007-08-08 17:56:13+02:00, guilhem@gbichot4.local +2 -2
    result update

  mysql-test/r/rpl_switch_stm_row_mixed.result@1.22.2.1, 2007-08-08 17:56:13+02:00, guilhem@gbichot4.local +3 -3
    result update

  mysql-test/t/rpl_insert.test@1.6.1.1, 2007-08-08 17:56:13+02:00, guilhem@gbichot4.local +1 -1
    uses INSERT DELAYED so has to specify MyISAM

  mysql-test/t/rpl_stm_flsh_tbls.test@1.4.1.1, 2007-08-08 17:56:13+02:00, guilhem@gbichot4.local +1 -1
    specifying the engine lengthens the query in binlog so shifts
    positions

  mysql-test/t/rpl_switch_stm_row_mixed.test@1.17.1.1, 2007-08-08 17:56:13+02:00, guilhem@gbichot4.local +1 -1
    uses INSERT DELAYED so has to specify MyISAM

  mysql-test/t/query_cache.test@1.73.1.1, 2007-08-08 17:56:13+02:00, guilhem@gbichot4.local +3 -3
    uses MERGE so has to specify MyISAM

  mysql-test/t/query_cache_merge.test@1.7, 2007-08-08 17:56:13+02:00, guilhem@gbichot4.local +1 -1
    uses MERGE so has to specify MyISAM

  mysql-test/t/subselect.test@1.159.1.1, 2007-08-08 17:56:13+02:00, guilhem@gbichot4.local +3 -3
    uses INSERT DELAYED so has to specify MyISAM

ChangeSet@1.2476.197.24, 2007-08-08 17:07:12+02:00, guilhem@gbichot4.local +2 -0
  Hackish fix for at-shutdown assertions in
  ./mtr --mysqld=--default-storage-engine=maria --mem --skip-ndb temp_table truncate --force
  The root cause of the problem has been reported as BUG#30309
  "mysql_truncate() does not inform engine that the recreated table is temporary"
  The temporary fix used here is that when mysql_truncate() identifies
  a temp table of engine "Maria" it declares it non-transactional,
  thus the table is re-created by ha_maria::create() as non-transactional.

  sql/mysqld.cc@1.598, 2007-08-08 17:07:10+02:00, guilhem@gbichot4.local +1 -0
    porting fix of BUG#29133 (mysqld takes too much time to shutdown
    without this fix, I can't wait for the next merge)

  sql/sql_delete.cc@1.223.2.1, 2007-08-08 17:07:10+02:00, guilhem@gbichot4.local +12 -1
    a hack to work around BUG#30309 "mysql_truncate() does not inform
    engine that the recreated table is temporary"

ChangeSet@1.1810.3262.7, 2007-08-08 16:45:18+02:00, msvensson@shellback.(none) +1 -0
  Use "create_temp_file" to create a temporary file name for the perl script

  client/mysqltest.c@1.155.35.6, 2007-08-08 16:45:07+02:00, msvensson@shellback.(none) +18 -9
    Use "create_temp_file" to create a temporary file name for the perl script

ChangeSet@1.1810.3262.6, 2007-08-08 16:44:01+02:00, msvensson@shellback.(none) +3 -0
  Remove extra newline added to files created by write_file and append_file

  client/mysqltest.c@1.155.35.5, 2007-08-08 16:43:57+02:00, msvensson@shellback.(none) +23 -0
    - Remove the extra newline first in the file produced by
      write_file and append_file
    - Add check for too many arguments passed to 'check_command_args'

  mysql-test/r/mysqltest.result@1.24.11.1, 2007-08-08 16:43:57+02:00, msvensson@shellback.(none) +1 -0
    Update test result

  mysql-test/t/mysqltest.test@1.24.15.1, 2007-08-08 16:43:57+02:00, msvensson@shellback.(none) +1 -0
    Add test to check that no extra newline is created

ChangeSet@1.2476.306.11, 2007-08-08 16:39:13+02:00, msvensson@pilot.(none) +1 -0
  Remove file before writing to it.

  mysql-test/t/csv.test@1.27, 2007-08-08 16:39:12+02:00, msvensson@pilot.(none) +5 -0
    Remove file before writing to it.

ChangeSet@1.2476.319.3, 2007-08-08 19:23:12+08:00, gni@dev3-221.dev.cn.tlan +1 -0
  fix merge bug

  sql/ha_ndbcluster.cc@1.457.2.2, 2007-08-08 19:23:07+08:00, gni@dev3-221.dev.cn.tlan +1 -0
    fix merge bug 

ChangeSet@1.2476.197.23, 2007-08-08 11:36:41+02:00, guilhem@gbichot4.local +2 -0
  propagation to maria_repair_by_sort() and maria_repair_parallel()
  of bugfix made to maria_repair() yesterday.
  Fail "bk delta" (and thus "bk citool") if an added or modified line
  of a C/C++ file has white space at end of line

  BitKeeper/triggers/pre-delta@1.5, 2007-08-08 11:36:13+02:00, guilhem@gbichot4.local +2 -2
    detection gave false alarm on added newline

  BitKeeper/triggers/pre-delta@1.4, 2007-08-08 11:18:45+02:00, guilhem@gbichot4.local +15 -0
    fail "bk delta" (and thus "bk citool") if an added or modified line
    of a C/C++ file has white space at end of line (I do the "mistake"
    often). Will break on platforms without "grep", but we already
    rely on "tail" earlier in the script.

  storage/maria/ma_check.c@1.31, 2007-08-08 11:36:39+02:00, guilhem@gbichot4.local +8 -0
    propagation to maria_repair_by_sort() and maria_repair_parallel()
    of bugfix made to maria_repair() yesterday. No effect now as
    those two repair variants are never used with BLOCK_RECORD.

ChangeSet@1.1810.3257.9, 2007-08-08 10:04:26+02:00, msvensson@pilot.(none) +1 -0
  Improve comments and log messages in lib/mtr_timer.pl

  mysql-test/lib/mtr_timer.pl@1.7.1.7, 2007-08-08 10:04:25+02:00, msvensson@pilot.(none) +12 -18
    Improve comments and log messages in lib/mtr_timer.pl

ChangeSet@1.1810.3257.8, 2007-08-08 09:31:45+02:00, msvensson@pilot.(none) +1 -0
  Fix warning

  client/mysqltest.c@1.155.9.111, 2007-08-08 09:31:43+02:00, msvensson@pilot.(none) +1 -1
    Fix warning

ChangeSet@1.1810.3080.2, 2007-08-07 18:07:57+00:00, lzhou@dev3-63.(none) +17 -0
  BUG#29674 Restore/backup are endian compatible in 5.0

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.1.Data@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +1066 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.1.Data@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.1.Data@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +394 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.1.Data@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.2.Data@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +393 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.2.Data@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.2.Data@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +1065 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.2.Data@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.ctl@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +549 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.ctl@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.ctl@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +549 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.ctl@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.log@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +2 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.log@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.log@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +2 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.log@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.ctl@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +549 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.ctl@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.ctl@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +549 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.ctl@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.log@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +2 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.log@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.log@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +2 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.log@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/r/ndb_restore_different_endian_data.result@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +200 -0
    Test case result for restore data from different endian

  mysql-test/r/ndb_restore_different_endian_data.result@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/t/ndb_restore_different_endian_data.test@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +185 -0
    Test case for restore data from different endian

  mysql-test/t/ndb_restore_different_endian_data.test@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.74.35.1, 2007-08-07 18:07:39+00:00, lzhou@dev3-63.(none) +10 -3
    Twiddle the "replicaCount" and "fragCount" variable when restore data from different endian.

  ndb/src/ndbapi/NdbDictionaryImpl.hpp@1.30.14.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +2 -1
    Add byte order variable

  ndb/tools/restore/Restore.cpp@1.22.12.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +32 -1
    Twiddle blob, datatime,timestamp when do restore in different endian.

ChangeSet@1.2476.12.75, 2007-08-07 19:16:06+02:00, msvensson@pilot.(none) +2 -0
  Bug#26793 mysqld crashes when doing specific query on information_schema
   - Drop the newly created user user1@localhost
   - Cleanup testcase

  mysql-test/r/ndb_bug26793.result@1.3, 2007-08-07 19:16:04+02:00, msvensson@pilot.(none) +1 -6
    Update test result

  mysql-test/t/ndb_bug26793.test@1.3, 2007-08-07 19:16:04+02:00, msvensson@pilot.(none) +8 -11
    - Remove the drop/restore of anonymous users - there are no such users
    by default anymore(if there were, they would probably be in mysql.user)
    - Switch back to default connection before cleanup 
    - Drop user1@localhost as part of cleanup

ChangeSet@1.2476.197.22, 2007-08-07 18:23:49+02:00, guilhem@gbichot4.local +5 -0
  Fix for errors during:
  "./mtr --mysqld=--default-storage-engine=maria mysqldump".
  First problem was use of INSERT DELAYED and MERGE tables without
  specifying that the tables to create should always be MyISAM.
  After fixing this, no rows were returned by the final SELECT of the
  "BUG 19025" portion of the test. Simplified problem was:
  LOCK TABLES `t1` WRITE;
  /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
  INSERT INTO `t1` VALUES ('bla',1000),('bla',1001),('bla',1002);
  /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
  UNLOCK TABLES;
  select * from t1;
  The SELECT would find no rows. Reason: ENABLE KEYS does a maria_repair();
  but data pages are still in the page cache and not on disk (because
  they were not flushed because maria_lock_database(F_UNLCK) was
  not called at the end of INSERT because under LOCK TABLES).
  At start of maria_repair(), sort_info.filelength is set to the
  physical size of the data file (=> too small because pages are in
  cache and not on disk).
  Then in sort_get_next_record(), when seeing end-of-file, this is done:
  sort_param->max_pos= sort_info->filelength;
  Further in maria_repair(), this is done:
  info->state->data_file_length= sort_param.max_pos;
  and so data_file_length is smaller (0) than reality (16384).
  This makes SELECT think EOF is where it is not, and thus find
  no rows.
  This is fixed by flushing all data pages at the start of maria_repair()
  (no performance problem is introduced as in common cases where
  ALTER TABLE is not under LOCK TABLES, the previous statement did
  this flush anyway).
  Another reason to do this flush is that, if not doing it, old cached
  pages might go down onto the repaired data file at a later point
  and thus corrupt it (assume a REPAIR non-QUICK).
  A similar bug is fixed:
  LOCK TABLES WRITE; INSERT; CHECK TABLE;
  reports "Size of datafile is: 0         Should be: 16384"
  again because the physical size was read without a preliminary
  page cache flush.

  mysql-test/r/maria.result@1.14, 2007-08-07 18:23:46+02:00, guilhem@gbichot4.local +12 -0
    result update

  mysql-test/r/mysqldump.result@1.152.1.2, 2007-08-07 18:23:46+02:00, guilhem@gbichot4.local +3 -3
    result update

  mysql-test/t/maria.test@1.16, 2007-08-07 18:23:47+02:00, guilhem@gbichot4.local +17 -0
    adding test for fixed bug in LOCK TABLES + CHECK TABLE + block format.
    Disabling portion which hits "incorrect key file" but still
    letting it make the test fail (Monty to fix).

  mysql-test/t/mysqldump.test@1.145.1.1, 2007-08-07 18:23:47+02:00, guilhem@gbichot4.local +3 -3
    in places where test expects engine to support INSERT DELAYED and
    be includable in a MERGE table, i.e. be MyISAM, we explicitely
    ask for MyISAM.

  storage/maria/ma_check.c@1.30, 2007-08-07 18:23:47+02:00, guilhem@gbichot4.local +18 -9
    Before reading the data file's physical size with my_seek(MY_SEEK_END)
    during maria_chk_size() and maria_repair(), we must flush this
    data file, otherwise physical size is misleading and leads to
    - CHECK TABLE finding the table corrupted ("size of datafile should be"
    error)
    - ALTER TABLE ENABLE KEYS losing rows (maria_repair()
    setting data_file_length to a too small value => later SELECT does
    not find rows though they are in the data file).
    This fixes the "mysqldump.test" failure.
    sort_info.filelength contains the physical size, re-using it.

ChangeSet@1.1810.3260.2, 2007-08-07 19:25:45+05:00, bar@mysql.com +3 -0
  Reversing additional change suggested by Serg
  under terms of bug#28875 for better performance.
  The change appeared to require more changes in item_cmpfunc.cc,
  which is dangerous in 5.0.
      
  Conversion between a latin1 column and an ascii string constant
  stopped to work.

  mysql-test/r/ctype_recoding.result@1.30.1.4, 2007-08-07 19:25:43+05:00, bar@mysql.com +8 -0
    Adding test case.

  mysql-test/t/ctype_recoding.test@1.23.1.1, 2007-08-07 19:25:43+05:00, bar@mysql.com +10 -0
    Adding test case.

  sql/sql_string.cc@1.91.1.8, 2007-08-07 19:25:43+05:00, bar@mysql.com +0 -2
    Reversing additional change suggested by Serg
    under terms of bug#28875 for better performance.
    The change appeared to require more changes in item_cmpfunc.cc,
    which is dangerous in 5.0.
        
    Conversion between a latin1 column and an ascii string constant
    stopped to work.

ChangeSet@1.2476.197.21, 2007-08-07 16:06:42+02:00, guilhem@gbichot4.local +6 -0
  Fix for three bugs:
  number 1: "./mtr --mysqld=--default-storage-engine=maria backup"
  restored no rows (forgot to flush data pages before my_copy(),
  and also the maria_repair() used by ha_maria::restore() needed
  a correct data_file_length to not miss rows). [note that BACKUP
  TABLE will be removed anyway in 5.2]
  number 2: "./mtr --mysqld=--default-storage-engine=maria bootstrap"
  caused segfault (uninitialized variable)
  number 3: "./mtr --mysqld=--default-storage-engine=maria check"
  showed warning in CHECK TABLE (maria_create() created a non-empty
  data file with data_file_length==0).

  storage/maria/ha_maria.cc@1.33, 2007-08-07 16:06:40+02:00, guilhem@gbichot4.local +7 -0
    in ha_maria::backup, need to flush the data file before copying it,
    otherwise data misses from the copy (bug 1)

  storage/maria/ma_bitmap.c@1.16, 2007-08-07 16:06:40+02:00, guilhem@gbichot4.local +1 -0
    when allocating data at the end of the bitmap, best_data is at "end",
    should not be left to 0 (bug 2)

  storage/maria/ma_check.c@1.29, 2007-08-07 16:06:40+02:00, guilhem@gbichot4.local +9 -1
    _ma_scan_block_record() is used in QUICK repair. It relies on
    data_file_length. RESTORE TABLE mixes the MAI of an empty table
    (so, data_file_length==0) with an non-empty MAD, and does a 
    QUICK repair; that got fooled (thought it had hit EOF immediately,
    so found no records) (bug 1)

  storage/maria/ma_create.c@1.23, 2007-08-07 16:06:40+02:00, guilhem@gbichot4.local +14 -1
    At the end of maria_create() we have, in the index file,
    data_file_length==0, while the data file has a bitmap page (8192).
    This inconsistency makes CHECK TABLE rightly complain.
    Fixed by not creating a first bitmap page during maria_create()
    (also saves disk space) (bug 3) Question for Monty.

  storage/maria/ma_extra.c@1.14, 2007-08-07 16:06:40+02:00, guilhem@gbichot4.local +60 -0
    A function to flush the data and index files before one can
    use OS syscalls (reads, writes) on those files. For example,
    ha_maria::backup() does a my_copy() of the data file and so
    all cached pieces of this file must be sent to the OS (bug 1)
    This function will have to be used elsewhere in Maria, several places
    have not been updated when we added pagecache-ing of the data file
    (they still only flush the index file), they are probable bugs.

  storage/maria/maria_def.h@1.28, 2007-08-07 16:06:40+02:00, guilhem@gbichot4.local +5 -0
    new function. Needs to be visible from ha_maria::backup.

ChangeSet@1.1810.3262.5, 2007-08-07 11:56:30+02:00, msvensson@shellback.(none) +1 -0
  Bug#29547 mysql-test-run to retrieve warnings for failed command
   - Run "SHOW WARNINGS" when mysqltest fails and display all but the
     last warning(since it's the same as "last error") on stderr
   - Fix typo

  client/mysqltest.c@1.155.35.4, 2007-08-07 11:56:26+02:00, msvensson@shellback.(none) +81 -4
    - Display any warnings produced prior to the error that caused
    mysqltest to die.
    - Fix typo "cur_con" -> "con_slot"
    - Move initialization of the "cur_con" pointer to just before it's
      initialized  so it can be used to check if a connection to mysql
      exist.   

ChangeSet@1.1810.3257.6, 2007-08-07 11:40:03+02:00, msvensson@pilot.(none) +7 -0
  Bug#20037 mysqltest requires cygwin on windows(part 1, new mysqltest commands)
   - Update comments
   - Make "write_file" fail if file already exist
   - Remove temporary files created by test cases

  client/mysqltest.c@1.155.9.109, 2007-08-07 11:40:02+02:00, msvensson@pilot.(none) +11 -5
    Improve function comments
    Make write_file fail if file already exist

  mysql-test/r/mysqltest.result@1.24.10.1, 2007-08-07 11:40:02+02:00, msvensson@pilot.(none) +2 -1
    Update test result after adding new test and updating description
    of argumements to chmod

  mysql-test/t/bootstrap.test@1.2, 2007-08-07 11:40:02+02:00, msvensson@pilot.(none) +5 -2
    Remove temporary file created by testcase 

  mysql-test/t/mysql.test@1.4.1.27, 2007-08-07 11:40:02+02:00, msvensson@pilot.(none) +3 -0
    Remove temporary file created by testcase 

  mysql-test/t/mysqladmin.test@1.5.1.1, 2007-08-07 11:40:02+02:00, msvensson@pilot.(none) +2 -1
    Remove temporary file created by testcase 

  mysql-test/t/mysqltest.test@1.24.14.1, 2007-08-07 11:40:02+02:00, msvensson@pilot.(none) +20 -0
    Remove temporary file created by testcase 
    Add test to show that "write_file" fails if file already exist

  mysql-test/t/sp-destruct.test@1.3.1.5, 2007-08-07 11:40:02+02:00, msvensson@pilot.(none) +1 -0
    Remove temporary file created by testcase 

ChangeSet@1.1810.3265.1, 2007-08-07 05:35:20-04:00, cmiller@zippy.cornsilk.net +4 -0
  Bug#27562: ascii.xml invalid?
  
  Two character mappings were way off (backtick and tilde were "E"
  and "Y"!), and three others were slightly rotated.  The first 
  would cause collisions, and the latter was probably benign.
  
  Now, assign the character mappings exactly to their normal values.

  mysql-test/r/ctype_ascii.result@1.1, 2007-08-07 05:35:18-04:00, cmiller@zippy.cornsilk.net +177 -0
    Add new test file.
    
    Test all combinations of printable letter comparisons for 
    similarity.
    

  mysql-test/r/ctype_ascii.result@1.0, 2007-08-07 05:35:18-04:00, cmiller@zippy.cornsilk.net +0 -0

  mysql-test/t/ctype_ascii.test@1.1, 2007-08-07 05:35:18-04:00, cmiller@zippy.cornsilk.net +13 -0
    Add new test file.
    
    Test all combinations of printable letter comparisons for 
    similarity.
    

  mysql-test/t/ctype_ascii.test@1.0, 2007-08-07 05:35:18-04:00, cmiller@zippy.cornsilk.net +0 -0

  sql/share/charsets/ascii.xml@1.7, 2007-08-07 05:35:18-04:00, cmiller@zippy.cornsilk.net +3 -3
    Change the character mapping for 
     "`" to "`" (was "E") and 
     "[" to "[" (was "\") and 
     "\" to "\" (was "]") and
     "]" to "]" (was "[") and 
     "~" to "~" (was "Y").

  strings/ctype-extra.c@1.23.4.1, 2007-08-07 05:35:18-04:00, cmiller@zippy.cornsilk.net +3 -3
    Generated from charsets directory.

ChangeSet@1.2476.197.20, 2007-08-06 20:17:38+02:00, guilhem@gbichot4.local +2 -0
  Make test does not fail if run with
  --mysqld=--default-storage-engine=X where X does not support
  INSERT DELAYED (like Maria)

  mysql-test/r/alter_table.result@1.85, 2007-08-06 20:17:36+02:00, guilhem@gbichot4.local +1 -1
    result update

  mysql-test/t/alter_table.test@1.66.1.1, 2007-08-06 20:17:36+02:00, guilhem@gbichot4.local +1 -1
    so that test does not fail if run with
    --mysqld=--default-storage-engine=X where X does not support
    INSERT DELAYED (like Maria)

ChangeSet@1.2476.197.19, 2007-08-06 16:13:42+02:00, guilhem@gbichot4.local +3 -0
  fixes of bad merge (probably). Less duplication in ma_test_recovery.

  storage/maria/ma_range.c@1.10, 2007-08-06 16:13:40+02:00, guilhem@gbichot4.local +0 -2
    old code, which is wrong now (key_len is now a local variable,
    not initialized). Fixes some problems in running ma_test2.

  storage/maria/ma_test2.c@1.17, 2007-08-06 16:13:40+02:00, guilhem@gbichot4.local +2 -2
    keypart_map should be used instead of length (fix of bad merge
    probably)

  storage/maria/ma_test_recovery@1.3, 2007-08-06 16:13:40+02:00, guilhem@gbichot4.local +25 -21
    less duplication in this script (one loop instead).

ChangeSet@1.2476.311.7, 2007-08-06 06:55:50-07:00, gkodinov@magare.gmz +1 -0
  Bug 29536 : error message changed 5.0-opt -> 5.1-opt

  mysql-test/suite/rpl/r/rpl_timezone.result@1.24, 2007-08-06 06:55:46-07:00, gkodinov@magare.gmz +1 -1
    Bug 29536 : error message changed 5.0-opt -> 5.1-opt

ChangeSet@1.1810.3264.1, 2007-08-06 04:57:28-07:00, gkodinov@magare.gmz +4 -0
  Bug #29536: timestamp inconsistent in replication around 1970
  
  MySQL replicates the time zone only when operations that involve
  it are performed. This is controlled by a flag. But this flag
  is set only on successful operation.
  The flag must be set also when there is an error that involves
  a timezone (so the master would replicate the error to the slaves). 
  
  Fixed by moving the setting of the flag before the operation
  (so it apples to errors as well).

  mysql-test/r/rpl_timezone.result@1.12.1.5, 2007-08-06 04:57:26-07:00, gkodinov@magare.gmz +18 -0
    Bug #29536: test case

  mysql-test/t/rpl_timezone.test@1.8.1.3, 2007-08-06 04:57:26-07:00, gkodinov@magare.gmz +27 -2
    Bug #29536: test case

  sql/field.cc@1.256.1.104, 2007-08-06 04:57:26-07:00, gkodinov@magare.gmz +3 -3
    Bug #29536: move setting of the flag before the operation
    (so it apples to errors as well).

  sql/time.cc@1.57.8.2, 2007-08-06 04:57:26-07:00, gkodinov@magare.gmz +1 -1
    Bug #29536: move setting of the flag before the operation
    (so it apples to errors as well).

ChangeSet@1.1810.3262.4, 2007-08-06 13:42:00+02:00, msvensson@shellback.(none) +1 -0
  Add missing '
  Extend buffer size to allow for longer log messages

  client/mysqltest.c@1.155.35.3, 2007-08-06 13:41:55+02:00, msvensson@shellback.(none) +2 -2
    Add missing '
    Extend buffer size to allow for longer log messages

ChangeSet@1.1810.3262.3, 2007-08-06 11:20:36+02:00, msvensson@shellback.(none) +3 -0
  Remove NOT_YET code
  Update comments
  Add more tests for "let from query"

  client/mysqltest.c@1.155.35.2, 2007-08-06 11:20:33+02:00, msvensson@shellback.(none) +6 -24
    Remove NOT_YET code
    Update comments

  mysql-test/r/mysqltest.result@1.24.1.29, 2007-08-06 11:20:33+02:00, msvensson@shellback.(none) +12 -0
    Add more tests for "let from query" 

  mysql-test/t/mysqltest.test@1.24.1.40, 2007-08-06 11:20:33+02:00, msvensson@shellback.(none) +19 -17
    Add more tests for "let from query" 

ChangeSet@1.1810.3262.2, 2007-08-06 10:39:48+02:00, msvensson@shellback.(none) +1 -0
  Fix spelling errors

  client/mysqltest.c@1.155.35.1, 2007-08-06 10:39:43+02:00, msvensson@shellback.(none) +2 -2
    Fix spelling errors

ChangeSet@1.1810.3259.6, 2007-08-06 01:01:22-07:00, igor@olga.mysql.com +2 -0
  Removed a query from the test case for bug 39219 that displayed in valgrind
  a problem for BIT type values different from the one reported for the bug.

  mysql-test/r/type_bit.result@1.14.1.8, 2007-08-06 01:01:16-07:00, igor@olga.mysql.com +0 -8
    Removed a query from the test case for bug 39219 that displayed in valgrind
    a problem for BIT type values different from the one reported for the bug.

  mysql-test/t/type_bit.test@1.18.1.2, 2007-08-06 01:01:17-07:00, igor@olga.mysql.com +0 -5
    Removed a query from the test case for bug 39219 that displayed in valgrind
    a problem for BIT type values different from the one reported for the bug.

ChangeSet@1.2476.311.4, 2007-08-06 00:53:32-07:00, igor@olga.mysql.com +1 -0
  Post-merge fixes.

  sql/field.h@1.242.1.2, 2007-08-06 00:53:26-07:00, igor@olga.mysql.com +2 -2
    Post-merge fixes.

ChangeSet@1.2476.308.5, 2007-08-05 21:37:55-04:00, dkatz@damien-katzs-computer.local +4 -0
  Bug #29804  UDF parameters don't contain correct string length
  
  Previously, UDF *_init functions were passed constant strings with erroneous lengths.
  The length came from the containing variable's size, not the length of the value itself.
  
  Now the *_init functions get the constant as a null terminated string with the correct
  length supplied.

  mysql-test/r/udf.result@1.21, 2007-08-05 21:37:51-04:00, dkatz@damien-katzs-computer.local +24 -0
    Test case to check constants passed UDFs.

  mysql-test/t/udf.test@1.19, 2007-08-05 21:37:51-04:00, dkatz@damien-katzs-computer.local +36 -0
    Test case to check constants passed UDFs.

  sql/item_func.cc@1.409.2.1, 2007-08-05 21:37:51-04:00, dkatz@damien-katzs-computer.local +2 -1
    UDF _init functions are now passed the length of the constants, rather than the max
    length of the var containing the constant.

  sql/udf_example.c@1.36.1.3, 2007-08-05 21:37:51-04:00, dkatz@damien-katzs-computer.local +35 -0
    Added check_const_len functions. The check_const_len_init functions checks that the
    lengths of constants are correctly passed.

ChangeSet@1.2476.308.4, 2007-08-05 21:08:08-04:00, dkatz@damien-katzs-computer.local +1 -0
  Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
  into  damien-katzs-computer.local:/Users/dkatz/mysql51

  BitKeeper/deleted/.del-.del-README.txt@1.2.1.1, 2007-08-05 21:08:03-04:00, dkatz@damien-katzs-computer.local +0 -0
    Delete: BitKeeper/deleted/.del-README.txt

ChangeSet@1.1810.3259.5, 2007-08-05 17:12:57-07:00, igor@olga.mysql.com +1 -0
  Fixed compiler error for Windows in the patch for bug 30219.

  sql/field.h@1.153.27.9, 2007-08-05 17:12:52-07:00, igor@olga.mysql.com +1 -1
    Fixed compiler error for Windows in the patch for bug 30219.

ChangeSet@1.1810.3250.5, 2007-08-05 14:16:49-07:00, igor@olga.mysql.com +3 -0
  Fix bug #30219.
  This bug manifested itself for queries with grouping by columns of
  the BIT type. It led to wrong comparisons of bit-field values and
  wrong result sets.
  Bit-field values never cannot be compared as binary values. Yet
  the class Field_bit had an implementation of the cmp method that
  compared bit-fields values as binary values. 
  Also the get_image and set_image methods of the base class Field 
  cannot be used for objects of the Field_bit class. 
  Now these methods are declared as virtual and specific implementations
  of the methods are provided for the class Field_bit.

  mysql-test/r/type_bit.result@1.14.1.7, 2007-08-05 14:16:44-07:00, igor@olga.mysql.com +32 -0
    Added a test case for bug #30219.

  mysql-test/t/type_bit.test@1.18.1.1, 2007-08-05 14:16:44-07:00, igor@olga.mysql.com +24 -0
    Added a test case for bug #30219.

  sql/field.h@1.153.27.8, 2007-08-05 14:16:44-07:00, igor@olga.mysql.com +10 -3
    Fix bug #30219.
    This bug manifested itself for queries with grouping by columns of
    the BIT type. It led to wrong comparisons of bit-field values and
    wrong result sets.
    Bit-field values never cannot be compared as binary values. Yet
    the class Field_bit had an implementation of the cmp method that
    compared bit-fields values as binary values.
    Also the get_image and set_image methods of the base class Field
    cannot be used for objects of the Field_bit class. 
    Now these methods are declared as virtual and specific implementations
    of these methods are provided for the class Field_bit.

ChangeSet@1.2476.311.2, 2007-08-05 14:02:33+03:00, gkodinov@magare.gmz +7 -0
  rpl_row_tabledefs_2myisam.result:
     merged 5.1-main to 5.1-opt : error numbers changed.
  Many files:
     merged 5.1-main to 5.1-opt : error numbers changed
  rpl_extraCol_innodb.result:
    merged 5.1-main to 5.1-opt : error numbers changed

  mysql-test/suite/rpl/r/rpl_extraCol_innodb.result@1.9, 2007-08-05 13:56:34+03:00, gkodinov@magare.gmz +14 -14
    merged 5.1-main to 5.1-opt : error numbers changed

  mysql-test/suite/rpl/r/rpl_extraCol_myisam.result@1.9, 2007-08-05 13:57:23+03:00, gkodinov@magare.gmz +14 -14
     merged 5.1-main to 5.1-opt : error numbers changed

  mysql-test/suite/rpl/r/rpl_incident.result@1.11, 2007-08-05 13:57:37+03:00, gkodinov@magare.gmz +2 -2
     merged 5.1-main to 5.1-opt : error numbers changed

  mysql-test/suite/rpl/r/rpl_loaddata_fatal.result@1.6, 2007-08-05 13:58:23+03:00, gkodinov@magare.gmz +2 -2
     merged 5.1-main to 5.1-opt : error numbers changed

  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result@1.23, 2007-08-05 13:58:58+03:00, gkodinov@magare.gmz +6 -6
     merged 5.1-main to 5.1-opt : error numbers changed.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result@1.20, 2007-08-05 13:59:23+03:00, gkodinov@magare.gmz +6 -6
     merged 5.1-main to 5.1-opt : error numbers changed

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result@1.10, 2007-08-05 13:59:50+03:00, gkodinov@magare.gmz +14 -14
     merged 5.1-main to 5.1-opt : error numbers changed

ChangeSet@1.2476.310.5, 2007-08-04 20:31:48-07:00, igor@olga.mysql.com +1 -0
  Removed warnings after fix for bug 28404.

  sql/sql_select.cc@1.541.6.4, 2007-08-04 20:31:43-07:00, igor@olga.mysql.com +5 -2
    Removed warnings after fix for bug 28404.

ChangeSet@1.2476.310.4, 2007-08-04 17:15:33-07:00, igor@olga.mysql.com +2 -0
  Made the test case for bug 28404 platform independent.

  mysql-test/r/order_by.result@1.70, 2007-08-04 17:15:24-07:00, igor@olga.mysql.com +12 -13
    Made the test case for bug 28404 platform independent.

  mysql-test/t/order_by.test@1.54, 2007-08-04 17:15:24-07:00, igor@olga.mysql.com +8 -8
    Made the test case for bug 28404 platform independent.

ChangeSet@1.2476.310.3, 2007-08-04 13:41:01-07:00, igor@olga.mysql.com +2 -0
  Made sure that the test case for bug 28404 use the correct statistics.

  mysql-test/r/order_by.result@1.69, 2007-08-04 13:40:55-07:00, igor@olga.mysql.com +9 -5
    Made sure that the test case for bug 28404 use the correct statistics.

  mysql-test/t/order_by.test@1.53, 2007-08-04 13:40:55-07:00, igor@olga.mysql.com +6 -3
    Made sure that the test case for bug 28404 use the correct statistics.

ChangeSet@1.2476.310.2, 2007-08-04 03:12:43-07:00, igor@olga.mysql.com +1 -0
  Post-merge fix.

  mysql-test/r/innodb_mysql.result@1.45.3.2, 2007-08-04 03:12:37-07:00, igor@olga.mysql.com +1 -1
    Post-merge fix.

ChangeSet@1.2476.310.1, 2007-08-03 21:10:57-07:00, igor@olga.mysql.com +1 -0
  Fixed a memory leak in the patch for bug 28404.

  sql/sql_select.cc@1.541.6.3, 2007-08-03 21:10:44-07:00, igor@olga.mysql.com +5 -2
    Fixed a memory leak in the patch for bug 28404.

ChangeSet@1.2476.197.18, 2007-08-03 15:58:50+02:00, guilhem@gbichot4.local +4 -0
  Log handler's unit test were broken by me on June 22, fixing this:
  don't auto-log LOGREC_LONG_TRANSACTION_ID in log handler's unit tests,
  as they read their log and expect to find only the records they asked
  for, and so not LOGREC_LONG_TRANSACTION_ID. All log handler's unit
  tests pass. A way to run them faster: when their LONG_BUFFER_SIZE is
  too big (1GB) I divide it by ten and then I can run them on /dev/shm
  - they are then "instant".
  By the way, pushbuild was not displaying anymore "unit: failed" in
  the list of all pushes, which participates to the reasons why I didn't
  notice the breakage earlier. The other reason being that I was too lazy
  to run log handler unit tests on my machine as they took long (hadn't
  yet thought about the /dev/shm idea) and so I relied on pushbuild;
  Danny has now quickly fixed pushbuild - thanks :)

  storage/maria/unittest/ma_test_loghandler-t.c@1.14, 2007-08-03 15:58:48+02:00, guilhem@gbichot4.local +1 -0
    don't auto-log LOGREC_LONG_TRANSACTION_ID in log handler's unit tests,
    as they read their log and expect to find only the records they asked
    for

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.14, 2007-08-03 15:58:48+02:00, guilhem@gbichot4.local +1 -0
    don't auto-log LOGREC_LONG_TRANSACTION_ID in log handler's unit tests,
    as they read their log and expect to find only the records they asked
    for

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.14, 2007-08-03 15:58:48+02:00, guilhem@gbichot4.local +2 -0
    don't auto-log LOGREC_LONG_TRANSACTION_ID in log handler's unit tests,
    as they read their log and expect to find only the records they asked
    for

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.13, 2007-08-03 15:58:48+02:00, guilhem@gbichot4.local +1 -0
    don't auto-log LOGREC_LONG_TRANSACTION_ID in log handler's unit tests,
    as they read their log and expect to find only the records they asked
    for

ChangeSet@1.2476.306.6, 2007-08-03 13:42:31+02:00, msvensson@pilot.(none) +2 -0
  Update to reflect new location of where log file end up

  mysql-test/r/mysqltest.result@1.66, 2007-08-03 13:42:29+02:00, msvensson@pilot.(none) +1 -1
    Update to reflect new location of where log file end up

  mysql-test/t/mysqltest.test@1.86, 2007-08-03 13:42:29+02:00, msvensson@pilot.(none) +1 -1
    Update to reflect new location of where log file end up

ChangeSet@1.1810.3257.5, 2007-08-03 13:39:55+02:00, msvensson@pilot.(none) +1 -0
  Add extra newline between diff and error message 

  client/mysqltest.c@1.155.9.108, 2007-08-03 13:39:54+02:00, msvensson@pilot.(none) +1 -1
    Add extra newline between diff and error message 

ChangeSet@1.2476.306.4, 2007-08-03 13:29:30+02:00, msvensson@pilot.(none) +1 -0
  Update after merge, change "byte" and "gptr" into "uchar" and "uchar*"

  client/mysqltest.c@1.301.2.8, 2007-08-03 13:29:29+02:00, msvensson@pilot.(none) +5 -5
    Update after merge, change "byte" and "gptr" into "uchar" and "uchar*"

ChangeSet@1.1810.3250.4, 2007-08-03 14:14:33+03:00, gkodinov@magare.gmz +1 -0
  Bug #25228: rpl_relayspace.test fails on powermacg5, vm-win2003-32-a
  
  A test case was waiting for a fixed number of seconds for a specific 
  state of the slave IO thread to take place.
  Fixed by waiting in a loop for that specific thread state instead 
  (or timeout).

  mysql-test/t/rpl_relayspace.test@1.5.1.1, 2007-08-03 14:14:31+03:00, gkodinov@magare.gmz +16 -0
    Bug #25228: fixed test case

ChangeSet@1.1810.3258.3, 2007-08-03 13:12:53+02:00, msvensson@shellback.(none) +5 -0
  WL#3935 Improve mysqltest report and exitcode for diff
   - Move the code to generate test report to the test tool(in this
     case mysqltest) where the best control of what failed is
  - Simplify the code in mysql-test-run.pl
  - mysqltest will now find what diff to use in a best effort attempt
    using "diff -u", "diff -c" and finally dumping the two files verbatim
    in the report.

  client/mysqltest.c@1.155.9.107, 2007-08-03 13:12:48+02:00, msvensson@shellback.(none) +404 -139
    - Add new option --tail-lines indicating how many lines of the result to output
      when generating report for a failure
    - Remove eval_result, noone knows what it should do and it's not used.
    - Add support for best effort execution of systems builtin "diff",
      try with "diff -u" and "diff -c" and if that fails dump the whole content
       of teh two files to report
    - Use one common function when comapring two files, used when test 
      has completed and the result should be compared to the .result file
      as well as using it from myqltest's builtin diff_files command.
    - Output the last lines og the result so far  in the report that mysqltest
      generates in case of a test failure.
    
     

  mysql-test/lib/mtr_report.pl@1.21.5.1, 2007-08-03 13:12:49+02:00, msvensson@shellback.(none) +9 -52
    - Remove code for generating diff between .reject and .result file,
      that is handled by mysqltest(or the test tool) from now on.
    - Add better comments 

  mysql-test/mysql-test-run.pl@1.30.91.1, 2007-08-03 13:12:49+02:00, msvensson@shellback.(none) +3 -6
    - Remove the --udiff flag to mysql-test-run.pl, if the systems diff supports
      unified diff it will be used automatically
    - Remove the code for "mtr_show_failed_diff", the report from mysqltest
      will know include the diff so if mysqltest(or another test tool)
      fails, just display it's report what went wrong
    - Pass --tail-lines=20 to mysqltest to it will shos the last 20 lines 
      from the result in the report in case of failure.	  

  mysql-test/r/mysqltest.result@1.24.1.28, 2007-08-03 13:12:49+02:00, msvensson@shellback.(none) +2 -1
    Update result file now when the output from mysqltest has been sent to /dev/null

  mysql-test/t/mysqltest.test@1.24.1.39, 2007-08-03 13:12:49+02:00, msvensson@shellback.(none) +51 -4
    - Improve tests for --diff_files
    - Remove temporary files in var/tmp generated in the fly
    - Send output from test for --diff_files to /deb/null since only the error
      code it returns are of interest and tyhe outpu may vary depending
      on what builtin diff is being used.

ChangeSet@1.1810.3258.2, 2007-08-03 12:56:45+02:00, msvensson@shellback.(none) +2 -0
  Cleanup created procedures in sp.test

  mysql-test/r/sp.result@1.170.44.1, 2007-08-03 12:56:40+02:00, msvensson@shellback.(none) +1 -0
    Cleanup created procedures

  mysql-test/t/sp.test@1.174.44.1, 2007-08-03 12:56:40+02:00, msvensson@shellback.(none) +1 -0
    Cleanup created procedures

ChangeSet@1.1810.3258.1, 2007-08-03 12:54:06+02:00, msvensson@shellback.(none) +1 -0
  Remove the temporary file created by mysql_upgrade 

  client/mysql_upgrade.c@1.6.1.18, 2007-08-03 12:54:01+02:00, msvensson@shellback.(none) +1 -0
    Remove the temporary file after it's been used 

ChangeSet@1.1810.3257.1, 2007-08-03 12:50:00+02:00, msvensson@pilot.(none) +2 -0
  Improve report on test execution time
  Define tot_real_tim locally in mtr_report.pl

  mysql-test/lib/mtr_report.pl@1.21.4.1, 2007-08-03 12:49:59+02:00, msvensson@pilot.(none) +8 -3
    Improve report on test execution time
    Define tot_real_tim locally in mtr_report.pl

  mysql-test/mysql-test-run.pl@1.30.49.90, 2007-08-03 12:49:59+02:00, msvensson@pilot.(none) +0 -1
    Move global variable to local scope in the file it's being used

ChangeSet@1.2476.277.18, 2007-08-03 12:37:00+02:00, gshchepa@dl145s.mysql.com +6 -0
  Many files:
    Post-merge fix.

  mysql-test/suite/ndb/r/ndb_dd_basic.result@1.21, 2007-08-03 11:38:20+02:00, gshchepa@dl145s.mysql.com +3 -3
    Post-merge fix.

  mysql-test/suite/ndb/r/ndb_dd_ddl.result@1.18, 2007-08-03 11:48:59+02:00, gshchepa@dl145s.mysql.com +1 -1
    Post-merge fix.

  mysql-test/suite/ndb/r/ndb_gis.result@1.25, 2007-08-03 12:02:56+02:00, gshchepa@dl145s.mysql.com +2 -2
    Post-merge fix.

  mysql-test/suite/ndb/r/ndb_row_format.result@1.7, 2007-08-03 12:21:14+02:00, gshchepa@dl145s.mysql.com +1 -1
    Post-merge fix.

  mysql-test/suite/ndb/r/ndb_single_user.result@1.13, 2007-08-03 12:26:44+02:00, gshchepa@dl145s.mysql.com +5 -5
    Post-merge fix.

  mysql-test/suite/rpl/r/rpl_udf.result@1.9, 2007-08-03 11:12:47+02:00, gshchepa@dl145s.mysql.com +4 -4
    Post-merge fix.

ChangeSet@1.1810.3256.1, 2007-08-03 12:36:32+02:00, msvensson@shellback.(none) +3 -0
  Send output to var/log/mysql-test-run.log to facilitate easier debugging
  of mysql-test-run.pl

  mysql-test/lib/mtr_process.pl@1.25.2.32, 2007-08-03 12:36:27+02:00, msvensson@shellback.(none) +11 -10
    Change from "print" to "mtr_debug" to get messages logged to file as well 

  mysql-test/lib/mtr_report.pl@1.21.3.3, 2007-08-03 12:36:27+02:00, msvensson@shellback.(none) +44 -11
    - Add "mtr_log_init" function used for opening the log file
    - Change from "print" to "mtr_report" to get the messages logged
    - Make printout functions log to the log file

  mysql-test/mysql-test-run.pl@1.30.90.1, 2007-08-03 12:36:27+02:00, msvensson@shellback.(none) +8 -5
    - Open the mysql-test-run log file as soon as var/log has been created
    - Change from "print" to "mtr_report" to get the messgages to log as well

ChangeSet@1.2476.277.17, 2007-08-03 13:07:37+05:00, gshchepa@gleb.loc +6 -0
  Many files:
    Post-merge fix.

  mysql-test/r/events_bugs.result@1.39.1.1, 2007-08-03 13:07:01+05:00, gshchepa@gleb.loc +8 -8
    Post-merge fix.

  mysql-test/r/events_trans.result@1.4, 2007-08-03 13:07:05+05:00, gshchepa@gleb.loc +1 -1
    Post-merge fix.

  mysql-test/r/sp.result@1.288, 2007-08-03 13:07:07+05:00, gshchepa@gleb.loc +4 -4
    Post-merge fix.

  mysql-test/r/sp_gis.result@1.9, 2007-08-03 13:07:08+05:00, gshchepa@gleb.loc +2 -2
    Post-merge fix.

  mysql-test/r/xml.result@1.26, 2007-08-03 13:07:09+05:00, gshchepa@gleb.loc +9 -9
    Post-merge fix.

  mysql-test/r/binlog_unsafe.result@1.4, 2007-08-03 13:06:52+05:00, gshchepa@gleb.loc +2 -2
    Post-merge fix.

ChangeSet@1.2476.302.1, 2007-08-03 03:50:19+05:00, svoj@mysql.com +1 -0
  BUG#27040 - Incorrect FTS parser name output
  
  When a table uses two (or more) fulltext keys with different fulltext parsers,
  all fulltext keys (excluding those that use built-in parser) were using first
  parser that was mentioned in .frm.
  
  With this fix fulltext keys use proper (assigned during create table) fulltext
  parser.
  
  This code was contributed by Yoshinori Matsunobu ymatsunobu@mysql.com
  on 2007-03-12 The copyright was assigned and transferred under the
  terms of the MySQL Contributor License Agreement.

  sql/table.cc@1.296.9.1, 2007-08-03 03:50:09+05:00, svoj@mysql.com +1 -0
    Shift extra data segment buffer pointer by parser name length to restore
    next key parser name correctly.

ChangeSet@1.1810.3252.1, 2007-08-03 01:58:21+05:00, gshchepa@gleb.loc +5 -0
  Fixed bug #27352.
  The SELECT query with more than 31 nested dependent SELECT queries returned
  wrong result.
  
  New error message has been added: ER_TOO_HIGH_LEVEL_OF_NESTING_FOR_SELECT.
  It will be reported as: "Too high level of nesting for select".

  mysql-test/r/select.result@1.121.1.35, 2007-08-03 01:57:44+05:00, gshchepa@gleb.loc +10 -0
    Updated test case for bug #27352.

  mysql-test/t/select.test@1.102.1.28, 2007-08-03 01:57:43+05:00, gshchepa@gleb.loc +30 -0
    Updated test case for bug #27352.

  sql/share/errmsg.txt@1.42.1.38, 2007-08-03 01:57:45+05:00, gshchepa@gleb.loc +2 -0
    Fixed bug #27352.
    New error message has been added: ER_TOO_HIGH_LEVEL_OF_NESTING_FOR_SELECT.

  sql/sql_parse.cc@1.426.164.1, 2007-08-03 01:57:24+05:00, gshchepa@gleb.loc +5 -0
    Fixed bug #27352.
    The Item_sum::register_sum_func method has been modified to return
    TRUE on exceeding of allowed level of SELECT nesting and to report
    corresponding error message.

  sql/unireg.h@1.39.1.11, 2007-08-03 01:57:41+05:00, gshchepa@gleb.loc +2 -0
    Fixed bug #27352.
    Constant definition has been added: maximal allowed level of SELECT nesting.

ChangeSet@1.2476.300.1, 2007-08-02 12:45:56-07:00, igor@olga.mysql.com +14 -0
  Fixed bug#28404.
  This patch adds cost estimation for the queries with ORDER BY / GROUP BY
  and LIMIT. 
  If there was a ref/range access to the table whose rows were required
  to be ordered in the result set the optimizer always employed this access
  though a scan by a different index that was compatible with the required 
  order could be cheaper to produce the first L rows of the result set.
  Now for such queries the optimizer makes a choice between the cheapest
  ref/range accesses not compatible with the given order and index scans
  compatible with it.

  mysql-test/r/distinct.result@1.56, 2007-08-02 12:45:48-07:00, igor@olga.mysql.com +4 -4
    Adjusted results for test cases affected fy the fix for bug #28404.

  mysql-test/r/endspace.result@1.13, 2007-08-02 12:45:48-07:00, igor@olga.mysql.com +1 -1
    Adjusted results for test cases affected fy the fix for bug #28404.

  mysql-test/r/group_by.result@1.84.1.1, 2007-08-02 12:45:48-07:00, igor@olga.mysql.com +1 -1
    Adjusted results for test cases affected fy the fix for bug #28404.

  mysql-test/r/group_min_max.result@1.34, 2007-08-02 12:45:48-07:00, igor@olga.mysql.com +5 -5
    Adjusted results for test cases affected fy the fix for bug #28404.

  mysql-test/r/innodb.result@1.200, 2007-08-02 12:45:48-07:00, igor@olga.mysql.com +1 -1
    Adjusted results for test cases affected fy the fix for bug #28404.

  mysql-test/r/innodb_mysql.result@1.45.3.1, 2007-08-02 12:45:49-07:00, igor@olga.mysql.com +11 -11
    Adjusted results for test cases affected fy the fix for bug #28404.

  mysql-test/r/merge.result@1.67, 2007-08-02 12:45:49-07:00, igor@olga.mysql.com +1 -1
    Adjusted results for test cases affected fy the fix for bug #28404.

  mysql-test/r/order_by.result@1.68, 2007-08-02 12:45:49-07:00, igor@olga.mysql.com +55 -0
    Added a test case for bug #28404.

  mysql-test/r/select_found.result@1.25, 2007-08-02 12:45:49-07:00, igor@olga.mysql.com +1 -1
    Adjusted results for test cases affected fy the fix for bug #28404.

  mysql-test/r/subselect.result@1.196, 2007-08-02 12:45:49-07:00, igor@olga.mysql.com +1 -1
    Adjusted results for test cases affected fy the fix for bug #28404.

  mysql-test/t/distinct.test@1.32, 2007-08-02 12:45:49-07:00, igor@olga.mysql.com +1 -1
    Changed a test case after adding the fix for bug #28404.

  mysql-test/t/order_by.test@1.52, 2007-08-02 12:45:49-07:00, igor@olga.mysql.com +37 -0
    Added a test case for bug #28404.

  sql/sql_select.cc@1.541.7.1, 2007-08-02 12:45:49-07:00, igor@olga.mysql.com +232 -76
    Fixed bug#28404.
    This patch adds cost estimation for the queries with ORDER BY / GROUP BY
    and LIMIT. 
    Now for such queries the optimizer makes a choice between the cheapest
    ref/range accesses not compatible with the given order and index scans
    compatible with it.
    
    Modified the function test_if_skip_sort_order to make the above mentioned
    choice cost based. 

  sql/sql_select.h@1.125.1.1, 2007-08-02 12:45:49-07:00, igor@olga.mysql.com +6 -0
    Fixed bug#28404.
    This patch adds cost estimation for the queries with ORDER BY / GROUP BY
    and LIMIT. 
    Added a new field fot the JOIN_TAB structure. 

ChangeSet@1.2476.277.15, 2007-08-02 23:08:52+04:00, evgen@moonbone.local +1 -0
  mysqld.cc:
    Post merge changes.

  sql/mysqld.cc@1.583.105.2, 2007-08-02 23:08:23+04:00, evgen@moonbone.local +3 -4
    Post merge changes.

ChangeSet@1.2476.277.14, 2007-08-02 21:49:27+04:00, evgen@moonbone.local +1 -0
  sql_class.h:
    After merge changes.

  sql/sql_class.h@1.386.1.3, 2007-08-02 21:49:15+04:00, evgen@moonbone.local +2 -1
    After merge changes.

ChangeSet@1.1810.3250.2, 2007-08-02 17:11:35+03:00, gkodinov@magare.gmz +1 -0
  Bug #30193: crash during drop table and kill
  
  When DROP TABLE detects that it has been killed
  by another thread it must unlock the table names
  it locked.
  
  Fixed by backporting the 5.1 error handling code.

  sql/sql_table.cc@1.239.69.1, 2007-08-02 17:11:34+03:00, gkodinov@magare.gmz +3 -2
    Bug #30193: correct error handling when a thread 
    is killed inside DROP TABLE.

ChangeSet@1.2476.197.17, 2007-08-02 12:42:49+02:00, guilhem@gbichot4.local +4 -0
  WL#3072 Maria checkpoint
  Preparation: for the two-checkpoint rule we will flush all pages
  which have block->rec_lsn <= last_checkpoint_lsn. Pages with
  rec_lsn not yet set (i.e. ==0) were dirtied very recently and so should
  not be flushed (otherwise it's not efficient: we should try to let
  a page be modified several times in memory before we flush it to disk).
  To make this easy, "block->rec_lsn not yet set" is now expressed
  with block->rec_lsn==LSN_MAX, not block->rec_lsn==0 anymore.
  It is easier this way because LSN_MAX>last_checkpoint_lsn whereas
  0<=last_checkpoint_lsn.

  storage/maria/ma_blockrec.c@1.33, 2007-08-02 12:42:47+02:00, guilhem@gbichot4.local +1 -1
    typo

  storage/maria/ma_loghandler.c@1.33, 2007-08-02 12:42:47+02:00, guilhem@gbichot4.local +1 -1
    typo

  storage/maria/ma_loghandler_lsn.h@1.10, 2007-08-02 12:42:47+02:00, guilhem@gbichot4.local +8 -0
    LSN_MAX

  storage/maria/ma_pagecache.c@1.35, 2007-08-02 12:42:48+02:00, guilhem@gbichot4.local +18 -8
    "block->rec_lsn not yet set" is now expressed by block->rec_lsn==LSN_MAX,
    not block_rec_lsn==0.

ChangeSet@1.1810.3250.1, 2007-08-02 12:35:05+03:00, gkodinov@magare.gmz +1 -0
  Addendum to bug 29325
  keep_files_on_create made a startup option

  sql/mysqld.cc@1.439.127.1, 2007-08-02 12:35:04+03:00, gkodinov@magare.gmz +7 -1
    Addendum to bug #29325
    keep_files_on_create made a startup option

ChangeSet@1.2476.289.1, 2007-08-01 08:50:38-07:00, brian@zim.(none) +2 -0
  On internals@mysql a developer at IBM pointed out that DBTYPE needed to be removed from the example (its a single line which was needed for previous versions of MySQL). Its been removed. Added a couple of comments.

  storage/example/ha_example.cc@1.57.1.2, 2007-08-01 08:50:28-07:00, brian@zim.(none) +4 -1
    Removed line, added comment about Skeleton.

  storage/example/plug.in@1.5, 2007-08-01 08:50:28-07:00, brian@zim.(none) +1 -1
    Corrected explanation

ChangeSet@1.2476.197.16, 2007-08-01 15:52:57+02:00, guilhem@gbichot4.local +6 -0
  WL#3072 Maria recovery:
  preparation to enable recoverability of the table's state, more exactly
  info->state->checksum. This will require that info->state->checksum
  be updated in a inwrite_hook when writing an UNDO record, thus
  info->cur_row.checksum needs to be accessible to inwrite_hook, so we
  make translog_write_record() accept a MARIA_HA* (info) instead of
  MARIA_SHARE* (info->s); with this, we will be able to access
  info->cur_row.checksum. Old code which needed the MARIA_SHARE
  can derive it from MARIA_HA. Fix for typos and compiler warnings.

  storage/maria/ma_blockrec.c@1.32, 2007-08-01 15:52:50+02:00, guilhem@gbichot4.local +13 -13
    fix for new loghandler API. Removing strange lines (how could gcc
    accept that?)

  storage/maria/ma_check.c@1.28, 2007-08-01 15:52:50+02:00, guilhem@gbichot4.local +1 -1
    fix for new loghandler API

  storage/maria/ma_delete_all.c@1.17, 2007-08-01 15:52:50+02:00, guilhem@gbichot4.local +1 -1
    fix for new loghandler API

  storage/maria/ma_loghandler.c@1.32, 2007-08-01 15:52:50+02:00, guilhem@gbichot4.local +32 -29
    functions now take a MARIA_HA in argument, this is more powerful
    than a MARIA_SHARE (MARIA_SHARE can be derived from MARIA_HA, not
    the other way around). MARIA_HA will be needed to allow recoverability
    of the table's state.
    Fixing wrong DBUG_PRINT ('i' is not the id).
    When writing the LOGREC_FILE_ID, we don't have a MARIA_HA around,
    so we cannot ask translog_write_record() to store the id for us;
    we thus store the file's id by ourselves. Alternative would have been
    to pass MARIA_HA to translog_assign_id_to_share() but I didn't like it.

  storage/maria/ma_loghandler.h@1.16, 2007-08-01 15:52:50+02:00, guilhem@gbichot4.local +4 -4
    new loghandler API

  storage/maria/tablockman.c@1.9, 2007-08-01 15:52:50+02:00, guilhem@gbichot4.local +2 -2
    fix for compiler warning (intptr is int on my machine)

ChangeSet@1.2476.183.20, 2007-08-01 14:52:10+04:00, skozlov@mysql.com +3 -0
  Fix for Bug#28744, bug#29363

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@1.3, 2007-08-01 14:49:10+04:00, skozlov@mysql.com +3 -1
    Data file moved into var directory

  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result@1.5, 2007-08-01 14:49:11+04:00, skozlov@mysql.com +21 -23
    updated result file

  mysql-test/suite/rpl/t/disabled.def@1.9, 2007-08-01 14:49:11+04:00, skozlov@mysql.com +2 -2
    updated file disabled.def

ChangeSet@1.2476.197.15, 2007-07-31 19:05:19+02:00, guilhem@gbichot4.local +1 -0
  testcase for a bug not yet fixed. Once fixed, the test should fail
  in EXPLAIN's output.

  mysql-test/t/maria.test@1.15, 2007-07-31 19:05:16+02:00, guilhem@gbichot4.local +11 -0
    adding a test for "incorrect key file" error in UPDATE with
    row_format=dynamic (does not happen with row_format=page)

ChangeSet@1.2476.197.14, 2007-07-31 19:01:23+02:00, guilhem@gbichot4.local +1 -0
  updating result file of ps_maria, it is now identical to
  the result of ps_2myisam.result. Thanks Serg for the help.

  mysql-test/r/ps_maria.result@1.6, 2007-07-31 19:01:19+02:00, guilhem@gbichot4.local +272 -265
    Result file was probably out-of-date; it thus becomes identical to
    the result of ps_2myisam.result

ChangeSet@1.2476.279.2, 2007-07-31 15:09:16+00:00, lzhou@dev3-63.(none) +1 -0
  BUG#30134 restore of backup from different endian can work for timestamp column

  storage/ndb/tools/restore/Restore.cpp@1.51.1.1, 2007-07-31 15:09:07+00:00, lzhou@dev3-63.(none) +4 -1
    Convert byte order of timestamp data type

ChangeSet@1.2476.197.13, 2007-07-30 15:05:43+02:00, guilhem@gbichot4.local +7 -0
  Applying Sanja's patch which makes the log handler not issue
  errors when reading a log record which has a 0-length header
  (like LOGREC_REDO_DROP_TABLE).

  storage/maria/ma_loghandler.c@1.31, 2007-07-30 15:05:32+02:00, guilhem@gbichot4.local +125 -152
    Functions reading record's header now don't use 0 to indicate error,
    as some valid records have a 0-length header (like REDO_DROP_TABLE).
    Instead, negative values are used for EOF and error.

  storage/maria/ma_loghandler.h@1.15, 2007-07-30 15:05:32+02:00, guilhem@gbichot4.local +6 -7
    functions to read record's header now return an int
    (either the length of this header (>=0) or some negative values
    for EOF or error).

  storage/maria/ma_recovery.c@1.10, 2007-07-30 15:05:32+02:00, guilhem@gbichot4.local +17 -9
    update to the new log handler's behaviour. Note the @todo.

  storage/maria/maria_read_log.c@1.11, 2007-07-30 15:05:32+02:00, guilhem@gbichot4.local +2 -1
    inform when program failed

  storage/maria/unittest/ma_test_loghandler-t.c@1.13, 2007-07-30 15:05:32+02:00, guilhem@gbichot4.local +13 -13
    update to new log handler's API

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.13, 2007-07-30 15:05:32+02:00, guilhem@gbichot4.local +14 -14
    update to new log handler's API

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.13, 2007-07-30 15:05:32+02:00, guilhem@gbichot4.local +7 -6
    update to new log handler's API

ChangeSet@1.2476.197.12, 2007-07-30 12:01:52+02:00, guilhem@gbichot4.local +3 -0
  Maria: it is allowed to change unknown type to any legal type of page
  in the pagecache: fixing wrong assertion and a test case.
  maria.test and ps_maria.test still fail.

  mysql-test/r/maria.result@1.13, 2007-07-30 12:01:45+02:00, guilhem@gbichot4.local +4 -0
    result update

  mysql-test/t/maria.test@1.14, 2007-07-30 12:01:45+02:00, guilhem@gbichot4.local +4 -0
    added test for incorrect assert on page's type

  storage/maria/ma_pagecache.c@1.34, 2007-07-30 12:01:45+02:00, guilhem@gbichot4.local +3 -1
    It is allowed to change unknown type to any legal type of page in the
    pagecache.

ChangeSet@1.2476.187.3, 2007-07-30 09:01:11+00:00, lzhou@dev3-63.(none) +1 -0
  BUG#30024 Restore of backup from different endian can work for datetime

  storage/ndb/tools/restore/Restore.cpp@1.52, 2007-07-30 09:00:01+00:00, lzhou@dev3-63.(none) +12 -0
    Convert datetime datatype to native endian

ChangeSet@1.2476.12.74, 2007-07-29 14:06:11-04:00, cbell@mysql_cab_desk. +2 -0
  WL#3228 (NDB) : RBR using different table defs on slave/master
  
  This patch corrects a incorrect type conversion during encoding and
  decoding the length for VARCHAR fields.

  sql/log_event.cc@1.277.8.5, 2007-07-29 14:06:08-04:00, cbell@mysql_cab_desk. +2 -2
    WL#3228 (NDB) : RBR using different table defs on slave/master
    
    This patch changes the encoding of the 16-bit length value for
    VARCHAR field correcting an undetected type conflict. 

  sql/rpl_utility.h@1.5.1.5, 2007-07-29 14:06:08-04:00, cbell@mysql_cab_desk. +3 -7
    WL#3228 (NDB) : RBR using different table defs on slave/master
    
    This patch changes the decoding of the 16-bit length value for
    VARCHAR field correcting an undetected type conflict. 

ChangeSet@1.2476.12.73, 2007-07-28 18:46:21-04:00, cbell@mysql_cab_desk. +1 -0
  WL#3228 (NDB) : RBR using different table defs on slave/master
    
  This patch changes the code to comply with different word order on Solaris

  sql/rpl_utility.h@1.5.1.4, 2007-07-28 18:46:18-04:00, cbell@mysql_cab_desk. +5 -1
    WL#3228 (NDB) : RBR using different table defs on slave/master
      
    This patch changes the code to comply with different word order on Solaris

ChangeSet@1.2476.12.72, 2007-07-28 11:30:50-04:00, cbell@mysql_cab_desk. +1 -0
  WL#3228 (NDB) : RBR using different table defs on slave/master
  
  Patch for PB testing errors.

  sql/rpl_utility.h@1.5.1.3, 2007-07-28 11:30:47-04:00, cbell@mysql_cab_desk. +8 -2
    WL#3228 (NDB) : RBR using different table defs on slave/master
    
    This patch corrects a problem detected on 64-bit platforms with BIT and
    VARCHAR fields.

ChangeSet@1.2476.12.71, 2007-07-27 23:11:36-04:00, cbell@mysql_cab_desk. +5 -0
  WL#3915 : (NDB) master's cols > slave
  
  Patch corrects minor test anomolies and build warnings.

  mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@1.2, 2007-07-27 23:11:28-04:00, cbell@mysql_cab_desk. +2 -2
    WL#3915 : (NDB) master's cols > slave
    
    Patch masks out the port number in the show slave status results.

  mysql-test/r/rpl_row_extraColmaster_ndb.result@1.2, 2007-07-27 23:11:30-04:00, cbell@mysql_cab_desk. +221 -221
    WL#3915 : (NDB) master's cols > slave
    
    New result file from changed test.

  mysql-test/r/rpl_extraColmaster_innodb.result@1.2, 2007-07-27 23:11:29-04:00, cbell@mysql_cab_desk. +470 -471
    WL#3915 : (NDB) master's cols > slave
    
    New result file from changed test.

  mysql-test/r/rpl_extraColmaster_myisam.result@1.2, 2007-07-27 23:11:30-04:00, cbell@mysql_cab_desk. +470 -471
    WL#3915 : (NDB) master's cols > slave
    
    New result file from changed test.

  sql/field.cc@1.385.10.3, 2007-07-27 23:11:32-04:00, cbell@mysql_cab_desk. +2 -1
    WL#3915 : (NDB) master's cols > slave
    
    Removed warning for unused parameter. Parameter was include for assertion
    and future changes to string class.

ChangeSet@1.2476.12.70, 2007-07-27 16:58:23-04:00, cbell@mysql_cab_desk. +1 -0
  WL#3915 : (NDB) master's cols > slave
  
  Minor change to fix compile problems on 64-bit.

  sql/field.h@1.226.5.3, 2007-07-27 16:58:19-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3915 : (NDB) master's cols > slave
    
    Minor change to fix compile problems on 64-bit.

ChangeSet@1.1810.3226.1, 2007-07-27 16:26:26-04:00, dkatz@damien-katzs-computer.local +1 -0
  Bug #29419 "Specifying a join_buffer > 4GB on 64 bit machines not possible."
  
  Use size_t instead of uint when calculating join buffer size, because uint can be overflown on 64-bit platforms and join_buffer_size > 4 GB.
  
  The test case for this bug is a part of the test suite for bug #5731.

  sql/sql_select.cc@1.312.172.1, 2007-07-27 16:26:22-04:00, dkatz@damien-katzs-computer.local +4 -3
    Use size_t instead of uint when calculating join buffer size, because uint can be overflown on 64-bit platforms and join_buffer_size > 4G.

ChangeSet@1.2476.270.2, 2007-07-27 14:45:57-04:00, cbell@mysql_cab_desk. +18 -0
  WL#3915 : (NDB) master's cols > slave
  
  Slave starts accepting and handling rows of master's tables which have more columns.
  The most important part of implementation is how to caclulate the amount of bytes to
  skip for unknown by slave column.
  
  To solve that issue this WL adopts results of WL#3228 which introduces an addon to
  table_map event that carries the necessary part of information about sizes of data of columns.
  
  mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@stripped, 2007-07-26 21:31:54-04:00, cbell@mysql_cab_desk. +393 -0
  WL#3915  master's cols > slave
  
  basic tests checking altering and skipping extra fields by slave.
  The fields can be of any possible types.

  mysql-test/t/rpl_extraColmaster_innodb-master.opt@1.1, 2007-07-27 14:45:41-04:00, cbell@mysql_cab_desk. +1 -0
    WL#3915  master's cols > slave
    
    option for innodb
    

  mysql-test/t/rpl_extraColmaster_innodb-master.opt@1.0, 2007-07-27 14:45:41-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/t/rpl_extraColmaster_innodb-slave.opt@1.1, 2007-07-27 14:45:42-04:00, cbell@mysql_cab_desk. +1 -0
    WL#3915  master's cols > slave
    
    option for innodb
    

  mysql-test/t/rpl_extraColmaster_innodb-slave.opt@1.0, 2007-07-27 14:45:42-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/t/rpl_extraColmaster_innodb.test@1.1, 2007-07-27 14:45:42-04:00, cbell@mysql_cab_desk. +15 -0
    WL#3915  master's cols > slave
    
    Test of innodb. Test runs in both statement- and row-based replication.
    

  mysql-test/t/rpl_extraColmaster_innodb.test@1.0, 2007-07-27 14:45:42-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/t/rpl_extraColmaster_myisam.test@1.1, 2007-07-27 14:45:43-04:00, cbell@mysql_cab_desk. +13 -0
    WL#3915  master's cols > slave
    
    Test of myisam. Test runs in both statement- and row-based replication.
    

  mysql-test/t/rpl_extraColmaster_myisam.test@1.0, 2007-07-27 14:45:43-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@1.1, 2007-07-27 14:45:47-04:00, cbell@mysql_cab_desk. +393 -0
    WL#3915  master's cols > slave
    
    basic tests checking altering and skipping extra fields by slave.
    The fields can be of any possible types.
    

  mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@1.0, 2007-07-27 14:45:47-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/r/rpl_row_extraColmaster_ndb.result@1.1, 2007-07-27 14:45:46-04:00, cbell@mysql_cab_desk. +274 -0
    WL#3915  master's cols > slave
    
    new results
    

  mysql-test/r/rpl_row_extraColmaster_ndb.result@1.0, 2007-07-27 14:45:46-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/t/rpl_row_extraColmaster_ndb.test@1.1, 2007-07-27 14:45:43-04:00, cbell@mysql_cab_desk. +12 -0
    WL#3915  master's cols > slave
    
    Test of ndb. Test runs in row-based replication.
    

  mysql-test/t/rpl_row_extraColmaster_ndb.test@1.0, 2007-07-27 14:45:43-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/r/rpl_stm_extraColmaster_ndb.result@1.1, 2007-07-27 14:45:46-04:00, cbell@mysql_cab_desk. +274 -0
    WL#3915  master's cols > slave
    
    new results
    

  mysql-test/r/rpl_stm_extraColmaster_ndb.result@1.0, 2007-07-27 14:45:46-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/t/rpl_stm_extraColmaster_ndb.test@1.1, 2007-07-27 14:45:44-04:00, cbell@mysql_cab_desk. +13 -0
    WL#3915  master's cols > slave
    
    Test of ndb. Test runs in statement-based replication.
    

  mysql-test/t/rpl_stm_extraColmaster_ndb.test@1.0, 2007-07-27 14:45:44-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/extra/rpl_tests/rpl_row_tabledefs.test@1.7.1.1, 2007-07-27 14:45:37-04:00, cbell@mysql_cab_desk. +0 -63
    WL#3915  master's cols > slave
    
    Changed test to remove checks for error#1523 (more master cols than
    slave). This portion of the test is no longer needed.

  mysql-test/r/rpl_extraColmaster_innodb.result@1.1, 2007-07-27 14:45:44-04:00, cbell@mysql_cab_desk. +545 -0
    WL#3915  master's cols > slave
    
    new results
    

  mysql-test/r/rpl_extraColmaster_innodb.result@1.0, 2007-07-27 14:45:44-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/r/rpl_extraColmaster_myisam.result@1.1, 2007-07-27 14:45:45-04:00, cbell@mysql_cab_desk. +545 -0
    WL#3915  master's cols > slave
    
    new results
    

  mysql-test/r/rpl_extraColmaster_myisam.result@1.0, 2007-07-27 14:45:45-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/r/rpl_row_tabledefs_2myisam.result@1.11.3.1, 2007-07-27 14:45:37-04:00, cbell@mysql_cab_desk. +0 -192
    WL#3915  master's cols > slave
    
    Corrected results from removal of checks for error#1523 (more master 
    cols than slave). This portion of the test is no longer needed.

  mysql-test/r/rpl_row_tabledefs_3innodb.result@1.8.3.1, 2007-07-27 14:45:38-04:00, cbell@mysql_cab_desk. +0 -192
    WL#3915  master's cols > slave
    
    Corrected results from removal of checks for error#1523 (more master 
    cols than slave). This portion of the test is no longer needed.

  mysql-test/t/disabled.def@1.253.7.1, 2007-07-27 14:45:39-04:00, cbell@mysql_cab_desk. +1 -0
    WL#3915  master's cols > slave
    
    Disabled the rpl_stm_extraColmaster_ndb test because statement-based
    replication is not supported in NDB at this time. It can be enabled
    when statement-based replication for NDB is released.

  sql/log_event.cc@1.277.8.3, 2007-07-27 14:45:40-04:00, cbell@mysql_cab_desk. +6 -13
    WL#3915  master's cols > slave
    
    copying extra (slave's) fields returns early if master's table version is wider;
    removing assert in the way of master > slave cols.

  sql/rpl_record.cc@1.2.1.2, 2007-07-27 14:45:40-04:00, cbell@mysql_cab_desk. +24 -1
    WL#3915  master's cols > slave
    
    adding a snippet that shift exectution curson donw the row skipping unknown by slave
    fields' data.

  sql/rpl_utility.cc@1.5.1.2, 2007-07-27 14:45:41-04:00, cbell@mysql_cab_desk. +0 -15
    WL#3915  master's cols > slave
    
    Remove warning message for master's cols > slave.

ChangeSet@1.2476.272.1, 2007-07-27 14:38:36-04:00, cbell@mysql_cab_desk. +26 -0
  WL#3228 (NDB) : RBR using different table defs on slave/master
  
  This patch adds the ability to store extra field metadata in the table
  map event. This data can include pack_length() or field_lenght() for
  fields such as CHAR or VARCHAR enabling developers to add code that
  can check for compatibilty between master and slave columns. More 
  importantly, the extra field metadata can be used to store data from the
  master correctly should a VARCHAR field on the master be <= 255 bytes 
  while the same field on the slave is > 255 bytes. '
  
  The patch also includes the needed changes to unpack to ensure that data
  which is smaller on the master can be unpacked correctly on the slave.

  mysql-test/t/rpl_colSize.test@1.1, 2007-07-27 14:38:31-04:00, cbell@mysql_cab_desk. +216 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a new test designed to test the feature of having
    columns on the master that are smaller than what is on the slave. 
    

  mysql-test/t/rpl_colSize.test@1.0, 2007-07-27 14:38:31-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/extra/rpl_tests/rpl_log.test@1.45.2.1, 2007-07-27 14:38:17-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3228 : RBR using different table defs on slave/master
    
    This patch changes the test to display slave status vertically.

  mysql-test/r/rpl_colSize.result@1.1, 2007-07-27 14:38:32-04:00, cbell@mysql_cab_desk. +179 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 
    

  mysql-test/r/rpl_colSize.result@1.0, 2007-07-27 14:38:32-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/t/binlog_row_mix_innodb_myisam.test@1.9.3.1, 2007-07-27 14:38:24-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3228 : RBR using different table defs on slave/master
    
    This patch changes the test to coincide with changes to binlog
    size of table map event.

  mysql-test/r/rpl_rbr_to_sbr.result@1.7.3.1, 2007-07-27 14:38:18-04:00, cbell@mysql_cab_desk. +2 -2
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_basic_11bugs.result@1.16.3.1, 2007-07-27 14:38:19-04:00, cbell@mysql_cab_desk. +2 -2
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_create_table.result@1.12.3.1, 2007-07-27 14:38:19-04:00, cbell@mysql_cab_desk. +42 -42
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_flsh_tbls.result@1.5.2.1, 2007-07-27 14:38:20-04:00, cbell@mysql_cab_desk. +2 -2
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_inexist_tbl.result@1.7.3.1, 2007-07-27 14:38:21-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_log.result@1.17.3.1, 2007-07-27 14:38:21-04:00, cbell@mysql_cab_desk. +39 -7
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_log_innodb.result@1.17.3.1, 2007-07-27 14:38:22-04:00, cbell@mysql_cab_desk. +39 -7
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_max_relay_size.result@1.9.3.1, 2007-07-27 14:38:22-04:00, cbell@mysql_cab_desk. +10 -10
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_until.result@1.5.2.1, 2007-07-27 14:38:23-04:00, cbell@mysql_cab_desk. +4 -4
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_stm_log.result@1.79.3.1, 2007-07-27 14:38:23-04:00, cbell@mysql_cab_desk. +35 -3
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the rpl_log.test modifications.

  mysql-test/t/rpl_row_create_table.test@1.12.2.1, 2007-07-27 14:38:25-04:00, cbell@mysql_cab_desk. +5 -5
    WL#3228 : RBR using different table defs on slave/master
    
    This patch changes the test to coincide with changes to binlog
    size of table map event.

  mysql-test/t/rpl_row_flsh_tbls.test@1.5.2.1, 2007-07-27 14:38:26-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3228 : RBR using different table defs on slave/master
    
    This patch changes the test to coincide with changes to binlog
    size of table map event.

  mysql-test/r/rpl_ndb_log.result@1.25.3.1, 2007-07-27 14:38:18-04:00, cbell@mysql_cab_desk. +38 -6
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_truncate_7ndb.result@1.10.4.1, 2007-07-27 14:38:24-04:00, cbell@mysql_cab_desk. +32 -32
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  sql/field.cc@1.385.11.1, 2007-07-27 14:38:26-04:00, cbell@mysql_cab_desk. +232 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch includes updates to the unpack() methods for the variable
    length fields. A new parameter was added (from_length) that is the
    value stored in the field_metadata of the table map from the table_def
    class. If the value is non-zero and less than what the field on the 
    slave is then use the from_length else use the original value from the
    field on the slave.

  sql/field.h@1.226.6.1, 2007-07-27 14:38:27-04:00, cbell@mysql_cab_desk. +31 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch includes updates to the unpack() methods for the variable
    length fields. A new parameter was added (from_length) that is the
    value stored in the field_metadata of the table map from the table_def
    class. 

  sql/log_event.cc@1.277.11.1, 2007-07-27 14:38:28-04:00, cbell@mysql_cab_desk. +230 -9
    WL#3228 : RBR using different table defs on slave/master
    
    This patch adds methods to calculate the field metadata size, prepare
    the field metadata for writing to the binlog, and additions to the
    Table_map_log_event::write_body method to include the field metadata 
    in the table map that is written to the binlog.

  sql/log_event.h@1.149.4.1, 2007-07-27 14:38:28-04:00, cbell@mysql_cab_desk. +10 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch adds method declarations and variables needed to support
    storing field metadata in the table map that is written to the binlog.

  sql/rpl_record.cc@1.2.2.1, 2007-07-27 14:38:29-04:00, cbell@mysql_cab_desk. +14 -4
    WL#3228 : RBR using different table defs on slave/master
    
    This patch modifies the unpack_row() method to unpack fields passing in
    the value from the table_def class. This value is the extra field
    metadata stored there from the master.

  sql/rpl_rli.h@1.14.2.1, 2007-07-27 14:38:29-04:00, cbell@mysql_cab_desk. +10 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch adds a helper function to retrieve the table_def for a given
    table in the RPL_TABLE_LIST structure.

  sql/rpl_utility.cc@1.5.2.1, 2007-07-27 14:38:30-04:00, cbell@mysql_cab_desk. +54 -35
    WL#3228 : RBR using different table defs on slave/master
    
    This patch adds a helper method that retrieves the correct size 
    parameter for the field. This method is used to compare the size as
    sent by the master with that on the slave for all types of fields that
    can vary in size and storage requirements. 

  sql/rpl_utility.h@1.5.2.1, 2007-07-27 14:38:30-04:00, cbell@mysql_cab_desk. +120 -7
    WL#3228 : RBR using different table defs on slave/master
    
    This patch changes the table_def class constructor to pass in the raw
    data read from the table map and extract it into an array of dimension
    size (number of fields). It also adds a method to return the field 
    metadata for any field. The method returns the data stored in the table
    map or 0 if no data was stored for that field. Lastly, a method to return
    the results of field->maybe_null() is included so that the slave can
    determine if a field that is not on the slave is null.

ChangeSet@1.2476.270.1, 2007-07-27 13:58:37-04:00, cbell@mysql_cab_desk. +26 -0
  WL#3228 (NDB) : RBR using different table defs on slave/master
  
  This patch adds the ability to store extra field metadata in the table
  map event. This data can include pack_length() or field_lenght() for
  fields such as CHAR or VARCHAR enabling developers to add code that
  can check for compatibilty between master and slave columns. More 
  importantly, the extra field metadata can be used to store data from the
  master correctly should a VARCHAR field on the master be <= 255 bytes 
  while the same field on the slave is > 255 bytes. '
  
  The patch also includes the needed changes to unpack to ensure that data
  which is smaller on the master can be unpacked correctly on the slave.

  mysql-test/r/rpl_colSize.result@1.1, 2007-07-27 13:58:32-04:00, cbell@mysql_cab_desk. +179 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 
    

  mysql-test/r/rpl_colSize.result@1.0, 2007-07-27 13:58:32-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/t/rpl_colSize.test@1.1, 2007-07-27 13:58:32-04:00, cbell@mysql_cab_desk. +216 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a new test designed to test the feature of having
    columns on the master that are smaller than what is on the slave. 
    

  mysql-test/t/rpl_colSize.test@1.0, 2007-07-27 13:58:32-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/extra/rpl_tests/rpl_log.test@1.45.1.2, 2007-07-27 13:58:18-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3228 : RBR using different table defs on slave/master
    
    This patch changes the test to display slave status vertically.

  mysql-test/t/binlog_row_mix_innodb_myisam.test@1.9.2.1, 2007-07-27 13:58:25-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3228 : RBR using different table defs on slave/master
    
    This patch changes the test to coincide with changes to binlog
    size of table map event.

  mysql-test/r/rpl_rbr_to_sbr.result@1.7.2.1, 2007-07-27 13:58:19-04:00, cbell@mysql_cab_desk. +2 -2
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_basic_11bugs.result@1.16.2.1, 2007-07-27 13:58:20-04:00, cbell@mysql_cab_desk. +2 -2
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_create_table.result@1.12.2.1, 2007-07-27 13:58:20-04:00, cbell@mysql_cab_desk. +42 -42
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_flsh_tbls.result@1.5.1.1, 2007-07-27 13:58:21-04:00, cbell@mysql_cab_desk. +2 -2
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_inexist_tbl.result@1.7.2.1, 2007-07-27 13:58:21-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_log.result@1.17.2.1, 2007-07-27 13:58:22-04:00, cbell@mysql_cab_desk. +39 -7
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_log_innodb.result@1.17.2.1, 2007-07-27 13:58:22-04:00, cbell@mysql_cab_desk. +39 -7
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_max_relay_size.result@1.9.2.1, 2007-07-27 13:58:23-04:00, cbell@mysql_cab_desk. +10 -10
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_until.result@1.5.1.1, 2007-07-27 13:58:24-04:00, cbell@mysql_cab_desk. +4 -4
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_stm_log.result@1.79.2.1, 2007-07-27 13:58:24-04:00, cbell@mysql_cab_desk. +35 -3
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the rpl_log.test modifications.

  mysql-test/t/rpl_row_create_table.test@1.12.1.1, 2007-07-27 13:58:26-04:00, cbell@mysql_cab_desk. +5 -5
    WL#3228 : RBR using different table defs on slave/master
    
    This patch changes the test to coincide with changes to binlog
    size of table map event.

  mysql-test/t/rpl_row_flsh_tbls.test@1.5.1.1, 2007-07-27 13:58:26-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3228 : RBR using different table defs on slave/master
    
    This patch changes the test to coincide with changes to binlog
    size of table map event.

  mysql-test/r/rpl_ndb_log.result@1.25.2.1, 2007-07-27 13:58:19-04:00, cbell@mysql_cab_desk. +4 -4
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_truncate_7ndb.result@1.10.3.1, 2007-07-27 13:58:25-04:00, cbell@mysql_cab_desk. +32 -32
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  sql/field.cc@1.385.10.1, 2007-07-27 13:58:27-04:00, cbell@mysql_cab_desk. +232 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch includes updates to the unpack() methods for the variable
    length fields. A new parameter was added (from_length) that is the
    value stored in the field_metadata of the table map from the table_def
    class. If the value is non-zero and less than what the field on the 
    slave is then use the from_length else use the original value from the
    field on the slave.

  sql/field.h@1.226.5.1, 2007-07-27 13:58:28-04:00, cbell@mysql_cab_desk. +31 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch includes updates to the unpack() methods for the variable
    length fields. A new parameter was added (from_length) that is the
    value stored in the field_metadata of the table map from the table_def
    class. 

  sql/log_event.cc@1.277.8.2, 2007-07-27 13:58:28-04:00, cbell@mysql_cab_desk. +230 -9
    WL#3228 : RBR using different table defs on slave/master
    
    This patch adds methods to calculate the field metadata size, prepare
    the field metadata for writing to the binlog, and additions to the
    Table_map_log_event::write_body method to include the field metadata 
    in the table map that is written to the binlog.

  sql/log_event.h@1.149.3.1, 2007-07-27 13:58:30-04:00, cbell@mysql_cab_desk. +10 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch adds method declarations and variables needed to support
    storing field metadata in the table map that is written to the binlog.

  sql/rpl_record.cc@1.2.1.1, 2007-07-27 13:58:30-04:00, cbell@mysql_cab_desk. +14 -4
    WL#3228 : RBR using different table defs on slave/master
    
    This patch modifies the unpack_row() method to unpack fields passing in
    the value from the table_def class. This value is the extra field
    metadata stored there from the master.

  sql/rpl_rli.h@1.14.1.1, 2007-07-27 13:58:30-04:00, cbell@mysql_cab_desk. +10 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch adds a helper function to retrieve the table_def for a given
    table in the RPL_TABLE_LIST structure.

  sql/rpl_utility.cc@1.5.1.1, 2007-07-27 13:58:31-04:00, cbell@mysql_cab_desk. +54 -35
    WL#3228 : RBR using different table defs on slave/master
    
    This patch adds a helper method that retrieves the correct size 
    parameter for the field. This method is used to compare the size as
    sent by the master with that on the slave for all types of fields that
    can vary in size and storage requirements. 

  sql/rpl_utility.h@1.5.1.1, 2007-07-27 13:58:31-04:00, cbell@mysql_cab_desk. +120 -7
    WL#3228 : RBR using different table defs on slave/master
    
    This patch changes the table_def class constructor to pass in the raw
    data read from the table map and extract it into an array of dimension
    size (number of fields). It also adds a method to return the field 
    metadata for any field. The method returns the data stored in the table
    map or 0 if no data was stored for that field. Lastly, a method to return
    the results of field->maybe_null() is included so that the slave can
    determine if a field that is not on the slave is null.

ChangeSet@1.2476.197.11, 2007-07-27 16:11:40+02:00, guilhem@gbichot4.local +6 -0
  porting Serg's fix for BUG#30094 to Maria. Now ma_test_all passes.
  maria.test and ps_maria.test still fail.

  mysys/mf_keycache.c@1.70, 2007-07-27 16:11:38+02:00, guilhem@gbichot4.local +2 -2
    split string annoys some compilers

  storage/maria/ha_maria.cc@1.32, 2007-07-27 16:11:38+02:00, guilhem@gbichot4.local +4 -2
    fix for compiler warnings

  storage/maria/ma_test1.c@1.13, 2007-07-27 16:11:38+02:00, guilhem@gbichot4.local +3 -2
    porting Serg's fix for BUG#30094 to Maria

  storage/maria/ma_test2.c@1.16, 2007-07-27 16:11:38+02:00, guilhem@gbichot4.local +13 -10
    porting Serg's fix for BUG#30094 to Maria

  storage/maria/ma_test3.c@1.9, 2007-07-27 16:11:38+02:00, guilhem@gbichot4.local +2 -2
    porting Serg's fix for BUG#30094 to Maria

  storage/maria/ma_test_recovery@1.2, 2007-07-27 16:11:38+02:00, guilhem@gbichot4.local +3 -3
    don't print ma_test1's messages if no problem

ChangeSet@1.2476.197.10, 2007-07-27 12:06:39+02:00, guilhem@gbichot4.local +25 -0
  merging MyISAM changes into Maria (not done in 5.1->maria merge of
  Jul 7th). "maria.test" and "ps_maria.test" still fail;
  "ma_test_all" starts failing (MyISAM has the same issue see BUG#30094).

  include/maria.h@1.14, 2007-07-27 12:06:36+02:00, guilhem@gbichot4.local +2 -2
    merging MyISAM changes into Maria

  mysys/mf_keycache.c@1.69, 2007-07-27 12:06:36+02:00, guilhem@gbichot4.local +6 -8
    mi_test_all showed "floating point exception", this was already
    fixed in the latest 5.1, importing fix.

  sql/item_xmlfunc.cc@1.32, 2007-07-27 12:06:36+02:00, guilhem@gbichot4.local +1 -1
    compiler warning (already fixed in latest 5.1)

  storage/maria/ha_maria.cc@1.31, 2007-07-27 12:06:36+02:00, guilhem@gbichot4.local +148 -50
    merging MyISAM changes into Maria. See #ifdef ASK_MONTY.

  storage/maria/ha_maria.h@1.14, 2007-07-27 12:06:36+02:00, guilhem@gbichot4.local +8 -5
    merging MyISAM changes into Maria

  storage/maria/ma_cache.c@1.4, 2007-07-27 12:06:36+02:00, guilhem@gbichot4.local +2 -2
    merging MyISAM changes into Maria

  storage/maria/ma_check.c@1.27, 2007-07-27 12:06:36+02:00, guilhem@gbichot4.local +9 -7
    merging MyISAM changes into Maria

  storage/maria/ma_create.c@1.22, 2007-07-27 12:06:36+02:00, guilhem@gbichot4.local +20 -6
    merging MyISAM changes into Maria

  storage/maria/ma_dynrec.c@1.15, 2007-07-27 12:06:36+02:00, guilhem@gbichot4.local +7 -7
    merging MyISAM changes into Maria

  storage/maria/ma_extra.c@1.13, 2007-07-27 12:06:36+02:00, guilhem@gbichot4.local +6 -4
    merging MyISAM changes into Maria

  storage/maria/ma_ft_boolean_search.c@1.8, 2007-07-27 12:06:37+02:00, guilhem@gbichot4.local +31 -20
    merging MyISAM changes into Maria

  storage/maria/ma_ft_nlq_search.c@1.6, 2007-07-27 12:06:37+02:00, guilhem@gbichot4.local +6 -2
    merging MyISAM changes into Maria

  storage/maria/ma_info.c@1.8, 2007-07-27 12:06:37+02:00, guilhem@gbichot4.local +3 -3
    merging MyISAM changes into Maria

  storage/maria/ma_key.c@1.9, 2007-07-27 12:06:37+02:00, guilhem@gbichot4.local +21 -43
    merging MyISAM changes into Maria

  storage/maria/ma_loghandler.c@1.30, 2007-07-27 12:06:37+02:00, guilhem@gbichot4.local +2 -2
    compiler warning (part->length is size_t)

  storage/maria/ma_open.c@1.21, 2007-07-27 12:06:37+02:00, guilhem@gbichot4.local +20 -28
    merging MyISAM changes into Maria

  storage/maria/ma_preload.c@1.6, 2007-07-27 12:06:37+02:00, guilhem@gbichot4.local +9 -4
    merging MyISAM changes into Maria

  storage/maria/ma_range.c@1.9, 2007-07-27 12:06:37+02:00, guilhem@gbichot4.local +49 -14
    merging MyISAM changes into Maria

  storage/maria/ma_rkey.c@1.9, 2007-07-27 12:06:37+02:00, guilhem@gbichot4.local +8 -7
    merging MyISAM changes into Maria

  storage/maria/ma_rt_index.c@1.9, 2007-07-27 12:06:37+02:00, guilhem@gbichot4.local +79 -28
    merging MyISAM changes into Maria

  storage/maria/ma_rt_key.c@1.6, 2007-07-27 12:06:37+02:00, guilhem@gbichot4.local +13 -5
    merging MyISAM changes into Maria

  storage/maria/ma_rt_split.c@1.7, 2007-07-27 12:06:37+02:00, guilhem@gbichot4.local +10 -2
    merging MyISAM changes into Maria

  storage/maria/ma_search.c@1.11, 2007-07-27 12:06:37+02:00, guilhem@gbichot4.local +35 -7
    merging MyISAM changes into Maria

  storage/maria/ma_sort.c@1.10, 2007-07-27 12:06:37+02:00, guilhem@gbichot4.local +10 -7
    merging MyISAM changes into Maria

  storage/maria/maria_def.h@1.27, 2007-07-27 12:06:37+02:00, guilhem@gbichot4.local +3 -2
    merging MyISAM changes into Maria

ChangeSet@1.1810.3217.3, 2007-07-27 17:12:53+10:00, stewart@willster.(none) +2 -0
  save the data from mysql.db that we delete (side effect that made read_only fail)

  mysql-test/r/ndb_bug26793.result@1.2, 2007-07-27 17:12:50+10:00, stewart@willster.(none) +4 -0
    save the data from mysql.db that we delete (side effect that made read_only fail)

  mysql-test/t/ndb_bug26793.test@1.2, 2007-07-27 17:12:50+10:00, stewart@willster.(none) +5 -0
    save the data from mysql.db that we delete (side effect that made read_only fail)

ChangeSet@1.2476.12.67, 2007-07-27 15:08:51+10:00, stewart@willster.(none) +1 -0
  point to bugs needing to be addressed before rpl_ndb_ctype_ucs2_def can be enabled

  mysql-test/t/disabled.def@1.253.5.4, 2007-07-27 15:08:46+10:00, stewart@willster.(none) +1 -1
    point to bugs needing to be addressed before rpl_ndb_ctype_ucs2_def can be enabled

ChangeSet@1.2476.197.9, 2007-07-26 17:51:49+02:00, guilhem@gbichot4.local +14 -0
  post-merge fixes, and fixes for some of the 16 compiler warnings
  found in pushbuild on sapsrv1. Some not fixed as not repeatable
  on my machine (32/64 bit issue?).
  Fixes for some test failures:
  - "maria-connect" now passes;
  - "maria": after fixing the obvious reasons for failures, the test
  went further and hit a more complex issues: difference in the output
  of EXPLAIN output; not fixed;
  - "ps_maria" still crashes in assertion
  mysqld: ha_maria.cc:1627: virtual int ha_maria::index_read(uchar*, const uchar*, uint, ha_rkey_function): Ass
  ertion `inited == INDEX' failed, as already observable in pushbuild.
  All this might just be due to an incomplete merge of MyISAM changes
  into Maria when 5.1 was last merged to mysql-maria.

  include/my_global.h@1.150, 2007-07-26 17:51:47+02:00, guilhem@gbichot4.local +7 -0
    temporary fix until next merge of 5.1; without this it does not build

  mysql-test/r/maria-connect.result@1.2, 2007-07-26 17:51:47+02:00, guilhem@gbichot4.local +4 -4
    position changed

  mysql-test/t/maria-connect.test@1.2, 2007-07-26 17:51:47+02:00, guilhem@gbichot4.local +3 -2
    If one wants to use the binlog it has to ask for it.
    1582 is not used for dup entry error anymore (it was in older 5.1).
    Size of first event in binlog was increased by 4 (when the new type
    of event "gap" was added).

  mysql-test/t/maria.test@1.13, 2007-07-26 17:51:47+02:00, guilhem@gbichot4.local +2 -2
    1582 not used anymore in this case

  storage/maria/ha_maria.cc@1.30, 2007-07-26 17:51:47+02:00, guilhem@gbichot4.local +1 -0
    engine now has to say what binlogging it supports

  storage/maria/ma_blockrec.c@1.31, 2007-07-26 17:51:47+02:00, guilhem@gbichot4.local +5 -5
    fix for compiler warnings ("comparison is always true" or "always
    false")

  storage/maria/ma_loghandler.c@1.29, 2007-07-26 17:51:47+02:00, guilhem@gbichot4.local +1 -1
    fix for compiler warnings (comparing char* to uchar*)

  storage/maria/ma_packrec.c@1.12, 2007-07-26 17:51:47+02:00, guilhem@gbichot4.local +2 -1
    fix for compiler warning (fix simply merged from MyISAM)

  storage/maria/ma_pagecache.c@1.33, 2007-07-26 17:51:47+02:00, guilhem@gbichot4.local +2 -1
    info_check_pin() was not used so gave a compiler warning.

  storage/maria/ma_pagecache.h@1.20, 2007-07-26 17:51:47+02:00, guilhem@gbichot4.local +1 -1
    fixing typo from the last 5.1->maria merge.

  storage/maria/ma_recovery.c@1.9, 2007-07-26 17:51:47+02:00, guilhem@gbichot4.local +4 -4
    my_free() has a void* argument, so why cast. byte->uchar.

  storage/maria/ma_search.c@1.10, 2007-07-26 17:51:47+02:00, guilhem@gbichot4.local +2 -2
    fix for compiler warning (fix simply merged from MyISAM)

  storage/maria/maria_read_log.c@1.10, 2007-07-26 17:51:47+02:00, guilhem@gbichot4.local +3 -3
    gptr->uchar*

  storage/maria/trnman.c@1.26, 2007-07-26 17:51:47+02:00, guilhem@gbichot4.local +1 -1
    probable fix for warning found in pushbuild (but not on my machine):
    storage/maria/trnman.c: 142
     passing argument 6 of \u2018lf_hash_init\u2019 from incompatible pointer type
    on sapsrv1.

ChangeSet@1.1810.3217.2, 2007-07-26 20:25:05+10:00, stewart@flamingspork.com +1 -0
  [PATCH] Bug#26793 I_S query crashes in NDB
  
  If ::exteral_lock hadn't been called, we'd have no NDB object,
  so need to check/get one here.
  
  It looks like sql_show.cc is the only place that does this....
  or at least the other places will be well hidden.
  
  Index: ndb-work/sql/ha_ndbcluster.cc
  ===================================================================

  sql/ha_ndbcluster.cc@1.175.1.139, 2007-07-25 17:33:55+10:00, stewart@flamingspork.com +2 -0
    Bug#26793 I_S query crashes in NDB

ChangeSet@1.1810.3217.1, 2007-07-26 20:24:54+10:00, stewart@flamingspork.com +2 -0
  [PATCH] BUG#26793 test: mysqld crashes in NDB on I_S query
  
  Reduce case and formalise into something we should be
  able to use in mysql-test-run.
  
  Index: ndb-work/mysql-test/t/ndb_bug26793.test
  ===================================================================

  mysql-test/r/ndb_bug26793.result@1.1, 2007-07-26 17:07:57+10:00, stewart@flamingspork.com +9 -0
    BUG#26793 test: mysqld crashes in NDB on I_S query

  mysql-test/r/ndb_bug26793.result@1.0, 2007-07-26 17:07:57+10:00, stewart@flamingspork.com +0 -0

  mysql-test/t/ndb_bug26793.test@1.1, 2007-07-26 17:06:48+10:00, stewart@flamingspork.com +33 -0
    BUG#26793 test: mysqld crashes in NDB on I_S query

  mysql-test/t/ndb_bug26793.test@1.0, 2007-07-26 17:06:48+10:00, stewart@flamingspork.com +0 -0

ChangeSet@1.2409.74.36, 2007-07-26 11:56:21+02:00, guilhem@gbichot4.local +20 -0
  WL#3072 - Maria recovery
  Unit test for recovery: runs ma_test1 and ma_test2 (both only with
  INSERTs and DELETEs; UPDATEs disabled as not handled by recovery)
  then moves the tables elswhere; recreates tables from the log, and
  compares and fails if there is a difference. Passes now.
  Most of maria_read_log.c moved to ma_recovery.c, as it will be re-used
  for recovery-from-ha_maria.
  Bugfixes of applying of REDO_INSERT, REDO_PURGE_ROW.
  Applying of REDO_PURGE_BLOCKS, REDO_DELETE_ALL, REDO_DROP_TABLE,
  UNDO_ROW_INSERT (in REDO phase only, i.e. just doing records++),
  UNDO_ROW_DELETE, UNDO_ROW_PURGE.
  Code cleanups.
  Monty: please look for "QQ". Sanja: please look for "Sanja".
  Future tasks: recovery of the bitmap (easy), recovery of the state
  (make it idempotent), more REDOs (Monty to work on
  REDO_UPDATE?), UNDO phase...
  Pushing this cset as it looks safe, contains test and bugfixes which
  will help Monty implement applying of REDO_UPDATE.

  sql/handler.cc@1.295.7.5, 2007-07-26 11:56:19+02:00, guilhem@gbichot4.local +1 -1
    typo

  storage/maria/Makefile.am@1.17, 2007-07-26 11:56:19+02:00, guilhem@gbichot4.local +4 -4
    Adding ma_test_recovery (which ma_test_all invokes, and which can
    also be run alone). Most of maria_read_log.c moved to ma_recovery.c

  storage/maria/ha_maria.cc@1.27.1.1, 2007-07-26 11:56:19+02:00, guilhem@gbichot4.local +13 -0
    comments

  storage/maria/ma_bitmap.c@1.13.1.1, 2007-07-26 11:56:19+02:00, guilhem@gbichot4.local +56 -15
    fixing comments. 2 -> sizeof(maria_bitmap_marker).
    Bitmap-related part of _ma_initialize_datafile() moves in bitmap module.
    Now putting the "bm" signature when creating the first bitmap page
    (it used to happen only at next open, but that
    caused an annoying difference when testing Recovery if the original
    run didn't open the table, and it looks more
    logical like this: it goes to disk only with its signature correct);
    see the "QQ" comment towards the _ma_initialize_data_file() call
    in ma_create.c for more).
    When reading a bitmap page, verify its signature (happens when normally
    using the table or when CHECKing it; not when REPAIRing it).

  storage/maria/ma_blockrec.c@1.26.1.2, 2007-07-26 11:56:19+02:00, guilhem@gbichot4.local +143 -32
    * no need to sync the data file if table is not transactional
    * Comments, code cleanup (log-related data moved to log-related code
    block, int5store->page_store).
    * Store the table's short id into LOGREC_UNDO_ROW_PURGE, like we
    do for other records (though this record will soon be replaced
    with a CLR).
    * If "page" is 1 it means the page which extends from byte
    page*block_size+1 to (page+1)*block_size (byte number 1 being
    the first byte of the file). The last byte of the file is
    data_file_length (same convention).
    A new page needs to be created if the last byte of the page is
    beyond the last byte of the file, i.e.
     (page+1)*block_size+1 > data_file_length, so we correct the test
    (bug found when testing log applying for ma_test1 -M -T --skip-update).
    * update the page's LSN when removing a row from it during
    execution of a REDO_PURGE_ROW record (bug found when testing log
    applying for ma_test1 -M -T --skip-update).
    * applying of REDO_PURGE_BLOCKs (limited to a one-page range for now).

  storage/maria/ma_blockrec.h@1.7.1.2, 2007-07-26 11:56:19+02:00, guilhem@gbichot4.local +3 -2
    new functions. maria_bitmap_marker does not need to be exported.

  storage/maria/ma_close.c@1.14.1.1, 2007-07-26 11:56:19+02:00, guilhem@gbichot4.local +1 -1
    we can always flush the table's state when closing the last instance
    of the table. And it is needed for maria_read_log (as it does
    not use maria_lock_database()).

  storage/maria/ma_control_file.c@1.17, 2007-07-26 11:56:19+02:00, guilhem@gbichot4.local +2 -0
    when in Recovery, some assertions should not be used.

  storage/maria/ma_control_file.h@1.18, 2007-07-26 11:56:19+02:00, guilhem@gbichot4.local +5 -1
    double-inclusion safe

  storage/maria/ma_create.c@1.19.1.1, 2007-07-26 11:56:19+02:00, guilhem@gbichot4.local +47 -22
    during recovery, don't log records. Comments.
    Moving the creation of the first bitmap page to ma_bitmap.c

  storage/maria/ma_delete_table.c@1.9, 2007-07-26 11:56:19+02:00, guilhem@gbichot4.local +3 -2
    during recovery, don't log records. Log the end-zero of the dropped
    table's name, so that recovery can use the string in place without
    extending it to fit an end zero.

  storage/maria/ma_loghandler.c@1.24.1.2, 2007-07-26 11:56:19+02:00, guilhem@gbichot4.local +122 -82
    * inwrite_rec_hook also needs access to the MARIA_SHARE, like
    prewrite_rec_hook. This will be needed to update
    share->records_diff (in the upcoming patch "recovery of the state").
    * LOG_DESC::record_ends_group changed to an enum.
    * LOG_DESC for LOGREC_REDO_PURGE_BLOCKS and LOGREC_UNDO_ROW_PURGE
    corrected
    * Sanja please see the @todo LOG BUG
    * avoiding DBUG_RETURN(func()) as it gives confusing debug traces.

  storage/maria/ma_loghandler.h@1.11.1.1, 2007-07-26 11:56:19+02:00, guilhem@gbichot4.local +7 -2
    - log write hooks called while the log's lock is held (inwrite_rec_hook)
    now need the MARIA_SHARE, like prewrite_rec_hook already had
    - instead of a bool saying if this record's type ends groups or not,
    we refine: it may not end a group, it may end a group, or it may
    be a group in itself. Imagine that we had a physical write failure
    to a table before we log the UNDO, we still end up in
    external_lock(F_UNLCK) and then we log a COMMIT: we don't want
    to consider this COMMIT as ending the group of REDOs (don't want
    to execute those REDOs during Recovery), that's why we say "COMMIT
    is a group in itself, it aborts any previous group". This also
    gives one more sanity check in maria_read_log.

  storage/maria/ma_recovery.c@1.8, 2007-07-26 11:56:19+02:00, guilhem@gbichot4.local +1046 -129
    New Recovery code, replacing the old pseudocode.
    Most of maria_read_log moved here.
    Call-able from ha_maria, but not enabled yet.
    Compared to the previous version of maria_read_log, some bugs have
    been fixed, debugging output can go to stdout or a disk file (for now
    it's useful for me, later it can be changed), execution of
    REDO_DROP_TABLE, REDO_DELETE_ALL, REDO_PURGE_BLOCKS has been added. Duplicate code
    has been factored into functions. We abort an unfinished group
    of records if we see a record which is a group in itself (like COMMIT).
    No need for maria_panic() after a bug (which caused tables to not
    be closed) was fixed; if there is yet another bug I prefer to see it.
    When opening a table for Recovery, set data_file_length
    and key_file_length to their real physical value (these are the
    easiest state members to restore :). Warn us if the last page
    was truncated (but Recovery handles it).
    MARIA_SHARE::state::state::records is now partly recovered (not
    idempotent, but works if recreating tables from scracth).
    When applying a REDO to a page, stamp it with the UNDO's LSN
    (current_group_end_lsn), not with the REDO's LSN; it makes
    the table more identical to the original table (easier to compare
    the two tables in the end).
    Big thing missing: some types of REDOs are not handled,
    and the UNDO phase does not exist (missing functions to execute UNDOs
    to actually rollback). So for now tests are only inserting/deleting
    a few 100 rows, closing the table and seeing if the log is applied ok;
    it works. UPDATE not handled.

  storage/maria/ma_recovery.h@1.6, 2007-07-26 11:56:19+02:00, guilhem@gbichot4.local +5 -1
    new functions: ma_recover() for recovery from inside ha_maria;
    _ma_apply_log() for maria_read_log (ma_recover() calls _ma_apply_log()).
    Btw, we need to not use the word "recover" for REPAIR/maria_chk anymore.

  storage/maria/ma_rename.c@1.9, 2007-07-26 11:56:19+02:00, guilhem@gbichot4.local +2 -2
    don't write log records during recovery

  storage/maria/ma_test2.c@1.13.1.1, 2007-07-26 11:56:19+02:00, guilhem@gbichot4.local +67 -43
    - fail if maria_info() or other subtests find some wrong information
    - new option -g to skip updates.
    - init the translog before creating the table, so that log applying
    can work.
    - in "#if 0" you'll see some fixed bugs (will be removed).

  storage/maria/ma_test_all.sh@1.10, 2007-07-26 11:56:19+02:00, guilhem@gbichot4.local +10 -0
    cleanup files. Test log applying.

  storage/maria/ma_test_recovery@1.1, 2007-07-26 11:56:19+02:00, guilhem@gbichot4.local +37 -0
    unit test for Recovery. Tests insert and delete,
    REDO_UPDATE not yet coded.
    Script is called from ma_test_all. Can run standalone.

  storage/maria/ma_test_recovery@1.0, 2007-07-26 11:56:19+02:00, guilhem@gbichot4.local +0 -0

  storage/maria/maria_read_log.c@1.7.1.1, 2007-07-26 11:56:19+02:00, guilhem@gbichot4.local +9 -811
    most of the logic moves to ma_recovery.c to be shared between
    maria_read_log and recovery-from-inside-mysqld.
    See ma_recovery.c for additional changes made to the moved code.

ChangeSet@1.1810.3214.1, 2007-07-25 14:53:25+08:00, gni@dev3-221.dev.cn.tlan +1 -0
  BUG#27683 Incorrect description for ndb_restore --print

  ndb/tools/restore/restore_main.cpp@1.29.18.1, 2007-07-25 14:53:23+08:00, gni@dev3-221.dev.cn.tlan +1 -1
    modify --print explaination of ndb_restore 

ChangeSet@1.2476.12.65, 2007-07-25 07:24:25+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  BUG#30017 log-slave-updates incorrect behavior for cluster
  - let the receiving injector thread decide what to do

  sql/ha_ndbcluster.cc@1.457.1.5, 2007-07-25 07:24:23+02:00, tomas@whalegate.ndb.mysql.com +37 -13
    BUG#30017 log-slave-updates incorrect behavior for cluster
    - let the receiving injector thread decide what to do

  sql/ha_ndbcluster_binlog.cc@1.118.1.4, 2007-07-25 07:24:23+02:00, tomas@whalegate.ndb.mysql.com +13 -0
    BUG#30017 log-slave-updates incorrect behavior for cluster
    - let the receiving injector thread decide what to do

ChangeSet@1.2476.12.64, 2007-07-25 07:22:28+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  wait_until_ready may return greater that 1 since wait time for second node to connect is 0

  storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1.cpp@1.4, 2007-07-25 07:22:25+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    wait_until_ready may return greater that 1 since wait time for second node to connect is 0

ChangeSet@1.1810.3212.1, 2007-07-25 09:32:28+08:00, gni@dev3-221.dev.cn.tlan +1 -0
  BUG#28423 cluster to storage engine error code mapping problem

  sql/ha_ndbcluster.cc@1.175.86.1, 2007-07-25 09:32:26+08:00, gni@dev3-221.dev.cn.tlan +2 -2
    make HA_ERR_FOUND_DUPP_KEY error cases throw warning like the other ambiguous engine error codes that may be caused by multiple cluster error codes

ChangeSet@1.2476.236.1, 2007-07-20 19:43:56+08:00, gni@dev3-221.dev.cn.tlan +8 -0
  BUG#22240 Upgrading from cluster 5.0 to 5.1 does not resize VARCHARS as expected.
           add varchar type restoring test from 5.0 backup into 5.1

  mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data@1.1, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +426 -0
    backup data

  mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data@1.0, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +0 -0

  mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data@1.1, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +417 -0
    backup data

  mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data@1.0, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +0 -0

  mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl@1.1, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +59 -0
    meta data of 5.0 backup

  mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl@1.0, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +0 -0

  mysql-test/std_data/ndb_backup50/BACKUP-2.1.log@1.1, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +2 -0
    log data of 5.0 backup

  mysql-test/std_data/ndb_backup50/BACKUP-2.1.log@1.0, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +0 -0

  mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl@1.1, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +59 -0
    meta data of 5.0 backup

  mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl@1.0, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +0 -0

  mysql-test/std_data/ndb_backup50/BACKUP-2.2.log@1.1, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +2 -0
    log data of 5.0 backup

  mysql-test/std_data/ndb_backup50/BACKUP-2.2.log@1.0, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +0 -0

  mysql-test/r/ndb_restore_compat.result@1.5.1.1, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +6 -0
    add test result for varchar type from 5.0 version backup into 5.1

  mysql-test/t/ndb_restore_compat.test@1.4.1.1, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +6 -0
    add test for varchar type restoring from 5.0 backup into 5.1 

ChangeSet@1.2476.224.1, 2007-07-17 15:49:07-05:00, jmiller@mysql.com +4 -0
  Many files:
    Added new test case for dropping column on the end of master table

  mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test@1.4, 2007-07-17 15:48:33-05:00, jmiller@mysql.com +64 -2
    Added new test case for dropping column on the end of master table

  mysql-test/r/rpl_extraCol_innodb.result@1.5.2.1, 2007-07-17 15:48:59-05:00, jmiller@mysql.com +60 -0
    Added new test case for dropping column on the end of master table

  mysql-test/r/rpl_extraCol_myisam.result@1.5.2.1, 2007-07-17 15:48:59-05:00, jmiller@mysql.com +60 -0
    Added new test case for dropping column on the end of master table

  mysql-test/r/rpl_ndb_extraCol.result@1.6.2.1, 2007-07-17 15:48:59-05:00, jmiller@mysql.com +60 -0
    Added new test case for dropping column on the end of master table

ChangeSet@1.2403.18.79, 2007-07-14 11:48:51+03:00, pekka@clam.ndb.mysql.com +8 -0
  ndb - threads and timings to hugo* pk ops

  storage/ndb/test/include/HugoTransactions.hpp@1.15, 2007-07-14 11:48:06+03:00, pekka@clam.ndb.mysql.com +15 -1
    threads and timings to hugo* pk ops

  storage/ndb/test/include/NDBT_Thread.hpp@1.2, 2007-07-14 11:48:06+03:00, pekka@clam.ndb.mysql.com +226 -0
    threads and timings to hugo* pk ops

  storage/ndb/test/include/NDBT_Thread.hpp@1.1, 2007-07-14 11:24:21+03:00, pekka@clam.ndb.mysql.com +0 -0
    BitKeeper file /export/space/pekka/ndb/version/my51-dd/storage/ndb/test/include/NDBT_Thread.hpp

  storage/ndb/test/include/NDBT_Thread.hpp@1.0, 2007-07-14 11:24:20+03:00, pekka@clam.ndb.mysql.com +0 -0

  storage/ndb/test/src/HugoTransactions.cpp@1.31.2.1, 2007-07-14 11:48:06+03:00, pekka@clam.ndb.mysql.com +74 -4
    threads and timings to hugo* pk ops

  storage/ndb/test/src/Makefile.am@1.11.1.1, 2007-07-14 11:48:06+03:00, pekka@clam.ndb.mysql.com +1 -1
    threads and timings to hugo* pk ops

  storage/ndb/test/src/NDBT_Thread.cpp@1.2, 2007-07-14 11:48:06+03:00, pekka@clam.ndb.mysql.com +283 -0
    threads and timings to hugo* pk ops

  storage/ndb/test/src/NDBT_Thread.cpp@1.1, 2007-07-14 11:24:21+03:00, pekka@clam.ndb.mysql.com +0 -0
    BitKeeper file /export/space/pekka/ndb/version/my51-dd/storage/ndb/test/src/NDBT_Thread.cpp

  storage/ndb/test/src/NDBT_Thread.cpp@1.0, 2007-07-14 11:24:21+03:00, pekka@clam.ndb.mysql.com +0 -0

  storage/ndb/test/tools/hugoPkDelete.cpp@1.11, 2007-07-14 11:48:06+03:00, pekka@clam.ndb.mysql.com +89 -5
    threads and timings to hugo* pk ops

  storage/ndb/test/tools/hugoPkRead.cpp@1.9, 2007-07-14 11:48:06+03:00, pekka@clam.ndb.mysql.com +85 -4
    threads and timings to hugo* pk ops

  storage/ndb/test/tools/hugoPkUpdate.cpp@1.12, 2007-07-14 11:48:07+03:00, pekka@clam.ndb.mysql.com +91 -7
    threads and timings to hugo* pk ops

ChangeSet@1.2476.197.7, 2007-07-07 23:17:35+03:00, jani@labbari.dsl.inet.fi +2 -0
  Merged from main 5.1

  mysql-test/r/alter_table.result@1.84, 2007-07-07 23:17:13+03:00, jani@labbari.dsl.inet.fi +2 -0
    Merged from main 5.1

  mysql-test/r/rpl_events.result@1.7.1.1, 2007-07-07 23:17:17+03:00, jani@labbari.dsl.inet.fi +4 -2
    Merged from main 5.1

ChangeSet@1.2476.195.1, 2007-07-05 07:42:12-05:00, jmiller@mysql.com +2 -0
  ndb api test case for bug 29501

  storage/ndb/test/ndbapi/testDict.cpp@1.38, 2007-07-05 07:40:36-05:00, jmiller@mysql.com +255 -0
    Added test for Bug#29501. Tested on both code without patch and code with patch. DN fails on code w/o and passed for code w/. Also includes new helper functions runWaitStarted and DropDDObjects. Along with these helper function I have included a test for DropDDObjects. I did find a case where lgman fails on the restarting DN with corrupt fs error. I will file a new bug report and test case for that.

  storage/ndb/test/run-test/daily-basic-tests.txt@1.92.1.6, 2007-07-05 07:41:16-05:00, jmiller@mysql.com +8 -0
    Added new tests for bug29501

ChangeSet@1.2409.74.34, 2007-07-04 22:27:58+02:00, serg@janus.mylan +6 -0
  in mysql_unlock_tables(), do thr_unlock() AFTER external_unlock().
  it means, {update,restore}_status() should be called in external_lock, 
  not in thr_unlock. Only affects storage engines that support
  TL_WRITE_CONCURRENT.

  mysys/thr_lock.c@1.58.1.1, 2007-07-04 22:27:56+02:00, serg@janus.mylan +7 -13
    in mysql_unlock_tables(), do thr_unlock() AFTER external_unlock().
    it means, {update,restore}_status() should be called in external_lock, 
    not in thr_unlock. Only affects storage engines that support
    TL_WRITE_CONCURRENT.

  sql/lock.cc@1.103.1.1, 2007-07-04 22:27:56+02:00, serg@janus.mylan +2 -2
    in mysql_unlock_tables(), do thr_unlock() AFTER external_unlock().
    it means, {update,restore}_status() should be called in external_lock, 
    not in thr_unlock. Only affects storage engines that support
    TL_WRITE_CONCURRENT.

  storage/csv/ha_tina.cc@1.52.1.1, 2007-07-04 22:27:56+02:00, serg@janus.mylan +10 -2
    in mysql_unlock_tables(), do thr_unlock() AFTER external_unlock().
    it means, {update,restore}_status() should be called in external_lock, 
    not in thr_unlock. Only affects storage engines that support
    TL_WRITE_CONCURRENT.

  storage/csv/ha_tina.h@1.27.1.1, 2007-07-04 22:27:56+02:00, serg@janus.mylan +4 -0
    in mysql_unlock_tables(), do thr_unlock() AFTER external_unlock().
    it means, {update,restore}_status() should be called in external_lock, 
    not in thr_unlock. Only affects storage engines that support
    TL_WRITE_CONCURRENT.

  storage/maria/ma_locking.c@1.9.1.1, 2007-07-04 22:27:56+02:00, serg@janus.mylan +6 -0
    in mysql_unlock_tables(), do thr_unlock() AFTER external_unlock().
    it means, {update,restore}_status() should be called in external_lock, 
    not in thr_unlock. Only affects storage engines that support
    TL_WRITE_CONCURRENT.

  storage/myisam/mi_locking.c@1.52.1.1, 2007-07-04 22:27:56+02:00, serg@janus.mylan +36 -16
    in mysql_unlock_tables(), do thr_unlock() AFTER external_unlock().
    it means, {update,restore}_status() should be called in external_lock, 
    not in thr_unlock. Only affects storage engines that support
    TL_WRITE_CONCURRENT.

ChangeSet@1.2409.121.15, 2007-07-04 16:01:00+02:00, guilhem@gbichot3.local +6 -0
  Maria: correcting assertions (should be enforced only in multi-threaded
  mode) so ma_test_all works again; more error detection in ma_test_all;
  maria_control renamed to maria_log_control (Monty's suggestion,
  so that a "rm maria_log*" removes all log-related files). Disabling
  failing wrong assertion.

  storage/maria/ma_blockrec.c@1.26.1.1, 2007-07-04 16:00:56+02:00, guilhem@gbichot3.local +2 -0
    disabling assertion which fails because cur_block is a
    local variable not initialized

  storage/maria/ma_check.c@1.23.1.1, 2007-07-04 16:00:56+02:00, guilhem@gbichot3.local +5 -1
    comment

  storage/maria/ma_control_file.h@1.17, 2007-07-04 16:00:56+02:00, guilhem@gbichot3.local +1 -1
    control file renamed

  storage/maria/ma_loghandler.c@1.24.1.1, 2007-07-04 16:00:56+02:00, guilhem@gbichot3.local +2 -2
    assertions needed only in multi-threaded mode (ma_test1 and ma_test2
    are single-threaded, it's ok for them to use dummy_transaction_object
    with transactional tables: trn->rec_lsn can be set without interfering
    with other threads).

  storage/maria/ma_test_all.sh@1.9, 2007-07-04 16:00:56+02:00, guilhem@gbichot3.local +9 -3
    got caught by failures in some ma_test1 runs, which I didn't see
    because ma_test_all returned 0 and I didn't scroll up in the window;
    now using "set -e" to avoid that. Also testing that
    we get the errors and warnings we expect.

  storage/maria/unittest/Makefile.am@1.11, 2007-07-04 16:00:56+02:00, guilhem@gbichot3.local +1 -1
    maria_control renamed

ChangeSet@1.2476.169.4, 2007-07-04 12:39:19+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +6 -0
  Fixed bytes to uchar and gptr to uchar*

  storage/maria/ma_blockrec.c@1.28, 2007-07-04 12:39:15+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +15 -15
    Fixed bytes to uchar and gptr to uchar*

  storage/maria/ma_blockrec.h@1.10, 2007-07-04 12:39:15+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +3 -3
    Fixed bytes to uchar and gptr to uchar*

  storage/maria/ma_check.c@1.25, 2007-07-04 12:39:15+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +3 -3
    Fixed bytes to uchar and gptr to uchar*

  storage/maria/ma_loghandler.c@1.26, 2007-07-04 12:39:15+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -1
    Fixed bytes to uchar and gptr to uchar*

  storage/maria/ma_loghandler.h@1.13, 2007-07-04 12:39:15+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -1
    Fixed bytes to uchar and gptr to uchar*

  storage/maria/maria_read_log.c@1.8, 2007-07-04 12:39:15+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +6 -6
    Fixed bytes to uchar and gptr to uchar*

ChangeSet@1.2409.121.14, 2007-07-04 01:04:21+03:00, monty@mysql.com +1 -0
  After merge fixes
  Note that ma_test_all doesn't work for the moment.
  (ma_test1 -s -M -T fails because it uses the dummy_transaction_object)

  storage/maria/ma_blockrec.c@1.26, 2007-07-04 01:04:20+03:00, monty@mysql.com +2 -2
    After merge fixes

ChangeSet@1.2409.124.1, 2007-07-04 00:50:17+03:00, monty@mysql.com +7 -0
  Implement applying of REDO entries for
  - LOGREC_REDO_INSERT_ROW_HEAD
  - LOGREC_REDO_INSERT_ROW_TAIL
  - LOGREC_REDO_PURGE_ROW_HEAD
  - LOGREC_REDO_PURGE_ROW_TAIL

  sql/sql_yacc.yy@1.534.8.2, 2007-07-04 00:50:15+03:00, monty@mysql.com +1 -1
    Fixed typo in previous push

  storage/maria/ma_bitmap.c@1.13, 2007-07-04 00:50:15+03:00, monty@mysql.com +1 -1
    Ensure we flush the new bitmap on close

  storage/maria/ma_blockrec.c@1.23.1.1, 2007-07-04 00:50:15+03:00, monty@mysql.com +415 -78
    Implement applying of REDO entries for
    - LOGREC_REDO_INSERT_ROW_HEAD
    - LOGREC_REDO_INSERT_ROW_TAIL
    - LOGREC_REDO_PURGE_ROW_HEAD
    - LOGREC_REDO_PURGE_ROW_TAIL
    Split some functions into subfunctions to be able to reuse code

  storage/maria/ma_blockrec.h@1.7.1.1, 2007-07-04 00:50:15+03:00, monty@mysql.com +8 -0
    Added prototypes for REDO applying functions

  storage/maria/ma_loghandler.h@1.11, 2007-07-04 00:50:15+03:00, monty@mysql.com +1 -1
    Safety fix

  storage/maria/ma_loghandler_lsn.h@1.8, 2007-07-04 00:50:15+03:00, monty@mysql.com +1 -1
    Avoid compiler warnings

  storage/maria/maria_read_log.c@1.5.1.1, 2007-07-04 00:50:15+03:00, monty@mysql.com +250 -22
    Added hocks for:
    - REDO_INSERT_ROW_HEAD
    - REDO_INSERT_ROW_TAIL
    - REDO_PURGE_ROW_HEAD
    - REDO_PURGE_ROW_TAIL
    
    Added dummy hooks for:
    - UNDO_ROW_INSERT
    - UNDO_ROW_DELETE
    
    Changed to use maria_pagecache instead of own pagecache (fixed problem with unitialized share->pagecache)
    Use maria_panic() at end to ensure that all files are closed properly.
    Fixed option handling for --debug

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.2409.121.12, 2007-07-03 16:36:13+02:00, guilhem@gbichot4.local +2 -0
  Verify that INSERT DELAYED is disabled only for transactional
  Maria tables

  mysql-test/r/maria.result@1.12, 2007-07-03 16:36:11+02:00, guilhem@gbichot4.local +24 -0
    result update (we see DELAYED is refused only for transactional
    Maria tables)

  mysql-test/t/maria.test@1.12, 2007-07-03 16:36:11+02:00, guilhem@gbichot4.local +18 -0
    verify that INSERT DELAYED is disabled only for transactional
    Maria tables

ChangeSet@1.2409.121.11, 2007-07-03 16:00:05+02:00, guilhem@gbichot3.local +1 -0
  Marking the block dirty requires linking it into the changed_blocks[]
  list (for flush_pagecache*() functions and Checkpoint to see it)

  storage/maria/ma_pagecache.c@1.31, 2007-07-03 16:00:02+02:00, guilhem@gbichot3.local +18 -22
    Marking the block dirty requires linking it into the changed_blocks[]
    list (for flush_pagecache*() functions and Checkpoint to see it)

ChangeSet@1.2409.123.1, 2007-07-03 15:20:41+02:00, guilhem@gbichot3.local +17 -0
  Maria:
  * Don't modify share->base.born_transactional; now it is a value carved
  in stone at creation time. share->now_transactional is what can be
  modified: it starts at born_transactional, can become false during
  ALTER TABLE (when we want no logging), and restored later.
  * Not resetting create_rename_lsn to 0 during delete_all or repair.
  * when we temporarily disable transactionality, we also change
  the page type to PAGECACHE_PLAIN_PAGE: it bypasses some work in the
  page cache (optimization), and avoids assertions related to LSNs.
  * Disable INSERT DELAYED for transactional tables, because
  durability could not be guaranteed (insertion may even not happen)

  mysys/mf_keycache.c@1.66.1.1, 2007-07-03 15:20:36+02:00, guilhem@gbichot3.local +8 -1
    comment

  storage/maria/ha_maria.cc@1.27, 2007-07-03 15:20:36+02:00, guilhem@gbichot3.local +45 -28
    * a transactional table cannot do INSERT DELAYED
    * ha_maria::save_transactional not needed anymore, as now instead
    we don't modify MARIA_SHARE::MARIA_BASE_INFO::born_transactional
    (born_transactional plays the role of save_transactional), and modify
    MARIA_SHARE::now_transactional.
    * REPAIR_TABLE log record is now logged by maria_repair()
    * comment why we rely on born_transactional to know if we should
    skipping a transaction.
    * putting together two if()s which test for F_UNLCK

  storage/maria/ha_maria.h@1.11.1.1, 2007-07-03 15:20:36+02:00, guilhem@gbichot3.local +0 -5
    ha_maria::save_transactional not needed anymore (moved to the C layer)

  storage/maria/ma_blockrec.c@1.24, 2007-07-03 15:20:36+02:00, guilhem@gbichot3.local +9 -17
    * For the block record's code (writing/updating/deleting records),
    all that counts is now_transactional, not born_transactional.
    * As we now set the page type to PAGECACHE_PLAIN_PAGE for tables
    which have now_transactional==FALSE, pagecache will not expect
    a meaningful LSN for them in pagecache_unlock_by_link(), so
    we can pass it LSN_IMPOSSIBLE.

  storage/maria/ma_check.c@1.23, 2007-07-03 15:20:36+02:00, guilhem@gbichot3.local +18 -10
    * writing LOGREC_REPAIR_TABLE moves from ha_maria::repair()
    to maria_repair(), sounds cleaner (less functions to export).
    * when opening a table during REPAIR, don't use the realpath-ed name,
    as this may fail if the table has symlinked files (maria_open()
    would try to find the data and index file in the directory
    of unique_file_name, it would fail if data and index files are in
    different dirs); use the unresolved name, open_file_name, which is
    the argument which was passed to the maria_open() which created 'info'.

  storage/maria/ma_close.c@1.14, 2007-07-03 15:20:36+02:00, guilhem@gbichot3.local +2 -1
    assert that when a statement is done with a table, it cleans up

  storage/maria/ma_create.c@1.19, 2007-07-03 15:20:36+02:00, guilhem@gbichot3.local +1 -1
    new name

  storage/maria/ma_delete_all.c@1.16, 2007-07-03 15:20:36+02:00, guilhem@gbichot3.local +1 -2
    * using now_transactional
    * no reason to reset create_rename_lsn during delete_all (a bug);
    also no reason to do it during repair: it was put there because
    a positive create_rename_lsn caused a call to check_and_set_lsn()
    which asserted in DBUG_ASSERT(block->type == PAGECACHE_LSN_PAGE);
    first solution was to use LSN_IMPOSSIBLE in _ma_unpin_all_pages() if
    not transactional; but then in the case of ALTER TABLE, with
    transactionality temporarily disabled, it asserted in
    DBUG_ASSERT(LSN_VALID(lsn)) in pagecache_fwrite() (PAGECACHE_LSN_PAGE
    page with zero LSN - bad). The additional solution is to use
    PAGECACHE_PLAIN_PAGE when we disable transactionality temporarily: this
    avoids checks on the LSN, and also bypasses (optimization) the "flush
    log up to LSN" call when the pagecache flushes our page (in other
    words, no WAL needed).

  storage/maria/ma_delete_table.c@1.8, 2007-07-03 15:20:36+02:00, guilhem@gbichot3.local +1 -1
    use now_transactional

  storage/maria/ma_locking.c@1.10, 2007-07-03 15:20:36+02:00, guilhem@gbichot3.local +1 -0
    assert that when a statement is done with a table, it cleans up.

  storage/maria/ma_loghandler.c@1.24, 2007-07-03 15:20:36+02:00, guilhem@gbichot3.local +12 -1
    * now_transactional should be used to test if we want a log record.
    * Assertions to make sure dummy_transaction_object is not spoilt
    by its many users.

  storage/maria/ma_open.c@1.19, 2007-07-03 15:20:36+02:00, guilhem@gbichot3.local +16 -7
    base.transactional -> base.born_transactional

  storage/maria/ma_pagecache.c@1.28.1.1, 2007-07-03 15:20:36+02:00, guilhem@gbichot3.local +10 -1
    missing name for page's type. Comment for future.

  storage/maria/ma_rename.c@1.8, 2007-07-03 15:20:36+02:00, guilhem@gbichot3.local +7 -1
    use now_transactional

  storage/maria/maria_chk.c@1.15, 2007-07-03 15:20:36+02:00, guilhem@gbichot3.local +1 -1
    use born_transactional

  storage/maria/maria_def.h@1.25, 2007-07-03 15:20:36+02:00, guilhem@gbichot3.local +17 -3
    MARIA_BASE_INFO::transactional renamed to born_transactional.
    MARIA_SHARE::now_transactional introduced.
    _ma_repair_write_log_record() is made local to ma_check.c.
    Macros to temporarily disable, and re-enable, transactionality for a
    table.

  storage/maria/maria_read_log.c@1.6, 2007-07-03 15:20:36+02:00, guilhem@gbichot3.local +18 -11
    assertions and using the new macros. Adding a forgotten resetting
    when we finally close all tables.

ChangeSet@1.2409.121.9, 2007-07-03 01:19:26+03:00, bell@desktop.sanja.is.com.ua +1 -0
  Mark the page dirty if we store LSN on it.
  New type of page in the page cache fixes.

  storage/maria/ma_pagecache.c@1.29, 2007-07-03 01:19:14+03:00, bell@desktop.sanja.is.com.ua +9 -1
    Mark the page dirty if we store LSN on it.
    Symbolic representation of new page type added (for debugging output).
    Asserts added (unknown type can't be used if we write the page).

ChangeSet@1.2476.169.2, 2007-07-02 20:45:15+03:00, jani@hynda.mysql.fi +99 -0
  Merged with mysql-5.1 main tree.

  BUILD/compile-pentium-debug-max@1.23, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +1 -1
    Added definition after macro was removed from main tree. This will
    be fixed back in main tree later.

  include/lf.h@1.14, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +1 -1
    Merged with mysql-5.1 main tree.

  include/maria.h@1.11.1.1, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +37 -37
    Merged with mysql-5.1 main tree.

  include/my_sys.h@1.217, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +4 -4
    Merged with mysql-5.1 main tree.

  include/myisam.h@1.86, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +1 -1
    Merged with mysql-5.1 main tree.

  include/myisamchk.h@1.4, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +5 -5
    Merged with mysql-5.1 main tree.

  mysys/lf_hash.c@1.17, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +14 -14
    Merged with mysql-5.1 main tree.

  mysys/my_compress.c@1.16.1.2, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +2 -1
    Merged with mysql-5.1 main tree.

  mysys/my_rename.c@1.13, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +3 -2
    Merged with mysql-5.1 main tree.

  mysys/my_safehash.c@1.3, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +15 -15
    Merged with mysql-5.1 main tree.

  mysys/my_safehash.h@1.2, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +9 -9
    Merged with mysql-5.1 main tree.

  mysys/my_sync.c@1.9, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +2 -1
    Merged with mysql-5.1 main tree.

  sql/filesort.cc@1.130, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +3 -3
    Merged with mysql-5.1 main tree.

  sql/item_xmlfunc.cc@1.31, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +1 -1
    Merged with mysql-5.1 main tree.

  sql/mysqld.cc@1.596, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +10 -12
    Merged with mysql-5.1 main tree.

  sql/set_var.cc@1.242, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +7 -7
    Merged with mysql-5.1 main tree.

  sql/set_var.h@1.92, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +1 -1
    Merged with mysql-5.1 main tree.

  sql/uniques.cc@1.31, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +1 -1
    Merged with mysql-5.1 main tree.

  storage/maria/ft_maria.c@1.7, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +2 -2
    Merged with mysql-5.1 main tree.

  storage/maria/ha_maria.cc@1.24.1.1, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +44 -54
    Merged with mysql-5.1 main tree.

  storage/maria/ha_maria.h@1.12, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +17 -17
    Merged with mysql-5.1 main tree.

  storage/maria/ma_bitmap.c@1.11.1.1, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +6 -6
    Merged with mysql-5.1 main tree.

  storage/maria/ma_blockrec.c@1.21.1.1, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +117 -117
    Merged with mysql-5.1 main tree.

  storage/maria/ma_blockrec.h@1.8, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +13 -13
    Merged with mysql-5.1 main tree.

  storage/maria/ma_cache.c@1.3, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +2 -2
    Merged with mysql-5.1 main tree.

  storage/maria/ma_check.c@1.19.1.1, 2007-07-02 20:45:00+03:00, jani@hynda.mysql.fi +111 -111
    Merged with mysql-5.1 main tree.

  storage/maria/ma_checkpoint.c@1.13, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +1 -1
    Merged with mysql-5.1 main tree.

  storage/maria/ma_checksum.c@1.6, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +3 -3
    Merged with mysql-5.1 main tree.

  storage/maria/ma_close.c@1.11.1.1, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +3 -3
    Merged with mysql-5.1 main tree.

  storage/maria/ma_create.c@1.14.1.1, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +9 -9
    Merged with mysql-5.1 main tree.

  storage/maria/ma_dbug.c@1.5, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +3 -3
    Merged with mysql-5.1 main tree.

  storage/maria/ma_delete.c@1.12, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +52 -52
    Merged with mysql-5.1 main tree.

  storage/maria/ma_dynrec.c@1.12.1.1, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +92 -91
    Merged with mysql-5.1 main tree.

  storage/maria/ma_extra.c@1.12, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +4 -4
    Merged with mysql-5.1 main tree.

  storage/maria/ma_ft_boolean_search.c@1.7, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +18 -17
    Merged with mysql-5.1 main tree.

  storage/maria/ma_ft_nlq_search.c@1.5, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +6 -6
    Merged with mysql-5.1 main tree.

  storage/maria/ma_ft_parser.c@1.6, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +14 -12
    Merged with mysql-5.1 main tree.

  storage/maria/ma_ft_update.c@1.6, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +17 -17
    Merged with mysql-5.1 main tree.

  storage/maria/ma_ftdefs.h@1.4, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +14 -14
    Merged with mysql-5.1 main tree.

  storage/maria/ma_fulltext.h@1.4, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +4 -4
    Merged with mysql-5.1 main tree.

  storage/maria/ma_key.c@1.8, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +21 -21
    Merged with mysql-5.1 main tree.

  storage/maria/ma_loghandler.c@1.18.1.1, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +78 -78
    Merged with mysql-5.1 main tree.

  storage/maria/ma_loghandler.h@1.8.1.1, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +4 -4
    Merged with mysql-5.1 main tree.

  storage/maria/ma_loghandler_lsn.h@1.5.1.1, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +1 -1
    Merged with mysql-5.1 main tree.

  storage/maria/ma_open.c@1.16.1.1, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +17 -17
    Merged with mysql-5.1 main tree.

  storage/maria/ma_packrec.c@1.11, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +115 -115
    Merged with mysql-5.1 main tree.

  storage/maria/ma_page.c@1.11, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +7 -7
    Merged with mysql-5.1 main tree.

  storage/maria/ma_pagecache.c@1.26.1.1, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +27 -27
    Merged with mysql-5.1 main tree.

  storage/maria/ma_pagecache.h@1.17.1.1, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +11 -11
    Merged with mysql-5.1 main tree.

  storage/maria/ma_pagecaches.c@1.4, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +5 -5
    Merged with mysql-5.1 main tree.

  storage/maria/ma_preload.c@1.5, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +3 -3
    Merged with mysql-5.1 main tree.

  storage/maria/ma_range.c@1.8, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +11 -11
    Merged with mysql-5.1 main tree.

  storage/maria/ma_rfirst.c@1.4, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +1 -1
    Merged with mysql-5.1 main tree.

  storage/maria/ma_rkey.c@1.8, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +2 -2
    Merged with mysql-5.1 main tree.

  storage/maria/ma_rlast.c@1.4, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +1 -1
    Merged with mysql-5.1 main tree.

  storage/maria/ma_rnext.c@1.4, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +1 -1
    Merged with mysql-5.1 main tree.

  storage/maria/ma_rnext_same.c@1.4, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +1 -1
    Merged with mysql-5.1 main tree.

  storage/maria/ma_rprev.c@1.4, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +1 -1
    Merged with mysql-5.1 main tree.

  storage/maria/ma_rrnd.c@1.5, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +1 -1
    Merged with mysql-5.1 main tree.

  storage/maria/ma_rsame.c@1.4, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +1 -1
    Merged with mysql-5.1 main tree.

  storage/maria/ma_rsamepos.c@1.6, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +1 -1
    Merged with mysql-5.1 main tree.

  storage/maria/ma_rt_index.c@1.8, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +47 -47
    Merged with mysql-5.1 main tree.

  storage/maria/ma_rt_index.h@1.5, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +8 -6
    Merged with mysql-5.1 main tree.

  storage/maria/ma_rt_key.c@1.5, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +5 -5
    Merged with mysql-5.1 main tree.

  storage/maria/ma_rt_key.h@1.4, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +4 -4
    Merged with mysql-5.1 main tree.

  storage/maria/ma_rt_mbr.c@1.5, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +12 -12
    Merged with mysql-5.1 main tree.

  storage/maria/ma_rt_mbr.h@1.4, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +9 -9
    Merged with mysql-5.1 main tree.

  storage/maria/ma_rt_split.c@1.6, 2007-07-02 20:45:01+03:00, jani@hynda.mysql.fi +8 -8
    Merged with mysql-5.1 main tree.

  storage/maria/ma_scan.c@1.4, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +1 -1
    Merged with mysql-5.1 main tree.

  storage/maria/ma_search.c@1.9, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +81 -81
    Merged with mysql-5.1 main tree.

  storage/maria/ma_sort.c@1.9, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +66 -66
    Merged with mysql-5.1 main tree.

  storage/maria/ma_sp_defs.h@1.5, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +2 -2
    Merged with mysql-5.1 main tree.

  storage/maria/ma_sp_key.c@1.5, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +8 -8
    Merged with mysql-5.1 main tree.

  storage/maria/ma_static.c@1.8, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +1 -1
    Merged with mysql-5.1 main tree.

  storage/maria/ma_statrec.c@1.7, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +17 -17
    Merged with mysql-5.1 main tree.

  storage/maria/ma_test1.c@1.10.1.1, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +26 -24
    Merged with mysql-5.1 main tree.

  storage/maria/ma_test2.c@1.12.1.1, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +4 -4
    Merged with mysql-5.1 main tree.

  storage/maria/ma_test3.c@1.8, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +2 -2
    Merged with mysql-5.1 main tree.

  storage/maria/ma_unique.c@1.6, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +9 -9
    Merged with mysql-5.1 main tree.

  storage/maria/ma_update.c@1.10.1.1, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +2 -2
    Merged with mysql-5.1 main tree.

  storage/maria/ma_write.c@1.15, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +79 -79
    Merged with mysql-5.1 main tree.

  storage/maria/maria_chk.c@1.12.2.1, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +49 -49
    Merged with mysql-5.1 main tree.

  storage/maria/maria_def.h@1.22.1.1, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +135 -135
    Merged with mysql-5.1 main tree.

  storage/maria/maria_ftdump.c@1.8, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +1 -1
    Merged with mysql-5.1 main tree.

  storage/maria/maria_pack.c@1.13, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +81 -81
    Merged with mysql-5.1 main tree.

  storage/maria/tablockman.c@1.8, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +4 -4
    Merged with mysql-5.1 main tree.

  storage/maria/trnman.c@1.23.1.1, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +2 -2
    Merged with mysql-5.1 main tree.

  storage/maria/trnman.h@1.15, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +1 -1
    Merged with mysql-5.1 main tree.

  storage/maria/unittest/ma_pagecache_consist.c@1.14, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +3 -3
    Merged with mysql-5.1 main tree.

  storage/maria/unittest/ma_pagecache_single.c@1.12, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +1 -1
    Merged with mysql-5.1 main tree.

  storage/maria/unittest/ma_test_loghandler-t.c@1.10.1.1, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +6 -6
    Merged with mysql-5.1 main tree.

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.10.1.1, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +7 -7
    Merged with mysql-5.1 main tree.

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.10.1.1, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +6 -6
    Merged with mysql-5.1 main tree.

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.10.1.1, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +1 -1
    Merged with mysql-5.1 main tree.

  storage/myisam/ft_myisam.c@1.2, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +2 -2
    Merged with mysql-5.1 main tree.

  storage/myisam/ha_myisam.cc@1.188, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +5 -4
    Merged with mysql-5.1 main tree.

  storage/myisam/myisamdef.h@1.95, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +4 -3
    Merged with mysql-5.1 main tree.

  storage/myisam/sort.c@1.60, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +4 -4
    Merged with mysql-5.1 main tree.

  storage/myisammrg/ha_myisammrg.cc@1.125, 2007-07-02 20:45:02+03:00, jani@hynda.mysql.fi +10 -10
    Merged with mysql-5.1 main tree.

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.2409.121.8, 2007-07-01 20:45:01+03:00, monty@mysql.com +4 -0
  After merge fixes

  BitKeeper/etc/ignore@1.253.1.1, 2007-07-01 20:44:04+03:00, monty@mysql.com +1 -0
    added storage/maria/maria_read_log

  storage/maria/ma_delete_all.c@1.15, 2007-07-01 20:44:56+03:00, monty@mysql.com +1 -0
    After merge fixes

  storage/maria/maria_read_log.c@1.5, 2007-07-01 20:44:56+03:00, monty@mysql.com +1 -1
    After merge fixes

  support-files/compiler_warnings.supp@1.9.1.1, 2007-07-01 20:44:56+03:00, monty@mysql.com +5 -0
    Ignore function used when debugging (can be called from gdb)

ChangeSet@1.2409.122.1, 2007-07-01 16:20:57+03:00, monty@mysql.com +50 -0
  Fixed REPAIR/CHECK/ANALYZE TABLE for tables with new BLOCK-ROW format.
  Fixed maria_chk to repair BLOCK-ROW tables.
  Added CREATE options ROW_FORMAT=PAGE & TRANSACTIONAL= 0|1
  More DBUG information in a lot of functions
  Some minor code cleanups
  Enable handler errors earlier for better clear text error messages at handler startup / standalone usage.
  Don't print NULL strings in my_create_with_symlink();  Fixes core dump when used with --debug

  include/maria.h@1.10.1.1, 2007-07-01 16:20:45+03:00, monty@mysql.com +3 -2
    Added extra variables needed for REPAIR with BLOCK records

  include/my_base.h@1.93.1.1, 2007-07-01 16:20:45+03:00, monty@mysql.com +1 -0
    Added argument for opening copy of maria table without a shared object

  include/my_handler.h@1.17, 2007-07-01 16:20:45+03:00, monty@mysql.com +2 -1
    Prototypes for my_handler_error_register() & my_handler_error_unregister()

  mysql-test/include/ps_conv.inc@1.5.1.1, 2007-07-01 16:20:45+03:00, monty@mysql.com +1 -1
    Enforce creation of table as MyISAM (to allow one to use --default-storage-engine)

  mysql-test/r/maria-connect.result@1.1, 2007-07-01 16:20:47+03:00, monty@mysql.com +23 -0
    New BitKeeper file ``mysql-test/r/maria-connect.result''

  mysql-test/r/maria-connect.result@1.0, 2007-07-01 16:20:47+03:00, monty@mysql.com +0 -0

  mysql-test/r/maria.result@1.11, 2007-07-01 16:20:45+03:00, monty@mysql.com +47 -26
    Moved some things to maria-connect.test
    Updared results as REPAIR now works
    Added tests for creation option TRANSACTIONAL

  mysql-test/r/ps_2myisam.result@1.51.1.1, 2007-07-01 16:20:45+03:00, monty@mysql.com +1 -1
    Enforce creation of table as MyISAM (to allow one to use --default-storage-engine)

  mysql-test/r/ps_3innodb.result@1.54.1.1, 2007-07-01 16:20:45+03:00, monty@mysql.com +1 -1
    Enforce creation of table as MyISAM (to allow one to use --default-storage-engine)

  mysql-test/r/ps_4heap.result@1.50.1.1, 2007-07-01 16:20:46+03:00, monty@mysql.com +1 -1
    Enforce creation of table as MyISAM (to allow one to use --default-storage-engine)

  mysql-test/r/ps_5merge.result@1.51.1.1, 2007-07-01 16:20:46+03:00, monty@mysql.com +2 -2
    Enforce creation of table as MyISAM (to allow one to use --default-storage-engine)

  mysql-test/r/ps_maria.result@1.5, 2007-07-01 16:20:46+03:00, monty@mysql.com +1 -1
    Enforce creation of table as MyISAM (to allow one to use --default-storage-engine)

  mysql-test/r/ps_7ndb.result@1.50.1.1, 2007-07-01 16:20:46+03:00, monty@mysql.com +1 -1
    Enforce creation of table as MyISAM (to allow one to use --default-storage-engine)

  mysql-test/t/maria-connect.test@1.1, 2007-07-01 16:20:47+03:00, monty@mysql.com +39 -0
    New BitKeeper file ``mysql-test/t/maria-connect.test''

  mysql-test/t/maria-connect.test@1.0, 2007-07-01 16:20:47+03:00, monty@mysql.com +0 -0

  mysql-test/t/maria.test@1.11, 2007-07-01 16:20:46+03:00, monty@mysql.com +22 -20
    Moved some things to maria-connect.test
    Updared results as REPAIR now works
    Added tests for creation option TRANSACTIONAL

  mysys/mf_iocache.c@1.67.1.1, 2007-07-01 16:20:46+03:00, monty@mysql.com +1 -0
    More debugging

  mysys/mf_tempfile.c@1.27.1.1, 2007-07-01 16:20:46+03:00, monty@mysql.com +1 -0
    Added missing close()

  mysys/my_error.c@1.24.1.1, 2007-07-01 16:20:46+03:00, monty@mysql.com +0 -5
    init_glob_errs() is now done in my_init()

  mysys/my_handler.c@1.29.1.1, 2007-07-01 16:20:46+03:00, monty@mysql.com +66 -0
    Added functions to initialize handler error messages

  mysys/my_init.c@1.55.1.1, 2007-07-01 16:20:46+03:00, monty@mysql.com +1 -0
    Moevd init_glob_errs() here.

  mysys/my_open.c@1.32.1.1, 2007-07-01 16:20:46+03:00, monty@mysql.com +39 -34
    More comments
    More debugging
    Code cleanup (join multiple code paths) and indentation fixes. No change in logic.
    

  mysys/my_symlink2.c@1.10.1.1, 2007-07-01 16:20:46+03:00, monty@mysql.com +3 -1
    Don't print NULL strings

  sql-bench/example@1.3, 2007-07-01 16:20:47+03:00, monty@mysql.com +4 -5
    Better example

  sql/handler.cc@1.295.7.4, 2007-07-01 16:20:46+03:00, monty@mysql.com +3 -5
    Added printing of PAGE row type
    Moved out initializing of handler errors to allow handler to give better error messages at startup

  sql/handler.h@1.249.1.1, 2007-07-01 16:20:46+03:00, monty@mysql.com +6 -1
    ROW_TYPE_PAGES -> ROW_TYPE_PAGE

  sql/lex.h@1.170.2.1, 2007-07-01 16:20:46+03:00, monty@mysql.com +2 -0
    Added 'PAGE' and 'TRANSACTIONAL'

  sql/mysqld.cc@1.594.1.1, 2007-07-01 16:20:46+03:00, monty@mysql.com +4 -0
    Initialize handler error messages early to get better error messages from handler startup

  sql/sql_show.cc@1.393.2.1, 2007-07-01 16:20:46+03:00, monty@mysql.com +7 -2
    ROW_TYPE_PAGES -> ROW_TYPE_PAGE

  sql/sql_table.cc@1.393.4.2, 2007-07-01 16:20:46+03:00, monty@mysql.com +2 -1
    Removed not needed initializer

  sql/sql_yacc.yy@1.534.8.1, 2007-07-01 16:20:46+03:00, monty@mysql.com +11 -0
    Added CREATE options ROW_FORMAT=PAGE and TRANSACTIONAL=[0|1]

  sql/table.cc@1.275.5.1, 2007-07-01 16:20:46+03:00, monty@mysql.com +6 -2
    Store transactional flag in .frm
    More comments

  sql/table.h@1.158.6.1, 2007-07-01 16:20:47+03:00, monty@mysql.com +1 -0
    Added transactional table option

  storage/maria/ha_maria.cc@1.22.1.1, 2007-07-01 16:20:47+03:00, monty@mysql.com +16 -15
    More debug information
    Enable REPAIR
    Detect usage of TRANSACTIONAL table option

  storage/maria/ma_bitmap.c@1.12, 2007-07-01 16:20:47+03:00, monty@mysql.com +13 -0
    More comments (from Guilhem)

  storage/maria/ma_blockrec.c@1.18.1.1, 2007-07-01 16:20:47+03:00, monty@mysql.com +37 -17
    SANITY_CHECK -> SANITY_CHECKS (fixed typo)
    Write out pages on delete even if there is no rows. (Fixed problem with REPAIR)
    Removed some ASSERTS to runtime checks (for better REPAIR)
    Fixed bug when scanning rows
    More DBUG information
    

  storage/maria/ma_check.c@1.18.1.1, 2007-07-01 16:20:47+03:00, monty@mysql.com +444 -126
    Partial rewrite to allow REPAIR of BLOCK/PAGE format.
    Repair of BLOCK format rows is for now only done with 'maria_repair()' (= repair through key cache)
    The new logic to repair rows with BLOCK format is:
    
    - Create new, unrelated MARIA_HA of the table
    - Create new datafile and associate it with new handler
    - Reset all statistic information in new handler
    - Copy all data to new handler with normal write operations
    - Move state of new handler to old handler
    - Close new handler
    - Close data file in old handler
    - Rename old data file to new data file.
    - Reopen data file in old handler

  storage/maria/ma_close.c@1.10.1.1, 2007-07-01 16:20:47+03:00, monty@mysql.com +1 -3
    REmoved not needed block

  storage/maria/ma_create.c@1.13.1.1, 2007-07-01 16:20:47+03:00, monty@mysql.com +2 -2
    Swap arguments to _ma_initialize_data_file()
    

  storage/maria/ma_delete_all.c@1.10.1.1, 2007-07-01 16:20:47+03:00, monty@mysql.com +38 -16
    Split maria_delete_all_rows() to two functions to allow REPAIR to easily reset all status information.
    

  storage/maria/ma_dynrec.c@1.13, 2007-07-01 16:20:47+03:00, monty@mysql.com +3 -2
    Added checksum argument to _ma_rec_check (multi-thread fix)

  storage/maria/ma_info.c@1.7, 2007-07-01 16:20:47+03:00, monty@mysql.com +1 -0
    Indentation fix

  storage/maria/ma_init.c@1.9.1.1, 2007-07-01 16:20:47+03:00, monty@mysql.com +1 -0
    Register error message to get better error message on init and when using as standalone module.

  storage/maria/ma_loghandler.c@1.14.2.1, 2007-07-01 16:20:47+03:00, monty@mysql.com +2 -2
    Fixed typo that disabled some error detection by valgrind

  storage/maria/ma_open.c@1.15.1.1, 2007-07-01 16:20:47+03:00, monty@mysql.com +7 -1
    Added 'calc_check_checksum()'
    Don't log things during repair
    Added option HA_OPEN_COPY to allow one to open a Maria table with an independent share (required by REPAIR)

  storage/maria/ma_pagecache.c@1.24.1.1, 2007-07-01 16:20:47+03:00, monty@mysql.com +10 -4
    Fixed some compiler warnings
    Added support for PAGECACHE_READ_UNKNOWN_PAGE (used for scanning file without knowing page types)

  include/pagecache.h@1.13.1.1, 2007-07-01 16:20:45+03:00, monty@mysql.com +3 -1
    Added PAGECACHE_READ_UNKNOWN_PAGE

  storage/maria/ma_test_all.sh@1.6.1.1, 2007-07-01 16:20:47+03:00, monty@mysql.com +21 -0
    More test of REPAIR

  storage/maria/ma_update.c@1.11, 2007-07-01 16:20:47+03:00, monty@mysql.com +1 -2
    Optimized checksum code

  storage/maria/maria_chk.c@1.12.1.1, 2007-07-01 16:20:47+03:00, monty@mysql.com +25 -19
    Use DBUG_SET_INITIAL() to get DBUG to work with --parallel-repair
    Ensure we always use maria_repair() for BLOCK format (for now)
    More DBUG information

  storage/maria/maria_def.h@1.21.1.1, 2007-07-01 16:20:47+03:00, monty@mysql.com +7 -4
    For now, always run with more checkings (SANITY_CHECKS)
    Added share->calc_check_checksum to be used with REPAIR / CHECK table.
    Swaped arguments to _ma_initialize_data_file()

  storage/myisam/ft_stopwords.c@1.26.1.1, 2007-07-01 16:20:47+03:00, monty@mysql.com +11 -6
    Added DBUG information

ChangeSet@1.2409.121.6, 2007-06-28 14:01:57+02:00, guilhem@gbichot3.local +6 -0
  WL#3239 "log CREATE TABLE in Maria": write the log record _before_
  creating the data file, and sync this log, so that the table cannot be
  used if log record didn't reach disk. The same way, we force the log
  in DROP/RENAME TABLE. Also in REPAIR TABLE though logging in this
  case is not polished.
  Making DELETE FROM t <no WHERE> atomic: we log the record before
  starting the operation, and will finish this op at Recovery if needed.

  storage/maria/ma_check.c@1.21, 2007-06-28 14:01:54+02:00, guilhem@gbichot3.local +19 -2
    comment. Force the log record for the log to have a complete history.

  storage/maria/ma_create.c@1.17, 2007-06-28 14:01:54+02:00, guilhem@gbichot3.local +58 -54
    better conformance to the text of WL#3239 "log CREATE TABLE in Maria":
    write the log record before creating the data file. This ensures
    that the log can be applied to an old backup in all circumstances.
    errpos=2 was wrong.

  storage/maria/ma_delete_all.c@1.13, 2007-06-28 14:01:54+02:00, guilhem@gbichot3.local +31 -34
    making DELETE FROM t <no WHERE> atomic: we log the record before
    starting the operation, and will finish the operation at Recovery
    if needed. Thus there is no need to force files to disk.

  storage/maria/ma_delete_table.c@1.7, 2007-06-28 14:01:54+02:00, guilhem@gbichot3.local +5 -4
    forcing the log before dropping a table, so that the log has the
    entire history.

  storage/maria/ma_loghandler.c@1.22, 2007-06-28 14:01:54+02:00, guilhem@gbichot3.local +1 -1
    LOGREC_REDO_DELETE_ALL needs to set trn's rec_lsn so that the log's
    low-water mark and Checkpoint retain this record until the 
    delete operation has finished.

  storage/maria/ma_rename.c@1.7, 2007-06-28 14:01:54+02:00, guilhem@gbichot3.local +4 -3
    force the log before renaming a table, so that the log has a complete
    history.

ChangeSet@1.2409.121.5, 2007-06-27 12:58:08+02:00, guilhem@gbichot4.local +7 -0
  WL#3072 - Maria recovery
  For this scenario: server crashes (could be because a table is
  corrupted) and Recovery repeatedly crashes on this table. User repairs
  it with maria_chk (as REPAIR TABLE is not possible), restarts the
  server, Recovery runs: for Recovery to not apply old REDOs to this
  repaired table (which would fail: rows have moved), maria_chk sets
  create_rename_lsn to the max value. Later when the server opens
  the table via ha_maria, it sets the LSN to the correct current value.

  storage/maria/ma_check.c@1.20, 2007-06-27 12:58:07+02:00, guilhem@gbichot4.local +2 -5
    using helper function

  storage/maria/ma_create.c@1.16, 2007-06-27 12:58:07+02:00, guilhem@gbichot4.local +31 -3
    A new helper function which stores the create_rename_lsn 
    into the table's header on disk when we cannot wait for this to happen
    naturally at a later _ma_state_info_write().

  storage/maria/ma_delete_all.c@1.12, 2007-06-27 12:58:07+02:00, guilhem@gbichot4.local +3 -5
    using helper function; so log_data now can be FILEID_STORE_SIZE.

  storage/maria/ma_open.c@1.17, 2007-06-27 12:58:07+02:00, guilhem@gbichot4.local +12 -0
    When opening a transactional table in the server, we discover
    if it has been repaired with maria_chk and if yes, give it a correct
    create_rename_lsn.

  storage/maria/ma_rename.c@1.6, 2007-06-27 12:58:07+02:00, guilhem@gbichot4.local +3 -6
    using helper function

  storage/maria/maria_chk.c@1.13, 2007-06-27 12:58:07+02:00, guilhem@gbichot4.local +7 -0
    By setting create_rename_lsn to the maximum possible LSN, maria_chk
    ensures that old REDOs are not applied to the new table it is
    going to produce.

  storage/maria/maria_def.h@1.23, 2007-06-27 12:58:07+02:00, guilhem@gbichot4.local +3 -2
    new helper function

ChangeSet@1.2409.121.4, 2007-06-26 22:53:35+02:00, guilhem@gbichot3.local +1 -0
  WL#3072 - Maria recovery
  comments; remember the UNDO's LSN for storing it in pages when
  executing REDO's (to imitate what the runtime code does)

  storage/maria/maria_read_log.c@1.4, 2007-06-26 22:53:32+02:00, guilhem@gbichot3.local +13 -6
    comments; remember the UNDO's LSN for storing it in pages when
    executing REDO's (to imitate what the runtime code does)

ChangeSet@1.2409.121.3, 2007-06-26 22:30:09+02:00, guilhem@gbichot3.local +5 -0
  WL#3072 - Maria recovery
  fixes for build failures; copyrights; small bugfixes and comments

  mysys/Makefile.am@1.91.1.1, 2007-06-26 22:30:07+02:00, guilhem@gbichot3.local +1 -1
    missing .h breaks building from tarball

  storage/maria/ma_loghandler.c@1.21, 2007-06-26 22:30:07+02:00, guilhem@gbichot3.local +18 -17
    applying Serg's bugfix of trnman_new_trid() to translog_assign_id_to_share()

  storage/maria/ma_loghandler.h@1.10, 2007-06-26 22:30:07+02:00, guilhem@gbichot3.local +17 -1
    copyright

  storage/maria/ma_loghandler_lsn.h@1.7, 2007-06-26 22:30:07+02:00, guilhem@gbichot3.local +15 -0
    copyright

  storage/maria/maria_read_log.c@1.3, 2007-06-26 22:30:07+02:00, guilhem@gbichot3.local +55 -11
    fix for compiler warnings. Comments.
    Close tables when program ends.

ChangeSet@1.2409.121.2, 2007-06-26 18:29:17+02:00, guilhem@gbichot3.local +1 -0
  WL#3072 - Maria recovery: safety assertions.

  storage/maria/maria_read_log.c@1.2, 2007-06-26 18:29:14+02:00, guilhem@gbichot3.local +3 -2
    assertions to protect against future bugs (especially, to ensure
    that replaying DROP TABLE, if implemented, wouldn't leave open tables
    behind it)

ChangeSet@1.2409.121.1, 2007-06-26 16:49:23+02:00, guilhem@gbichot3.local +23 -0
  WL#3072 Maria Recovery
  - new program maria_read_log to display and apply log records
  found in a Maria log (see file's revision comment)
  - minor, misc fixes

  storage/maria/Makefile.am@1.16, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +7 -1
    new program maria_read_log

  storage/maria/ha_maria.cc@1.25, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +1 -1
    create control file if missing

  storage/maria/ma_blockrec.c@1.22, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +21 -9
    0 -> LSN_IMPOSSIBLE; comments

  storage/maria/ma_checkpoint.h@1.6, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +57 -10
    preparations for Checkpoint module

  storage/maria/ma_close.c@1.12, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +1 -0
    comment

  storage/maria/ma_control_file.c@1.16, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +18 -22
    renaming constants.
    Possibility to say "open control file but don't create it if it's
    missing" (used by maria_read_log which does not want to create
    anything)

  storage/maria/ma_control_file.h@1.16, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +7 -16
    renaming constants

  storage/maria/ma_create.c@1.15, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +27 -21
    I had duplicated "linkname" and "linkname_ptr", now I see it's not
    needed, reverting. Indeed those variables don't contain interesting
    information; fixing log record accordingly (the links are in
    ci->data/index_file_name). Storing keystart in log record is needed,
    to know at which size we must extend the file if we replay
    LOGREC_CREATE_TABLE.

  storage/maria/ma_loghandler.c@1.20, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +109 -122
    some structures need to be known to maria_read_log.c, taking
    them to ma_loghandler.h

  storage/maria/ma_loghandler.h@1.9, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +99 -0
    we have page_store, adding page_korr.
    translog_lock() made public, because Checkpoint will need it (to
    write to control file).
    Some structures moved from ma_loghandler.c because maria_read_log.c
    needs them (needs to know the execute-in-REDO-phase hooks of each
    record).

  storage/maria/ma_loghandler_lsn.h@1.6, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +8 -3
    constants defined in ma_control_file.h serve everywhere,
    and they relate to LSNs, so putting them in ma_loghandler_lsn.h.
    Stronger constraints in LSN_VALID().

  storage/maria/ma_pagecache.c@1.27, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +9 -16
    renaming constants

  storage/maria/ma_recovery.h@1.5, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +1 -1
    copyright

  storage/maria/ma_test1.c@1.11, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +1 -1
    new prototype

  storage/maria/ma_test2.c@1.13, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +1 -1
    new prototype

  storage/maria/maria_read_log.c@1.1, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +696 -0
    program to read and print log records from a Maria transaction log,
    and optionally apply them to tables. Very basic, early version.
    Should serve as a base for Recovery's code. Designed to be idempotent.
    Create a log by running maria.test, then cd to var/master-data
    and run "maria_read_log --only-display" to see info about records;
    run "maria_read_log --display-and-apply" to also apply the records
    to tables (it's more interesting if you first wipe out the
    tables in var/master-data/test, to see how they get re-created).
    Only a few records are handled by now: LONG_TRANSACTION_ID,
    COMMIT, FILE_ID, REDO_CREATE_TABLE; place is ready for
    REDO_INSERT_ROW_HEAD where I could use Monty's help (search for
    "Monty" in the file). Note: changes to the index pages, index's header
    and bitmap pages are not properly logged yet, so don't expect
    the program to work with that.

  storage/maria/maria_read_log.c@1.0, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +0 -0

  storage/maria/trnman_public.h@1.3, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +4 -0
    double-inclusion safe

  storage/maria/unittest/ma_control_file-t.c@1.15, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +12 -11
    constants renamed, new prototype

  storage/maria/unittest/ma_test_loghandler-t.c@1.11, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +5 -5
    constants renamed, new prototype

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.11, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +5 -5
    constants renamed, new prototype

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.11, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +2 -2
    constants renamed, new prototype

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.11, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +1 -1
    constants renamed, new prototype

  storage/myisam/mi_close.c@1.24.1.1, 2007-06-26 16:49:20+02:00, guilhem@gbichot3.local +1 -0
    comment

ChangeSet@1.2409.74.32, 2007-06-26 16:14:59+02:00, serg@janus.mylan +1 -0
  storage/maria/trnman.c
      fix for architectures not supported by my_atomic.h
      we cannot iterate the array over and over without releasing a lock

  storage/maria/trnman.c@1.24, 2007-06-26 16:14:56+02:00, serg@janus.mylan +13 -8
    fix for architectures not supported by my_atomic.h
    we cannot iterate the array over and over without releasing a lock

ChangeSet@1.2409.74.31, 2007-06-25 10:07:46+03:00, bell@desktop.sanja.is.com.ua +1 -0
  Creation of new log when maria change version added.

  storage/maria/ma_loghandler.c@1.19, 2007-06-25 10:07:45+03:00, bell@desktop.sanja.is.com.ua +59 -1
    Structure and function to read loghandler file data added.
    Creation of new log when maria change version added.

ChangeSet@1.2409.74.30, 2007-06-22 14:49:37+02:00, guilhem@gbichot3.local +36 -0
  - WL#3239 "log CREATE TABLE in Maria"
  - WL#3240 "log DROP TABLE in Maria"
  - similarly, log RENAME TABLE, REPAIR/OPTIMIZE TABLE, and
  DELETE no_WHERE_clause (== the DELETE which just truncates the files)
  - create_rename_lsn added to MARIA_SHARE's state
  - all these operations (except DROP TABLE) also update the table's
  create_rename_lsn, which is needed for the correctness of
  Recovery (see function comment of _ma_repair_write_log_record()
  in ma_check.c)
  - write a COMMIT record when transaction commits.
  - don't log REDOs/UNDOs if this is an internal temporary table
  like inside ALTER TABLE (I expect this to be a big win). There was
  already no logging for user-created "CREATE TEMPORARY" tables.
  - don't fsync files/directories if the table is not transactional
  - in translog_write_record(), autogenerate a 2-byte-id for the table
  and log the "id->name" pair (LOGREC_FILE_ID); log
  LOGREC_LONG_TRANSACTION_ID; automatically store
  the table's 2-byte-id in any log record.
  - preparations for Checkpoint: translog_get_horizon(); pausing Checkpoint
  when some dirty pages are unknown; capturing trn->rec_lsn,
  trn->first_undo_lsn for Checkpoint and log's low-water-mark computing.
  - assertions, comments.

  .tree-is-private@1.1, 2007-06-22 14:49:35+02:00, guilhem@gbichot3.local +0 -0
    this file is now needed to keep our tree private (don't push it
    to public trees). When 5.1 is merged into mysql-maria, we can abandon
    our maria-specific post-commit trigger; .tree_is_private will take
    care of keeping commit mails private. Don't push this file to public
    trees.

  .tree-is-private@1.0, 2007-06-22 14:49:35+02:00, guilhem@gbichot3.local +0 -0

  storage/maria/Makefile.am@1.15, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +4 -2
    more files to build

  storage/maria/ha_maria.cc@1.24, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +35 -15
    - logging a REPAIR log record if REPAIR/OPTIMIZE was successful.
    - ha_maria::data_file_type does not have to be set in every info()
    call, just do it once in open().
    - if caller said that transactionality can be disabled (like if
    caller is ALTER TABLE) i.e. thd->transaction.on==FALSE, then we
    temporarily disable transactionality of the table in external_lock();
    that will ensure that no REDOs/UNDOs are logged for this possibly
    massive write operation (they are not needed, as if any write fails,
    the table will be dropped). We re-enable in external_lock(F_UNLCK),
    which in ALTER TABLE happens before the tmp table replaces the original
    one (which is good, as thus the final table will have a REDO RENAME
    and a correct create_rename_lsn).
    - when we commit we also have to write a log record, so
    trnman_commit_trn() calls become ma_commit() calls
    - at end of engine's initialization, we are potentially entering a
    multi-threaded dangerous world (clients are going to be accepted)
    and so some assertions of mutex-owning become enforceable, for that
    we set maria_multi_threaded=TRUE (see ma_control_file.c)

  storage/maria/ha_maria.h@1.11, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +5 -0
    new member ha_maria::save_transactional (see also ha_maria.cc)

  storage/maria/ma_blockrec.c@1.21, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +86 -60
    - fixing comments according to discussion with Monty
    - if a table is transactional but temporarily non-transactional
    (like in ALTER TABLE), we need to give a sensible LSN to the pages
    (and, if we give 0, pagecache asserts).
    - translog_write_record() now takes care of storing the share's
    2-byte-id in the log record

  storage/maria/ma_blockrec.h@1.7, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +1 -1
    fixing comment according to discussion with Monty

  storage/maria/ma_check.c@1.19, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +81 -7
    When REPAIR/OPTIMIZE modify the data/index file, if this is a
    transactional table, they must sync it; if they remove files or rename
    files, they must sync the directory, so that everything is durable.
    This is just applying to REPAIR/OPTIMIZE the logic already implemented
    in CREATE/DROP/RENAME a few months ago.
    Adding a function to write a LOGREC_REPAIR_TABLE at end of
    REPAIR/OPTIMIZE (called only by ha_maria, not by maria_chk), and
    to update the table's create_rename_lsn.

  storage/maria/ma_close.c@1.11, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +6 -9
    fix for a future bug

  storage/maria/ma_commit.c@1.1, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +71 -0
    function which wraps:
    - writing a LOGREC_COMMIT record (==commit on disk)
    - calling trnman_commit_trn() (=commit in memory)

  storage/maria/ma_commit.c@1.0, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +0 -0

  storage/maria/ma_commit.h@1.1, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +18 -0
    new header file

  storage/maria/ma_commit.h@1.0, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +0 -0

  storage/maria/ma_control_file.c@1.15, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +13 -3
    ensuring that if Maria is running in multi-threaded mode, anybody
    wanting to write to the control file and update
    last_checkpoint_lsn/last_logno owns the log's lock.

  storage/maria/ma_control_file.h@1.15, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +2 -0
    see ma_control_file.c

  storage/maria/ma_create.c@1.14, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +106 -42
    when creating a table:
    - sync it and its directory only if this is a transactional table
    and there is a log (no point in syncing in maria_chk)
    - decouple the two uses of linkname/linkname_ptr (for index file and
    for data file) into more variables, as we need to know all links
    until the moment we write the LOGREC_CREATE_TABLE.
    - set share.data_file_type early so that _ma_initialize_data_file()
    knows it (Monty's bugfix so that a table always has at least a bitmap
    page when it is created; so data-file is not 0 bytes anymore).
    - log a LOGREC_CREATE_TABLE; it contains the bytes which we have
    just written to the index file's header. Update table's
    create_rename_lsn.
    - syncing of kfile had been bugified in a previous merge, correcting
    - syncing of dfile is now needed as it's not empty anymore
    - in _ma_initialize_data_file(), use share's block_size and not the
    global one. This is a gratuitous change, both variables are equal,
    just that I find it more future-proof to use share-bound variable
    rather than global one.

  storage/maria/ma_delete_all.c@1.11, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +53 -26
    log a LOGREC_DELETE_ALL record when doing ma_delete_all_rows();
    update create_rename_lsn then.

  storage/maria/ma_delete_table.c@1.6, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +64 -35
    - logging LOGREC_DROP_TABLE; knowing if this is needed, requires
    knowing if the table is transactional, which requires opening the
    table.
    - we need to sync directories only if the table is transactional

  storage/maria/ma_extra.c@1.11, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +31 -17
    questions

  storage/maria/ma_init.c@1.11, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +1 -1
    when maria_end() is called, engine is not multithreaded

  storage/maria/ma_loghandler.c@1.18, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +281 -68
    - translog_inited has to be visible to ma_create() (see how it is used
    in ma_create())
    - checkpoint record will be a single record, not three
    - no REDO for TRUNCATE (TRUNCATE calls ma_create() internally so will
    log a REDO_CREATE)
    - adding REDO for DELETE no_WHERE_clause (fast DELETE of all rows by
    truncating the files), REPAIR.
    - MY_WAIT_IF_FULL to wait&retry if a log write hits a full disk
    - in translog_write_record(), if MARIA_SHARE does not yet have a
    2-byte-id, generate one for it and log LOGREC_FILE_ID; automatically
    store this short id into log records.
    - in translog_write_record(), if transaction has not logged its
    long trid, log LOGREC_LONG_TRANSACTION_ID.
    - For Checkpoint, we need to know the current end-of-log: adding
    translog_get_horizon().
    - For Control File, adding an assertion that the thread owns the
    log's lock (control file is protected by this lock)

  storage/maria/ma_loghandler.h@1.8, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +17 -18
    Changes in log records (see ma_loghandler.c).
    new prototypes, new functions.

  storage/maria/ma_loghandler_lsn.h@1.5, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +9 -1
    adding a type LSN_WITH_FLAGS especially for TRN::first_undo_lsn,
    where the most significant byte is used for flags.

  storage/maria/ma_open.c@1.16, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +20 -2
    storing the create_rename_lsn in the index file's header (in the
    state, precisely) and retrieving it from there.

  storage/maria/ma_pagecache.c@1.26, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +95 -86
    - my set_if_bigger was wrong, correcting it
    - if the first_in_switch list is not empty, it means that
    changed_blocks misses some dirty pages, so Checkpoint cannot run and
    needs to wait. A variable missing_blocks_in_changed_list is added to
    tell that (should it be named missing_blocks_in_changed_blocks?)
    - pagecache_collect_changed_blocks_with_lsn() now also tells the
    minimum rec_lsn (needed for low-water mark computation).

  storage/maria/ma_pagecache.h@1.17, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +1 -0
    see ma_pagecache.c

  storage/maria/ma_panic.c@1.5, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +6 -1
    comment

  storage/maria/ma_range.c@1.7, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +20 -16
    comment

  storage/maria/ma_rename.c@1.5, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +74 -22
    - logging LOGREC_RENAME_TABLE; knowing if this is needed, requires
    knowing if the table is transactional, which requires opening the
    table.
    - update create_rename_lsn
    - we need to sync directories only if the table is transactional

  storage/maria/ma_static.c@1.7, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +7 -1
    comment

  storage/maria/ma_test_all.sh@1.7, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +142 -136
    - tip for Valgrind-ing ma_test_all
    - do "export maria_path=somepath" before calling ma_test_all,
    if you want to run ma_test_all out of storage/maria (useful
    to have parallel runs, like one normal and one Valgrind, they
    must not use the same tables so need to run in different directories)

  storage/maria/maria_def.h@1.22, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +5 -1
    - state now contains, in memory and on disk, the create_rename_lsn
    - share now contains a 2-byte-id

  storage/maria/trnman.c@1.23, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +131 -46
    preparations for Checkpoint: capture trn->rec_lsn, trn->first_undo_lsn;
    minimum first_undo_lsn needed to know log's low-water-mark

  storage/maria/trnman.h@1.14, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +3 -2
    using most significant byte of first_undo_lsn to hold miscellaneous
    flags, for now TRANSACTION_LOGGED_LONG_ID.
    dummy_transaction_object is already declared in ma_static.c.

  storage/maria/trnman_public.h@1.2, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +6 -1
    dummy_transaction_object was declared in all files including
    trnman_public.h, while in fact it's a single object.
    new prototype

  storage/maria/unittest/ma_test_loghandler-t.c@1.10, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +7 -7
    update for new prototype

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.10, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +7 -7
    update for new prototype

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.10, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +3 -3
    update for new prototype

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.10, 2007-06-22 14:49:34+02:00, guilhem@gbichot3.local +1 -1
    update for new prototype

ChangeSet@1.2409.74.29, 2007-06-19 16:01:04+02:00, guilhem@gbichot3.local +3 -0
  Monty's fix for Maria's table scan sometimes not seeing all rows;
  without the fix, only 896 rows were inserted into t2 in maria-big.test.

  mysql-test/r/maria-big.result@1.1, 2007-06-19 16:01:02+02:00, guilhem@gbichot3.local +61 -0
    result for new test

  mysql-test/r/maria-big.result@1.0, 2007-06-19 16:01:02+02:00, guilhem@gbichot3.local +0 -0

  mysql-test/t/maria-big.test@1.1, 2007-06-19 16:01:02+02:00, guilhem@gbichot3.local +26 -0
    test for a bug where we missed some rows when scanning

  mysql-test/t/maria-big.test@1.0, 2007-06-19 16:01:02+02:00, guilhem@gbichot3.local +0 -0

  storage/maria/ma_blockrec.c@1.20, 2007-06-19 16:01:02+02:00, guilhem@gbichot3.local +2 -1
    due to wrong test we were skipping some rows when scanning

ChangeSet@1.2409.74.28, 2007-06-15 08:31:12+03:00, bell@desktop.sanja.is.com.ua +2 -0
  Postmerge changes

  storage/maria/unittest/ma_test_loghandler-t.c@1.9, 2007-06-15 08:31:09+03:00, bell@desktop.sanja.is.com.ua +2 -3
    Spaces at the end of the line removed.
    Parameters of translog_write_record() fixed.

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.9, 2007-06-15 08:31:09+03:00, bell@desktop.sanja.is.com.ua +1 -1
    Parameters of translog_write_record() fixed.

ChangeSet@1.2409.120.1, 2007-06-15 01:45:55+03:00, bell@desktop.sanja.is.com.ua +9 -0
  Fixed LSN codding to allow code all
    relative LSN independed on "distance".
  Added support for test record descriptors to avoid
    interfere woth real record descriptors.
  Fixed descriptor of pseudofixed length record length,
    now it is length of record passed from/to client of
    the loghandler.

  BitKeeper/etc/ignore@1.253, 2007-06-15 01:45:52+03:00, bell@desktop.sanja.is.com.ua +1 -0
    Added storage/maria/unittest/ma_test_loghandler_long-t-big to the ignore list

  storage/maria/ma_init.c@1.10, 2007-06-15 01:45:52+03:00, bell@desktop.sanja.is.com.ua +0 -1
    Removed loghandler_init call because it is present in translog_init()

  storage/maria/ma_loghandler.c@1.15.1.1, 2007-06-15 01:45:52+03:00, bell@desktop.sanja.is.com.ua +126 -48
    Fixed LSN codding to allow code all
      relative LSN independed on "distance".
    Added support for test record descriptors to avoid
      interfere woth real record descriptors.
    Fixed length of LOGREC_REDO_INSERT_ROW_TAIL.
    Fixed descriptor of pseudofixed length record length,
      now it is length of record passed from/to client of
      the loghandler.

  storage/maria/ma_loghandler.h@1.5.1.1, 2007-06-15 01:45:52+03:00, bell@desktop.sanja.is.com.ua +12 -3
    Added support for test record descriptors to avoid
      interfere woth real record descriptors.

  storage/maria/unittest/Makefile.am@1.10, 2007-06-15 01:45:52+03:00, bell@desktop.sanja.is.com.ua +8 -5
    Made new test for log with reference over 63 files.
    Layout fixed.

  storage/maria/unittest/ma_test_loghandler-t.c@1.6.1.1, 2007-06-15 01:45:52+03:00, bell@desktop.sanja.is.com.ua +83 -49
    Added support for test record descriptors to avoid
      interfere woth real record descriptors.

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.6.1.1, 2007-06-15 01:45:52+03:00, bell@desktop.sanja.is.com.ua +53 -42
    Added support for test record descriptors to avoid
      interfere woth real record descriptors.

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.7.1.1, 2007-06-15 01:45:52+03:00, bell@desktop.sanja.is.com.ua +16 -12
    Added support for test record descriptors to avoid
      interfere woth real record descriptors.

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.7.1.1, 2007-06-15 01:45:52+03:00, bell@desktop.sanja.is.com.ua +2 -1
    Added support for test record descriptors to avoid
      interfere woth real record descriptors.

ChangeSet@1.1810.3072.1, 2007-06-13 10:42:21+00:00, lzhou@dev3-63.(none) +2 -0
  BUG#23354 Clear "no start" when nodes restart and add new prompting string when nodes restart

  ndb/src/common/debugger/EventLogger.cpp@1.21.16.1, 2007-06-13 10:42:16+00:00, lzhou@dev3-63.(none) +0 -2
    Remove "no start" from output when nodes restart.

  ndb/src/mgmclient/CommandInterpreter.cpp@1.49.42.1, 2007-06-13 10:42:16+00:00, lzhou@dev3-63.(none) +10 -2
    Add new prompting string when nodes restart.

ChangeSet@1.2409.119.1, 2007-06-11 16:29:53+02:00, guilhem@gbichot3.local +18 -0
  - moving pagecache.h from include/ to storage/maria as it is Maria-
  specific
  - adding TRN::first_undo_lsn, needed to know when a log can be deleted;
  this variable must be set under log's mutex and that leads to setting
  TRN::rec_lsn, TRN::undo_lsn and TRN::first_undo_lsn in a
  inwrite_rec_hook; adding implementation of one hook for REDOs and one
  for UNDOs. Thus translog_write_record() always uses TRN and so does
  not need a short_id argument, can find it from TRN.
  - Monty's patch for the last Valgrind error in the tree.
  - Log handler's unit tests fail but Sanja says it's known

  include/Makefile.am@1.76, 2007-06-11 16:29:48+02:00, guilhem@gbichot3.local +1 -1
    pagecache.h moved and renamed

  include/maria.h@1.11, 2007-06-11 16:29:48+02:00, guilhem@gbichot3.local +1 -3
    pagecache.h moved and renamed

  sql/handler.h@1.250, 2007-06-11 16:29:48+02:00, guilhem@gbichot3.local +1 -1
    pagecache.h moved and renamed

  storage/maria/Makefile.am@1.14, 2007-06-11 16:29:48+02:00, guilhem@gbichot3.local +1 -1
    pagecache.h moved and renamed

  storage/maria/ha_maria.cc@1.23, 2007-06-11 16:29:48+02:00, guilhem@gbichot3.local +8 -1
    adding an assertion which sounds logical

  storage/maria/ma_blockrec.c@1.19, 2007-06-11 16:29:48+02:00, guilhem@gbichot3.local +33 -50
    trn->rec_lsn and trn->undo_lsn are now set via hooks inside the log
    record's writing; this allows to also set trn->first_undo_lsn
    needed to compute the log's low-water mark.
    The PAGERANGE_STORE_SIZE -> PAGE_STORE_SIZE is Monty's fix to a
    Valgrind error.

  storage/maria/ma_loghandler.c@1.14.1.1, 2007-06-11 16:29:48+02:00, guilhem@gbichot3.local +95 -56
    "tcb" renamed to "trn". Log handler now knows what is a transaction,
    and finds short_id from trn. trn's rec_lsn, undo_lsn, first_undo_lsn
    are now set by some inwrite_rec_hookS (one for REDOs, one for UNDOs).
    The HAVE_purify blocks are Monty's fix to a Valgrind error.

  storage/maria/ma_loghandler.h@1.6, 2007-06-11 16:29:48+02:00, guilhem@gbichot3.local +3 -2
    Log handler functions use TRN, that needs a forward declaration

  storage/maria/ma_pagecache.c@1.25, 2007-06-11 16:29:48+02:00, guilhem@gbichot3.local +1 -1
    pagecache.h was moved and renamed

  storage/maria/ma_pagecache.h@1.16, 2007-06-11 16:29:48+02:00, guilhem@gbichot3.local +3 -3
    pagecache.h was moved and renamed

  storage/maria/ma_pagecache.h@1.15, 2007-06-11 15:30:57+02:00, guilhem@gbichot3.local +0 -0
    Rename: storage/maria/pagecache.h -> storage/maria/ma_pagecache.h

  storage/maria/pagecache.h@1.14, 2007-06-11 15:25:18+02:00, guilhem@gbichot3.local +0 -0
    Rename: include/pagecache.h -> storage/maria/pagecache.h

  storage/maria/ma_pagecaches.c@1.3, 2007-06-11 16:29:48+02:00, guilhem@gbichot3.local +1 -1
    pagecache.h was moved and renamed

  storage/maria/trnman.c@1.22, 2007-06-11 16:29:49+02:00, guilhem@gbichot3.local +1 -1
    initializing some members of TRN.

  storage/maria/trnman.h@1.13, 2007-06-11 16:29:49+02:00, guilhem@gbichot3.local +1 -1
    TRN::first_undo_lsn needed for log's low-water mark calculation
    (which will serve to know which logs can be deleted)

  storage/maria/unittest/ma_test_loghandler-t.c@1.7, 2007-06-11 16:29:49+02:00, guilhem@gbichot3.local +11 -9
    translog_write_record() now needs a valid TRN

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.7, 2007-06-11 16:29:49+02:00, guilhem@gbichot3.local +16 -9
    translog_write_record() now needs a valid TRN

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.8, 2007-06-11 16:29:49+02:00, guilhem@gbichot3.local +8 -3
    translog_write_record() now needs a valid TRN

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.8, 2007-06-11 16:29:49+02:00, guilhem@gbichot3.local +3 -1
    translog_write_record() now needs a valid TRN

  storage/maria/unittest/test_file.h@1.5, 2007-06-11 16:29:49+02:00, guilhem@gbichot3.local +1 -1
    pagecache.h was moved and renamed

ChangeSet@1.2409.74.25, 2007-06-11 12:52:40+03:00, bell@desktop.sanja.is.com.ua +1 -0
  Small fixes of loghandler code found during a bug investigation.

  storage/maria/ma_loghandler.c@1.15, 2007-06-11 12:52:36+03:00, bell@desktop.sanja.is.com.ua +4 -4
    Variable length record descriptor fixed.
    Assignment of file number moved out of the loop.

ChangeSet@1.2409.74.24, 2007-06-09 14:52:17+03:00, monty@mysql.com +27 -0
  Fixed compiler warnings
  Fixed bug in ma_dbug.c that gave valgrind warning (only relevant when using --debug)
  Fixed bug in blob logging (Fixes valgrind warning)
  maria_getint() -> maria_data_on_page()

  mysys/safemalloc.c@1.29.2.1, 2007-06-09 14:52:13+03:00, monty@mysql.com +23 -0
    Added debug function to print out where a piece of memory was allocated

  sql/opt_range.cc@1.262.2.2, 2007-06-09 14:52:14+03:00, monty@mysql.com +0 -1
    Remove DBUG_PRINT of unitailized memory

  storage/maria/ma_blockrec.c@1.18, 2007-06-09 14:52:14+03:00, monty@mysql.com +3 -1
    Fixed bug in blob logging

  storage/maria/ma_check.c@1.18, 2007-06-09 14:52:14+03:00, monty@mysql.com +7 -7
    Fixed compiler warning

  storage/maria/ma_dbug.c@1.4, 2007-06-09 14:52:14+03:00, monty@mysql.com +1 -0
    Added missed end++; Caused usage of unitialized memory for nullable keys that was not NULL

  storage/maria/ma_delete.c@1.11, 2007-06-09 14:52:14+03:00, monty@mysql.com +19 -19
    maria_getint() -> maria_data_on_page()

  storage/maria/ma_init.c@1.9, 2007-06-09 14:52:14+03:00, monty@mysql.com +1 -0
    Added header file to get rid of warning

  storage/maria/ma_key.c@1.7, 2007-06-09 14:52:14+03:00, monty@mysql.com +1 -0
    More debugging

  storage/maria/ma_loghandler.c@1.14, 2007-06-09 14:52:14+03:00, monty@mysql.com +29 -21
    Removed some wrong ';' to get rid of compiler errors when compiling without debugging
    Indentation fixes
    Removed not needed 'break's
    Fixed some compiler warnings
    Added code to detect logging of unitialized memory

  storage/maria/ma_page.c@1.10, 2007-06-09 14:52:14+03:00, monty@mysql.com +12 -3
    maria_getint() -> maria_data_on_page()
    Clear rest of index page before writing when used with valgrind
    (Fixes warning of writing pages with unitialized data)

  storage/maria/ma_range.c@1.6, 2007-06-09 14:52:14+03:00, monty@mysql.com +1 -1
    maria_getint() -> maria_data_on_page()

  storage/maria/ma_rt_index.c@1.7, 2007-06-09 14:52:14+03:00, monty@mysql.com +4 -4
    maria_getint() -> maria_data_on_page()

  storage/maria/ma_rt_index.h@1.4, 2007-06-09 14:52:14+03:00, monty@mysql.com +1 -1
    maria_getint() -> maria_data_on_page()

  storage/maria/ma_rt_key.c@1.4, 2007-06-09 14:52:14+03:00, monty@mysql.com +2 -2
    maria_getint() -> maria_data_on_page()

  storage/maria/ma_rt_split.c@1.5, 2007-06-09 14:52:14+03:00, monty@mysql.com +2 -2
    maria_getint() -> maria_data_on_page()

  storage/maria/ma_search.c@1.8, 2007-06-09 14:52:14+03:00, monty@mysql.com +8 -8
    maria_getint() -> maria_data_on_page()

  storage/maria/ma_test1.c@1.10, 2007-06-09 14:52:14+03:00, monty@mysql.com +1 -1
    Fixed compiler warning

  storage/maria/ma_write.c@1.14, 2007-06-09 14:52:14+03:00, monty@mysql.com +9 -9
    maria_getint() -> maria_data_on_page()

  storage/maria/maria_chk.c@1.12, 2007-06-09 14:52:14+03:00, monty@mysql.com +1 -1
    maria_getint() -> maria_data_on_page()

  storage/maria/maria_def.h@1.21, 2007-06-09 14:52:14+03:00, monty@mysql.com +1 -1
    maria_getint() -> maria_data_on_page()

  storage/maria/unittest/ma_pagecache_consist.c@1.13, 2007-06-09 14:52:14+03:00, monty@mysql.com +2 -1
    Fixed compiler warning

  storage/maria/unittest/ma_pagecache_single.c@1.11, 2007-06-09 14:52:14+03:00, monty@mysql.com +5 -2
    Fixed compiler warning

  storage/maria/unittest/ma_test_loghandler-t.c@1.6, 2007-06-09 14:52:14+03:00, monty@mysql.com +1 -1
    Fixed compiler warning

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.6, 2007-06-09 14:52:14+03:00, monty@mysql.com +1 -1
    Fixed compiler warning

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.7, 2007-06-09 14:52:14+03:00, monty@mysql.com +2 -1
    Fixed compiler warning

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.7, 2007-06-09 14:52:14+03:00, monty@mysql.com +1 -1
    Fixed compiler warning

  storage/myisam/mi_dbug.c@1.18, 2007-06-09 14:52:14+03:00, monty@mysql.com +1 -0
    Added missed end++; Caused usage of unitialized memory for nullable keys that was not NULL

ChangeSet@1.2409.74.23, 2007-06-08 16:03:39+02:00, guilhem@gbichot3.local +3 -0
  - if table is not transactional, we don't create a transaction
  - if table is temporary it's not crash-safe so we declare it
  non-transactional (saves trnman calls, REDO/UNDO log writing,
  and fixes the assertion failure at the first line of trnman_destroy()).

  storage/maria/ha_maria.cc@1.22, 2007-06-08 16:03:36+02:00, guilhem@gbichot3.local +8 -5
    if table is not transactional, no need to create a transaction:
    - it saves trnman calls (mutex locks etc)
    - it saves REDO and UNDO log writing
    - it closes a bug: if this is a temporary table, external_lock(F_RD|WRLCK)
    is not always paired with external_lock(F_UNLCK), which confuses the
    transaction logic in external_lock. As temp tables are not crash-safe
    and so not transactional in this Maria version, we skip transactions
    and de-confuse. Note that maria_lock_database(F_UNLCK) is
    properly called, so if the transaction logic moves from external_lock()
    to maria_lock_database() (probably TODO), transactional temp tables
    will be possible.

  storage/maria/ma_create.c@1.13, 2007-06-08 16:03:36+02:00, guilhem@gbichot3.local +8 -5
    temporary tables cannot be crash-safe as they are dropped at restart

  storage/maria/maria_def.h@1.20, 2007-06-08 16:03:36+02:00, guilhem@gbichot3.local +1 -1
    comment

ChangeSet@1.2409.74.22, 2007-06-07 22:07:44+02:00, guilhem@gbichot3.local +1 -0
  fix for memory leak in _ma_scan_init_block_record() (Valgrind error):
  make Maria support multiple calls to rnd_init() without an rnd_end()
  call in between.

  storage/maria/ma_blockrec.c@1.17, 2007-06-07 22:07:41+02:00, guilhem@gbichot3.local +8 -4
    as explained in sql/handler.h, multiple calls to rnd_init() without
    a rnd_end() in between, are possible, and engine must be prepared to
    that. So in _ma_scan_init_block_record(), we allocate a buffer
    only if we have not yet one.

ChangeSet@1.2409.74.21, 2007-06-07 21:51:11+02:00, guilhem@gbichot3.local +2 -0
  Maria: fix for "use of uninitialized value" Valgrind error.

  storage/maria/ha_maria.cc@1.21, 2007-06-07 21:51:08+02:00, guilhem@gbichot3.local +1 -0
    initialize ha_maria::data_file_type when opening the table
    (it was not initialized, causing a Valgrind error)

  storage/maria/ma_locking.c@1.9, 2007-06-07 21:51:08+02:00, guilhem@gbichot3.local +1 -0
    if it's impossible, let's test it

ChangeSet@1.2409.74.20, 2007-06-07 15:10:17+02:00, guilhem@gbichot3.local +2 -0
  fix for 2 memory leaks in ps_maria.test (just need to destroy objects
  allocated at startup).

  storage/maria/ma_init.c@1.8, 2007-06-07 15:10:14+02:00, guilhem@gbichot3.local +2 -0
    destroy transaction manager and log's pagecache when Maria shuts down

  storage/maria/trnman.c@1.21, 2007-06-07 15:10:15+02:00, guilhem@gbichot3.local +11 -5
    short_trid_to_active_trn!=NULL now serves to detect if
    trnman has initialized some objects and so if trnman_destroy()
    has objects to destroy. In other words, short_trid_to_active_trn
    serves as "trnman_inited" variable.
    trnman_destroy() is always called by maria_end(), but trnman_init() is
    not always called (for example in ma_test1), that's why
    trnman_destroy() cannot blindly destroy.

ChangeSet@1.2409.118.1, 2007-06-07 01:01:43+03:00, monty@mysql.com +19 -0
  rec_lsn (first REDO LSN( is now given to the page cache on unpinning
  Added maria_clone(), needed by future REPAIR code

  include/maria.h@1.10, 2007-06-07 01:01:38+03:00, monty@mysql.com +1 -0
    Added prototype for maria_clone (for future)

  storage/maria/ha_maria.cc@1.18.1.1, 2007-06-07 01:01:38+03:00, monty@mysql.com +3 -3
    Move filename to share structure

  storage/maria/ma_blockrec.c@1.16, 2007-06-07 01:01:38+03:00, monty@mysql.com +37 -28
    rec_lsn (first REDO LSN( is now given to the page cache on unpinning
    Removed impossible lock handling in get_head_or_tail_page()
    Changed calls ot translog_write_record() to remember rec_lsn
    Removed some logging in csse of not transactions

  storage/maria/ma_delete.c@1.10, 2007-06-07 01:01:38+03:00, monty@mysql.com +2 -2
    info->filename -> info->s->open_file_name

  storage/maria/ma_loghandler.c@1.13, 2007-06-07 01:01:38+03:00, monty@mysql.com +2 -3
    Indentation fixes

  storage/maria/ma_open.c@1.15, 2007-06-07 01:01:38+03:00, monty@mysql.com +180 -134
    Added maria_clone(), needed by future REPAIR code

  storage/maria/ma_packrec.c@1.10, 2007-06-07 01:01:38+03:00, monty@mysql.com +1 -1
    Fixed typo in comment

  storage/maria/ma_pagecache.c@1.22.1.1, 2007-06-07 01:01:38+03:00, monty@mysql.com +7 -1
    Added comment.
    Allow setting REC_LSN in case of read lock

  storage/maria/ma_update.c@1.10, 2007-06-07 01:01:38+03:00, monty@mysql.com +2 -2
    info->filename -> info->s->open_file_name

  storage/maria/ma_write.c@1.13, 2007-06-07 01:01:39+03:00, monty@mysql.com +2 -2
    info->filename -> info->s->open_file_name

  storage/maria/maria_def.h@1.19, 2007-06-07 01:01:39+03:00, monty@mysql.com +4 -4
    info->filename -> info->s->open_file_name
    Added have_rtree to simplify test in ma_clone()

  storage/maria/maria_ftdump.c@1.7, 2007-06-07 01:01:39+03:00, monty@mysql.com +1 -1
    info->filename -> info->s->open_file_name

  storage/maria/maria_pack.c@1.12, 2007-06-07 01:01:39+03:00, monty@mysql.com +6 -3
    info->filename -> info->s->open_file_name

  storage/maria/trnman.h@1.12, 2007-06-07 01:01:39+03:00, monty@mysql.com +1 -1
    Added rec_lsn

  storage/maria/unittest/lockman-t.c@1.13, 2007-06-06 10:49:35+03:00, monty@mysql.com +0 -0
    Change mode to -rw-rw-r--

  storage/maria/unittest/lockman1-t.c@1.5, 2007-06-06 10:49:35+03:00, monty@mysql.com +0 -0
    Change mode to -rw-rw-r--

  storage/maria/unittest/lockman2-t.c@1.7, 2007-06-06 10:49:35+03:00, monty@mysql.com +0 -0
    Change mode to -rw-rw-r--

  storage/maria/unittest/ma_pagecache_consist.c@1.12, 2007-06-06 10:48:39+03:00, monty@mysql.com +0 -0
    Change mode to -rw-rw-r--

  storage/maria/unittest/trnman-t.c@1.11, 2007-06-06 10:49:35+03:00, monty@mysql.com +0 -0
    Change mode to -rw-rw-r--

ChangeSet@1.1810.3043.1, 2007-06-06 17:54:14+03:00, gkodinov@macbook.gmz +3 -0
  Bug #28701:
  Views don't have indexes. So they can't take index hints.
  Added a check and disabled the usage of hints for views.

  mysql-test/r/view.result@1.138.1.68, 2007-06-06 17:54:00+03:00, gkodinov@macbook.gmz +12 -1
    Bug #28701: test case

  mysql-test/t/view.test@1.126.1.61, 2007-06-06 17:54:01+03:00, gkodinov@macbook.gmz +21 -1
    Bug #28701: test case

  sql/sql_view.cc@1.78.28.4, 2007-06-06 17:54:03+03:00, gkodinov@macbook.gmz +9 -0
    Bug #28701: disable usage of hints for views

ChangeSet@1.2409.117.1, 2007-06-06 09:51:30+03:00, bell@desktop.sanja.is.com.ua +1 -0
  Fixed pagecache unittest

  storage/maria/ma_pagecache.c@1.23, 2007-06-06 09:51:26+03:00, bell@desktop.sanja.is.com.ua +4 -14
    - remove_reader() call is removed from unlock/unpin operations
      which uses direct link (because find_block() was not called)
    - patch which broke pagecache unittest is reverted

ChangeSet@1.2409.74.17, 2007-06-05 18:34:24+02:00, serg@janus.mylan +2 -0
  fix unit tests to build

  unittest/mysys/Makefile.am@1.13, 2007-06-05 18:34:22+02:00, serg@janus.mylan +1 -0
    build unit tests (they were lost in a bad merge)

  unittest/mysys/my_atomic-t.c@1.17, 2007-06-05 18:34:22+02:00, serg@janus.mylan +18 -7
    update to the new lf_pinbox* API

ChangeSet@1.2409.74.16, 2007-06-05 16:06:08+02:00, serg@janus.mylan +3 -0
  maria cannot rollback yet

  mysql-test/r/maria.result@1.10, 2007-06-05 16:06:06+02:00, serg@janus.mylan +19 -0
    maria cannot rollback yet

  mysql-test/t/maria.test@1.10, 2007-06-05 16:06:06+02:00, serg@janus.mylan +16 -0
    maria cannot rollback yet

  storage/maria/ha_maria.cc@1.19, 2007-06-05 16:06:06+02:00, serg@janus.mylan +11 -1
    maria cannot rollback yet

ChangeSet@1.2409.114.11, 2007-06-05 14:35:34+03:00, monty@mysql.com +3 -0
  Fixes to get maria.test and ps_maria.test to work

  storage/maria/ma_blockrec.c@1.13.1.1, 2007-06-05 14:35:32+03:00, monty@mysql.com +5 -1
    Reset undo_lsn if not transactional table
    (Avoids assert() when checking LSN in pagecache code)

  storage/maria/ma_create.c@1.12, 2007-06-05 14:35:32+03:00, monty@mysql.com +35 -21
    Don't convert simple FIXED size tables to BLOCK format.

  storage/maria/trnman.c@1.20, 2007-06-05 14:35:32+03:00, monty@mysql.com +8 -1
    Reset undo_lsn

ChangeSet@1.2409.74.14, 2007-06-05 12:14:05+03:00, bell@desktop.sanja.is.com.ua +3 -0
  postmerge changes

  storage/maria/ma_blockrec.c@1.14, 2007-06-05 12:13:43+03:00, bell@desktop.sanja.is.com.ua +3 -2
    postmerge changes

  storage/maria/ma_pagecache.c@1.22, 2007-06-05 12:13:44+03:00, bell@desktop.sanja.is.com.ua +3 -3
    postmerge changes

  include/pagecache.h@1.13, 2007-06-05 12:13:43+03:00, bell@desktop.sanja.is.com.ua +6 -6
    postmerge changes

ChangeSet@1.2409.114.10, 2007-06-04 14:07:18+03:00, monty@mysql.com +10 -0
  Fixed that ma_test_all works with -T (simple transaction/logging support)
  Some fixes from Sanja

  BitKeeper/etc/ignore@1.252, 2007-06-04 13:52:30+03:00, monty@mysql.com +1 -0
    added storage/maria/maria_log.*

  BitKeeper/etc/ignore@1.251, 2007-06-04 13:52:19+03:00, monty@mysql.com +1 -0
    added storage/maria/maria_control

  storage/maria/ma_bitmap.c@1.11, 2007-06-04 14:07:14+03:00, monty@mysql.com +3 -0
    Reset 'debugging' bitmap when creating new one (fixes valgrind warning)

  storage/maria/ma_blockrec.c@1.13, 2007-06-04 14:07:14+03:00, monty@mysql.com +1 -2
    Removed duplicate (wrong) initialization
    Reset not initialized variable

  storage/maria/ma_check.c@1.17, 2007-06-04 14:07:14+03:00, monty@mysql.com +1 -1
    Use right page type
    (Patch from Sanja)

  storage/maria/ma_init.c@1.7, 2007-06-04 14:07:14+03:00, monty@mysql.com +2 -0
    Reset logging in maria_end()
    (Fixes memory leak)

  storage/maria/ma_loghandler.c@1.12, 2007-06-04 14:07:14+03:00, monty@mysql.com +43 -23
    Add missing copyright header
    Added checking of duplicate calls or calls without init to translog_destroy()
    Don't lock mutex before destroying them (not needed as you can't use a destroyed mutex anyway)

  storage/maria/ma_pagecache.c@1.18.1.6, 2007-06-04 14:07:14+03:00, monty@mysql.com +11 -3
    Added extra page type text
    Trivial indentation fixes

  include/pagecache.h@1.11, 2007-06-04 14:07:14+03:00, monty@mysql.com +4 -3
    Always have enum PAGECACHE_EMPTY_PAGE available
    (Simpler code)

  storage/maria/ma_test1.c@1.9, 2007-06-04 14:07:15+03:00, monty@mysql.com +20 -2
    Added transaction setup
    (Patch from Sanja)

  storage/maria/ma_test2.c@1.12, 2007-06-04 14:07:15+03:00, monty@mysql.com +16 -1
    Added transaction setup
    (Patch from Sanja)

ChangeSet@1.2409.114.9, 2007-05-29 20:13:56+03:00, monty@mysql.com +43 -0
  This patch is a collection of patches from from Sanja, Sergei and Monty.
  
  Added logging and pinning of pages to block format.
  Integration of transaction manager, log handler.
  Better page cache intergration
  Split trnman.h into two files, so that we don't have to include my_atomic.h into C++ programs.
  Renaming of structures, more comments, more debugging etc.
  Fixed problem with small head block + long varchar.
  Added extra argument to delete_record() and update_record() (needed for UNDO logging)
  Small changes to interface of pagecache and log handler.
  Change initialization of log_record_type_descriptors to not be depending on enum order.
  Use array of LEX_STRING's to send data to log handler
  Added 'dummy' transaction option to MARIA_INFO so that we can always assume 'trn' exists.

  include/lf.h@1.13, 2007-05-29 20:13:53+03:00, monty@mysql.com +30 -28
    Interface fixes
    Rename of structures
    (Patch from Sergei via Sanja)

  include/my_atomic.h@1.13, 2007-05-29 20:13:54+03:00, monty@mysql.com +5 -0
    More comments

  include/my_global.h@1.148, 2007-05-29 20:13:54+03:00, monty@mysql.com +2 -0
    Added MY_ERRPTR

  mysql-test/r/maria.result@1.9, 2007-05-29 20:13:54+03:00, monty@mysql.com +8 -0
    Updated results

  mysql-test/t/maria.test@1.9, 2007-05-29 20:13:54+03:00, monty@mysql.com +8 -0
    Added autocommit around lock tables
    (Patch from Sanja)

  mysys/lf_alloc-pin.c@1.12, 2007-05-29 20:13:54+03:00, monty@mysql.com +134 -54
    Post-review fixes, simple optimizations
    More comments
    Struct slot renames
    Check amount of memory on stack
    (Patch from Sergei)

  mysys/lf_dynarray.c@1.9, 2007-05-29 20:13:54+03:00, monty@mysql.com +7 -3
    More comments

  mysys/lf_hash.c@1.16, 2007-05-29 20:13:54+03:00, monty@mysql.com +130 -37
    More comments
    After review fixes
    (Patch from Sergei)

  storage/maria/ha_maria.cc@1.18, 2007-05-29 20:13:54+03:00, monty@mysql.com +114 -10
    Split trnman.h into two files, so that we don't have to include my_atomic.h into the .cc program.
    (Temporary fix to avoid bug in gcc)
    Move out all deferencing of the transaction structure.
    Transaction manager integrated (Patch from Sergei)

  storage/maria/ha_maria.h@1.10, 2007-05-29 20:13:54+03:00, monty@mysql.com +1 -0
    Added prototype for start_stmt()

  storage/maria/lockman.c@1.15, 2007-05-29 20:13:54+03:00, monty@mysql.com +1 -1
    Function call rename

  storage/maria/ma_bitmap.c@1.10, 2007-05-29 20:13:54+03:00, monty@mysql.com +6 -2
    Mark deleted pages free from page cache

  storage/maria/ma_blockrec.c@1.12, 2007-05-29 20:13:54+03:00, monty@mysql.com +1132 -128
    Offset -> rownr
    More debugging
    Fixed problem with small head block + long varchar
    Added logging of changed pages
    Added logging of undo (Including only loggging of changed fields in case of update)
    Added pinning/unpinning of all changed pages
    More comments
    Added free_full_pages() as the same code was used in several places.
    fill_rows_parts() renamed as fill_insert_undo_parts()
    offset -> rownr
    Added some optimization of not transactional tables
    _ma_update_block_record() has new parameter, as we need original row to do efficent undo for update

  storage/maria/ma_blockrec.h@1.6, 2007-05-29 20:13:54+03:00, monty@mysql.com +5 -2
    Added ROW_EXTENTS_ON_STACK
    Changed prototype for update and delete of row

  storage/maria/ma_check.c@1.16, 2007-05-29 20:13:54+03:00, monty@mysql.com +2 -1
    Added original row to delete_record() call

  storage/maria/ma_control_file.h@1.14, 2007-05-29 20:13:54+03:00, monty@mysql.com +7 -0
    Added ifdefs for C++

  storage/maria/ma_delete.c@1.9, 2007-05-29 20:13:54+03:00, monty@mysql.com +1 -1
    Added original row to delete_record() call
    (Needed for efficent undo logging)

  storage/maria/ma_dynrec.c@1.12, 2007-05-29 20:13:54+03:00, monty@mysql.com +5 -2
    Added extra argument to delete_record() and update_record()
    Removed not used variable

  storage/maria/ma_init.c@1.6, 2007-05-29 20:13:54+03:00, monty@mysql.com +1 -0
    Initialize log handler

  storage/maria/ma_loghandler.c@1.11, 2007-05-29 20:13:54+03:00, monty@mysql.com +310 -244
    Removed not used variable
    Change initialization of log_record_type_descriptors to not be depending on enum order
    Use array of LEX_STRING's to send data to log handler

  storage/maria/ma_loghandler.h@1.5, 2007-05-29 20:13:54+03:00, monty@mysql.com +78 -35
    New defines
    Use array of LEX_STRING's to send data to log handler

  storage/maria/ma_open.c@1.14, 2007-05-29 20:13:54+03:00, monty@mysql.com +5 -0
    Added 'dummy' transaction option to MARIA_INFO so that we can always assume 'trn' exists.
    Store in MARIA_SHARE->page_type if pages will have up to date LSN's

  storage/maria/ma_pagecache.c@1.18.1.5, 2007-05-29 20:13:54+03:00, monty@mysql.com +189 -162
    Don't decrease number of readers when using pagecache_write()/pagecache_read()
    In pagecache_write() decrement request count if page was left pinned
    Added pagecache_delete_pages()
    Removed some casts
    Make trace output consistent with rest of code
    Simplify calling of DBUG_ASSERT(0)
    Only update LSN if the LSN is bigger than what's already on the page
    Added LSN parameter pagecache_unpin_page(), pagecache_unpin(), and pagecache_unlock()
    (Part of patch from Sanja)

  include/pagecache.h@1.10, 2007-05-29 20:13:54+03:00, monty@mysql.com +14 -4
    Added undo LSN when unlocking pages

  storage/maria/ma_static.c@1.6, 2007-05-29 20:13:54+03:00, monty@mysql.com +7 -0
    Added 'dummy' transaction option to MARIA_INFO so that we can always assume 'trn' exists.
    Added default page cache

  storage/maria/ma_statrec.c@1.6, 2007-05-29 20:13:54+03:00, monty@mysql.com +3 -1
    Added extra argument to delete_record() and update_record()

  storage/maria/ma_test1.c@1.8, 2007-05-29 20:13:54+03:00, monty@mysql.com +5 -1
    Added option -T for transactions

  storage/maria/ma_test2.c@1.11, 2007-05-29 20:13:54+03:00, monty@mysql.com +6 -2
    Added option -T for transactions

  storage/maria/ma_test_all.sh@1.6, 2007-05-29 20:13:54+03:00, monty@mysql.com +3 -0
    Test with transactions

  storage/maria/ma_update.c@1.9, 2007-05-29 20:13:54+03:00, monty@mysql.com +1 -1
    Changed prototype for update of row

  storage/maria/maria_def.h@1.18, 2007-05-29 20:13:54+03:00, monty@mysql.com +33 -14
    Changed prototype for update & delete of row as block records need to access the old row
    Store in MARIA_SHARE->page_type if pages will have up to date LSN's
    Added MARIA_MAX_TREE_LEVELS to allow us to calculate the number of possible pinned pages we may need.
    Removed not used 'empty_bits_buffer'
    Added pointer to transaction object
    Added array for pinned pages
    Added log_row_parts array for logging of field data.
    Added MARIA_PINNED_PAGE to store pinned pages

  storage/maria/trnman.c@1.19, 2007-05-29 20:13:54+03:00, monty@mysql.com +117 -28
    Added accessor functions to transaction object
    Added missing DBUG_RETURN()
    More debugging
    More comments
    Changed // comment of code to #ifdef NOT_USED
    Transaction manager integrated.
    Post review fixes
    Part of patch originally from Sergei

  storage/maria/trnman.h@1.11, 2007-05-29 20:13:54+03:00, monty@mysql.com +17 -15
    Split trnman.h into two files, so that we don't have to include my_atomic.h into the .cc program.
    (Temporary fix to avoid bug in gcc)

  storage/maria/trnman_public.h@1.1, 2007-05-29 20:13:55+03:00, monty@mysql.com +49 -0
    New BitKeeper file ``storage/maria/trnman_public.h''

  storage/maria/trnman_public.h@1.0, 2007-05-29 20:13:55+03:00, monty@mysql.com +0 -0

  storage/maria/unittest/ma_pagecache_single.c@1.9, 2007-05-29 20:13:54+03:00, monty@mysql.com +10 -5
    Added missing argument
    Added SKIP_BIG_TESTS
    (Patch from Sanja)

  storage/maria/unittest/ma_test_loghandler-t.c@1.5, 2007-05-29 20:13:54+03:00, monty@mysql.com +39 -9
    Test logging with new LEX_STRING parameter
    (Patch from Sanja)

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.5, 2007-05-29 20:13:54+03:00, monty@mysql.com +37 -12
    Test logging with new LEX_STRING parameter
    (Patch from Sanja)

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.6, 2007-05-29 20:13:54+03:00, monty@mysql.com +15 -3
    Test logging with new LEX_STRING parameter
    (Patch from Sanja)

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.6, 2007-05-29 20:13:54+03:00, monty@mysql.com +5 -1
    Test logging with new LEX_STRING parameter
    (Patch from Sanja)

  storage/maria/unittest/trnman-t.c@1.10, 2007-05-29 20:13:54+03:00, monty@mysql.com +14 -5
    Stack overflow detection
    (Patch from Sergei)

  unittest/mytap/tap.c@1.12, 2007-05-29 20:13:55+03:00, monty@mysql.com +6 -0
    Detect --big
    (Patch from Sergei)

  unittest/mytap/tap.h@1.10, 2007-05-29 20:13:55+03:00, monty@mysql.com +42 -1
    Skip_big_tests and SKIP_BIG_TESTS
    (Patch from Sergei)

  unittest/unit.pl@1.8, 2007-05-29 20:13:54+03:00, monty@mysql.com +11 -1
    Command-line options --big and --verbose
    (Patch from Sergei)

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.355.1.104, 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.583.85.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.2409.114.8, 2007-04-26 00:19:56+03:00, bell@desktop.sanja.is.com.ua +2 -0
  fixed mistypings in comments and spaces

  storage/maria/ma_blockrec.c@1.11, 2007-04-26 00:19:54+03:00, bell@desktop.sanja.is.com.ua +24 -25
    fixed mistypings in comments and spaces

  storage/maria/ma_loghandler.c@1.10, 2007-04-26 00:19:54+03:00, bell@desktop.sanja.is.com.ua +2 -2
    fixed mistypings in comments and spaces

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.2469.217.1, 2007-04-24 18:42:46+05:00, holyfoot@mysql.com +1 -0
  bug #27405 (Partitioning InnoDB auto_increment bug)
  InnoDB engine changes internal auto_increment counter only after
  ha_innodb::write_row, so two threads can't simultaneously
  operate between ha_innodb::update_autoincrement and
  ha_innodb::write_row.
  So concurrent execution of ha_partition::write_row prevented

  sql/ha_partition.cc@1.88.1.1, 2007-04-24 18:42:43+05:00, holyfoot@mysql.com +21 -2
    use table_share->mutex to avoid concurrent write_row for AUTO_INCREMENTed table

ChangeSet@1.2469.210.1, 2007-04-23 17:58:33-04:00, cmiller@zippy.cornsilk.net +3 -0
  Contributed patch from Jorge Bernal Ordovs.  CLA#42
  
  Bug#27894: mysqlbinlog formats timestamp wrong in comment
  
  Date stamps lack zero padding, and so are meaningless.
  
  Implement minimum-width zero padding for the percent-escape sequences
  used in the logging code.

  mysql-test/r/mysqlbinlog2.result@1.14, 2007-04-23 17:58:31-04:00, cmiller@zippy.cornsilk.net +26 -0
    Include the long form, so we notice that it may be broken.  Replace
    away specific elements that vary from run to run.

  mysql-test/t/mysqlbinlog2.test@1.16, 2007-04-23 17:58:31-04:00, cmiller@zippy.cornsilk.net +2 -1
    Include the long form, so we notice that it may be broken.  Replace
    away specific elements that vary from run to run.

  mysys/mf_iocache2.c@1.34, 2007-04-23 17:58:31-04:00, cmiller@zippy.cornsilk.net +35 -3
    Implement minimum-width padding for printf-style percent-expressions.

ChangeSet@1.2409.114.7, 2007-04-20 15:16:43+03:00, monty@mysql.com +1 -0
  Fixed some problems caused by and unconvered when we don't read the first bitmap on open

  storage/maria/ma_bitmap.c@1.9, 2007-04-20 15:16:41+03:00, monty@mysql.com +26 -14
    Set 'first_bitmap_with_space' to point at first page, if it's was not set before.
    (This is needed as we are not anymore reading the first bitmap into memory on startup)
    Fixed some bugs with full bitmaps and changing bitmaps that was unconvered while finding and fixing
    the above problem.

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.2409.114.6, 2007-04-19 18:48:36+03:00, monty@mysql.com +15 -0
  After merge fixes
  Read blocks through page cache in check_block_record()
  Don't read first bitmap on ma_open()
  Don't require that a files block_size is equal to maria_block_size, if page cache is not setup yet.
  Changed ma_test1, ma_test2, maria_chk and maria_pack to always create a page cache.
  The above fixes so that ma_test_all now works again
  

  BitKeeper/etc/ignore@1.250, 2007-04-19 18:47:55+03:00, monty@mysql.com +9 -9
    added storage/maria/unittest/ma_pagecache_consist_1k-t-big storage/maria/unittest/ma_pagecache_consist_1kHC-t-big storage/maria/unittest/ma_pagecache_consist_1kRD-t-big storage/maria/unittest/ma_pagecache_consist_1kWR-t-big storage/maria/unittest/ma_pagecache_consist_64k-t-big storage/maria/unittest/ma_pagecache_consist_64kHC-t-big storage/maria/unittest/ma_pagecache_consist_64kRD-t-big storage/maria/unittest/ma_pagecache_consist_64kWR-t-big storage/maria/unittest/ma_pagecache_single_64k-t-big

  BitKeeper/etc/ignore@1.249, 2007-04-19 18:43:28+03:00, monty@mysql.com +9 -0
    added unittest/ma_pagecache_consist_1k-t-big unittest/ma_pagecache_consist_1kHC-t-big unittest/ma_pagecache_consist_1kRD-t-big unittest/ma_pagecache_consist_1kWR-t-big unittest/ma_pagecache_consist_64k-t-big unittest/ma_pagecache_consist_64kHC-t-big unittest/ma_pagecache_consist_64kRD-t-big unittest/ma_pagecache_consist_64kWR-t-big unittest/ma_pagecache_single_64k-t-big

  include/maria.h@1.9, 2007-04-19 18:48:34+03:00, monty@mysql.com +2 -0
    Added MARIA_MIN_PAGE_CACHE_SIZE

  storage/maria/ma_bitmap.c@1.8, 2007-04-19 18:48:34+03:00, monty@mysql.com +10 -5
    After merge fixes
    Create dummy bitmap on startup (can't read first bitmap becasue page cache may not be set up yet)

  storage/maria/ma_blockrec.c@1.10, 2007-04-19 18:48:34+03:00, monty@mysql.com +7 -8
    After merge fixes

  storage/maria/ma_check.c@1.15, 2007-04-19 18:48:34+03:00, monty@mysql.com +15 -11
    Use page cache to read rows-in-block rows.
    Don't initialize page cache; It's now done in maria_chk

  storage/maria/ma_dynrec.c@1.11, 2007-04-19 18:48:34+03:00, monty@mysql.com +8 -5
    Trivial code reorganization

  storage/maria/ma_open.c@1.13, 2007-04-19 18:48:34+03:00, monty@mysql.com +8 -3
    Don't give error for conflicting block size if page cache is not initalized.
    (Needed for maria_chk to be able to work on tables with different page sizes)
    After merge fixes

  storage/maria/ma_page.c@1.9, 2007-04-19 18:48:34+03:00, monty@mysql.com +3 -4
    Fix compiler warning
    Remove net needed asserts (Guranteed by ma_create())

  storage/maria/ma_pagecache.c@1.18.1.4, 2007-04-19 18:48:34+03:00, monty@mysql.com +11 -8
    Allow one to create a page cache with just one block
    (For trivail scan of table)
    Trivial code simplication

  include/pagecache.h@1.9, 2007-04-19 18:48:34+03:00, monty@mysql.com +1 -1
    Filedescriptors should be of type File

  storage/maria/ma_test1.c@1.7, 2007-04-19 18:48:34+03:00, monty@mysql.com +2 -2
    Always create a page cache (Maria now requires a page cache to work)

  storage/maria/ma_test2.c@1.10, 2007-04-19 18:48:34+03:00, monty@mysql.com +8 -23
    Always create a page cache (Maria now requires a page cache to work)

  storage/maria/maria_chk.c@1.11, 2007-04-19 18:48:34+03:00, monty@mysql.com +186 -195
    Remove command line options --maria_block_size and --pagecache_block_size.
    Set the global maria_block_size from the data file. This allows maria_chk to work with tables of different block sizes.
    Simply DESCRIPT handling; Allows us to remove one indentation level in maria_chk().
    Always initialize page cache if we are doing check/repair.
    (Most of the patch is reindentation of the code)

  storage/maria/maria_def.h@1.17, 2007-04-19 18:48:34+03:00, monty@mysql.com +2 -2
    After merge fix

  storage/maria/maria_pack.c@1.11, 2007-04-19 18:48:34+03:00, monty@mysql.com +11 -2
    Set maria_block_size based on the files block_size.
    Initalize page cache (needed for getting rows-in-blocks to works)

ChangeSet@1.2409.115.1, 2007-04-19 13:18:56+03:00, monty@mysql.com +51 -0
  Fixes after review of guilhem of block record patch
  Short overview:
  Changed a lot of variable, functions, defines and struct elements to use more readable names
  More comments (mostly function and structure slot comments)
  
  Other things:
  Changed 'USE_WHOLE_KEY' to a big number to not interfer with long keys
  Ensure that tail block are at least of size 'MIN_TAIL_SIZE'
  Allow longer keys and key parts than before (don't limit Maria interface by HA_MAX_KEY_LENGTH)
  Use ma_chsize() to write initial bitmap page
  Added checking if using file with wrong block_size
  Added issing types to type_names[] (for maria_chk -d)
  Added maria_max_key_length()

  include/maria.h@1.5.1.2, 2007-04-19 13:18:51+03:00, monty@mysql.com +5 -4
    Changed maria_portable_size_char_ptr to portable_size_char_ptr and moved it to my_handler.h
    Removed not used variable maria_delay_rec_write.
    More comments

  include/my_handler.h@1.16, 2007-04-19 13:18:51+03:00, monty@mysql.com +7 -0
    Added portable_sizeof_char_ptr

  include/myisam.h@1.84, 2007-04-19 13:18:51+03:00, monty@mysql.com +0 -2
    Changed mi_portable_size_char_ptr to portable_size_char_ptr and moved it to my_handler.h

  mysql-test/r/maria.result@1.8, 2007-04-19 13:18:51+03:00, monty@mysql.com +22 -18
    Fix results when we now have a longer key length

  mysql-test/t/maria.test@1.8, 2007-04-19 13:18:51+03:00, monty@mysql.com +4 -0
    More tests

  mysys/my_pread.c@1.20, 2007-04-19 13:18:51+03:00, monty@mysql.com +0 -2
    Code cleanup

  sql/net_serv.cc@1.106.1.1, 2007-04-19 13:18:52+03:00, monty@mysql.com +2 -2
    Changed warning to note (as in main 5.1 tree) to avoid not critical failing tests

  sql/sql_select.cc@1.492.2.2, 2007-04-19 13:18:52+03:00, monty@mysql.com +2 -2
    Use portable_sizeof_char_ptr

  storage/maria/ha_maria.cc@1.15.1.1, 2007-04-19 13:18:52+03:00, monty@mysql.com +21 -1
    Added max_supported_key_length(), as this is not a trival function anymore

  storage/maria/ha_maria.h@1.9, 2007-04-19 13:18:52+03:00, monty@mysql.com +2 -3
    Moved max_supported_key_length(), as this is not a trival function anymore

  storage/maria/ma_bitmap.c@1.4.1.1, 2007-04-19 13:18:52+03:00, monty@mysql.com +283 -35
    Lots of new comments
    Added maria_bitmap_marker[] to mark 2 last bytes of each bitmap (for corruption detection)
    Trivial code changes (based on review comments)

  storage/maria/ma_blockrec.c@1.6.1.1, 2007-04-19 13:18:52+03:00, monty@mysql.com +230 -150
    More code comments
    Renamed _block_row() functions to _block_record()
    Trivial code changes, based on review comments
    Moved Code from maria_close() to _ma_end_block_record()
    Some function renames to make things more understandable
    DIR_ENTRY_OFFSET -> DIR_COUNT_OFFSET
    keybuff_used -> keyread_buff_used
    ma_recordpos_to_offset -> ma_recordpos_to_dir_entry
    Changed some 'rec' named variables to 'column'.
    Ensure that tail block are at least of size 'MIN_TAIL_SIZE'

  storage/maria/ma_blockrec.h@1.5, 2007-04-19 13:18:52+03:00, monty@mysql.com +35 -19
    More comments
    DIRCOUNT_SIZE -> DIR_COUNT_SIZE
    Added define for maira_bitmap_marker[]
    ma_recordpos_to_offset -> ma_recordpos_to_dir_entry
    xxx_block_row() -> xxx_block_record()
    Made _ma_read_bitmap_page() static

  storage/maria/ma_check.c@1.12.1.1, 2007-04-19 13:18:52+03:00, monty@mysql.com +25 -15
    More comments
    ma_recordpos_to_offset() -> ma_recordpos_to_dir_entry()
    DIR_ENTRY_OFFSET -> DIR_COUNT_OFFSET
    rec variables -> column variables
    recdef -> columndef

  storage/maria/ma_checksum.c@1.5, 2007-04-19 13:18:52+03:00, monty@mysql.com +16 -13
    rec -> column
    Avoid an 'if' in _ma_checksum() for the common case

  storage/maria/ma_close.c@1.8.1.1, 2007-04-19 13:18:52+03:00, monty@mysql.com +1 -3
    Moved resetting of info->dfile to ma_end_once_block_record()

  storage/maria/ma_create.c@1.11, 2007-04-19 13:18:52+03:00, monty@mysql.com +78 -75
    Some variable changes to make things more readable:
    recinfo -> columndef
    rec -> column
    rec_end -> end_column
    record_type -> datafile_type
    ma_recinfo_write() -> ma_columndef_write()
    Fixed wrong setting of 'data_file_length'; Now max_rows should be calculated correctly
    New check if too long key.
    Use ma_chsize() to write bitmap page.
    

  storage/maria/ma_delete.c@1.8, 2007-04-19 13:18:52+03:00, monty@mysql.com +1 -1
    keybuff_used -> keyread_buff_used

  storage/maria/ma_dynrec.c@1.8.1.1, 2007-04-19 13:18:52+03:00, monty@mysql.com +50 -55
    rec -> columndef
    rec_length -> column_length
    maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
    Better comment for _ma_read_rnd_dynamic_record()

  storage/maria/ma_ft_eval.c@1.4, 2007-04-19 13:18:52+03:00, monty@mysql.com +1 -1
    maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/maria/ma_ft_test1.c@1.4, 2007-04-19 13:18:52+03:00, monty@mysql.com +2 -2
    maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/maria/ma_ft_update.c@1.5, 2007-04-19 13:18:52+03:00, monty@mysql.com +1 -1
    keybuff_used -> keyread_buff_used

  storage/maria/ma_info.c@1.4.1.1, 2007-04-19 13:18:52+03:00, monty@mysql.com +4 -0
    More comments

  storage/maria/ma_open.c@1.10.1.1, 2007-04-19 13:18:52+03:00, monty@mysql.com +51 -37
    Added checking if using file with wrong block_size
    New checking of max_key_length
    rec -> columndef
    _ma_recinfo_write -> _ma_columndef_write
    Don't change block_size (as this is checked in ma_create())
    More comments

  storage/maria/ma_packrec.c@1.7.1.1, 2007-04-19 13:18:52+03:00, monty@mysql.com +16 -16
    Trivial code changes
    rec -> columndef
    maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/maria/ma_page.c@1.5.1.1, 2007-04-19 13:18:52+03:00, monty@mysql.com +1 -1
    keybuff_used -> keyread_buff_used

  storage/maria/ma_rkey.c@1.7, 2007-04-19 13:18:52+03:00, monty@mysql.com +0 -1
    Removed not needded empty line

  storage/maria/ma_rrnd.c@1.4, 2007-04-19 13:18:52+03:00, monty@mysql.com +0 -1
    Removed not used variable

  storage/maria/ma_rt_index.c@1.6, 2007-04-19 13:18:52+03:00, monty@mysql.com +11 -11
    keybuff_used -> keyread_buff_used

  storage/maria/ma_search.c@1.7, 2007-04-19 13:18:52+03:00, monty@mysql.com +9 -9
    keybuff_used -> keyread_buff_used
    Trivial code changes

  storage/maria/ma_sp_test.c@1.4, 2007-04-19 13:18:52+03:00, monty@mysql.com +1 -1
    maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/maria/ma_test1.c@1.4.1.1, 2007-04-19 13:18:52+03:00, monty@mysql.com +2 -2
    maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/maria/ma_test2.c@1.7.1.1, 2007-04-19 13:18:52+03:00, monty@mysql.com +1 -1
    maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/maria/ma_update.c@1.8, 2007-04-19 13:18:52+03:00, monty@mysql.com +1 -1
    Updated comment

  storage/maria/ma_write.c@1.10.1.1, 2007-04-19 13:18:53+03:00, monty@mysql.com +2 -2
    keybuff_used -> keyread_buff_used

  storage/maria/maria_chk.c@1.8.1.1, 2007-04-19 13:18:53+03:00, monty@mysql.com +20 -20
    Added missing types to type_names[]
    Removed not used variable
    rec -> columndef
    Replaced some numbers with define flags

  storage/maria/maria_def.h@1.14.1.1, 2007-04-19 13:18:53+03:00, monty@mysql.com +56 -18
    More comments
    Added 'MARIA_INDEX_MIN_OVERHEAD_SIZE'
    rec -> columndef
    keybuff_used -> keyread_buff_used
    _ma_recinfo_write -> _ma_culumndef_write
    _ma_recinfo_read -> _ma_columndef_read
    Changed 'USE_WHOLE_KEY' to a big number to not interfer with long keys
    Added maria_max_key_length()

  storage/maria/maria_pack.c@1.8.1.1, 2007-04-19 13:18:53+03:00, monty@mysql.com +11 -9
    Updated message strings
    rec -> columndef
    maria_portable_sizeof_char_ptr -> portable_sizeof_char_ptr
    More comments

  storage/myisam/ft_eval.c@1.22, 2007-04-19 13:18:53+03:00, monty@mysql.com +1 -1
    mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/myisam/ft_test1.c@1.24, 2007-04-19 13:18:53+03:00, monty@mysql.com +2 -2
    mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/myisam/mi_checksum.c@1.12, 2007-04-19 13:18:53+03:00, monty@mysql.com +2 -2
    mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/myisam/mi_create.c@1.65, 2007-04-19 13:18:53+03:00, monty@mysql.com +2 -2
    mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/myisam/mi_dynrec.c@1.50, 2007-04-19 13:18:53+03:00, monty@mysql.com +4 -4
    mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/myisam/mi_open.c@1.107, 2007-04-19 13:18:53+03:00, monty@mysql.com +1 -1
    mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/myisam/mi_packrec.c@1.42, 2007-04-19 13:18:53+03:00, monty@mysql.com +1 -1
    mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/myisam/mi_rkey.c@1.30.1.1, 2007-04-19 13:18:53+03:00, monty@mysql.com +2 -0
    Unlock mutex also in case of error

  storage/myisam/mi_test1.c@1.33, 2007-04-19 13:18:53+03:00, monty@mysql.com +2 -2
    mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/myisam/mi_test2.c@1.39, 2007-04-19 13:18:53+03:00, monty@mysql.com +1 -1
    mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/myisam/myisampack.c@1.61, 2007-04-19 13:18:53+03:00, monty@mysql.com +4 -4
    mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  storage/myisam/sp_test.c@1.14.1.1, 2007-04-19 13:18:53+03:00, monty@mysql.com +1 -1
    mi_portable_sizeof_char_ptr -> portable_sizeof_char_ptr

  support-files/magic@1.5, 2007-04-19 13:18:53+03:00, monty@mysql.com +2 -2
    Fixed typo

ChangeSet@1.2409.114.4, 2007-04-18 14:45:32+03:00, bell@desktop.sanja.is.com.ua +2 -0
  Fixed dubug info.

  mysys/my_safehash.c@1.2, 2007-04-18 14:45:28+03:00, bell@desktop.sanja.is.com.ua +3 -3
    Fixed dubug info.

  sql/set_var.cc@1.215.2.5, 2007-04-18 14:45:28+03:00, bell@desktop.sanja.is.com.ua +5 -6
    fixed parameters.

ChangeSet@1.2409.114.3, 2007-04-18 12:55:09+03:00, bell@desktop.sanja.is.com.ua +10 -0
  Postmerge fixes.
  added forgoten file.
  
  The patch broke maria.test (will be fixed later)

  mysys/my_safehash.c@1.1, 2007-04-18 12:55:07+03:00, bell@desktop.sanja.is.com.ua +297 -0
    New BitKeeper file ``mysys/my_safehash.c''

  mysys/my_safehash.c@1.0, 2007-04-18 12:55:07+03:00, bell@desktop.sanja.is.com.ua +0 -0

  sql/handler.cc@1.295.7.3, 2007-04-18 12:55:06+03:00, bell@desktop.sanja.is.com.ua +1 -2
    Pagecache block should be equal maria block.

  sql/mysqld.cc@1.594, 2007-04-18 12:55:06+03:00, bell@desktop.sanja.is.com.ua +8 -23
    parameters Fixed.

  storage/maria/ma_bitmap.c@1.6, 2007-04-18 12:55:06+03:00, bell@desktop.sanja.is.com.ua +1 -1
    fixed typo.

  storage/maria/ma_blockrec.c@1.8, 2007-04-18 12:55:07+03:00, bell@desktop.sanja.is.com.ua +4 -4
    fixed typo.

  storage/maria/ma_delete_all.c@1.10, 2007-04-18 12:55:07+03:00, bell@desktop.sanja.is.com.ua +1 -1
    fixed typo.

  storage/maria/ma_page.c@1.7, 2007-04-18 12:55:07+03:00, bell@desktop.sanja.is.com.ua +4 -3
    fixed typo.

  storage/maria/ma_pagecache.c@1.18.1.3, 2007-04-18 12:55:07+03:00, bell@desktop.sanja.is.com.ua +9 -11
    pin/lock debugging protection activated by default.

  storage/maria/ma_pagecaches.c@1.2, 2007-04-18 12:55:07+03:00, bell@desktop.sanja.is.com.ua +1 -1
    parameters Fixed.

  storage/maria/ma_preload.c@1.4, 2007-04-18 12:55:07+03:00, bell@desktop.sanja.is.com.ua +2 -2
    fixed typo.

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.2409.113.1, 2007-04-12 12:05:30+03:00, monty@mysql.com +7 -0
  Enabled ps_maria.test
  Fixed bug in field-is-zero detection
  Fixed bug in truncate file (datafile was not properly initialized)

  mysql-test/t/disabled.def@1.231.3.3, 2007-04-12 12:05:27+03:00, monty@mysql.com +0 -1
    Enable ps_maria

  storage/maria/ma_bitmap.c@1.4, 2007-04-12 12:05:27+03:00, monty@mysql.com +14 -0
    Added reset of bitmap (for truncate) 

  storage/maria/ma_blockrec.c@1.6, 2007-04-12 12:05:27+03:00, monty@mysql.com +1 -1
    Fixed bug in zero detection

  storage/maria/ma_blockrec.h@1.4, 2007-04-12 12:05:27+03:00, monty@mysql.com +1 -0
    New prototype

  storage/maria/ma_create.c@1.10, 2007-04-12 12:05:27+03:00, monty@mysql.com +22 -13
    Moved initialzation of datafile to separate function

  storage/maria/ma_delete_all.c@1.8, 2007-04-12 12:05:28+03:00, monty@mysql.com +4 -0
    Added initializtion of data file

  storage/maria/maria_def.h@1.14, 2007-04-12 12:05:28+03:00, monty@mysql.com +1 -0
    New prototype

ChangeSet@1.2409.74.12, 2007-04-12 11:35:05+03:00, bell@desktop.sanja.is.com.ua +5 -0
  Postreview changes.

  include/my_sys.h@1.215, 2007-04-12 11:35:00+03:00, bell@desktop.sanja.is.com.ua +6 -1
    The comments added.

  mysys/mf_pagecache.c@1.19, 2007-04-12 11:35:00+03:00, bell@desktop.sanja.is.com.ua +100 -85
    Postreview changes.

  include/pagecache.h@1.7.1.1, 2007-04-12 11:35:00+03:00, bell@desktop.sanja.is.com.ua +16 -16
    Functions names changed.

  storage/maria/unittest/mf_pagecache_consist.c@1.8.1.1, 2007-04-12 11:35:00+03:00, bell@desktop.sanja.is.com.ua +2 -2
    Functions names changed.

  storage/maria/unittest/mf_pagecache_single.c@1.7.1.1, 2007-04-12 11:35:01+03:00, bell@desktop.sanja.is.com.ua +10 -10
    Functions names changed.

ChangeSet@1.1810.2842.3, 2007-04-12 09:47:45+02:00, mats@capulet.net +1 -0
  Adding build file for Solaris on AMD64

  BUILD/compile-solaris-amd64@1.1, 2007-04-12 09:47:34+02:00, mats@capulet.net +55 -0
    New BitKeeper file ``BUILD/compile-solaris-amd64''

  BUILD/compile-solaris-amd64@1.0, 2007-04-12 09:47:34+02:00, mats@capulet.net +0 -0

ChangeSet@1.2409.74.11, 2007-04-11 09:40:54+03:00, bell@desktop.sanja.is.com.ua +1 -0
  Fixed buffer size in the control file test

  storage/maria/unittest/ma_control_file-t.c@1.14, 2007-04-11 09:40:51+03:00, bell@desktop.sanja.is.com.ua +1 -1
    Fixed buffer size in the control file test

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.2409.74.10, 2007-04-06 04:58:05+03:00, monty@mysql.com +7 -0
  After merge fixes
  Fixed test for row based replication

  mysql-test/mysql-test-run.pl@1.270.1.6, 2007-04-06 04:58:03+03:00, monty@mysql.com +0 -13
    After merge fix

  mysql-test/r/maria.result@1.7, 2007-04-06 04:58:04+03:00, monty@mysql.com +1 -2
    Fixed test for row based replication

  mysql-test/t/maria.test@1.7, 2007-04-06 04:58:04+03:00, monty@mysql.com +8 -0
    Fixed test for row based replication

  storage/maria/ha_maria.cc@1.15, 2007-04-06 04:58:04+03:00, monty@mysql.com +1 -1
    After merge fix

  storage/maria/ma_blockrec.c@1.5, 2007-04-06 04:58:04+03:00, monty@mysql.com +3 -3
    Better to clear whole page, as 'length' may be bigger than what we need.

  storage/maria/ma_loghandler.c@1.8, 2007-04-06 04:58:04+03:00, monty@mysql.com +6 -8
    Fix compiler warning
    Removed access to not initialized memory

  storage/maria/ma_open.c@1.10, 2007-04-06 04:58:04+03:00, monty@mysql.com +0 -7
    Remove wrong (not needed) test

ChangeSet@1.2343.63.1, 2007-04-05 14:38:05+03:00, monty@mysql.com +48 -0
  Fixed that maria.test works

  BUILD/SETUP.sh@1.66.1.1, 2007-04-05 14:38:00+03:00, monty@mysql.com +25 -6
    Update from 5.1

  mysql-test/lib/init_db.sql@1.29.1.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +14 -0
    Update from 5.1

  BitKeeper/etc/ignore@1.246.1.1, 2007-04-05 14:38:02+03:00, monty@mysql.com +9 -0
    Added storage/maria/unittest/mf_pagecache_consist_1k-t-big storage/maria/unittest/mf_pagecache_consist_1kHC-t-big storage/maria/unittest/mf_pagecache_consist_1kRD-t-big storage/maria/unittest/mf_pagecache_consist_1kWR-t-big storage/maria/unittest/mf_pagecache_consist_64k-t-big storage/maria/unittest/mf_pagecache_consist_64kHC-t-big storage/maria/unittest/mf_pagecache_consist_64kRD-t-big storage/maria/unittest/mf_pagecache_consist_64kWR-t-big storage/maria/unittest/mf_pagecache_single_64k-t-big to the ignore list

  include/maria.h@1.5.1.1, 2007-04-05 14:38:00+03:00, monty@mysql.com +9 -8
    Moved structs into size order

  mysql-test/include/varchar.inc@1.8.1.1, 2007-04-05 14:38:00+03:00, monty@mysql.com +6 -6
    Fixed error numbers (as in 5.1)

  mysql-test/lib/mtr_cases.pl@1.50.2.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +18 -6
    Update from 5.1

  mysql-test/lib/mtr_diff.pl@1.1.1.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +14 -0
    Update from 5.1

  mysql-test/lib/mtr_gcov.pl@1.2.1.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +14 -0
    Update from 5.1

  mysql-test/lib/mtr_gprof.pl@1.1.1.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +14 -0
    Update from 5.1

  mysql-test/lib/mtr_im.pl@1.2.1.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +14 -0
    Update from 5.1

  mysql-test/lib/mtr_io.pl@1.11.1.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +14 -0
    Update from 5.1

  mysql-test/lib/mtr_match.pl@1.4.1.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +14 -0
    Update from 5.1

  mysql-test/lib/mtr_misc.pl@1.22.1.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +14 -0
    Update from 5.1

  mysql-test/lib/mtr_process.pl@1.64.2.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +16 -1
    Update from 5.1

  mysql-test/lib/mtr_report.pl@1.42.1.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +18 -2
    Update from 5.1

  mysql-test/lib/mtr_stress.pl@1.3.1.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +14 -0
    Update from 5.1

  mysql-test/lib/mtr_timer.pl@1.12.1.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +14 -0
    Update from 5.1

  mysql-test/lib/mtr_unique.pl@1.3.1.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +16 -0
    Update from 5.1

  mysql-test/mysql-test-run.pl@1.254.5.2, 2007-04-05 14:38:00+03:00, monty@mysql.com +216 -105
    Updated from 5.1
    Create a dummy mysql.err file if using --valgrind --debug

  mysql-test/r/maria.result@1.6, 2007-04-05 14:38:01+03:00, monty@mysql.com +37 -42
    Updated results. The reason for the new results are:
    
    - Maria doesn't support REPAIR TABLE or OPTIMIZE table yet
    - Some statistics information is different, so MySQL prefers index reads instead of table scans
    - No support for concurrent writes in the default BLOCK_RECORD mode
    - No support for different KEY_BLOCK sizes (will not be fixed)
    

  mysql-test/t/disabled.def@1.220.5.3, 2007-04-05 14:38:01+03:00, monty@mysql.com +0 -1
    Enable maria test

  mysql-test/t/maria.test@1.6, 2007-04-05 14:38:01+03:00, monty@mysql.com +50 -43
    No support for concurrent writes in the default BLOCK_RECORD mode
    No support for different KEY_BLOCK sizes (will not be fixed)
    

  mysql-test/t/myisam.test@1.71.5.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +1 -1
    Fix to be able to run with --extern

  mysql-test/t/query_cache_notembedded.test@1.6.2.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +2 -2
    Fix to be able to run with --extern

  sql/filesort.cc@1.119.1.2, 2007-04-05 14:38:01+03:00, monty@mysql.com +1 -1
    Fixed compiler warning

  sql/handler.cc@1.287.5.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +3 -3
    Use new error message (as in 5.1)

  sql/share/errmsg.txt@1.137.1.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +590 -551
    Update error messages (as in 5.1)

  sql/slave.cc@1.293.17.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +2 -0
    Fixed compiler warning

  sql/slave.h@1.102.6.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +0 -2
    Fixed compiler warning

  sql/sql_table.cc@1.375.3.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +1 -2
    Fixed compiler warning

  storage/maria/ha_maria.cc@1.11.2.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +63 -19
    Added better scan_time()
    Disble REPAIR on BLOCK_RECORD tables
    Added rnd_end() to free memory after scan
    Don't pack numerical primary keys
    Don't allow fast alter table if row type changes

  storage/maria/ha_maria.h@1.6.1.1, 2007-04-05 14:38:01+03:00, monty@mysql.com +4 -0
    Added get_row_type(), scan_time() and rnd_end()

  storage/maria/ma_bitmap.c@1.1.2.1, 2007-04-05 14:38:02+03:00, monty@mysql.com +14 -5
    Fixed some bugs found with maria.test
    Added more DBUG_PRINT and some more comments

  storage/maria/ma_blockrec.c@1.2.2.1, 2007-04-05 14:38:02+03:00, monty@mysql.com +188 -81
    Fixed some bugs found with maria.test
    Simplified code
    More comments

  storage/maria/ma_blockrec.h@1.1.1.1, 2007-04-05 14:38:02+03:00, monty@mysql.com +2 -1
    Added DBUG_ASSERT()

  storage/maria/ma_check.c@1.9.2.1, 2007-04-05 14:38:02+03:00, monty@mysql.com +12 -3
    Don't check record data links with block_records
    Update state.changed properly

  storage/maria/ma_checksum.c@1.2.1.1, 2007-04-05 14:38:02+03:00, monty@mysql.com +2 -3
    Fixed bug in checksum handling (only first field was calculated)

  storage/maria/ma_create.c@1.6.1.1, 2007-04-05 14:38:02+03:00, monty@mysql.com +50 -27
    Set rec->fill_length properly
    Added extra testing needed for BLOCK_RECORD
    Fixed bug in unlock of not locked mutex
    Fixed memory leak

  storage/maria/ma_delete.c@1.5.1.1, 2007-04-05 14:38:02+03:00, monty@mysql.com +2 -1
    Update state.changed

  storage/maria/ma_delete_all.c@1.4.2.1, 2007-04-05 14:38:02+03:00, monty@mysql.com +1 -0
    Update state.changed

  storage/maria/ma_extra.c@1.6.2.1, 2007-04-05 14:38:02+03:00, monty@mysql.com +15 -4
    Disable caching of rows if we are using BLOCK_RECORD
    (scan_init will enable caching of rows when using BLOCK_RECORD)

  storage/maria/ma_info.c@1.2.2.1, 2007-04-05 14:38:02+03:00, monty@mysql.com +3 -3
    Added data_file_type

  storage/maria/ma_search.c@1.3.1.1, 2007-04-05 14:38:02+03:00, monty@mysql.com +5 -4
    Fixed bug with signed bytes

  storage/maria/ma_test2.c@1.5.2.1, 2007-04-05 14:38:02+03:00, monty@mysql.com +1 -2
    Fixed wrong pointer handling (caused crash on 64 bit machines)

  storage/maria/ma_write.c@1.7.2.1, 2007-04-05 14:38:02+03:00, monty@mysql.com +2 -0
    Added DBUG_ statements

  storage/maria/maria_def.h@1.10.2.1, 2007-04-05 14:38:02+03:00, monty@mysql.com +1 -0
    Added STATE_NOT_OPTIMIZED_ROWS

  storage/myisam/mi_create.c@1.62.1.1, 2007-04-05 14:38:02+03:00, monty@mysql.com +12 -9
    Fixed bug with unlocking of not locked mutex (in case of error condition)

  storage/myisam/mi_test2.c@1.36.1.1, 2007-04-05 14:38:02+03:00, monty@mysql.com +1 -2
    Fixed wrong pointer handling (caused crash on 64 bit machines)

ChangeSet@1.2343.62.1, 2007-04-04 23:37:09+03:00, bell@pwbook.sanja.is.com.ua +45 -0
  Pagecache integration for review.

  include/maria.h@1.6, 2007-04-04 23:32:38+03:00, bell@pwbook.sanja.is.com.ua +7 -7
    Pagecache integration.

  include/myisamchk.h@1.3, 2007-04-04 23:32:38+03:00, bell@pwbook.sanja.is.com.ua +1 -1
    Pagecache integration.

  mysys/Makefile.am@1.89.1.1, 2007-04-04 23:32:39+03:00, bell@pwbook.sanja.is.com.ua +2 -1
    Safe hash procedures moved to the separate file.
    Pagecache moved to maria engine directory.

  mysys/mf_keycaches.c@1.8.1.1, 2007-04-04 23:32:39+03:00, bell@pwbook.sanja.is.com.ua +4 -265
    Safe hash procedures moved to the separate file.

  mysys/my_safehash.h@1.1, 2007-04-04 23:32:50+03:00, bell@pwbook.sanja.is.com.ua +58 -0
    New BitKeeper file ``mysys/my_safehash.h''

  mysys/my_safehash.h@1.0, 2007-04-04 23:32:50+03:00, bell@pwbook.sanja.is.com.ua +0 -0

  sql/handler.cc@1.287.4.1, 2007-04-04 23:32:39+03:00, bell@pwbook.sanja.is.com.ua +97 -0
    Pageccahe integration.

  sql/handler.h@1.247.1.1, 2007-04-04 23:32:40+03:00, bell@pwbook.sanja.is.com.ua +12 -1
    Pagecache integration.

  sql/mysql_priv.h@1.464.2.2, 2007-04-04 23:32:40+03:00, bell@pwbook.sanja.is.com.ua +3 -0
    pagecache integration

  sql/mysqld.cc@1.591.1.1, 2007-04-04 23:32:40+03:00, bell@pwbook.sanja.is.com.ua +69 -9
    pagecache integration

  sql/set_var.cc@1.205.2.3, 2007-04-04 23:32:41+03:00, bell@pwbook.sanja.is.com.ua +174 -2
    Pagecache integration.

  sql/set_var.h@1.88.1.1, 2007-04-04 23:32:41+03:00, bell@pwbook.sanja.is.com.ua +40 -2
    Pagecache integration.

  storage/maria/Makefile.am@1.10.1.1, 2007-04-04 23:32:42+03:00, bell@pwbook.sanja.is.com.ua +2 -1
    Pagecache integration and moving to maria engine directory.

  storage/maria/ha_maria.cc@1.11.1.1, 2007-04-04 23:32:42+03:00, bell@pwbook.sanja.is.com.ua +5 -5
    File changed on PAGECCAHE_FILE.

  storage/maria/ma_bitmap.c@1.1.1.1, 2007-04-04 23:32:42+03:00, bell@pwbook.sanja.is.com.ua +12 -7
    Pagecache integration.

  storage/maria/ma_blockrec.c@1.2.1.1, 2007-04-04 23:32:42+03:00, bell@pwbook.sanja.is.com.ua +81 -48
    Pagecache integration.

  storage/maria/ma_check.c@1.9.1.1, 2007-04-04 23:32:43+03:00, bell@pwbook.sanja.is.com.ua +83 -73
    File changed on PAGECCAHE_FILE.
    Pagecache integration.

  storage/maria/ma_close.c@1.6.1.1, 2007-04-04 23:32:43+03:00, bell@pwbook.sanja.is.com.ua +10 -9
    File changed on PAGECCAHE_FILE.

  storage/maria/ma_delete_all.c@1.4.1.1, 2007-04-04 23:32:43+03:00, bell@pwbook.sanja.is.com.ua +4 -3
    File changed on PAGECCAHE_FILE.

  storage/maria/ma_dynrec.c@1.6.1.1, 2007-04-04 23:32:44+03:00, bell@pwbook.sanja.is.com.ua +26 -23
    File changed on PAGECCAHE_FILE.

  storage/maria/ma_extra.c@1.6.1.1, 2007-04-04 23:32:44+03:00, bell@pwbook.sanja.is.com.ua +14 -13
    File changed on PAGECCAHE_FILE.

  storage/maria/ma_info.c@1.2.1.1, 2007-04-04 23:32:44+03:00, bell@pwbook.sanja.is.com.ua +2 -2
    File changed on PAGECCAHE_FILE.

  storage/maria/ma_keycache.c@1.3.1.1, 2007-04-04 23:32:44+03:00, bell@pwbook.sanja.is.com.ua +25 -25
    Pagecache integration.

  storage/maria/ma_locking.c@1.5.1.1, 2007-04-04 23:32:45+03:00, bell@pwbook.sanja.is.com.ua +19 -18
    File changed on PAGECCAHE_FILE.

  storage/maria/ma_loghandler.c@1.5.1.1, 2007-04-04 23:32:45+03:00, bell@pwbook.sanja.is.com.ua +1 -0
    Assert added.

  storage/maria/ma_loghandler.h@1.4, 2007-04-04 23:32:45+03:00, bell@pwbook.sanja.is.com.ua +36 -33
    extern specifier added.

  storage/maria/ma_open.c@1.7.1.1, 2007-04-04 23:32:45+03:00, bell@pwbook.sanja.is.com.ua +13 -12
    Pagecache integration.
    File changed on PAGECCAHE_FILE.

  storage/maria/ma_packrec.c@1.5.1.1, 2007-04-04 23:32:45+03:00, bell@pwbook.sanja.is.com.ua +4 -4
    File changed on PAGECCAHE_FILE.

  storage/maria/ma_page.c@1.4.1.1, 2007-04-04 23:32:46+03:00, bell@pwbook.sanja.is.com.ua +53 -31
    Pagecache integration.

  storage/maria/ma_pagecache.c@1.17.1.2, 2007-04-04 23:32:46+03:00, bell@pwbook.sanja.is.com.ua +147 -149
    Pagecache renamed and moved to the maria directory.
    BLOCK_* defines renamed to avoid conflict with BLOCK_ERROR defined in maria_def.h

  storage/maria/ma_pagecache.c@1.17.1.1, 2007-04-04 11:08:38+03:00, bell@pwbook.sanja.is.com.ua +0 -0
    Rename: mysys/mf_pagecache.c -> storage/maria/ma_pagecache.c

  include/pagecache.h@1.8, 2007-04-04 23:32:39+03:00, bell@pwbook.sanja.is.com.ua +32 -12
    removed WRITE_NOW mode
    Pagecache parameters management.

  storage/maria/ma_pagecaches.c@1.1, 2007-04-04 23:32:49+03:00, bell@pwbook.sanja.is.com.ua +105 -0
    New BitKeeper file ``storage/maria/ma_pagecaches.c''

  storage/maria/ma_pagecaches.c@1.0, 2007-04-04 23:32:49+03:00, bell@pwbook.sanja.is.com.ua +0 -0

  storage/maria/ma_panic.c@1.2.1.1, 2007-04-04 23:32:46+03:00, bell@pwbook.sanja.is.com.ua +17 -13
    File changed on PAGECCAHE_FILE.

  storage/maria/ma_preload.c@1.1.1.1, 2007-04-04 23:32:46+03:00, bell@pwbook.sanja.is.com.ua +20 -8
    Pagecache integration.
    File changed on PAGECCAHE_FILE.

  storage/maria/ma_static.c@1.3.1.1, 2007-04-04 23:32:47+03:00, bell@pwbook.sanja.is.com.ua +2 -2
    Pagecache integration.

  storage/maria/ma_test1.c@1.3.1.1, 2007-04-04 23:32:47+03:00, bell@pwbook.sanja.is.com.ua +6 -6
    Pagecache integration.

  storage/maria/ma_test2.c@1.5.1.1, 2007-04-04 23:32:47+03:00, bell@pwbook.sanja.is.com.ua +26 -23
    Pagecache integration.

  storage/maria/ma_test3.c@1.5.1.1, 2007-04-04 23:32:48+03:00, bell@pwbook.sanja.is.com.ua +5 -5
    Pagecache integration.

  storage/maria/ma_write.c@1.7.1.1, 2007-04-04 23:32:48+03:00, bell@pwbook.sanja.is.com.ua +1 -1
    File changed on PAGECCAHE_FILE.

  storage/maria/maria_chk.c@1.6.1.1, 2007-04-04 23:32:48+03:00, bell@pwbook.sanja.is.com.ua +23 -22
    Pagecache integration.
    File changed on PAGECCAHE_FILE.

  storage/maria/maria_def.h@1.10.1.1, 2007-04-04 23:32:48+03:00, bell@pwbook.sanja.is.com.ua +6 -5
    Pagecache integration.
    File changed on PAGECCAHE_FILE.

  storage/maria/maria_ftdump.c@1.4.1.1, 2007-04-04 23:32:48+03:00, bell@pwbook.sanja.is.com.ua +2 -1
    Pagecache integration.

  storage/maria/maria_pack.c@1.6.1.1, 2007-04-04 23:32:49+03:00, bell@pwbook.sanja.is.com.ua +5 -5
    File changed on PAGECCAHE_FILE.

  storage/maria/unittest/Makefile.am@1.9, 2007-04-04 23:32:49+03:00, bell@pwbook.sanja.is.com.ua +41 -42
    Pagecache moved to the maria directory.

  storage/maria/unittest/ma_pagecache_consist.c@1.10, 2007-04-04 23:32:49+03:00, bell@pwbook.sanja.is.com.ua +1 -1
    fixed using uninitialized variable

  storage/maria/unittest/ma_pagecache_consist.c@1.9, 2007-04-04 15:22:40+03:00, bell@pwbook.sanja.is.com.ua +0 -0
    Rename: storage/maria/unittest/mf_pagecache_consist.c -> storage/maria/unittest/ma_pagecache_consist.c

  storage/maria/unittest/ma_pagecache_single.c@1.8, 2007-04-04 15:22:56+03:00, bell@pwbook.sanja.is.com.ua +0 -0
    Rename: storage/maria/unittest/mf_pagecache_single.c -> storage/maria/unittest/ma_pagecache_single.c

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.2469.13.1, 2007-03-11 22:30:54+04:00, holyfoot@mysql.com +1 -0
  Bug #26527 LOAD DATA INFILE extremely slow with partitioned table
  mysql_load calls hander::start_bulk_insert(0) to prepare caches
  for big inserts. As ha_partition didn't allow these caches
  for underlaying tables, the inserts were much slower

  sql/ha_partition.cc@1.83.1.4, 2007-03-11 22:30:51+04:00, holyfoot@mysql.com +1 -6
    allow using caches for BIG inserts

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.2409.74.8, 2007-03-02 12:15:19+01:00, guilhem@gbichot3.local +2 -0
  Maria: a stronger checksum in the control file, to test integrity.
  4 bytes, using my_checksum() (the old checksum was one byte and just
  a sum of the bytes - that was before I saw we have my_checksum :)

  storage/maria/ma_control_file.c@1.14, 2007-03-02 12:15:17+01:00, guilhem@gbichot3.local +11 -18
    stronger checksum (4 bytes instead of 1, and using CRC instead of
    simple byte sum).

  storage/maria/unittest/ma_control_file-t.c@1.13, 2007-03-02 12:15:17+01:00, guilhem@gbichot3.local +4 -4
    Checksum is now 4 bytes (total length of control file is now 23),
    so LSN and LAST_LOGNO move.

ChangeSet@1.2409.74.7, 2007-03-02 11:20:23+01:00, guilhem@gbichot3.local +91 -0
  GPL license update (same change as was done for all files in 5.1).

  storage/maria/ma_least_recently_dirtied.c@1.9, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_least_recently_dirtied.h@1.4, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/Makefile.am@1.12, 2007-03-02 11:20:17+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ft_maria.c@1.6, 2007-03-02 11:20:17+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ha_maria.cc@1.13, 2007-03-02 11:20:17+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ha_maria.h@1.7, 2007-03-02 11:20:17+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/lockman.c@1.14, 2007-03-02 11:20:17+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/lockman.h@1.6, 2007-03-02 11:20:17+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_bitmap.c@1.2, 2007-03-02 11:20:17+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_blockrec.c@1.3, 2007-03-02 11:20:17+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_blockrec.h@1.2, 2007-03-02 11:20:17+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_cache.c@1.2, 2007-03-02 11:20:17+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_changed.c@1.2, 2007-03-02 11:20:17+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_check.c@1.11, 2007-03-02 11:20:17+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_checkpoint.c@1.12, 2007-03-02 11:20:17+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_checkpoint.h@1.5, 2007-03-02 11:20:17+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_checksum.c@1.3, 2007-03-02 11:20:17+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_close.c@1.8, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_control_file.c@1.13, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_control_file.h@1.13, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_create.c@1.8, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_dbug.c@1.3, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_delete.c@1.6, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_delete_all.c@1.6, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_delete_table.c@1.5, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_dynrec.c@1.8, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_extra.c@1.8, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_ft_boolean_search.c@1.6, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_ft_eval.c@1.3, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_ft_eval.h@1.2, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_ft_nlq_search.c@1.4, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_ft_parser.c@1.5, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_ft_stem.c@1.2, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_ft_test1.c@1.3, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_ft_test1.h@1.2, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_ft_update.c@1.4, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_ftdefs.h@1.3, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_fulltext.h@1.3, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_info.c@1.3, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_init.c@1.5, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_key.c@1.6, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_keycache.c@1.4, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_locking.c@1.7, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_open.c@1.9, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_packrec.c@1.7, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_page.c@1.5, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_panic.c@1.3, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_preload.c@1.2, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_range.c@1.5, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_recovery.c@1.7, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_recovery.h@1.4, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_rename.c@1.4, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_rfirst.c@1.3, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_rkey.c@1.6, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_rlast.c@1.3, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_rnext.c@1.3, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_rnext_same.c@1.3, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_rprev.c@1.3, 2007-03-02 11:20:18+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_rrnd.c@1.3, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_rsame.c@1.3, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_rsamepos.c@1.5, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_rt_index.c@1.5, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_rt_index.h@1.3, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_rt_key.c@1.3, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_rt_key.h@1.3, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_rt_mbr.c@1.4, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_rt_mbr.h@1.3, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_rt_split.c@1.4, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_rt_test.c@1.3, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_scan.c@1.3, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_search.c@1.5, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_sort.c@1.8, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_sp_defs.h@1.4, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_sp_key.c@1.4, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_sp_test.c@1.3, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_static.c@1.4, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_statrec.c@1.5, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_test1.c@1.4, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_test2.c@1.6, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_test3.c@1.6, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_unique.c@1.5, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_update.c@1.7, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/ma_write.c@1.9, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/maria_chk.c@1.8, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/maria_def.h@1.12, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/maria_ftdump.c@1.5, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/maria_pack.c@1.8, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/tablockman.c@1.7, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/tablockman.h@1.5, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/trnman.c@1.18, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

  storage/maria/trnman.h@1.10, 2007-03-02 11:20:19+01:00, guilhem@gbichot3.local +1 -2
    GPL license update

ChangeSet@1.2409.74.6, 2007-03-01 22:36:46+01:00, guilhem@gbichot3.local +2 -0
  adding files needed for building from the source tarball

  include/Makefile.am@1.75, 2007-03-01 22:36:43+01:00, guilhem@gbichot3.local +1 -1
    needed for source tarball

  storage/maria/Makefile.am@1.11, 2007-03-01 22:36:43+01:00, guilhem@gbichot3.local +2 -1
    needed for source tarball

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.2409.74.5, 2007-03-01 18:23:58+01:00, guilhem@gbichot3.local +28 -0
  merge from MyISAM into Maria (last step of merge of 5.1 into Maria).
  Tests: "maria" and "ps_maria" fail like before merge (assertions),
  "ma_test_all" fails like before merge (ma_test2 segfaults, I'll try
  to find out why).

  storage/maria/ha_maria.cc@1.12, 2007-03-01 18:23:51+01:00, guilhem@gbichot3.local +389 -219
    merge from MyISAM into Maria

  storage/maria/ma_check.c@1.10, 2007-03-01 18:23:51+01:00, guilhem@gbichot3.local +8 -0
    merge from MyISAM into Maria

  storage/maria/ma_close.c@1.7, 2007-03-01 18:23:51+01:00, guilhem@gbichot3.local +1 -1
    TODO as a word

  storage/maria/ma_create.c@1.7, 2007-03-01 18:23:51+01:00, guilhem@gbichot3.local +8 -7
    merge from MyISAM into Maria

  storage/maria/ma_delete_all.c@1.5, 2007-03-01 18:23:51+01:00, guilhem@gbichot3.local +6 -6
    TODO as a word

  storage/maria/ma_delete_table.c@1.4, 2007-03-01 18:23:51+01:00, guilhem@gbichot3.local +2 -2
    TODO as a word

  storage/maria/ma_dynrec.c@1.7, 2007-03-01 18:23:51+01:00, guilhem@gbichot3.local +14 -4
    merge from MyISAM into Maria

  storage/maria/ma_extra.c@1.7, 2007-03-01 18:23:51+01:00, guilhem@gbichot3.local +6 -1
    merge from MyISAM into Maria

  storage/maria/ma_ft_boolean_search.c@1.5, 2007-03-01 18:23:51+01:00, guilhem@gbichot3.local +8 -8
    merge from MyISAM into Maria

  storage/maria/ma_locking.c@1.6, 2007-03-01 18:23:51+01:00, guilhem@gbichot3.local +9 -0
    merge from MyISAM into Maria

  storage/maria/ma_loghandler.c@1.7, 2007-03-01 18:23:51+01:00, guilhem@gbichot3.local +1 -1
    fix for compiler warning

  storage/maria/ma_open.c@1.8, 2007-03-01 18:23:51+01:00, guilhem@gbichot3.local +53 -4
    merge from MyISAM into Maria.
    I will ask Monty to check the ASKMONTY-marked piece of code.

  storage/maria/ma_packrec.c@1.6, 2007-03-01 18:23:52+01:00, guilhem@gbichot3.local +317 -26
    merge from MyISAM into Maria

  mysys/mf_pagecache.c@1.18, 2007-03-01 18:23:51+01:00, guilhem@gbichot3.local +9 -8
    using a more distinctive tag

  storage/maria/ma_range.c@1.4, 2007-03-01 18:23:52+01:00, guilhem@gbichot3.local +1 -0
    merge from MyISAM into Maria

  storage/maria/ma_rename.c@1.3, 2007-03-01 18:23:52+01:00, guilhem@gbichot3.local +2 -2
    TODO as a word

  storage/maria/ma_rt_index.c@1.4, 2007-03-01 18:23:52+01:00, guilhem@gbichot3.local +0 -3
    merge from MyISAM into Maria

  storage/maria/ma_rt_split.c@1.3, 2007-03-01 18:23:52+01:00, guilhem@gbichot3.local +4 -0
    merge from MyISAM into Maria

  storage/maria/ma_search.c@1.4, 2007-03-01 18:23:52+01:00, guilhem@gbichot3.local +7 -7
    merge from MyISAM into Maria

  storage/maria/ma_sort.c@1.7, 2007-03-01 18:23:52+01:00, guilhem@gbichot3.local +3 -3
    merge from MyISAM into Maria

  storage/maria/ma_update.c@1.6, 2007-03-01 18:23:52+01:00, guilhem@gbichot3.local +2 -1
    merge from MyISAM into Maria

  storage/maria/ma_write.c@1.8, 2007-03-01 18:23:52+01:00, guilhem@gbichot3.local +3 -1
    merge from MyISAM into Maria

  storage/maria/maria_chk.c@1.7, 2007-03-01 18:23:52+01:00, guilhem@gbichot3.local +1 -0
    merge from MyISAM into Maria

  storage/maria/maria_def.h@1.11, 2007-03-01 18:23:52+01:00, guilhem@gbichot3.local +1 -0
    merge from MyISAM into Maria

  storage/maria/maria_pack.c@1.7, 2007-03-01 18:23:52+01:00, guilhem@gbichot3.local +5 -4
    merge from MyISAM into Maria

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.5, 2007-03-01 18:23:52+01:00, guilhem@gbichot3.local +1 -1
    fix for compiler warning

  storage/myisam/ha_myisam.cc@1.186, 2007-03-01 18:23:52+01:00, guilhem@gbichot3.local +6 -6
    merge from MyISAM into Maria

  storage/myisammrg/ha_myisammrg.cc@1.114.1.4, 2007-03-01 18:23:52+01:00, guilhem@gbichot3.local +10 -8
    merge from MyISAM into Maria

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.2343.42.16, 2007-02-27 10:59:01+02:00, bell@book.local +2 -0
  comments fixed

  storage/maria/ma_loghandler.c@1.6, 2007-02-27 10:58:53+02:00, bell@book.local +1 -2
    The function comment fixed.

  storage/maria/ma_loghandler_lsn.h@1.4, 2007-02-27 10:58:53+02:00, bell@book.local +6 -1
    Comment of LSN/TRANSLOG_ADDRESS type fixed

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.2343.42.15, 2007-02-22 10:19:52+02:00, bell@desktop.sanja.is.com.ua +1 -0
  removed pthread_attr_setstacksize (not really nead but incompatible with some platforms)

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.5, 2007-02-22 10:19:50+02:00, bell@desktop.sanja.is.com.ua +1 -8
    removed pthread_attr_setstacksize (not really nead but incompatible with some platforms)

ChangeSet@1.2343.42.14, 2007-02-21 23:54:07+02:00, bell@desktop.sanja.is.com.ua +1 -0
  fixed C++ comment

  storage/maria/ma_loghandler.c@1.5, 2007-02-21 23:53:37+02:00, bell@desktop.sanja.is.com.ua +1 -1
    fixed C++ comment

ChangeSet@1.2343.59.1, 2007-02-21 23:30:58+02:00, bell@desktop.sanja.is.com.ua +1 -0
  More postreview changes

  storage/maria/ma_loghandler.c@1.4, 2007-02-21 23:30:55+02:00, bell@desktop.sanja.is.com.ua +32 -61
    Cursor checks made as one function.

ChangeSet@1.2343.42.12, 2007-02-21 16:03:04+02:00, bell@desktop.sanja.is.com.ua +1 -0
  Temporary disable unstable test

  mysql-test/t/disabled.def@1.220.5.2, 2007-02-21 16:03:01+02:00, bell@desktop.sanja.is.com.ua +1 -0
    Temporary disable unstable test

ChangeSet@1.2343.42.11, 2007-02-21 15:54:08+02:00, bell@desktop.sanja.is.com.ua +7 -0
  unittest fixed

  storage/maria/unittest/Makefile.am@1.8, 2007-02-21 15:54:05+02:00, bell@desktop.sanja.is.com.ua +5 -0
    Unittest cleunup added

  storage/maria/unittest/ma_control_file-t.c@1.12, 2007-02-21 15:54:05+02:00, bell@desktop.sanja.is.com.ua +8 -7
    Unittest fixed according new file format

  storage/maria/unittest/ma_maria_log_cleanup.c@1.1, 2007-02-21 15:54:05+02:00, bell@desktop.sanja.is.com.ua +45 -0
    New BitKeeper file ``storage/maria/unittest/ma_maria_log_cleanup.c''

  storage/maria/unittest/ma_maria_log_cleanup.c@1.0, 2007-02-21 15:54:05+02:00, bell@desktop.sanja.is.com.ua +0 -0

  storage/maria/unittest/ma_test_loghandler-t.c@1.4, 2007-02-21 15:54:05+02:00, bell@desktop.sanja.is.com.ua +39 -7
    Unittest cleunup added
    Unittest progress report added

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.4, 2007-02-21 15:54:05+02:00, bell@desktop.sanja.is.com.ua +31 -7
    Unittest cleunup added
    Unittest progress report added

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.4, 2007-02-21 15:54:05+02:00, bell@desktop.sanja.is.com.ua +27 -37
    Unittest cleunup added
    Unittest progress report added

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.4, 2007-02-21 15:54:05+02:00, bell@desktop.sanja.is.com.ua +8 -0
    Unittest cleunup added
    Unittest progress report added

ChangeSet@1.2343.42.10, 2007-02-19 23:01:27+02:00, bell@desktop.sanja.is.com.ua +11 -0
  Postreview changes.
  Fixed befaviour when loghandler flags changed from one
  run to another one.
  Description of maria transaction log and control file
  added to the file commandÍs magic number file.

  storage/maria/ma_control_file.c@1.12, 2007-02-19 23:01:24+02:00, bell@desktop.sanja.is.com.ua +5 -6
    Postreview changes.
    

  storage/maria/ma_control_file.h@1.12, 2007-02-19 23:01:24+02:00, bell@desktop.sanja.is.com.ua +11 -14
    Postreview changes.

  storage/maria/ma_loghandler.c@1.3, 2007-02-19 23:01:24+02:00, bell@desktop.sanja.is.com.ua +1048 -1166
    Postreview changes.
    Fixed befaviour when loghandler flags changed from
    one run to another one.

  storage/maria/ma_loghandler.h@1.3, 2007-02-19 23:01:24+02:00, bell@desktop.sanja.is.com.ua +58 -190
    Postreview changes.
    Functions comment left only near the function body.

  storage/maria/ma_loghandler_lsn.h@1.3, 2007-02-19 23:01:24+02:00, bell@desktop.sanja.is.com.ua +5 -2
    Postreview changes.

  mysys/mf_pagecache.c@1.17, 2007-02-19 23:01:24+02:00, bell@desktop.sanja.is.com.ua +1 -1
    postreview changes

  storage/maria/unittest/ma_test_loghandler-t.c@1.3, 2007-02-19 23:01:24+02:00, bell@desktop.sanja.is.com.ua +55 -45
    Postreview changes.

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.3, 2007-02-19 23:01:24+02:00, bell@desktop.sanja.is.com.ua +60 -49
    Postreview changes.

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.3, 2007-02-19 23:01:24+02:00, bell@desktop.sanja.is.com.ua +13 -10
    Postreview changes.

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.3, 2007-02-19 23:01:24+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Postreview changes.

  support-files/magic@1.4, 2007-02-19 23:01:24+02:00, bell@desktop.sanja.is.com.ua +7 -0
    Description of maria transaction log and control file
    added to the file commandÕs magic number file.

ChangeSet@1.2343.42.9, 2007-02-12 14:23:43+02:00, bell@desktop.sanja.is.com.ua +15 -0
  Postmerge fix (including changing type of LSN)
  Some debug info and comments added

  storage/maria/ma_control_file.c@1.11, 2007-02-12 14:23:41+02:00, bell@desktop.sanja.is.com.ua +9 -25
    Used the same LSN storing procedure everywhere
    Postmerge fix (including changing type of LSN)

  storage/maria/ma_control_file.h@1.11, 2007-02-12 14:23:41+02:00, bell@desktop.sanja.is.com.ua +4 -6
    Postmerge fix (including changing type of LSN)

  storage/maria/ma_loghandler.c@1.2, 2007-02-12 14:23:41+02:00, bell@desktop.sanja.is.com.ua +427 -400
    Postmerge fix (including changing type of LSN)

  storage/maria/ma_loghandler.h@1.2, 2007-02-12 14:23:41+02:00, bell@desktop.sanja.is.com.ua +4 -4
    Postmerge fix (including changing type of LSN)

  storage/maria/ma_loghandler_lsn.h@1.2, 2007-02-12 14:23:41+02:00, bell@desktop.sanja.is.com.ua +25 -16
    Postmerge fix (including changing type of LSN)

  mysys/mf_pagecache.c@1.16, 2007-02-12 14:23:41+02:00, bell@desktop.sanja.is.com.ua +92 -66
    Postmerge fix (including changing type of LSN)
    Additional DBUG_ASSERTs added
    Comment about pinning mechanism added

  include/pagecache.h@1.7, 2007-02-12 14:23:41+02:00, bell@desktop.sanja.is.com.ua +6 -8
    postmerge fix

  storage/maria/unittest/Makefile.am@1.7, 2007-02-12 14:23:41+02:00, bell@desktop.sanja.is.com.ua +31 -31
    Postmerge fix

  storage/maria/unittest/ma_control_file-t.c@1.11, 2007-02-12 14:23:41+02:00, bell@desktop.sanja.is.com.ua +27 -30
    Postmerge fix (including changing type of LSN)

  storage/maria/unittest/mf_pagecache_consist.c@1.8, 2007-02-12 14:23:41+02:00, bell@desktop.sanja.is.com.ua +1 -0
    Postmerge fix (including changing type of LSN)

  storage/maria/unittest/mf_pagecache_single.c@1.7, 2007-02-12 14:23:41+02:00, bell@desktop.sanja.is.com.ua +3 -2
    Postmerge fix (including changing type of LSN)

  storage/maria/unittest/ma_test_loghandler-t.c@1.2, 2007-02-12 14:23:41+02:00, bell@desktop.sanja.is.com.ua +66 -70
    Postmerge fix (including changing type of LSN)

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.2, 2007-02-12 14:23:41+02:00, bell@desktop.sanja.is.com.ua +64 -69
    Postmerge fix (including changing type of LSN)

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.2, 2007-02-12 14:23:41+02:00, bell@desktop.sanja.is.com.ua +31 -28
    Postmerge fix (including changing type of LSN)

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.2, 2007-02-12 14:23:41+02:00, bell@desktop.sanja.is.com.ua +2 -1
    Postmerge fix (including changing type of LSN)

ChangeSet@1.2303.214.1, 2007-02-02 09:41:32+02:00, bell@desktop.sanja.is.com.ua +23 -0
  postreview changes for page cache and pre review commit for loghandler

  include/wqueue.h@1.1, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +26 -0
    New BitKeeper file ``include/wqueue.h''

  include/wqueue.h@1.0, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +0 -0

  mysys/Makefile.am@1.86.1.1, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +1 -1
    A waiting queue mechanism moved to separate file wqueue.*

  mysys/mf_keycache.c@1.61.1.1, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +1 -1
    fixed unsigned comparison

  mysys/wqueue.c@1.1, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +167 -0
    New BitKeeper file ``mysys/wqueue.c''

  mysys/wqueue.c@1.0, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +0 -0

  storage/maria/Makefile.am@1.8.1.1, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +1 -1
    The loghandler files added

  storage/maria/ma_control_file.h@1.10, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +2 -20
    Now we have loghandler and can compile control file

  storage/maria/ma_loghandler.c@1.1, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +5417 -0
    New BitKeeper file ``storage/maria/ma_loghandler.c''

  storage/maria/ma_loghandler.c@1.0, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +0 -0

  storage/maria/ma_loghandler.h@1.1, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +314 -0
    New BitKeeper file ``storage/maria/ma_loghandler.h''

  storage/maria/ma_loghandler.h@1.0, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +0 -0

  storage/maria/ma_loghandler_lsn.h@1.1, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +39 -0
    New BitKeeper file ``storage/maria/ma_loghandler_lsn.h''

  storage/maria/ma_loghandler_lsn.h@1.0, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +0 -0

  mysys/mf_pagecache.c@1.8.1.1, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +346 -428
    A waiting queue mechanism moved to separate file wqueue.*
    Fixed bug in unregistering block during write

  include/pagecache.h@1.2.1.1, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +33 -32
    A waiting queue mechanism moved to separate file wqueue.*
    Pointer name changed for compatibility

  storage/maria/maria_def.h@1.5.1.1, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +5 -0
    Including files need for compilation of maria

  storage/maria/unittest/Makefile.am@1.4.1.1, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +55 -5
    unit tests of loghandler

  storage/maria/unittest/ma_control_file-t.c@1.8.1.1, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +1 -1
    Used maria def

  storage/maria/unittest/mf_pagecache_consist.c@1.6, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +28 -5
    fixed memory overrun

  storage/maria/unittest/mf_pagecache_consist.c@1.5, 2006-12-01 15:17:14+02:00, bell@desktop.sanja.is.com.ua +0 -0
    Rename: unittest/mysys/mf_pagecache_consist.c -> storage/maria/unittest/mf_pagecache_consist.c

  storage/maria/unittest/mf_pagecache_single.c@1.5, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +4 -2
    fixed used uninitialized memory

  storage/maria/unittest/mf_pagecache_single.c@1.4, 2006-12-01 15:17:25+02:00, bell@desktop.sanja.is.com.ua +0 -0
    Rename: unittest/mysys/mf_pagecache_single.c -> storage/maria/unittest/mf_pagecache_single.c

  storage/maria/unittest/ma_test_loghandler-t.c@1.1, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +540 -0
    New BitKeeper file ``storage/maria/unittest/ma_test_loghandler-t.c''

  storage/maria/unittest/ma_test_loghandler-t.c@1.0, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +0 -0

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.1, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +570 -0
    New BitKeeper file ``storage/maria/unittest/ma_test_loghandler_multigroup-t.c''

  storage/maria/unittest/ma_test_loghandler_multigroup-t.c@1.0, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +0 -0

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.1, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +468 -0
    New BitKeeper file ``storage/maria/unittest/ma_test_loghandler_multithread-t.c''

  storage/maria/unittest/ma_test_loghandler_multithread-t.c@1.0, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +0 -0

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.1, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +140 -0
    New BitKeeper file ``storage/maria/unittest/ma_test_loghandler_pagecache-t.c''

  storage/maria/unittest/ma_test_loghandler_pagecache-t.c@1.0, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +0 -0

  storage/maria/unittest/test_file.c@1.4, 2006-12-05 13:52:02+02:00, bell@desktop.sanja.is.com.ua +0 -0
    Rename: unittest/mysys/test_file.c -> storage/maria/unittest/test_file.c

  storage/maria/unittest/test_file.h@1.3, 2006-12-05 13:52:09+02:00, bell@desktop.sanja.is.com.ua +0 -0
    Rename: unittest/mysys/test_file.h -> storage/maria/unittest/test_file.h

  unittest/mysys/Makefile.am@1.7.1.1, 2007-02-02 09:41:29+02:00, bell@desktop.sanja.is.com.ua +1 -42
    unittests of pagecache moved to maria becase pagecache need loghandler

ChangeSet@1.2343.42.7, 2007-01-26 13:32:02+02:00, monty@mysql.com +38 -0
  After merge fixes
  Removed compiler warnings
  Fixed clashing function name in maria
  Disable maria tests from MySQL level for now

  BitKeeper/deleted/.del-ha_maria.cc@1.2, 2007-01-26 13:31:01+02:00, monty@mysql.com +0 -0
    Rename: libmysqld/ha_maria.cc -> BitKeeper/deleted/.del-ha_maria.cc

  BitKeeper/etc/ignore@1.246, 2007-01-26 13:31:49+02:00, monty@mysql.com +15 -0
    added libmysqld/ha_maria.cc
    ---
    added storage/maria/unittest/maria_control unittest/maria_control
    ---
    added *.Tpo
    ---
    added unittest/page_cache_test_file_1
    ---
    added unittest/pagecache_debug.log
    ---
    added unittest/mysys/mf_pagecache_consist_1k-t-big unittest/mysys/mf_pagecache_consist_1kHC-t-big unittest/mysys/mf_pagecache_consist_1kRD-t-big unittest/mysys/mf_pagecache_consist_1kWR-t-big unittest/mysys/mf_pagecache_consist_64k-t-big unittest/mysys/mf_pagecache_consist_64kHC-t-big unittest/mysys/mf_pagecache_consist_64kRD-t-big unittest/mysys/mf_pagecache_consist_64kWR-t-big
    ---
    added unittest/mysys/mf_pagecache_single_64k-t-big

  Makefile.am@1.106.1.2, 2007-01-26 13:31:49+02:00, monty@mysql.com +2 -2
    Don't run 'test-unit' by default (takes too long time)

  client/mysqldump.c@1.260.2.1, 2007-01-26 13:31:49+02:00, monty@mysql.com +2 -2
    Fixed compiler warning

  include/lf.h@1.12, 2007-01-26 13:31:50+02:00, monty@mysql.com +2 -1
    Remove compiler warnings about not used require_pins constant

  mysql-test/r/events_logs_tests.result@1.14.1.1, 2007-01-26 13:31:50+02:00, monty@mysql.com +1 -1
    Make test predictable

  mysql-test/r/view.result@1.193.3.1, 2007-01-26 13:31:50+02:00, monty@mysql.com +11 -0
    Make test results predictable

  mysql-test/t/disabled.def@1.220.5.1, 2007-01-26 13:31:51+02:00, monty@mysql.com +2 -0
    Disable maria tests for a while

  mysql-test/t/events_logs_tests.test@1.14.1.1, 2007-01-26 13:31:51+02:00, monty@mysql.com +1 -1
    Make test predictable

  mysql-test/t/view.test@1.175.5.1, 2007-01-26 13:31:51+02:00, monty@mysql.com +17 -1
    Make test results predictable

  mysys/lf_alloc-pin.c@1.11, 2007-01-26 13:31:51+02:00, monty@mysql.com +1 -1
    #warning ->QQ

  mysys/lf_hash.c@1.15, 2007-01-26 13:31:52+02:00, monty@mysql.com +7 -6
    #warning ->QQ
    Removed compiler warnings

  mysys/my_rename.c@1.11, 2007-01-26 13:31:52+02:00, monty@mysql.com +2 -1
    Removed compiler warnings

  plugin/daemon_example/daemon_example.c@1.1.1.1, 2007-01-26 13:31:52+02:00, monty@mysql.com +2 -2
    Remove compiler warning

  sql/ha_ndbcluster.cc@1.375.2.1, 2007-01-26 13:31:53+02:00, monty@mysql.com +2 -2
    Remove compiler warning

  sql/udf_example.c@1.33.1.1, 2007-01-26 13:31:53+02:00, monty@mysql.com +1 -1
    Remove compiler warning

  storage/maria/lockman.c@1.13, 2007-01-26 13:31:54+02:00, monty@mysql.com +15 -12
    Changed #warnings to QQ comment
    Removed compiler warnings

  storage/maria/ma_blockrec.c@1.2, 2007-01-26 13:31:54+02:00, monty@mysql.com +6 -5
    Removed compiler warnings

  storage/maria/ma_check.c@1.9, 2007-01-26 13:31:55+02:00, monty@mysql.com +23 -13
    After merge fixes

  storage/maria/ma_key.c@1.5, 2007-01-26 13:31:55+02:00, monty@mysql.com +3 -3
    After merge fixes

  storage/maria/ma_packrec.c@1.5, 2007-01-26 13:31:55+02:00, monty@mysql.com +1 -1
    After merge fixes

  mysys/mf_pagecache.c@1.14, 2007-01-26 13:31:52+02:00, monty@mysql.com +51 -47
    Removed compiler warnings

  include/pagecache.h@1.5, 2007-01-26 13:31:50+02:00, monty@mysql.com +1 -1
    LSN should be of type ulonglong
    (This fixes some compiler warnings)

  storage/maria/ma_rkey.c@1.5, 2007-01-26 13:31:55+02:00, monty@mysql.com +2 -1
    After merge fixes

  storage/maria/ma_sort.c@1.6, 2007-01-26 13:31:56+02:00, monty@mysql.com +1 -2
    After merge fixes

  storage/maria/ma_sp_defs.h@1.3, 2007-01-26 13:31:56+02:00, monty@mysql.com +2 -2
    Rename clashing function name

  storage/maria/ma_sp_key.c@1.3, 2007-01-26 13:31:56+02:00, monty@mysql.com +2 -2
    Rename clashing function name

  storage/maria/ma_test_all.res@1.2, 2007-01-26 13:31:56+02:00, monty@mysql.com +50 -41
    New test results

  storage/maria/ma_unique.c@1.4, 2007-01-26 13:31:57+02:00, monty@mysql.com +1 -1
    Fixed compiler warning

  storage/maria/tablockman.c@1.6, 2007-01-26 13:31:57+02:00, monty@mysql.com +3 -3
    #warning -> QQ

  storage/maria/tablockman.h@1.4, 2007-01-26 13:31:57+02:00, monty@mysql.com +1 -1
    #warning -> QQ

  storage/maria/trnman.c@1.17, 2007-01-26 13:31:57+02:00, monty@mysql.com +1 -1
    #warning -> QQ

  storage/maria/unittest/lockman2-t.c@1.6, 2007-01-26 13:31:58+02:00, monty@mysql.com +14 -7
    Removed compiler warnings

  storage/maria/unittest/ma_control_file-t.c@1.9, 2007-01-26 13:31:58+02:00, monty@mysql.com +6 -6
    Removed warning for 'maria_control' file not found

  unittest/mysys/mf_pagecache_consist.c@1.4.1.3, 2007-01-26 13:32:00+02:00, monty@mysql.com +1 -1
    Removed compiler warnings

  storage/maria/unittest/trnman-t.c@1.9, 2007-01-26 13:31:59+02:00, monty@mysql.com +2 -3
    Removed compiler warnings

  storage/ndb/src/mgmapi/mgmapi.cpp@1.80.1.1, 2007-01-26 13:31:59+02:00, monty@mysql.com +6 -6
    Remove compiler warnings

  unittest/mysys/my_atomic-t.c@1.15, 2007-01-26 13:32:00+02:00, monty@mysql.com +1 -1
    Removed compiler warnings

ChangeSet@1.2255.87.1, 2007-01-18 21:38:14+02:00, monty@mysql.com +82 -0
  Implementation of rows-in-block
  - Fixes some things missed in myisam->maria port
  - Moved variables that holds the state for the current row to 'cur_row'
  - Changed most uchar * to byte * to be able to remove a lot of casts
  - Removed RAID support
  - Added CHECK for rows-in-block
  - Added allocate_dynamic() for easier usage of dynamic rows when we know how many entries we will need
  - Reorder columns after CREATE for more optimal row storage (for rows-in-block)
  - Removed flag 'RRND_PRESERVER_LASTINX' (not needed)
  - Extended ma_test_all.sh to test more completely all row formats
  - New structs and variables to hold rows-in-block and bitmap information
  - Added org_data_file_type in header to allow easy restore of old record format when doing maria_pack / maria_chk -u
  - More virtual functions to handle different row types
  - Pointer to row is now MARIA_RECORD_POS instead of my_off_t
  - New header signature for MARIA index files
  - Fixed bugs in ma_test1.c and ma_test2.c
  - All key and row blocks are now of same size
  - We now only have one link chain for deleted key blocks

  include/m_string.h@1.44.1.1, 2007-01-18 21:38:02+02:00, monty@mysql.com +5 -2
    Define bzero_if_purify

  include/maria.h@1.3.1.1, 2007-01-18 21:38:03+02:00, monty@mysql.com +54 -42
    Implementation of rows-in-block

  include/my_base.h@1.89.1.1, 2007-01-18 21:38:03+02:00, monty@mysql.com +2 -2
    Implementation of rows-in-block

  include/my_handler.h@1.14, 2007-01-18 21:38:03+02:00, monty@mysql.com +12 -10
    Cleanup macros
    Added size_to_store_key_length()

  include/my_sys.h@1.206.7.1, 2007-01-18 21:38:03+02:00, monty@mysql.com +1 -0
    Added 'allocate_dynamic()'

  include/myisamchk.h@1.2, 2007-01-18 21:38:03+02:00, monty@mysql.com +12 -8
    Implementation of rows-in-block

  mysys/array.c@1.12.1.1, 2007-01-18 21:38:04+02:00, monty@mysql.com +41 -15
    Added allocate_dynamic()

  mysys/mf_keycache.c@1.60.2.1, 2007-01-18 21:38:04+02:00, monty@mysql.com +11 -6
    Moved DBUG_ENTER to it's right position

  mysys/my_pread.c@1.13.2.1, 2007-01-18 21:38:04+02:00, monty@mysql.com +4 -2
    Ensure my_errno is always set

  sql/filesort.cc@1.109.2.1, 2007-01-18 21:38:04+02:00, monty@mysql.com +6 -6
    Fixed some compiler warnings

  sql/gen_lex_hash.cc@1.66.2.1, 2007-01-18 21:38:05+02:00, monty@mysql.com +2 -2
    Removed not needed 'inline'

  sql/mysqld.cc@1.564.24.1, 2007-01-18 21:38:06+02:00, monty@mysql.com +1 -0
    Fixed setting of wrong variable

  sql/uniques.cc@1.24.1.1, 2007-01-18 21:38:06+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  storage/maria/Makefile.am@1.3.2.1, 2007-01-18 21:38:06+02:00, monty@mysql.com +2 -1
    Implementation of rows-in-block

  sql/ha_maria.cc@1.4.2.1, 2007-01-18 21:38:05+02:00, monty@mysql.com +42 -27
    Implementation of rows-in-block
    Fixed compiler warnings

  storage/maria/ma_bitmap.c@1.1, 2007-01-18 21:38:10+02:00, monty@mysql.com +1704 -0
    New BitKeeper file ``storage/maria/ma_bitmap.c''

  storage/maria/ma_bitmap.c@1.0, 2007-01-18 21:38:10+02:00, monty@mysql.com +0 -0

  storage/maria/ma_blockrec.c@1.1, 2007-01-18 21:38:10+02:00, monty@mysql.com +2742 -0
    New BitKeeper file ``storage/maria/ma_blockrec.c''

  storage/maria/ma_blockrec.c@1.0, 2007-01-18 21:38:10+02:00, monty@mysql.com +0 -0

  storage/maria/ma_blockrec.h@1.1, 2007-01-18 21:38:10+02:00, monty@mysql.com +160 -0
    New BitKeeper file ``storage/maria/ma_blockrec.h''

  storage/maria/ma_blockrec.h@1.0, 2007-01-18 21:38:10+02:00, monty@mysql.com +0 -0

  storage/maria/ma_check.c@1.3.1.1, 2007-01-18 21:38:06+02:00, monty@mysql.com +1112 -608
    Removed RAID functions
    Added support for CHECK of rows-in-blocks rows

  storage/maria/ma_checksum.c@1.2, 2007-01-18 21:38:06+02:00, monty@mysql.com +14 -11
    Implementation of rows-in-block

  storage/maria/ma_close.c@1.2.1.1, 2007-01-18 21:38:07+02:00, monty@mysql.com +15 -14
    Implementation of rows-in-block

  storage/maria/ma_create.c@1.2.1.1, 2007-01-18 21:38:07+02:00, monty@mysql.com +301 -157
    Implementation of rows-in-block:
    - Reorder columns
    - All key blocks are now of same size
    - Removed old RAID support

  storage/maria/ma_dbug.c@1.2, 2007-01-18 21:38:07+02:00, monty@mysql.com +3 -3
    Implementation of rows-in-block

  storage/maria/ma_delete.c@1.2.1.1, 2007-01-18 21:38:07+02:00, monty@mysql.com +103 -101
    Implementation of rows-in-block

  storage/maria/ma_delete_all.c@1.2.1.1, 2007-01-18 21:38:07+02:00, monty@mysql.com +1 -2
    Implementation of rows-in-block

  storage/maria/ma_dynrec.c@1.3.1.1, 2007-01-18 21:38:07+02:00, monty@mysql.com +149 -112
    info->rec_buff is now allocated through _ma_alloc_buffer()
    Use new info->cur_row structure

  storage/maria/ma_extra.c@1.3.1.1, 2007-01-18 21:38:08+02:00, monty@mysql.com +23 -11
    Implementation of rows-in-block

  storage/maria/ma_ft_boolean_search.c@1.2.1.1, 2007-01-18 21:38:08+02:00, monty@mysql.com +17 -17
    Removed compiler warnings
    Indentation fixes

  storage/maria/ma_ft_nlq_search.c@1.3, 2007-01-18 21:38:08+02:00, monty@mysql.com +18 -17
    Removed compiler warnings
    Indentation fixes

  storage/maria/ma_ft_update.c@1.3, 2007-01-18 21:38:08+02:00, monty@mysql.com +12 -11
    Removed some casts

  storage/maria/ma_fulltext.h@1.2, 2007-01-18 21:38:08+02:00, monty@mysql.com +1 -1
    Changed pointer type

  storage/maria/ma_info.c@1.2, 2007-01-18 21:38:08+02:00, monty@mysql.com +13 -9
    Implementation of rows-in-block
    More general _ma_report_error()

  storage/maria/ma_init.c@1.2.1.1, 2007-01-18 21:38:08+02:00, monty@mysql.com +2 -0
    Implementation of rows-in-block

  storage/maria/ma_key.c@1.2.1.1, 2007-01-18 21:38:08+02:00, monty@mysql.com +34 -34
    Implementation of rows-in-block
    Removed some casts

  storage/maria/ma_keycache.c@1.1.1.1, 2007-01-18 21:38:08+02:00, monty@mysql.com +3 -2
    Fixed DBUG entry

  storage/maria/ma_locking.c@1.2.1.1, 2007-01-18 21:38:08+02:00, monty@mysql.com +33 -20
    Implementation of rows-in-block

  storage/maria/ma_open.c@1.3.1.1, 2007-01-18 21:38:08+02:00, monty@mysql.com +343 -308
    Implementation of rows-in-block

  storage/maria/ma_packrec.c@1.1.1.1, 2007-01-18 21:38:08+02:00, monty@mysql.com +161 -110
    Indentation fixes
    Changed uchar * to byte * to make it possible to remove some casts

  storage/maria/ma_page.c@1.2.1.1, 2007-01-18 21:38:09+02:00, monty@mysql.com +16 -19
    Implementation of rows-in-block

  storage/maria/ma_range.c@1.1.1.1, 2007-01-18 21:38:09+02:00, monty@mysql.com +18 -19
    Implementation of rows-in-block

  storage/maria/ma_rfirst.c@1.2, 2007-01-18 21:38:09+02:00, monty@mysql.com +1 -1
    Implementation of rows-in-block

  storage/maria/ma_rkey.c@1.2.1.1, 2007-01-18 21:38:09+02:00, monty@mysql.com +46 -30
    Implementation of rows-in-block
    Indentation fixes

  storage/maria/ma_rlast.c@1.2, 2007-01-18 21:38:09+02:00, monty@mysql.com +1 -1
    Implementation of rows-in-block

  storage/maria/ma_rnext.c@1.2, 2007-01-18 21:38:09+02:00, monty@mysql.com +5 -4
    Implementation of rows-in-block

  storage/maria/ma_rnext_same.c@1.2, 2007-01-18 21:38:09+02:00, monty@mysql.com +18 -15
    Implementation of rows-in-block

  storage/maria/ma_rprev.c@1.2, 2007-01-18 21:38:09+02:00, monty@mysql.com +5 -4
    Implementation of rows-in-block

  storage/maria/ma_rrnd.c@1.2, 2007-01-18 21:38:09+02:00, monty@mysql.com +14 -20
    Implementation of rows-in-block
    Removed flag 'RRND_PRESERVER_LASTINX', by not resetting lastinx (This is reset by maria_scan_init())

  storage/maria/ma_rsame.c@1.2, 2007-01-18 21:38:09+02:00, monty@mysql.com +15 -11
    Implementation of rows-in-block

  storage/maria/ma_rsamepos.c@1.2.1.1, 2007-01-18 21:38:09+02:00, monty@mysql.com +8 -6
    Implementation of rows-in-block

  storage/maria/ma_rt_index.c@1.3, 2007-01-18 21:38:09+02:00, monty@mysql.com +138 -128
    Implementation of rows-in-block

  storage/maria/ma_rt_index.h@1.2, 2007-01-18 21:38:09+02:00, monty@mysql.com +9 -8
    Implementation of rows-in-block

  storage/maria/ma_rt_key.c@1.2, 2007-01-18 21:38:09+02:00, monty@mysql.com +7 -5
    Implementation of rows-in-block

  storage/maria/ma_rt_key.h@1.2, 2007-01-18 21:38:09+02:00, monty@mysql.com +6 -6
    Implementation of rows-in-block

  storage/maria/ma_rt_mbr.c@1.3, 2007-01-18 21:38:09+02:00, monty@mysql.com +18 -16
    Implementation of rows-in-block

  storage/maria/ma_rt_mbr.h@1.2, 2007-01-18 21:38:09+02:00, monty@mysql.com +15 -14
    Implementation of rows-in-block

  storage/maria/ma_rt_split.c@1.2, 2007-01-18 21:38:09+02:00, monty@mysql.com +8 -7
    Implementation of rows-in-block

  storage/maria/ma_rt_test.c@1.2, 2007-01-18 21:38:09+02:00, monty@mysql.com +5 -4
    Indentation fix

  storage/maria/ma_scan.c@1.2, 2007-01-18 21:38:09+02:00, monty@mysql.com +24 -9
    Implementation of rows-in-block
    Added 'maria_scan_end()'

  storage/maria/ma_search.c@1.3, 2007-01-18 21:38:09+02:00, monty@mysql.com +181 -170
    Implementation of rows-in-block

  storage/maria/ma_sort.c@1.2.1.1, 2007-01-18 21:38:09+02:00, monty@mysql.com +66 -66
    Indentation fixes
    uchar -> byte to be able to remove some casts

  storage/maria/ma_sp_defs.h@1.2, 2007-01-18 21:38:09+02:00, monty@mysql.com +1 -1
    uchar * -> byte *

  storage/maria/ma_sp_key.c@1.2, 2007-01-18 21:38:09+02:00, monty@mysql.com +1 -1
    uchar * -> byte *

  storage/maria/ma_sp_test.c@1.2, 2007-01-18 21:38:09+02:00, monty@mysql.com +5 -4
    Indentation fixes

  storage/maria/ma_static.c@1.3, 2007-01-18 21:38:10+02:00, monty@mysql.com +8 -4
    New header signature for MARIA

  storage/maria/ma_statrec.c@1.2.1.1, 2007-01-18 21:38:10+02:00, monty@mysql.com +38 -36
    int -> my_bool functions
    my_off_t -> MARIA_RECORD_POS
    Fixed argument order for _ma_read_static_record()

  storage/maria/ma_test1.c@1.3, 2007-01-18 21:38:10+02:00, monty@mysql.com +97 -65
    Implementation of rows-in-block
    Fixed some bugs in VARCHAR and BLOB testing

  storage/maria/ma_test2.c@1.3.1.1, 2007-01-18 21:38:10+02:00, monty@mysql.com +85 -37
    Implementation of rows-in-block
    Fixed bug in BLOB testing

  storage/maria/ma_test3.c@1.3.1.1, 2007-01-18 21:38:10+02:00, monty@mysql.com +2 -2
    Implementation of rows-in-block

  storage/maria/ma_test_all.sh@1.2.1.1, 2007-01-18 21:38:10+02:00, monty@mysql.com +173 -128
    Run all tests with dynamic, static and block row formats
    (For the moment we skip REPAIR test of rows-in-block as this is not yet implemented)

  storage/maria/ma_unique.c@1.1.1.1, 2007-01-18 21:38:10+02:00, monty@mysql.com +16 -14
    Implementation of rows-in-block

  storage/maria/ma_update.c@1.3.1.1, 2007-01-18 21:38:10+02:00, monty@mysql.com +23 -14
    Implementation of rows-in-block

  storage/maria/ma_write.c@1.3.1.1, 2007-01-18 21:38:10+02:00, monty@mysql.com +129 -87
    Implementation of rows-in-block
    Write of row is split into two parts, as rows-in-block format require us to do write of row before keys (to get row position) in contrast to all other row formats

  storage/maria/maria_chk.c@1.3.1.1, 2007-01-18 21:38:10+02:00, monty@mysql.com +101 -94
    Implementation of rows-in-block

  storage/maria/maria_def.h@1.3.1.1, 2007-01-18 21:38:10+02:00, monty@mysql.com +285 -178
    Implementation of rows-in-block
    - New structs and variables to hold rows-in-block and bitmap information
    - Added org_data_file_type in header to allow easy restore of old record format when doing maria_pack / maria_chk -u
    - More virtual functions to handle different row types
    - Pointer to row is now MARIA_RECORD_POS instead of my_off_t
    - uchar -> byte for many parameters to avoid casts

  storage/maria/maria_ftdump.c@1.2.1.1, 2007-01-18 21:38:10+02:00, monty@mysql.com +3 -3
    Implementation of rows-in-block

  storage/maria/maria_pack.c@1.3.1.1, 2007-01-18 21:38:10+02:00, monty@mysql.com +54 -46
    Implementation of rows-in-block

  storage/myisam/mi_check.c@1.145.1.1, 2007-01-18 21:38:10+02:00, monty@mysql.com +37 -26
    Added new row types into switch to avoid compiler warnings
    Added some casts to avoid warnings after changing type of lastkey and buff

  storage/myisam/mi_create.c@1.59.1.1, 2007-01-18 21:38:10+02:00, monty@mysql.com +5 -5
    Fix that 'pack_fields' is calculated correctly

  storage/myisam/mi_rsamepos.c@1.7.1.1, 2007-01-18 21:38:10+02:00, monty@mysql.com +2 -1
    Implementation of rows-in-block

  storage/myisam/mi_test2.c@1.33.1.1, 2007-01-18 21:38:10+02:00, monty@mysql.com +1 -1
    Fixed wrong printf

  storage/myisam/sort.c@1.53.1.1, 2007-01-18 21:38:10+02:00, monty@mysql.com +5 -5
    uchar * -> byte *

  support-files/magic@1.3, 2007-01-18 21:38:10+02:00, monty@mysql.com +6 -2
    Added support for Maria files
    Fided wrong entry's for MyISAM files

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.2343.42.5, 2007-01-03 12:41:51+01:00, guilhem@gbichot2.(none) +5 -0
  very minor comments and merges from MyISAM into Maria.

  storage/maria/ma_checkpoint.c@1.11, 2007-01-03 12:41:40+01:00, guilhem@gbichot2.(none) +35 -9
    comments

  storage/maria/ma_close.c@1.5, 2007-01-03 12:41:41+01:00, guilhem@gbichot2.(none) +5 -3
    comments

  storage/maria/ma_write.c@1.6, 2007-01-03 12:41:41+01:00, guilhem@gbichot2.(none) +10 -8
    merge from myisam

  storage/maria/maria_def.h@1.8, 2007-01-03 12:41:41+01:00, guilhem@gbichot2.(none) +1 -1
    typo

  storage/myisam/mi_delete.c@1.44, 2007-01-03 12:41:41+01:00, guilhem@gbichot2.(none) +0 -2
    unneeded {}, making it identical to Maria

ChangeSet@1.2343.42.4, 2006-12-20 22:30:00+01:00, guilhem@gbichot3.local +2 -0
  Maria - fixes to the pagecache unit tests (which started to print
  "x threads didn't exit" today after my merge); the main() thread
  was calling my_init() and my_thread_global_init() which is redudant;
  it was not calling my_end() though it's needed.

  unittest/mysys/mf_pagecache_consist.c@1.4.1.2, 2006-12-20 22:29:58+01:00, guilhem@gbichot3.local +1 -4
    program already calls my_init(), which calls my_thread_global_init(),
    so no need for my_thread_global_init() (double call caused the main()
    thread to wait for itself thus timing out and printing
    "x threads didn't exit".
    my_thread_global_end() is not enough, as we call my_init() we must call
    my_end() (which calls my_thread_global_end()).

  unittest/mysys/mf_pagecache_single.c@1.3.1.2, 2006-12-20 22:29:58+01:00, guilhem@gbichot3.local +1 -3
    program already calls my_init(), which calls my_thread_global_init(),
    so no need for my_thread_global_init() (double call caused the main()
    thread to wait for itself thus timing out and printing
    "x threads didn't exit".
    my_thread_global_end() is not enough, as we call my_init() we must call
    my_end() (which calls my_thread_global_end()).

ChangeSet@1.2343.42.3, 2006-12-20 19:01:07+01:00, guilhem@gbichot3.local +4 -0
  WL#3071 - Maria checkpoint:
  a function to store information about transactions into buffers,
  is added to the transaction manager, and called by the Checkpoint module.

  storage/maria/ma_checkpoint.c@1.10, 2006-12-20 19:01:04+01:00, guilhem@gbichot3.local +8 -60
    "collecting info about transactions" moves to trnman.c

  storage/maria/trnman.c@1.16, 2006-12-20 19:01:04+01:00, guilhem@gbichot3.local +108 -4
    a function to store information about the active transactions list
    and committed transactions list, into buffers, for use by the
    Checkpoint module.
    This function needs to know how many trns there are in the committed
    list, so we introduce a counter, trnman_committed_transactions.
    m_string.h is needed for LEX_STRING.

  storage/maria/trnman.h@1.9, 2006-12-20 19:01:04+01:00, guilhem@gbichot3.local +1 -0
    A function to store information about the active transactions list
    and committed transactions list, into buffers, for use by the
    Checkpoint module.

  storage/maria/unittest/trnman-t.c@1.8, 2006-12-20 19:01:04+01:00, guilhem@gbichot3.local +1 -0
    trnman.h needs LEX_STRING so m_string.h

ChangeSet@1.2343.42.2, 2006-12-20 18:58:35+01:00, guilhem@gbichot3.local +22 -0
  merge of recent MyISAM changes into Maria.
  Only failure is ndb_restore - could have been worse!!

  mysys/mf_keycache.c@1.63, 2006-12-20 18:58:31+01:00, guilhem@gbichot3.local +2 -2
    page_status is int

  sql/mysqld.cc@1.590, 2006-12-20 18:58:32+01:00, guilhem@gbichot3.local +2 -0
    post-merge fixes

  sql/set_var.cc@1.205.2.2, 2006-12-20 18:58:32+01:00, guilhem@gbichot3.local +2 -0
    post-merge fixes

  storage/maria/ha_maria.cc@1.10, 2006-12-20 18:58:32+01:00, guilhem@gbichot3.local +11 -7
    merge of recent MyISAM changes into Maria

  storage/maria/ha_maria.h@1.6, 2006-12-20 18:58:32+01:00, guilhem@gbichot3.local +1 -1
    merge of recent MyISAM changes into Maria

  storage/maria/ma_close.c@1.4, 2006-12-20 18:58:32+01:00, guilhem@gbichot3.local +3 -2
    merge of recent MyISAM changes into Maria

  storage/maria/ma_create.c@1.5, 2006-12-20 18:58:32+01:00, guilhem@gbichot3.local +3 -3
    merge of recent MyISAM changes into Maria

  storage/maria/ma_delete.c@1.4, 2006-12-20 18:58:32+01:00, guilhem@gbichot3.local +5 -4
    merge of recent MyISAM changes into Maria

  storage/maria/ma_dynrec.c@1.5, 2006-12-20 18:58:32+01:00, guilhem@gbichot3.local +2 -2
    merge of recent MyISAM changes into Maria

  storage/maria/ma_ft_boolean_search.c@1.3, 2006-12-20 18:58:32+01:00, guilhem@gbichot3.local +0 -1
    merge of recent MyISAM changes into Maria

  storage/maria/ma_key.c@1.3, 2006-12-20 18:58:32+01:00, guilhem@gbichot3.local +8 -7
    merge of recent MyISAM changes into Maria

  storage/maria/ma_keycache.c@1.2, 2006-12-20 18:58:32+01:00, guilhem@gbichot3.local +2 -2
    merge of recent MyISAM changes into Maria

  storage/maria/ma_open.c@1.6, 2006-12-20 18:58:32+01:00, guilhem@gbichot3.local +21 -2
    merge of recent MyISAM changes into Maria

  storage/maria/ma_page.c@1.3, 2006-12-20 18:58:32+01:00, guilhem@gbichot3.local +2 -2
    merge of recent MyISAM changes into Maria

  mysys/mf_pagecache.c@1.13, 2006-12-20 18:58:32+01:00, guilhem@gbichot3.local +28 -26
    merge of recent key cache changes

  include/pagecache.h@1.4, 2006-12-20 18:58:31+01:00, guilhem@gbichot3.local +1 -1
    LSN->lsn

  storage/maria/ma_rsamepos.c@1.3, 2006-12-20 18:58:32+01:00, guilhem@gbichot3.local +2 -1
    merge of recent MyISAM changes into Maria

  storage/maria/ma_statrec.c@1.3, 2006-12-20 18:58:32+01:00, guilhem@gbichot3.local +2 -2
    merge of recent MyISAM changes into Maria

  storage/maria/ma_unique.c@1.2, 2006-12-20 18:58:32+01:00, guilhem@gbichot3.local +2 -2
    merge of recent MyISAM changes into Maria

  storage/maria/maria_chk.c@1.5, 2006-12-20 18:58:32+01:00, guilhem@gbichot3.local +1 -0
    merge of recent MyISAM changes into Maria

  storage/maria/maria_pack.c@1.5, 2006-12-20 18:58:32+01:00, guilhem@gbichot3.local +19 -17
    merge of recent MyISAM changes into Maria

  storage/myisam/myisampack.c@1.59, 2006-12-20 18:58:32+01:00, guilhem@gbichot3.local +2 -2
    compiler warning

ChangeSet@1.2303.208.2, 2006-12-19 19:15:53+01:00, guilhem@gbichot3.local +19 -0
  Maria - merging recent changes done to MyISAM into Maria.
  Plus compiler warnings, and a fix to the pagecache unit tests for IA64

  include/maria.h@1.4, 2006-12-19 19:15:48+01:00, guilhem@gbichot3.local +13 -2
    merging MyISAM into Maria

  include/myisam.h@1.82, 2006-12-19 19:15:48+01:00, guilhem@gbichot3.local +15 -0
    post-merge fixes

  mysql-test/r/maria.result@1.5, 2006-12-19 19:15:48+01:00, guilhem@gbichot3.local +134 -8
    merging MyISAM into Maria

  mysql-test/t/maria.test@1.5, 2006-12-19 19:15:48+01:00, guilhem@gbichot3.local +92 -0
    merging MyISAM into Maria

  sql/mysqld.cc@1.588, 2006-12-19 19:15:48+01:00, guilhem@gbichot3.local +1 -1
    post-merge fixes

  storage/maria/ha_maria.cc@1.9, 2006-12-19 19:15:48+01:00, guilhem@gbichot3.local +7 -5
    merging MyISAM into Maria

  storage/maria/ha_maria.h@1.5, 2006-12-19 19:15:48+01:00, guilhem@gbichot3.local +1 -1
    merging MyISAM into Maria

  storage/maria/ma_check.c@1.7, 2006-12-19 19:15:48+01:00, guilhem@gbichot3.local +256 -49
    merging MyISAM into Maria

  storage/maria/ma_open.c@1.5, 2006-12-19 19:15:48+01:00, guilhem@gbichot3.local +4 -1
    merging MyISAM into Maria

  storage/maria/ma_packrec.c@1.3, 2006-12-19 19:15:48+01:00, guilhem@gbichot3.local +44 -32
    merging MyISAM into Maria

  storage/maria/ma_range.c@1.2, 2006-12-19 19:15:48+01:00, guilhem@gbichot3.local +15 -0
    merging MyISAM into Maria

  storage/maria/ma_sort.c@1.4, 2006-12-19 19:15:48+01:00, guilhem@gbichot3.local +146 -112
    merging MyISAM into Maria

  storage/maria/maria_def.h@1.7, 2006-12-19 19:15:48+01:00, guilhem@gbichot3.local +17 -17
    merging MyISAM into Maria

  storage/maria/maria_pack.c@1.4, 2006-12-19 19:15:48+01:00, guilhem@gbichot3.local +3 -3
    merging MyISAM into Maria

  storage/maria/plug.in@1.3, 2006-12-19 19:15:48+01:00, guilhem@gbichot3.local +1 -0
    merging MyISAM into Maria

  unittest/mysys/mf_pagecache_consist.c@1.4.1.1, 2006-12-19 19:15:48+01:00, guilhem@gbichot3.local +0 -8
    this sets the stack size lower than the minimum on IA64, we remove it
    (it made the test fail)

  unittest/mysys/mf_pagecache_single.c@1.3.1.1, 2006-12-19 19:15:48+01:00, guilhem@gbichot3.local +0 -8
    this sets the stack size lower than the minimum on IA64, we remove it
    (it made the test fail)

  storage/myisam/myisamdef.h@1.92, 2006-12-19 19:15:48+01:00, guilhem@gbichot3.local +2 -10
    merging MyISAM into Maria

  storage/myisam/myisampack.c@1.57, 2006-12-19 19:15:48+01:00, guilhem@gbichot3.local +4 -4
    fix for compiler warnings

ChangeSet@1.2303.2.41, 2006-12-18 17:24:02+01:00, guilhem@gbichot3.local +5 -0
  WL#3071 Maria checkpoint
  - cleanups, simplifications
  - moving the construction of the "dirty pages table" into the
  pagecache where it belongs (because it's the pagecache which knows
  dirty pages). TODO: do the same soon for the "transactions table".
  - fix for a small bug in the pagecache (decrementation of "changed_blocks")

  storage/maria/ma_least_recently_dirtied.c@1.8, 2006-12-18 17:24:00+01:00, guilhem@gbichot3.local +31 -153
    Simplifying the thread which does background flushing of
    least-recently-dirtied pages:
    - in first version that thread will not flush, just do checkpoints
    - in 2nd version, flushing should re-use existing page cache functions
    like flush_pagecache_blocks().

  storage/maria/ma_checkpoint.c@1.9, 2006-12-18 17:24:00+01:00, guilhem@gbichot3.local +43 -136
    refining the checkpoint code: factoring functions, moving the
    construction of the "dirty pages table" into mf_pagecache.c
    (I'll do the same with the construction of the "transactions table"
    once Serg tells me what's the best way to do it).

  mysys/mf_pagecache.c@1.12, 2006-12-18 17:24:00+01:00, guilhem@gbichot3.local +154 -26
    m_string.h moves up for LEX_STRING to be known for pagecache.h.
    In pagecache_delete_page(), we must decrement "blocks_changed" even
    if we just delete the page without flushing it.
    A new function pagecache_collect_changed_blocks_with_LSN()
    (used by the Checkpoint module), which stores information about the
    changed blocks (a.k.a. "the dirty pages table") into a LEX_STRING.
    This function is not tested now, it will be when there is a Checkpoint.

  include/pagecache.h@1.3, 2006-12-18 17:24:00+01:00, guilhem@gbichot3.local +3 -0
    prototype

  unittest/mysys/test_file.h@1.2.1.1, 2006-12-18 17:24:00+01:00, guilhem@gbichot3.local +1 -1
    m_string.h moves up for LEX_STRING to be known in pagecache.h

ChangeSet@1.2303.2.40, 2006-12-16 17:42:45+01:00, guilhem@gbichot2.(none) +1 -0
  WL#3071 - Maria checkpoint. Correcting comment about a bad problem.

  storage/maria/ma_checkpoint.c@1.8, 2006-12-16 17:42:38+01:00, guilhem@gbichot2.(none) +15 -9
    I was too optimistic; problem 1) is really a bad problem.

ChangeSet@1.2303.2.39, 2006-12-16 18:10:47+01:00, guilhem@gbichot3.local +4 -0
  WL#3071 - Maria checkpoint
  Adding rec_lsn to Maria's page cache. Misc fixes to Checkpoint.

  storage/maria/ma_least_recently_dirtied.c@1.7, 2006-12-16 18:10:44+01:00, guilhem@gbichot3.local +4 -1
    comment

  storage/maria/ma_checkpoint.c@1.7, 2006-12-16 18:10:43+01:00, guilhem@gbichot3.local +258 -175
    misc fixes to Checkpoint (updates now that the transaction manager
    and the page cache are more known)

  storage/maria/ma_close.c@1.3, 2006-12-16 18:10:43+01:00, guilhem@gbichot3.local +6 -0
    an important note for the future.

  mysys/mf_pagecache.c@1.11, 2006-12-16 18:10:43+01:00, guilhem@gbichot3.local +9 -3
    adding rec_lsn, the LSN when a page first became dirty.
    It is set when unlocking a page (TODO: should also be set when
    the unlocking is an implicit part of pagecache_write()).
    It is reset in link_to_file_list() and free_block()
    (one of which is used every time we flush a block).
    It is a ulonglong and not LSN, because its destination is comparisons
    for which ulonglong is better than a struct.

ChangeSet@1.1810.2430.5, 2006-12-15 11:32:41+01:00, rafal@quant.(none) +1 -0
  BUG#21132 (Slave fails to reconnect on update_slave_list):
  
  The update_slave_list() call is a remainder from attempts to implement failsafe 
  replication. This code is now obsolete and not maintained (see comments in 
  rpl_failsafe.cc). 
  
  Inspecting the code one can see that this function do not interferre with normal 
  slave operation and thus can be safely removed. This will solve the issue 
  reported in the bug (errors on slave reconnection). 
  
  A related issue is to remove unneccessary reconnections done by slave. This is 
  handled in the patch for BUG#20435.

  sql/slave.cc@1.241.12.1, 2006-12-15 11:32:37+01:00, rafal@quant.(none) +1 -1
    Removed call to obsolete function update_slave_list() upon slave's I/O thread 
    reconnect.

ChangeSet@1.2303.2.38, 2006-12-07 15:23:50+01:00, guilhem@gbichot3.local +2 -0
  Maria - fix for "statement with no effect" warning

  mysys/lf_hash.c@1.14, 2006-12-07 15:23:48+01:00, guilhem@gbichot3.local +2 -2
    fix for "statement with no effect" warning

  storage/maria/lockman.c@1.12, 2006-12-07 15:23:48+01:00, guilhem@gbichot3.local +2 -2
    fix for "statement with no effect" warning

ChangeSet@1.2303.2.37, 2006-12-04 15:31:04+01:00, guilhem@gbichot3.local +4 -0
  Maria - post-review change of "fixes for gcc -ansi".
  And reducing the time taken by my_atomic-t.

  include/lf.h@1.11, 2006-12-04 15:31:02+01:00, guilhem@gbichot3.local +1 -1
    fix to be able to add a ";" at the end of the macro's invokation
    (removing it here, removes a warning from "gcc -ansi" about a
    standalone ";").

  mysys/lf_hash.c@1.13, 2006-12-04 15:31:02+01:00, guilhem@gbichot3.local +1 -1
    ";" is ok now after LF_REQUIRE_PINS

  mysys/mf_pagecache.c@1.10, 2006-12-04 15:31:02+01:00, guilhem@gbichot3.local +1 -1
    comment fix

  unittest/mysys/my_atomic-t.c@1.14, 2006-12-04 15:31:02+01:00, guilhem@gbichot3.local +2 -2
    decreasing number of iterations to make test take less time.

ChangeSet@1.2303.2.36, 2006-12-03 17:06:27+01:00, guilhem@gbichot3.local +5 -0
  Maria:
  * merging changes done to the key cache since May 2006 into Maria
  * enabling two small enough page cache's unit tests by default
  * fix to have non-buffered output in unit tests (to not have a false
  timeout killing in pushbuild) (patch given by Serg)
  * removing some warnings of gcc -ansi

  include/lf.h@1.10, 2006-12-03 17:06:25+01:00, guilhem@gbichot3.local +7 -7
    getting rid of "warning: ISO C does not allow extra `;' outside of a function"
    (gcc -ansi)

  mysys/lf_hash.c@1.12, 2006-12-03 17:06:25+01:00, guilhem@gbichot3.local +1 -1
    getting rid of "warning: ISO C does not allow extra `;' outside of a function"
    (gcc -ansi)

  mysys/mf_pagecache.c@1.9, 2006-12-03 17:06:25+01:00, guilhem@gbichot3.local +36 -30
    Cosmetic changes to minimize the diff with the key cache.
    #define PAGECACHE_DEBUG_LOG is not needed (just define PAGECACHE_DEBUG
    if you want) (this change removes "warning: 'pagecache_debug_print'
    declared `static' but never defined").
    Importing changes made to mf_keycache.c since May 2006, into the page cache.
    Disabling online resizing in the page cache.
    Fix for "warning: ISO C90 forbids mixed declarations and code".

  unittest/mysys/Makefile.am@1.10, 2006-12-03 17:06:25+01:00, guilhem@gbichot3.local +9 -6
    Of the page cache's unit tests, two are small enough to run on pushbuild,
    renaming them to a -t suffix.

  unittest/mytap/tap.c@1.6.2.1, 2006-12-03 17:06:25+01:00, guilhem@gbichot3.local +2 -0
    pushbuild kills a test after seeing no output from it for 10 minutes;
    so we set the mytap framework to not buffer output (patch given by
    Serg) so that output is seen more frequently and not "all at the end
    of the test".

ChangeSet@1.2303.2.35, 2006-11-30 21:12:17+01:00, guilhem@gbichot2.(none) +3 -0
  Maria - fixes for gcc -ansi

  storage/maria/unittest/lockman-t.c@1.12, 2006-11-30 21:12:04+01:00, guilhem@gbichot2.(none) +1 -1
    no //

  storage/maria/unittest/lockman1-t.c@1.4, 2006-11-30 21:12:04+01:00, guilhem@gbichot2.(none) +1 -1
    no //

  storage/maria/unittest/lockman2-t.c@1.5, 2006-11-30 21:12:04+01:00, guilhem@gbichot2.(none) +1 -1
    no //

ChangeSet@1.2303.2.34, 2006-11-30 15:43:15+01:00, guilhem@gbichot2.(none) +2 -0
  Maria - fixes for gcc -ansi (no //)

  storage/maria/lockman.c@1.11, 2006-11-30 15:43:09+01:00, guilhem@gbichot2.(none) +6 -5
    no //

  storage/maria/trnman.c@1.15, 2006-11-30 15:43:09+01:00, guilhem@gbichot2.(none) +2 -1
    no //

ChangeSet@1.2303.2.33, 2006-11-30 15:12:28+01:00, guilhem@gbichot2.(none) +2 -0
  Maria - misc fixes:
  don't run tests depending on the generic lock manager which will be
  removed; don't run page cache unit tests by default (too intensive).

  storage/maria/unittest/Makefile.am@1.5, 2006-11-30 15:12:12+01:00, guilhem@gbichot2.(none) +3 -1
    don't run tests depending on the generic lock manager (it will 
    be removed in the end), one of them crashes.

  unittest/mysys/Makefile.am@1.9, 2006-11-30 15:12:12+01:00, guilhem@gbichot2.(none) +36 -32
    page cache tests put a too high load, causes problems on shared machines;
    so we still build them but give them a suffix so that they are
    not run by the default "test-unit" Makefile target.

ChangeSet@1.2303.176.1, 2006-11-30 12:14:36+01:00, guilhem@gbichot2.(none) +1 -0
  Maria - pagecache unit tests: add test_file.h to the tarball

  unittest/mysys/Makefile.am@1.8, 2006-11-30 12:14:23+01:00, guilhem@gbichot2.(none) +2 -2
    add test_file.h in the tarball

ChangeSet@1.2303.2.31, 2006-11-30 11:00:55+01:00, gbichot@quadita2.mysql.com +2 -0
  Maria - fixes for gcc -ansi (// changed to #warning)

  storage/maria/lockman.c@1.10, 2006-11-30 10:59:21+01:00, gbichot@quadita2.mysql.com +0 -0
    fix for -ansi (// changed to #warning)

  storage/maria/trnman.c@1.14, 2006-11-30 11:00:18+01:00, gbichot@quadita2.mysql.com +0 -0
    fix for -ansi (// changed to #warning)

ChangeSet@1.2303.2.30, 2006-11-27 22:09:06+01:00, guilhem@gbichot3.local +3 -0
  Maria - Fixes to help some pushbuild hosts compile.

  include/Makefile.am@1.71, 2006-11-27 22:09:04+01:00, guilhem@gbichot3.local +1 -1
    put my_bit.h in the tarball (need it for mf_keycache.c)

  mysys/lf_alloc-pin.c@1.10, 2006-11-27 22:09:04+01:00, guilhem@gbichot3.local +1 -1
    // in .c file

  mysys/lf_hash.c@1.11, 2006-11-27 22:09:04+01:00, guilhem@gbichot3.local +2 -1
    // in .c file

ChangeSet@1.2303.2.29, 2006-11-27 22:01:29+01:00, guilhem@gbichot3.local +10 -0
  WL#3072 Maria Recovery. Making DDLs durable in Maria:
  Sync table files after CREATE (of non-temp table), DROP, RENAME,
  TRUNCATE, sync directories and symlinks (for the 3 first commands).
  Comments for future log records.
  In ma_rename(), if rename of index works and then rename of data fails,
  try to undo the rename of the index to leave a consistent state.

  mysys/my_symlink.c@1.10, 2006-11-27 22:01:26+01:00, guilhem@gbichot3.local +2 -0
    sync directory after creation of a symbolic link in it, if asked

  mysys/my_sync.c@1.7, 2006-11-27 22:01:26+01:00, guilhem@gbichot3.local +6 -2
    comment. Fix for when the file's name has no directory in it.

  storage/maria/ma_create.c@1.4, 2006-11-27 22:01:26+01:00, guilhem@gbichot3.local +40 -9
    sync files and links and dirs when creating a non-temporary table.
    Optimizations of the above to reduce syncs in the common cases:
    * if index file and data file have the exact same paths (regular
    and link), sync the directories (of regular and link) only once
    after creating the last file (the data file).
    * don't sync the data file if we didn't write to it (always true
    in our builds).

  storage/maria/ma_delete_all.c@1.3, 2006-11-27 22:01:26+01:00, guilhem@gbichot3.local +26 -0
    sync files after truncating a table

  storage/maria/ma_delete_table.c@1.3, 2006-11-27 22:01:26+01:00, guilhem@gbichot3.local +14 -3
    sync files and symbolic links and dirs after dropping a table

  storage/maria/ma_extra.c@1.5, 2006-11-27 22:01:26+01:00, guilhem@gbichot3.local +8 -3
    a function which wraps the sync of the index file and the sync of the
    data file.

  storage/maria/ma_locking.c@1.4, 2006-11-27 22:01:26+01:00, guilhem@gbichot3.local +1 -3
    using a wrapper function

  storage/maria/ma_rename.c@1.2, 2006-11-27 22:01:26+01:00, guilhem@gbichot3.local +32 -4
    sync files and symbolic links and dirs after renaming a table.
    If rename of index works and then rename of data fails, try to undo
    the rename of the index to leave a consistent state. That is just a
    try, it may fail...

  storage/maria/ma_test3.c@1.4, 2006-11-27 22:01:26+01:00, guilhem@gbichot3.local +4 -0
    warning to not pay attention to this test.

  storage/maria/maria_def.h@1.6, 2006-11-27 22:01:26+01:00, guilhem@gbichot3.local +1 -0
    declaration for the function added to ma_extra.c

ChangeSet@1.2303.2.28, 2006-11-22 23:38:10+01:00, guilhem@gbichot3.local +7 -0
  Maria - post-review fixes about my_sync_dir():
  make it return an error (except if certain errno), test this error in
  callers. Do a single my_sync_dir() in my_rename() if possible.

  include/my_global.h@1.144, 2006-11-22 23:38:07+01:00, guilhem@gbichot3.local +8 -0
    better have a symbol name talking about the feature, use it in the
    code of the feature, and define the symbol once depending on the
    platform, rather than have the platform "tested" in the code
    of the feature several times.

  include/my_sys.h@1.210, 2006-11-22 23:38:07+01:00, guilhem@gbichot3.local +2 -2
    my_sync_dir() now can return error

  mysys/my_create.c@1.18, 2006-11-22 23:38:07+01:00, guilhem@gbichot3.local +6 -2
    my_sync_dir() can now return an error

  mysys/my_delete.c@1.8, 2006-11-22 23:38:07+01:00, guilhem@gbichot3.local +3 -2
    my_sync_dir() can now return an error

  mysys/my_rename.c@1.10, 2006-11-22 23:38:08+01:00, guilhem@gbichot3.local +10 -2
    my_sync_dir() can now return an error.
    Do a single sync if "from" and "to" are the same directory.
    #ifdef here to not even compile dirname_part() if useless.

  mysys/my_sync.c@1.6, 2006-11-22 23:38:08+01:00, guilhem@gbichot3.local +34 -33
    more comments.
    A compilation error if no way to make my_sync() work (I guess
    we don't want to ship a binary which cannot do any sync at all;
    users of strange OSes compile from source and can remove
    the #error).
    my_sync_dir() now returns an error (except for certain errno values
    considered ok; EIO "input/output error" is not ok).

  sql/unireg.cc@1.87.1.2, 2006-11-22 23:38:08+01:00, guilhem@gbichot3.local +4 -5
    my_sync_dir() now returns an error which must be tested

ChangeSet@1.2303.154.1, 2006-11-22 15:53:26+01:00, serg@janus.mylan +2 -0
  shut up signedness warnings in atomic ops in gcc

  include/my_atomic.h@1.11, 2006-11-22 15:53:23+01:00, serg@janus.mylan +98 -41
    shut up signedness warnings in atomic ops in gcc

  unittest/mysys/my_atomic-t.c@1.13, 2006-11-22 15:53:23+01:00, serg@janus.mylan +3 -2
    try both signed and unsigned arguments for atomic ops

ChangeSet@1.2303.147.1, 2006-11-21 22:22:59+01:00, guilhem@gbichot3.local +11 -0
  Maria - various fixes around durability of files:
  1) on Mac OS X >=10.3, fcntl() is recommended over fsync (from the
  man page: "[With fsync()] the disk drive may also re-order the data
  so that later writes may be present while earlier writes are not.
  Applications such as databases that require a strict ordering of writes
  should use F_FULLFSYNC to ensure their data is written in the order
  they expect"). I have seen two other pieces of software changing from
  fsync to F_FULLFSYNC on Mac OS X.
  2) to make a file creation/deletion/renaming durable on Linux (at least
  ext2 as I have tested) (see "man fsync"), a fsync() on the directory
  is needed: new functions to do that, and a flag MY_SYNC_DIR to do
  it in my_create/my_delete/my_rename.
  3) now using this directory syncing when creating he frm if
  opt_sync_frm, and for Maria's control file when it is created.

  libmysql/CMakeLists.txt@1.12, 2006-11-21 22:22:56+01:00, guilhem@gbichot3.local +1 -0
    my_create() now depends on my_sync() so my_sync is needed for libmysql

  include/my_sys.h@1.209, 2006-11-21 22:22:56+01:00, guilhem@gbichot3.local +3 -0
    new flag to my_create/my_delete/my_rename, which asks to sync the
    directory after the operation is done (currently does nothing except
    on Linux)

  libmysql/Makefile.shared@1.70, 2006-11-21 22:22:56+01:00, guilhem@gbichot3.local +1 -1
    my_create() now depends on my_sync() so my_sync is needed for libmysql

  mysys/my_create.c@1.17, 2006-11-21 22:22:56+01:00, guilhem@gbichot3.local +3 -0
    my_create() can now sync the directory if asked for

  mysys/my_delete.c@1.7, 2006-11-21 22:22:56+01:00, guilhem@gbichot3.local +2 -0
    my_delete() can now sync the directory if asked for

  mysys/my_open.c@1.29.1.1, 2006-11-21 22:22:56+01:00, guilhem@gbichot3.local +1 -0
    it was a bug that my_close() is done on fd but a positive fd would
    still be returned, by my_register_filename().

  mysys/my_rename.c@1.9, 2006-11-21 22:22:56+01:00, guilhem@gbichot3.local +5 -0
    my_rename() can now sync the two directories (the one of "from" and
    the one of "to") if asked for.

  mysys/my_sync.c@1.5, 2006-11-21 22:22:56+01:00, guilhem@gbichot3.local +74 -0
    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?

  sql/log.cc@1.237.7.1, 2006-11-21 22:22:56+01:00, guilhem@gbichot3.local +5 -0
    a TODO for the future.

  sql/unireg.cc@1.87.1.1, 2006-11-21 22:22:56+01:00, guilhem@gbichot3.local +6 -3
    If we sync the frm it makes sense to also sync its creation in the
    directory.

  storage/maria/ma_control_file.c@1.10, 2006-11-21 22:22:56+01:00, guilhem@gbichot3.local +3 -8
    control file is vital, try to make it to disk

ChangeSet@1.2303.2.24, 2006-11-19 21:32:16+01:00, serg@janus.mylan +1 -0
  post-review fixes

  storage/maria/tablockman.c@1.5, 2006-11-19 21:32:12+01:00, serg@janus.mylan +43 -30
    post-review fixes

ChangeSet@1.2303.128.1, 2006-11-17 14:41:33+02:00, bell@desktop.sanja.is.com.ua +1 -0
  Post review changes.

  mysys/mf_pagecache.c@1.8, 2006-11-17 14:41:31+02:00, bell@desktop.sanja.is.com.ua +62 -80
    Unneed volitile definitions removed.
    Comments added.
    info_check_lock() code simplified.
    pagecache_delete_page() fixed.

ChangeSet@1.2303.2.22, 2006-11-16 23:04:53+01:00, guilhem@gbichot3.local +1 -0
  Maria:    fix for compiler warning (signed-ness).
      #warning to warn (!) about current issues in the pagecache hindering
      checkpoint (we will have to fix them!).

  mysys/mf_pagecache.c@1.7, 2006-11-16 23:04:50+01:00, guilhem@gbichot3.local +7 -1
    fix for compiler warning (signed-ness).
    #warning to warn (!) about current issues in the pagecache hindering
    checkpoint (we will have to fix them!).

ChangeSet@1.2303.2.21, 2006-11-16 22:53:53+01:00, guilhem@gbichot3.local +7 -0
  Maria - WL#3134 Key cache to Page cache conversion
  Moving the test_pagecache_ tests from mysys to unittest/mysys.
  Means fixing includes to work with the new directory, some Makefile.am
  editing, replacing memset() with bfill().
  test_page_cache_*.c renamed to mf_pagecache_*-t.c (-t is the standard
  suffix for tests in the mytap protocol).
  Also added plan() and exit_status() calls to tests.
  Sanja, I put some TODOs for you at the start of mf_pagecache_*.c

  mysys/Makefile.am@1.86, 2006-11-16 22:53:47+01:00, guilhem@gbichot3.local +0 -55
    pagecache test files move to top/unittest/mysys

  mysys/mf_pagecache.c@1.6, 2006-11-16 22:53:47+01:00, guilhem@gbichot3.local +2 -0
    my_bit.h needed to compile.

  unittest/mysys/mf_pagecache_consist.c@1.4, 2006-11-16 22:53:47+01:00, guilhem@gbichot3.local +11 -13
    fixing includes to work with the new directory.
    The test must return an exit code informing if any part failed.
    TODOs for Sanja.

  unittest/mysys/mf_pagecache_consist.c@1.3, 2006-11-16 22:29:15+01:00, guilhem@gbichot3.local +0 -0
    Rename: mysys/test_pagecache_consist.c -> unittest/mysys/mf_pagecache_consist.c

  unittest/mysys/mf_pagecache_single.c@1.3, 2006-11-16 22:53:47+01:00, guilhem@gbichot3.local +20 -22
    fixing includes to work with new directory.
    adding a plan() to account for the number of tests.
    Adding exit_status() to tell how many tests failed.
    memset() was giving a compilation warning (implicit declaration etc),
    properly due to me removing stdio.h etc, so I replaced it with bfill().
    TODOs for Sanja.

  unittest/mysys/mf_pagecache_single.c@1.2, 2006-11-16 22:27:56+01:00, guilhem@gbichot3.local +0 -0
    Rename: mysys/test_pagecache_single.c -> unittest/mysys/mf_pagecache_single.c

  unittest/mysys/test_file.c@1.3, 2006-11-16 22:53:47+01:00, guilhem@gbichot3.local +3 -5
    moved from mysys (piece of the page cache tests) and includes fixed.

  unittest/mysys/test_file.c@1.2, 2006-11-16 22:42:00+01:00, guilhem@gbichot3.local +0 -0
    Rename: mysys/test_file.c -> unittest/mysys/test_file.c

  unittest/mysys/test_file.h@1.2, 2006-11-16 22:42:45+01:00, guilhem@gbichot3.local +0 -0
    Rename: mysys/test_file.h -> unittest/mysys/test_file.h

  unittest/mysys/Makefile.am@1.7, 2006-11-16 22:53:47+01:00, guilhem@gbichot3.local +43 -3
    INCLUDES is a better place for includes than AM_CPPFLAGS (the latter
    get overriden by prog_CPPFLAGS, which is not desirable here).
    Adding pagecache's test programs (moved from mysys);
    test_pagecache_* has been renamed to mf_pagecache*-t
    (-t is the required suffix for test executables in the mytap framework).

ChangeSet@1.2303.125.1, 2006-11-16 15:40:08+01:00, serg@janus.mylan +16 -0
  post-review fixes.
  tablockman: fixed a bug in finding a blocker lock

  BUILD/SETUP.sh@1.64, 2006-11-16 14:34:41+01:00, serg@janus.mylan +2 -1
    add -DMY_LF_EXTRA_DEBUG to debug builds

  include/atomic/nolock.h@1.6, 2006-11-16 14:34:41+01:00, serg@janus.mylan +1 -1
    suppress warning

  include/lf.h@1.9, 2006-11-16 15:40:04+01:00, serg@janus.mylan +2 -2
    post-review fix

  include/lf.h@1.8, 2006-11-16 14:34:41+01:00, serg@janus.mylan +30 -13
    post-review fixes

  include/my_atomic.h@1.10, 2006-11-16 12:31:58+01:00, serg@janus.mylan +0 -8
    moved intptr definition to my_global.h

  include/my_global.h@1.143, 2006-11-16 14:34:41+01:00, serg@janus.mylan +2 -1
    suppress warning

  include/my_global.h@1.142, 2006-11-16 12:31:58+01:00, serg@janus.mylan +8 -0
    moved intptr definition to my_global.h

  mysys/lf_alloc-pin.c@1.9, 2006-11-16 14:34:41+01:00, serg@janus.mylan +15 -14
    post-review fixes

  mysys/lf_dynarray.c@1.8, 2006-11-16 14:34:41+01:00, serg@janus.mylan +23 -12
    post-review fixes

  mysys/lf_hash.c@1.10, 2006-11-16 14:34:41+01:00, serg@janus.mylan +60 -59
    post-review fixes

  mysys/my_getsystime.c@1.6, 2006-11-16 12:07:26+01:00, serg@janus.mylan +0 -4
    this is no longer true

  storage/maria/lockman.h@1.5, 2006-11-16 12:07:26+01:00, serg@janus.mylan +4 -3
    post-review fixes

  storage/maria/tablockman.c@1.4, 2006-11-16 12:31:58+01:00, serg@janus.mylan +17 -3
    post-review fixes

  storage/maria/tablockman.c@1.3, 2006-11-16 12:07:26+01:00, serg@janus.mylan +224 -129
    post-review fixes,
    comments,
    constant arrays are declared const,
    macros changed to inline function,
    fixed a bug in finding a blocker lock,
    added asserts,
    initialize my_getsystime()

  storage/maria/tablockman.h@1.3, 2006-11-16 12:07:26+01:00, serg@janus.mylan +26 -26
    post-review fixes

  storage/maria/trnman.c@1.13, 2006-11-16 14:34:41+01:00, serg@janus.mylan +2 -1
    suppress warning

  storage/maria/unittest/lockman-t.c@1.11, 2006-11-16 12:07:26+01:00, serg@janus.mylan +4 -0
    post-review fixes

  storage/maria/unittest/lockman1-t.c@1.3, 2006-11-16 12:07:26+01:00, serg@janus.mylan +14 -9
    post-review fixes

  storage/maria/unittest/lockman2-t.c@1.4, 2006-11-16 12:07:26+01:00, serg@janus.mylan +38 -16
    post-review fixes

ChangeSet@1.2303.2.20, 2006-11-15 12:58:37+02:00, bell@desktop.sanja.is.com.ua +1 -0
  fixed typo

  storage/maria/CMakeLists.txt@1.3, 2006-11-15 12:58:18+02:00, bell@desktop.sanja.is.com.ua +0 -0
    Rename: storage/maria/_MakeLists.txt -> storage/maria/CMakeLists.txt

ChangeSet@1.2303.2.18, 2006-11-14 20:27:38+02:00, bell@desktop.sanja.is.com.ua +1 -0
  make it possible to use the tree on caseinsensitive file systems

  BitKeeper/deleted/.del-cmakelists_.txt@1.3, 2006-11-14 20:26:40+02:00, bell@desktop.sanja.is.com.ua +0 -0
    Delete: storage/maria/cmakelists_.txt

  storage/maria/cmakelists_.txt@1.2, 2006-11-14 20:26:33+02:00, bell@desktop.sanja.is.com.ua +0 -0
    Rename: storage/maria/cmakelists.txt -> storage/maria/cmakelists_.txt

ChangeSet@1.2303.14.2, 2006-11-13 00:26:29+02:00, bell@desktop.sanja.is.com.ua +3 -0
  postreview fixes
  fixed bug in the pagecache which lead to assertion in multithread test

  mysys/mf_pagecache.c@1.5, 2006-11-13 00:26:25+02:00, bell@desktop.sanja.is.com.ua +142 -48
    postreview fixes:
     - comments fixed and added
     - types fixed
     - typo fixed
    Added write locking flag set when we took a block from LRU and going to free it (to prevent locking/using it for write)

  include/pagecache.h@1.2, 2006-11-13 00:26:25+02:00, bell@desktop.sanja.is.com.ua +25 -25
    post review fixes:
     - comments fixed
     - types fixed
     - keyword 'extern' added to all interface functions

  mysys/test_pagecache_consist.c@1.2, 2006-11-13 00:26:25+02:00, bell@desktop.sanja.is.com.ua +2 -2
    pagecache size reduced (to be able reproduce problems found by Guilhem)
    typo in the comment fixed

ChangeSet@1.2303.102.1, 2006-11-12 14:44:12+01:00, serg@janus.mylan +2 -0
  minor unittest fixes

  storage/maria/lockman.c@1.9, 2006-11-12 14:44:10+01:00, serg@janus.mylan +7 -4
    restore removed lines

  storage/maria/unittest/lockman2-t.c@1.3, 2006-11-12 14:44:10+01:00, serg@janus.mylan +1 -1
    fix the plan

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.

ChangeSet@1.2303.2.16, 2006-11-10 16:18:10+01:00, guilhem@gbichot3.local +1 -0
  Maria: importing change made to MyISAM's mi_test_all, into Maria's ma_test_all
  This makes an expected warning message about the index file's size, go away,
  as intended.

  storage/maria/ma_test_all.sh@1.4, 2006-11-10 16:18:08+01:00, guilhem@gbichot3.local +2 -1
    importing change made to MyISAM's mi_test_all, into Maria's ma_test_all
    This makes an expected warning message about the index file's size, go away,
    as intended.

ChangeSet@1.2303.55.3, 2006-11-10 10:56:05+01:00, serg@janus.mylan +4 -0
  comments

  storage/maria/tablockman.c@1.2, 2006-11-10 10:56:03+01:00, serg@janus.mylan +196 -40
    comments. bugfix - a special case in release_locks

  storage/maria/tablockman.h@1.2, 2006-11-10 10:56:03+01:00, serg@janus.mylan +18 -14
    comments

  storage/maria/unittest/lockman1-t.c@1.2, 2006-11-10 10:56:03+01:00, serg@janus.mylan +2 -2
    updated

  storage/maria/unittest/lockman2-t.c@1.2, 2006-11-10 10:56:03+01:00, serg@janus.mylan +16 -2
    new tests

ChangeSet@1.2303.55.2, 2006-11-09 16:20:40+01:00, serg@janus.mylan +8 -0
  lock manager optimized for table locks

  storage/maria/Makefile.am@1.8, 2006-11-09 16:20:36+01:00, serg@janus.mylan +2 -2
    lock manager optimized for table locks

  storage/maria/lockman.c@1.8, 2006-11-09 16:20:36+01:00, serg@janus.mylan +30 -25
    lock manager optimized for table locks

  storage/maria/tablockman.c@1.1, 2006-11-09 16:20:37+01:00, serg@janus.mylan +399 -0
    New BitKeeper file ``storage/maria/tablockman.c''

  storage/maria/tablockman.c@1.0, 2006-11-09 16:20:37+01:00, serg@janus.mylan +0 -0

  storage/maria/tablockman.h@1.1, 2006-11-09 16:20:37+01:00, serg@janus.mylan +84 -0
    New BitKeeper file ``storage/maria/tablockman.h''

  storage/maria/tablockman.h@1.0, 2006-11-09 16:20:37+01:00, serg@janus.mylan +0 -0

  storage/maria/unittest/Makefile.am@1.4, 2006-11-09 16:20:36+01:00, serg@janus.mylan +1 -1
    lock manager optimized for table locks

  storage/maria/unittest/lockman-t.c@1.10, 2006-11-09 16:20:36+01:00, serg@janus.mylan +1 -1
    lock manager optimized for table locks

  storage/maria/unittest/lockman1-t.c@1.1, 2006-11-09 16:20:36+01:00, serg@janus.mylan +330 -0
    New BitKeeper file ``storage/maria/unittest/lockman1-t.c''

  storage/maria/unittest/lockman1-t.c@1.0, 2006-11-09 16:20:36+01:00, serg@janus.mylan +0 -0

  storage/maria/unittest/lockman2-t.c@1.1, 2006-11-09 16:20:37+01:00, serg@janus.mylan +318 -0
    New BitKeeper file ``storage/maria/unittest/lockman2-t.c''

  storage/maria/unittest/lockman2-t.c@1.0, 2006-11-09 16:20:37+01:00, serg@janus.mylan +0 -0

ChangeSet@1.2303.2.14, 2006-11-08 23:22:38+01:00, guilhem@gbichot3.local +2 -0
  Maria: fix for a bug in the transaction's manager and a bug in 
  the unit test of the control file module.

  storage/maria/trnman.c@1.12, 2006-11-08 23:22:34+01:00, guilhem@gbichot3.local +1 -1
    fix for a bug (i has to be in [1..SHORT_TRID_MAX])

  storage/maria/unittest/ma_control_file-t.c@1.8, 2006-11-08 23:22:35+01:00, guilhem@gbichot3.local +2 -2
    corrupted checksum is in buffer[0], not in buffer[1]

ChangeSet@1.2303.55.1, 2006-10-30 16:58:18+01:00, serg@janus.mylan +1 -0
  fix dynarray_idxes_in_prev_level[] values

  mysys/lf_dynarray.c@1.7, 2006-10-30 16:58:15+01:00, serg@janus.mylan +5 -3
    fix dynarray_idxes_in_prev_level[] values

ChangeSet@1.2303.2.13, 2006-10-30 12:44:33+01:00, guilhem@gbichot2.(none) +3 -0
  Manually importing Ingo's fix for BUG#22119
  "Changing MI_KEY_BLOCK_LENGTH makes a wrong myisamchk"
  in the Maria tree as it is really needed to get "ma_test_all" to pass
  (this bug showed up in Maria first, not in MyISAM).
  Now ma_test_all does not have corruption messages about test2 anymore,
  and shows the same output as mi_test_all except that
  ma_test_all has this at the start:
  lt-maria_chk: MARIA file test1
  lt-maria_chk: warning: Size of indexfile is: 8192          Should be: 16384
  MARIA-table 'test1' is usable but should be fixed
  This was already true before importing the bugfix.
  Wonder if normal.
  NOTE: this bugfix is currently in 5.1-engines, in a few days
  will be in the main 5.1, then we'll merge 5.1
  into Maria: this will merge the bugfix into storage/myisam, but there
  will be no need to apply it to storage/maria again. I just couldn't
  wait a few days for the 5.1-engines->5.1 merge to be allowed.

  mysql-test/r/maria.result@1.4, 2006-10-30 12:44:22+01:00, guilhem@gbichot2.(none) +45 -0
    result update

  mysql-test/t/maria.test@1.4, 2006-10-30 12:44:23+01:00, guilhem@gbichot2.(none) +44 -0
    test for BUG#22119

  storage/maria/ma_check.c@1.6, 2006-10-30 12:44:23+01:00, guilhem@gbichot2.(none) +72 -16
    fix for BUG#22119

ChangeSet@1.2303.33.5, 2006-10-27 17:09:31+02:00, serg@janus.mylan +6 -0
  comments, minor changes
  ---
  comments

  mysys/lf_alloc-pin.c@1.8, 2006-10-27 17:09:29+02:00, serg@janus.mylan +33 -31
    comments

  mysys/lf_dynarray.c@1.6, 2006-10-27 17:09:29+02:00, serg@janus.mylan +24 -1
    comments

  mysys/lf_hash.c@1.9, 2006-10-27 17:09:29+02:00, serg@janus.mylan +57 -18
    comments, charset-aware comparison

  storage/maria/trnman.c@1.9.1.2, 2006-10-27 17:09:29+02:00, serg@janus.mylan +10 -1
    comments

  storage/maria/unittest/lockman-t.c@1.9, 2006-10-27 17:09:29+02:00, serg@janus.mylan +10 -4
    test case for a bug

  unittest/mysys/my_atomic-t.c@1.12, 2006-10-27 17:09:29+02:00, serg@janus.mylan +6 -7
    removed mistakenly copied line

ChangeSet@1.2303.33.4, 2006-10-23 15:13:51+02:00, serg@janus.mylan +1 -0
  include/my_atomic.h: comment

  include/my_atomic.h@1.9, 2006-10-23 15:13:48+02:00, serg@janus.mylan +34 -0
    comment

ChangeSet@1.2303.33.3, 2006-10-23 12:44:08+02:00, serg@janus.mylan +2 -0
  trnman_destroy returns void, remove unused variables

  storage/maria/trnman.c@1.9.1.1, 2006-10-23 12:44:05+02:00, serg@janus.mylan +4 -5
    trnman_destroy returns void, remove unused variables

  storage/maria/trnman.h@1.8, 2006-10-23 12:44:05+02:00, serg@janus.mylan +1 -1
    trnman_destroy returns void

ChangeSet@1.2303.33.2, 2006-10-22 16:05:18+02:00, serg@janus.mylan +3 -0
  make sure all test threads really exit before main() - workaround for
  NPTL bug in some linux kernels (Bug#22320)

  storage/maria/unittest/lockman-t.c@1.8, 2006-10-22 16:05:15+02:00, serg@janus.mylan +18 -21
    make sure all test threads really exit before main() - workaround for
    NPTL bug in some linux kernels (Bug#22320)

  storage/maria/unittest/trnman-t.c@1.7, 2006-10-22 16:05:15+02:00, serg@janus.mylan +17 -19
    make sure all test threads really exit before main() - workaround for
    NPTL bug in some linux kernels (Bug#22320)

  unittest/mysys/my_atomic-t.c@1.11, 2006-10-22 16:05:15+02:00, serg@janus.mylan +72 -99
    make sure all test threads really exit before main() - workaround for
    NPTL bug in some linux kernels (Bug#22320)

ChangeSet@1.2303.33.1, 2006-10-21 20:06:56+02:00, serg@janus.mylan +5 -0
  less confusing and more correct name for my_atomic_swap

  include/atomic/x86-msvc.h@1.5, 2006-10-21 20:06:53+02:00, serg@janus.mylan +1 -1
    less confusing and more correct name for my_atomic_swap

  include/atomic/rwlock.h@1.4, 2006-10-21 20:06:53+02:00, serg@janus.mylan +1 -1
    less confusing and more correct name for my_atomic_swap

  include/atomic/x86-gcc.h@1.8, 2006-10-21 20:06:53+02:00, serg@janus.mylan +1 -1
    less confusing and more correct name for my_atomic_swap

  include/my_atomic.h@1.8, 2006-10-21 20:06:53+02:00, serg@janus.mylan +11 -11
    less confusing and more correct name for my_atomic_swap

  unittest/mysys/my_atomic-t.c@1.10, 2006-10-21 20:06:53+02:00, serg@janus.mylan +4 -4
    less confusing and more correct name for my_atomic_swap

ChangeSet@1.2303.2.11, 2006-10-21 15:53:42+02:00, guilhem@gbichot3.local +1 -0
  malloc() failure is unlikely().

  storage/maria/trnman.c@1.10, 2006-10-21 15:53:39+02:00, guilhem@gbichot3.local +1 -1
    malloc() failure is unlikely

ChangeSet@1.2303.2.10, 2006-10-20 14:02:18+02:00, serg@janus.mylan +7 -0
  more post-review fixes - comments, renames, error checks in unit tests
  concurrency bug in lock manager

  include/my_global.h@1.141, 2006-10-20 14:02:15+02:00, serg@janus.mylan +7 -0
    compile-time assert macro

  mysys/my_atomic.c@1.5, 2006-10-20 14:02:15+02:00, serg@janus.mylan +1 -1
    use compile_time_assert() macro

  storage/maria/lockman.c@1.7, 2006-10-20 14:02:15+02:00, serg@janus.mylan +8 -3
    bug in concurrent lockdelete (with retries)

  storage/maria/trnman.c@1.9, 2006-10-20 14:02:15+02:00, serg@janus.mylan +40 -16
    more post-review fixes - comments, renames

  storage/maria/trnman.h@1.7, 2006-10-20 14:02:15+02:00, serg@janus.mylan +9 -1
    more post-review fixes - comments

  storage/maria/unittest/lockman-t.c@1.7, 2006-10-20 14:02:15+02:00, serg@janus.mylan +9 -5
    friendlier error checks

  storage/maria/unittest/trnman-t.c@1.6, 2006-10-20 14:02:15+02:00, serg@janus.mylan +13 -2
    friendlier error checks

ChangeSet@1.2303.2.9, 2006-10-19 13:33:49+02:00, serg@janus.mylan +1 -0
  comments

  mysys/lf_alloc-pin.c@1.7, 2006-10-19 13:33:47+02:00, serg@janus.mylan +159 -34
    comments

ChangeSet@1.2303.2.8, 2006-10-19 12:21:30+02:00, serg@janus.mylan +7 -0
  post-review fixes (style)

  include/lf.h@1.7, 2006-10-19 12:21:27+02:00, serg@janus.mylan +21 -22
    comments

  storage/maria/lockman.c@1.6, 2006-10-19 12:21:27+02:00, serg@janus.mylan +4 -4
    post-review fixes (style)

  storage/maria/lockman.h@1.4, 2006-10-19 12:21:27+02:00, serg@janus.mylan +1 -1
    post-review fixes (style)

  storage/maria/trnman.c@1.8, 2006-10-19 12:21:27+02:00, serg@janus.mylan +93 -54
    post-review fixes (style)

  storage/maria/trnman.h@1.6, 2006-10-19 12:21:27+02:00, serg@janus.mylan +1 -1
    post-review fixes (style)

  storage/maria/unittest/lockman-t.c@1.6, 2006-10-19 12:21:27+02:00, serg@janus.mylan +51 -46
    post-review fixes (style)

  storage/maria/unittest/trnman-t.c@1.5, 2006-10-19 12:21:28+02:00, serg@janus.mylan +15 -16
    post-review fixes (style)

ChangeSet@1.2303.2.7, 2006-10-18 17:24:07+02:00, serg@janus.mylan +9 -0
  lock manager passed unit tests

  include/lf.h@1.6, 2006-10-18 17:24:03+02:00, serg@janus.mylan +8 -7
    lf_pinbox - don't use a fixed-size purgatory.

  include/my_dbug.h@1.23, 2006-10-15 22:12:19+02:00, serg@janus.mylan +1 -1
    make DBUG_ASSERT always a statement

  mysys/lf_alloc-pin.c@1.6, 2006-10-18 17:24:03+02:00, serg@janus.mylan +84 -88
    lf_pinbox - don't use a fixed-size purgatory.

  mysys/lf_hash.c@1.8, 2006-10-18 17:24:04+02:00, serg@janus.mylan +3 -1
    lf_pinbox - don't use a fixed-size purgatory.

  storage/maria/lockman.c@1.5, 2006-10-18 17:24:04+02:00, serg@janus.mylan +17 -34
    removed IGNORE_ME/UPGDARED matching - it was wrong in the first place.
    updated for "lf_pinbox - don't use a fixed-size purgatory"

  storage/maria/lockman.c@1.4, 2006-10-15 22:12:19+02:00, serg@janus.mylan +125 -19
    fixes for loose locks
    big lock manager description comment

  storage/maria/lockman.c@1.3, 2006-10-14 11:04:03+02:00, serg@janus.mylan +19 -19
    bug: lo->waiting_for was set too late and released to early, breaking rwlock mode.
    bug: prev_lock wasn't changed for upgraded locks, breaking active lock detection

  storage/maria/lockman.h@1.3, 2006-10-15 22:12:19+02:00, serg@janus.mylan +6 -3
    comments

  storage/maria/trnman.c@1.7, 2006-10-14 11:04:03+02:00, serg@janus.mylan +16 -6
    comments

  storage/maria/unittest/lockman-t.c@1.5, 2006-10-18 17:24:04+02:00, serg@janus.mylan +23 -11
    IGNORE_ME/UPGRADED pair counting bugtest.
    more tests

  storage/maria/unittest/lockman-t.c@1.4, 2006-10-15 22:12:19+02:00, serg@janus.mylan +47 -18
    more tests

  storage/maria/unittest/lockman-t.c@1.3, 2006-10-14 11:04:03+02:00, serg@janus.mylan +8 -2
    test: lock upgrade when conflicts are present

  unittest/mysys/my_atomic-t.c@1.9, 2006-10-18 17:24:04+02:00, serg@janus.mylan +2 -2
    lf_pinbox - don't use a fixed-size purgatory.

ChangeSet@1.2303.14.1, 2006-10-15 22:26:42+03:00, bell@desktop.sanja.is.com.ua +1 -0
  This is not supposed to be pushed, it is just to check of source of mac os problems

  storage/maria/_MakeLists.txt@1.2, 2006-10-15 22:25:00+03:00, bell@desktop.sanja.is.com.ua +0 -0
    Rename: storage/maria/CMakeLists.txt -> storage/maria/_MakeLists.txt

ChangeSet@1.2273.27.11, 2006-10-13 11:37:27+02:00, serg@janus.mylan +19 -0
  push for trnman review
  (lockmanager still fails unit tests)

  BitKeeper/deleted/.del-Makefile.am~4375ae3d4de2bdf0@1.2, 2006-09-20 17:30:23+02:00, serg@janus.mylan +0 -0
    Delete: unittest/maria/Makefile.am

  include/atomic/x86-msvc.h@1.4, 2006-10-11 16:57:20+02:00, serg@janus.mylan +5 -5
    s/LOCK/LOCK_prefix/

  configure.in@1.363, 2006-10-11 16:57:20+02:00, serg@janus.mylan +3 -3
    silence up configure warnings, don't generate unittest/maria/Makefile

  include/atomic/nolock.h@1.5, 2006-10-11 16:57:20+02:00, serg@janus.mylan +2 -2
    s/LOCK/LOCK_prefix/

  include/atomic/x86-gcc.h@1.7, 2006-10-11 16:57:20+02:00, serg@janus.mylan +9 -9
    s/LOCK/LOCK_prefix/

  include/lf.h@1.5, 2006-10-11 16:57:20+02:00, serg@janus.mylan +8 -6
    pin asserts, renames

  include/my_atomic.h@1.7, 2006-10-11 16:57:20+02:00, serg@janus.mylan +5 -5
    move cleanup

  include/my_bit.h@1.2, 2006-10-11 16:57:20+02:00, serg@janus.mylan +2 -2
    s/uint/uint32/

  mysys/lf_dynarray.c@1.5, 2006-10-11 16:57:20+02:00, serg@janus.mylan +37 -55
    style fixes, split for() in two, remove if()s

  mysys/lf_hash.c@1.7, 2006-10-11 16:57:20+02:00, serg@janus.mylan +21 -20
    renames, minor fixes

  mysys/my_atomic.c@1.4, 2006-10-11 16:57:20+02:00, serg@janus.mylan +1 -1
    run-time assert -> compile-time assert

  storage/maria/Makefile.am@1.6, 2006-10-11 16:57:20+02:00, serg@janus.mylan +2 -2
    lockman here

  storage/maria/lockman.c@1.2, 2006-10-13 11:37:24+02:00, serg@janus.mylan +59 -43
    many changes:
    second meaning of "blocker"
    portability: s/gettimeofday/my_getsystime/
    move mutex/cond out of LOCK_OWNER - it creates a race condition
    that will be fixed in a separate changeset
    increment lm->count for every element, not only for distinct ones -
    because we cannot decrease it for distinct elements only :(

  storage/maria/lockman.c@1.1, 2006-10-11 16:57:21+02:00, serg@janus.mylan +665 -0
    New BitKeeper file ``storage/maria/lockman.c''

  storage/maria/lockman.c@1.0, 2006-10-11 16:57:21+02:00, serg@janus.mylan +0 -0

  storage/maria/lockman.h@1.2, 2006-10-13 11:37:24+02:00, serg@janus.mylan +2 -3
    move mutex/cond out of LOCK_OWNER

  storage/maria/lockman.h@1.1, 2006-10-11 16:57:21+02:00, serg@janus.mylan +74 -0
    New BitKeeper file ``storage/maria/lockman.h''

  storage/maria/lockman.h@1.0, 2006-10-11 16:57:21+02:00, serg@janus.mylan +0 -0

  storage/maria/trnman.c@1.6, 2006-10-13 11:37:24+02:00, serg@janus.mylan +19 -9
    move mutex/cond out of LOCK_OWNER
    atomic-ops to access short_trid_to_trn[]

  storage/maria/trnman.c@1.5, 2006-10-11 16:57:20+02:00, serg@janus.mylan +181 -117
    lots of changes

  storage/maria/trnman.c@1.4, 2006-09-20 16:50:37+02:00, serg@janus.mylan +0 -0
    Rename: storage/maria/trxman.c -> storage/maria/trnman.c

  storage/maria/trnman.h@1.5, 2006-10-13 11:37:24+02:00, serg@janus.mylan +3 -3
    move mutex/cond out of LOCK_OWNER

  storage/maria/trnman.h@1.4, 2006-10-11 16:57:20+02:00, serg@janus.mylan +43 -23
    lots of changes

  storage/maria/trnman.h@1.3, 2006-09-20 16:50:22+02:00, serg@janus.mylan +0 -0
    Rename: storage/maria/trxman.h -> storage/maria/trnman.h

  storage/maria/unittest/Makefile.am@1.3, 2006-10-11 16:57:20+02:00, serg@janus.mylan +1 -1
    new unit tests

  storage/maria/unittest/lockman-t.c@1.2, 2006-10-13 11:37:24+02:00, serg@janus.mylan +97 -16
    unit stress test

  storage/maria/unittest/lockman-t.c@1.1, 2006-10-11 16:57:21+02:00, serg@janus.mylan +165 -0
    New BitKeeper file ``storage/maria/unittest/lockman-t.c''

  storage/maria/unittest/lockman-t.c@1.0, 2006-10-11 16:57:21+02:00, serg@janus.mylan +0 -0

  storage/maria/unittest/trnman-t.c@1.4, 2006-10-11 16:57:21+02:00, serg@janus.mylan +87 -47
    lots of changes

  storage/maria/unittest/trnman-t.c@1.3, 2006-09-20 17:27:03+02:00, serg@janus.mylan +0 -0
    Rename: unittest/maria/trxman-t.c -> storage/maria/unittest/trnman-t.c

ChangeSet@1.2303.2.5, 2006-10-11 19:30:16+03:00, guilhem@gbichot3.local +19 -0
  Merge of recent MyISAM changes into Maria. Testsuite passes as much
  as in the main 5.1 (partition and ndb_alter_table fail).

  mysql-test/r/maria.result@1.3, 2006-10-11 19:30:13+03:00, guilhem@gbichot3.local +28 -0
    merge from MyISAM 

  mysql-test/r/ps_maria.result@1.4, 2006-10-11 19:30:13+03:00, guilhem@gbichot3.local +160 -160
    merge from MyISAM 

  mysql-test/t/maria.test@1.3, 2006-10-11 19:30:13+03:00, guilhem@gbichot3.local +36 -0
    merge from MyISAM 

  sql/mysql_priv.h@1.448.1.2, 2006-10-11 19:30:13+03:00, guilhem@gbichot3.local +3 -0
    fix after wrong merge

  sql/mysqld.cc@1.585, 2006-10-11 19:30:13+03:00, guilhem@gbichot3.local +5 -0
    fix after wrong merge

  sql/set_var.cc@1.192.2.2, 2006-10-11 19:30:13+03:00, guilhem@gbichot3.local +2 -2
    adding _db like other engines have

  storage/maria/Makefile.am@1.3.1.7, 2006-10-11 19:30:13+03:00, guilhem@gbichot3.local +1 -1
    merge from MyISAM 

  storage/maria/ha_maria.cc@1.4.1.3, 2006-10-11 19:30:13+03:00, guilhem@gbichot3.local +40 -14
    merge from MyISAM 

  storage/maria/ha_maria.h@1.4, 2006-10-11 19:30:13+03:00, guilhem@gbichot3.local +3 -3
    merge from MyISAM 

  storage/maria/ma_check.c@1.5, 2006-10-11 19:30:13+03:00, guilhem@gbichot3.local +9 -6
    merge from MyISAM 

  storage/maria/ma_delete.c@1.3, 2006-10-11 19:30:13+03:00, guilhem@gbichot3.local +1 -1
    merge from MyISAM 

  storage/maria/ma_init.c@1.3, 2006-10-11 19:30:13+03:00, guilhem@gbichot3.local +3 -3
    maria_inited should rather be my_bool

  storage/maria/ma_locking.c@1.3, 2006-10-11 19:30:13+03:00, guilhem@gbichot3.local +15 -0
    merge from MyISAM 

  storage/maria/ma_packrec.c@1.2, 2006-10-11 19:30:13+03:00, guilhem@gbichot3.local +13 -5
    merge from MyISAM 

  storage/maria/ma_panic.c@1.2, 2006-10-11 19:30:13+03:00, guilhem@gbichot3.local +2 -0
    maria_panic() should not take mutex if engine has not been inited.

  storage/maria/ma_rkey.c@1.3, 2006-10-11 19:30:13+03:00, guilhem@gbichot3.local +34 -21
    merge from MyISAM 

  storage/maria/ma_write.c@1.5, 2006-10-11 19:30:13+03:00, guilhem@gbichot3.local +4 -4
    merge from MyISAM 

  storage/maria/maria_def.h@1.5, 2006-10-11 19:30:13+03:00, guilhem@gbichot3.local +8 -0
    merge from MyISAM. maria_inited is needed for maria_panic().

  storage/maria/maria_ftdump.c@1.3, 2006-10-11 19:30:13+03:00, guilhem@gbichot3.local +1 -2
    merge from MyISAM 

ChangeSet@1.2273.75.1, 2006-09-21 23:12:56+02:00, guilhem@gbichot3.local +3 -0
  Maria: fixes for build failures in pushbuild. Comments, fixing of function names.

  sql/mysqld.cc@1.564.23.1, 2006-09-21 23:12:53+02:00, guilhem@gbichot3.local +2 -0
    MyISAM is always enabled so Maria needs have_maria
    which MyISAM does not need. This should fix a link failure in pushbuild

  storage/Makefile.am@1.7, 2006-09-21 23:12:53+02:00, guilhem@gbichot3.local +6 -1
    force myisam to be built before maria (will not be needed when
    Maria does not depend on MyISAM anymore)

  mysys/mf_pagecache.c@1.4, 2006-09-21 23:12:52+02:00, guilhem@gbichot3.local +15 -10
    comments fixing. More comments.
    pagecache_ulock_block->page_unlock_block

ChangeSet@1.2273.27.9, 2006-09-20 10:42:15+02:00, guilhem@gbichot3.local +2 -0
  Maria, very minor changes.

  mysys/Makefile.am@1.82.1.2, 2006-09-20 10:42:13+02:00, guilhem@gbichot3.local +2 -1
    test_pagecache* programs need to link with dbug
    (I used BUILD/compile-pentium64-valgrind-max)

  mysys/mf_pagecache.c@1.3, 2006-09-20 10:42:13+02:00, guilhem@gbichot3.local +0 -1
    unused constant

ChangeSet@1.2273.27.8, 2006-09-15 11:05:35+02:00, guilhem@gbichot3.local +5 -0
  WL#3234 Maria Control file manager
  last round of fixes to the storage engines' and plugins' unit tests
  structure. Will extract a total patch and push it in 5.1 as has been
  approved.

  Makefile.am@1.95.2.1, 2006-09-15 11:05:33+02:00, guilhem@gbichot3.local +2 -2
    unittest must be before storage and plugin, because engine and plugin
    may have unit tests which link with libtap which is found in
    unitttest.

  config/ac-macros/plugins.m4@1.19, 2006-09-15 11:05:33+02:00, guilhem@gbichot3.local +8 -16
    When enabling an engine/plugin, add its directory to the list
    of directories where unit tests should be searched. That is,
    its directory will be recursively searched by our unit test framework
    which will execute any executable *-t file.

  storage/maria/ma_control_file.c@1.9, 2006-09-15 11:05:33+02:00, guilhem@gbichot3.local +7 -4
    those my_message pollute the output of unit tests.

  storage/maria/plug.in@1.2, 2006-09-15 11:05:33+02:00, guilhem@gbichot3.local +1 -1
    When Maria is enabled, add its unittest Makefile.

  unittest/Makefile.am@1.9.2.3, 2006-09-15 11:05:33+02:00, guilhem@gbichot3.local +1 -1
    plugins too

ChangeSet@1.2273.27.7, 2006-09-14 19:06:51+02:00, guilhem@gbichot3.local +10 -0
  WL#3071 Maria checkpoint:
      changing pseudocode to use the structures of the Maria pagecache
      ("pagecache->changed_blocks" etc) and other Maria structures
      inherited from MyISAM (THR_LOCK_maria etc).

  storage/maria/ma_least_recently_dirtied.c@1.6, 2006-09-14 19:06:49+02:00, guilhem@gbichot3.local +16 -0
    copyright

  storage/maria/ma_least_recently_dirtied.h@1.3, 2006-09-14 19:06:49+02:00, guilhem@gbichot3.local +16 -0
    copyright

  storage/maria/ma_checkpoint.c@1.6, 2006-09-14 19:06:49+02:00, guilhem@gbichot3.local +104 -20
    changing pseudocode to use the structures of the Maria pagecache
    ("pagecache->changed_blocks" etc) and other Maria structures
    inherited from MyISAM (THR_LOCK_maria etc).

  storage/maria/ma_checkpoint.h@1.4, 2006-09-14 19:06:49+02:00, guilhem@gbichot3.local +16 -0
    copyright

  storage/maria/ma_control_file.c@1.8, 2006-09-14 19:06:49+02:00, guilhem@gbichot3.local +20 -1
    copyright

  storage/maria/ma_control_file.h@1.9, 2006-09-14 19:06:49+02:00, guilhem@gbichot3.local +16 -0
    copyright

  mysys/mf_pagecache.c@1.2, 2006-09-14 19:06:49+02:00, guilhem@gbichot3.local +4 -0
    comment

  storage/maria/ma_recovery.c@1.6, 2006-09-14 19:06:49+02:00, guilhem@gbichot3.local +16 -0
    copyright

  storage/maria/ma_recovery.h@1.3, 2006-09-14 19:06:49+02:00, guilhem@gbichot3.local +16 -0
    copyright

  storage/maria/unittest/Makefile.am@1.2, 2006-09-14 19:06:49+02:00, guilhem@gbichot3.local +1 -1
    copyright

ChangeSet@1.2273.27.6, 2006-09-12 15:52:01+02:00, guilhem@gbichot3.local +8 -0
  WL#3234 Maria control file
  Fixes after Brian's and Serg's comments: storage engine's unit tests
  are now in storage/<engine>/unittest instead of unittest/storage/<engine>

  BitKeeper/deleted/.del-Makefile.am~78ea2e42d44d121f@1.4, 2006-09-12 15:09:34+02:00, guilhem@gbichot3.local +0 -0
    Delete: unittest/storage/maria/Makefile.am

  unittest/storage/maria/Makefile.am@1.3, 2006-09-12 15:09:21+02:00, guilhem@gbichot3.local +0 -0
    Rename: BitKeeper/deleted/.del-Makefile.am~78ea2e42d44d121f -> unittest/storage/maria/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~78ea2e42d44d121f@1.2, 2006-09-12 15:07:35+02:00, guilhem@gbichot3.local +0 -0
    Delete: unittest/storage/maria/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~80497dbf1a80bdf3@1.2, 2006-09-12 15:10:01+02:00, guilhem@gbichot3.local +0 -0
    Delete: unittest/storage/Makefile.am

  config/ac-macros/plugins.m4@1.18, 2006-09-12 15:51:57+02:00, guilhem@gbichot3.local +4 -4
    we change from unittest/storage/<engine>/ to storage/<engine>/unittest:
    if the engine is enabled has such a directory, build this directory,
    and add it to the list of unit tests to run.

  configure.in@1.359.1.4, 2006-09-12 15:51:57+02:00, guilhem@gbichot3.local +0 -1
    this dir does not exist anymore

  storage/maria/Makefile.am@1.3.1.6, 2006-09-12 15:51:57+02:00, guilhem@gbichot3.local +3 -0
    to build Maria unittests, libmaria must be built.

  storage/maria/unittest/Makefile.am@1.1, 2006-09-12 15:51:57+02:00, guilhem@gbichot3.local +29 -0
    simple Makefile.am to build ma_control_file-t

  storage/maria/unittest/Makefile.am@1.0, 2006-09-12 15:51:57+02:00, guilhem@gbichot3.local +0 -0

  storage/maria/unittest/ma_control_file-t.c@1.7, 2006-09-12 15:46:29+02:00, guilhem@gbichot3.local +0 -0
    Rename: unittest/storage/maria/ma_control_file-t.c -> storage/maria/unittest/ma_control_file-t.c

  unittest/storage/maria/ma_control_file-t.c@1.6, 2006-09-12 15:45:56+02:00, guilhem@gbichot3.local +0 -0
    Rename: BitKeeper/deleted/.del-ma_control_file-t.c -> unittest/storage/maria/ma_control_file-t.c

  BitKeeper/deleted/.del-ma_control_file-t.c@1.5, 2006-09-12 15:07:35+02:00, guilhem@gbichot3.local +0 -0
    Delete: unittest/storage/maria/ma_control_file-t.c

  unittest/Makefile.am@1.9.2.2, 2006-09-12 15:51:57+02:00, guilhem@gbichot3.local +2 -2
    unittest/storage is removed. target "unitests" is defined at
    "configure" time based on enabled engines.

ChangeSet@1.2273.27.5, 2006-09-11 16:12:31+02:00, guilhem@gbichot3.local +9 -0
  WL#3234 Maria control file manager.
  Fitting ma_control_file_test into the mytap unittest framework:
  new directories:
  - unittest/storage/ for unit tests of any storage engine
  - unittest/storage/maria for ... Maria, containing ma_control_file-t.
  Later, older tests like ma_test*, ma_test_all (but which is Unix
  dependent in its current form) could move here too.
  The plugins macro enable building of unittest/storage/X for any
  enabled engine X which has such a directory.
  If Falcon wants to have unit tests there too, I may have to merge
  this patch into 5.x one day.

  unittest/storage/maria/Makefile.am@1.1, 2006-09-11 16:12:26+02:00, guilhem@gbichot3.local +29 -0
    a_control_file-t is added to the Maria unit tests.
    Later, older tests (ma_test1 etc) could also move here.

  unittest/storage/maria/Makefile.am@1.0, 2006-09-11 16:12:26+02:00, guilhem@gbichot3.local +0 -0

  unittest/storage/Makefile.am@1.1, 2006-09-11 16:12:27+02:00, guilhem@gbichot3.local +27 -0
    New BitKeeper file ``unittest/storage/Makefile.am''

  unittest/storage/Makefile.am@1.0, 2006-09-11 16:12:27+02:00, guilhem@gbichot3.local +0 -0

  config/ac-macros/plugins.m4@1.17, 2006-09-11 16:12:26+02:00, guilhem@gbichot3.local +18 -2
    If a storage engine has a directory in unittest/storage, build this
    directory.

  configure.in@1.359.1.3, 2006-09-11 16:12:26+02:00, guilhem@gbichot3.local +1 -0
    build storage engines' unit tests.

  storage/maria/Makefile.am@1.3.1.5, 2006-09-11 16:12:26+02:00, guilhem@gbichot3.local +2 -8
    ma_control_file_test moves to unittest/storage/maria

  storage/maria/ma_control_file.c@1.7, 2006-09-11 16:12:26+02:00, guilhem@gbichot3.local +53 -24
    more error codes when opening the control file fails.
    ma_control_file_end() may now return an error if my_close() failed.

  storage/maria/ma_control_file.h@1.8, 2006-09-11 16:12:26+02:00, guilhem@gbichot3.local +12 -3
    more error codes when opening the control file fails.

  unittest/storage/maria/ma_control_file-t.c@1.4, 2006-09-11 16:12:26+02:00, guilhem@gbichot3.local +286 -150
    Making the test fit the mytap framework (return all the way up
    the stack instead of assert(); use the mytap functions plan(), ok() etc).
    Adding test of file too short/long.

  unittest/storage/maria/ma_control_file-t.c@1.3, 2006-09-11 13:59:35+02:00, guilhem@gbichot3.local +0 -0
    Rename: storage/maria/ma_control_file_test.c -> unittest/storage/maria/ma_control_file-t.c

  unittest/Makefile.am@1.9.2.1, 2006-09-11 16:12:26+02:00, guilhem@gbichot3.local +2 -2
    adding unit tests for storage engines.
    Note that unit.pl simply recurses into "storage", so if a unit test for
    storage engine X has been built previously, and now you re-configure
    (without making clean) to disable this engine, then the unit test of
    X will not be rebuilt but will still be present in storage/X, so will
    be run.

ChangeSet@1.2273.27.4, 2006-09-08 15:37:02+02:00, guilhem@gbichot3.local +1 -0
  There is a Maria category now in the bugs db (but only devs
  can see this category), so no need for this file.

  BitKeeper/deleted/.del-BUGS_IN_MARIA.txt@1.2, 2006-09-08 15:36:06+02:00, guilhem@gbichot3.local +0 -0
    Delete: BUGS_IN_MARIA.txt

ChangeSet@1.2273.27.3, 2006-09-07 18:40:10+02:00, guilhem@gbichot3.local +1 -0
  a file to record known Maria bugs until we use a bugs db.

  BUGS_IN_MARIA.txt@1.1, 2006-09-07 18:40:08+02:00, guilhem@gbichot3.local +49 -0
    a file to record our bugs until we use a bugs db

  BUGS_IN_MARIA.txt@1.0, 2006-09-07 18:40:08+02:00, guilhem@gbichot3.local +0 -0

ChangeSet@1.2273.27.2, 2006-09-07 17:07:17+02:00, guilhem@gbichot3.local +14 -0
  Manually merging changes made to MyISAM into Maria. End of merge.

  configure.in@1.359.1.2, 2006-09-07 17:07:15+02:00, guilhem@gbichot3.local +0 -7
    maria moves to its plug.in

  storage/maria/Makefile.am@1.3.1.4, 2006-09-07 17:07:15+02:00, guilhem@gbichot3.local +67 -12
    merging changes made to MyISAM into Maria.
    ft_maria.c is still needed.

  storage/maria/ft_maria.c@1.5, 2006-09-07 15:55:48+02:00, guilhem@gbichot3.local +0 -0
    Rename: BitKeeper/deleted/.del-ft_maria.c -> storage/maria/ft_maria.c

  BitKeeper/deleted/.del-ft_maria.c@1.4, 2006-09-07 15:02:38+02:00, guilhem@gbichot3.local +0 -0
    Delete: storage/maria/ft_maria.c

  storage/maria/ft_maria.c@1.3, 2006-09-07 15:02:17+02:00, guilhem@gbichot3.local +0 -0
    Rename: BitKeeper/deleted/.del-ft_maria.c -> storage/maria/ft_maria.c

  storage/maria/ha_maria.cc@1.4.1.2, 2006-09-07 17:07:15+02:00, guilhem@gbichot3.local +21 -9
    merging changes made to MyISAM into Maria

  storage/maria/ma_dynrec.c@1.4, 2006-09-07 17:07:15+02:00, guilhem@gbichot3.local +135 -28
    merging changes made to MyISAM into Maria

  storage/maria/ma_extra.c@1.4, 2006-09-07 17:07:15+02:00, guilhem@gbichot3.local +5 -0
    merging changes made to MyISAM into Maria

  storage/maria/ma_ft_parser.c@1.4, 2006-09-07 17:07:15+02:00, guilhem@gbichot3.local +1 -1
    merging changes made to MyISAM into Maria

  storage/maria/ma_open.c@1.4, 2006-09-07 17:07:15+02:00, guilhem@gbichot3.local +1 -0
    merging changes made to MyISAM into Maria

  storage/maria/ma_sort.c@1.3, 2006-09-07 17:07:15+02:00, guilhem@gbichot3.local +5 -6
    merging changes made to MyISAM into Maria

  storage/maria/ma_update.c@1.4, 2006-09-07 17:07:15+02:00, guilhem@gbichot3.local +12 -1
    merging changes made to MyISAM into Maria

  storage/maria/ma_write.c@1.4, 2006-09-07 17:07:15+02:00, guilhem@gbichot3.local +12 -0
    merging changes made to MyISAM into Maria

  storage/maria/maria_def.h@1.4, 2006-09-07 17:07:15+02:00, guilhem@gbichot3.local +3 -0
    merging changes made to MyISAM into Maria

  storage/maria/plug.in@1.1, 2006-09-07 17:07:15+02:00, guilhem@gbichot3.local +7 -0
    merging changes made to MyISAM into Maria

  storage/maria/plug.in@1.0, 2006-09-07 17:07:15+02:00, guilhem@gbichot3.local +0 -0

  storage/myisam/Makefile.am@1.37, 2006-09-07 17:07:15+02:00, guilhem@gbichot3.local +1 -1
    merging changes made to MyISAM into Maria

ChangeSet@1.2255.26.7, 2006-09-07 11:12:37+02:00, guilhem@gbichot3.local +8 -0
  Merge of Myisam changes into Maria.
  First step: ha_maria moves to storage/maria.

  libmysqld/Makefile.am@1.94, 2006-09-07 11:12:35+02:00, guilhem@gbichot3.local +1 -1
    ha_maria moves to other dir (like myisam has)

  sql/Makefile.am@1.145.2.2, 2006-09-07 11:12:35+02:00, guilhem@gbichot3.local +2 -2
    ha_maria moves to other dir (like myisam has)

  sql/mysqld.cc@1.564.17.1, 2006-09-07 11:12:35+02:00, guilhem@gbichot3.local +1 -1
    ha_maria moves to other dir (like myisam has)

  storage/maria/Makefile.am@1.3.1.3, 2006-09-07 11:12:35+02:00, guilhem@gbichot3.local +1 -1
    I delete ft_maria.c like ft_myisam.c has

  BitKeeper/deleted/.del-ft_maria.c@1.2, 2006-09-06 14:30:58+02:00, guilhem@gbichot3.local +0 -0
    Delete: storage/maria/ft_maria.c

  storage/maria/ha_maria.cc@1.4.1.1, 2006-09-06 15:12:08+02:00, guilhem@gbichot3.local +0 -0
    Rename: sql/ha_maria.cc -> storage/maria/ha_maria.cc

  storage/maria/ha_maria.h@1.3, 2006-09-06 15:12:05+02:00, guilhem@gbichot3.local +0 -0
    Rename: sql/ha_maria.h -> storage/maria/ha_maria.h

  storage/maria/ma_test_all.sh@1.3, 2006-09-07 11:12:35+02:00, guilhem@gbichot3.local +2 -4
    -l option is removed (no MyISAM log in Maria), maria_log is removed too.

ChangeSet@1.2255.26.6, 2006-09-04 16:53:09+02:00, guilhem@gbichot3.local +6 -0
  WL#3234 "Maria - control file manager":
  added checksum of the file. Now we have size + magic string + checksum
  to detect that all is ok.
  Plus misc fixes for "make dist" to work and the resulting tarball to build

  include/Makefile.am@1.67.1.2, 2006-09-04 16:53:07+02:00, guilhem@gbichot3.local +1 -1
    adding pagecache.h to help the tarball build.
    The model of pagecache.h, keycache.h, is in pkginclude_HEADERS,
    wonder why. Adding pagecache.h to noinst_HEADERS for now.

  storage/maria/CMakeLists.txt@1.1, 2006-09-04 16:53:07+02:00, guilhem@gbichot3.local +1 -0
    just to make "make dist" happy for now.

  storage/maria/CMakeLists.txt@1.0, 2006-09-04 16:53:07+02:00, guilhem@gbichot3.local +0 -0

  storage/maria/Makefile.am@1.3.1.2, 2006-09-04 16:53:07+02:00, guilhem@gbichot3.local +3 -1
    adding ma_control_file.h to help the tarball build

  storage/maria/ma_control_file.c@1.6, 2006-09-04 16:53:07+02:00, guilhem@gbichot3.local +123 -66
    adding a simple checksum to the control file.
    We protect against corruption of this file like this:
    - test size
    - test magic string at start
    - test checksum
    I also add some simple my_message() errors (to be changed to a better
    reporting later).

  storage/maria/ma_control_file.h@1.7, 2006-09-04 16:53:07+02:00, guilhem@gbichot3.local +3 -3
    comments

  storage/maria/ma_control_file_test.c@1.2, 2006-09-04 16:53:07+02:00, guilhem@gbichot3.local +37 -15
    test of wrong checksum in control file

ChangeSet@1.2255.26.5, 2006-09-01 17:53:10+02:00, guilhem@gbichot3.local +10 -0
  WL#3234 "Maria - control file manager"
  - fixes to the control file module
  - unit test for it
  - renames of all Maria files I created to start with ma_

  storage/maria/ma_least_recently_dirtied.c@1.5, 2006-09-01 15:11:01+02:00, guilhem@gbichot3.local +0 -0
    Rename: storage/maria/least_recently_dirtied.c -> storage/maria/ma_least_recently_dirtied.c

  storage/maria/ma_least_recently_dirtied.h@1.2, 2006-09-01 15:11:04+02:00, guilhem@gbichot3.local +0 -0
    Rename: storage/maria/least_recently_dirtied.h -> storage/maria/ma_least_recently_dirtied.h

  storage/maria/Makefile.am@1.3.1.1, 2006-09-01 17:53:07+02:00, guilhem@gbichot3.local +4 -3
    control file module and its unit test program

  storage/maria/ma_checkpoint.c@1.5, 2006-09-01 15:10:14+02:00, guilhem@gbichot3.local +0 -0
    Rename: storage/maria/checkpoint.c -> storage/maria/ma_checkpoint.c

  storage/maria/ma_checkpoint.h@1.3, 2006-09-01 15:10:19+02:00, guilhem@gbichot3.local +0 -0
    Rename: storage/maria/checkpoint.h -> storage/maria/ma_checkpoint.h

  storage/maria/ma_control_file.c@1.5, 2006-09-01 17:53:07+02:00, guilhem@gbichot3.local +64 -41
    DBUG_ tags. Fix for gcc warnings.
    log_no -> logno (I felt "_no" sounded like a standalone "No" word).
    ma_ prefix for some functions.
    last_checkpoint_lsn_at_startup -> last_checkpoint_lsn (no need
    to make special vars for the values at startup). Same for last_logno.
    ma_control_file_write_and_force() now updates last_checkpoint_lsn
    and last_logno, the idea being that they belong to the module,
    others should not update them.
    And thus when the module shuts down, it zeroes those vars.

  storage/maria/ma_control_file.c@1.4, 2006-09-01 15:10:33+02:00, guilhem@gbichot3.local +0 -0
    Rename: storage/maria/control_file.c -> storage/maria/ma_control_file.c

  storage/maria/ma_control_file.h@1.6, 2006-09-01 17:53:07+02:00, guilhem@gbichot3.local +39 -10
    importing structs from Sanja to get the control file module to compile;
    we'll remove that when Sanja pushes the log handler.
    CONTROL_FILE_IMPOSSIBLE_LOGNO is 0, not FFFFFFFF.

  storage/maria/ma_control_file.h@1.5, 2006-09-01 15:10:30+02:00, guilhem@gbichot3.local +0 -0
    Rename: storage/maria/control_file.h -> storage/maria/ma_control_file.h

  storage/maria/ma_recovery.c@1.5, 2006-09-01 15:11:26+02:00, guilhem@gbichot3.local +0 -0
    Rename: storage/maria/recovery.c -> storage/maria/ma_recovery.c

  storage/maria/ma_recovery.h@1.2, 2006-09-01 15:11:29+02:00, guilhem@gbichot3.local +0 -0
    Rename: storage/maria/recovery.h -> storage/maria/ma_recovery.h

  storage/maria/ma_control_file_test.c@1.1, 2006-09-01 17:53:07+02:00, guilhem@gbichot3.local +290 -0
    Unit test program for the Maria control file module.
    Modelled after other ma_test* files in this directory (so, does
    not follow the unit test framework recently introduced with libtap;
    TODO as a task on all ma_test* programs).
    We test that writing to the control file works, and re-reading from it
    too, we check (by reading the file by ourselves) that its content
    on disk is correct, and check that a corrupted control file is detected.

  storage/maria/ma_control_file_test.c@1.0, 2006-09-01 17:53:07+02:00, guilhem@gbichot3.local +0 -0

ChangeSet@1.2255.26.4, 2006-08-30 10:55:27+02:00, guilhem@gbichot3.local +2 -0
  write a magic string "MACF" (MAria Control File) at the start of the control file.
  lsn8store, lsn8korr.

  storage/maria/control_file.c@1.3, 2006-08-30 10:55:25+02:00, guilhem@gbichot3.local +82 -36
    write a magic string "MACF" (MAria Control File) at the start of the control file.
    lsn8store, lsn8korr.

  storage/maria/control_file.h@1.4, 2006-08-30 10:55:25+02:00, guilhem@gbichot3.local +1 -1
    parameter changes name

ChangeSet@1.2255.26.3, 2006-08-29 22:10:06+02:00, guilhem@gbichot3.local +3 -0
  importing Sanja's changes to the control file, with my changes on them.

  mysys/my_pread.c@1.13.1.1, 2006-08-29 22:10:03+02:00, guilhem@gbichot3.local +2 -1
    print errno in case of error

  storage/maria/control_file.c@1.2, 2006-08-29 22:10:03+02:00, guilhem@gbichot3.local +121 -33
    importing Sanja's changes, with my minor changes on them :)

  storage/maria/control_file.h@1.3, 2006-08-29 22:10:03+02:00, guilhem@gbichot3.local +24 -2
    importing Sanja's changes, with my minor changes on them :)

ChangeSet@1.2255.67.1, 2006-08-29 11:30:35+02:00, guilhem@gbichot3.local +5 -0
  just comment changes and line formatting changes.

  storage/maria/least_recently_dirtied.c@1.4, 2006-08-29 11:30:32+02:00, guilhem@gbichot3.local +12 -2
    comments

  storage/maria/ma_check.c@1.4, 2006-08-29 11:30:32+02:00, guilhem@gbichot3.local +9 -8
    line formatting changes neglected from my last merge

  storage/maria/checkpoint.c@1.4, 2006-08-29 11:30:32+02:00, guilhem@gbichot3.local +4 -4
    comments

  storage/maria/ma_ft_parser.c@1.3, 2006-08-29 11:30:32+02:00, guilhem@gbichot3.local +1 -1
    it reduces the diff of MyISAM vs Maria :)

  storage/maria/recovery.c@1.4, 2006-08-29 11:30:32+02:00, guilhem@gbichot3.local +1 -11
    comments

ChangeSet@1.2255.15.9, 2006-08-23 17:27:21+02:00, serg@janus.mylan +3 -0
  renamed global variables

  storage/maria/trxman.c@1.3, 2006-08-23 17:27:18+02:00, serg@janus.mylan +10 -13
    renamed global variables

  storage/maria/trxman.h@1.2, 2006-08-23 17:27:19+02:00, serg@janus.mylan +1 -1
    renamed global variables

  unittest/maria/trxman-t.c@1.2, 2006-08-23 17:27:19+02:00, serg@janus.mylan +1 -2
    renamed global variables

ChangeSet@1.2255.15.8, 2006-08-17 15:22:54+02:00, serg@janus.mylan +1 -0
  lf_hash: only data nodes use lf_alloc now, dummy nodes are
  malloc'ed directly

  mysys/lf_hash.c@1.6, 2006-08-17 15:22:52+02:00, serg@janus.mylan +11 -6
    only data nodes use lf_alloc now, dummy nodes are malloc'ed directly

ChangeSet@1.2255.15.7, 2006-08-17 15:20:58+02:00, serg@janus.mylan +12 -0
  maria transaction manager with unit tests

  unittest/maria/Makefile.am@1.1, 2006-08-16 20:28:10+02:00, serg@janus.mylan +12 -0
    New BitKeeper file ``unittest/maria/Makefile.am''

  unittest/maria/Makefile.am@1.0, 2006-08-16 20:28:10+02:00, serg@janus.mylan +0 -0

  configure.in@1.361, 2006-08-16 20:28:09+02:00, serg@janus.mylan +1 -1
    maria transaction manager with unit tests

  include/lf.h@1.4, 2006-08-16 20:28:10+02:00, serg@janus.mylan +8 -8
    few lf API changes

  mysys/lf_alloc-pin.c@1.5, 2006-08-16 20:28:10+02:00, serg@janus.mylan +4 -4
    few lf API changes

  mysys/lf_dynarray.c@1.4, 2006-08-16 20:28:10+02:00, serg@janus.mylan +1 -1
    few lf API changes

  mysys/lf_hash.c@1.5, 2006-08-16 20:28:10+02:00, serg@janus.mylan +29 -49
    few lf API changes

  storage/maria/Makefile.am@1.4, 2006-08-16 20:28:10+02:00, serg@janus.mylan +4 -2
    transaction manager

  storage/maria/trxman.c@1.2, 2006-08-17 15:20:55+02:00, serg@janus.mylan +9 -3
    comment clarified

  storage/maria/trxman.c@1.1, 2006-08-16 20:28:10+02:00, serg@janus.mylan +255 -0
    New BitKeeper file ``storage/maria/trxman.c''

  storage/maria/trxman.c@1.0, 2006-08-16 20:28:10+02:00, serg@janus.mylan +0 -0

  storage/maria/trxman.h@1.1, 2006-08-16 20:28:10+02:00, serg@janus.mylan +28 -0
    New BitKeeper file ``storage/maria/trxman.h''

  storage/maria/trxman.h@1.0, 2006-08-16 20:28:10+02:00, serg@janus.mylan +0 -0

  unittest/maria/trxman-t.c@1.1, 2006-08-16 20:28:10+02:00, serg@janus.mylan +138 -0
    New BitKeeper file ``unittest/maria/trxman-t.c''

  unittest/maria/trxman-t.c@1.0, 2006-08-16 20:28:10+02:00, serg@janus.mylan +0 -0

  unittest/Makefile.am@1.10, 2006-08-16 20:28:10+02:00, serg@janus.mylan +2 -2
    maria transaction manager

  unittest/mysys/my_atomic-t.c@1.7, 2006-08-16 20:28:10+02:00, serg@janus.mylan +7 -10
    ensure that values are positive

ChangeSet@1.2255.15.6, 2006-08-11 01:16:51+02:00, serg@janus.mylan +4 -0
  fixes for inline bit functions

  sql/ha_maria.cc@1.5, 2006-08-11 01:16:47+02:00, serg@janus.mylan +1 -0
    fixes for inline bit functions

  storage/maria/ma_create.c@1.3, 2006-08-11 01:16:47+02:00, serg@janus.mylan +1 -0
    fixes for inline bit functions

  storage/maria/ma_test2.c@1.4, 2006-08-11 01:16:47+02:00, serg@janus.mylan +1 -0
    fixes for inline bit functions

  storage/maria/maria_chk.c@1.4, 2006-08-11 01:16:47+02:00, serg@janus.mylan +1 -0
    fixes for inline bit functions

ChangeSet@1.2181.130.3, 2006-08-10 19:19:47+02:00, serg@janus.mylan +30 -0
  amd64 atomic ops
  lock-free alloc (WL#3229), lock-free hash (WL#3230)
  bit functions made inline

  include/Makefile.am@1.68, 2006-08-02 13:00:34+02:00, serg@janus.mylan +1 -1
    lf.h added

  include/atomic/nolock.h@1.4, 2006-08-07 11:37:09+02:00, serg@janus.mylan +12 -11
    amd64 atomic ops

  include/atomic/rwlock.h@1.3, 2006-08-07 11:37:09+02:00, serg@janus.mylan +13 -8
    s/rw_lock/mutex/g

  include/atomic/x86-gcc.h@1.6, 2006-08-07 11:37:09+02:00, serg@janus.mylan +14 -3
    amd64 atomic ops
    try PAUSE

  include/atomic/x86-gcc.h@1.5, 2006-08-02 13:00:34+02:00, serg@janus.mylan +1 -1
    typo fixed

  include/lf.h@1.3, 2006-08-08 18:43:36+02:00, serg@janus.mylan +13 -6
    dylf_dynarray refactored to remove 65536 elements limit

  include/lf.h@1.2, 2006-08-07 11:37:09+02:00, serg@janus.mylan +38 -22
    generalized lf_hash, better assert on pins

  include/lf.h@1.1, 2006-08-02 13:00:34+02:00, serg@janus.mylan +215 -0

  include/lf.h@1.0, 2006-08-02 13:00:34+02:00, serg@janus.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-5.1/include/lf.h

  include/my_atomic.h@1.6, 2006-08-07 13:34:14+02:00, serg@janus.mylan +5 -5
    STATIC_INLINE

  include/my_atomic.h@1.5, 2006-08-07 11:37:09+02:00, serg@janus.mylan +4 -0
    back-off support

  include/my_bit.h@1.1, 2006-08-07 13:34:15+02:00, serg@janus.mylan +107 -0

  include/my_bit.h@1.0, 2006-08-07 13:34:15+02:00, serg@janus.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-5.1/include/my_bit.h

  include/my_global.h@1.137.1.1, 2006-08-07 13:34:13+02:00, serg@janus.mylan +2 -0
    STATIC_INLINE

  include/my_sys.h@1.201.2.3, 2006-08-08 18:42:21+02:00, serg@janus.mylan +1 -0
    thread_size moved to mysys

  include/my_sys.h@1.201.2.2, 2006-08-07 13:34:14+02:00, serg@janus.mylan +1 -7
    make bit functions inline

  include/my_sys.h@1.201.2.1, 2006-08-02 13:00:34+02:00, serg@janus.mylan +2 -0
    my_clear_highest_bit, my_reverse_bits

  mysys/Makefile.am@1.83, 2006-08-02 13:00:34+02:00, serg@janus.mylan +2 -1
    lf_hash.c lf_dynarray.c lf_alloc-pin.c

  mysys/lf_alloc-pin.c@1.4, 2006-08-08 18:43:36+02:00, serg@janus.mylan +53 -55
    dylf_dynarray refactored to remove 65536 elements limit

  mysys/lf_alloc-pin.c@1.3, 2006-08-07 13:34:14+02:00, serg@janus.mylan +1 -1
    warning

  mysys/lf_alloc-pin.c@1.2, 2006-08-07 11:37:09+02:00, serg@janus.mylan +14 -10
    backoff support

  mysys/lf_alloc-pin.c@1.1, 2006-08-02 13:00:35+02:00, serg@janus.mylan +317 -0

  mysys/lf_alloc-pin.c@1.0, 2006-08-02 13:00:35+02:00, serg@janus.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-5.1/mysys/lf_alloc-pin.c

  mysys/lf_dynarray.c@1.3, 2006-08-08 18:43:36+02:00, serg@janus.mylan +112 -40
    dylf_dynarray refactored to remove 65536 elements limit

  mysys/lf_dynarray.c@1.2, 2006-08-07 11:37:09+02:00, serg@janus.mylan +1 -1
    amd64 warning fixed

  mysys/lf_dynarray.c@1.1, 2006-08-02 13:00:35+02:00, serg@janus.mylan +114 -0

  mysys/lf_dynarray.c@1.0, 2006-08-02 13:00:35+02:00, serg@janus.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-5.1/mysys/lf_dynarray.c

  mysys/lf_hash.c@1.4, 2006-08-08 18:43:36+02:00, serg@janus.mylan +0 -1
    dylf_dynarray refactored to remove 65536 elements limit

  mysys/lf_hash.c@1.3, 2006-08-07 13:34:14+02:00, serg@janus.mylan +1 -0
    make bit functions inline

  mysys/lf_hash.c@1.2, 2006-08-07 11:37:09+02:00, serg@janus.mylan +185 -91
    generalized lf_hash, backoff support

  mysys/lf_hash.c@1.1, 2006-08-02 13:00:35+02:00, serg@janus.mylan +276 -0

  mysys/lf_hash.c@1.0, 2006-08-02 13:00:35+02:00, serg@janus.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-5.1/mysys/lf_hash.c

  mysys/mf_keycache.c@1.61, 2006-08-07 13:34:13+02:00, serg@janus.mylan +1 -0
    make bit functions inline

  mysys/my_atomic.c@1.3, 2006-08-07 13:34:13+02:00, serg@janus.mylan +3 -4
    STATIC_INLINE

  mysys/my_bit.c@1.8, 2006-08-07 13:34:14+02:00, serg@janus.mylan +10 -96
    make bit functions inline

  mysys/my_bit.c@1.7, 2006-08-07 11:37:09+02:00, serg@janus.mylan +7 -1
    fix for my_clear_highest_bit

  mysys/my_bit.c@1.6, 2006-08-02 13:00:34+02:00, serg@janus.mylan +45 -1
    my_clear_highest_bit, my_reverse_bits

  mysys/my_bitmap.c@1.42, 2006-08-07 13:34:13+02:00, serg@janus.mylan +1 -0
    make bit functions inline

  mysys/my_init.c@1.53, 2006-08-08 18:42:20+02:00, serg@janus.mylan +1 -0
    thread_size moved to mysys

  sql/item_func.cc@1.302.1.1, 2006-08-07 13:34:13+02:00, serg@janus.mylan +1 -0
    make bit functions inline

  sql/mysql_priv.h@1.416.4.1, 2006-08-08 18:42:20+02:00, serg@janus.mylan +1 -1
    thread_size moved to mysys

  sql/mysqld.cc@1.564.6.2, 2006-08-08 18:42:21+02:00, serg@janus.mylan +12 -12
    thread_size moved to mysys

  sql/mysqld.cc@1.564.6.1, 2006-08-07 13:34:14+02:00, serg@janus.mylan +1 -0
    make bit functions inline

  sql/set_var.cc@1.178.6.1, 2006-08-08 18:42:20+02:00, serg@janus.mylan +2 -2
    thread_size moved to mysys

  sql/sql_parse.cc@1.565.5.1, 2006-08-08 18:42:21+02:00, serg@janus.mylan +2 -2
    thread_size moved to mysys

  sql/sql_select.cc@1.418.3.1, 2006-08-07 13:34:14+02:00, serg@janus.mylan +1 -0
    make bit functions inline

  sql/sql_test.cc@1.47, 2006-08-08 18:42:21+02:00, serg@janus.mylan +2 -2
    thread_size moved to mysys

  sql/ha_myisam.cc@1.175.11.1, 2006-08-07 13:34:13+02:00, serg@janus.mylan +1 -0
    make bit functions inline

  storage/myisam/mi_create.c@1.56.2.1, 2006-08-07 13:34:14+02:00, serg@janus.mylan +2 -1
    make bit functions inline

  storage/myisam/mi_test2.c@1.30.1.3, 2006-08-07 13:34:14+02:00, serg@janus.mylan +1 -0
    make bit functions inline

  storage/myisam/myisamchk.c@1.120.1.3, 2006-08-07 13:34:14+02:00, serg@janus.mylan +1 -0
    make bit functions inline

  unittest/mysys/my_atomic-t.c@1.4.1.4, 2006-08-10 19:19:25+02:00, serg@janus.mylan +5 -3
    fix to commit (remove debug code)

  unittest/mysys/my_atomic-t.c@1.4.1.3, 2006-08-08 18:43:36+02:00, serg@janus.mylan +2 -2
    dylf_dynarray refactored to remove 65536 elements limit

  unittest/mysys/my_atomic-t.c@1.4.1.2, 2006-08-07 11:37:09+02:00, serg@janus.mylan +4 -3
    amd64 fix

  unittest/mysys/my_atomic-t.c@1.4.1.1, 2006-08-02 13:00:34+02:00, serg@janus.mylan +163 -26
    a

ChangeSet@1.2255.15.3, 2006-08-10 17:24:50+02:00, guilhem@gbichot3.local +1 -0
  adding handler flag missing from previous merge, for Maria

  sql/ha_maria.cc@1.4, 2006-08-10 17:24:47+02:00, guilhem@gbichot3.local +1 -1
    flag missing from previous merge

ChangeSet@1.2255.15.2, 2006-08-10 16:36:54+02:00, guilhem@gbichot3.local +43 -0
  Completion of merge of mysql-5.1 into mysql-maria.
  Manually imported changes done to MyISAM (include/myisam.h,
  storage/myisam/*, sql/ha_myisam.*, mysql-test/t/myisam.test,
  mysql-test/t/ps_2myisam.test) the last
  months into Maria (tedious, should do it more frequently in the
  future), including those not done at the previous 5.1->Maria merge
  (please in the future don't forget to apply MyISAM changes to Maria
  when you merge 5.1 into Maria).
  Note: I didn't try to import anything which could be MyISAM-related
  in other tests of mysql-test (I didn't want to dig in all csets),
  but as QA is working to make most tests re-usable for other engines
  (Falcon), it is likely that we'll benefit from this and just have
  to set engine=Maria somewhere to run those tests on Maria.
  func_group and partition tests fail but they already do in main 5.1
  on my machine. No Valgrind error in t/*maria*.test.
  Monty: please see the commit comment of maria.result and check.

  BitKeeper/deleted/.del-ha_maria.m4@1.2, 2006-08-09 16:25:10+02:00, guilhem@gbichot3.local +0 -0
    Delete: config/ac-macros/ha_maria.m4

  configure.in@1.359, 2006-08-10 16:36:48+02:00, guilhem@gbichot3.local +5 -4
    fix for the new way of enabling engines

  include/maria.h@1.3, 2006-08-10 16:36:48+02:00, guilhem@gbichot3.local +3 -3
    importing changes done to MyISAM the last months into Maria

  include/my_handler.h@1.13, 2006-08-10 16:36:48+02:00, guilhem@gbichot3.local +0 -2
    importing changes done to MyISAM the last months into Maria

  include/myisam.h@1.80, 2006-08-10 16:36:48+02:00, guilhem@gbichot3.local +1 -0
    importing changes done to MyISAM the last months into Maria

  mysql-test/r/maria.result@1.2, 2006-08-10 16:36:48+02:00, guilhem@gbichot3.local +233 -61
    identical to myisam.result, except the engine name in some places
    AND in the line testing key_block_size=1000000000000000000:
    Maria gives a key block size of 8192 while MyISAM gives 4096;
    is it explainable by the difference between MARIA_KEY_BLOCK_LENGTH
    and the same constant in MyISAM? Monty?

  mysql-test/r/ps_maria.result@1.3, 2006-08-10 16:36:48+02:00, guilhem@gbichot3.local +2 -2
    identical to ps_2myisam.result (except the engine name in some places)

  mysql-test/t/maria.test@1.2, 2006-08-10 16:36:48+02:00, guilhem@gbichot3.local +175 -67
    instead of engine=maria everywhere, I use @@storage_engine (reduces
    the diff with myisam.test).
    importing changes done to MyISAM the last months into Maria

  mysys/my_handler.c@1.27, 2006-08-10 16:36:48+02:00, guilhem@gbichot3.local +0 -1
    importing changes done to MyISAM the last months into Maria

  sql/mysqld.cc@1.564.7.2, 2006-08-10 16:36:48+02:00, guilhem@gbichot3.local +0 -1
    unneeded

  storage/maria/Makefile.am@1.3, 2006-08-10 16:36:48+02:00, guilhem@gbichot3.local +1 -1
    importing changes done to MyISAM the last months into Maria

  sql/ha_maria.cc@1.3, 2006-08-10 16:36:48+02:00, guilhem@gbichot3.local +72 -89
    importing changes done to MyISAM the last months into Maria

  sql/ha_maria.h@1.2, 2006-08-10 16:36:48+02:00, guilhem@gbichot3.local +6 -2
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_check.c@1.3, 2006-08-10 16:36:48+02:00, guilhem@gbichot3.local +70 -35
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_create.c@1.2, 2006-08-10 16:36:48+02:00, guilhem@gbichot3.local +68 -14
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_delete_table.c@1.2, 2006-08-10 16:36:48+02:00, guilhem@gbichot3.local +18 -6
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_dynrec.c@1.3, 2006-08-10 16:36:48+02:00, guilhem@gbichot3.local +8 -0
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_extra.c@1.3, 2006-08-10 16:36:48+02:00, guilhem@gbichot3.local +34 -23
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_ft_boolean_search.c@1.2, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +36 -26
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_ft_eval.c@1.2, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +1 -0
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_ft_nlq_search.c@1.2, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +7 -3
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_ft_parser.c@1.2, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +66 -35
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_ft_test1.c@1.2, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +1 -0
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_ft_update.c@1.2, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +25 -32
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_ftdefs.h@1.2, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +13 -9
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_key.c@1.2, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +7 -9
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_open.c@1.3, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +6 -6
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_page.c@1.2, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +5 -4
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_rkey.c@1.2, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +15 -4
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_rsamepos.c@1.2, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +2 -1
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_rt_index.c@1.2, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +5 -3
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_rt_mbr.c@1.2, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +5 -1
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_search.c@1.2, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +24 -23
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_sort.c@1.2, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +1 -0
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_test1.c@1.2, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +1 -0
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_test2.c@1.3, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +11 -5
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_test3.c@1.3, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +2 -0
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_update.c@1.3, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +2 -1
    importing changes done to MyISAM the last months into Maria

  storage/maria/ma_write.c@1.3, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +2 -1
    importing changes done to MyISAM the last months into Maria

  storage/maria/maria_chk.c@1.3, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +1 -9
    importing changes done to MyISAM the last months into Maria

  storage/maria/maria_def.h@1.3, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +4 -3
    importing changes done to MyISAM the last months into Maria

  storage/maria/maria_ftdump.c@1.2, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +9 -8
    importing changes done to MyISAM the last months into Maria

  storage/maria/maria_pack.c@1.3, 2006-08-10 16:36:49+02:00, guilhem@gbichot3.local +3 -3
    importing changes done to MyISAM the last months into Maria

ChangeSet@1.2154.53.3, 2006-07-26 10:36:34+02:00, guilhem@gbichot2.local +3 -0
  Writing down MikaelR's comments made in May in Helsinki so that they are not forgotten. Minor fixes.

  storage/maria/least_recently_dirtied.c@1.3, 2006-07-26 10:36:29+02:00, guilhem@gbichot2.local +9 -0
    writing down MikaelR's comments.

  storage/maria/checkpoint.c@1.3, 2006-07-26 10:36:29+02:00, guilhem@gbichot2.local +6 -4
    minor fixes

  storage/maria/recovery.c@1.3, 2006-07-26 10:36:29+02:00, guilhem@gbichot2.local +44 -23
    writing down MikaelR's comments.
    Some small fixes.

ChangeSet@1.2154.53.2, 2006-07-26 09:47:44+02:00, guilhem@gbichot2.local +1 -0
  two include files were missing in the source tarball, causing pushbuild build failures.

  include/Makefile.am@1.64.1.1, 2006-07-26 09:47:34+02:00, guilhem@gbichot2.local +1 -1
    two include files missing in the source tarball

ChangeSet@1.2154.53.1, 2006-07-24 21:50:18+02:00, guilhem@gbichot3.local +3 -0
  Post-vacation-musing fixes to WL#3071 "Maria checkpoint":
  changes to how synchronous checkpoint requests are executed.
  changes to how the background LRD flushing thread refrains from using
  all resources. See more comments for each file.

  storage/maria/least_recently_dirtied.c@1.2, 2006-07-24 21:50:15+02:00, guilhem@gbichot3.local +27 -12
    A better solution than sleeping one second after flushing a piece of the
    LRD: instead we pthread_yield(). Hopefully this will slow down the background
    thread (avoiding it using all the disk's bandwidth) if there are other threads 
    competing, and will not slow it down if this thread is alone (where we do
    want it to run fast and not do useless sleeps).
    This thread will probe for asynchronous checkpoint requests every few seconds.

  storage/maria/checkpoint.c@1.2, 2006-07-24 21:50:15+02:00, guilhem@gbichot3.local +139 -160
    I was not happy that checkpoint requests which want to know the success/error
    of their executed request, get inaccurate information in case of error
    (no error string etc). Instead of implementing a more complete communication
    protocol between requestor and executor, I make the requestor do the
    execution itself. I call this a synchronous checkpoint.
    For asynchronous checkpoints (requestor does not want to know success/error,
    does not want to wait for completion), no change, checkpoint is executed
    by the background thread.
    Comments, constants, mutex usage fixes.

  storage/maria/checkpoint.h@1.2, 2006-07-24 21:50:15+02:00, guilhem@gbichot3.local +3 -7
    new prototype of "API" (the calls exposed by the checkpoint module)

ChangeSet@1.2154.32.3, 2006-07-06 11:10:34+03:00, bell@sanja.is.com.ua +7 -0
  The pagae cache added.

  mysys/Makefile.am@1.78.1.1, 2006-07-06 11:10:22+03:00, bell@sanja.is.com.ua +57 -1
    the page cache and test proms for it added

  mysys/mf_pagecache.c@1.1, 2006-07-06 11:10:22+03:00, bell@sanja.is.com.ua +3920 -0
    New BitKeeper file ``mysys/mf_pagecache.c''

  mysys/mf_pagecache.c@1.0, 2006-07-06 11:10:22+03:00, bell@sanja.is.com.ua +0 -0
    BitKeeper file /home/bell/mysql/bk/work-maria/mysys/mf_pagecache.c

  include/pagecache.h@1.1, 2006-07-06 11:10:22+03:00, bell@sanja.is.com.ua +226 -0
    New BitKeeper file ``include/pagecache.h''

  include/pagecache.h@1.0, 2006-07-06 11:10:22+03:00, bell@sanja.is.com.ua +0 -0
    BitKeeper file /home/bell/mysql/bk/work-maria/include/pagecache.h

  mysys/test_pagecache_consist.c@1.1, 2006-07-06 11:10:23+03:00, bell@sanja.is.com.ua +447 -0
    New BitKeeper file ``mysys/test_pagecache_consist.c''

  mysys/test_pagecache_consist.c@1.0, 2006-07-06 11:10:23+03:00, bell@sanja.is.com.ua +0 -0
    BitKeeper file /home/bell/mysql/bk/work-maria/mysys/test_pagecache_consist.c

  mysys/test_pagecache_single.c@1.1, 2006-07-06 11:10:23+03:00, bell@sanja.is.com.ua +589 -0
    New BitKeeper file ``mysys/test_pagecache_single.c''

  mysys/test_pagecache_single.c@1.0, 2006-07-06 11:10:23+03:00, bell@sanja.is.com.ua +0 -0
    BitKeeper file /home/bell/mysql/bk/work-maria/mysys/test_pagecache_single.c

  mysys/test_file.c@1.1, 2006-07-06 11:10:22+03:00, bell@sanja.is.com.ua +70 -0
    New BitKeeper file ``mysys/test_file.c''

  mysys/test_file.c@1.0, 2006-07-06 11:10:22+03:00, bell@sanja.is.com.ua +0 -0
    BitKeeper file /home/bell/mysql/bk/work-maria/mysys/test_file.c

  mysys/test_file.h@1.1, 2006-07-06 11:10:23+03:00, bell@sanja.is.com.ua +14 -0
    New BitKeeper file ``mysys/test_file.h''

  mysys/test_file.h@1.0, 2006-07-06 11:10:23+03:00, bell@sanja.is.com.ua +0 -0
    BitKeeper file /home/bell/mysql/bk/work-maria/mysys/test_file.h

ChangeSet@1.2154.32.2, 2006-05-24 16:44:26+03:00, bell@sanja.is.com.ua +5 -0
  postmerge fix

  BUILD/SETUP.sh@1.62, 2006-05-24 16:44:20+03:00, bell@sanja.is.com.ua +0 -1
    postmerge changes

  configure.in@1.357, 2006-05-24 16:44:20+03:00, bell@sanja.is.com.ua +5 -4
    postmerge changes

  mysql-test/r/ps_maria.result@1.2, 2006-05-24 16:44:20+03:00, bell@sanja.is.com.ua +2 -2
    changed result according last MyISAM test changes

  sql/Makefile.am@1.139.1.1, 2006-05-24 16:44:21+03:00, bell@sanja.is.com.ua +2 -2
    postmerge fix

  sql/ha_maria.cc@1.2, 2006-05-24 16:44:21+03:00, bell@sanja.is.com.ua +19 -2
    postmerge fix

ChangeSet@1.2119.342.8, 2006-05-05 20:32:02+02:00, guilhem@mysql.com +22 -0
  WL#3270 "Maria - cleanups of inherited MyISAM functionality"
  Removing the "external lock" functionality from Maria (as two separate processes wanting to share a table
  should not only my_lock() the data and index files but also the log files, and share memory
  (as the latest data is in the page cache), it sounds useless to feature this).
  Removing the MyISAM logging from Maria (as REDO logging will be done differently).

  BitKeeper/deleted/.del-ma_log.c~4a44ec11d547772f@1.2, 2006-05-05 16:52:43+02:00, guilhem@mysql.com +0 -0
    Delete: storage/maria/ma_log.c

  BitKeeper/deleted/.del-maria_log.c~1fb295a18c3f5d4c@1.2, 2006-05-05 16:52:38+02:00, guilhem@mysql.com +0 -0
    Delete: storage/maria/maria_log.c

  include/maria.h@1.2, 2006-05-05 20:31:56+02:00, guilhem@mysql.com +0 -2
    unneeded

  storage/maria/Makefile.am@1.2, 2006-05-05 20:31:56+02:00, guilhem@mysql.com +2 -3
    log removed

  storage/maria/ma_check.c@1.2, 2006-05-05 20:31:56+02:00, guilhem@mysql.com +1 -19
    external locking removed

  storage/maria/ma_close.c@1.2, 2006-05-05 20:31:56+02:00, guilhem@mysql.com +0 -1
    log removed

  storage/maria/ma_delete.c@1.2, 2006-05-05 20:31:56+02:00, guilhem@mysql.com +0 -2
    log removed

  storage/maria/ma_delete_all.c@1.2, 2006-05-05 20:31:56+02:00, guilhem@mysql.com +0 -2
    log removed. Unused var.

  storage/maria/ma_dynrec.c@1.2, 2006-05-05 20:31:56+02:00, guilhem@mysql.com +0 -6
    external locking removed

  storage/maria/ma_extra.c@1.2, 2006-05-05 20:31:56+02:00, guilhem@mysql.com +0 -1
    log removed

  storage/maria/ma_init.c@1.2, 2006-05-05 20:31:56+02:00, guilhem@mysql.com +0 -1
    log removed

  storage/maria/ma_locking.c@1.2, 2006-05-05 20:31:56+02:00, guilhem@mysql.com +1 -69
    external locking removed, log removed

  storage/maria/ma_open.c@1.2, 2006-05-05 20:31:56+02:00, guilhem@mysql.com +1 -23
    external locking removed, log removed

  storage/maria/ma_static.c@1.2, 2006-05-05 20:31:56+02:00, guilhem@mysql.com +0 -2
    log removed

  storage/maria/ma_statrec.c@1.2, 2006-05-05 20:31:56+02:00, guilhem@mysql.com +0 -3
    external locking removed

  storage/maria/ma_test2.c@1.2, 2006-05-05 20:31:56+02:00, guilhem@mysql.com +1 -6
    log removed

  storage/maria/ma_test3.c@1.2, 2006-05-05 20:31:56+02:00, guilhem@mysql.com +2 -9
    log removed

  storage/maria/ma_update.c@1.2, 2006-05-05 20:31:56+02:00, guilhem@mysql.com +0 -2
    log removed

  storage/maria/ma_write.c@1.2, 2006-05-05 20:31:56+02:00, guilhem@mysql.com +0 -7
    external locking removed, log removed

  storage/maria/maria_chk.c@1.2, 2006-05-05 20:31:56+02:00, guilhem@mysql.com +0 -1
    external locking removed

  storage/maria/maria_def.h@1.2, 2006-05-05 20:31:56+02:00, guilhem@mysql.com +0 -20
    log removed, maria_pid unused.

  storage/maria/maria_pack.c@1.2, 2006-05-05 20:31:56+02:00, guilhem@mysql.com +5 -5
    fixes for warnings (where pointers are like ulong and so %u is not enough).

ChangeSet@1.2119.342.7, 2006-05-04 10:59:19+02:00, guilhem@mysql.com +2 -0
  WL#3072 Maria recovery, small fixes to pseudocode, discussion why no checkpoint at end of UNDO phase.

  storage/maria/control_file.h@1.2, 2006-05-04 10:59:06+02:00, guilhem@mysql.com +2 -2
    small fix

  storage/maria/recovery.c@1.2, 2006-05-04 10:59:06+02:00, guilhem@mysql.com +18 -1
    small fixes to the pseudocode and discussion of why no checkpoint at end of UNDO phase.

ChangeSet@1.2119.342.6, 2006-04-27 16:06:46+02:00, guilhem@mysql.com +8 -0
  Maria: first version of checkpoint (WL#3071), least-recently-dirtied page flushing (WL#3261), recovery (WL#3072),
  control file (WL#3234), to serve as a detailed LLD. It looks like C code, but does not compile (no point in making it compile,
  as other modules on which I depend are not yet fully speficied or written); some pieces are not coded and just marked in comments.
  Files' organization (names, directories of C files) does not matter at this point.
  I don't think I had to commit so early, but it feels good to publish something, gives me the impression of moving forward :)

  storage/maria/least_recently_dirtied.c@1.1, 2006-04-27 16:06:36+02:00, guilhem@mysql.com +175 -0
    WL#3261 Maria background flushing of least-recently-dirtied pages, implementation

  storage/maria/least_recently_dirtied.c@1.0, 2006-04-27 16:06:36+02:00, guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-maria-clean/storage/maria/least_recently_dirtied.c

  storage/maria/least_recently_dirtied.h@1.1, 2006-04-27 16:06:36+02:00, guilhem@mysql.com +10 -0
    WL#3261 Maria background flushing of least-recently-dirtied pages, interface

  storage/maria/least_recently_dirtied.h@1.0, 2006-04-27 16:06:36+02:00, guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-maria-clean/storage/maria/least_recently_dirtied.h

  storage/maria/checkpoint.c@1.1, 2006-04-27 16:06:33+02:00, guilhem@mysql.com +394 -0
    WL#3071 Maria checkpoint, implementation

  storage/maria/checkpoint.c@1.0, 2006-04-27 16:06:33+02:00, guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-maria-clean/storage/maria/checkpoint.c

  storage/maria/checkpoint.h@1.1, 2006-04-27 16:06:34+02:00, guilhem@mysql.com +23 -0
    WL#3071 Maria checkpoint, interface

  storage/maria/checkpoint.h@1.0, 2006-04-27 16:06:34+02:00, guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-maria-clean/storage/maria/checkpoint.h

  storage/maria/control_file.c@1.1, 2006-04-27 16:06:35+02:00, guilhem@mysql.com +77 -0
    WL#3234 Maria control file, implementation

  storage/maria/control_file.c@1.0, 2006-04-27 16:06:35+02:00, guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-maria-clean/storage/maria/control_file.c

  storage/maria/control_file.h@1.1, 2006-04-27 16:06:35+02:00, guilhem@mysql.com +24 -0
    WL#3234 Maria control file, interface

  storage/maria/control_file.h@1.0, 2006-04-27 16:06:35+02:00, guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-maria-clean/storage/maria/control_file.h

  storage/maria/recovery.c@1.1, 2006-04-27 16:06:36+02:00, guilhem@mysql.com +224 -0
    WL#3072 Maria recovery, implementation

  storage/maria/recovery.c@1.0, 2006-04-27 16:06:36+02:00, guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-maria-clean/storage/maria/recovery.c

  storage/maria/recovery.h@1.1, 2006-04-27 16:06:37+02:00, guilhem@mysql.com +10 -0
    WL#3072 Maria recovery, interface

  storage/maria/recovery.h@1.0, 2006-04-27 16:06:37+02:00, guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-maria-clean/storage/maria/recovery.h

ChangeSet@1.2119.342.5, 2006-04-12 15:40:50+02:00, guilhem@mysql.com +1 -0
  Exact same change as the one I just pushed in 5.1-new: 10 MB is enough for most cases.

  mysql-test/mysql-test-run.pl@1.93.5.1, 2006-04-12 15:40:46+02:00, guilhem@mysql.com +1 -1
    10 instead of 128

ChangeSet@1.2119.342.4, 2006-04-12 15:36:53+02:00, guilhem@mysql.com +1 -0
  easy fixes to ma_test_all (to make shell happy)

  storage/maria/ma_test_all.sh@1.2, 2006-04-12 15:36:48+02:00, guilhem@mysql.com +136 -136
    ; is needed before "else". Some ./ for executables to be found.

ChangeSet@1.2119.342.3, 2006-04-11 20:00:57+03:00, monty@mysql.com +1 -0
  Add ma_test_all.res

  storage/maria/ma_test_all.res@1.1, 2006-04-11 20:00:52+03:00, monty@mysql.com +53 -0
    New BitKeeper file ``storage/maria/ma_test_all.res''

  storage/maria/ma_test_all.res@1.0, 2006-04-11 20:00:52+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_test_all.res

ChangeSet@1.2119.407.1, 2006-04-11 16:45:10+03:00, monty@mysql.com +146 -0
  Added storage/maria (based on MyISAM). WL#3245
  Moved things into ft_global.h, my_handler.h and myisamchk.h to allow MyISAM and Maria to share code and defines
  Rename of not properly renamed functions in MyISAM and my_handler.c
  Renamed some MI_ defines to HA_ to allow MyISAM and Maria to share
  Added maria variables to mysqld.cc and set_var.cc
  Fixed compiler warnings
  

  BUILD/SETUP.sh@1.53.2.1, 2006-04-11 16:43:52+03:00, monty@mysql.com +1 -1
    Compile maria by default

  storage/maria/cmakelists.txt@1.1, 2006-04-11 16:44:06+03:00, monty@mysql.com +26 -0
    New BitKeeper file ``storage/maria/cmakelists.txt''

  storage/maria/cmakelists.txt@1.0, 2006-04-11 16:44:06+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/cmakelists.txt

  libmysqld/ha_maria.cc@1.1, 2006-04-11 16:44:01+03:00, monty@mysql.com +0 -0
    New BitKeeper file ``libmysqld/ha_maria.cc''

  libmysqld/ha_maria.cc@1.0, 2006-04-11 16:44:01+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/libmysqld/ha_maria.cc

  config/ac-macros/ha_maria.m4@1.1, 2006-04-11 16:43:59+03:00, monty@mysql.com +29 -0
    New BitKeeper file ``config/ac-macros/ha_maria.m4''

  config/ac-macros/ha_maria.m4@1.0, 2006-04-11 16:43:59+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/config/ac-macros/ha_maria.m4

  storage/maria/ma_log.c@1.1, 2006-04-11 16:44:24+03:00, monty@mysql.com +164 -0
    New BitKeeper file ``storage/maria/ma_log.c''

  storage/maria/ma_log.c@1.0, 2006-04-11 16:44:24+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_log.c

  storage/maria/maria_log.c@1.1, 2006-04-11 16:44:55+03:00, monty@mysql.com +848 -0
    New BitKeeper file ``storage/maria/maria_log.c''

  storage/maria/maria_log.c@1.0, 2006-04-11 16:44:55+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/maria_log.c

  BitKeeper/etc/ignore@1.239, 2006-04-11 16:32:22+03:00, monty@mysql.com +1 -0
    added storage/maria/*.MAI

  BitKeeper/etc/ignore@1.238, 2006-04-11 16:32:15+03:00, monty@mysql.com +1 -0
    added storage/maria/*.MAD

  BitKeeper/etc/ignore@1.237, 2006-04-11 16:31:47+03:00, monty@mysql.com +1 -0
    added storage/maria/maria.log

  BitKeeper/etc/ignore@1.236, 2006-04-11 16:31:17+03:00, monty@mysql.com +10 -0
    added storage/maria/ma_test1 storage/maria/ma_test2 storage/maria/ma_test3 storage/maria/maria_ftdump storage/maria/ma_sp_test storage/maria/ma_rt_test storage/maria/maria_log storage/maria/maria_pack storage/maria/maria_chk storage/maria/ma_test_all

  BitKeeper/triggers/post-commit@1.33.1.1, 2006-04-11 16:43:52+03:00, monty@mysql.com +1 -46
    No public maria emails.
    Mark changesets emails with 'maria'

  configure.in@1.333.14.1, 2006-04-11 16:43:52+03:00, monty@mysql.com +4 -0
    Add maria

  include/ft_global.h@1.31, 2006-04-11 16:43:52+03:00, monty@mysql.com +11 -0
    Move defines needed by maria and MyISAM here

  include/keycache.h@1.7, 2006-04-11 16:43:52+03:00, monty@mysql.com +2 -1
    Add support for default key_cache if cache not found

  include/maria.h@1.1, 2006-04-11 16:44:00+03:00, monty@mysql.com +418 -0
    New BitKeeper file ``include/maria.h''

  include/maria.h@1.0, 2006-04-11 16:44:00+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/include/maria.h

  include/my_base.h@1.87, 2006-04-11 16:43:52+03:00, monty@mysql.com +3 -1
    Add invalidator_by_filename

  include/my_handler.h@1.11, 2006-04-11 16:43:53+03:00, monty@mysql.com +23 -4
    Remove duplicate header files
    Add defines that are typical for handlers (MyISAM and Maria)

  include/myisam.h@1.77, 2006-04-11 16:43:53+03:00, monty@mysql.com +78 -178
    Move things to my_handler.h to allow Maria and MyISAM to share things
    (Some things needed to be shared to allow sharing of HA_CHECK structure)

  include/myisamchk.h@1.1, 2006-04-11 16:44:00+03:00, monty@mysql.com +160 -0
    New BitKeeper file ``include/myisamchk.h''

  include/myisamchk.h@1.0, 2006-04-11 16:44:00+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/include/myisamchk.h

  libmysqld/Makefile.am@1.81.1.1, 2006-04-11 16:43:53+03:00, monty@mysql.com +2 -2
    Added ha_maria.cc

  mysql-test/include/have_maria.inc@1.1, 2006-04-11 16:44:01+03:00, monty@mysql.com +4 -0
    New BitKeeper file ``mysql-test/include/have_maria.inc''

  mysql-test/include/have_maria.inc@1.0, 2006-04-11 16:44:01+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/mysql-test/include/have_maria.inc

  mysql-test/r/have_maria.require@1.1, 2006-04-11 16:44:02+03:00, monty@mysql.com +2 -0
    New BitKeeper file ``mysql-test/r/have_maria.require''

  mysql-test/r/have_maria.require@1.0, 2006-04-11 16:44:02+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/mysql-test/r/have_maria.require

  mysql-test/r/maria.result@1.1, 2006-04-11 16:44:03+03:00, monty@mysql.com +1417 -0
    New BitKeeper file ``mysql-test/r/maria.result''

  mysql-test/r/maria.result@1.0, 2006-04-11 16:44:03+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/mysql-test/r/maria.result

  mysql-test/r/ps_maria.result@1.1, 2006-04-11 16:44:03+03:00, monty@mysql.com +3137 -0
    New BitKeeper file ``mysql-test/r/ps_maria.result''

  mysql-test/r/ps_maria.result@1.0, 2006-04-11 16:44:03+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/mysql-test/r/ps_maria.result

  mysql-test/t/maria.test@1.1, 2006-04-11 16:44:04+03:00, monty@mysql.com +802 -0
    New BitKeeper file ``mysql-test/t/maria.test''

  mysql-test/t/maria.test@1.0, 2006-04-11 16:44:04+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/mysql-test/t/maria.test

  mysql-test/t/ps_maria.test@1.1, 2006-04-11 16:44:04+03:00, monty@mysql.com +46 -0
    New BitKeeper file ``mysql-test/t/ps_maria.test''

  mysql-test/t/ps_maria.test@1.0, 2006-04-11 16:44:04+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/mysql-test/t/ps_maria.test

  mysys/mf_keycaches.c@1.7, 2006-04-11 16:43:53+03:00, monty@mysql.com +9 -5
    Added default value for multi_key_cache_search

  mysys/my_handler.c@1.25, 2006-04-11 16:43:53+03:00, monty@mysql.com +21 -9
    mi_compare_text -> ha_compare_text
    Removed compiler warnings

  sql/handler.h@1.197.2.1, 2006-04-11 16:43:54+03:00, monty@mysql.com +2 -0
    Added MARIA
    Added inclusion of my_handler.h

  sql/item_func.h@1.136.1.1, 2006-04-11 16:43:54+03:00, monty@mysql.com +0 -1
    Remove duplicate include

  sql/mysql_priv.h@1.388.2.1, 2006-04-11 16:43:54+03:00, monty@mysql.com +6 -0
    Added maria variables

  sql/mysqld.cc@1.534.10.1, 2006-04-11 16:43:54+03:00, monty@mysql.com +69 -12
    Added maria

  sql/set_var.cc@1.164.3.7, 2006-04-11 16:43:55+03:00, monty@mysql.com +35 -1
    Added maria status variables

  sql/set_var.h@1.85, 2006-04-11 16:43:55+03:00, monty@mysql.com +1 -0
    Added maria

  sql/sql_class.h@1.283.4.1, 2006-04-11 16:43:55+03:00, monty@mysql.com +4 -1
    Added maria status variables

  sql/sql_sort.h@1.6, 2006-04-11 16:43:55+03:00, monty@mysql.com +3 -8
    Remove duplicate BUFFPEK struct

  storage/Makefile.am@1.5, 2006-04-11 16:43:55+03:00, monty@mysql.com +1 -1
    Added maria

  storage/csv/ha_tina.cc@1.39.1.1, 2006-04-11 16:43:55+03:00, monty@mysql.com +2 -1
    Removed compiler warning

  storage/maria/Makefile.am@1.1, 2006-04-11 16:44:06+03:00, monty@mysql.com +106 -0
    New BitKeeper file ``storage/maria/Makefile.am''

  storage/maria/Makefile.am@1.0, 2006-04-11 16:44:06+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/Makefile.am

  storage/maria/ft_maria.c@1.1, 2006-04-11 16:44:07+03:00, monty@mysql.com +49 -0
    New BitKeeper file ``storage/maria/ft_maria.c''

  storage/maria/ft_maria.c@1.0, 2006-04-11 16:44:07+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ft_maria.c

  sql/ha_maria.cc@1.1, 2006-04-11 16:44:05+03:00, monty@mysql.com +1836 -0
    New BitKeeper file ``sql/ha_maria.cc''

  sql/ha_maria.cc@1.0, 2006-04-11 16:44:05+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/sql/ha_maria.cc

  sql/ha_maria.h@1.1, 2006-04-11 16:44:05+03:00, monty@mysql.com +141 -0
    New BitKeeper file ``sql/ha_maria.h''

  sql/ha_maria.h@1.0, 2006-04-11 16:44:05+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/sql/ha_maria.h

  storage/maria/ma_cache.c@1.1, 2006-04-11 16:44:08+03:00, monty@mysql.com +108 -0
    New BitKeeper file ``storage/maria/ma_cache.c''

  storage/maria/ma_cache.c@1.0, 2006-04-11 16:44:08+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_cache.c

  storage/maria/ma_changed.c@1.1, 2006-04-11 16:44:08+03:00, monty@mysql.com +34 -0
    New BitKeeper file ``storage/maria/ma_changed.c''

  storage/maria/ma_changed.c@1.0, 2006-04-11 16:44:08+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_changed.c

  storage/maria/ma_check.c@1.1, 2006-04-11 16:44:09+03:00, monty@mysql.com +4301 -0
    New BitKeeper file ``storage/maria/ma_check.c''

  storage/maria/ma_check.c@1.0, 2006-04-11 16:44:08+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_check.c

  storage/maria/ma_checksum.c@1.1, 2006-04-11 16:44:09+03:00, monty@mysql.com +65 -0
    New BitKeeper file ``storage/maria/ma_checksum.c''

  storage/maria/ma_checksum.c@1.0, 2006-04-11 16:44:09+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_checksum.c

  storage/maria/ma_close.c@1.1, 2006-04-11 16:44:09+03:00, monty@mysql.com +124 -0
    New BitKeeper file ``storage/maria/ma_close.c''

  storage/maria/ma_close.c@1.0, 2006-04-11 16:44:09+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_close.c

  storage/maria/ma_create.c@1.1, 2006-04-11 16:44:10+03:00, monty@mysql.com +816 -0
    New BitKeeper file ``storage/maria/ma_create.c''

  storage/maria/ma_create.c@1.0, 2006-04-11 16:44:10+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_create.c

  storage/maria/ma_dbug.c@1.1, 2006-04-11 16:44:11+03:00, monty@mysql.com +193 -0
    New BitKeeper file ``storage/maria/ma_dbug.c''

  storage/maria/ma_dbug.c@1.0, 2006-04-11 16:44:11+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_dbug.c

  storage/maria/ma_delete.c@1.1, 2006-04-11 16:44:11+03:00, monty@mysql.com +890 -0
    New BitKeeper file ``storage/maria/ma_delete.c''

  storage/maria/ma_delete.c@1.0, 2006-04-11 16:44:11+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_delete.c

  storage/maria/ma_delete_all.c@1.1, 2006-04-11 16:44:12+03:00, monty@mysql.com +79 -0
    New BitKeeper file ``storage/maria/ma_delete_all.c''

  storage/maria/ma_delete_all.c@1.0, 2006-04-11 16:44:12+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_delete_all.c

  storage/maria/ma_delete_table.c@1.1, 2006-04-11 16:44:13+03:00, monty@mysql.com +58 -0
    New BitKeeper file ``storage/maria/ma_delete_table.c''

  storage/maria/ma_delete_table.c@1.0, 2006-04-11 16:44:13+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_delete_table.c

  storage/maria/ma_dynrec.c@1.1, 2006-04-11 16:44:13+03:00, monty@mysql.com +1811 -0
    New BitKeeper file ``storage/maria/ma_dynrec.c''

  storage/maria/ma_dynrec.c@1.0, 2006-04-11 16:44:13+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_dynrec.c

  storage/maria/ma_extra.c@1.1, 2006-04-11 16:44:14+03:00, monty@mysql.com +426 -0
    New BitKeeper file ``storage/maria/ma_extra.c''

  storage/maria/ma_extra.c@1.0, 2006-04-11 16:44:14+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_extra.c

  storage/maria/ma_ft_boolean_search.c@1.1, 2006-04-11 16:44:14+03:00, monty@mysql.com +955 -0
    New BitKeeper file ``storage/maria/ma_ft_boolean_search.c''

  storage/maria/ma_ft_boolean_search.c@1.0, 2006-04-11 16:44:14+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_ft_boolean_search.c

  storage/maria/ma_ft_eval.c@1.1, 2006-04-11 16:44:15+03:00, monty@mysql.com +254 -0
    New BitKeeper file ``storage/maria/ma_ft_eval.c''

  storage/maria/ma_ft_eval.c@1.0, 2006-04-11 16:44:15+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_ft_eval.c

  storage/maria/ma_ft_eval.h@1.1, 2006-04-11 16:44:15+03:00, monty@mysql.com +42 -0
    New BitKeeper file ``storage/maria/ma_ft_eval.h''

  storage/maria/ma_ft_eval.h@1.0, 2006-04-11 16:44:15+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_ft_eval.h

  storage/maria/ma_ft_nlq_search.c@1.1, 2006-04-11 16:44:16+03:00, monty@mysql.com +366 -0
    New BitKeeper file ``storage/maria/ma_ft_nlq_search.c''

  storage/maria/ma_ft_nlq_search.c@1.0, 2006-04-11 16:44:16+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_ft_nlq_search.c

  storage/maria/ma_ft_parser.c@1.1, 2006-04-11 16:44:16+03:00, monty@mysql.com +394 -0
    New BitKeeper file ``storage/maria/ma_ft_parser.c''

  storage/maria/ma_ft_parser.c@1.0, 2006-04-11 16:44:16+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_ft_parser.c

  storage/maria/ma_ft_stem.c@1.1, 2006-04-11 16:44:17+03:00, monty@mysql.com +19 -0
    New BitKeeper file ``storage/maria/ma_ft_stem.c''

  storage/maria/ma_ft_stem.c@1.0, 2006-04-11 16:44:17+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_ft_stem.c

  storage/maria/ma_ft_test1.c@1.1, 2006-04-11 16:44:17+03:00, monty@mysql.com +317 -0
    New BitKeeper file ``storage/maria/ma_ft_test1.c''

  storage/maria/ma_ft_test1.c@1.0, 2006-04-11 16:44:17+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_ft_test1.c

  storage/maria/ma_ft_test1.h@1.1, 2006-04-11 16:44:18+03:00, monty@mysql.com +421 -0
    New BitKeeper file ``storage/maria/ma_ft_test1.h''

  storage/maria/ma_ft_test1.h@1.0, 2006-04-11 16:44:18+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_ft_test1.h

  storage/maria/ma_ft_update.c@1.1, 2006-04-11 16:44:19+03:00, monty@mysql.com +359 -0
    New BitKeeper file ``storage/maria/ma_ft_update.c''

  storage/maria/ma_ft_update.c@1.0, 2006-04-11 16:44:19+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_ft_update.c

  storage/maria/ma_ftdefs.h@1.1, 2006-04-11 16:44:19+03:00, monty@mysql.com +149 -0
    New BitKeeper file ``storage/maria/ma_ftdefs.h''

  storage/maria/ma_ftdefs.h@1.0, 2006-04-11 16:44:19+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_ftdefs.h

  storage/maria/ma_fulltext.h@1.1, 2006-04-11 16:44:20+03:00, monty@mysql.com +28 -0
    New BitKeeper file ``storage/maria/ma_fulltext.h''

  storage/maria/ma_fulltext.h@1.0, 2006-04-11 16:44:20+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_fulltext.h

  storage/maria/ma_info.c@1.1, 2006-04-11 16:44:20+03:00, monty@mysql.com +133 -0
    New BitKeeper file ``storage/maria/ma_info.c''

  storage/maria/ma_info.c@1.0, 2006-04-11 16:44:20+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_info.c

  storage/maria/ma_init.c@1.1, 2006-04-11 16:44:21+03:00, monty@mysql.com +59 -0
    New BitKeeper file ``storage/maria/ma_init.c''

  storage/maria/ma_init.c@1.0, 2006-04-11 16:44:21+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_init.c

  storage/maria/ma_key.c@1.1, 2006-04-11 16:44:22+03:00, monty@mysql.com +592 -0
    New BitKeeper file ``storage/maria/ma_key.c''

  storage/maria/ma_key.c@1.0, 2006-04-11 16:44:22+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_key.c

  storage/maria/ma_keycache.c@1.1, 2006-04-11 16:44:23+03:00, monty@mysql.com +163 -0
    New BitKeeper file ``storage/maria/ma_keycache.c''

  storage/maria/ma_keycache.c@1.0, 2006-04-11 16:44:23+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_keycache.c

  storage/maria/ma_locking.c@1.1, 2006-04-11 16:44:23+03:00, monty@mysql.com +554 -0
    New BitKeeper file ``storage/maria/ma_locking.c''

  storage/maria/ma_locking.c@1.0, 2006-04-11 16:44:23+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_locking.c

  storage/maria/ma_open.c@1.1, 2006-04-11 16:44:25+03:00, monty@mysql.com +1288 -0
    New BitKeeper file ``storage/maria/ma_open.c''

  storage/maria/ma_open.c@1.0, 2006-04-11 16:44:25+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_open.c

  storage/maria/ma_packrec.c@1.1, 2006-04-11 16:44:26+03:00, monty@mysql.com +1346 -0
    New BitKeeper file ``storage/maria/ma_packrec.c''

  storage/maria/ma_packrec.c@1.0, 2006-04-11 16:44:26+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_packrec.c

  storage/maria/ma_page.c@1.1, 2006-04-11 16:44:26+03:00, monty@mysql.com +160 -0
    New BitKeeper file ``storage/maria/ma_page.c''

  storage/maria/ma_page.c@1.0, 2006-04-11 16:44:26+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_page.c

  storage/maria/ma_panic.c@1.1, 2006-04-11 16:44:27+03:00, monty@mysql.com +124 -0
    New BitKeeper file ``storage/maria/ma_panic.c''

  storage/maria/ma_panic.c@1.0, 2006-04-11 16:44:27+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_panic.c

  storage/maria/ma_preload.c@1.1, 2006-04-11 16:44:28+03:00, monty@mysql.com +117 -0
    New BitKeeper file ``storage/maria/ma_preload.c''

  storage/maria/ma_preload.c@1.0, 2006-04-11 16:44:28+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_preload.c

  storage/maria/ma_range.c@1.1, 2006-04-11 16:44:29+03:00, monty@mysql.com +244 -0
    New BitKeeper file ``storage/maria/ma_range.c''

  storage/maria/ma_range.c@1.0, 2006-04-11 16:44:29+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_range.c

  storage/maria/ma_rename.c@1.1, 2006-04-11 16:44:29+03:00, monty@mysql.com +61 -0
    New BitKeeper file ``storage/maria/ma_rename.c''

  storage/maria/ma_rename.c@1.0, 2006-04-11 16:44:29+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_rename.c

  storage/maria/ma_rfirst.c@1.1, 2006-04-11 16:44:29+03:00, monty@mysql.com +27 -0
    New BitKeeper file ``storage/maria/ma_rfirst.c''

  storage/maria/ma_rfirst.c@1.0, 2006-04-11 16:44:29+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_rfirst.c

  storage/maria/ma_rkey.c@1.1, 2006-04-11 16:44:30+03:00, monty@mysql.com +144 -0
    New BitKeeper file ``storage/maria/ma_rkey.c''

  storage/maria/ma_rkey.c@1.0, 2006-04-11 16:44:30+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_rkey.c

  storage/maria/ma_rlast.c@1.1, 2006-04-11 16:44:31+03:00, monty@mysql.com +27 -0
    New BitKeeper file ``storage/maria/ma_rlast.c''

  storage/maria/ma_rlast.c@1.0, 2006-04-11 16:44:31+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_rlast.c

  storage/maria/ma_rnext.c@1.1, 2006-04-11 16:44:31+03:00, monty@mysql.com +122 -0
    New BitKeeper file ``storage/maria/ma_rnext.c''

  storage/maria/ma_rnext.c@1.0, 2006-04-11 16:44:31+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_rnext.c

  storage/maria/ma_rnext_same.c@1.1, 2006-04-11 16:44:32+03:00, monty@mysql.com +105 -0
    New BitKeeper file ``storage/maria/ma_rnext_same.c''

  storage/maria/ma_rnext_same.c@1.0, 2006-04-11 16:44:32+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_rnext_same.c

  storage/maria/ma_rprev.c@1.1, 2006-04-11 16:44:32+03:00, monty@mysql.com +88 -0
    New BitKeeper file ``storage/maria/ma_rprev.c''

  storage/maria/ma_rprev.c@1.0, 2006-04-11 16:44:32+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_rprev.c

  storage/maria/ma_rrnd.c@1.1, 2006-04-11 16:44:33+03:00, monty@mysql.com +60 -0
    New BitKeeper file ``storage/maria/ma_rrnd.c''

  storage/maria/ma_rrnd.c@1.0, 2006-04-11 16:44:33+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_rrnd.c

  storage/maria/ma_rsame.c@1.1, 2006-04-11 16:44:34+03:00, monty@mysql.com +66 -0
    New BitKeeper file ``storage/maria/ma_rsame.c''

  storage/maria/ma_rsame.c@1.0, 2006-04-11 16:44:34+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_rsame.c

  storage/maria/ma_rsamepos.c@1.1, 2006-04-11 16:44:35+03:00, monty@mysql.com +56 -0
    New BitKeeper file ``storage/maria/ma_rsamepos.c''

  storage/maria/ma_rsamepos.c@1.0, 2006-04-11 16:44:35+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_rsamepos.c

  storage/maria/ma_rt_index.c@1.1, 2006-04-11 16:44:35+03:00, monty@mysql.com +1081 -0
    New BitKeeper file ``storage/maria/ma_rt_index.c''

  storage/maria/ma_rt_index.c@1.0, 2006-04-11 16:44:35+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_rt_index.c

  storage/maria/ma_rt_index.h@1.1, 2006-04-11 16:44:36+03:00, monty@mysql.com +47 -0
    New BitKeeper file ``storage/maria/ma_rt_index.h''

  storage/maria/ma_rt_index.h@1.0, 2006-04-11 16:44:36+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_rt_index.h

  storage/maria/ma_rt_key.c@1.1, 2006-04-11 16:44:37+03:00, monty@mysql.com +100 -0
    New BitKeeper file ``storage/maria/ma_rt_key.c''

  storage/maria/ma_rt_key.c@1.0, 2006-04-11 16:44:37+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_rt_key.c

  storage/maria/ma_rt_key.h@1.1, 2006-04-11 16:44:38+03:00, monty@mysql.com +33 -0
    New BitKeeper file ``storage/maria/ma_rt_key.h''

  storage/maria/ma_rt_key.h@1.0, 2006-04-11 16:44:38+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_rt_key.h

  storage/maria/ma_rt_mbr.c@1.1, 2006-04-11 16:44:39+03:00, monty@mysql.com +801 -0
    New BitKeeper file ``storage/maria/ma_rt_mbr.c''

  storage/maria/ma_rt_mbr.c@1.0, 2006-04-11 16:44:39+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_rt_mbr.c

  storage/maria/ma_rt_mbr.h@1.1, 2006-04-11 16:44:39+03:00, monty@mysql.com +38 -0
    New BitKeeper file ``storage/maria/ma_rt_mbr.h''

  storage/maria/ma_rt_mbr.h@1.0, 2006-04-11 16:44:39+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_rt_mbr.h

  storage/maria/ma_rt_split.c@1.1, 2006-04-11 16:44:40+03:00, monty@mysql.com +350 -0
    New BitKeeper file ``storage/maria/ma_rt_split.c''

  storage/maria/ma_rt_split.c@1.0, 2006-04-11 16:44:40+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_rt_split.c

  storage/maria/ma_rt_test.c@1.1, 2006-04-11 16:44:40+03:00, monty@mysql.com +473 -0
    New BitKeeper file ``storage/maria/ma_rt_test.c''

  storage/maria/ma_rt_test.c@1.0, 2006-04-11 16:44:40+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_rt_test.c

  storage/maria/ma_scan.c@1.1, 2006-04-11 16:44:41+03:00, monty@mysql.com +46 -0
    New BitKeeper file ``storage/maria/ma_scan.c''

  storage/maria/ma_scan.c@1.0, 2006-04-11 16:44:41+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_scan.c

  storage/maria/ma_search.c@1.1, 2006-04-11 16:44:42+03:00, monty@mysql.com +1894 -0
    New BitKeeper file ``storage/maria/ma_search.c''

  storage/maria/ma_search.c@1.0, 2006-04-11 16:44:42+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_search.c

  storage/maria/ma_sort.c@1.1, 2006-04-11 16:44:42+03:00, monty@mysql.com +1021 -0
    New BitKeeper file ``storage/maria/ma_sort.c''

  storage/maria/ma_sort.c@1.0, 2006-04-11 16:44:42+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_sort.c

  storage/maria/ma_sp_defs.h@1.1, 2006-04-11 16:44:43+03:00, monty@mysql.com +48 -0
    New BitKeeper file ``storage/maria/ma_sp_defs.h''

  storage/maria/ma_sp_defs.h@1.0, 2006-04-11 16:44:43+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_sp_defs.h

  storage/maria/ma_sp_key.c@1.1, 2006-04-11 16:44:43+03:00, monty@mysql.com +300 -0
    New BitKeeper file ``storage/maria/ma_sp_key.c''

  storage/maria/ma_sp_key.c@1.0, 2006-04-11 16:44:43+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_sp_key.c

  storage/maria/ma_sp_test.c@1.1, 2006-04-11 16:44:44+03:00, monty@mysql.com +568 -0
    New BitKeeper file ``storage/maria/ma_sp_test.c''

  storage/maria/ma_sp_test.c@1.0, 2006-04-11 16:44:44+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_sp_test.c

  storage/maria/ma_static.c@1.1, 2006-04-11 16:44:44+03:00, monty@mysql.com +65 -0
    New BitKeeper file ``storage/maria/ma_static.c''

  storage/maria/ma_static.c@1.0, 2006-04-11 16:44:44+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_static.c

  storage/maria/ma_statrec.c@1.1, 2006-04-11 16:44:45+03:00, monty@mysql.com +301 -0
    New BitKeeper file ``storage/maria/ma_statrec.c''

  storage/maria/ma_statrec.c@1.0, 2006-04-11 16:44:45+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_statrec.c

  storage/maria/ma_test1.c@1.1, 2006-04-11 16:44:45+03:00, monty@mysql.com +681 -0
    New BitKeeper file ``storage/maria/ma_test1.c''

  storage/maria/ma_test1.c@1.0, 2006-04-11 16:44:45+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_test1.c

  storage/maria/ma_test2.c@1.1, 2006-04-11 16:44:46+03:00, monty@mysql.com +1050 -0
    New BitKeeper file ``storage/maria/ma_test2.c''

  storage/maria/ma_test2.c@1.0, 2006-04-11 16:44:46+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_test2.c

  storage/maria/ma_test3.c@1.1, 2006-04-11 16:44:47+03:00, monty@mysql.com +502 -0
    New BitKeeper file ``storage/maria/ma_test3.c''

  storage/maria/ma_test3.c@1.0, 2006-04-11 16:44:47+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_test3.c

  storage/maria/ma_test_all.sh@1.1, 2006-04-11 16:44:48+03:00, monty@mysql.com +147 -0
    New BitKeeper file ``storage/maria/ma_test_all.sh''

  storage/maria/ma_test_all.sh@1.0, 2006-04-11 16:44:48+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_test_all.sh

  storage/maria/ma_unique.c@1.1, 2006-04-11 16:44:48+03:00, monty@mysql.com +234 -0
    New BitKeeper file ``storage/maria/ma_unique.c''

  storage/maria/ma_unique.c@1.0, 2006-04-11 16:44:48+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_unique.c

  storage/maria/ma_update.c@1.1, 2006-04-11 16:44:49+03:00, monty@mysql.com +232 -0
    New BitKeeper file ``storage/maria/ma_update.c''

  storage/maria/ma_update.c@1.0, 2006-04-11 16:44:49+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_update.c

  storage/maria/ma_write.c@1.1, 2006-04-11 16:44:50+03:00, monty@mysql.com +1033 -0
    New BitKeeper file ``storage/maria/ma_write.c''

  storage/maria/ma_write.c@1.0, 2006-04-11 16:44:50+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/ma_write.c

  storage/maria/maria_chk.c@1.1, 2006-04-11 16:44:51+03:00, monty@mysql.com +1824 -0
    New BitKeeper file ``storage/maria/maria_chk.c''

  storage/maria/maria_chk.c@1.0, 2006-04-11 16:44:51+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/maria_chk.c

  storage/maria/maria_def.h@1.1, 2006-04-11 16:44:54+03:00, monty@mysql.com +751 -0
    New BitKeeper file ``storage/maria/maria_def.h''

  storage/maria/maria_def.h@1.0, 2006-04-11 16:44:54+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/maria_def.h

  storage/maria/maria_ftdump.c@1.1, 2006-04-11 16:44:54+03:00, monty@mysql.com +279 -0
    New BitKeeper file ``storage/maria/maria_ftdump.c''

  storage/maria/maria_ftdump.c@1.0, 2006-04-11 16:44:54+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/maria_ftdump.c

  storage/maria/maria_pack.c@1.1, 2006-04-11 16:44:56+03:00, monty@mysql.com +3202 -0
    New BitKeeper file ``storage/maria/maria_pack.c''

  storage/maria/maria_pack.c@1.0, 2006-04-11 16:44:56+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/maria_pack.c

  storage/maria/maria_rename.sh@1.1, 2006-04-11 16:44:57+03:00, monty@mysql.com +17 -0
    New BitKeeper file ``storage/maria/maria_rename.sh''

  storage/maria/maria_rename.sh@1.0, 2006-04-11 16:44:57+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/maria_rename.sh

  storage/maria/test_pack@1.1, 2006-04-11 16:44:57+03:00, monty@mysql.com +10 -0
    New BitKeeper file ``storage/maria/test_pack''

  storage/maria/test_pack@1.0, 2006-04-11 16:44:57+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/maria/test_pack

  storage/myisam/Makefile.am@1.34, 2006-04-11 16:43:55+03:00, monty@mysql.com +2 -1
    Added ft_myisam.c

  storage/myisam/ft_boolean_search.c@1.99.1.1, 2006-04-11 16:43:55+03:00, monty@mysql.com +8 -8
    mi_compare_text -> ha_compare_text
    MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF
    Remove compiler warnings

  storage/myisam/ft_myisam.c@1.1, 2006-04-11 16:44:58+03:00, monty@mysql.com +36 -0
    New BitKeeper file ``storage/myisam/ft_myisam.c''

  storage/myisam/ft_myisam.c@1.0, 2006-04-11 16:44:58+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-maria/storage/myisam/ft_myisam.c

  storage/myisam/ft_nlq_search.c@1.42.1.1, 2006-04-11 16:43:55+03:00, monty@mysql.com +1 -1
    mi_compare_text -> ha_compare_text

  storage/myisam/ft_parser.c@1.51.1.1, 2006-04-11 16:43:56+03:00, monty@mysql.com +1 -1
    mi_compare_text -> ha_compare_text

  storage/myisam/ft_static.c@1.34, 2006-04-11 16:43:56+03:00, monty@mysql.com +0 -13
    Move ft_init_search() to ft_myisam.c to make ft_static.c independent of MyISAM
    

  storage/myisam/ft_stopwords.c@1.25, 2006-04-11 16:43:56+03:00, monty@mysql.com +1 -1
    mi_compare_text -> ha_compare_text

  storage/myisam/ft_update.c@1.41.1.1, 2006-04-11 16:43:56+03:00, monty@mysql.com +2 -2
    mi_compare_text -> ha_compare_text

  storage/myisam/fulltext.h@1.11, 2006-04-11 16:43:56+03:00, monty@mysql.com +0 -10
    Move things to ft_global.h to allow to share more things between MyISAM and Maria

  sql/ha_myisam.cc@1.176, 2006-04-11 16:43:53+03:00, monty@mysql.com +19 -19
    MI_CHECK -> HA_CHECK
    MI_MAX_KEY_LENGTH -> HA_MAX_KEY_LENGTH

  sql/ha_myisam.h@1.73, 2006-04-11 16:43:53+03:00, monty@mysql.com +4 -3
    MI_CHECK -> HA_CHECK
    MI_MAX_KEY_LENGTH -> HA_MAX_KEY_LENGTH

  storage/myisam/mi_check.c@1.143, 2006-04-11 16:43:56+03:00, monty@mysql.com +56 -56
    MI_CHECK -> HA_CHECK

  storage/myisam/mi_create.c@1.57, 2006-04-11 16:43:57+03:00, monty@mysql.com +4 -4
    MI_MAX_POSSIBLE_KEY ->   HA_MAX_POSSIBLE_KEY
    MI_MAX_KEY_BLOCK_SIZE -> HA_MAX_KEY_BLOCK_SIZE
    MI_MAX_KEY_SEG ->  HA_MAX_KEY_SEG
    MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF

  storage/myisam/mi_delete.c@1.41, 2006-04-11 16:43:57+03:00, monty@mysql.com +6 -6
    MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF

  storage/myisam/mi_delete_all.c@1.19, 2006-04-11 16:43:57+03:00, monty@mysql.com +0 -1
    Remove not used variable

  storage/myisam/mi_dynrec.c@1.43, 2006-04-11 16:43:57+03:00, monty@mysql.com +5 -5
    _my_calc_total_blob_length -> _mi_calc_total_blob_length

  storage/myisam/mi_key.c@1.49, 2006-04-11 16:43:57+03:00, monty@mysql.com +1 -1
    _my_store_blob_length -> _mi_store_blob_length

  storage/myisam/mi_log.c@1.13, 2006-04-11 16:43:57+03:00, monty@mysql.com +1 -1
    _my_calc_total_blob_length -> _mi_calc_total_blob_length

  storage/myisam/mi_open.c@1.101, 2006-04-11 16:43:57+03:00, monty@mysql.com +8 -7
    MI_MAX_POSSIBLE_KEY -> HA_MAX_POSSIBLE_KEY
    MI_MAX_KEY_SEG ->      HA_MAX_KEY_SEG
    MI_MAX_KEY_BUFF ->     HA_MAX_KEY_BUFF
    my_n_base_info_read -> mi_n_base_info_read

  storage/myisam/mi_packrec.c@1.36, 2006-04-11 16:43:57+03:00, monty@mysql.com +3 -3
    Made read_pack_length static
    _my_store_blob_length -> _mi_store_blob_length
    Remove not used variable

  storage/myisam/mi_range.c@1.17, 2006-04-11 16:43:58+03:00, monty@mysql.com +1 -1
    MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF

  storage/myisam/mi_search.c@1.60.1.1, 2006-04-11 16:43:58+03:00, monty@mysql.com +5 -5
    MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF

  storage/myisam/mi_test1.c@1.30, 2006-04-11 16:43:58+03:00, monty@mysql.com +1 -1
    MI_MAX_KEY_LENGTH -> HA_MAX_KEY_LENGTH

  storage/myisam/mi_test2.c@1.31, 2006-04-11 16:43:58+03:00, monty@mysql.com +1 -1
    Fixed compiler warning

  storage/myisam/mi_unique.c@1.26, 2006-04-11 16:43:58+03:00, monty@mysql.com +2 -2
    Fixed compiler warning
    mi_compare_text -> ha_compare_text

  storage/myisam/mi_update.c@1.22, 2006-04-11 16:43:58+03:00, monty@mysql.com +1 -1
    MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF

  storage/myisam/mi_write.c@1.58, 2006-04-11 16:43:58+03:00, monty@mysql.com +6 -6
    Rename of defines and functions

  storage/myisam/myisamchk.c@1.121, 2006-04-11 16:43:58+03:00, monty@mysql.com +16 -17
    Rename of defines and functions

  storage/myisam/myisamdef.h@1.86, 2006-04-11 16:43:58+03:00, monty@mysql.com +410 -455
    Remove tabs
    Indentation fixes (Large changes as I did run indent-ex on the file)
    Move some things to myisamchk.h
    Added missing functions that gave compiler warnings

  storage/myisam/myisamlog.c@1.34, 2006-04-11 16:43:59+03:00, monty@mysql.com +1 -1
    Rename of defines and functions

  storage/myisam/myisampack.c@1.53, 2006-04-11 16:43:59+03:00, monty@mysql.com +1 -0
    Remove compiler warning

  storage/myisam/rt_index.c@1.18, 2006-04-11 16:43:59+03:00, monty@mysql.com +2 -2
    Rename of defines and functions

  storage/myisam/sort.c@1.52, 2006-04-11 16:43:59+03:00, monty@mysql.com +3 -4
    Rename of defines, functions and structures

  sql/ha_myisammrg.h@1.43, 2006-04-11 16:43:54+03:00, monty@mysql.com +2 -2
    MI_CHECK -> HA_CHECK
    MI_MAX_KEY_LENGTH -> HA_MAX_KEY_LENGTH

ChangeSet@1.2119.342.1, 2006-04-05 10:30:18+02:00, gbichot@bk-internal.mysql.com +1 -0
  post-commit:
    Removed commit messages to public lists (for now)

  BitKeeper/triggers/post-commit@1.34, 2006-03-31 19:55:48+02:00, monty@bk-internal.mysql.com +0 -45
    Removed commit messages to public lists (for now)

ChangeSet@1.1810.1388.1, 2006-02-21 14:55:54+01:00, msvensson@neptunus.(none) +3 -0
  Bug#11589 mysqltest, --ps-protocol, strange output, float/double/real with zerofill
   - Add zerofill in client if real/float/double is bound to string and fetched using binary protocol.

  libmysql/libmysql.c@1.230.4.1, 2006-02-21 14:55:50+01:00, msvensson@neptunus.(none) +9 -1
    Add zerofill before value if column is created with zerofill 

  mysql-test/r/type_float.result@1.42.3.1, 2006-02-21 14:55:50+01:00, msvensson@neptunus.(none) +16 -0
    Update test for zerofill

  mysql-test/t/type_float.test@1.27.2.1, 2006-02-21 14:55:50+01:00, msvensson@neptunus.(none) +18 -0
    Add test for zerofill and prepared statments

