ChangeSet
  1.1961 05/11/14 18:10:16 SergeyV@selena. +7 -0
  Import patch for bug #13377 from current 5.0 bk tree.

  sql/sql_repl.cc
    1.144 05/11/14 17:56:00 SergeyV@selena.[SergeyV] +7 -32
    Import patch 00.txt

  sql/sql_class.h
    1.273 05/11/14 17:56:00 SergeyV@selena.[SergeyV] +1 -5
    Import patch 00.txt

  sql/log.cc
    1.183 05/11/14 17:56:00 SergeyV@selena.[SergeyV] +1 -61
    Import patch 00.txt

  mysys/my_open.c
    1.22 05/11/14 17:56:00 SergeyV@selena.[SergeyV] +184 -0
    Import patch 00.txt

  mysys/my_create.c
    1.11 05/11/14 17:56:00 SergeyV@selena.[SergeyV] +4 -1
    Import patch 00.txt

  include/my_sys.h
    1.176 05/11/14 17:56:00 SergeyV@selena.[SergeyV] +1 -0
    Import patch 00.txt

  include/my_global.h
    1.110 05/11/14 17:56:00 SergeyV@selena.[SergeyV] +9 -0
    Import patch 00.txt

ChangeSet
  1.1960 05/11/14 15:19:52 SergeyV@selena. +3 -0
  Fixed number of compiler errors on win32.

  sql/spatial.cc
    1.25 05/11/14 15:18:41 SergeyV@selena. +2 -0
    Fixed compiler error for Win32 build. float8get should be enclosed
    in {} since it is macro on win32 and might cause unmatching blocks.

  sql/ha_innodb.cc
    1.276 05/11/14 15:18:41 SergeyV@selena. +2 -2
    Fixed compiler error for Win32 build. 

  VC++Files/mysqlbinlog/mysqlbinlog.vcproj
    1.2 05/11/14 15:18:40 SergeyV@selena. +1 -1
    Fixed compiler error for Win32 build. #include "decimal.c" wrere no able to find decimal.c file.

ChangeSet
  1.1959 05/11/14 04:07:24 kent@mysql.com +1 -0
  config-win.h:
    Disabled yaSSL support for now

  include/config-win.h
    1.69 05/11/14 04:07:01 kent@mysql.com +2 -2
    Disabled yaSSL support for now

ChangeSet
  1.1958 05/11/14 02:08:17 kent@mysql.com +1 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca
  into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release

  mysql-test/mysql-test-run.pl
    1.58 05/11/14 02:08:13 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2144.115 05/11/14 01:59:15 kent@mysql.com +1 -0
  mysql-test-run.pl:
    Corrected search for 'mysqlimport' executable

  mysql-test/mysql-test-run.pl
    1.8.2.41 05/11/14 01:58:39 kent@mysql.com +2 -1
    Corrected search for 'mysqlimport' executable

ChangeSet
  1.1957 05/11/11 22:18:41 joerg@mysql.com +1 -0
  Not all RPM builds can use the bundled zlib, due to dependency and link conflicts. Solve this.

  support-files/mysql.spec.sh
    1.127 05/11/11 22:18:36 joerg@mysql.com +2 -2
    We cannot always use the bundled zlib, as this conflicts with the "shared" build of the "max" binary.
    The fully static RPM build on "build" also does not work with the bundled zlib.
    With this change, we use the bundled zlib for "standard" RPMs (unless fully stytic, "build")
    and the one already installed onm the system for the "max" build which is also labeled "experimental".

ChangeSet
  1.1953.1.2 05/11/10 17:50:51 guilhem@mysql.com +15 -0
  WL#2971 "change log-bin-trust-routine-creators=0 to apply only to functions".
  Indeed now that stored procedures CALL is not binlogged, but instead the invoked substatements are,
  the restrictions applied by log-bin-trust-routine-creators=0 are superfluous for procedures.
  They still need to apply to functions where function calls are written to the binlog (for example as "DO myfunc(3)").
  We rename the variable to log-bin-trust-function-creators but allow the old name until some future version (and issue a warning if old name is used).

  sql/sql_trigger.cc
    1.31 05/11/10 17:50:43 guilhem@mysql.com +5 -2
    comments.

  sql/sql_parse.cc
    1.510 05/11/10 17:50:43 guilhem@mysql.com +8 -13
    1) sending ER_FAILED_ROUTINE_BREAK_BINLOG is wrong since August as we don't binlog CALL anymore but instead binlog the substatements;
    the clear_error() goes away too as it was necessary only when we created a binlog event from the "CALL" statement.
    2) log-bin-trust-routine-creators now applies only to functions.

  sql/sp.cc
    1.97 05/11/10 17:50:43 guilhem@mysql.com +3 -2
    log-bin-trust-routine-creators now applies only to functions.

  sql/share/errmsg.txt
    1.55 05/11/10 17:50:43 guilhem@mysql.com +2 -2
    routine -> function

  sql/set_var.h
    1.72 05/11/10 17:50:43 guilhem@mysql.com +11 -0
    new class to be able to issue a "this is a deprecated variable" warning if used.

  sql/set_var.cc
    1.143 05/11/10 17:50:43 guilhem@mysql.com +27 -3
    a new class sys_var_trust_routine_creators to be able to issue a "this is a deprecated variable" warning if used.

  sql/mysqld.cc
    1.517 05/11/10 17:50:43 guilhem@mysql.com +20 -9
    option name changes. A precision about --read-only.

  sql/mysql_priv.h
    1.366 05/11/10 17:50:43 guilhem@mysql.com +1 -1
    variable name changed

  sql/item_func.cc
    1.266 05/11/10 17:50:43 guilhem@mysql.com +0 -6
    This warning is wrong since binlogging of functions was changed in August. If a function fails
    in the middle, it will be binlogged with its error code (i.e. properly).

  mysql-test/t/rpl_sp.test
    1.8 05/11/10 17:50:43 guilhem@mysql.com +142 -62
    Test update:
    1) as log-bin-trust-routine-creators now affects only functions, the testing of this option, which was
    mainly done on procedures, is moved to functions
    2) cleanup is simplified; and instead of many SHOW BINLOG EVENTS we do a big one in the end, which is more
    maintainable.
    3) we test a few more function and procedures cases to see how they replicate.
    4) removing out-of-date comments

  mysql-test/t/rpl_sp-slave.opt
    1.2 05/11/10 17:50:43 guilhem@mysql.com +1 -1
    we need to skip this error to not hit BUG#14769

  mysql-test/r/rpl_sp.result
    1.10 05/11/10 17:50:43 guilhem@mysql.com +194 -94
    result update

  mysql-test/mysql_test_run_new.c
    1.15 05/11/10 17:50:43 guilhem@mysql.com +1 -1
    update to new option name

  mysql-test/mysql-test-run.sh
    1.283 05/11/10 17:50:43 guilhem@mysql.com +3 -3
    update to new option name

  mysql-test/mysql-test-run.pl
    1.57 05/11/10 17:50:43 guilhem@mysql.com +2 -2
    update to new option name

ChangeSet
  1.1955 05/11/10 18:58:33 ramil@mysql.com +2 -0
  Fix for bug #14822: Test "mysqldump" fails, "result" protocol seems wrong.

  mysql-test/t/mysqldump.test
    1.74 05/11/10 18:58:27 ramil@mysql.com +5 -5
    Fix for bug #14822: Test "mysqldump" fails, "result" protocol seems wrong.
    2>&1 added to be able to see error messages.

  mysql-test/r/mysqldump.result
    1.81 05/11/10 18:58:27 ramil@mysql.com +10 -0
    Fix for bug #14822: Test "mysqldump" fails, "result" protocol seems wrong.

ChangeSet
  1.1953.1.1 05/11/10 15:13:12 guilhem@mysql.com +3 -0
  Merge mysql.com:/home/mysql_src/mysql-4.1-gca
  into  mysql.com:/home/mysql_src/mysql-5.0-release

  sql/item_timefunc.h
    1.63 05/11/10 15:13:07 guilhem@mysql.com +0 -0
    Auto merged

  sql/item_strfunc.h
    1.100 05/11/10 15:13:07 guilhem@mysql.com +0 -0
    Auto merged

  sql/item_func.h
    1.132 05/11/10 15:13:07 guilhem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2144.114 05/11/10 15:12:22 guilhem@mysql.com +3 -0
  Declaring some class members public for BUG#12377:
  "Item_date_add_interval needs to have the int_type member as Public".
  As explained in the bug report, this change is is to help http://search.cpan.org/~philips/DBIx-MyParse-0.20/
  So please keep those members public.

  sql/item_timefunc.h
    1.42.1.13 05/11/10 15:12:18 guilhem@mysql.com +4 -4
    declaring some class members public for BUG#12377

  sql/item_strfunc.h
    1.73.2.13 05/11/10 15:12:18 guilhem@mysql.com +1 -1
    declaring some class members public for BUG#12377

  sql/item_func.h
    1.68.1.59 05/11/10 15:12:18 guilhem@mysql.com +2 -2
    declaring some class members public for BUG#12377

ChangeSet
  1.1954 05/11/10 14:24:54 joerg@mysql.com +1 -0
  Provide a default "minimum thread stack size" PTHREAD_STACK_MIN where it is missing.
  (Currently, affects only BSD with Linuxthreads)

  server-tools/instance-manager/priv.cc
    1.9 05/11/10 14:24:48 joerg@mysql.com +3 -0
    Provide a default "minimum thread stack size" PTHREAD_STACK_MIN where it is missing.
    (Currently, affects only BSD with Linuxthreads)

ChangeSet
  1.1953 05/11/09 12:45:34 joerg@mysql.com +0 -0
  Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/M50/mysql-5.0

ChangeSet
  1.1944.1.33 05/11/08 20:18:08 ingo@production.mysql.com +1 -0
  Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
  into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0

  sql/field.cc
    1.290 05/11/08 20:18:05 ingo@production.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1944.58.1 05/11/08 01:27:15 petr@mysql.com +2 -0
  Merge mysql.com:/home/cps/mysql/trees/mysql-4.1
  into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin

  support-files/mysql.spec.sh
    1.126 05/11/08 01:27:10 petr@mysql.com +0 -0
    SCCS merged

  sql/examples/ha_tina.cc
    1.21 05/11/08 01:12:32 petr@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1944.57.1 05/11/07 22:30:44 joerg@mysql.com +2 -0
  mysql-test/r/connect.result + mysql-test/t/connect.test
  Replace the full socket path name, not just a directory component. bug#14720

  mysql-test/t/connect.test
    1.19 05/11/07 22:30:38 joerg@mysql.com +10 -10
    In cases where "--tmpdir=" is given to the test run, the socket file is not created below
    "$MYSQL_TEST_DIR" but rather within this directory. So the "--replace_result" should not
    be done to a directory in the path but rather to the complete path name of the socket file.
    bug#14720

  mysql-test/r/connect.result
    1.20 05/11/07 22:30:38 joerg@mysql.com +10 -10
    In cases where "--tmpdir=" is given to the test run, the socket file is not created below
    "$MYSQL_TEST_DIR" but rather within this directory. So the "--replace_result" should not 
    be done to a directory in the path but rather to the complete path name of the socket file. 
    bug#14720

ChangeSet
  1.1944.56.1 05/11/07 18:31:48 ingo@mysql.com +1 -0
  Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
  Initialized 'ptr' for a newly instantiated varstring field.
  This is required by INSERT DELAYED.
  
  No test case. This is a migration issue. There are two shell
  scripts attached to the bug report. They can be used for testing.

  sql/field.cc
    1.288.1.1 05/11/07 18:31:43 ingo@mysql.com +10 -3
    Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
    Initialized 'ptr' for a newly instantiated varstring field.
    This is required by INSERT DELAYED.

ChangeSet
  1.1944.1.30 05/11/07 16:18:46 guilhem@mysql.com +3 -0
  Fix for BUG#14703 "Valgrind error when inserting 0 into a BIT column (like in type_bit.test)":
  test "length" first (otherwise when "length" is 0, the *from invalid access still triggers a Valgrind warning).
  I wrote to the Valgrind authors in case this is something fixable in Valgrind (normally the
  decision to issue a warning is based on the simulated CPU condition code, which should not be undefined here).

  sql/field.cc
    1.289 05/11/07 16:18:31 guilhem@mysql.com +2 -2
    To avoid a Valgrind warning running the type_bit test: test "length" first (otherwise when "length" is 0, the *from invalid access still triggers a Valgrind warning).

  mysql-test/r/read_only.result
    1.2 05/11/07 16:18:31 guilhem@mysql.com +2 -0
    result update

  BUILD/compile-pentium64-valgrind-max
    1.2 05/11/07 16:18:31 guilhem@mysql.com +2 -2
    putting this script in sync with compile-pentium-valgrind-max, otherwise we didn't have the federated engine compiled in.

ChangeSet
  1.1944.1.28 05/11/05 22:45:54 igor@rurik.mysql.com +2 -0
  Merge rurik.mysql.com:/home/igor/mysql-5.0
  into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0

  mysql-test/t/view.test
    1.120 05/11/05 22:45:49 igor@rurik.mysql.com +16 -15
    Manual merge.

  mysql-test/r/view.result
    1.130 05/11/05 22:45:49 igor@rurik.mysql.com +19 -31
    Manual merge.

ChangeSet
  1.1944.1.27 05/11/05 22:41:36 igor@rurik.mysql.com +3 -0
  Post review fixes.

  sql/sql_table.cc
    1.282 05/11/05 22:41:30 igor@rurik.mysql.com +1 -1
    Post review fixes.

  sql/share/errmsg.txt
    1.54 05/11/05 22:41:30 igor@rurik.mysql.com +0 -2
    Post review fixes.

  mysql-test/r/view.result
    1.129 05/11/05 22:41:30 igor@rurik.mysql.com +4 -4
    Post review fixes.

ChangeSet
  1.1616.2393.2 05/11/06 02:11:12 petr@mysql.com +3 -0
  Fix Bug#14672 Bug in deletion

  sql/examples/ha_tina.cc
    1.3.1.7 05/11/06 02:11:00 petr@mysql.com +2 -1
    Add O_APPEND flag to my_open. We should always add rows to the end of file

  mysql-test/t/csv.test
    1.4 05/11/06 02:11:00 petr@mysql.com +19 -0
    Add test for a bug

  mysql-test/r/csv.result
    1.3 05/11/06 02:11:00 petr@mysql.com +27 -0
    correct result file

ChangeSet
  1.1616.2393.1 05/11/05 15:08:15 petr@mysql.com +3 -0
  Fix Bug#13894 Server crashes on update of CSV table

  sql/examples/ha_tina.cc
    1.3.1.6 05/11/05 15:07:59 petr@mysql.com +9 -10
    sort function should return reverted values for chains to be sorted in
    the right orded. don't do a strange memmove

  mysql-test/t/csv.test
    1.3 05/11/05 15:07:59 petr@mysql.com +18 -0
    Add test for a bug

  mysql-test/r/csv.result
    1.2 05/11/05 15:07:59 petr@mysql.com +20 -0
    update result file

ChangeSet
  1.1944.55.1 05/11/05 05:46:41 sergefp@mysql.com +1 -0
  Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/psergey/mysql-5.0-oct03-push

  sql/mysql_priv.h
    1.365 05/11/05 05:46:39 sergefp@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2144.112 05/11/05 01:44:35 kent@mysql.com +1 -0
  mysql.spec.sh:
    Always use bundled zlib

  support-files/mysql.spec.sh
    1.83.1.27 05/11/05 01:43:36 kent@mysql.com +1 -0
    Always use bundled zlib

ChangeSet
  1.1944.1.26 05/11/04 15:03:29 igor@rurik.mysql.com +2 -0
  Merge rurik.mysql.com:/home/igor/mysql-5.0
  into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0

  sql/sql_table.cc
    1.281 05/11/04 15:03:22 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/handler.h
    1.163 05/11/04 15:03:22 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1944.54.1 05/11/04 16:44:20 petr@mysql.com +1 -0
  Merge mysql.com:/home/cps/mysql/trees/mysql-4.1
  into  mysql.com:/home/cps/mysql/trees/mysql-5.0

  sql/spatial.h
    1.17 05/11/04 16:44:14 petr@mysql.com +0 -2
    Auto merged

ChangeSet
  1.1616.2144.111 05/11/04 16:17:43 petr@mysql.com +1 -0
  fix --ansi --pedantic compilation failure

  sql/spatial.h
    1.12.1.2 05/11/04 16:17:29 petr@mysql.com +2 -2
    fix --ansi --pedantic compilation failure

ChangeSet
  1.1944.53.1 05/11/04 15:12:22 monty@mysql.com +2 -0
  Reorder struct elements to be more optimal for 64 bit computers
  (Main reason for reordering was to get rid of compiler warnings for order of element initialization)

  sql/sql_class.h
    1.272 05/11/04 15:12:19 monty@mysql.com +30 -32
    Reorder MYSQL_LOG struct elements to be more optimal for 64 bit computers
    (Main reason for reordering was to get rid of compiler warnings for order of element initialization)

  sql/log.cc
    1.182 05/11/04 15:12:19 monty@mysql.com +4 -3
    Remove compiler warning

ChangeSet
  1.1944.52.1 05/11/04 10:54:51 guilhem@mysql.com +1 -0
  sql_parse.cc:
    SCCS merged

  sql/sql_parse.cc
    1.509 05/11/04 10:54:45 guilhem@mysql.com +0 -0
    SCCS merged

ChangeSet
  1.1944.1.21 05/11/04 10:03:31 monty@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/my/mysql-5.0

  sql/mysqld.cc
    1.516 05/11/04 10:03:27 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1944.49.2 05/11/04 10:02:43 monty@mysql.com +2 -0
  DROP created procedures
  (Caused sp-security to fail)

  mysql-test/t/mysqldump.test
    1.73 05/11/04 10:02:40 monty@mysql.com +1 -0
    DROP created procedures
    (Caused sp-security to fail)

  mysql-test/r/mysqldump.result
    1.80 05/11/04 10:02:40 monty@mysql.com +1 -0
    DROP created procedures
    (Caused sp-security to fail)

ChangeSet
  1.1944.49.1 05/11/03 22:42:25 monty@mysql.com +3 -0
  Fixes during review of new code
  Destroy LOCK_uuid_generator

  sql/mysqld.cc
    1.514.1.1 05/11/03 22:42:21 monty@mysql.com +1 -0
    Destroy LOCK_uuid_generator

  sql/ha_ndbcluster.cc
    1.219 05/11/03 22:42:21 monty@mysql.com +2 -1
    Fixed portability problem

  sql/ha_berkeley.h
    1.77 05/11/03 22:42:21 monty@mysql.com +2 -2
    Fix portability problem (warnings from gcc on 32 bit linux)

ChangeSet
  1.1944.48.1 05/11/03 22:35:18 sergefp@mysql.com +1 -0
  Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/psergey/mysql-5.0-oct03-push

  sql/sql_select.cc
    1.374 05/11/03 22:35:16 sergefp@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1944.42.9 05/11/03 20:29:21 jani@ua141d10.elisa.omakaista.fi +1 -0
  Disabled ps_protocol for two statements.

  mysql-test/t/type_newdecimal.test
    1.32 05/11/03 20:29:16 jani@ua141d10.elisa.omakaista.fi +2 -0
    Disabled ps_protocol for two statements.

ChangeSet
  1.1944.42.7 05/11/03 21:01:27 holyfoot@deer.(none) +1 -0
  test enabled

  mysql-test/t/disabled.def
    1.13 05/11/03 21:01:19 holyfoot@mysql.com +0 -1
    test enabled

ChangeSet
  1.1944.42.6 05/11/03 20:58:43 holyfoot@mysql.com +2 -0
  Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
  into mysql.com:/home/hf/work/mysql-5.0.9551

  BitKeeper/deleted/.del-ctype_cp932.test
    1.9 05/11/03 20:58:36 holyfoot@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-ctype_cp932.result
    1.8 05/11/03 20:58:36 holyfoot@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1944.42.5 05/11/03 19:47:08 holyfoot@mysql.com +1 -0
  Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
  into mysql.com:/home/hf/work/mysql-5.0.9551

  sql/sql_select.cc
    1.373 05/11/03 19:47:00 holyfoot@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1944.43.5 05/11/03 17:39:40 jani@ua141d10.elisa.omakaista.fi +1 -0
  Disabled a test temporarily.

  mysql-test/t/disabled.def
    1.12 05/11/03 17:39:34 jani@ua141d10.elisa.omakaista.fi +1 -0
    Disabled a test temporarily.

ChangeSet
  1.1944.47.2 05/11/03 16:28:20 jani@ua141d10.elisa.omakaista.fi +8 -0
  Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

ChangeSet
  1.1944.47.1 05/11/03 17:43:03 evgen@moonbone.local +1 -0
  opt_range.cc:
    Additional fix for bug#14093

  sql/opt_range.cc
    1.196 05/11/03 17:42:03 evgen@moonbone.local +2 -1
    Additional fix for bug#14093

  sql/table.cc
    1.208 05/11/03 16:28:11 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  sql/sql_view.h
    1.11 05/11/03 16:28:11 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  sql/sql_view.cc
    1.75 05/11/03 16:28:11 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  sql/sql_table.cc
    1.278.1.2 05/11/03 16:28:11 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  sql/sql_show.cc
    1.293 05/11/03 16:28:11 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  sql/sql_delete.cc
    1.169 05/11/03 16:28:10 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  sql/sql_base.cc
    1.317 05/11/03 16:28:10 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.363.1.1 05/11/03 16:28:10 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

ChangeSet
  1.1939.11.1 05/11/03 16:10:11 jani@ua141d10.elisa.omakaista.fi +9 -0
  Changes in get_table_type() and mysql_frm_type(). The main problem was
  that in mysql_rm_table_part2_with_lock() previously we needed to open
  same file twice. Now once is enough.

  sql/table.cc
    1.198.1.1 05/11/03 16:10:04 jani@ua141d10.elisa.omakaista.fi +0 -23
    No longer needed.

  sql/sql_view.h
    1.9.1.1 05/11/03 16:10:04 jani@ua141d10.elisa.omakaista.fi +1 -1
    Function prototype changes.

  sql/sql_view.cc
    1.71.1.1 05/11/03 16:10:04 jani@ua141d10.elisa.omakaista.fi +24 -10
    Merged code from get_table_type() and mysql_frm_type() into the latter one.

  sql/sql_table.cc
    1.273.1.9 05/11/03 16:10:04 jani@ua141d10.elisa.omakaista.fi +10 -3
    Changed get_table_type() to mysql_frm_type()

  sql/sql_show.cc
    1.290.2.1 05/11/03 16:10:04 jani@ua141d10.elisa.omakaista.fi +2 -1
    Changed get_table_type() to mysql_frm_type()

  sql/sql_rename.cc
    1.31 05/11/03 16:10:04 jani@ua141d10.elisa.omakaista.fi +4 -3
    Changed get_table_type() to mysql_frm_type()

  sql/sql_delete.cc
    1.166.2.1 05/11/03 16:10:04 jani@ua141d10.elisa.omakaista.fi +2 -1
    Changed get_table_type() to mysql_frm_type()

  sql/sql_base.cc
    1.312.1.1 05/11/03 16:10:04 jani@ua141d10.elisa.omakaista.fi +2 -1
    Changed get_table_type() to mysql_frm_type()

  sql/mysql_priv.h
    1.362.1.1 05/11/03 16:10:03 jani@ua141d10.elisa.omakaista.fi +0 -1
    Merged functions get_table_type() and mysql_frm_type() into one,
    using the name from latter one.

ChangeSet
  1.1944.38.4 05/11/03 16:21:21 sergefp@mysql.com +7 -0
  Merge mysql.com:/home/psergey/mysql-5.0-bug14026-r2
  into mysql.com:/home/psergey/mysql-5.0-oct03-push

  sql/table.h
    1.119 05/11/03 16:21:19 sergefp@mysql.com +0 -0
    Auto merged

  sql/sql_select.h
    1.102 05/11/03 16:21:19 sergefp@mysql.com +0 -0
    Auto merged

  sql/sql_select.cc
    1.371.2.1 05/11/03 16:21:19 sergefp@mysql.com +0 -0
    Auto merged

  sql/sql_prepare.cc
    1.163 05/11/03 16:21:19 sergefp@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.364 05/11/03 16:21:19 sergefp@mysql.com +0 -0
    Auto merged

  mysql-test/t/join_nested.test
    1.14 05/11/03 16:21:19 sergefp@mysql.com +0 -0
    Auto merged

  mysql-test/r/join_nested.result
    1.18 05/11/03 16:21:19 sergefp@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1944.45.2 05/11/03 15:01:04 jani@ua141d10.elisa.omakaista.fi +4 -0
  Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
  into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp

  Makefile.am
    1.82 05/11/03 15:01:00 jani@ua141d10.elisa.omakaista.fi +2 -4
    Merged from 4.1

  BitKeeper/deleted/.del-ctype_cp932.test
    1.7.1.1 05/11/03 14:54:40 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-ctype_cp932.result
    1.6.1.1 05/11/03 14:54:40 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.282 05/11/03 14:54:40 jani@ua141d10.elisa.omakaista.fi +0 -2
    Auto merged

  BitKeeper/deleted/.del-ctype_cp932.test
    1.1.7.1 05/11/03 14:54:40 jani@ua141d10.elisa.omakaista.fi +0 -0
    Merge rename: mysql-test/t/ctype_cp932.test -> BitKeeper/deleted/.del-ctype_cp932.test

  BitKeeper/deleted/.del-ctype_cp932.result
    1.1.6.1 05/11/03 14:54:40 jani@ua141d10.elisa.omakaista.fi +0 -0
    Merge rename: mysql-test/r/ctype_cp932.result -> BitKeeper/deleted/.del-ctype_cp932.result

ChangeSet
  1.1944.43.2 05/11/03 15:24:55 konstantin@mysql.com +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/opt/local/work/mysql-5.0-14210

  sql/opt_range.cc
    1.195 05/11/03 15:24:47 konstantin@mysql.com +0 -0
    Auto merged

  sql/handler.cc
    1.202 05/11/03 15:24:47 konstantin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1944.42.3 05/11/03 16:17:11 holyfoot@deer.(none) +2 -0
  Merging

  mysql-test/t/ctype_cp932_binlog.test
    1.2 05/11/03 16:17:01 holyfoot@mysql.com +1 -2
    test fixed with 5.0 specific

  mysql-test/r/ctype_cp932_binlog.result
    1.2 05/11/03 16:17:01 holyfoot@mysql.com +5 -7
    test result fixed

ChangeSet
  1.1944.44.1 05/11/03 14:20:13 konstantin@mysql.com +11 -0
  A fix and a test case for Bug#14210 "Simple query with > operator on 
  large table gives server crash": make sure that when a MyISAM temporary
  table is created for a cursor, it's created in its memory root,
  not the memory root of the current query.

  tests/mysql_client_test.c
    1.162 05/11/03 14:20:07 konstantin@mysql.com +54 -0
    A test case for Bug#14210 "Simple query with > operator on large table
     gives server crash": a C API test case is worth adding because of different
    memory allocation/freeing patterns in handling of C API and SP cursors

  sql/unireg.cc
    1.74 05/11/03 14:20:07 konstantin@mysql.com +2 -2
    - get_new_handler declaration changed

  sql/table.cc
    1.207 05/11/03 14:20:07 konstantin@mysql.com +2 -1
    - get_new_handler declaration changed

  sql/sql_table.cc
    1.278.1.1 05/11/03 14:20:07 konstantin@mysql.com +4 -2
    - get_new_handler declaration changed

  sql/sql_select.cc
    1.371.1.1 05/11/03 14:20:07 konstantin@mysql.com +6 -3
    - the actual fix for Bug#14210. In create_myisam_from_heap we should
    create the new table handler in TABLE::mem_root, not in THD::mem_root:
    the latter is freed shortly after cursor is open.
    - adjust create_tmp_table to explicitly supply &table->mem_root
    to get_new_handler when creating a handler for a new temporary table

  sql/sql_base.cc
    1.316 05/11/03 14:20:07 konstantin@mysql.com +1 -1
    - get_new_handler declaration changed

  sql/opt_range.cc
    1.193.1.1 05/11/03 14:20:07 konstantin@mysql.com +1 -1
    - get_new_handler declaration changed

  sql/handler.h
    1.161.1.1 05/11/03 14:20:07 konstantin@mysql.com +1 -1
    - get_new_handler declaration changed

  sql/handler.cc
    1.200.1.1 05/11/03 14:20:07 konstantin@mysql.com +19 -17
    - rewrite get_new_handler to accept a memory root and use it for

  mysql-test/t/sp.test
    1.162 05/11/03 14:20:07 konstantin@mysql.com +52 -0
    A test case for Bug#14210 "Simple query with > operator on large table 
    gives server crash"

  mysql-test/r/sp.result
    1.169 05/11/03 14:20:07 konstantin@mysql.com +42 -0
    Test results fixed: a test case for Bug#14210

ChangeSet
  1.1616.2144.110 05/11/03 13:02:05 jani@ua141d10.elisa.omakaista.fi +2 -0
  Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0
  into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1

  mysql-test/mysql-test-run.sh
    1.208.1.50 05/11/03 13:02:02 jani@ua141d10.elisa.omakaista.fi +1 -2
    Merged from 4.0

  Makefile.am
    1.60.1.14 05/11/03 13:02:02 jani@ua141d10.elisa.omakaista.fi +2 -6
    Merged from 4.0

ChangeSet
  1.1944.42.2 05/11/03 14:58:36 holyfoot@mysql.com +2 -0
  Merge mysql.com:/home/hf/work/mysql-4.1.14183
  into mysql.com:/home/hf/work/mysql-5.0.9551

  BitKeeper/deleted/.del-ctype_cp932.test
    1.8 05/11/03 14:58:29 holyfoot@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-ctype_cp932.result
    1.7 05/11/03 14:58:29 holyfoot@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-ctype_cp932.test
    1.1.6.2 05/11/03 14:58:29 holyfoot@mysql.com +0 -0
    Merge rename: mysql-test/t/ctype_cp932.test -> BitKeeper/deleted/.del-ctype_cp932.test

  BitKeeper/deleted/.del-ctype_cp932.result
    1.1.5.2 05/11/03 14:58:29 holyfoot@mysql.com +0 -0
    Merge rename: mysql-test/r/ctype_cp932.result -> BitKeeper/deleted/.del-ctype_cp932.result

ChangeSet
  1.1944.43.1 05/11/03 13:55:08 evgen@moonbone.local +3 -0
  Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
  into moonbone.local:/work/14093-bug-5.0-mysql

  sql/item.h
    1.179 05/11/03 13:55:07 evgen@moonbone.local +0 -0
    Auto merged

  mysql-test/t/select.test
    1.90 05/11/03 13:55:07 evgen@moonbone.local +0 -0
    Auto merged

  mysql-test/r/select.result
    1.110 05/11/03 13:55:07 evgen@moonbone.local +0 -0
    Auto merged

ChangeSet
  1.1944.42.1 05/11/03 14:54:13 holyfoot@mysql.com +1 -0
  Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
  into mysql.com:/home/hf/work/mysql-5.0.9551

  sql/sql_select.cc
    1.372 05/11/03 14:54:05 holyfoot@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1939.10.1 05/11/03 13:53:49 evgen@moonbone.local +5 -0
  Fix bug #14093 Query takes a lot of time when date format is not valid
  
  Invalid date like 2000-02-32 wasn't converted to int, which lead to not
  using index and comparison with field as astring, which results in slow
  query execution.
  
  convert_constatn_item() and get_mm_leaf() now forces MODE_INVALID_DATES to
  allow such conversion.

  mysql-test/t/select.test
    1.88.1.1 05/11/03 13:52:54 evgen@moonbone.local +18 -0
    Test case for bug#14093 Query takes a lot of time when date format is not valid

  mysql-test/r/select.result
    1.107.1.1 05/11/03 13:52:10 evgen@moonbone.local +40 -0
    Test case for bug#14093 Query takes a lot of time when date format is not valid

  sql/opt_range.cc
    1.194 05/11/03 13:51:53 evgen@moonbone.local +8 -1
     Fix bug #14093 Query takes a lot of time when date format is not valid
    get_mm_leaf() modified so it allows index usage for comparing fields with invalid dates like 2000-01-32.

  sql/item_cmpfunc.cc
    1.184 05/11/03 13:51:41 evgen@moonbone.local +5 -0
     Fix bug #14093 Query takes a lot of time when date format is not valid
    convert_constant_item() now allows conversion of invalid dates like 2000-01-32 to int to make it possible to use index when comparing fields with such dates.

  sql/item.h
    1.176.1.1 05/11/03 13:51:28 evgen@moonbone.local +1 -0
    Fix bug #14093 Query takes a lot of time when date format is not valid
    To Item_int_with_ref added method real_item() which returns ref.

ChangeSet
  1.1944.14.10 05/11/03 11:01:13 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/bug13957/my50-bug13957

  configure.in
    1.361 05/11/03 11:01:07 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1346.1.827 05/11/03 11:47:54 jani@ua141d10.elisa.omakaista.fi +1 -0
  Added test-force to Makefile.

  Makefile.am
    1.40.1.15 05/11/03 11:47:52 jani@ua141d10.elisa.omakaista.fi +4 -0
    Added test-force to Makefile.

ChangeSet
  1.1944.38.3 05/11/03 12:38:46 sergefp@mysql.com +2 -0
  Post-merge fixes

  mysql-test/t/view.test
    1.118.1.2 05/11/03 12:38:37 sergefp@mysql.com +24 -7
    Post-merge fixes

  mysql-test/r/view.result
    1.127.1.2 05/11/03 12:38:37 sergefp@mysql.com +12 -12
    Post-merge fixes

ChangeSet
  1.1944.41.1 05/11/03 10:37:49 msvensson@neptunus.(none) +3 -0
  Bug#13957 yassl: opensrv6c compile failure
   - Added some ifdefs and turn off auto template instantiation, use explicit template instantiation

  extra/yassl/src/timer.cpp
    1.5 05/11/03 10:37:41 msvensson@neptunus.(none) +7 -5
    Dont' include files from within namespace yaSSL.

  extra/yassl/src/socket_wrapper.cpp
    1.7 05/11/03 10:37:41 msvensson@neptunus.(none) +1 -1
    Include sys/filio.h if __SCO_VERSION__ is defined

  configure.in
    1.358.1.2 05/11/03 10:37:41 msvensson@neptunus.(none) +4 -0
    Use -Tno_implict to indicate that we specifiy which template should be instantiated.
    Turn on HAVE_EXPLICIT_TEMPLATE_INSTATNTIATION

ChangeSet
  1.1346.1.826 05/11/03 11:19:06 jani@ua141d10.elisa.omakaista.fi +1 -0
  Added new build script for pentium64.

  BUILD/compile-pentium64-debug-max
    1.1 05/11/03 11:18:14 jani@ua141d10.elisa.omakaista.fi +13 -0

  BUILD/compile-pentium64-debug-max
    1.0 05/11/03 11:18:14 jani@ua141d10.elisa.omakaista.fi +0 -0
    BitKeeper file /home/my/bk/mysql-4.0/BUILD/compile-pentium64-debug-max

ChangeSet
  1.1346.1.825 05/11/03 11:05:52 jani@ua141d10.elisa.omakaista.fi +1 -0
  Changed mysql-test-run to correspond to the one in 5.0 tree.

  mysql-test/mysql-test-run.sh
    1.146.1.55 05/11/03 11:05:50 jani@ua141d10.elisa.omakaista.fi +2 -2
    Changed mysql-test-run to correspond to the one in 5.0 tree.

ChangeSet
  1.1944.39.1 05/11/03 10:28:12 sergefp@mysql.com +2 -0
  Merged

  mysql-test/t/view.test
    1.118.1.1 05/11/03 10:28:08 sergefp@mysql.com +0 -15
    Merged

  mysql-test/r/view.result
    1.127.1.1 05/11/03 10:28:08 sergefp@mysql.com +0 -0
    Merged

ChangeSet
  1.1944.38.1 05/11/03 11:05:34 holyfoot@mysql.com +1 -0
  Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
  into mysql.com:/home/hf/work/mysql-5.0.13573

  sql/item_func.cc
    1.265 05/11/03 11:05:27 holyfoot@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1944.36.3 05/11/02 22:24:36 igor@rurik.mysql.com +2 -0
  Merge rurik.mysql.com:/home/igor/mysql-5.0
  into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0

  mysql-test/t/view.test
    1.119 05/11/02 22:24:31 igor@rurik.mysql.com +10 -11
    Manual merge.

  mysql-test/r/view.result
    1.128 05/11/02 22:24:31 igor@rurik.mysql.com +12 -12
    Manual merge.

ChangeSet
  1.1944.36.2 05/11/02 22:13:10 igor@rurik.mysql.com +4 -0
  Post review fixes.

  sql/sql_table.cc
    1.280 05/11/02 22:12:08 igor@rurik.mysql.com +6 -6
    Post review fixes

  sql/share/errmsg.txt
    1.53 05/11/02 22:12:08 igor@rurik.mysql.com +1 -1
    Post review fixes.

  mysql-test/t/view.test
    1.117.2.2 05/11/02 22:12:08 igor@rurik.mysql.com +1 -1
    Post review fixes.

  mysql-test/r/view.result
    1.126.2.2 05/11/02 22:12:08 igor@rurik.mysql.com +1 -1
    Post review fixes.

ChangeSet
  1.1944.37.2 05/11/02 17:56:12 jimw@mysql.com +1 -0
  Don't allow startup when default storage engine is specified to be a
  storage engine that is disabled. This was fixed once in 4.1, but regressed
  in 5.0 because of changes to storage engine initialization. (Bug #9815)

  sql/mysqld.cc
    1.515 05/11/02 17:56:08 jimw@mysql.com +17 -16
    Move check of whether default storage engine is available to after
    storage engine initialization.

ChangeSet
  1.1944.37.1 05/11/03 01:51:47 evgen@moonbone.local +1 -0
  Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
  into moonbone.local:/work/14466-bug-5.0-mysql

  sql/table.cc
    1.206 05/11/03 01:51:45 evgen@moonbone.local +0 -1
    Auto merged

ChangeSet
  1.1944.32.3 05/11/03 01:50:36 evgen@moonbone.local +2 -0
  func_gconcat.result:
    Fixed wrong test case
  table.cc:
    Fixed wrong DBUG_ENTER placement

  mysql-test/r/func_gconcat.result
    1.48 05/11/03 01:49:32 evgen@moonbone.local +2 -2
    Fixed wrong test case

  sql/table.cc
    1.203.2.1 05/11/03 01:46:44 evgen@moonbone.local +1 -1
    Fixed wrong DBUG_ENTER placement

ChangeSet
  1.1944.35.1 05/11/02 13:44:58 igor@rurik.mysql.com +5 -0
  #view.test#:
    new file
  sql_table.cc, handler.h:
    Fixed bug #14540.
    Added error mnemonic code HA_ADMIN_NOT_BASE_TABLE
    to report that an operation cannot be applied for views.
  view.test, view.result:
    Added a test case for bug #14540.
  errmsg.txt:
    Fixed bug #14540.
    Added error ER_CHECK_NOT_BASE_TABLE.

  sql/sql_table.cc
    1.279 05/11/02 13:44:53 igor@rurik.mysql.com +23 -10
    Fixed bug #14540.
    Added error mnemonic code HA_ADMIN_NOT_BASE_TABLE
    to report that an operation cannot be applied for views.

  sql/share/errmsg.txt
    1.52 05/11/02 13:44:52 igor@rurik.mysql.com +2 -0
    Added error ER_CHECK_NOT_BASE_TABLE.

  sql/handler.h
    1.162 05/11/02 13:44:52 igor@rurik.mysql.com +1 -0
    Fixed bug #14540.
    Added error mnemonic code HA_ADMIN_NOT_BASE_TABLE
    to report that an operation cannot be applied for views.

  mysql-test/t/view.test
    1.117.2.1 05/11/02 13:44:52 igor@rurik.mysql.com +15 -0
    Added a test case for bug #14540.

  mysql-test/r/view.result
    1.126.2.1 05/11/02 13:44:52 igor@rurik.mysql.com +19 -0
    Added a test case for bug #14540.

ChangeSet
  1.1944.34.1 05/11/02 20:44:09 konstantin@mysql.com +1 -0
  Fix -ansi -pedantic compilation failure

  sql/spatial.h
    1.16 05/11/02 20:44:03 konstantin@mysql.com +2 -2
    Fix -ansi -pedantic compilation failure

ChangeSet
  1.1944.14.5 05/11/02 18:07:03 monty@mysql.com +2 -0
  Merge monty@192.168.0.9:/my/mysql-5.0
  into  mysql.com:/my/mysql-5.0

ChangeSet
  1.1944.33.2 05/11/02 19:28:49 monty@mysql.com +1 -0
  wait_for_update must unlock mutex.
  (Fixed failure in rpl0000008.test)

  sql/log.cc
    1.181 05/11/02 19:28:46 monty@mysql.com +3 -0
    wait_for_update must unlock mutex.
    (Fixed failure in rpl0000008.test)

ChangeSet
  1.1944.33.1 05/11/02 19:09:29 monty@mysql.com +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/my/mysql-5.0

  sql/table.cc
    1.205 05/11/02 18:06:58 monty@mysql.com +0 -0
    Auto merged

  sql/item_func.cc
    1.259.1.10 05/11/02 18:06:58 monty@mysql.com +0 -0
    Auto merged

  sql/table.cc
    1.203.1.1 05/11/02 19:09:25 monty@mysql.com +0 -1
    Auto merged

  sql/item_func.cc
    1.259.6.1 05/11/02 19:09:25 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1944.30.3 05/11/02 17:34:40 msvensson@neptunus.(none) +2 -0
  BUG#14514
   - Add tests

  mysql-test/t/ndb_basic.test
    1.31 05/11/02 17:34:33 msvensson@neptunus.(none) +9 -0
    Add test case

  mysql-test/r/ndb_basic.result
    1.29 05/11/02 17:34:33 msvensson@neptunus.(none) +4 -0
    Add test result

ChangeSet
  1.1944.1.17 05/11/02 09:30:01 reggie@fedora.(none) +4 -0
  make the IM compile on Windows

  server-tools/instance-manager/priv.h
    1.8 05/11/02 09:28:48 reggie@fedora.(none) +1 -1
    include my_pthread so the thread functions will compile on Windows

  server-tools/instance-manager/priv.cc
    1.8 05/11/02 09:28:48 reggie@fedora.(none) +3 -2
    don't call pthread_attr_setstacksize on Windows

  server-tools/instance-manager/parse_output.cc
    1.18 05/11/02 09:28:47 reggie@fedora.(none) +2 -2
    fix for coding guidelines

  server-tools/instance-manager/instance_options.cc
    1.29 05/11/02 09:28:47 reggie@fedora.(none) +1 -1
    fix for coding guidelines

ChangeSet
  1.1944.31.1 05/11/02 18:58:25 holyfoot@mysql.com +1 -0
  Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
  into mysql.com:/home/hf/work/mysql-5.0.13573

  sql/item_func.cc
    1.264 05/11/02 18:58:18 holyfoot@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1944.30.2 05/11/02 15:53:04 msvensson@neptunus.(none) +3 -0
  BUG#14514 Creating table with packed key fails silently

  sql/handler.cc
    1.201 05/11/02 15:52:49 msvensson@neptunus.(none) +1 -1
    Use HA_OPTION_CREATE_FROM_ENGINE

  sql/ha_ndbcluster.cc
    1.218 05/11/02 15:52:49 msvensson@neptunus.(none) +1 -1
    Use HA_OPTION_CREATE_FROM_ENGINE

  include/my_base.h
    1.72 05/11/02 15:52:49 msvensson@neptunus.(none) +1 -1
    Move HA_CREATE_FROM_ENGINE to HA_OPTION_CREATE_FROM_ENGINE

ChangeSet
  1.1944.15.7 05/11/02 18:46:13 holyfoot@deer.(none) +1 -0
  Additional fix for #13573

  strings/decimal.c
    1.64 05/11/02 18:45:45 holyfoot@mysql.com +4 -0
    here we can run over the buffer - need to check on overflow

ChangeSet
  1.1944.14.4 05/11/02 15:09:36 monty@mysql.com +2 -0
  Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/my/mysql-5.0

ChangeSet
  1.1944.28.3 05/11/02 16:28:58 monty@mysql.com +2 -0
  Portability fix
  (BDB test failed in Intel64)

  mysql-test/t/bdb.test
    1.48 05/11/02 16:28:55 monty@mysql.com +1 -0
    Portability fix

  mysql-test/r/bdb.result
    1.46 05/11/02 16:28:55 monty@mysql.com +1 -1
    Portability fix

ChangeSet
  1.1944.30.1 05/11/02 15:04:16 msvensson@neptunus.(none) +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  mysys/base64.c
    1.11 05/11/02 15:04:11 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1944.28.2 05/11/02 15:45:25 monty@mysql.com +1 -0
  Use --with-openssl instead of --with-yassl for now

  BUILD/SETUP.sh
    1.57 05/11/02 15:45:23 monty@mysql.com +7 -3
    Use --with-openssl instead of --with-yassl for now
    (We need to fix that libmysqlclient_r links with a -PIC compiled yassl library before enabling yassl)

ChangeSet
  1.1944.29.1 05/11/02 14:32:50 msvensson@neptunus.(none) +1 -0
  Portability fix, opnsrv6c

  mysys/base64.c
    1.9.1.1 05/11/02 14:32:42 msvensson@neptunus.(none) +3 -3
    Use unsigned char for d

ChangeSet
  1.1944.14.3 05/11/02 15:17:57 bell@sanja.is.com.ua +2 -0
  found problem removed

  sql/table.cc
    1.204 05/11/02 15:09:30 monty@mysql.com +0 -1
    Auto merged

  sql/table.cc
    1.203 05/11/02 15:17:52 bell@sanja.is.com.ua +1 -1
    fixed returning value for libmysqld

  sql/sql_parse.cc
    1.506.1.7 05/11/02 15:17:52 bell@sanja.is.com.ua +2 -0
    allow query_tables_own_last work correctly

  sql/item_func.cc
    1.259.1.9 05/11/02 15:09:30 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1944.28.1 05/11/02 14:57:18 monty@mysql.com +1 -0
  Build max builds with --yassl instead of openssl

  BUILD/SETUP.sh
    1.56 05/11/02 14:57:15 monty@mysql.com +2 -2
    Build with --yassl instead of openssl

ChangeSet
  1.1944.1.16 05/11/02 06:51:44 reggie@fedora.(none) +2 -0
  more refinement of IM patch to fix Windows pathnames with spaces

  server-tools/instance-manager/parse_output.cc
    1.17 05/11/02 06:49:51 reggie@fedora.(none) +6 -8
    remove space before =
    use my_isspace to determine if *end is white space
    remove comments related to get_word which was removed
    replace tab character with appropriate # of spaces

  server-tools/instance-manager/instance_options.cc
    1.28 05/11/02 06:48:55 reggie@fedora.(none) +2 -1
    move declaration of end to start of function so gcc is happy

ChangeSet
  1.1944.27.2 05/11/02 14:43:25 monty@mysql.com +2 -0
  Fixed wrong merge
  Optimize new pushed code

  sql/sql_update.cc
    1.180 05/11/02 14:43:23 monty@mysql.com +3 -4
    Optimize new pushed code
    (There is no reason to add extra test for not common error case if code can handle it anyway)

  sql/item_func.cc
    1.259.5.3 05/11/02 14:43:23 monty@mysql.com +0 -1
    Fixed wrong merge

ChangeSet
  1.1944.14.2 05/11/02 12:56:19 bell@sanja.is.com.ua +3 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner-5.0

  sql/table.cc
    1.202 05/11/02 12:56:15 bell@sanja.is.com.ua +0 -3
    merge

  sql/sql_base.cc
    1.315 05/11/02 12:53:41 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.259.1.8 05/11/02 12:53:41 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1944.15.6 05/11/02 13:01:21 holyfoot@mysql.com +1 -0
  Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
  into mysql.com:/home/hf/work/mysql-5.0.13573

  sql/item_func.cc
    1.263 05/11/02 13:00:49 holyfoot@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1944.26.1 05/11/02 07:05:19 sergefp@mysql.com +3 -0
  BUG#14026: When doing the end-of-prepare fix up for TABLE_LISTs used in the PS, do the fixup
  for underlying tables of a merge VIEWs, too.

  sql/sql_lex.cc
    1.173 05/11/02 07:05:06 sergefp@mysql.com +30 -10
    BUG#14026: When doing the end-of-prepare fix up for TABLE_LISTs used in the PS, do the fixup
    for underlying tables of a merge VIEWs, too.

  mysql-test/t/view.test
    1.117.1.1 05/11/02 07:05:06 sergefp@mysql.com +23 -1
    Testcase for BUG#14026

  mysql-test/r/view.result
    1.126.1.1 05/11/02 07:05:06 sergefp@mysql.com +22 -1
    Testcase for BUG#14026

ChangeSet
  1.1944.20.6 05/11/01 12:15:08 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-clean
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  scripts/mysqld_safe.sh
    1.80 05/11/01 12:15:05 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1944.24.2 05/11/01 21:59:24 monty@mysql.com +1 -0
  Added missing DBUG_ENTER (bug in last push)

  sql/table.cc
    1.200.1.3 05/11/01 21:59:21 monty@mysql.com +1 -1
    Added missing DBUG_ENTER (bug in last push)

ChangeSet
  1.1944.24.1 05/11/01 21:57:24 monty@mysql.com +2 -0
  Add missing return
  Compile max with --yassl instead of --with-openssl

  BUILD/SETUP.sh
    1.55 05/11/01 21:57:21 monty@mysql.com +2 -2
    Compile max with --yassl instead of --with-openssl

ChangeSet
  1.1944.23.1 05/11/01 20:49:02 joerg@mysql.com +1 -0
  config/ac-macros/zlib.m4
  Accept any shared library for "libz", not just the static one. Bug#6584
  Repetition of the corresponding change, as the 4.1 "acinclude.m4" is not used in 5.0.

  config/ac-macros/zlib.m4
    1.4 05/11/01 20:48:57 joerg@mysql.com +3 -2
    Accept any shared library for "libz", not just the static one. Bug#6584
    Repetition of the corresponding change, as the 4.1 "acinclude.m4" is not used in 5.0.

ChangeSet
  1.1932.362.2 05/11/01 19:37:59 andrey@lmy004. +2 -0
  fix for bug #14381
  (BDB keylength limitted to 255)

  sql/ha_berkeley.h
    1.76 05/11/01 19:37:49 andrey@lmy004. +2 -2
    use the maximal possible length of 2^32 - 1

  mysql-test/r/bdb.result
    1.45 05/11/01 19:37:49 andrey@lmy004. +26 -30
    fix bdb test after fixing the maximal length of BDB keys to 2^32-1

  sql/table.cc
    1.200.1.2 05/11/01 20:36:43 monty@mysql.com +1 -1
    Add missing return

ChangeSet
  1.1944.22.2 05/11/01 20:53:27 evgen@moonbone.local +1 -0
  sql_update.cc:
    After merge fix

  sql/sql_update.cc
    1.179 05/11/01 20:52:54 evgen@moonbone.local +1 -2
    After merge fix

ChangeSet
  1.1944.22.1 05/11/01 19:47:53 evgen@moonbone.local +13 -0
  Manually merged

  sql/sql_update.cc
    1.178 05/11/01 19:47:51 evgen@moonbone.local +1 -0
    Manually merged

  sql/sql_select.cc
    1.371 05/11/01 19:47:51 evgen@moonbone.local +0 -0
    Manually merged

  sql/item_timefunc.cc
    1.98 05/11/01 19:47:51 evgen@moonbone.local +0 -2
    Manually merged

  sql/item_func.cc
    1.259.5.2 05/11/01 19:47:51 evgen@moonbone.local +1 -0
    Manually merged

  mysql-test/r/func_sapdb.result
    1.15 05/11/01 19:47:51 evgen@moonbone.local +0 -2
    Manually merged

  BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003
    1.138 05/11/01 19:40:49 evgen@moonbone.local +0 -0
    Auto merged

  sql/sql_select.h
    1.100.1.2 05/11/01 19:40:49 evgen@moonbone.local +0 -0
    Auto merged

  sql/spatial.cc
    1.24 05/11/01 19:40:49 evgen@moonbone.local +0 -0
    Auto merged

  sql/item_timefunc.h
    1.62 05/11/01 19:40:49 evgen@moonbone.local +0 -1
    Auto merged

  mysql-test/t/update.test
    1.26 05/11/01 19:40:49 evgen@moonbone.local +0 -0
    Auto merged

  mysql-test/r/update.result
    1.28 05/11/01 19:40:49 evgen@moonbone.local +0 -0
    Auto merged

  myisam/mi_check.c
    1.140 05/11/01 19:40:49 evgen@moonbone.local +0 -0
    Auto merged

  client/mysqltest.c
    1.176 05/11/01 19:40:49 evgen@moonbone.local +0 -0
    Auto merged

  BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003
    1.123.15.2 05/11/01 19:40:49 evgen@moonbone.local +0 -0
    Merge rename: acinclude.m4 -> BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003

ChangeSet
  1.1944.20.1 05/11/01 17:39:09 lenz@mysql.com +1 -0
  Merge bk-internal:/home/bk/mysql-5.0
  into mysql.com:/data0/mysqldev/lenz/mysql-5.0

  configure.in
    1.360 05/11/01 17:39:06 lenz@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1944.16.6 05/11/01 20:37:27 hf@deer.(none) +3 -0
  Conflicts resolving

  mysql-test/t/type_newdecimal.test
    1.31 05/11/01 20:37:23 hf@deer.(none) +5 -6
    resolving

  mysql-test/r/type_newdecimal.result
    1.35 05/11/01 20:37:23 hf@deer.(none) +2 -2
    resolving

  sql/item_func.cc
    1.262 05/11/01 20:32:36 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.2392.2 05/11/01 17:34:19 evgen@moonbone.local +2 -0
  Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
  into moonbone.local:/work/14186-bug-4.1-mysql

  sql/sql_select.h
    1.60.1.18 05/11/01 17:34:18 evgen@moonbone.local +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.1.227 05/11/01 17:34:18 evgen@moonbone.local +0 -0
    Auto merged

ChangeSet
  1.1944.19.1 05/11/01 16:30:55 jani@ua141d10.elisa.omakaista.fi +1 -0
  Changed MTR_BUILD_THREAD port reserving policy.

ChangeSet
  1.1944.18.1 05/11/01 17:27:10 evgen@moonbone.local +3 -0
  Fix bug #14466 lost sort order in GROUP_CONCAT() in a view
  
  Item_func_group_concat::print() wasn't printing sort order thus creating wrong
  view. This results in reported error.

  mysql-test/t/view.test
    1.118 05/11/01 17:24:55 evgen@moonbone.local +11 -1
    Test case for bug #14466 lost sort order in GROUP_CONCAT() in a view

  mysql-test/r/view.result
    1.127 05/11/01 17:24:32 evgen@moonbone.local +12 -0
    Test case for bug #14466 lost sort order in GROUP_CONCAT() in a view

  sql/item_sum.cc
    1.167 05/11/01 17:21:43 evgen@moonbone.local +4 -0
    Fix bug #14466 lost sort order in GROUP_CONCAT() in a view
    Now Item_func_group_concat::print() prints sort order.

  mysql-test/mysql-test-run.sh
    1.281 05/11/01 16:20:58 jani@ua141d10.elisa.omakaista.fi +3 -3
    Changed MTR_BUILD_THREAD port reserving policy.

ChangeSet
  1.1944.16.5 05/11/01 15:54:30 monty@mysql.com +14 -0
  Reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort
  Fix for bug #14536: SELECT @a,@a:=... fails with prepared statements

  sql/table.cc
    1.200.1.1 05/11/01 15:54:16 monty@mysql.com +3 -6
    Simple optimization of new code

  sql/sql_view.h
    1.10 05/11/01 15:54:16 monty@mysql.com +1 -1
    Remove usage of current_thd() in mysql_make_view()

  sql/sql_view.cc
    1.74 05/11/01 15:54:16 monty@mysql.com +20 -22
    Remove usage of current_thd() in mysql_make_view()
    Simple optimization of new code

  sql/sql_select.cc
    1.370 05/11/01 15:54:16 monty@mysql.com +8 -3
    Fix for bug #14536: SELECT @a,@a:=... fails with prepared statements

  sql/sql_lex.h
    1.206 05/11/01 15:54:16 monty@mysql.com +2 -2
    Remove usage of current_thd() in mysql_make_view()

  sql/sql_base.cc
    1.313.1.1 05/11/01 15:54:16 monty@mysql.com +10 -9
    Remove usage of current_thd() in mysql_make_view()

  sql/item_timefunc.h
    1.61 05/11/01 15:54:16 monty@mysql.com +1 -0
    timediff() can return NULL for not NULL arguments

  sql/item_func.cc
    1.259.5.1 05/11/01 15:54:16 monty@mysql.com +0 -1
    Reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort)

  sql/item.cc
    1.196 05/11/01 15:54:16 monty@mysql.com +7 -5
    Simple optimization during review of new code

  mysql-test/t/user_var.test
    1.32 05/11/01 15:54:16 monty@mysql.com +4 -0
    More test with SELECT @a:=

  mysql-test/t/disabled.def
    1.11 05/11/01 15:54:16 monty@mysql.com +0 -1
    Enable user_var.test for

  mysql-test/r/user_var.result
    1.37 05/11/01 15:54:16 monty@mysql.com +11 -0
    More test with SELECT @a:=

  mysql-test/r/type_newdecimal.result
    1.34 05/11/01 15:54:16 monty@mysql.com +1 -1
    Correct tests after reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort)

  mysql-test/r/func_sapdb.result
    1.14 05/11/01 15:54:15 monty@mysql.com +2 -2
    Correct tests after reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort)

ChangeSet
  1.1944.16.4 05/11/01 16:14:26 hf@deer.(none) +3 -0
  Additional fix for bug #14445 (analyse.test fails)

  sql/sql_analyse.cc
    1.65 05/11/01 16:14:13 hf@deer.(none) +14 -3
    rounding added

  mysql-test/t/disabled.def
    1.10 05/11/01 16:14:13 hf@deer.(none) +1 -0
    user_var disabled

  mysql-test/r/analyse.result
    1.25 05/11/01 16:14:13 hf@deer.(none) +3 -3
    test result fixed

ChangeSet
  1.1616.2392.1 05/11/01 13:00:02 monty@mysql.com +6 -0
  Review of new pushed code
  Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
  Mark that add_time(), time_diff() and str_to_date() can return null values

  sql/spatial.cc
    1.19.1.4 05/11/01 12:59:53 monty@mysql.com +22 -17
    Simple cleanups during review of new code

  sql/item_timefunc.h
    1.42.1.12 05/11/01 12:59:53 monty@mysql.com +1 -0
    Mark that time_diff can return 0

  sql/item_timefunc.cc
    1.51.1.42 05/11/01 12:59:53 monty@mysql.com +3 -1
    Mark that add_time and str_to_date() can return null values

  sql/item_func.cc
    1.124.42.6 05/11/01 12:59:53 monty@mysql.com +0 -1
    Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)

  mysql-test/r/func_sapdb.result
    1.2.1.7 05/11/01 12:59:53 monty@mysql.com +2 -2
    Fixed test after marking that timediff() can return NULL

  myisam/mi_check.c
    1.105.1.51 05/11/01 12:59:53 monty@mysql.com +1 -1
    keyoffset is not a position (no %lx here)

ChangeSet
  1.1616.2144.108 05/11/01 13:18:46 hf@deer.(none) +4 -0
  Fix for bug #14183 (ctype_cp983.test fails with the embedded server)

  mysql-test/t/ctype_cp932_binlog.test
    1.1 05/11/01 13:17:52 hf@deer.(none) +35 -0

  mysql-test/t/ctype_cp932_binlog.test
    1.0 05/11/01 13:17:52 hf@deer.(none) +0 -0
    BitKeeper file /home/hf/work/mysql-4.1.14183/mysql-test/t/ctype_cp932_binlog.test

  mysql-test/r/ctype_cp932_binlog.result
    1.1 05/11/01 13:17:51 hf@deer.(none) +19 -0

  mysql-test/t/ctype_cp932.test
    1.1.6.1 05/11/01 13:17:51 hf@deer.(none) +0 -23
    these lines don't work in embedded-server

  mysql-test/r/ctype_cp932_binlog.result
    1.0 05/11/01 13:17:51 hf@deer.(none) +0 -0
    BitKeeper file /home/hf/work/mysql-4.1.14183/mysql-test/r/ctype_cp932_binlog.result

  mysql-test/r/ctype_cp932.result
    1.1.5.1 05/11/01 13:17:51 hf@deer.(none) +0 -16
    result fixed

ChangeSet
  1.1944.16.3 05/11/01 13:08:14 hf@deer.(none) +2 -0
  Fix for bug #14445 (analyse.test fails)

  sql/sql_analyse.cc
    1.64 05/11/01 13:08:06 hf@deer.(none) +11 -5
    missing sqrt(std_sqr) added

  mysql-test/r/analyse.result
    1.24 05/11/01 13:08:06 hf@deer.(none) +3 -3
    test result fixed

ChangeSet
  1.1944.16.2 05/11/01 11:43:34 hf@deer.(none) +1 -0
  gis.test fixed

  mysql-test/r/gis.result
    1.29 05/11/01 11:43:25 hf@deer.(none) +6 -6
    test result fixed

ChangeSet
  1.1932.356.2 05/11/01 08:36:49 sergefp@mysql.com +2 -0
  BUG#13126: Post-review fixes: better comments, some function renaming.

  sql/sql_select.cc
    1.364.1.21 05/11/01 08:36:40 sergefp@mysql.com +105 -58
    BUG#13126: Post-review fixes: better comments, some function renaming.

  sql/mysql_priv.h
    1.360.1.2 05/11/01 08:36:39 sergefp@mysql.com +3 -2
    BUG#13126: Post-review fixes: better comments

ChangeSet
  1.1944.15.2 05/10/31 17:26:45 patg@krsna.patg.net +2 -0
  BUG# 14532
  
  Post-review fixes

  mysql-test/t/federated.test
    1.19 05/10/31 17:26:36 patg@krsna.patg.net +2 -1
    BUG# 14532 
    
    Added comments to test

  mysql-test/r/federated.result
    1.22 05/10/31 17:26:35 patg@krsna.patg.net +0 -26
    BUG# 14532
    
    Regenerated test results

ChangeSet
  1.1944.16.1 05/11/01 02:19:06 kent@mysql.com +1 -0
  mysql-test-run.pl:
    Make IM ports change with MTR_BUILD_THREAD

  mysql-test/mysql-test-run.pl
    1.56 05/11/01 02:18:42 kent@mysql.com +5 -0
    Make IM ports change with MTR_BUILD_THREAD

ChangeSet
  1.1944.15.1 05/10/31 17:17:16 patg@krsna.patg.net +3 -0
  BUG #14532
  
  Added FIELD_TYPE_BIT to field method 'needs_quotes' to make BIT columns
  work.

  sql/field.cc
    1.288 05/10/31 17:06:56 patg@krsna.patg.net +1 -0
    BUG #14532
    
    Just needed to quote/escape bit field, add FIELD_TYPE_BIT to switch

  mysql-test/t/federated.test
    1.18 05/10/31 17:06:56 patg@krsna.patg.net +34 -0
    BUG# 14532
    
    Test fix by creating table with bit column and inserting,selecting

  mysql-test/r/federated.result
    1.21 05/10/31 17:06:56 patg@krsna.patg.net +53 -0
    BUG# 14532
    
    Test fix by creating table with bit column and inserting,selecting

ChangeSet
  1.1944.14.1 05/10/31 22:14:27 bell@sanja.is.com.ua +5 -0
  postreview fixes

  sql/table.cc
    1.201 05/10/31 22:11:29 bell@sanja.is.com.ua +2 -4
    some optimisation

  sql/sql_parse.cc
    1.506.1.6 05/10/31 22:11:29 bell@sanja.is.com.ua +1 -1
    some optimisation

  sql/sql_base.cc
    1.314 05/10/31 22:11:29 bell@sanja.is.com.ua +2 -4
    some optimisation

  sql/sql_acl.cc
    1.179 05/10/31 22:11:29 bell@sanja.is.com.ua +1 -1
    some optimisation

  sql/item_func.cc
    1.259.1.7 05/10/31 22:11:29 bell@sanja.is.com.ua +2 -4
    some optimisation

ChangeSet
  1.1616.2391.1 05/10/31 11:15:44 jimw@mysql.com +1 -0
  Handle decision to use mysqld-max over mysqld within mysqld_safe
  even when --ledir option is specified. (Bug #13774)

  scripts/mysqld_safe.sh
    1.72.1.4 05/10/31 11:15:40 jimw@mysql.com +11 -8
    Figure out whether to use mysqld or mysqld-max after we have handled
    the command-line options and .cnf files.

ChangeSet
  1.1944.13.1 05/10/31 19:57:57 lars@mysql.com +1 -0
  Fixed failure of NDB config retrieval.
  1. Made sure that base64 string is terminated with NUL.
  2. Made calculation of needed size for base64 string exact.
  Added checks in test for the above two fixes.

  mysys/base64.c
    1.10 05/10/31 19:57:21 lars@mysql.com +14 -4
    Made sure that base64 string is terminated with NUL.
    Made calculation of needed size for base64 string exact.
    Added checks in test for the above two fixes.

ChangeSet
  1.1944.1.15 05/10/27 11:17:38 reggie@fedora.(none) +2 -0
  improved previous changeset per JimW's review

ChangeSet
  1.1944.1.14 05/10/27 08:47:58 reggie@fedora.(none) +2 -0
  fix some issues with IM and long pathnames (with spaces)

ChangeSet
  1.1944.1.13 05/10/31 19:31:05 pem@mysql.com +1 -0
  Fixed bugs in client/mysqltest.c which made lots of "connect" commands in tests fail.

  client/mysqltest.c
    1.175 05/10/31 19:30:52 pem@mysql.com +3 -2
    Fixed crash bug in debug mode and make sure q->last_argument is set right
    so that check_eol_junk() will work again.

ChangeSet
  1.1616.2390.1 05/10/31 18:35:26 joerg@mysql.com +1 -0
  Accept any shared library for "libz", not just the static one. Bug#6584

  acinclude.m4
    1.123.15.1 05/10/31 18:35:19 joerg@mysql.com +3 -2
    Accept any shared library for "libz", not just the static one. Bug#6584

ChangeSet
  1.1944.1.12 05/10/31 17:51:48 pem@mysql.com +1 -0
  Removed C++-isms from client/mysqltest.c

  client/mysqltest.c
    1.174 05/10/31 17:51:34 pem@mysql.com +1 -2
    Removed C++-isms from C file.

ChangeSet
  1.1932.362.1 05/10/31 14:13:51 andrey@lmy004. +1 -0
  fix for bug #14381 (Key length is limited to 255 bytes on BDB)

  sql/ha_berkeley.h
    1.75 05/10/31 13:52:37 andrey@lmy004. +3 -0
    BDB supports keylength of maximal 2^32 - use the maximum allowed by mysqld.
    (http://www.sleepycat.com/docs/ref/am_misc/dbsizes.html)

ChangeSet
  1.1616.2144.106 05/10/31 16:28:45 ramil@mysql.com +1 -0
  Check for NULLs only if we don't replace column results,
  get real results after all checks.
  (see bug #14254: func_crypt.test fails on FreeBSD with --ps-protocol).

  client/mysqltest.c
    1.92.1.97 05/10/31 16:23:52 ramil@mysql.com +9 -4
    Check for NULLs only if we don't replace column results,
    get real results after all checks.

ChangeSet
  1.1944.1.11 05/10/31 12:20:54 jani@ua141d10.elisa.omakaista.fi +1 -0
  Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp

  mysql-test/mysql-test-run.pl
    1.55 05/10/31 12:20:46 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

ChangeSet
  1.1944.9.7 05/10/31 11:54:36 jani@ua141d10.elisa.omakaista.fi +14 -0
  Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
  into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp

  mysql-test/t/gis.test
    1.25 05/10/31 11:54:31 jani@ua141d10.elisa.omakaista.fi +0 -0
    Merged from 4.1.

  mysql-test/r/mysqldump.result
    1.79 05/10/31 11:54:31 jani@ua141d10.elisa.omakaista.fi +10 -10
    Merged from 4.1.

  mysql-test/mysql-test-run.sh
    1.280 05/10/31 11:54:31 jani@ua141d10.elisa.omakaista.fi +3 -4
    Merged from 4.1.

  support-files/my-large.cnf.sh
    1.23 05/10/31 11:42:29 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  support-files/my-innodb-heavy-4G.cnf.sh
    1.9 05/10/31 11:42:29 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  support-files/my-huge.cnf.sh
    1.24 05/10/31 11:42:28 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  sql/spatial.h
    1.15 05/10/31 11:42:28 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  sql/spatial.cc
    1.23 05/10/31 11:42:28 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  sql/item_geofunc.cc
    1.26 05/10/31 11:42:28 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  sql/field.cc
    1.287 05/10/31 11:42:28 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  mysql-test/t/mysqldump.test
    1.72 05/10/31 11:42:28 jani@ua141d10.elisa.omakaista.fi +12 -12
    Auto merged

  mysql-test/r/gis.result
    1.28 05/10/31 11:42:28 jani@ua141d10.elisa.omakaista.fi +6 -6
    Auto merged

  mysql-test/mysql-test-run.pl
    1.51.1.6 05/10/31 11:42:28 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  client/mysqlimport.c
    1.54 05/10/31 11:42:28 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

ChangeSet
  1.1616.2144.105 05/10/31 12:24:43 hf@deer.(none) +1 -0
  Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
  into deer.(none):/home/hf/work/mysql-4.1.12839

  sql/field.cc
    1.197.1.30 05/10/31 12:24:36 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.2301.2 05/10/31 12:05:27 hf@deer.(none) +2 -0
  Additional fix for #12839

  sql/spatial.cc
    1.19.1.3 05/10/31 12:00:57 hf@deer.(none) +9 -9
    small syntax fixes

  sql/field.cc
    1.197.1.29 05/10/31 12:00:57 hf@deer.(none) +1 -2
    This code still could work for VERY out-of-dated databases

ChangeSet
  1.1944.9.5 05/10/31 09:22:33 sergefp@mysql.com +4 -0
  BUG#14139 - Merge to 5.0

  sql/item.h
    1.178 05/10/31 09:18:22 sergefp@mysql.com +1 -0
    BUG#14139 - Merge to 5.0

  sql/field.h
    1.169 05/10/31 09:18:22 sergefp@mysql.com +4 -1
    BUG#14139 - Merge to 5.0

  mysql-test/t/create.test
    1.65 05/10/31 09:18:22 sergefp@mysql.com +1 -0
    BUG#14139 - Merge to 5.0

  mysql-test/r/create.result
    1.103 05/10/31 09:18:22 sergefp@mysql.com +3 -1
    BUG#14139 - Merge to 5.0

ChangeSet
  1.1944.11.4 05/10/29 13:11:34 konstantin@mysql.com +2 -0
  Minor comments.

  sql/table.h
    1.117.1.3 05/10/29 13:11:25 konstantin@mysql.com +4 -4
    Minor fix of a comment.

  sql/sql_lex.h
    1.205 05/10/29 13:11:25 konstantin@mysql.com +1 -1
    Minor fix of a comment.

ChangeSet
  1.1944.9.4 05/10/29 02:36:57 sergefp@mysql.com +7 -0
  4.1->5.0 merge

  sql/sql_table.cc
    1.278 05/10/29 02:36:53 sergefp@mysql.com +0 -0
    Auto Merged

  sql/field.h
    1.168 05/10/29 02:36:53 sergefp@mysql.com +1 -4
    Manual Merge

  sql/field.cc
    1.286 05/10/29 02:36:53 sergefp@mysql.com +0 -0
    Auto Merged

  mysql-test/t/create.test
    1.64 05/10/29 02:36:53 sergefp@mysql.com +0 -0
    Auto Merged

  mysql-test/r/create.result
    1.102 05/10/29 02:36:53 sergefp@mysql.com +0 -0
    Auto Merged

  innobase/row/row0ins.c
    1.73 05/10/29 02:36:53 sergefp@mysql.com +11 -38
    BUG#10511: Per alexi's instructions, the changes in innobase/row/row0ins.c are not 
    propagated to 5.x

  include/config-netware.h
    1.12 05/10/29 02:36:53 sergefp@mysql.com +0 -0
    Merged

ChangeSet
  1.1944.11.2 05/10/29 02:07:57 evgen@moonbone.local +1 -0
  sql_select.cc:
    After merge fix

  sql/sql_select.cc
    1.369 05/10/29 02:07:36 evgen@moonbone.local +2 -1
    After merge fix

ChangeSet
  1.1944.12.1 05/10/28 14:26:22 paul@frost.snake.net +1 -0
  Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  frost.snake.net:/Users/paul/bk/mysql-5.0

  client/mysqldump.c
    1.212 05/10/28 14:26:10 paul@frost.snake.net +0 -0
    Auto merged

ChangeSet
  1.1944.11.1 05/10/28 23:17:51 evgen@moonbone.local +4 -0
  Manually merged

  sql/sql_select.cc
    1.368 05/10/28 23:17:48 evgen@moonbone.local +4 -8
    Manually merged

  mysql-test/r/analyse.result
    1.23 05/10/28 23:17:48 evgen@moonbone.local +13 -13
    Manually merged

  sql/sql_select.h
    1.100.1.1 05/10/28 23:13:57 evgen@moonbone.local +0 -0
    Auto merged

  mysql-test/t/analyse.test
    1.17 05/10/28 23:13:57 evgen@moonbone.local +0 -0
    Auto merged

ChangeSet
  1.1944.10.1 05/10/28 22:31:41 sergefp@mysql.com +2 -0
  Merge

  mysql-test/t/disabled.def
    1.9 05/10/28 22:31:40 sergefp@mysql.com +0 -0
    SCCS merged

  sql/sql_update.cc
    1.177 05/10/28 22:31:07 sergefp@mysql.com +0 -1
    Auto merged

ChangeSet
  1.1944.9.1 05/10/28 10:17:37 jimw@mysql.com +1 -0
  Merge bk-internal:/home/bk/mysql-5.0
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  sql/item_func.cc
    1.259.1.6 05/10/28 10:17:33 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1944.4.4 05/10/28 10:16:44 jimw@mysql.com +1 -0
  Update test with changed result after merge

  mysql-test/r/type_newdecimal.result
    1.33 05/10/28 10:16:37 jimw@mysql.com +1 -1
    Update result

ChangeSet
  1.1944.1.9 05/10/28 19:10:05 msvensson@neptunus.(none) +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  sql/sql_prepare.cc
    1.162 05/10/28 19:09:59 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1944.6.6 05/10/28 17:12:30 msvensson@neptunus.(none) +1 -0
  Update after merge, include libtaoint-integer.o into libtaocrypt.a

  extra/yassl/taocrypt/src/Makefile.am
    1.9 05/10/28 17:11:21 msvensson@neptunus.(none) +7 -4
    Build libtaoint first and then link the .o file from that into libtaocrypt.a

ChangeSet
  1.1944.8.3 05/10/28 16:50:52 lenz@mysql.com +1 -0
  - after merge fix: removed pack_isam from the RPM spec file list again

  support-files/mysql.spec.sh
    1.125 05/10/28 16:50:20 lenz@mysql.com +0 -2
    - after merge fix: removed pack_isam from the file list again

ChangeSet
  1.1616.2388.1 05/10/28 17:16:22 aivanov@mysql.com +1 -0
  Fix BUG#10511: Wrong padding of UCS2 CHAR columns in
   ON UPDATE CASCADE

  innobase/row/row0ins.c
    1.49.1.6 05/10/28 17:15:52 aivanov@mysql.com +38 -8
    Patch from Marko is applied

ChangeSet
  1.1944.1.8 05/10/28 14:55:01 pem@mysql.com +3 -0
  Merge mysql.com:/usr/local/bk/mysql-5.0
  into  mysql.com:/usr/home/pem/bug14256/mysql-5.0

  mysql-test/t/view_grant.test
    1.6 05/10/28 14:54:56 pem@mysql.com +45 -45
    Merge fix.

  mysql-test/r/view_grant.result
    1.6 05/10/28 14:54:56 pem@mysql.com +0 -0
    Merge fix.

  mysql-test/r/view.result
    1.126 05/10/28 14:50:29 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1944.6.5 05/10/28 14:03:24 msvensson@neptunus.(none) +2 -0
  Use replace_result to mask portnumber printed from failing connect 

  mysql-test/t/connect.test
    1.18 05/10/28 14:02:59 msvensson@neptunus.(none) +10 -10
    Fix test to work also when no running on standard ports.

  mysql-test/r/connect.result
    1.19 05/10/28 14:02:59 msvensson@neptunus.(none) +10 -10
    Update test result

ChangeSet
  1.1944.1.7 05/10/28 14:56:55 bell@sanja.is.com.ua +1 -0
  disabling archive_gis

  mysql-test/t/disabled.def
    1.7.1.1 05/10/28 14:56:50 bell@sanja.is.com.ua +1 -0
    disabling archive_gis

ChangeSet
  1.1944.8.2 05/10/28 13:31:19 lenz@mysql.com +1 -0
   - added man page for the mysqlmanager in the RPM spec file list

  support-files/mysql.spec.sh
    1.124 05/10/28 13:30:51 lenz@mysql.com +1 -0
     - added man page for mysqlmanager

ChangeSet
  1.1616.2387.1 05/10/28 15:24:46 evgen@moonbone.local +4 -0
  Fix bug #14138 ROLLUP and PROCEDURE ANALYSE() hang server 
  
  Procedure analyse() redefines select's fields_list. setup_copy_fields() assumes
  that fields_list is a part of all_fields_list. Because select have only 
  3 columns and analyse() redefines it to have 10 columns, int overrun in
  setup_copy_fields() occurs and server goes to almost infinite loop.
  
  Because fields_list used not only to send data ad fields types, it's wrong 
  to allow procedure redefine it. This patch separates select's fileds_list 
  and procedure's one. Now if procedure is present, copy of fields_list is 
  created in procedure_fields_list and it is used for sending data and fields.

  sql/sql_select.cc
    1.216.1.226 05/10/28 15:24:03 evgen@moonbone.local +14 -11
    Fix bug #14138  ROLLUP and PROCEDURE ANALYSE() hang server
    SELECT's fields_list and procedure's fields_list made split. If procedure is defined
    then procedure's fields_list is used to send fields and data.

  sql/sql_select.h
    1.60.4.1 05/10/28 15:23:34 evgen@moonbone.local +1 -0
    Fix bug #14138  ROLLUP and PROCEDURE ANALYSE() hang server
    To JOIN  Added separate fields_list for procedure.

  mysql-test/r/analyse.result
    1.14.1.4 05/10/28 15:23:21 evgen@moonbone.local +26 -0
    Test case for bug #14138  ROLLUP and PROCEDURE ANALYSE() hang server

  mysql-test/t/analyse.test
    1.12.1.3 05/10/28 15:21:32 evgen@moonbone.local +25 -0
    Test case for bug #14138  ROLLUP and PROCEDURE ANALYSE() hang server

ChangeSet
  1.1616.2144.99 05/10/28 14:04:06 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
  Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
  into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

  include/config-netware.h
    1.2.1.8 05/10/28 14:03:59 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

ChangeSet
  1.1346.861.1 05/10/28 14:01:00 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
  NetWare specific change to use a LibC API instead of a
  kernel function to prevent CPU hogs.

  include/config-netware.h
    1.2.2.3 05/10/28 14:00:56 jani@a193-229-222-105.elisa-laajakaista.fi +1 -4
    NetWare specific change to use a LibC API instead of a
    kernel function to prevent CPU hogs.

ChangeSet
  1.1944.7.2 05/10/28 14:48:39 petr@mysql.com +1 -0
  Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin

  server-tools/instance-manager/listener.cc
    1.24 05/10/28 14:48:27 petr@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1943.1.1 05/10/28 14:29:46 petr@mysql.com +4 -0
  fix Bug #14103 IM tests fail on SCO

  server-tools/instance-manager/priv.h
    1.7 05/10/28 14:29:37 petr@mysql.com +4 -0
    declare new function

  server-tools/instance-manager/priv.cc
    1.7 05/10/28 14:29:37 petr@mysql.com +35 -0
    Add a new function, which is a wrapper around pthread_create to increase the stack size

  server-tools/instance-manager/manager.cc
    1.30 05/10/28 14:29:37 petr@mysql.com +6 -6
    change stack size of listener and guardian threads

  server-tools/instance-manager/listener.cc
    1.22.1.1 05/10/28 14:29:36 petr@mysql.com +4 -3
    every new connection should have sufficient thread stack to
    handle all IM commands

ChangeSet
  1.1942.2.1 05/10/28 12:11:32 pem@mysql.com +5 -0
  Fixed BUG#14256: definer in view definition is not fully qualified
    Changed the parser test for wildcards in hostname to checking for empty
    strings instead (analogous with the test in default_view_definer()),
    since wildcards do appear in the definer's host-part sometimes.

  sql/sql_yacc.yy
    1.438 05/10/28 12:11:24 pem@mysql.com +1 -2
    Changed test for wildcards in hostpart of explicit view definer to test for empty
    host part instead. (Analogous with sql_parse.cc:default_view_definer().)

  mysql-test/t/view_grant.test
    1.4.1.1 05/10/28 12:11:24 pem@mysql.com +45 -0
    Added test for BUG#14256.

  mysql-test/t/view.test
    1.117 05/10/28 12:11:24 pem@mysql.com +1 -1
    Changed test for explicit definer; wildcards in host are ok, empty host-part is not.

  mysql-test/r/view_grant.result
    1.4.1.1 05/10/28 12:11:24 pem@mysql.com +27 -0
    Added test for BUG#14256.

  mysql-test/r/view.result
    1.124.1.1 05/10/28 12:11:24 pem@mysql.com +1 -1
    Updated result.

ChangeSet
  1.1944.6.3 05/10/28 11:45:30 msvensson@neptunus.(none) +5 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  extra/yassl/taocrypt/src/Makefile.am
    1.8 05/10/28 11:45:19 msvensson@neptunus.(none) +4 -4
    Manual merge

  sql/Makefile.am
    1.112 05/10/28 11:41:27 msvensson@neptunus.(none) +0 -0
    Auto merged

  libmysqld/Makefile.am
    1.64 05/10/28 11:41:27 msvensson@neptunus.(none) +0 -0
    Auto merged

  configure.in
    1.358.1.1 05/10/28 11:41:27 msvensson@neptunus.(none) +0 -0
    Auto merged

  config/ac-macros/yassl.m4
    1.8 05/10/28 11:41:27 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1944.8.1 05/10/28 11:10:29 lenz@mysql.com +7 -0
  - after merge fixes

  support-files/mysql.spec.sh
    1.123 05/10/28 11:10:24 lenz@mysql.com +6 -5
    - after merge fix

  man/Makefile.am
    1.11 05/10/28 11:10:24 lenz@mysql.com +0 -0
    - after merge fix

ChangeSet
  1.1944.7.1 05/10/28 13:02:26 petr@mysql.com +1 -0
  fix a typo

  server-tools/instance-manager/listener.cc
    1.23 05/10/28 13:02:16 petr@mysql.com +1 -1
    fix a typo

ChangeSet
  1.1944.6.1 05/10/28 11:00:54 msvensson@neptunus.(none) +8 -0
  Merge neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  sql/structs.h
    1.53 05/10/28 11:00:48 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/sql_show.cc
    1.292 05/10/28 11:00:48 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/mysqld.cc
    1.514 05/10/28 11:00:48 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/sp-security.test
    1.25 05/10/28 11:00:48 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/myisam.test
    1.51 05/10/28 11:00:48 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/information_schema.test
    1.61 05/10/28 11:00:48 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.54 05/10/28 11:00:48 msvensson@neptunus.(none) +0 -0
    Auto merged

  client/mysqltest.c
    1.173 05/10/28 11:00:48 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1932.277.4 05/10/28 10:58:57 msvensson@neptunus.(none) +1 -0
  After reiview fix
   - Use msg argument to determine if param is required or not in safe_get_param

  client/mysqltest.c
    1.172 05/10/28 10:58:31 msvensson@neptunus.(none) +22 -12
    Use msg argument as inidicator wheter param is required or not.

  netware/BUILD/compile-netware-END
    1.7 05/10/28 10:48:09 lenz@mysql.com +0 -0
    Auto merged

  netware/BUILD/compile-linux-tools
    1.9 05/10/28 10:48:09 lenz@mysql.com +0 -0
    Auto merged

  configure.in
    1.359 05/10/28 10:48:09 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19
    1.9 05/10/28 10:48:09 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962
    1.10 05/10/28 10:48:09 lenz@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2384.8 05/10/28 10:46:07 lenz@mysql.com +1 -0
   - fixed RPM spec file list after merge, removed dupes

  support-files/mysql.spec.sh
    1.83.1.26 05/10/28 10:45:43 lenz@mysql.com +2 -7
     - fixed file list after merge, removed dupes

ChangeSet
  1.1939.1.10 05/10/28 12:15:46 hf@deer.(none) +1 -0
  Fix for bug #9551 (Show commands fail)

  sql/sql_select.cc
    1.366.1.1 05/10/28 12:14:26 hf@deer.(none) +1 -1
    stop using temp_pool if we have TEST_KEEP_TMP_TABLES on

ChangeSet
  1.1944.1.5 05/10/28 10:12:36 bell@sanja.is.com.ua +2 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0

  sql/sql_update.cc
    1.175.1.2 05/10/28 10:12:30 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.195 05/10/28 10:12:30 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1944.4.3 05/10/27 18:46:00 jimw@mysql.com +3 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-clean
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  sql/item_func.cc
    1.259.4.1 05/10/27 18:45:57 jimw@mysql.com +1 -1
    Resolve conflict

  mysql-test/r/func_math.result
    1.32 05/10/27 18:45:56 jimw@mysql.com +0 -0
    Resolve conflict

  mysql-test/t/func_math.test
    1.24 05/10/27 18:41:13 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1944.5.1 05/10/28 02:17:41 kent@mysql.com +1 -0
  Makefile.am:
    Added "base64.h" to enable "make dist" to work

  include/Makefile.am
    1.53 05/10/28 02:17:23 kent@mysql.com +1 -1
    Added "base64.h" to enable "make dist" to work

ChangeSet
  1.1944.2.2 05/10/28 02:36:19 jani@ua141d10.elisa.omakaista.fi +7 -0
  Merge 4.1 - 5.0

  sql/item_timefunc.h
    1.60 05/10/28 02:35:59 jani@ua141d10.elisa.omakaista.fi +1 -0
    Imported bug fix from 4.1 to 5.0. (Bug#14016)

  sql/item_timefunc.cc
    1.97 05/10/28 02:35:59 jani@ua141d10.elisa.omakaista.fi +24 -9
    Imported bug fix from 4.1 to 5.0. (Bug#14016)

  sql/item.cc
    1.194 05/10/28 02:35:59 jani@ua141d10.elisa.omakaista.fi +2 -1
    Merge from 4.1 to 5.0.

  mysys/my_handler.c
    1.24 05/10/28 02:35:58 jani@ua141d10.elisa.omakaista.fi +2 -2
    Merge from 4.1 to 5.0.

  mysql-test/t/insert_select.test
    1.28 05/10/28 02:35:58 jani@ua141d10.elisa.omakaista.fi +1 -1
    Merge from 4.1 to 5.0.

  mysql-test/r/select.result
    1.109 05/10/28 02:35:58 jani@ua141d10.elisa.omakaista.fi +8 -306
    Merge from 4.1 to 5.0.

  mysql-test/r/insert_select.result
    1.35 05/10/28 02:35:57 jani@ua141d10.elisa.omakaista.fi +11 -1
    Merge from 4.1 to 5.0.

ChangeSet
  1.1944.3.1 05/10/28 12:13:34 tim@siva.hindu.god +1 -0
  BUG#14358: in mysql.cc, don't neglect to strip delimiter off lines < 9 characters long.

  client/mysql.cc
    1.188 05/10/28 12:13:11 tim@siva.hindu.god +5 -4
    BUG#14358: don't neglect to strip delimiter off lines < 9 characters long.

ChangeSet
  1.1944.1.4 05/10/28 00:56:44 bell@sanja.is.com.ua +6 -0
  fixe of typos, comments & layout

  sql/table.h
    1.117.1.2 05/10/28 00:56:38 bell@sanja.is.com.ua +2 -2
    typo fixed

  sql/table.cc
    1.200 05/10/28 00:56:37 bell@sanja.is.com.ua +1 -3
    typo fixed
    layout fixed

  sql/sql_view.cc
    1.73 05/10/28 00:56:37 bell@sanja.is.com.ua +0 -2
    layout fixed

  sql/sql_parse.cc
    1.506.1.5 05/10/28 00:56:37 bell@sanja.is.com.ua +3 -2
    comment fixed

  sql/sql_acl.cc
    1.178 05/10/28 00:56:37 bell@sanja.is.com.ua +8 -2
    comment fixed

  sql/item_func.cc
    1.259.1.5 05/10/28 00:56:37 bell@sanja.is.com.ua +1 -1
    fixed typo

ChangeSet
  1.1944.1.3 05/10/28 00:24:13 bell@sanja.is.com.ua +13 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0

ChangeSet
  1.1616.2386.1 05/10/28 01:24:11 evgen@moonbone.local +5 -0
  Fix bug#14186 select datefield is null not updated
  
  Date field was declared as not null, thus expression 'datefield is null'
  was always false. For SELECT special handling of such cases is used. 
  There 'datefield is null' converted to 'datefield eq "0000-00-00"'.
  
  In mysql_update() before creation of select added remove_eq_conds() call.
  It makes some optimization of conds and in particular performs conversion
  from 'is null' to 'eq'. 
  Also remove_eq_conds() makes some evaluation of conds and if it founds that
  conds is always false then update statement is not processed further.
  All this allows to perform some update statements process faster due to
  optimized conds, and not wasting resources if conds known to be false. 

  sql/sql_view.cc
    1.72 05/10/28 00:24:04 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_prepare.cc
    1.160.1.1 05/10/28 00:24:04 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.506.1.4 05/10/28 00:24:03 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.h
    1.204 05/10/28 00:24:03 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_delete.cc
    1.168 05/10/28 00:24:03 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_cache.cc
    1.86 05/10/28 00:24:03 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_base.cc
    1.313 05/10/28 00:24:03 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_acl.cc
    1.177 05/10/28 00:24:03 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.259.1.4 05/10/28 00:24:03 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.177 05/10/28 00:24:02 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.192.1.1 05/10/28 00:24:02 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/sp.result
    1.168 05/10/28 00:24:02 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/information_schema.result
    1.87 05/10/28 00:24:02 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_update.cc
    1.83.2.64 05/10/28 01:23:05 evgen@moonbone.local +12 -4
    Fix bug#14186  select datefield is null not updated
    To mysql_update() added call to remove_eq_conds() to optimize conds and convert 'datefield is null' to 'datefield eq 0000-00-00'

  mysql-test/t/update.test
    1.19.1.6 05/10/28 01:19:13 evgen@moonbone.local +9 -0
    Test case for  bug#14186  select datefield is null not updated

ChangeSet
  1.1932.361.1 05/10/28 00:18:23 bell@sanja.is.com.ua +24 -0
  support of view underlying tables and SP functions security check added (BUG#9505) (WL#2787)

  sql/table.h
    1.117.1.1 05/10/28 00:18:11 bell@sanja.is.com.ua +43 -5
    storege for reuested privileges added

  sql/table.cc
    1.199 05/10/28 00:18:11 bell@sanja.is.com.ua +201 -32
    renaming and fixing view preparation methods, methods for checking underlyoing tables security context added

  sql/sql_view.cc
    1.70.1.1 05/10/28 00:18:11 bell@sanja.is.com.ua +90 -25
    underlying tables of view security check support added

  sql/sql_update.cc
    1.175.2.1 05/10/28 00:18:11 bell@sanja.is.com.ua +2 -0
    manipulation of requested privileges for underlying tables made the same as for table which we are updating

  sql/sql_prepare.cc
    1.159.3.1 05/10/28 00:18:11 bell@sanja.is.com.ua +2 -0
    registration of requested privileges added

  sql/sql_parse.cc
    1.506.2.1 05/10/28 00:18:11 bell@sanja.is.com.ua +12 -2
    registration of requested privileges added

  sql/sql_lex.h
    1.201.1.1 05/10/28 00:18:11 bell@sanja.is.com.ua +5 -0
    The comment added

  sql/sql_derived.cc
    1.78 05/10/28 00:18:11 bell@sanja.is.com.ua +21 -18
    refult of derived table processing functions changed to bool
    do not give SELECT_ACL for TEMPTABLE views

  sql/sql_delete.cc
    1.166.1.1 05/10/28 00:18:11 bell@sanja.is.com.ua +3 -2
    ancestor -> merge_underlying_list renaming

  sql/sql_cache.cc
    1.83.1.4 05/10/28 00:18:11 bell@sanja.is.com.ua +4 -16
    Code cleunup: we should not register underlying tables of view second time

  sql/sql_base.cc
    1.311.1.1 05/10/28 00:18:11 bell@sanja.is.com.ua +73 -21
    View underlying tables privilege check added

  sql/sql_acl.cc
    1.175.1.1 05/10/28 00:18:11 bell@sanja.is.com.ua +48 -7
    Storing requested privileges of tables added
    View underlying tables privilege check added

  sql/share/errmsg.txt
    1.51 05/10/28 00:18:11 bell@sanja.is.com.ua +1 -2
    error message fixed

  sql/mysql_priv.h
    1.363 05/10/28 00:18:10 bell@sanja.is.com.ua +8 -6
    refult of derived table processing functions changed to bool
    Security_context added as an argument to find_field_in_table()

  sql/item_func.cc
    1.259.3.1 05/10/28 00:18:10 bell@sanja.is.com.ua +31 -5
    a view error hiding for execution of prepared function belonged to a view
    fixed checking privileges if stored functions belonds to some view

  sql/item.h
    1.175.1.1 05/10/28 00:18:10 bell@sanja.is.com.ua +4 -4
    Name the resolution context points to the security  context of view (if item belong to the view)

  sql/item.cc
    1.190.1.1 05/10/28 00:18:10 bell@sanja.is.com.ua +6 -10
    check of underlying tables privilege added

  mysql-test/t/view_grant.test
    1.5 05/10/28 00:18:10 bell@sanja.is.com.ua +213 -0
    test of underlying view tables check

  mysql-test/t/sql_mode.test
    1.16 05/10/28 00:18:10 bell@sanja.is.com.ua +2 -1
    fixed test suite

  mysql-test/r/view_grant.result
    1.5 05/10/28 00:18:10 bell@sanja.is.com.ua +167 -0
    test of underlying view tables check

  mysql-test/r/view.result
    1.125 05/10/28 00:18:10 bell@sanja.is.com.ua +12 -12
    error message changed

  mysql-test/r/sql_mode.result
    1.32 05/10/28 00:18:10 bell@sanja.is.com.ua +2 -1
    fixed test suite

  mysql-test/r/sp.result
    1.165.1.1 05/10/28 00:18:10 bell@sanja.is.com.ua +1 -1
    error message changed

  mysql-test/r/information_schema.result
    1.84.1.1 05/10/28 00:18:10 bell@sanja.is.com.ua +6 -6
    error message changed

  mysql-test/r/update.result
    1.22.1.5 05/10/28 01:17:34 evgen@moonbone.local +8 -0
    Test case for  bug#14186  select datefield is null not updated

  sql/sql_select.h
    1.60.1.17 05/10/28 01:15:33 evgen@moonbone.local +1 -0
     Fix bug#14186  select datefield is null not updated
    Added remove_eq_conds() prototype.

  sql/sql_select.cc
    1.216.119.1 05/10/28 01:14:17 evgen@moonbone.local +1 -3
    Fix bug#14186  select datefield is null not updated
    Remove static from remove_eq_conds()

ChangeSet
  1.1944.2.1 05/10/27 23:43:20 jani@ua141d10.elisa.omakaista.fi +44 -0
  Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
  into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp

  tests/mysql_client_test.c
    1.161 05/10/27 23:43:14 jani@ua141d10.elisa.omakaista.fi +14 -14
    Merged from 4.1

  sql/sql_update.cc
    1.175.1.1 05/10/27 23:43:14 jani@ua141d10.elisa.omakaista.fi +6 -8
    Merged from 4.1

  sql/mysqld.cc
    1.512.1.7 05/10/27 23:43:14 jani@ua141d10.elisa.omakaista.fi +13 -15
    Merged from 4.1

  sql/item.cc
    1.193 05/10/27 23:43:13 jani@ua141d10.elisa.omakaista.fi +7 -6
    Merged from 4.1

  netware/mysql_test_run.c
    1.16 05/10/27 23:43:13 jani@ua141d10.elisa.omakaista.fi +0 -2
    Merged from 4.1

  mysql-test/t/myisam.test
    1.49.1.1 05/10/27 23:43:13 jani@ua141d10.elisa.omakaista.fi +0 -0
    Merged from 4.1

  mysql-test/t/insert_select.test
    1.27 05/10/27 23:43:13 jani@ua141d10.elisa.omakaista.fi +10 -0
    Merged from 4.1

  mysql-test/r/select.result
    1.108 05/10/27 23:43:13 jani@ua141d10.elisa.omakaista.fi +298 -0
    Merged from 4.1

  mysql-test/r/myisam.result
    1.69 05/10/27 23:43:13 jani@ua141d10.elisa.omakaista.fi +0 -0
    Merged from 4.1

  mysql-test/r/insert_select.result
    1.34 05/10/27 23:43:13 jani@ua141d10.elisa.omakaista.fi +0 -0
    Merged from 4.1

  mysql-test/mysql-test-run.pl
    1.51.1.5 05/10/27 23:43:13 jani@ua141d10.elisa.omakaista.fi +0 -1
    Merged from 4.1

  myisam/myisamchk.c
    1.121 05/10/27 23:43:13 jani@ua141d10.elisa.omakaista.fi +0 -1
    Merged from 4.1

  Makefile.am
    1.81 05/10/27 23:43:13 jani@ua141d10.elisa.omakaista.fi +0 -0
    Merged from 4.1

ChangeSet
  1.1932.319.2 05/10/27 21:48:43 msvensson@neptunus.(none) +6 -0
  BUG#12985 Do-mysqlclient-test: Can't find -lyassl when linking
   - Remove yassl_libsfrom CLIENT_LIBS var
   - Add yassl_libs to libmysql and libmysqld

  libmysqld/Makefile.am
    1.61.1.2 05/10/27 21:48:37 msvensson@neptunus.(none) +3 -1
    Add yassl_libss_with_path to libmysqld

  libmysql/Makefile.am
    1.45 05/10/27 21:48:37 msvensson@neptunus.(none) +1 -1
    Add yassl_libs to libmysql

  extra/yassl/taocrypt/src/Makefile.am
    1.6.1.1 05/10/27 21:48:37 msvensson@neptunus.(none) +2 -2
    Make a normal .a lib

  extra/yassl/src/Makefile.am
    1.7 05/10/27 21:48:37 msvensson@neptunus.(none) +2 -2
    Make a normal .a lib

  configure.in
    1.345.2.2 05/10/27 21:48:37 msvensson@neptunus.(none) +1 -1
    Don't add yassl_libs to CLIENT_LIBS var since clients will be linked with libmysqlclient that includes yassl libs.

  config/ac-macros/yassl.m4
    1.4.1.2 05/10/27 21:48:37 msvensson@neptunus.(none) +2 -0
    Add variable yassl_libs_with_path variable for libmysqld

ChangeSet
  1.1944.1.2 05/10/27 22:45:18 monty@mysql.com +10 -0
  Add DROP TABLE before trying to create view (in mysqldump)
  Cleaned up xxxx_gis.test's and made gis_generic.inc independent of ndb
  (Note that archive_gis.test fails, but this is independent of this patch)

  sql/item_func.cc
    1.259.1.3 05/10/27 22:45:06 monty@mysql.com +9 -9
    Simplify code (as signal_divide_by_null sets 'null_value')

  mysql-test/t/ndb_gis.test
    1.4 05/10/27 22:45:06 monty@mysql.com +0 -1
    gis_generic tests for have_geometry.inc

  mysql-test/t/innodb_gis.test
    1.2 05/10/27 22:45:06 monty@mysql.com +1 -2
    gis_generic tests for have_geometry.inc

  mysql-test/t/bdb_gis.test
    1.2 05/10/27 22:45:06 monty@mysql.com +0 -1
    gis_generic tests for have_geometry.inc

  mysql-test/t/archive_gis.test
    1.3 05/10/27 22:45:06 monty@mysql.com +2 -3
    gis_generic tests for have_geometry.inc

  mysql-test/r/mysqldump.result
    1.78 05/10/27 22:45:06 monty@mysql.com +9 -0
    New test results after adding 'drop table'

  mysql-test/include/have_geometry.inc
    1.2 05/10/27 22:45:06 monty@mysql.com +3 -3
    Fix syntax

  mysql-test/include/have_archive.inc
    1.2 05/10/27 22:45:06 monty@mysql.com +3 -3
    Fix syntax

  mysql-test/include/gis_generic.inc
    1.3 05/10/27 22:45:06 monty@mysql.com +1 -2
    Remove dependency of ndb

  client/mysqldump.c
    1.209.1.2 05/10/27 22:45:06 monty@mysql.com +4 -1
    Add DROP TABLE to be able to re-run mysqldump if it fails after 'table-named-as-view' is created

ChangeSet
  1.1616.2144.98 05/10/27 10:20:38 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-14009
  into  mysql.com:/home/jimw/my/mysql-4.1-clean

  sql/item_func.cc
    1.124.42.5 05/10/27 10:20:35 jimw@mysql.com +0 -0
    Auto merged

  strings/ctype-win1250ch.c
    1.54 05/10/27 20:04:33 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  strings/conf_to_src.c
    1.15 05/10/27 20:04:33 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  sql/structs.h
    1.49.1.3 05/10/27 20:04:33 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  sql/sql_select.cc
    1.367 05/10/27 20:04:33 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  sql/sql_load.cc
    1.88 05/10/27 20:04:33 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  sql/records.cc
    1.42 05/10/27 20:04:33 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  sql/item_timefunc.cc
    1.96 05/10/27 20:04:32 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.164 05/10/27 20:04:32 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  scripts/make_binary_distribution.sh
    1.101 05/10/27 20:04:32 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  mysys/my_handler.c
    1.23 05/10/27 20:04:32 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  mysys/my_getopt.c
    1.55 05/10/27 20:04:32 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  mysql-test/t/update.test
    1.25 05/10/27 20:04:32 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  mysql-test/t/select.test
    1.89 05/10/27 20:04:32 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  mysql-test/t/date_formats.test
    1.14 05/10/27 20:04:32 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  mysql-test/r/update.result
    1.27 05/10/27 20:04:32 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  mysql-test/r/date_formats.result
    1.18 05/10/27 20:04:31 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.279 05/10/27 20:04:31 jani@ua141d10.elisa.omakaista.fi +0 -3
    Auto merged

  myisam/sort.c
    1.49 05/10/27 20:04:31 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  myisam/myisamdef.h
    1.83 05/10/27 20:04:31 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  myisam/mi_write.c
    1.55 05/10/27 20:04:31 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  myisam/mi_search.c
    1.60 05/10/27 20:04:31 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  myisam/mi_rnext_same.c
    1.18 05/10/27 20:04:31 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  myisam/mi_delete.c
    1.36 05/10/27 20:04:31 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  myisam/mi_check.c
    1.139 05/10/27 20:04:31 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  innobase/include/Makefile.am
    1.12 05/10/27 20:04:31 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  include/myisam.h
    1.70 05/10/27 20:04:31 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  include/my_handler.h
    1.10 05/10/27 20:04:31 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  include/my_base.h
    1.71 05/10/27 20:04:31 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  include/config-netware.h
    1.11 05/10/27 20:04:31 jani@ua141d10.elisa.omakaista.fi +0 -1
    Auto merged

  heap/hp_create.c
    1.21 05/10/27 20:04:31 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  heap/_check.c
    1.18 05/10/27 20:04:31 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

ChangeSet
  1.1616.2384.7 05/10/27 18:34:20 lenz@mysql.com +1 -0
  Merge mysql.com:/data0/mysqldev/lenz/mysql-4.0
  into mysql.com:/data0/mysqldev/lenz/mysql-4.1

  netware/BUILD/compile-linux-tools
    1.3.1.4 05/10/27 18:34:19 lenz@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.1.824 05/10/27 18:32:14 mysqldev@mysql.com +5 -0
   - cleanup: removed the empty NEW-RPMS directory and all references
   - cleanup: removed obsolete support-files/MacOSX/make_mysql_pkg.pl
     script (we now use Do-pkg for building OS X packages)

  netware/BUILD/compile-netware-src
    1.2 05/10/27 18:31:47 mysqldev@mysql.com +0 -1
     - removed reference to the NEW-RPMS directory

  netware/BUILD/compile-netware-END
    1.3.1.2 05/10/27 18:31:47 mysqldev@mysql.com +0 -1
     - removed reference to the NEW-RPMS directory

  netware/BUILD/compile-linux-tools
    1.3.2.1 05/10/27 18:31:46 mysqldev@mysql.com +0 -1
     - removed reference to the NEW-RPMS directory

  server-tools/instance-manager/parse_output.cc
    1.16 05/10/27 11:17:26 reggie@fedora.(none) +11 -11
    removed tabs
    and added call to trim_space

  server-tools/instance-manager/instance_options.cc
    1.27 05/10/27 11:17:26 reggie@fedora.(none) +1 -1
    fixed to coding guidelines

  BitKeeper/deleted/.del-make_mysql_pkg.pl~caac82eb901cc206
    1.4 05/10/27 18:15:43 mysqldev@mysql.com +0 -0
    Delete: support-files/MacOSX/make_mysql_pkg.pl

  BitKeeper/deleted/.del-.cvsignore~4c7a1f88a5a62a24
    1.3 05/10/27 18:14:12 mysqldev@mysql.com +0 -0
    Delete: NEW-RPMS/.cvsignore

ChangeSet
  1.1945 05/10/27 17:22:01 jonas@perch.ndb.mysql.com +1 -0
  Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.87 05/10/27 17:21:57 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1932.310.5 05/10/27 17:18:01 jonas@perch.ndb.mysql.com +3 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

  ndb/src/ndbapi/ndb_cluster_connection.cpp
    1.32 05/10/27 17:17:59 jonas@perch.ndb.mysql.com +0 -13
    merge

  ndb/src/ndbapi/NdbImpl.hpp
    1.12 05/10/27 17:17:59 jonas@perch.ndb.mysql.com +1 -1
    merge

  ndb/src/ndbapi/NdbRecAttr.cpp
    1.23 05/10/27 17:14:42 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2303.9 05/10/27 17:14:17 jonas@perch.ndb.mysql.com +3 -0
  bug#13078 - ndb
       memleak when doing ordered index scan on index with column larger than 32 bytes
       (recommit for merge to 5.0)

  ndb/src/ndbapi/ndb_cluster_connection.cpp
    1.13.1.6 05/10/27 17:14:14 jonas@perch.ndb.mysql.com +13 -0
    Destroy mutexes

  ndb/src/ndbapi/NdbRecAttr.cpp
    1.9.1.6 05/10/27 17:14:14 jonas@perch.ndb.mysql.com +4 -0
     Dont allocate theStorageX twice

  ndb/src/ndbapi/NdbImpl.hpp
    1.6.1.2 05/10/27 17:14:14 jonas@perch.ndb.mysql.com +6 -4
     Fix order of free lists so that destructors are run in correct order

ChangeSet
  1.1616.2384.6 05/10/27 16:53:14 lenz@mysql.com +2 -0
   - after merge fixes

  support-files/mysql.spec.sh
    1.83.1.25 05/10/27 16:53:09 lenz@mysql.com +5 -0
     - after-merge fix

  configure.in
    1.201.1.197 05/10/27 16:47:56 lenz@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2385.2 05/10/27 18:36:11 evgen@moonbone.local +1 -0
  select.result:
    After merge fix

  mysql-test/r/select.result
    1.34.3.33 05/10/27 18:35:50 evgen@moonbone.local +8 -8
    After merge fix

ChangeSet
  1.1616.2385.1 05/10/27 17:44:28 evgen@moonbone.local +5 -0
  Manually merged

  netware/mysql_test_run.c
    1.3.1.11 05/10/27 17:44:26 evgen@moonbone.local +1 -2
    Manually merged

  mysql-test/t/select.test
    1.28.4.8 05/10/27 17:44:26 evgen@moonbone.local +0 -0
    Manuall merged fix for bug#13855

  mysql-test/r/select.result
    1.34.3.32 05/10/27 17:44:26 evgen@moonbone.local +0 -0
    Manually merged fix for bug#13855

  server-tools/instance-manager/parse_output.cc
    1.15 05/10/27 08:42:19 reggie@fedora.(none) +15 -2
    stop using get_word since it stops at spaces.  Now we just read the entire line and trim spaces.

  server-tools/instance-manager/instance_options.cc
    1.26 05/10/27 08:42:19 reggie@fedora.(none) +6 -4
    small cleanup
    -and-
    convert mysqld_path to the proper syntax after reading

  sql/sql_select.cc
    1.216.1.225 05/10/27 17:36:17 evgen@moonbone.local +0 -0
    Auto merged

  include/config-netware.h
    1.2.1.7 05/10/27 17:36:17 evgen@moonbone.local +0 -4
    Auto merged

ChangeSet
  1.1932.360.1 05/10/27 17:04:01 SergeyV@selena. +1 -0
  Fix for the patch #13377. Avoids race condition for relay logs close.
  Code that closes current relay log is moved to purge_relay_logs().

  sql/slave.cc
    1.261 05/10/27 17:03:48 SergeyV@selena. +14 -16
    Fix for the patch #13377. Avoids race condition for relay logs close.
    Code that closes current relay log is moved to purge_relay_logs().

ChangeSet
  1.1346.1.823 05/10/27 14:51:58 lenz@mysql.com +18 -0
   - Removed obsolete and outdated man page files from the man
     directory - these files are now maintained in the mysqldoc
     repository and included in the source distribution during the
     release build. Updated the configure.in script and Makefiles to
     create the man page file list at build time
   - Updated the file list in the RPM spec file to include all currently
     available man pages (this can not be done with wildcards, as
     the man pages are spread across several subpackages. However, RPM
     warns about unpackaged files, so newly added man pages can be 
     spotted)

  support-files/mysql.spec.sh
    1.61.1.34 05/10/27 14:51:29 lenz@mysql.com +25 -9
     - adjusted file list: added man pages that are now part of the
       official source distribution (taken from the documentation
       server)

  man/mysqlman.1
    1.4 05/10/27 14:51:29 lenz@mysql.com +1 -1
     - removed version number

  man/Makefile.am
    1.9.1.1 05/10/27 14:51:29 lenz@mysql.com +2 -24
     - removed hard-coded list of man pages, the list is populated
       during the configure stage. When building from BK, only one
       placeholder file exists. For the release builds, this directory
       is populated by the Bootstrap script, which takes man page files
       from the documentation server.

  configure.in
    1.191.1.142 05/10/27 14:51:29 lenz@mysql.com +4 -0
     - dynamically add man pages included in the man directory
       (the BK tree only contains one dummy file, the directory is
       populated by the Bootstrap script by copying current man pages
       from the documentation server)

ChangeSet
  1.1616.2384.3 05/10/27 17:40:21 bar@mysql.com +1 -0
  conf_to_src.c:
    Dump MY_CS_CSSORT when it's necessary.

  strings/conf_to_src.c
    1.13.1.2 05/10/27 17:39:10 bar@mysql.com +11 -2
    Dump MY_CS_CSSORT when it's necessary.

ChangeSet
  1.1932.359.1 05/10/27 15:15:01 monty@mysql.com +6 -0
  Fixes during review of pushed code
  Added back missing return in mysql_delete()

  sql/sql_delete.cc
    1.167 05/10/27 15:13:53 monty@mysql.com +5 -3
    Add back missing RETURN (was lost in a merge)
    Indentation fixes

  sql/log_event.h
    1.122 05/10/27 15:13:52 monty@mysql.com +2 -3
    Remove number from last even to help future merges
    (all compilers I know of can handle this properly)

  sql/log.cc
    1.180 05/10/27 15:13:52 monty@mysql.com +4 -4
    false -> FALSE
    true -> TRUE
    Wait until readers_count is 0 (not just for a signal)
    
    NOTE: it's very likely that the way to handle readers_count is wrong.
    (We are in pthread_cond_wait freeing a mutex that is not the innermost mutex,
    which can lead to deadlocks)
    
    I will talk with Guilhem about this ASAP

  mysql-test/t/drop_temp_table.test
    1.8 05/10/27 15:13:52 monty@mysql.com +4 -0
    Delete database that may be left from other test

  mysql-test/r/drop_temp_table.result
    1.16 05/10/27 15:13:52 monty@mysql.com +1 -0
    Delete database that may be left from other test

  mysql-test/my_manage.c
    1.10 05/10/27 15:13:52 monty@mysql.com +10 -13
    Cleanup: Remove some #ifdef

ChangeSet
  1.1939.9.1 05/10/27 15:54:01 petr@mysql.com +1 -0
  Fix for Bug #14388 "IM eats 99% CPU"

  server-tools/instance-manager/listener.cc
    1.22 05/10/27 15:53:49 petr@mysql.com +6 -2
    reinitialize timer used in select(), as on linux it is modified
    to reflect amout of time not slept (e.g. set ot zero)

ChangeSet
  1.1616.2384.2 05/10/27 16:48:49 bar@mysql.com +1 -0
  conf_to_src.c:
    Updating to conform the current CHARSET_INFO structure.

  strings/conf_to_src.c
    1.13.1.1 05/10/27 16:48:00 bar@mysql.com +40 -26
    Updating to conform the current structure.

ChangeSet
  1.1939.8.1 05/10/27 09:36:11 pekka@mysql.com +1 -0
  ndb - base64 compile fix in ndbapi test

  ndb/test/src/HugoCalculator.cpp
    1.20 05/10/27 09:35:19 pekka@mysql.com +0 -1
    does not use Base64.hpp which was renamed to base64.h

ChangeSet
  1.1939.7.1 05/10/27 04:00:31 petr@mysql.com +1 -0
  Added a comment re Bug#14164

  server-tools/instance-manager/manager.cc
    1.29 05/10/27 04:00:17 petr@mysql.com +6 -0
    Additional comment for the bugfix

ChangeSet
  1.1939.4.5 05/10/26 14:11:08 jimw@mysql.com +5 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-clean
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  mysql-test/t/loaddata.test
    1.15 05/10/26 14:11:06 jimw@mysql.com +4 -3
    Resolve conflicts, deal with renamed dat file

  mysql-test/r/loaddata.result
    1.20 05/10/26 14:11:06 jimw@mysql.com +1 -2
    Resolve conflicts, deal with renamed dat file

  sql/sql_load.cc
    1.87 05/10/26 14:09:17 jimw@mysql.com +0 -0
    Auto merged

  sql/item.cc
    1.192 05/10/26 14:09:17 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/std_data/loaddata_dq.dat
    1.2 05/10/26 14:09:16 jimw@mysql.com +0 -0
    Merge rename: mysql-test/std_data/loaddata5.dat -> mysql-test/std_data/loaddata_dq.dat

ChangeSet
  1.1939.1.5 05/10/26 13:55:08 brian@zim.(none) +10 -0
  Change in gis test to allow NDB to be able to call generic tests. Fix for Archive so that ALTER TABLE doesn't issue a warning. Also added test case for alter table.

  sql/ha_archive.cc
    1.60 05/10/26 13:54:56 brian@zim.(none) +0 -1
    Removed ARN temp file from exts[] to solve warning messages in alter table.

  mysql-test/t/ndb_gis.test
    1.3 05/10/26 13:54:56 brian@zim.(none) +1 -0
    Change to test both with and not with pushdown conditions

  mysql-test/t/archive_gis.test
    1.2 05/10/26 13:54:56 brian@zim.(none) +1 -1
    Change in syntax

  mysql-test/t/archive.test
    1.14 05/10/26 13:54:56 brian@zim.(none) +5 -0
    Added alter table test to fix bug in alter table

  mysql-test/r/ndb_gis.result
    1.3 05/10/26 13:54:56 brian@zim.(none) +599 -372
    Change in gis means result change

  mysql-test/r/innodb_gis.result
    1.2 05/10/26 13:54:56 brian@zim.(none) +37 -267
    Change in gis test means change in results. 

  mysql-test/r/bdb_gis.result
    1.2 05/10/26 13:54:56 brian@zim.(none) +37 -267
    Change in gis test means new results

  mysql-test/r/archive_gis.result
    1.2 05/10/26 13:54:56 brian@zim.(none) +37 -270
    Change in test gis_generic

  mysql-test/r/archive.result
    1.13 05/10/26 13:54:56 brian@zim.(none) +1227 -2
    Change for gis_generic

  mysql-test/include/gis_generic.inc
    1.2 05/10/26 13:54:56 brian@zim.(none) +39 -256
    Change in test for NDB (needs order by)

ChangeSet
  1.1616.2369.18 05/10/26 09:22:47 patg@krsna.patg.net +2 -0
  Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  krsna.patg.net:/home/patg/mysql-build/mysql-4.1

  mysql-test/mysql-test-run.sh
    1.208.1.49 05/10/26 09:22:38 patg@krsna.patg.net +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.8.2.40 05/10/26 09:22:38 patg@krsna.patg.net +0 -0
    Auto merged

ChangeSet
  1.1616.2383.1 05/10/26 20:06:08 aivanov@mysql.com +33 -0
  Removed innobase/my_cnf, innobase/include/makefilewin.i,
   and innobase/*/makefilewin (which are unused now).

  innobase/include/Makefile.am
    1.10.1.1 05/10/26 20:05:58 aivanov@mysql.com +1 -1
    Removed ref to Makefilewin.i (it is unused now).

ChangeSet
  1.1939.4.4 05/10/26 19:05:02 SergeyV@selena. +1 -0
  Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  selena.:H:/MYSQL/src/#14137-mysql-5.0

  sql/mysqld.cc
    1.512.1.6 05/10/26 19:04:49 SergeyV@selena. +0 -0
    Auto merged

ChangeSet
  1.1932.344.3 05/10/26 17:45:30 SergeyV@selena. +1 -0
  Formatting change for #14137 patch.

  sql/mysqld.cc
    1.512.3.2 05/10/26 17:45:11 SergeyV@selena. +1 -1
    Formatting change for #14137 patch.

ChangeSet
  1.1616.2369.17 05/10/26 16:12:41 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
  Imported fix from 5.0.

  netware/mysql_test_run.c
    1.3.1.10 05/10/26 16:12:34 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Imported fix from 5.0.

ChangeSet
  1.1939.6.2 05/10/26 15:06:17 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/bug12258/my50-bug12258

  sql/sql_prepare.cc
    1.161 05/10/26 15:06:12 msvensson@neptunus.(none) +0 -0
    Auto merged

  BitKeeper/deleted/.del-replace.1.in~e92dc1aea682608c
    1.9 05/10/26 15:02:10 lenz@mysql.com +0 -0
    Delete: man/replace.1.in

  BitKeeper/deleted/.del-perror.1.in~60d1efcbe71bdd9c
    1.11 05/10/26 15:02:10 lenz@mysql.com +0 -0
    Delete: man/perror.1.in

  BitKeeper/deleted/.del-mysqlshow.1.in~81ce953dcc1a282f
    1.10 05/10/26 15:02:10 lenz@mysql.com +0 -0
    Delete: man/mysqlshow.1.in

  BitKeeper/deleted/.del-mysql_zap.1.in~df5cf8089b50c624
    1.9 05/10/26 15:02:10 lenz@mysql.com +0 -0
    Delete: man/mysql_zap.1.in

  BitKeeper/deleted/.del-mysql_fix_privilege_tables.1.in~7422405bb0e64325
    1.7 05/10/26 15:02:10 lenz@mysql.com +0 -0
    Delete: man/mysql_fix_privilege_tables.1.in

  BitKeeper/deleted/.del-mysqldump.1.in~9520980bfec710d5
    1.13 05/10/26 15:02:09 lenz@mysql.com +0 -0
    Delete: man/mysqldump.1.in

  BitKeeper/deleted/.del-mysqld_safe.1.in~6f34e14acc0c5e0b
    1.11 05/10/26 15:02:09 lenz@mysql.com +0 -0
    Delete: man/mysqld_safe.1.in

  BitKeeper/deleted/.del-mysqld_multi.1.in~b3f1c5343b8481e6
    1.9 05/10/26 15:02:08 lenz@mysql.com +0 -0
    Delete: man/mysqld_multi.1.in

  BitKeeper/deleted/.del-mysqld.1.in~42371a82eb27d87c
    1.10 05/10/26 15:02:08 lenz@mysql.com +0 -0
    Delete: man/mysqld.1.in

  BitKeeper/deleted/.del-mysqladmin.1.in~81703c6092a1f769
    1.10 05/10/26 15:02:08 lenz@mysql.com +0 -0
    Delete: man/mysqladmin.1.in

  BitKeeper/deleted/.del-mysqlaccess.1.in~2adf98feb44a0dbf
    1.12 05/10/26 15:02:07 lenz@mysql.com +0 -0
    Delete: man/mysqlaccess.1.in

  BitKeeper/deleted/.del-mysql.1.in~3f4dbf65d31fea3a
    1.13 05/10/26 15:02:07 lenz@mysql.com +0 -0
    Delete: man/mysql.1.in

  BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19
    1.6.2.1 05/10/26 15:02:07 lenz@mysql.com +0 -0
    Delete: man/isamlog.1.in

  BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962
    1.7.2.1 05/10/26 15:02:06 lenz@mysql.com +0 -0
    Delete: man/isamchk.1.in

  man/mysqlman.1
    1.3 05/10/26 15:01:42 lenz@mysql.com +0 -0
    Rename: man/mysqlman.1.in -> man/mysqlman.1

ChangeSet
  1.1932.341.3 05/10/26 14:15:04 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug12258/my41-bug12258
  into  neptunus.(none):/home/msvensson/mysql/bug12258/my50-bug12258

  sql/sql_prepare.cc
    1.159.2.1 05/10/26 14:14:59 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.2382.1 05/10/26 14:14:08 msvensson@neptunus.(none) +1 -0
  Bug #12258 mysql_client_test failure on FC4
   - Fix for gcc 4.0.1, use cast packet arg local variable

  sql/sql_prepare.cc
    1.34.1.122 05/10/26 14:14:02 msvensson@neptunus.(none) +2 -1
    Use local variable packet that contains an uchar pointer to packet_arg

ChangeSet
  1.1932.358.1 05/10/26 14:01:54 ingo@mysql.com +2 -0
  1.2048 05/10/20 10:31:16 ingo@mysql.com +1 -0
  Bug#12166 - Unable to index very large tables
  Moved clearing of errors behind the second repair attempt,
  but will clear only if no error happened.
  
  No test case. The error can be repeated with little free
  space on tmpdir only. I do not know of a way to create this
  in a portable way with our test suite.
  
  I did however attach a shell script to the bug report which
  can easily be adapted to the situation on the test machine.

  sql/ha_myisam.cc
    1.163 05/10/26 14:01:47 ingo@mysql.com +8 -3
    Bug#12166 - Unable to index very large tables
    Moved clearing of errors behind the second repair attempt,
    but will clear only if no error happened.

  myisam/mi_check.c
    1.138 05/10/26 14:01:47 ingo@mysql.com +12 -7
    Bug#12166 - Unable to index very large tables
    Changed comments.
    Removed unnecessary use of param->keys_in_use.

  BitKeeper/deleted/.del-my_cnf~977f69858affc57b
    1.2 05/10/26 15:58:13 aivanov@mysql.com +0 -0
    Delete: innobase/my_cnf

  BitKeeper/deleted/.del-makefilewin~14f24a4a173e2fcd
    1.2 05/10/26 15:57:43 aivanov@mysql.com +0 -0
    Delete: innobase/makefilewin

  BitKeeper/deleted/.del-makefilewin~389ee2dcf79afb79
    1.2 05/10/26 15:57:27 aivanov@mysql.com +0 -0
    Delete: innobase/ut/makefilewin

  BitKeeper/deleted/.del-makefilewin~72a64128bacce71b
    1.2 05/10/26 15:57:19 aivanov@mysql.com +0 -0
    Delete: innobase/usr/makefilewin

  BitKeeper/deleted/.del-makefilewin~f4b7b99a887b7de
    1.2 05/10/26 15:57:12 aivanov@mysql.com +0 -0
    Delete: innobase/trx/makefilewin

  BitKeeper/deleted/.del-makefilewin~c8273a47b90f52bb
    1.2 05/10/26 15:57:01 aivanov@mysql.com +0 -0
    Delete: innobase/thr/makefilewin

  BitKeeper/deleted/.del-makefilewin~13888739357b3025
    1.3 05/10/26 15:56:51 aivanov@mysql.com +0 -0
    Delete: innobase/sync/makefilewin

  BitKeeper/deleted/.del-makefilewin~63acd666293282a
    1.2 05/10/26 15:56:44 aivanov@mysql.com +0 -0
    Delete: innobase/srv/makefilewin

  BitKeeper/deleted/.del-makefilewin~dc4b8ad5ea53bd
    1.2 05/10/26 15:56:29 aivanov@mysql.com +0 -0
    Delete: innobase/row/makefilewin

  BitKeeper/deleted/.del-makefilewin~fdda94ad32fa9e34
    1.2 05/10/26 15:56:21 aivanov@mysql.com +0 -0
    Delete: innobase/rem/makefilewin

  BitKeeper/deleted/.del-makefilewin~2e0407fe123f8365
    1.2 05/10/26 15:56:15 aivanov@mysql.com +0 -0
    Delete: innobase/read/makefilewin

  BitKeeper/deleted/.del-makefilewin~608ed49dcd88e0f7
    1.2 05/10/26 15:56:08 aivanov@mysql.com +0 -0
    Delete: innobase/que/makefilewin

  BitKeeper/deleted/.del-makefilewin~dea10ec1c94f7be
    1.2 05/10/26 15:56:01 aivanov@mysql.com +0 -0
    Delete: innobase/pars/makefilewin

  BitKeeper/deleted/.del-makefilewin~aeea7c82f21f7cf5
    1.2 05/10/26 15:55:53 aivanov@mysql.com +0 -0
    Delete: innobase/page/makefilewin

  BitKeeper/deleted/.del-makefilewin~15e9e5c9e8fa870b
    1.3 05/10/26 15:55:29 aivanov@mysql.com +0 -0
    Delete: innobase/os/makefilewin

  BitKeeper/deleted/.del-makefilewin~6ba64863bce3d0b8
    1.2 05/10/26 15:55:19 aivanov@mysql.com +0 -0
    Delete: innobase/mtr/makefilewin

  BitKeeper/deleted/.del-makefilewin~1dbc058d76ebf1db
    1.2 05/10/26 15:55:13 aivanov@mysql.com +0 -0
    Delete: innobase/mem/makefilewin

  BitKeeper/deleted/.del-makefilewin~a40ea12eebdd6ef0
    1.2 05/10/26 15:55:05 aivanov@mysql.com +0 -0
    Delete: innobase/mach/makefilewin

  BitKeeper/deleted/.del-makefilewin~b643e38d8da389ac
    1.2 05/10/26 15:54:59 aivanov@mysql.com +0 -0
    Delete: innobase/log/makefilewin

  BitKeeper/deleted/.del-makefilewin~7a9d7d5a42bbfaf5
    1.2 05/10/26 15:54:52 aivanov@mysql.com +0 -0
    Delete: innobase/lock/makefilewin

  BitKeeper/deleted/.del-makefilewin~1c53f31b88dd36e
    1.2 05/10/26 15:53:50 aivanov@mysql.com +0 -0
    Delete: innobase/ibuf/makefilewin

  BitKeeper/deleted/.del-makefilewin~f1e3b890aa1c9ea3
    1.2 05/10/26 15:53:43 aivanov@mysql.com +0 -0
    Delete: innobase/ha/makefilewin

  BitKeeper/deleted/.del-makefilewin~ef3a208fa0e9b0db
    1.2 05/10/26 15:53:37 aivanov@mysql.com +0 -0
    Delete: innobase/fut/makefilewin

  BitKeeper/deleted/.del-makefilewin~d1a9d1f7d33fcb73
    1.2 05/10/26 15:53:30 aivanov@mysql.com +0 -0
    Delete: innobase/fsp/makefilewin

  BitKeeper/deleted/.del-makefilewin~4d139e182457e553
    1.2 05/10/26 15:53:23 aivanov@mysql.com +0 -0
    Delete: innobase/fil/makefilewin

  BitKeeper/deleted/.del-makefilewin~c7b621c745e5de95
    1.2 05/10/26 15:53:16 aivanov@mysql.com +0 -0
    Delete: innobase/eval/makefilewin

  BitKeeper/deleted/.del-makefilewin~d90f35fdc3f2ee5f
    1.2 05/10/26 15:53:07 aivanov@mysql.com +0 -0
    Delete: innobase/dyn/makefilewin

  BitKeeper/deleted/.del-makefilewin~5104767c73775697
    1.2 05/10/26 15:52:59 aivanov@mysql.com +0 -0
    Delete: innobase/dict/makefilewin

  BitKeeper/deleted/.del-makefilewin~d37b6b303348c871
    1.2 05/10/26 15:52:22 aivanov@mysql.com +0 -0
    Delete: innobase/data/makefilewin

  BitKeeper/deleted/.del-makefilewin~2fc379bd4065c995
    1.2 05/10/26 15:52:12 aivanov@mysql.com +0 -0
    Delete: innobase/buf/makefilewin

  BitKeeper/deleted/.del-makefilewin~78000390c783b1c5
    1.2 05/10/26 15:51:58 aivanov@mysql.com +0 -0
    Delete: innobase/btr/makefilewin

  BitKeeper/deleted/.del-makefilewin.i~5c8479dcb8a455b2
    1.2 05/10/26 15:50:37 aivanov@mysql.com +0 -0
    Delete: innobase/include/makefilewin.i

ChangeSet
  1.1932.306.2 05/10/26 11:54:15 hf@deer.(none) +1 -0
  Additional fix for bug #13573

  sql/item_func.cc
    1.261 05/10/26 11:54:06 hf@deer.(none) +8 -9
    don't return NULL when we got E_DEC_OVERFLOW

ChangeSet
  1.1939.4.2 05/10/25 23:51:05 reggie@big_geek. +1 -0
  changed define from EXTERN_C to EXTERNC so it doesn't conflict with 
  another macro defined in the Windows header files.

  include/my_pthread.h
    1.88 05/10/25 23:50:50 reggie@big_geek. +6 -6
    changed define from EXTERN_C to EXTERNC so it doesn't conflict with 
    another macro defined in the Windows header files.

ChangeSet
  1.1616.2369.16 05/10/26 01:24:03 kent@mysql.com +1 -0
  mysql-test-run.pl:
    Added MTR_BUILD_THREAD to control the port range

  mysql-test/mysql-test-run.pl
    1.8.7.1 05/10/26 01:23:26 kent@mysql.com +29 -3
    Added MTR_BUILD_THREAD to control the port range

ChangeSet
  1.1616.2381.1 05/10/25 14:50:08 patg@krsna.patg.net +5 -0
  BUG# 12123
  
  Made change to mysqlimport to set character_set_database to binary to 
  make importing various charsets/columns work correctly.

  mysql-test/t/mysqldump.test
    1.19.1.22 05/10/25 14:49:54 patg@krsna.patg.net +12 -0
    BUG #12123
    
    Added dumping and reloading (using mysql, mysqldump, and mysqlimport) to
    show that this fix handles dumping and reloading of non-latin1 charsets
    in table with different charset columns (mixing of charsets, also can be a
    UTF table with latin1 tables). Note the select before and after dump and 
    restore - should be exact. (results of this)

  mysql-test/r/mysqldump.result
    1.9.1.41 05/10/25 14:49:54 patg@krsna.patg.net +10 -0
    BUG #12123
    
    Added dumping and reloading (using mysql, mysqldump, and mysqlimport) to
    show that this fix handles dumping and reloading of non-latin1 charsets
    in table with different charset columns (mixing of charsets, also can be a
    UTF table with latin1 tables). Note the select before and after dump and 
    restore - should be exact.

  mysql-test/mysql-test-run.sh
    1.208.14.1 05/10/25 14:49:54 patg@krsna.patg.net +8 -1
    BUG #12123
    
    Added $MYSQL_IMPORT in order to test mysqlimport bug.

  mysql-test/mysql-test-run.pl
    1.8.2.39 05/10/25 14:49:54 patg@krsna.patg.net +11 -0
    BUG #12123
    
    Added $MYSQL_IMPORT in order to test mysqlimport bug.

  client/mysqlimport.c
    1.49.1.3 05/10/25 14:49:54 patg@krsna.patg.net +7 -0
    BUG# 12123
    
    Added 'set @@character_set_database=binary' to make loading of tables with
    mixed charset types and non-latin characters load.

ChangeSet
  1.1616.2380.1 05/10/26 00:56:17 sergefp@mysql.com +5 -0
  BUG#14139: When handling "CREATE TABLE(field_X type_spec,...) SELECT smth AS field_X, ...."
  avoid multiplying length of field_X by charset->mbmaxlen twice when calculating space 
  required for field_X in the new table.

  sql/sql_table.cc
    1.157.2.146 05/10/26 00:56:10 sergefp@mysql.com +2 -2
    BUG#14139: When handling "CREATE TABLE(field_X type_spec,...) SELECT smth AS field_X, ...."
    we get two instances of create_field: (1) is occurence of field_X in create list, and (2) is
    in select list. If we figure they both refer to the same field, we "join" them according to
    some rule that is not explicitly specified anywhere.
    When we do this "join", create_field::length already contains length-in-bytes for both, so
    when we transfer field length (in characters) from (1) to (2), use length-in-characters that
    we have saved in create_length::chars_length.

  sql/field.h
    1.120.1.10 05/10/26 00:56:10 sergefp@mysql.com +8 -0
    BUG#14139: Add create_length::chars_length where we save length-in-characters, added comments.

  sql/field.cc
    1.197.9.1 05/10/26 00:56:10 sergefp@mysql.com +12 -0
    BUG#14139: Make create_length_to_internal_length() save length-in-characters in 
    create_field::chars_length.

  mysql-test/t/create.test
    1.48.1.12 05/10/26 00:56:10 sergefp@mysql.com +8 -0
    Testcase for BUG#14139

  mysql-test/r/create.result
    1.75.1.11 05/10/26 00:56:10 sergefp@mysql.com +11 -0
    Testcase for BUG#14139

ChangeSet
  1.1939.2.5 05/10/25 12:50:03 paul@frost.snake.net +1 -0
  Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  frost.snake.net:/Users/paul/bk/mysql-5.0

  client/mysqldump.c
    1.211 05/10/25 12:49:52 paul@frost.snake.net +0 -0
    Auto merged

ChangeSet
  1.1616.2375.5 05/10/25 10:11:47 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-12925
  into  mysql.com:/home/jimw/my/mysql-4.1-clean

  tests/mysql_client_test.c
    1.51.1.110 05/10/25 10:11:44 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2379.1 05/10/25 10:10:53 jimw@mysql.com +3 -0
  Fix incorrect casts in my_getopt code that capped the maximum of longlong
  options to the wrong value. (Bug #12925)

  tests/mysql_client_test.c
    1.51.28.1 05/10/25 10:10:47 jimw@mysql.com +19 -0
    Add test case for Bug #12925 (my_getopt bug)

  mysys/my_getopt.c
    1.50.1.1 05/10/25 10:10:47 jimw@mysql.com +3 -3
    Remove incorrect and unnecessary casts

  mysql-test/t/mysql_client_test.test
    1.14 05/10/25 10:10:47 jimw@mysql.com +2 -2
    Add parameter for testing getopt bug

ChangeSet
  1.1932.357.1 05/10/25 19:04:31 pgalbraith@mysql.com +3 -0
  This cset fixes BUG# 12838, 14061, 12129
  mysqldump.result:
    BUG# 12838
        New test results for mysqldump -x on a DB with views
  mysqldump.test:
    sqldump.test:
        BUG# 12838
        New test to run mysqldump -x on a DB with views
  mysqldump.c:
    BUG# 12838
        Removed/Changed code which created tables to be put into the dump
        (For loading views of views) by creating temp tables and then using
        the CREATE TABLE information in those temp tables. The problem with this
        is that when mysqldump -x is called, it locks all tables, so the
        temp tables could not be created, causing the mysqldump to exit with
        failure. The code was changed to use SHOW FIELDS to get the column
        names and type to build CREATE TABLE text used to create these tables
        that views need in the dump.

ChangeSet
  1.1939.2.2 05/10/25 22:04:20 hf@deer.(none) +1 -0
  Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
  into deer.(none):/home/hf/work/mysql-5.0.12267

  sql/sql_yacc.yy
    1.437 05/10/25 22:04:13 hf@deer.(none) +0 -0
    Auto merged

  mysql-test/r/mysqldump.result
    1.77 05/10/25 19:01:33 pgalbraith@mysql.com +105 -16
    BUG# 12838
        New test results for mysqldump -x on a DB with views

  mysql-test/t/mysqldump.test
    1.71 05/10/25 19:01:13 pgalbraith@mysql.com +23 -0
    sqldump.test:
        BUG# 12838
        New test to run mysqldump -x on a DB with views

  client/mysqldump.c
    1.209.1.1 05/10/25 18:59:02 pgalbraith@mysql.com +79 -71
    BUG# 12838
        Removed/Changed code which created tables to be put into the dump
        (For loading views of views) by creating temp tables and then using
        the CREATE TABLE information in those temp tables. The problem with this
        is that when mysqldump -x is called, it locks all tables, so the
        temp tables could not be created, causing the mysqldump to exit with
        failure. The code was changed to use SHOW FIELDS to get the column
        names and type to build CREATE TABLE text used to create these tables
        that views need in the dump.

ChangeSet
  1.1616.2378.1 05/10/25 20:37:26 evgen@moonbone.local +3 -0
  Fix bug #14016 date_format() 2nd parameter was compared using case insensitive 
  collation
  
  By default constant strings in second parameter of date_time() have case
  insensitive collation. Because of this expressions date_format(f,'%m') and 
  date_format(f,'%M') wrongly becomes equal, which results in choosing wrong 
  column to sort by.
  
  Now if second parameter of date_format() is constant then it's collation is 
  changed to case sensitive.

  mysql-test/t/date_formats.test
    1.11.1.2 05/10/25 20:35:50 evgen@moonbone.local +8 -0
    Test case for bug#14016 2nd parameter was compared using case insensitive collation

  mysql-test/r/date_formats.result
    1.15.1.1 05/10/25 20:35:31 evgen@moonbone.local +8 -0
    Test case for bug#14016 2nd parameter was compared using case insensitive collation

  sql/item_timefunc.cc
    1.51.1.41 05/10/25 20:33:04 evgen@moonbone.local +10 -0
    Fix bug #14016 date_format() 2nd parameter was compared using case insensitive collation.
    If second parameter of date_format() is constant then it's collation is changed to case sensitive.

ChangeSet
  1.1939.3.3 05/10/25 21:10:58 hf@deer.(none) +1 -0
  Merge deer.(none):/home/hf/work/mysql-5.0.13820
  into deer.(none):/home/hf/work/mysql-5.0.12267

  sql/item_func.cc
    1.259.1.2 05/10/25 21:10:51 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.1939.3.2 05/10/25 21:09:37 hf@deer.(none) +1 -0
  Merge deer.(none):/home/hf/work/mysql-5.0.13667
  into deer.(none):/home/hf/work/mysql-5.0.12267

  sql/sql_parse.cc
    1.506.1.3 05/10/25 21:09:30 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.2377.1 05/10/25 20:04:12 evgen@moonbone.local +3 -0
  Fix bug#13392 Wrong VALUES() behaviour in INSERT SELECT with ON DUPLICATE
  
  VALUES() can only refer to table insert going to. 
  But Item_insert_value::fix_fields() were passing to it's arg full table list,
  This results in finding second column which shouldn't be found, and
  failing with error about ambiguous field.
  
  Item_insert_value::fix_fields() now passes only first table of full table
  list.

  mysql-test/t/insert_select.test
    1.14.1.9 05/10/25 20:02:30 evgen@moonbone.local +12 -0
    Test case for bug#14016 2nd parameter was compared using case insensitive collation

  mysql-test/r/insert_select.result
    1.16.1.13 05/10/25 20:02:11 evgen@moonbone.local +8 -0
    Test case for bug#14016 2nd parameter was compared using case insensitive collation

  sql/item.cc
    1.58.1.170 05/10/25 20:01:39 evgen@moonbone.local +7 -0
    Fix bug #14016 date_format() 2nd parameter was compared using case insensitive collation.
    If second parameter of date_format() is constant then it's collation is changed to case sensitive.

ChangeSet
  1.1932.356.1 05/10/25 19:28:27 sergefp@mysql.com +9 -0
  BUG#13126: When choosing join order for join with nested joins, don't produce join 
  orders that cannot be handled by the executioner.

  sql/table.h
    1.118 05/10/25 19:28:08 sergefp@mysql.com +9 -1
    BUG#13126: In NESTED_JOIN: added nj_map, added comment about where counter is used.

  sql/sql_select.h
    1.101 05/10/25 19:28:08 sergefp@mysql.com +10 -1
    BUG#13126: Added JOIN_TAB::embedding_map and JOIN::cur_embedding_map.

  sql/sql_select.cc
    1.364.1.20 05/10/25 19:28:08 sergefp@mysql.com +239 -11
    BUG#13126: When choosing join order for join with nested joins, don't produce join orders
    that the executioner cannot handle. The work is done by check_interleaving_with_nj() and 
    restore_prev_nj_state() functions that are used from the join optimizer to avoid building
    invalid join orders.

  sql/sql_prepare.cc
    1.159.1.1 05/10/25 19:28:07 sergefp@mysql.com +0 -2
    BUG#13126: Don't set NESTED_JOIN::counter to 0 here as it is reset in other place now.

  sql/mysql_priv.h
    1.360.1.1 05/10/25 19:28:07 sergefp@mysql.com +5 -0
    BUG#13126: Added nested_join_map type.

  mysql-test/t/join_nested.test
    1.11.1.2 05/10/25 19:28:07 sergefp@mysql.com +68 -0
    Testcase for BUG#13126

  mysql-test/t/bigint.test
    1.27 05/10/25 19:28:07 sergefp@mysql.com +1 -1
    Added mssing "drop table if exists"

  mysql-test/r/join_nested.result
    1.15.1.2 05/10/25 19:28:07 sergefp@mysql.com +64 -0
    Testcase for BUG#13126

  mysql-test/r/bigint.result
    1.31 05/10/25 19:28:07 sergefp@mysql.com +1 -1
    Added mssing "drop table if exists"

ChangeSet
  1.1939.2.1 05/10/25 08:18:32 acurtis@zim.(none) +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  zim.(none):/home/acurtis/mysql-5.0-noraid.2

  sql/sql_yacc.yy
    1.434.1.5 05/10/25 08:18:26 acurtis@zim.(none) +0 -0
    Auto merged

ChangeSet
  1.1932.355.1 05/10/25 08:15:37 acurtis@zim.(none) +1 -0
  Deprecate RAID create options

  sql/sql_yacc.yy
    1.434.3.1 05/10/25 08:15:16 acurtis@zim.(none) +15 -3
    Deprecate RAID create options

ChangeSet
  1.1939.1.1 05/10/25 09:29:39 reggie@big_geek. +1 -0
  fix issue with IM that causes commandlines that are executed to be incorrect.

  server-tools/instance-manager/instance.cc
    1.30 05/10/25 09:26:15 reggie@big_geek. +2 -1
    terminate the new line buffer so our strcat's will work

ChangeSet
  1.1938.1.1 05/10/25 19:08:33 hf@deer.(none) +2 -0
  Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
  into deer.(none):/home/hf/work/mysql-5.0.12267

  sql/sql_yacc.yy
    1.436 05/10/25 19:08:25 hf@deer.(none) +0 -0
    Auto merged

  sql/sql_table.cc
    1.277 05/10/25 19:08:24 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.1346.860.1 05/10/25 16:56:25 jani@ua141d10.elisa.omakaista.fi +2 -0
  Imported fixes from 4.1 and 5.0 to 4.0.

  netware/mysql_test_run.c
    1.3.2.4 05/10/25 16:56:21 jani@ua141d10.elisa.omakaista.fi +1 -1
    Imported fixes from 4.1 and 5.0 to 4.0.

  include/config-netware.h
    1.2.2.2 05/10/25 16:56:21 jani@ua141d10.elisa.omakaista.fi +4 -0
    Imported fixes from 4.1 and 5.0 to 4.0.

ChangeSet
  1.1932.354.1 05/10/25 16:34:03 sergefp@mysql.com +2 -0
  Fix for BUG#14272: Don't run index scan when we should use quick select.
  This could cause failures because there are table handlers (like federated)
  that support quick select scanning but do not support index scanning.
   

  sql/sql_update.cc
    1.176 05/10/25 16:33:56 sergefp@mysql.com +2 -2
    Fix for BUG#14272: Don't run index scan when we should use quick select.
    This could cause failures because there are table handlers (like federated)
    that support quick select scanning but do not support index scanning.
     

  mysql-test/t/disabled.def
    1.8 05/10/25 16:33:55 sergefp@mysql.com +0 -1
    Enabled federated testcase.

ChangeSet
  1.1940 05/10/25 17:22:58 ramil@mysql.com +3 -0
  Fix for bug #14290: wrong CHARACTER_MAXIMUM_LENGTH value for some text fields.

  sql/sql_show.cc
    1.290.1.5 05/10/25 17:22:44 ramil@mysql.com +3 -2
    Fix for bug #14290: wrong CHARACTER_MAXIMUM_LENGTH value for some text fields.
    adjust CHARACTER_MAXIMUM_LENGTH value for text fields.

  mysql-test/t/information_schema.test
    1.59.1.2 05/10/25 17:22:44 ramil@mysql.com +9 -0
    Fix for bug #14290: wrong CHARACTER_MAXIMUM_LENGTH value for some text fields.

  mysql-test/r/information_schema.result
    1.86 05/10/25 17:22:43 ramil@mysql.com +8 -0
    Fix for bug #14290: wrong CHARACTER_MAXIMUM_LENGTH value for some text fields.

ChangeSet
  1.1616.2376.1 05/10/25 14:49:04 bar@mysql.com +3 -0
    Bug#13347: empty result from query with like and cp1250 charset
  ctype-win1250ch.c:
    Like range prefix tables were wrong.
  ctype_cp1250_ch.result, ctype_cp1250_ch.test:
    Adding test case.

  mysql-test/r/ctype_cp1250_ch.result
    1.3 05/10/25 14:47:57 bar@mysql.com +23 -0
    Adding test case.

  mysql-test/t/ctype_cp1250_ch.test
    1.4 05/10/25 14:47:52 bar@mysql.com +21 -0
    Adding test case.

  strings/ctype-win1250ch.c
    1.42.1.5 05/10/25 14:46:59 bar@mysql.com +76 -34
    Bug#13347: empty result from query with like and cp1250 charset
    Like range prefix tables were wrong.

ChangeSet
  1.1938 05/10/25 11:30:43 pem@mysql.com +1 -0
  Converted mysys/base64.c into C code (not C++).

  mysys/base64.c
    1.9 05/10/25 11:30:16 pem@mysql.com +6 -3
    Converted into C code (not C++).

ChangeSet
  1.1616.2375.1 05/10/25 12:12:10 jani@ua141d10.elisa.omakaista.fi +1 -0
  Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1

  myisam/mi_check.c
    1.105.1.50 05/10/25 12:12:05 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

ChangeSet
  1.1616.2374.1 05/10/25 12:11:31 jani@ua141d10.elisa.omakaista.fi +2 -0
  Changed some dbug print options.

  myisam/mi_delete.c
    1.31.1.1 05/10/25 12:11:26 jani@ua141d10.elisa.omakaista.fi +4 -2
    Changed print style for keypos.

  myisam/mi_check.c
    1.105.7.1 05/10/25 12:11:26 jani@ua141d10.elisa.omakaista.fi +4 -3
    Changed print style for keyoffset.

ChangeSet
  1.1932.353.1 05/10/25 13:02:48 anozdrin@mysql.com +5 -0
  Fix for BUG#13037: undefined variable in IF cause erroneous error-message.

  sql/sql_class.h
    1.271 05/10/25 13:02:41 anozdrin@mysql.com +8 -0
    Introduce a constant for the default value of THD::where.

  sql/sql_class.cc
    1.217 05/10/25 13:02:41 anozdrin@mysql.com +5 -1
    Reset THD::where in THD::cleanup_after_query();
    Polishing: use the constant (THD::DEFAULT_WHERE).

  sql/sql_base.cc
    1.312 05/10/25 13:02:41 anozdrin@mysql.com +1 -1
    Polishing: use constant.

  mysql-test/t/sp-error.test
    1.92 05/10/25 13:02:41 anozdrin@mysql.com +54 -0
    Test case for BUG#13037.

  mysql-test/r/sp-error.result
    1.88 05/10/25 13:02:41 anozdrin@mysql.com +35 -2
    Results for the test case for BUG#13037.

ChangeSet
  1.1932.351.2 05/10/24 23:57:15 brian@zim.(none) +1 -0
  Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  zim.(none):/home/brian/mysql/mysql-5.0

  sql/ha_innodb.cc
    1.275 05/10/24 23:57:09 brian@zim.(none) +0 -0
    Auto merged

ChangeSet
  1.1932.352.2 05/10/24 23:55:44 brian@zim.(none) +3 -0
  Additional test request by Jonas. We check pushdown conditions for GEOM types. 

  mysql-test/r/innodb_gis.result
    1.1 05/10/24 23:55:36 brian@zim.(none) +688 -0
    New BitKeeper file ``mysql-test/r/innodb_gis.result''

  mysql-test/t/ndb_gis.test
    1.2 05/10/24 23:55:36 brian@zim.(none) +1 -0
    pushdown conditions now checked for geom  types

  mysql-test/r/ndb_gis.result
    1.2 05/10/24 23:55:36 brian@zim.(none) +1 -0
    Result file change to check pushdown conditions. 

  mysql-test/r/innodb_gis.result
    1.0 05/10/24 23:55:36 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-5.0/mysql-test/r/innodb_gis.result

ChangeSet
  1.1932.352.1 05/10/24 23:20:39 brian@zim.(none) +12 -0
  This patch add support for storing Geometry types to Archive, Innodb, NDB, and BDB.

  mysql-test/t/ndb_gis.test
    1.1 05/10/24 23:20:28 brian@zim.(none) +4 -0
    New BitKeeper file ``mysql-test/t/ndb_gis.test''

  mysql-test/t/innodb_gis.test
    1.1 05/10/24 23:20:28 brian@zim.(none) +4 -0
    New BitKeeper file ``mysql-test/t/innodb_gis.test''

  mysql-test/t/ndb_gis.test
    1.0 05/10/24 23:20:28 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-5.0/mysql-test/t/ndb_gis.test

  mysql-test/t/innodb_gis.test
    1.0 05/10/24 23:20:28 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-5.0/mysql-test/t/innodb_gis.test

  mysql-test/t/bdb_gis.test
    1.1 05/10/24 23:20:27 brian@zim.(none) +4 -0
    New BitKeeper file ``mysql-test/t/bdb_gis.test''

  mysql-test/t/archive_gis.test
    1.1 05/10/24 23:20:27 brian@zim.(none) +4 -0
    New BitKeeper file ``mysql-test/t/archive_gis.test''

  mysql-test/r/ndb_gis.result
    1.1 05/10/24 23:20:27 brian@zim.(none) +688 -0
    New BitKeeper file ``mysql-test/r/ndb_gis.result''

  mysql-test/r/bdb_gis.result
    1.1 05/10/24 23:20:27 brian@zim.(none) +688 -0
    New BitKeeper file ``mysql-test/r/bdb_gis.result''

  mysql-test/t/bdb_gis.test
    1.0 05/10/24 23:20:27 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-5.0/mysql-test/t/bdb_gis.test

  mysql-test/t/archive_gis.test
    1.0 05/10/24 23:20:27 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-5.0/mysql-test/t/archive_gis.test

  mysql-test/r/ndb_gis.result
    1.0 05/10/24 23:20:27 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-5.0/mysql-test/r/ndb_gis.result

  mysql-test/r/bdb_gis.result
    1.0 05/10/24 23:20:27 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-5.0/mysql-test/r/bdb_gis.result

  mysql-test/r/archive_gis.result
    1.1 05/10/24 23:20:26 brian@zim.(none) +691 -0
    New BitKeeper file ``mysql-test/r/archive_gis.result''

  mysql-test/include/gis_generic.inc
    1.1 05/10/24 23:20:26 brian@zim.(none) +398 -0
    New BitKeeper file ``mysql-test/include/gis_generic.inc''

  sql/ha_ndbcluster.cc
    1.217 05/10/24 23:20:26 brian@zim.(none) +4 -2
    Adding Geometry support to NDB.

  sql/ha_innodb.cc
    1.273.1.1 05/10/24 23:20:26 brian@zim.(none) +2 -0
    Adding geometry support to Innodb. 

  sql/ha_berkeley.cc
    1.159 05/10/24 23:20:26 brian@zim.(none) +1 -0
    Adding geometry support to berkely

  sql/ha_archive.h
    1.31 05/10/24 23:20:26 brian@zim.(none) +1 -1
    Adding support for Geometry type to archive. 

  mysql-test/r/archive_gis.result
    1.0 05/10/24 23:20:26 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-5.0/mysql-test/r/archive_gis.result

  mysql-test/include/gis_generic.inc
    1.0 05/10/24 23:20:26 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-5.0/mysql-test/include/gis_generic.inc

ChangeSet
  1.1932.351.1 05/10/25 09:01:47 timour@mysql.com +3 -0
  Merge mysql.com:/home/timka/mysql/src/5.0-virgin
  into  mysql.com:/home/timka/mysql/src/5.0-bug-13832

  sql/sql_yacc.yy
    1.434.1.4 05/10/25 09:01:42 timour@mysql.com +0 -0
    Auto merged

  mysql-test/t/select.test
    1.88 05/10/25 09:01:42 timour@mysql.com +0 -0
    Auto merged

  mysql-test/r/select.result
    1.107 05/10/25 09:01:42 timour@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1932.350.1 05/10/25 09:00:57 timour@mysql.com +3 -0
  Fix for BUG#13832 - Unknown column t1.a in 'on clause'.
  
  The cause for the bug is that the priorities of all rules/terminals
  that process the FROM clause are not fully specified, and the
  parser generator produces a parser that doesn't always parse
  the FROM clause so that JOINs are left-associative. As a result
  the final join tree produced by the parser is incorrect, which
  is the cause for subsequent name resolution to fail.

  sql/sql_yacc.yy
    1.434.2.1 05/10/25 09:00:49 timour@mysql.com +23 -9
    Fix for BUG#13832 - Unknown column t1.a in 'on clause'.
    
    List all join-related operators as having lower priority
    than the join operands to make the parser process join-
    related productions from left to right.

  mysql-test/t/select.test
    1.86.1.1 05/10/25 09:00:49 timour@mysql.com +14 -0
    Test for BUG#13832.

  mysql-test/r/select.result
    1.105.1.1 05/10/25 09:00:49 timour@mysql.com +12 -0
    Test for BUG#13832.

ChangeSet
  1.1932.1.93 05/10/25 03:00:09 kent@mysql.com +2 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread
  into mysql.com:/Users/kent/mysql/bk/mysql-5.0

  mysql-test/mysql-test-run.sh
    1.278 05/10/25 03:00:04 kent@mysql.com +3 -1

  Makefile.am
    1.80 05/10/25 02:57:48 kent@mysql.com +13 -17

ChangeSet
  1.1616.2369.14 05/10/25 02:36:51 kent@mysql.com +2 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread
  into mysql.com:/Users/kent/mysql/bk/mysql-4.1

  mysql-test/mysql-test-run.sh
    1.208.1.48 05/10/25 02:36:47 kent@mysql.com +3 -1

  Makefile.am
    1.60.1.13 05/10/25 02:34:03 kent@mysql.com +3 -10

ChangeSet
  1.1346.858.2 05/10/25 02:27:55 kent@mysql.com +2 -0
  Makefile.am:
    Option to set environment variable MTR_BUILD_THREAD to a small
    number, from what mysql-test-run calculate port numbers that
    will not conflict with other runs with different thread num

  mysql-test/mysql-test-run.sh
    1.146.1.54 05/10/25 02:27:08 kent@mysql.com +17 -0

  Makefile.am
    1.40.1.14 05/10/25 02:25:52 kent@mysql.com +8 -9
    Option to set environment variable MTR_BUILD_THREAD to a small
    number, from what mysql-test-run calculate port numbers that
    will not conflict with other runs with different thread num

ChangeSet
  1.1616.2369.13 05/10/25 02:27:40 monty@mysql.com +15 -0
  Added more tests for new UPDATE ... ORDER BY ... LIMIT optimization

  sql/structs.h
    1.36.1.6 05/10/25 02:27:29 monty@mysql.com +0 -1
    Removed not needed structure element

  sql/sql_update.cc
    1.83.2.63 05/10/25 02:27:29 monty@mysql.com +11 -13
    Simplify code
    Fixed bug when one is updating an index column that could be used with ORDER BY

  sql/sql_load.cc
    1.46.3.39 05/10/25 02:27:29 monty@mysql.com +2 -5
    Simplify 

  sql/records.cc
    1.19.1.13 05/10/25 02:27:29 monty@mysql.com +86 -102
    Simplify new rr_index() code
    Create common error handling function for rr_() functions.
    Remove loop from rr_index() as handler::index_next() can never return HA_ERR_RECORD_DELETED

  mysys/my_handler.c
    1.16.1.5 05/10/25 02:27:29 monty@mysql.com +3 -11
    Remove SEARCH_RETURN_B_POS and instead always send an array to ha_key_cmp() as last argument
    (This removes an if in a loop at the expensive of an int on the stack)

  mysql-test/t/update.test
    1.19.1.5 05/10/25 02:27:29 monty@mysql.com +9 -4
    Added more tests for new UPDATE ... ORDER BY ... LIMIT optimization

  mysql-test/r/update.result
    1.22.1.4 05/10/25 02:27:29 monty@mysql.com +23 -8
    Added more tests for new UPDATE ... ORDER BY ... LIMIT optimization

  myisammrg/myrg_queue.c
    1.11 05/10/25 02:27:29 monty@mysql.com +2 -2
    Change arguments to ha_key_cmp

  myisam/mi_write.c
    1.46.1.3 05/10/25 02:27:29 monty@mysql.com +3 -3
    Change arguments to ha_key_cmp

  myisam/mi_search.c
    1.49.1.6 05/10/25 02:27:29 monty@mysql.com +9 -9
    Change arguments to ha_key_cmp

  myisam/mi_rnext_same.c
    1.14.1.3 05/10/25 02:27:29 monty@mysql.com +2 -2
    Change arguments to ha_key_cmp

  myisam/mi_check.c
    1.105.1.49 05/10/25 02:27:29 monty@mysql.com +18 -18
    Change arguments to ha_key_cmp

  include/my_base.h
    1.58.1.6 05/10/25 02:27:29 monty@mysql.com +0 -2
    Remove SEARCH_RETURN_B_POS and instead always send an array to ha_key_cmp() as last argument

  heap/hp_create.c
    1.14.1.4 05/10/25 02:27:29 monty@mysql.com +2 -2
    Change arguments to ha_key_cmp

  heap/_check.c
    1.16.1.1 05/10/25 02:27:28 monty@mysql.com +2 -2
    Change arguments to ha_key_cmp

ChangeSet
  1.1932.346.4 05/10/25 00:23:14 lars@mysql.com +1 -0
  Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
  into  mysql.com:/users/lthalmann/bk/mysql-5.0-enum-logtype

  sql/log_event.h
    1.121 05/10/25 00:23:06 lars@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1932.345.2 05/10/24 23:09:14 lars@mysql.com +1 -0
  Fixed enum numbering, patch 2

  sql/log_event.h
    1.115.1.4 05/10/24 23:08:51 lars@mysql.com +21 -11
    One enum value per line
    Fixed a mistake
    Added values to every line for strange compilers

ChangeSet
  1.1932.348.1 05/10/25 00:54:04 anozdrin@mysql.com +6 -0
  Fix for BUG#13095: Cannot create VIEWs in prepared statements
    - allow CREATE VIEW as well as DROP VIEW to use in prepared statements;
    - fix CREATE VIEW implementation to make it work in prepared statements.

  sql/sql_yacc.yy
    1.434.1.3 05/10/25 00:53:56 anozdrin@mysql.com +2 -0
    Remember start of whole CREATE VIEW statement as well as start of its
    SELECT part.

  sql/sql_view.cc
    1.71 05/10/25 00:53:55 anozdrin@mysql.com +2 -1
    Use stored start of whole CREATE VIEW statement instead of thd->query,
    which differs from the original when prepared statement is executing.

  sql/sql_prepare.cc
    1.160 05/10/25 00:53:55 anozdrin@mysql.com +2 -0
    Allow CREATE VIEW and DROP VIEW to use in prepared statements.

  sql/sql_lex.h
    1.203 05/10/25 00:53:55 anozdrin@mysql.com +1 -0
    Added a variable to remember start of whole CREATE VIEW statement
    as well as start of its SELECT part.

  mysql-test/t/sp.test
    1.161 05/10/25 00:53:55 anozdrin@mysql.com +56 -0
    Test case for BUG#13095.

  mysql-test/r/sp.result
    1.167 05/10/25 00:53:55 anozdrin@mysql.com +43 -0
    Results file for the test case for BUG#13095.

ChangeSet
  1.1932.347.1 05/10/24 13:51:05 patg@krsna.patg.net +2 -0
  Disabled federated test, added then removed
  federated.disabled and instead using disabled.def (per
  comments in this commit)
  
  disabled.def:
    disabled federated until bug 14272 is fixed.
  .del-federated.disabled~9e4cca59f547174d:
    Delete: mysql-test/t/federated.disabled
  federated.disabled:
    New BitKeeper file ``t/federated.disabled'' to disable federated test until
    Bug 14272 is fixed.
    new file

  mysql-test/t/disabled.def
    1.7 05/10/24 13:46:09 patg@krsna.patg.net +1 -0
    disabled federated until bug 14272 is fixed.

  BitKeeper/deleted/.del-federated.disabled~9e4cca59f547174d
    1.2 05/10/24 13:45:29 patg@krsna.patg.net +0 -0
    Delete: mysql-test/t/federated.disabled

  mysql-test/t/federated.disabled
    1.1 05/10/24 13:40:49 patg@krsna.patg.net +1 -0
    New BitKeeper file ``t/federated.disabled'' to disable federated test until
    Bug 14272 is fixed.

  mysql-test/t/federated.disabled
    1.0 05/10/24 13:40:49 patg@krsna.patg.net +0 -0
    BitKeeper file /home/patg/mysql-build/mysql-5.0.test2/mysql-test/t/federated.disabled

ChangeSet
  1.1932.346.1 05/10/25 00:27:15 sergefp@mysql.com +1 -0
  BUG#11704: Make InnoDB not to convert TL_WRITE_ONLY locks to TL_WRITE_ALLOW_WRITE in 
  OPTIMIZE TABLE.

  sql/ha_innodb.cc
    1.274 05/10/25 00:27:04 sergefp@mysql.com +1 -0
    Fix for BUG#11704: "Found locks from different thread" warnings:
    The source of warnings was this scenario in OPTIMIZE:
      thr1: lock table with TL_WRITE_ONLY (InnoDB converts lock to TL_WRITE_ALLOW_WRITE)
      thr2: (UPDATE command) obtains a TL_WRITE_ALLOW_WRITE lock
      thr1: call mysql_lock_abort(). This function sets type of thr'1 lock to TL_WRITE_ONLY
      thr2: try to release thr2's lock. See two locks: TL_WRITE_ONLY, TL_WRITE_ALLOW_WRITE 
            and produce a warning.
    
    The fix: Make InnoDB not to convert TL_WRITE_ONLY locks to TL_WRITE_ALLOW_WRITE in
    OPTIMIZE TABLE.

ChangeSet
  1.1932.1.90 05/10/24 20:03:40 lars@mysql.com +2 -0
  Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
  into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64

  ndb/src/mgmsrv/Services.cpp
    1.57 05/10/24 20:03:27 lars@mysql.com +0 -0
    Auto merged

  ndb/src/mgmapi/mgmapi.cpp
    1.55 05/10/24 20:03:27 lars@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1932.345.1 05/10/24 19:06:32 lars@mysql.com +1 -0
  Reducing risk for incorrect merges.  Since we are multiple teams working on 
  different features, adding numbering to enums reduce the risk that code will
  be merged incorrectly.  This particular enum must have fixed values to ensure
  that an upgraded server always can read old logs.  I added this, since I 
  noticed the incorrect order in the RBR clone.

  sql/log_event.h
    1.115.1.3 05/10/24 19:06:05 lars@mysql.com +10 -9
    Added numbering of enum values

ChangeSet
  1.1932.344.2 05/10/24 20:08:56 SergeyV@selena. +1 -0
  Fixes bug #14137. Converts charsets_dir path to underlying 
  system representation.

  sql/mysqld.cc
    1.512.3.1 05/10/24 20:08:41 SergeyV@selena. +1 -0
    Added code to convert charsets_dir path to system representation.

ChangeSet
  1.1932.344.1 05/10/24 15:05:06 msvensson@neptunus.mysql.com +2 -0
  Fix for dropping a table with frm file consisting of "junk"

  sql/sql_table.cc
    1.273.1.8 05/10/24 15:03:28 msvensson@neptunus.mysql.com +2 -1
    Reset error if table_type is unknown. ie. the .frm file could not be opened 

  mysql-test/r/show_check.result
    1.75 05/10/24 15:03:28 msvensson@neptunus.mysql.com +7 -7
    Move result to correct place

ChangeSet
  1.1932.343.1 05/10/24 16:45:27 ramil@mysql.com +1 -0
  a fix (bug #14207: strange change of values CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH).

  sql/sql_show.cc
    1.290.1.4 05/10/24 16:45:08 ramil@mysql.com +3 -3
    a fix (bug #14207: strange change of values CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH).
    Interchange of CHARACTER_MAXIMUM_LENGTH and CHARACTER_OCTET_LENGTH.

ChangeSet
  1.1935 05/10/24 11:36:29 ramil@mysql.com +4 -0
  Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/usr/home/ram/work/5.0.b10303

  sql/sql_select.cc
    1.366 05/10/24 11:36:18 ramil@mysql.com +0 -0
    Auto merged

  sql/sql_cache.cc
    1.85 05/10/24 11:36:17 ramil@mysql.com +0 -0
    Auto merged

  mysql-test/t/query_cache.test
    1.49 05/10/24 11:36:17 ramil@mysql.com +0 -0
    Auto merged

  mysql-test/r/query_cache.result
    1.65 05/10/24 11:36:17 ramil@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1932.342.1 05/10/22 18:17:11 sasha@asksasha.com +1 -0
  fix for BUG#12974: mysqld segfaults when depreciated option --sql-bin-update-same is used

  sql/mysqld.cc
    1.512.1.5 05/10/22 18:16:54 sasha@asksasha.com +1 -1
    fix for BUG#12974: mysqld segfaults when depreciated option --sql-bin-update-same is used

ChangeSet
  1.1616.2369.12 05/10/23 02:49:57 sergefp@mysql.com +1 -0
  Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/psergey/mysql-4.1-nulls-stats-r2

  sql/mysqld.cc
    1.356.98.17 05/10/23 02:49:55 sergefp@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2373.2 05/10/23 02:46:10 sergefp@mysql.com +3 -0
  BUG#9622: post-review-fixes: better comments

  mysys/my_handler.c
    1.16.1.4 05/10/23 02:46:04 sergefp@mysql.com +19 -7
    BUG#9622: post-review-fixes: better comments

  myisam/mi_check.c
    1.105.1.48 05/10/23 02:46:04 sergefp@mysql.com +32 -22
    BUG#9622: post-review-fixes: better comments

  include/myisam.h
    1.63.1.3 05/10/23 02:46:04 sergefp@mysql.com +1 -1
    BUG#9622: post-review-fixes: better comments

ChangeSet
  1.1616.2369.11 05/10/21 19:54:34 jimw@mysql.com +2 -0
  Fix merge of test that left out a drop table.

  mysql-test/t/loaddata.test
    1.7.1.3 05/10/21 19:54:29 jimw@mysql.com +1 -0
    Add missing drop table

  mysql-test/r/loaddata.result
    1.14.1.3 05/10/21 19:54:29 jimw@mysql.com +1 -0
    Update esults

ChangeSet
  1.1616.2369.10 05/10/21 17:57:51 jimw@mysql.com +3 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-11203
  into  mysql.com:/home/jimw/my/mysql-4.1-clean

  mysql-test/t/loaddata.test
    1.7.1.2 05/10/21 17:57:47 jimw@mysql.com +2 -2
    Resolve conflict

  mysql-test/r/loaddata.result
    1.14.1.2 05/10/21 17:57:47 jimw@mysql.com +0 -0
    Resolve conflict

  sql/sql_load.cc
    1.46.3.38 05/10/21 17:56:51 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2369.9 05/10/21 14:56:59 serg@serg.mylan +1 -0
  compilation failure fixed

  sql/item.cc
    1.58.1.169 05/10/21 14:56:47 serg@serg.mylan +1 -1
    compilation failure fixed

ChangeSet
  1.1932.341.2 05/10/21 16:58:10 bar@mysql.com +1 -0
  ctype_utf8.result:
    After merge fix.

  mysql-test/r/ctype_utf8.result
    1.82 05/10/21 16:57:50 bar@mysql.com +9 -9
    After merge fix.

ChangeSet
  1.1932.341.1 05/10/21 16:53:50 bar@mysql.com +8 -0
  Merge mysql.com:/usr/home/bar/mysql-4.1
  into  mysql.com:/usr/home/bar/mysql-5.0.b12371

  tests/mysql_client_test.c
    1.160 05/10/21 16:53:36 bar@mysql.com +92 -0
    After merge fix.

  sql/item_strfunc.h
    1.99 05/10/21 16:50:24 bar@mysql.com +0 -6
    After merge fix.

  mysql-test/r/show_check.result
    1.74 05/10/21 16:49:25 bar@mysql.com +7 -7
    After merge fix.

  mysql-test/r/ctype_utf8.result
    1.81 05/10/21 16:48:50 bar@mysql.com +9 -9
    After merge fix.

  sql/sql_yacc.yy
    1.434.1.2 05/10/21 16:46:51 bar@mysql.com +0 -2
    Auto merged

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.85.1.1 05/10/21 16:46:51 bar@mysql.com +0 -0
    Auto merged

  mysql-test/t/show_check.test
    1.54 05/10/21 16:46:50 bar@mysql.com +0 -0
    Auto merged

  mysql-test/t/ctype_utf8.test
    1.76 05/10/21 16:46:50 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1932.327.2 05/10/21 13:08:00 pem@mysql.com +1 -0
  Post-review fix.

  sql/sp_head.cc
    1.193 05/10/21 13:07:50 pem@mysql.com +4 -3
    Post-review fix; changed string copying method (+ fixed comment typo and indention).

ChangeSet
  1.1616.2369.8 05/10/21 14:41:56 bar@mysql.com +4 -0
    Bug#13233
    select distinct char(column) fails with utf8
  ctype_utf8.result, ctype_utf8.test:
    Adding test case
  sql_yacc.yy:
    Adding new syntax.
  item_strfunc.h:
    Fixing wrong max_length calculation.
    Also, adding CHAR(x USING charset),
    for easier migrating from 4.1 to 5.0,
    according to Monty's suggestion.

  mysql-test/r/ctype_utf8.result
    1.45.1.22 05/10/21 14:40:47 bar@mysql.com +9 -0
    Adding test case

  mysql-test/t/ctype_utf8.test
    1.57.1.12 05/10/21 14:40:42 bar@mysql.com +9 -0
    Adding test case

  sql/sql_yacc.yy
    1.203.1.193 05/10/21 14:39:55 bar@mysql.com +2 -0
    Adding new syntax.

  sql/item_strfunc.h
    1.73.2.12 05/10/21 14:38:58 bar@mysql.com +6 -3
    Bug#13233
    select distinct char(column) fails with utf8
    Also, adding CHAR(x USING charset),
    for easier migrating from 4.1 to 5.0.

ChangeSet
  1.1932.338.1 05/10/21 13:14:54 gluh@eagle.intranet.mysql.r18.ru +3 -0
  fix for bug#14089 FROM list subquery always fails when 
                    information_schema is current database
    skip the check of I_S tables if table is derived table

  sql/sql_parse.cc
    1.506.1.2 05/10/21 13:14:45 gluh@mysql.com +2 -2
    fix for bug#14089 FROM list subquery always fails when 
                      information_schema is current database
      skip the check of I_S tables if table is derived table

  mysql-test/t/information_schema.test
    1.59.1.1 05/10/21 13:14:45 gluh@mysql.com +12 -0
    fix for bug#14089 FROM list subquery always fails when 
                      information_schema is current database
      test case

  mysql-test/r/information_schema.result
    1.85 05/10/21 13:14:45 gluh@mysql.com +12 -0
    fix for bug#14089 FROM list subquery always fails when 
                      information_schema is current database
      test case

ChangeSet
  1.1932.310.4 05/10/21 06:44:42 jonas@perch.ndb.mysql.com +1 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.86 05/10/21 06:44:38 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2303.8 05/10/21 06:41:49 jonas@perch.ndb.mysql.com +2 -0
  bug#14199 - ndb leak of index opertaions in TC leading to error 288

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.42.1.18 05/10/21 06:41:46 jonas@perch.ndb.mysql.com +29 -1
    New dump for index operation count
    Fix leak on index ops

  ndb/include/kernel/signaldata/DumpStateOrd.hpp
    1.4 05/10/21 06:41:46 jonas@perch.ndb.mysql.com +2 -0
    New dump for index operation count

ChangeSet
  1.1616.2373.1 05/10/21 06:29:17 sergefp@mysql.com +12 -0
  BUG#9622, stage 2, work together with fix for BUG#12232:
  added "nulls_ignored" index statistics collection method for MyISAM tables.
  (notification trigger: this is about BUG#9622).

  sql/mysqld.cc
    1.356.106.1 05/10/21 06:29:11 sergefp@mysql.com +16 -5
    BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.

  sql/ha_myisam.cc
    1.115.1.47 05/10/21 06:29:11 sergefp@mysql.com +1 -1
    BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.

  mysys/my_handler.c
    1.16.1.3 05/10/21 06:29:11 sergefp@mysql.com +97 -2
    BUG#9622: ha_key_cmp() now supports new SEARCH_RETURN_B_POS flag, added ha_find_null()

  mysql-test/t/myisam.test
    1.33.1.9 05/10/21 06:29:11 sergefp@mysql.com +19 -0
    Testcase for BUG9622

  mysql-test/r/myisam.result
    1.45.1.9 05/10/21 06:29:11 sergefp@mysql.com +32 -0
    Testcase for BUG9622

  myisam/sort.c
    1.35.1.10 05/10/21 06:29:11 sergefp@mysql.com +6 -2
    BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.

  myisam/myisamdef.h
    1.59.1.22 05/10/21 06:29:11 sergefp@mysql.com +7 -0
    BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.

  myisam/myisamchk.c
    1.92.1.37 05/10/21 06:29:11 sergefp@mysql.com +20 -4
    BUG#9622: Added nulls_ignored index statistics collection method for MyISAM

  myisam/mi_check.c
    1.105.1.47 05/10/21 06:29:11 sergefp@mysql.com +161 -15
    BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method, added 
     mi_collect_stats_*(), updated update_key_parts() to deal with all 3 methods. 

  include/myisam.h
    1.63.1.2 05/10/21 06:29:11 sergefp@mysql.com +12 -2
    BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.

  include/my_handler.h
    1.5.1.1 05/10/21 06:29:11 sergefp@mysql.com +2 -0
    BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method: added ha_find_null()

  include/my_base.h
    1.58.1.5 05/10/21 06:29:11 sergefp@mysql.com +2 -0
    BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method:
    Added SEARCH_RETURN_B_POS flag for ha_key_cmp()

ChangeSet
  1.1932.336.1 05/10/21 04:01:52 andrey@lmy004. +8 -0
  fix for bug #12595 (ESCAPE must be exactly 1 character long)
  ESCAPE has length of 1 if specified and sql_mode is NO_BACKSLASH_ESCAPES
  or has length of 0 or 1 in every other situation.
  (approved patch applied on a up-to-date tree re-commit) 

  sql/sql_yacc.yy
    1.434.1.1 05/10/21 04:01:32 andrey@lmy004. +8 -4
    initialize Lex->escape_used and then use it when reducing.
    This is needed as fix for bug #12595 to distinguish between
    situation where ESCAPE was found and when not because internally
    we may pass a string an empty string and there is no other way
    to find out whether this is correct or not in case of 
    NO_BACKSLASH_ESCAPES mode, which allows only length of 1 if
    ESCAPE is part of the SQL statement.

  sql/sql_lex.h
    1.202 05/10/21 04:01:32 andrey@lmy004. +2 -0
    new variable used for transfering information when
    reducing in the grammar.

  sql/sql_lex.cc
    1.172 05/10/21 04:01:32 andrey@lmy004. +1 -0
    initialized variable used to transfer information during
    parsing up in the stack when reducing in the grammar

  sql/sql_help.cc
    1.51 05/10/21 04:01:32 andrey@lmy004. +2 -1
    pass FALSE for escape_used_in_parsing because we
    want the default mode of no error checking - our internal code.

  sql/item_cmpfunc.h
    1.116 05/10/21 04:01:31 andrey@lmy004. +5 -2
    pass variable from the parsing stage - whether
    ESCAPE clause was found in the statement

  sql/item_cmpfunc.cc
    1.183 05/10/21 04:01:31 andrey@lmy004. +9 -0
    if ESCAPE was in the statement check whether its length is
    different than 1. In NO_BACKSLASH_ESCAPES mode only length of 1 is
    allowed, otherwise the length could be 0 or 1 character (code point
    in the sense of Unicode).

  mysql-test/t/select.test
    1.87 05/10/21 04:01:30 andrey@lmy004. +39 -0
    test for bug #12595 (ESCAPE must be exactly one character long)

  mysql-test/r/select.result
    1.106 05/10/21 04:01:30 andrey@lmy004. +57 -0
    results of test for bug 12595

ChangeSet
  1.1932.335.1 05/10/21 03:25:07 petr@mysql.com +1 -0
  Fix Bug#14107 (IM test failures on QNX)
  (v.2 with post-review fixes)

  server-tools/instance-manager/instance.cc
    1.29 05/10/21 03:24:53 petr@mysql.com +13 -3
    On QNX one cannot use fork() in multithreaded environment. Therefore we should use QNX's spawn()

ChangeSet
  1.1932.334.1 05/10/20 23:23:33 kent@mysql.com +2 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
  into mysql.com:/Users/kent/mysql/bk/mysql-5.0

  mysql-test/mysql-test-run.pl
    1.51.1.4 05/10/20 23:23:29 kent@mysql.com +0 -0
    Auto merged

  client/mysql.cc
    1.187 05/10/20 23:23:29 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1932.333.1 05/10/20 13:37:54 kent@mysql.com +1 -0
  configure.in:
    Set the version number to 5.0.16

  configure.in
    1.358 05/10/20 13:36:45 kent@mysql.com +2 -2
    Set the version number to 5.0.16

ChangeSet
  1.1932.332.1 05/10/20 10:14:25 guilhem@mysql.com +1 -0
  Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/mysql_src/mysql-5.0

  sql/sql_parse.cc
    1.508 05/10/20 10:14:20 guilhem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1932.330.4 05/10/20 11:56:27 bar@mysql.com +4 -0
     Bug#12371: executing prepared statement fails (illegal mix of collations)
  ctype_utf8.test, ctype_utf8.result:
    Adding test case.
  item.h:
  item.cc:
    Adding Item_param::safe_charset_converter

  mysql-test/t/ctype_utf8.test
    1.75 05/10/20 11:55:37 bar@mysql.com +17 -0
    Adding test case.

  mysql-test/r/ctype_utf8.result
    1.80 05/10/20 11:55:31 bar@mysql.com +17 -0
    Adding test case.

  sql/item.h
    1.176 05/10/20 11:55:25 bar@mysql.com +1 -0
    Adding Item_param::safe_charset_converter

  sql/item.cc
    1.191 05/10/20 11:54:56 bar@mysql.com +27 -1
     Bug#12371: executing prepared statement fails (illegal mix of collations)
    Adding Item_param::safe_charset_converter

ChangeSet
  1.1932.330.3 05/10/20 11:12:34 bar@mysql.com +1 -0
  Merge mysql.com:/usr/home/bar/mysql-4.1
  into  mysql.com:/usr/home/bar/mysql-5.0

  mysys/charset.c
    1.147 05/10/20 11:12:26 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2369.5 05/10/20 10:30:51 bar@mysql.com +1 -0
  charset.c:
    Bug#13238 mysqldump and mysqladmin hangs
    Avoid recursion into init_available_charsets.
    Serg's version didn't work for me: I got 
    double mutex locking.
    Pushing this version instead
    (It was approved by Serg anyway)

  mysys/charset.c
    1.135.1.8 05/10/20 10:29:06 bar@mysql.com +19 -12
    Bug#13238 mysqldump and mysqladmin hangs
    Avoid recursion into init_available_charsets.
    Serg's version didn't work for me: I got 
    double mutex locking.
    Pushing this version instead
    (It was approved by Serg anyway)

ChangeSet
  1.1932.330.2 05/10/19 13:47:05 jimw@mysql.com +9 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-clean
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  strings/ctype-ucs2.c
    1.57 05/10/19 13:47:02 jimw@mysql.com +0 -1
    Resolve conflicts

  strings/ctype-simple.c
    1.75 05/10/19 13:47:02 jimw@mysql.com +0 -1
    Resolve conflicts

  sql/sql_acl.cc
    1.176 05/10/19 13:47:02 jimw@mysql.com +1 -2
    Resolve conflicts

  mysql-test/t/variables.test
    1.50 05/10/19 13:47:02 jimw@mysql.com +9 -7
    Resolve conflicts

  mysql-test/r/variables.result
    1.75 05/10/19 13:47:02 jimw@mysql.com +3 -3
    Resolve conflicts

  sql/mysqld.cc
    1.512.1.4 05/10/19 13:43:41 jimw@mysql.com +0 -0
    Auto merged

  sql/item_func.cc
    1.259.2.1 05/10/19 13:43:41 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/mysql_test_run_new.c
    1.14 05/10/19 13:43:40 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/my_manage.c
    1.9 05/10/19 13:43:40 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1932.287.37 05/10/19 22:00:12 kent@mysql.com +1 -0
  mysql.spec.sh:
    Made yaSSL support an option (off by default)

  support-files/mysql.spec.sh
    1.122 05/10/19 21:58:06 kent@mysql.com +13 -0
    Made yaSSL support an option (off by default)

