ChangeSet
  1.2174 05/04/01 12:35:49 msvensson@neptunus.(none) +2 -0
  Manual merge

  sql/ha_berkeley.cc
    1.148 05/04/01 12:35:47 msvensson@neptunus.(none) +0 -3
    Manual merge, fix already applied to 4.1

  BitKeeper/etc/logging_ok
    1.375 05/04/01 12:34:09 msvensson@neptunus.(none) +0 -1
    auto-union

ChangeSet
  1.1346.1.735 05/04/01 12:32:47 msvensson@neptunus.(none) +2 -0
  BUG#6554 Problem Building MySql on Fedora Core 3
   - Remove the local static var

  BitKeeper/etc/logging_ok
    1.206.1.127 05/04/01 12:32:47 msvensson@neptunus.(none) +1 -0
    Logging to logging@openlogging.org accepted

  sql/ha_berkeley.cc
    1.105.1.13 05/04/01 12:32:42 msvensson@neptunus.(none) +3 -1
    Remove local static var, make it local in file instead.

ChangeSet
  1.2173 05/04/01 11:05:17 sergefp@mysql.com +1 -0
  Better comment

  sql/sql_select.cc
    1.392 05/04/01 11:05:14 sergefp@mysql.com +3 -2
    Better comment

ChangeSet
  1.2160.6.1 05/03/31 20:27:29 serg@serg.mylan +1 -0
  include sql/examples in the window source distribution

  scripts/make_win_src_distribution.sh
    1.31 05/03/31 20:27:22 serg@serg.mylan +1 -1
    include sql/examples in the window source distribution

ChangeSet
  1.2169.1.1 05/03/31 19:18:50 mskold@mysql.com +1 -0
  Fixed so no merge conflict with 5.0

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.31 05/03/31 19:17:09 mskold@mysql.com +2 -1
    Fixed so no merge conflict with

ChangeSet
  1.2170 05/03/31 20:23:10 sergefp@mysql.com +2 -0
  Make the tests deterministic: change DELETE ... LIMIT to DELETE ... ORDER BY ... LIMIT 

  mysql-test/t/group_by.test
    1.34 05/03/31 20:23:08 sergefp@mysql.com +2 -1
    Make the tests deterministic: change DELETE ... LIMIT to DELETE ... ORDER BY ... LIMIT 

  mysql-test/r/group_by.result
    1.44 05/03/31 20:23:08 sergefp@mysql.com +1 -1
    Make the tests deterministic: change DELETE ... LIMIT to DELETE ... ORDER BY ... LIMIT 

ChangeSet
  1.2153.4.2 05/03/31 14:31:06 mskold@mysql.com +1 -0
  Removed warnings

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.30 05/03/31 14:30:13 mskold@mysql.com +3 -2
    Removed warnings

ChangeSet
  1.2164.1.2 05/03/31 14:25:03 petr@mysql.com +1 -0
  Bug #9507 /etc/init.d/mysql script does not stop mysqld correctly
  wait_for_pid function is fixed to wait for pid removal in "stop".
  recomitted with post-review fix  

  support-files/mysql.server.sh
    1.37 05/03/31 14:25:00 petr@mysql.com +14 -3
    wait_for_pid function corrected to work properly with start/stop

ChangeSet
  1.2167 05/03/31 10:47:32 msvensson@neptunus.(none) +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into neptunus.(none):/home/msvensson/mysql/mysql-4.1

  sql/item_subselect.h
    1.60 05/03/31 10:47:31 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/item.h
    1.176 05/03/31 10:47:30 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/item.cc
    1.197 05/03/31 10:47:30 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2164.1.1 05/03/31 03:44:51 konstantin@mysql.com +1 -0
  A fix for Bug#9443 "mysql_client_test fails on linux and some solaris 
  platforms": yet another issue with floating pointer comparisons.
  The fix uses the workaround with volatiles.

  sql/item_cmpfunc.cc
    1.185 05/03/31 03:44:46 konstantin@mysql.com +8 -2
    A fix for the failing mysql_client_test on some Intel platforms
    when compiled with optimization.
    We don't use -ffloat-store compileation as it may slow all
    floating point operations.

ChangeSet
  1.2165 05/03/30 22:17:11 pekka@mysql.com +1 -0
  ndb - CSC#4927: ordered index + long pk, second half

ChangeSet
  1.2163 05/03/30 23:08:03 bell@sanja.is.com.ua +2 -0
  postmerge fixes

  sql/item.cc
    1.196 05/03/30 23:07:59 bell@sanja.is.com.ua +22 -16
    work around about varchar in 4.1

  mysql-test/r/metadata.result
    1.9 05/03/30 23:07:59 bell@sanja.is.com.ua +4 -4
    postmerge change

  ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
    1.26 05/03/30 21:54:18 pekka@mysql.com +20 -0
    ACC_LOCKREQ - element may have moved after lock request was made

ChangeSet
  1.2162 05/03/30 22:11:08 bell@sanja.is.com.ua +2 -0
  merge

  sql/sql_select.cc
    1.391 05/03/30 22:11:05 bell@sanja.is.com.ua +0 -1
    merge

  sql/sql_parse.cc
    1.431 05/03/30 22:08:53 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.2160.5.3 05/03/30 20:39:37 joerg@mysql.com +1 -0
  Fix 'Bootstrap' to bypass a problem with "bk changes" by changing the directory before calling the command.

  Build-tools/Bootstrap
    1.26 05/03/30 20:39:34 joerg@mysql.com +25 -13
    Bypass a BK problem with "bk changes": It stopped delivering changeset comments when
    1) it encountered a single, unbroken line with about 1k characters  AND
    2) it was applied not to the current directory but to a named BK root directory.
    
    As 1) cannot be changed post-factum (and might happen again),
    the "bk changes" command is now preceded by a "cd $REPO".
    
    Do some renaming of variables used around the "bk changes" call to improve documentation.

ChangeSet
  1.2160.5.2 05/03/30 18:38:54 joerg@mysql.com +1 -0
  Portability fix (avoid bash-ism).

  support-files/mysql.server.sh
    1.36 05/03/30 18:38:50 joerg@mysql.com +3 -1
    Replace a non-portable "for" loop (bash style, fails on BSD) by an equivalent "while" loop.
    Note that the "stop" method is still wrong, as it does not wait for file removal.

ChangeSet
  1.2160.5.1 05/03/30 17:59:36 joerg@mysql.com +1 -0
  Ensure 'texi2html' is taken from the Docs tree, not to miss any corrections.

  Build-tools/Bootstrap
    1.25 05/03/30 17:59:32 joerg@mysql.com +3 -1
    Ensure 'texi2html' is taken from the Docs tree, not to miss any corrections.

ChangeSet
  1.2160.4.1 05/03/30 14:30:32 msvensson@neptunus.(none) +6 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug8807
  into neptunus.(none):/home/msvensson/mysql/mysql-4.1-synced

  mysql-test/r/ps_7ndb.result
    1.17 05/03/30 14:30:31 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/ps_6bdb.result
    1.23 05/03/30 14:30:31 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/ps_5merge.result
    1.22 05/03/30 14:30:31 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/ps_4heap.result
    1.22 05/03/30 14:30:31 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/ps_3innodb.result
    1.24 05/03/30 14:30:31 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/ps_2myisam.result
    1.23 05/03/30 14:30:31 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2160.1.4 05/03/30 15:57:42 sergefp@mysql.com +4 -0
  Fix for BUG#9213: GROUP BY returns wrong query results:
  Make test_if_skip_sort_order() rebuild tab->ref if it decides to use an index
  different from the index join optimizer has choosen.  

  sql/table.h
    1.70 05/03/30 15:57:38 sergefp@mysql.com +3 -1
    Added comments about TABLE::used_keys

  sql/sql_select.cc
    1.389.1.2 05/03/30 15:57:38 sergefp@mysql.com +13 -1
    Fix for BUG#9213: GROUP BY returns wrong query results:
    Make test_if_skip_sort_order() rebuild tab->ref if it decides to use an index
    different from the index join optimizer has choosen.  

  mysql-test/t/group_by.test
    1.33 05/03/30 15:57:38 sergefp@mysql.com +25 -0
    Testcase for BUG#9213

  mysql-test/r/group_by.result
    1.43 05/03/30 15:57:38 sergefp@mysql.com +25 -0
    Testcase for BUG#9213

ChangeSet
  1.2140.2.1 05/03/30 12:14:37 msvensson@neptunus.(none) +10 -0
  BUG#8807 Select crash server
   - Add function Item_param::fix_fields which will update any subselect they are part of and indicate that the subsleect is not const during prepare phase, and thus should not be executed during prepare.

  sql/item_subselect.h
    1.58.1.1 05/03/30 12:14:34 msvensson@neptunus.(none) +1 -0
    Make Item_param::fix_field friend of Item_subselect

  sql/item.h
    1.174.1.1 05/03/30 12:14:34 msvensson@neptunus.(none) +1 -0
    Adde Item_param::fix_fields

  sql/item.cc
    1.194.1.1 05/03/30 12:14:34 msvensson@neptunus.(none) +28 -0
    Add function Item_param::fix_fields, which will mark any subselects they are part of as not being a constant expression unless the param value is specified, ie. it will be not be constant during prepare phase.

  mysql-test/r/ps_7ndb.result
    1.14.2.1 05/03/30 12:14:34 msvensson@neptunus.(none) +4 -0
    Update test result

  mysql-test/r/ps_6bdb.result
    1.21.1.1 05/03/30 12:14:34 msvensson@neptunus.(none) +4 -0
    Update test result

  mysql-test/r/ps_5merge.result
    1.20.1.1 05/03/30 12:14:34 msvensson@neptunus.(none) +8 -0
    Update test result

  mysql-test/r/ps_4heap.result
    1.20.1.1 05/03/30 12:14:34 msvensson@neptunus.(none) +4 -0
    Update test result

  mysql-test/r/ps_3innodb.result
    1.22.1.1 05/03/30 12:14:34 msvensson@neptunus.(none) +4 -0
    Update test result

  mysql-test/r/ps_2myisam.result
    1.21.1.1 05/03/30 12:14:33 msvensson@neptunus.(none) +4 -0
    Update test result

  mysql-test/include/ps_query.inc
    1.11 05/03/30 12:14:33 msvensson@neptunus.(none) +5 -0
    Adde new test case

ChangeSet
  1.2160.3.1 05/03/30 14:43:56 ramil@mysql.com +1 -0
  A fix (bug #9401: type_timestamp segfaults mysqld)

  sql/sql_select.cc
    1.389.1.1 05/03/30 14:43:51 ramil@mysql.com +17 -15
    A fix (bug #9401: type_timestamp segfaults mysqld).
    1. create_tmp_field_from_field() is modified to take 'Item_ref *item' and 'char *name'
    instead of 'bool modify_item' and 'Item *item'.
    2. For Item_sum_min/max we should never modify item, so NULL is 
    passed as item to the create_tmp_field_from_field().

ChangeSet
  1.2160.2.1 05/03/30 14:10:27 bar@mysql.com +3 -0
  Remove .opt file for faster test running.

  mysql-test/t/ctype_cp1251.test
    1.5 05/03/30 14:10:21 bar@mysql.com +2 -2
    Remove .opt file for faster test running.

  mysql-test/r/ctype_cp1251.result
    1.6 05/03/30 14:10:21 bar@mysql.com +2 -2
    Remove .opt file for faster test running.

  BitKeeper/deleted/.del-ctype_cp1251-master.opt~68be9a59ec8ee106
    1.3 05/03/30 14:06:42 bar@mysql.com +0 -0
    Delete: mysql-test/t/ctype_cp1251-master.opt

ChangeSet
  1.2157.1.4 05/03/30 10:52:28 serg@serg.mylan +1 -0
  merged

  sql/sql_parse.cc
    1.428.1.3 05/03/30 10:52:22 serg@serg.mylan +3 -6
    merged

ChangeSet
  1.1346.820.1 05/03/30 10:43:24 serg@serg.mylan +1 -0
  don't strcmp db if it's a pattern

  sql/sql_parse.cc
    1.218.44.3 05/03/30 10:43:16 serg@serg.mylan +5 -4
    don't strcmp db if it's a pattern

ChangeSet
  1.2161 05/03/30 10:27:36 bell@sanja.is.com.ua +8 -0
  Merge

  mysql-test/t/union.test
    1.82 05/03/30 10:27:32 bell@sanja.is.com.ua +0 -0
    SCCS merged

  mysql-test/r/union.result
    1.88 05/03/30 10:27:32 bell@sanja.is.com.ua +0 -0
    SCCS merged

  sql/sql_union.cc
    1.141 05/03/30 10:13:21 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.390 05/03/30 10:13:21 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.430 05/03/30 10:13:21 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.h
    1.121 05/03/30 10:13:21 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.175 05/03/30 10:13:21 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/metadata.result
    1.8 05/03/30 10:13:21 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.2127.1.3 05/03/30 10:07:08 bell@sanja.is.com.ua +3 -0
  postreview changes
  fixed bug in IN/ALL/ANY subqeries with HAVING clause (BUG#9350)

  sql/item_subselect.cc
    1.131 05/03/30 10:07:04 bell@sanja.is.com.ua +20 -15
    fixed typo in comment
    removed unused code
    fixed bug with HAVING clause detectiuon (BUG#9350)
    postreview changes

  mysql-test/t/subselect.test
    1.143 05/03/30 10:07:04 bell@sanja.is.com.ua +176 -0
    added new subquery tests to make code covarage better

  mysql-test/r/subselect.result
    1.164 05/03/30 10:07:04 bell@sanja.is.com.ua +421 -0
    added new subquery tests to make code covarage better

ChangeSet
  1.2160 05/03/30 02:49:21 kent@mysql.com +2 -0
  Merge

  Build-tools/Do-compile
    1.110 05/03/30 02:49:07 kent@mysql.com +2 -4
    Merge from 4.0

  BitKeeper/etc/logging_ok
    1.374 05/03/30 02:42:02 kent@mysql.com +0 -1
    auto-union

ChangeSet
  1.1346.1.733 05/03/30 02:41:08 kent@mysql.com +2 -0
  Do-compile:
    Added option --with-big-tables

  BitKeeper/etc/logging_ok
    1.206.1.126 05/03/30 02:41:08 kent@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  Build-tools/Do-compile
    1.74.1.16 05/03/30 02:39:36 kent@mysql.com +4 -2
    Added option --with-big-tables

ChangeSet
  1.2157.2.1 05/03/30 02:28:41 kent@mysql.com +1 -0
  Do-compile:
    Added option --with-blackhole

  Build-tools/Do-compile
    1.109 05/03/30 02:26:29 kent@mysql.com +3 -1
    Added option --with-blackhole

ChangeSet
  1.2157.1.3 05/03/29 23:31:56 serg@serg.mylan +3 -0
  Fedora now defines read(2)/write(2) as macros.
  Argh!

  vio/test-sslclient.c
    1.8 05/03/29 23:31:49 serg@serg.mylan +2 -2
    Fedora now defines read(2)/write(2) as macros.
    Argh!

  vio/test-ssl.c
    1.9 05/03/29 23:31:49 serg@serg.mylan +2 -2
    Fedora now defines read(2)/write(2) as macros.
    Argh!

  include/violite.h
    1.39 05/03/29 23:31:49 serg@serg.mylan +2 -2
    Fedora now defines read(2)/write(2) as macros.
    Argh!

ChangeSet
  1.2157.1.2 05/03/29 23:03:36 serg@serg.mylan +1 -0
  typo fixed

  strings/my_strtoll10-x86.s
    1.3 05/03/29 23:03:29 serg@serg.mylan +1 -1
    typo fixed

ChangeSet
  1.2157.1.1 05/03/29 20:16:35 serg@serg.mylan +1 -0
  Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  mysql-test/r/ps_7ndb.result
    1.16 05/03/29 20:16:28 serg@serg.mylan +0 -11
    Auto merged

ChangeSet
  1.2158 05/03/29 19:25:55 joerg@mysql.com +2 -0
  Merge

  acinclude.m4
    1.132 05/03/29 19:25:55 joerg@mysql.com +0 -0
    SCCS merged

  configure.in
    1.356 05/03/29 19:23:21 joerg@mysql.com +1 -1
    Auto merged

ChangeSet
  1.1346.1.732 05/03/29 18:55:47 joerg@mysql.com +1 -0
  Post-review fix: Drop the duplicate assignment.

  acinclude.m4
    1.77.1.24 05/03/29 18:55:46 joerg@mysql.com +0 -2
    Post-review fix: Drop the duplicate assignment.

ChangeSet
  1.1346.1.731 05/03/29 16:34:33 joerg@mysql.com +2 -0
  Introduce "configure" support for a new '-with-big-tables' option that can replace
  the current way of passing '-DBIG_TABLES' to the compilers.
  
  This is needed even in 4.0, as 'Do-compile-all' must use this new approach for
  all "max" builds in 4.0, 4.1, and up.

  configure.in
    1.191.1.132 05/03/29 16:34:30 joerg@mysql.com +1 -0
    Call the new 'MYSQL_CHECK_BIG_TABLES' macro.

  acinclude.m4
    1.77.1.23 05/03/29 16:34:30 joerg@mysql.com +30 -0
    Provide a new macro 'MYSQL_CHECK_BIG_TABLES' to check a '-with-big-tables' option 
    and set the CPP symbol 'BIG_TABLES' accordingly.

ChangeSet
  1.2153.3.2 05/03/29 15:36:02 mskold@mysql.com +1 -0
  New test result

  mysql-test/r/ps_7ndb.result
    1.14.1.1 05/03/29 15:35:53 mskold@mysql.com +11 -11
    New test result

ChangeSet
  1.2153.3.1 05/03/29 15:15:28 mskold@mysql.com +1 -0
  Backport of ChangeSet 1.1700.256.8: Export the variable MASTER_MY_PORT1 from the place where the second master is started

  mysql-test/mysql-test-run.sh
    1.248 05/03/29 15:14:36 mskold@mysql.com +3 -2
    Backport of ChangeSet 1.1700.256.8: Export the variable MASTER_MY_PORT1 from the place where the second master is started

ChangeSet
  1.2152.1.1 05/03/29 13:57:15 serg@serg.mylan +1 -0
  update results

  mysql-test/r/ps_7ndb.result
    1.15 05/03/29 13:57:08 serg@serg.mylan +11 -11
    update results

ChangeSet
  1.2153.1.6 05/03/29 16:23:44 bar@mysql.com +2 -0
  ctype-utf8.c, ctype-sjis.c:
    Safer and mode readable way.

  strings/ctype-utf8.c
    1.83 05/03/29 16:23:28 bar@mysql.com +2 -7
    Safer and mode readable way.

  strings/ctype-sjis.c
    1.75 05/03/29 16:23:17 bar@mysql.com +1 -6
    Safer and mode readable way.

ChangeSet
  1.2153.1.5 05/03/29 16:19:31 bar@mysql.com +1 -0
  ctype-big5.c:
    More readable and safer way.

  strings/ctype-big5.c
    1.71 05/03/29 16:18:57 bar@mysql.com +1 -5
    More readable and safer way.

ChangeSet
  1.2153.1.4 05/03/29 15:43:00 bar@mysql.com +2 -0
  Better error message.
  Bugs#9057: Incorrect errormsg for too-large char field in table definition

  sql/share/english/errmsg.txt
    1.144 05/03/29 15:42:55 bar@mysql.com +1 -1
    Better error message.
    Bugs#9057: Incorrect errormsg for too-large char field in table definition

  mysql-test/r/type_blob.result
    1.44 05/03/29 15:42:55 bar@mysql.com +1 -1
    Better error message.
    Bugs#9057: Incorrect errormsg for too-large char field in table definition

ChangeSet
  1.2153.1.3 05/03/29 14:30:34 konstantin@mysql.com +1 -0
  Remove redundant my_security_attr_free() from 
  handle_connections_shared_memory (double free spotted by Monty).

  sql/mysqld.cc
    1.565 05/03/29 14:30:29 konstantin@mysql.com +0 -2
    Remove excessive my_security_attr_free()

ChangeSet
  1.2153.2.1 05/03/29 14:48:47 bar@mysql.com +2 -0
  Adding Cybozu's patch.
  Not active by default.
  One need to pass -DHAVE_CYBOZU_COLLATION to 
  activate it.

  strings/ctype-utf8.c
    1.82 05/03/29 14:48:42 bar@mysql.com +166 -0
    Adding Cybozu's patch.
    Not active by default.

  mysys/charset-def.c
    1.9 05/03/29 14:48:42 bar@mysql.com +6 -0
    Adding Cybozu's patch.
    Not active by default.

ChangeSet
  1.2154 05/03/29 07:29:38 kent@mysql.com +2 -0
  mysql-test-run.pl:
    Corrected typo
  mtr_diff.pl:
    A simplified unified diff in Perl
    new file

  mysql-test/mysql-test-run.pl
    1.15 05/03/29 07:24:10 kent@mysql.com +3 -2
    Corrected typo

  mysql-test/lib/mtr_diff.pl
    1.1 05/03/29 07:23:36 kent@mysql.com +283 -0
    A simplified unified diff in Perl

  mysql-test/lib/mtr_diff.pl
    1.0 05/03/29 07:23:36 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1-perl/mysql-test/lib/mtr_diff.pl

ChangeSet
  1.2147.2.1 05/03/28 22:55:32 pekka@mysql.com +2 -0
  ndb - set up long key page vars in ACC_LOCKREQ  (bug#????)

  ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
    1.25 05/03/28 22:54:34 pekka@mysql.com +27 -15
    set up long key page vars in ACC_LOCKREQ

  ndb/src/kernel/blocks/dbacc/Dbacc.hpp
    1.11 05/03/28 22:54:34 pekka@mysql.com +1 -1
    set up long key page vars in ACC_LOCKREQ

ChangeSet
  1.2147.1.4 05/03/28 11:51:31 pekka@mysql.com +2 -0
  ndb - make printSchemaFile available (compile manually)

  ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
    1.6 05/03/28 11:48:35 pekka@mysql.com +15 -0
    compile manually

ChangeSet
  1.2147.1.3 05/03/28 14:17:47 bar@mysql.com +2 -0
  union.test:
    Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
    Prove that this problem was fixed with bug9425 fix too.

  mysql-test/r/union.result
    1.86.1.1 05/03/28 14:16:57 bar@mysql.com +5 -0

  mysql-test/t/union.test
    1.80.1.1 05/03/28 14:16:13 bar@mysql.com +6 -0
    Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
    Prove that this problem was fixed with bug9425 fix too.

ChangeSet
  1.2147.1.2 05/03/28 14:01:57 bar@mysql.com +3 -0
  Bug#9425 A user variable doesn't always have implicit coercibility
  Coercibility fixes for numeric types and not defined values were done.

  sql/item_func.cc
    1.238 05/03/28 14:01:53 bar@mysql.com +6 -3
    Bug#9425 A user variable doesn't always have implicit coercibility
    Coercibility fixes for numeric types and not defined values were done.

  mysql-test/t/user_var.test
    1.18 05/03/28 14:01:53 bar@mysql.com +7 -0
    Bug#9425 A user variable doesn't always have implicit coercibility
    Coercibility fixes for numeric types and not defined values were done.

  mysql-test/r/user_var.result
    1.25 05/03/28 14:01:53 bar@mysql.com +7 -0
    Bug#9425 A user variable doesn't always have implicit coercibility
    Coercibility fixes for numeric types and not defined values were done.

ChangeSet
  1.2147.1.1 05/03/28 12:24:12 bar@mysql.com +4 -0
  func_system.test, ctype_utf8.test, func_system.result, ctype_utf8.result:
    Prove that the queries mentioned in
    Bugs#5980: NULL requires a characterset in a union
    works fine after recent changes related to itroducing
    more coercibility level: IRNORABLE and SYSCONST.

  mysql-test/t/func_system.test
    1.12 05/03/28 12:24:00 bar@mysql.com +2 -0
    Prove that the queries mentioned in
    Bugs#5980: NULL requires a characterset in a union
    works fine after recent changes related to itroducing
    more coercibility level: IRNORABLE and SYSCONST.

  mysql-test/t/ctype_utf8.test
    1.51 05/03/28 12:24:00 bar@mysql.com +11 -0
    Prove that the queries mentioned in
    Bugs#5980: NULL requires a characterset in a union
    works fine after recent changes related to itroducing
    more coercibility level: IRNORABLE and SYSCONST.

  mysql-test/r/func_system.result
    1.20 05/03/28 12:24:00 bar@mysql.com +4 -0
    Prove that the queries mentioned in
    Bugs#5980: NULL requires a characterset in a union
    works fine after recent changes related to itroducing
    more coercibility level: IRNORABLE and SYSCONST.

  mysql-test/r/ctype_utf8.result
    1.51 05/03/28 12:24:00 bar@mysql.com +14 -0
    Prove that the queries mentioned in
    Bugs#5980: NULL requires a characterset in a union
    works fine after recent changes related to itroducing
    more coercibility level: IRNORABLE and SYSCONST.

ChangeSet
  1.2150 05/03/27 15:46:06 serg@serg.mylan +2 -0
  more wild_compare tests

  mysql-test/t/grant2.test
    1.10 05/03/27 15:46:00 serg@serg.mylan +19 -1
    more wild_compare tests

  mysql-test/r/grant2.result
    1.11 05/03/27 15:46:00 serg@serg.mylan +20 -3
    more wild_compare tests

  BitKeeper/deleted/.del-Makefile~b03e75f2bff8d72
    1.2 05/03/27 14:47:12 pekka@mysql.com +0 -0
    Delete: ndb/src/kernel/blocks/dbdict/printSchemafile/Makefile

  ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
    1.5 05/03/27 14:46:56 pekka@mysql.com +0 -0
    Rename: ndb/src/kernel/blocks/dbdict/printSchemafile/printSchemafile.cpp -> ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp

ChangeSet
  1.2149 05/03/26 20:15:18 serg@serg.mylan +3 -0
  merged

  sql/sql_parse.cc
    1.428.1.2 05/03/26 20:15:10 serg@serg.mylan +0 -2
    merged with ul

  sql/sql_acl.cc
    1.162 05/03/26 20:05:07 serg@serg.mylan +0 -0
    Auto merged

  myisam/mi_create.c
    1.43 05/03/26 20:05:06 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.2148 05/03/26 19:49:24 serg@serg.mylan +2 -0
  Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  mysql-test/r/ps_1general.result
    1.18 05/03/26 19:49:09 serg@serg.mylan +0 -0
    Auto merged

  acinclude.m4
    1.131 05/03/26 19:49:09 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1346.1.729 05/03/26 19:46:42 serg@serg.mylan +2 -0
  fixes for "backport wild_compare fix from 4.1 - bug#3924"

  sql/sql_parse.cc
    1.218.44.2 05/03/26 19:46:38 serg@serg.mylan +2 -2
    fixed backporting error in "backport wild_compare fix from 4.1 - bug#3924"

  sql/sql_acl.cc
    1.51.1.83 05/03/26 19:46:38 serg@serg.mylan +6 -2
    don't use acl_cache for GRANT

ChangeSet
  1.2147 05/03/26 01:21:52 konstantin@mysql.com +6 -0
  A fix for Bug#8226 "Cannot connect via shared memory": 
  provide created shared memory objects with proper
  access rights to make them usable when client and server
  are running under different accounts. 
  Post review fixes.

  mysys/my_windac.c
    1.1 05/03/26 01:21:48 konstantin@mysql.com +224 -0

  mysys/my_windac.c
    1.0 05/03/26 01:21:48 konstantin@mysql.com +0 -0
    BitKeeper file /media/sda1/mysql/mysql-4.1-8226/mysys/my_windac.c

  sql/mysqld.cc
    1.564 05/03/26 01:21:47 konstantin@mysql.com +29 -15
    Set proper security attributes for the kernel objects to make them
    usable when mysqld is running as a Windows service.

  sql-common/client.c
    1.83 05/03/26 01:21:47 konstantin@mysql.com +8 -7
    Lower requested access rights for events as the server won't 
    provide clients with ALL access in order to prevent denial
    of service attack.

  mysys/Makefile.am
    1.55 05/03/26 01:21:47 konstantin@mysql.com +1 -1
    Add my_windac.c to the list of compiled files.

  include/my_sys.h
    1.133 05/03/26 01:21:47 konstantin@mysql.com +8 -0
    Declarations for SECURITY_ATTRIBUTES create/destroy functions.

  VC++Files/mysys/mysys.dsp
    1.24 05/03/26 01:21:47 konstantin@mysql.com +5 -0
    Add my_windac.c to mysys.lib

ChangeSet
  1.2146 05/03/25 14:09:19 brian@zim.(none) +2 -0
  Fixing blackhole support in libmysqld

  libmysqld/ha_blackhole.cc
    1.1 05/03/25 14:09:16 brian@zim.(none) +0 -0

  libmysqld/ha_blackhole.cc
    1.0 05/03/25 14:09:16 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-4.1/libmysqld/ha_blackhole.cc

  libmysqld/Makefile.am
    1.58 05/03/25 14:09:16 brian@zim.(none) +2 -1
    Adding ha_blackhole.cc

ChangeSet
  1.2145 05/03/25 12:36:04 brian@zim.(none) +2 -0
  Fix upgrade/downgrade issue. 

  sql/handler.h
    1.135 05/03/25 12:36:02 brian@zim.(none) +1 -1
    Added federated to the list so that any beta users won't end up with a mismatch for table enum

  mysql-test/r/ps_1general.result
    1.16.1.1 05/03/25 12:36:02 brian@zim.(none) +1 -0
    Fix test case.

ChangeSet
  1.2142.1.2 05/03/25 17:30:51 bar@mysql.com +1 -0
  mysql_client_test.c:
    Don't run GBK test if not GBK support was compiled.

  tests/mysql_client_test.c
    1.150 05/03/25 17:30:12 bar@mysql.com +2 -0
    Don't run GBK test if not GBK support was compiled.

ChangeSet
  1.2142.1.1 05/03/25 16:08:54 bar@mysql.com +3 -0
  Allow inserting of extra HKSCS and cp950 characters into a Big5 column.

  strings/ctype-big5.c
    1.70 05/03/25 16:08:39 bar@mysql.com +38 -1
    Allow inserting of extra HKSCS and cp950 characters into a Big5 column.

  mysql-test/t/ctype_big5.test
    1.5 05/03/25 16:08:38 bar@mysql.com +9 -0
    Allow inserting of extra HKSCS and cp950 characters into a Big5 column.

  mysql-test/r/ctype_big5.result
    1.6 05/03/25 16:08:38 bar@mysql.com +7 -0
    Allow inserting of extra HKSCS and cp950 characters into a Big5 column.

ChangeSet
  1.2078.1.1 05/03/25 04:13:30 petr@mysql.com +1 -0
  Post-review fixes for "!include" patch originating from Yahoo! (the whole patch is recommitted)

  mysys/default.c
    1.48 05/03/25 04:13:27 petr@mysql.com +121 -14
    Post-review fixes for "!include" patch originating from Yahoo!

ChangeSet
  1.2143 05/03/24 16:08:48 brian@zim.(none) +3 -0
  Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
  into zim.(none):/home/brian/mysql/mysql-4.1

  sql/set_var.cc
    1.163 05/03/24 16:08:47 brian@zim.(none) +0 -0
    Auto merged

  sql/mysqld.cc
    1.563 05/03/24 16:08:46 brian@zim.(none) +0 -0
    Auto merged

  configure.in
    1.355 05/03/24 16:08:46 brian@zim.(none) +0 -0
    Auto merged

ChangeSet
  1.2089.4.2 05/03/24 16:07:56 brian@zim.(none) +5 -0
  Collection of changes per Bar and Serg.

  sql/ha_blackhole.h
    1.2 05/03/24 16:07:54 brian@zim.(none) +13 -4
    Indention fix, added methods for index...

  sql/ha_blackhole.cc
    1.2 05/03/24 16:07:54 brian@zim.(none) +60 -36
    Added indexes per Serg, correction of indention, added asserts per Serg.

  mysql-test/t/blackhole.test
    1.2 05/03/24 16:07:54 brian@zim.(none) +2 -1202
    Lowered the number of inserts.

  mysql-test/r/blackhole.result
    1.2 05/03/24 16:07:54 brian@zim.(none) +3 -0
    Lowered the number of inserts.

  acinclude.m4
    1.130 05/03/24 16:07:54 brian@zim.(none) +1 -1
    Change in message

ChangeSet
  1.2140.1.2 05/03/24 18:21:56 bar@mysql.com +1 -0
  myisamchk.c:
    Wrong help string fix.

  myisam/myisamchk.c
    1.124 05/03/24 18:21:21 bar@mysql.com +2 -2
    Wrong help string fix.

ChangeSet
  1.2135.1.12 05/03/24 18:10:46 bar@mysql.com +4 -0
  Fixed that LEFT OUTER JOIN was replaced with a regulat join
  in some cases, because "charset(x) = 'string'" was considered
  as "x is not null" due to incorrect not_null_tables().

  sql/item_strfunc.h
    1.92 05/03/24 18:08:03 bar@mysql.com +4 -0
    Fixed that LEFT OUTER JOIN was replaced with a regulat join
    in some cases, because "charset(x) = 'string'" was considered
    as "x is not null" due to incorrect not_null_tables().

  sql/item_func.h
    1.119.1.1 05/03/24 18:08:03 bar@mysql.com +2 -1
    Fixed that LEFT OUTER JOIN was replaced with a regulat join
    in some cases, because "charset(x) = 'string'" was considered
    as "x is not null" due to incorrect not_null_tables().

  mysql-test/t/func_str.test
    1.71 05/03/24 18:08:03 bar@mysql.com +14 -0
    Fixed that LEFT OUTER JOIN was replaced with a regulat join
    in some cases, because "charset(x) = 'string'" was considered
    as "x is not null" due to incorrect not_null_tables().

  mysql-test/r/func_str.result
    1.90 05/03/24 18:08:03 bar@mysql.com +20 -0
    Fixed that LEFT OUTER JOIN was replaced with a regulat join
    in some cases, because "charset(x) = 'string'" was considered
    as "x is not null" due to incorrect not_null_tables().

ChangeSet
  1.2139.1.1 05/03/24 13:48:38 msvensson@neptunus.(none) +2 -0
  BUG#9303 blob field with specified length < 256 does not create tinyblob

  sql/sql_parse.cc
    1.428.1.1 05/03/24 13:48:35 msvensson@neptunus.(none) +1 -1
    Added missing else so that FIELD_TINY_BLOB can be selected

  mysql-test/r/type_blob.result
    1.43 05/03/24 13:48:35 msvensson@neptunus.(none) +1 -1
    Test creates a blob(250 whcih is now displayed as tinyblob when SHOW COLUMNS is called.

ChangeSet
  1.2140 05/03/24 12:21:55 msvensson@neptunus.(none) +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into neptunus.(none):/home/msvensson/mysql/mysql-4.1

  sql/mysqld.cc
    1.562 05/03/24 12:21:54 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2135.4.2 05/03/24 10:28:02 serg@serg.mylan +1 -0
  mysql-test/r/ps_6bdb.result
      followup - results fixed

  mysql-test/r/ps_6bdb.result
    1.22 05/03/24 10:27:56 serg@serg.mylan +11 -11
    followup - results fixed

ChangeSet
  1.2121.2.3 05/03/23 21:08:13 serg@serg.mylan +18 -0
  upgrade zlib to 1.2.2

  zlib/zutil.h
    1.3 05/03/23 21:08:04 serg@serg.mylan +6 -1
    upgrade zlib to 1.2.2

  zlib/zlib.h
    1.3 05/03/23 21:08:04 serg@serg.mylan +15 -15
    upgrade zlib to 1.2.2

  zlib/zlib.3
    1.3 05/03/23 21:08:04 serg@serg.mylan +3 -3
    upgrade zlib to 1.2.2

  zlib/zconf.h
    1.3 05/03/23 21:08:04 serg@serg.mylan +44 -41
    upgrade zlib to 1.2.2

  zlib/trees.c
    1.3 05/03/23 21:08:04 serg@serg.mylan +2 -2
    upgrade zlib to 1.2.2

  zlib/inftrees.c
    1.3 05/03/23 21:08:04 serg@serg.mylan +12 -5
    upgrade zlib to 1.2.2

  zlib/inflate.c
    1.3 05/03/23 21:08:04 serg@serg.mylan +4 -0
    upgrade zlib to 1.2.2

  zlib/inffast.c
    1.3 05/03/23 21:08:04 serg@serg.mylan +2 -2
    upgrade zlib to 1.2.2

  zlib/infback.c
    1.2 05/03/23 21:08:04 serg@serg.mylan +3 -0
    upgrade zlib to 1.2.2

  zlib/gzio.c
    1.3 05/03/23 21:08:04 serg@serg.mylan +4 -0
    upgrade zlib to 1.2.2

  zlib/deflate.h
    1.3 05/03/23 21:08:03 serg@serg.mylan +0 -1
    upgrade zlib to 1.2.2

  zlib/deflate.c
    1.3 05/03/23 21:08:03 serg@serg.mylan +2 -2
    upgrade zlib to 1.2.2

  zlib/crc32.c
    1.3 05/03/23 21:08:03 serg@serg.mylan +49 -27
    upgrade zlib to 1.2.2

  zlib/README
    1.4 05/03/23 21:08:03 serg@serg.mylan +4 -4
    upgrade zlib to 1.2.2

  zlib/INDEX
    1.4 05/03/23 21:08:03 serg@serg.mylan +3 -0
    upgrade zlib to 1.2.2

  zlib/FAQ
    1.4 05/03/23 21:08:03 serg@serg.mylan +55 -33
    upgrade zlib to 1.2.2

  zlib/ChangeLog
    1.3 05/03/23 21:08:03 serg@serg.mylan +42 -0
    upgrade zlib to 1.2.2

  acinclude.m4
    1.128.1.1 05/03/23 21:08:03 serg@serg.mylan +3 -2
    clarify help text

ChangeSet
  1.2121.2.2 05/03/23 20:38:42 serg@serg.mylan +9 -0
  client/mysqltest.c
      corrected number of fields for --enable_metadata
  sql/sql_union.cc
      fixed a apparent typo in assert

  sql/sql_union.cc
    1.139.1.1 05/03/23 20:38:36 serg@serg.mylan +1 -1
    fixed a apparent typo in assert

  mysql-test/r/type_enum.result
    1.25 05/03/23 20:38:36 serg@serg.mylan +1 -1
    corrected number of fields for --enable_metadata

  mysql-test/r/ps_5merge.result
    1.21 05/03/23 20:38:36 serg@serg.mylan +22 -22
    corrected number of fields for --enable_metadata

  mysql-test/r/ps_4heap.result
    1.21 05/03/23 20:38:36 serg@serg.mylan +11 -11
    corrected number of fields for --enable_metadata

  mysql-test/r/ps_3innodb.result
    1.23 05/03/23 20:38:36 serg@serg.mylan +11 -11
    corrected number of fields for --enable_metadata

  mysql-test/r/ps_2myisam.result
    1.22 05/03/23 20:38:36 serg@serg.mylan +11 -11
    corrected number of fields for --enable_metadata

  mysql-test/r/ps_1general.result
    1.17 05/03/23 20:38:35 serg@serg.mylan +2 -2
    corrected number of fields for --enable_metadata

  mysql-test/r/metadata.result
    1.6.1.1 05/03/23 20:38:35 serg@serg.mylan +6 -6
    corrected number of fields for --enable_metadata

  client/mysqltest.c
    1.158 05/03/23 20:38:35 serg@serg.mylan +1 -1
    corrected number of fields for --enable_metadata

ChangeSet
  1.2135.3.1 05/03/23 19:19:36 gbichot@quadita2.mysql.com +9 -0
  "After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication":
  s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late);
  no message on error log (deadlock is too common sometimes), a global counter
  instead (SHOW STATUS LIKE 'slave_retried_transactions').
  Plus a fix for libmysql/Makefile.shared

  BitKeeper/etc/logging_ok
    1.373 05/03/23 19:19:35 gbichot@quadita2.mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/structs.h
    1.39 05/03/23 19:19:10 gbichot@quadita2.mysql.com +1 -1
    new SHOW_SLAVE_RETRIED_TRANS

  sql/sql_show.cc
    1.197 05/03/23 19:19:09 gbichot@quadita2.mysql.com +13 -0
    SHOW STATUS LIKE "slave_retried_transactions"; needs replication mutexes.
    Can't be a simple SHOW_LONG, because active_mi is unset (not alloced yet)
    when the static global status_vars is created (active_mi is set
    in init_slave()).

  sql/slave.h
    1.85 05/03/23 19:19:09 gbichot@quadita2.mysql.com +8 -1
    new global counter rli->retried_trans

  sql/slave.cc
    1.268 05/03/23 19:19:09 gbichot@quadita2.mysql.com +16 -17
    If slave retries automatically a transaction, no message on error log
    (too common situation); sleep 0 secs at first retry, then 1, 2, 3, 4,
    5, 5, 5... Sleeping 0 is to get the least possible late, as deadlocks
    are usually resolved at first try. New global counter rli->retried_trans
    (for SHOW STATUS: total number of times the slave had to retry
    any transaction). safe_sleep() is thread-safe, sleep() was not.
    I change the rli->trans_retries counter to go from 0 to max instead
    of the other way (better for new sleep()).

  sql/mysqld.cc
    1.560.1.1 05/03/23 19:19:09 gbichot@quadita2.mysql.com +13 -3
    if active_mi could not be alloced, die. New SHOW STATUS LIKE "slave_retried_transactions".

  mysql-test/t/rpl_deadlock.test
    1.2 05/03/23 19:19:08 gbichot@quadita2.mysql.com +4 -0
    small test addition

  mysql-test/r/rpl_deadlock.result
    1.2 05/03/23 19:19:08 gbichot@quadita2.mysql.com +6 -0
    result fix

  libmysql/Makefile.shared
    1.56 05/03/23 19:19:08 gbichot@quadita2.mysql.com +2 -1
    When we "make clean" in libmysql/ we remove the symlinks there, so we
    need to mark that they have to be recreated later: this is done by removing
    ../linked_libmysql_sources. If we don't do this, 'make' will fail after 'cd libmysql;make clean'.
    This Makefile.shared is used by libmysql_r too.
    No reason to remove linked_client_sources as we don't remove the links in client/.

ChangeSet
  1.2135.1.10 05/03/23 10:45:57 paul@kite-hub.kitebird.com +1 -0
  README:
    Fix typo.

  mysql-test/README
    1.8 05/03/23 10:45:41 paul@kite-hub.kitebird.com +1 -1
    Fix typo.

ChangeSet
  1.2127.1.2 05/03/23 08:36:48 bell@sanja.is.com.ua +17 -0
  fixed union types merging and table related metadata (BUG#8824)

  sql/sql_union.cc
    1.140 05/03/23 08:36:42 bell@sanja.is.com.ua +6 -6
    added table name parameter to prepare() to show right table alias for derived tables

  sql/sql_select.cc
    1.385.1.1 05/03/23 08:36:42 bell@sanja.is.com.ua +3 -11
    new temporary table field creation by Item_type_holder
    fixed table alias for temporary table

  sql/sql_prepare.cc
    1.145 05/03/23 08:36:42 bell@sanja.is.com.ua +2 -2
    added table name parameter to prepare() to show right table alias for derived tables

  sql/sql_parse.cc
    1.429 05/03/23 08:36:42 bell@sanja.is.com.ua +2 -4
    made function for enum/set pack length calculation

  sql/sql_lex.h
    1.184 05/03/23 08:36:42 bell@sanja.is.com.ua +2 -1
    added table name parameter to prepare() to show right table alias for derived tables

  sql/sql_derived.cc
    1.79 05/03/23 08:36:42 bell@sanja.is.com.ua +2 -2
    added table name parameter to prepare() to show right table alias for derived tables

  sql/item_subselect.cc
    1.130 05/03/23 08:36:42 bell@sanja.is.com.ua +1 -1
    added table name parameter to prepare() to show right table alias for derived tables

  sql/item_func.h
    1.120 05/03/23 08:36:42 bell@sanja.is.com.ua +2 -1
    new item type to make correct field type detection possible

  sql/item.h
    1.172.1.2 05/03/23 08:36:42 bell@sanja.is.com.ua +16 -16
    replaced mechanism of merging types of UNION

  sql/item.cc
    1.195 05/03/23 08:36:42 bell@sanja.is.com.ua +204 -140
    fixed bug in NEW_DATE type field creartion
    replaced mechanism of merging types of UNION

  sql/field.h
    1.125 05/03/23 08:36:42 bell@sanja.is.com.ua +13 -35
    removed unned field type reporting

  sql/field.cc
    1.212 05/03/23 08:36:42 bell@sanja.is.com.ua +805 -190
    Field type merging rules added
    Fixed table name/alias returting for field made from temporary tables

  mysql-test/t/union.test
    1.81 05/03/23 08:36:42 bell@sanja.is.com.ua +25 -0
    test of union of enum

  mysql-test/t/metadata.test
    1.3 05/03/23 08:36:41 bell@sanja.is.com.ua +13 -0
    test of metadata of variables, unions and derived tables

  mysql-test/r/union.result
    1.87 05/03/23 08:36:41 bell@sanja.is.com.ua +46 -11
    new results
    test of union of enum

  mysql-test/r/metadata.result
    1.7 05/03/23 08:36:41 bell@sanja.is.com.ua +26 -1
    new result
    test of metadata of variables, unions and derived tables

  mysql-test/r/func_group.result
    1.38 05/03/23 08:36:41 bell@sanja.is.com.ua +1 -1
    new result

ChangeSet
  1.2089.4.1 05/03/22 16:10:39 brian@zim.(none) +14 -0
  Additional storage engine called "blackhole". Customer request, and for that matter a Zawodny request.  With this you can alter table to a type of table that would never store data. Its a /dev/null for a database.  

  sql/ha_blackhole.h
    1.1 05/03/22 16:10:37 brian@zim.(none) +79 -0

  sql/ha_blackhole.h
    1.0 05/03/22 16:10:37 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-4.1/sql/ha_blackhole.h

  sql/ha_blackhole.cc
    1.1 05/03/22 16:10:36 brian@zim.(none) +164 -0

  mysql-test/t/blackhole.test
    1.1 05/03/22 16:10:36 brian@zim.(none) +1299 -0

  mysql-test/r/have_blackhole.require
    1.1 05/03/22 16:10:36 brian@zim.(none) +2 -0

  mysql-test/r/blackhole.result
    1.1 05/03/22 16:10:36 brian@zim.(none) +83 -0

  mysql-test/include/have_blackhole.inc
    1.1 05/03/22 16:10:36 brian@zim.(none) +4 -0

  sql/set_var.cc
    1.159.1.4 05/03/22 16:10:36 brian@zim.(none) +1 -0
    Show variable for blackhole engine

  sql/mysqld.cc
    1.558.1.1 05/03/22 16:10:36 brian@zim.(none) +6 -0
    Updates for building backhole.

  sql/mysql_priv.h
    1.343 05/03/22 16:10:36 brian@zim.(none) +1 -0
    Added blackhole type.

  sql/handler.h
    1.134 05/03/22 16:10:36 brian@zim.(none) +1 -0
    Flag for storage engine type.

  sql/handler.cc
    1.160 05/03/22 16:10:36 brian@zim.(none) +9 -0
    Ifdef enable code for blackhole (and message for "what does this thing do").

  sql/ha_blackhole.cc
    1.0 05/03/22 16:10:36 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-4.1/sql/ha_blackhole.cc

  sql/Makefile.am
    1.112 05/03/22 16:10:36 brian@zim.(none) +2 -2
    Additions to Makefile for blackhole engine

  mysql-test/t/blackhole.test
    1.0 05/03/22 16:10:36 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-4.1/mysql-test/t/blackhole.test

  mysql-test/r/have_blackhole.require
    1.0 05/03/22 16:10:36 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-4.1/mysql-test/r/have_blackhole.require

  mysql-test/r/blackhole.result
    1.0 05/03/22 16:10:36 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-4.1/mysql-test/r/blackhole.result

  mysql-test/include/have_blackhole.inc
    1.0 05/03/22 16:10:36 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-4.1/mysql-test/include/have_blackhole.inc

  configure.in
    1.352.1.1 05/03/22 16:10:35 brian@zim.(none) +1 -0
    Rule enabling blackhole engine

  acinclude.m4
    1.129 05/03/22 16:10:35 brian@zim.(none) +30 -0
    New macro rule for ha_blackhole.

ChangeSet
  1.2135.2.1 05/03/22 16:00:02 jimw@mysql.com +3 -0
  Fix calls to memset() with arguments out of order. (Bug #9323)

  ndb/src/kernel/vm/VMSignal.cpp
    1.2 05/03/22 13:46:52 jimw@mysql.com +2 -2
    Fix order of arguments to memset()

  bdb/btree/bt_open.c
    1.4 05/03/22 13:41:06 jimw@mysql.com +1 -1
    Fix order of arguments to memset()

  bdb/hash/hash_open.c
    1.2 05/03/22 13:40:14 jimw@mysql.com +1 -1
    Fix order of arguments to memset()

ChangeSet
  1.2135.1.9 05/03/22 22:12:24 mskold@mysql.com +1 -0
  Simplified rounding up to nearest 64-bit boundry

  ndb/src/ndbapi/DictCache.cpp
    1.11 05/03/22 22:12:07 mskold@mysql.com +1 -3
    Simplified rounding up to nearest 64-bit boundry

ChangeSet
  1.2135.1.8 05/03/22 17:48:28 mskold@mysql.com +1 -0
  Added better comment for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index

  sql/ha_ndbcluster.cc
    1.135 05/03/22 17:48:12 mskold@mysql.com +3 -2
    Added better comment for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index

ChangeSet
  1.2135.1.7 05/03/22 17:42:08 mskold@mysql.com +3 -0
  Extra fix for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index

  sql/ha_ndbcluster.h
    1.50 05/03/22 17:41:44 mskold@mysql.com +2 -1
    Extra fix for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index

  sql/ha_ndbcluster.cc
    1.134 05/03/22 17:41:44 mskold@mysql.com +35 -21
    Extra fix for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index

  ndb/src/ndbapi/DictCache.cpp
    1.10 05/03/22 17:41:44 mskold@mysql.com +5 -4
    Extra fix for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index

ChangeSet
  1.2135.1.6 05/03/22 15:57:20 kent@mysql.com +1 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build
  into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

  mysql-test/mysql-test-run.sh
    1.247 05/03/22 15:57:11 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2121.1.8 05/03/22 15:12:05 kent@mysql.com +2 -0
  mysql-test-run.sh, mysql-test-run.pl:
    InnoDB needs longer start time for second slave on slow hosts

  mysql-test/mysql-test-run.sh
    1.244.1.1 05/03/22 15:11:18 kent@mysql.com +1 -1
    InnoDB needs longer start time for second slave on slow hosts

  mysql-test/mysql-test-run.pl
    1.14 05/03/22 15:11:18 kent@mysql.com +3 -3
    InnoDB needs longer start time for second slave on slow hosts

ChangeSet
  1.2135.1.5 05/03/22 02:36:31 monty@mysql.com +1 -0
  Fixed newly introduced bug in ROLLUP

  sql/sql_select.cc
    1.389 05/03/22 02:36:14 monty@mysql.com +1 -1
    Fixed newly introduced bug in ROLLUP

ChangeSet
  1.2135.1.4 05/03/21 22:21:55 heikki@hundin.mysql.fi +1 -0
  trx0trx.c:
    If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)

  innobase/trx/trx0trx.c
    1.42 05/03/21 22:17:54 heikki@hundin.mysql.fi +9 -1
    If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)

ChangeSet
  1.2135.1.3 05/03/21 22:14:00 heikki@hundin.mysql.fi +3 -0
  Merge

  innobase/trx/trx0trx.c
    1.41 05/03/21 22:13:51 heikki@hundin.mysql.fi +1 -9
    SCCS merged

  innobase/include/trx0trx.h
    1.36 05/03/21 22:13:15 heikki@hundin.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.372 05/03/21 22:13:01 heikki@hundin.mysql.fi +0 -0
    auto-union

ChangeSet
  1.1346.814.14 05/03/21 22:10:42 heikki@hundin.mysql.fi +2 -0
  trx0trx.c, trx0trx.h:
    If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)

  innobase/trx/trx0trx.c
    1.20.1.22 05/03/21 22:07:48 heikki@hundin.mysql.fi +9 -1
    If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)

  innobase/include/trx0trx.h
    1.30.1.4 05/03/21 22:07:41 heikki@hundin.mysql.fi +6 -0
    If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)

ChangeSet
  1.2135.1.1 05/03/21 18:11:11 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
  A fix for Netware.

  include/config-netware.h
    1.5 05/03/21 18:11:07 jani@a193-229-222-105.elisa-laajakaista.fi +3 -0
    A fix for Netware.

ChangeSet
  1.2121.1.7 05/03/21 16:01:39 kent@mysql.com +3 -0
  mtr_report.pl:
    Made --timer work
  mtr_cases.pl:
    Added option --reorder to get less server restarts
  mysql-test-run.pl:
    Added option --reorder to get less server restarts
    Moved do_before_start_master() not to remove binlog files unless restarted
    Made --timer work
    Slave was incorrectly writing log to error log

  mysql-test/lib/mtr_report.pl
    1.6 05/03/21 15:59:58 kent@mysql.com +5 -6
    Made --timer work

  mysql-test/lib/mtr_cases.pl
    1.2 05/03/21 15:59:15 kent@mysql.com +18 -15
    Added option --reorder to get less server restarts

  mysql-test/mysql-test-run.pl
    1.13 05/03/21 15:57:05 kent@mysql.com +21 -9
    Added option --reorder to get less server restarts
    Moved do_before_start_master() not to remove binlog files unless restarted
    Made --timer work
    Slave was incorrectly writing log to error log

ChangeSet
  1.2136 05/03/21 11:07:31 msvensson@neptunus.(none) +3 -0
  BUG#9072 'Max_error_count' system variable cannot be set to zero
   - Chaned min value in mysqld.cc
   - Added testcase to warnings.test

  sql/mysqld.cc
    1.561 05/03/21 11:07:28 msvensson@neptunus.(none) +1 -1
    Change min value of max_error_count from 1 to 0

  mysql-test/t/warnings.test
    1.19 05/03/21 11:07:28 msvensson@neptunus.(none) +13 -0
    Added testcase for testing max and min value of max_error_count

  mysql-test/r/warnings.result
    1.29 05/03/21 11:07:28 msvensson@neptunus.(none) +19 -0
    Added testcase for testing max and min value of max_error_count

ChangeSet
  1.2121.1.6 05/03/18 12:44:40 joerg@mysql.com +1 -0
  Move mis-placed assignments to their proper position.

  Build-tools/Do-compile
    1.108 05/03/18 12:44:37 joerg@mysql.com +2 -2
    Move mis-placed assignments to their proper position.

ChangeSet
  1.2121.2.1 05/03/18 09:00:46 serg@serg.mylan +1 -0
  don't allow to commit as mysqldev

  BitKeeper/triggers/pre-commit
    1.2 05/03/18 09:00:40 serg@serg.mylan +11 -0
    don't allow to commit as mysqldev

ChangeSet
  1.2134 05/03/17 20:18:19 igor@rurik.mysql.com +3 -0
  olap.test:
    Added a test case for bug #8617.
  sql_select.cc:
    Fixed bug #8617.
    Queries with ROLLUP and LIMIT n returned more than n rows
    if SQL_CALC_FOUND_ROWS was used.

  mysql-test/r/olap.result
    1.15 05/03/17 20:16:30 igor@rurik.mysql.com +13 -0

  mysql-test/t/olap.test
    1.12 05/03/17 20:16:01 igor@rurik.mysql.com +16 -0
    Added a test case for bug #8617.

  sql/sql_select.cc
    1.388 05/03/17 20:09:30 igor@rurik.mysql.com +1 -1
    Fixed bug #8617.
    Queries with ROLLUP and LIMIT n returned more than n rows
    if SQL_CALC_FOUND_ROWS was used.

ChangeSet
  1.2133 05/03/17 11:48:11 paul@frost.snake.net +1 -0
  Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
  into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1

  BitKeeper/etc/logging_ok
    1.371 05/03/17 11:47:53 paul@frost.snake.net +0 -0
    auto-union

ChangeSet
  1.1346.814.13 05/03/17 11:43:56 paul@frost.snake.net +1 -0
  Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
  into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0

  BitKeeper/etc/logging_ok
    1.206.1.125 05/03/17 11:43:29 paul@frost.snake.net +0 -0
    auto-union

ChangeSet
  1.2131.1.1 05/03/17 11:42:51 paul@frost.snake.net +1 -0
  Merge frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0
  into frost.snake.net:/Volumes/frost2/MySQL/bk/merge-4.1

  BitKeeper/etc/logging_ok
    1.369.1.1 05/03/17 11:42:35 paul@frost.snake.net +0 -1
    auto-union

ChangeSet
  1.1346.819.2 05/03/17 11:40:41 paul@frost.snake.net +15 -0
  Update URL.

  man/replace.1.in
    1.8 05/03/17 11:40:37 paul@frost.snake.net +1 -1
    Update URL.

  man/perror.1.in
    1.10 05/03/17 11:40:37 paul@frost.snake.net +1 -1
    Update URL.

  man/mysqlshow.1.in
    1.9 05/03/17 11:40:36 paul@frost.snake.net +1 -1
    Update URL.

  man/mysqlman.1.in
    1.2 05/03/17 11:40:36 paul@frost.snake.net +1 -1
    Update URL.

  man/mysqldump.1.in
    1.11 05/03/17 11:40:36 paul@frost.snake.net +1 -1
    Update URL.

  man/mysqld_safe.1.in
    1.10 05/03/17 11:40:36 paul@frost.snake.net +1 -1
    Update URL.

  man/mysqld_multi.1.in
    1.8 05/03/17 11:40:36 paul@frost.snake.net +1 -1
    Update URL.

  man/mysqld.1.in
    1.9 05/03/17 11:40:36 paul@frost.snake.net +1 -1
    Update URL.

  man/mysqladmin.1.in
    1.9 05/03/17 11:40:36 paul@frost.snake.net +1 -1
    Update URL.

  man/mysqlaccess.1.in
    1.11 05/03/17 11:40:36 paul@frost.snake.net +1 -1
    Update URL.

  man/mysql_zap.1.in
    1.8 05/03/17 11:40:36 paul@frost.snake.net +1 -1
    Update URL.

  man/mysql_fix_privilege_tables.1.in
    1.6 05/03/17 11:40:36 paul@frost.snake.net +1 -1
    Update URL.

  man/mysql.1.in
    1.12 05/03/17 11:40:35 paul@frost.snake.net +1 -1
    Update URL.

  man/isamlog.1.in
    1.8 05/03/17 11:40:35 paul@frost.snake.net +1 -1
    Update URL.

  man/isamchk.1.in
    1.9 05/03/17 11:40:35 paul@frost.snake.net +1 -1
    Update URL.

ChangeSet
  1.1346.819.1 05/03/17 11:33:07 paul@frost.snake.net +15 -0
  Update URL.

  BitKeeper/etc/logging_ok
    1.206.35.1 05/03/17 11:33:06 paul@frost.snake.net +1 -0
    Logging to logging@openlogging.org accepted

  man/replace.1.in
    1.7 05/03/17 11:32:55 paul@frost.snake.net +1 -1
    Update URL.

  man/perror.1.in
    1.9 05/03/17 11:32:55 paul@frost.snake.net +1 -1
    Update URL.

  man/mysqlshow.1.in
    1.8 05/03/17 11:32:55 paul@frost.snake.net +1 -1
    Update URL.

  man/mysqldump.1.in
    1.10 05/03/17 11:32:55 paul@frost.snake.net +1 -1
    Update URL.

  man/mysqld_safe.1.in
    1.9 05/03/17 11:32:55 paul@frost.snake.net +1 -1
    Update URL.

  man/mysqld_multi.1.in
    1.7 05/03/17 11:32:55 paul@frost.snake.net +1 -1
    Update URL.

  man/mysqld.1.in
    1.8 05/03/17 11:32:54 paul@frost.snake.net +1 -1
    Update URL.

  man/mysqladmin.1.in
    1.8 05/03/17 11:32:54 paul@frost.snake.net +1 -1
    Update URL.

  man/mysqlaccess.1.in
    1.10 05/03/17 11:32:54 paul@frost.snake.net +1 -1
    Update URL.

  man/mysql_zap.1.in
    1.7 05/03/17 11:32:54 paul@frost.snake.net +1 -1
    Update URL.

  man/mysql_fix_privilege_tables.1.in
    1.5 05/03/17 11:32:54 paul@frost.snake.net +1 -1
    Update URL.

  man/mysql.1.in
    1.11 05/03/17 11:32:54 paul@frost.snake.net +1 -1
    Update URL.

  man/isamlog.1.in
    1.7 05/03/17 11:32:54 paul@frost.snake.net +1 -1
    Update URL.

  man/isamchk.1.in
    1.8 05/03/17 11:32:54 paul@frost.snake.net +1 -1
    Update URL.

ChangeSet
  1.2132 05/03/17 17:00:44 gbichot@quadxeon.mysql.com +2 -0
  Merge quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon
  into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.1-4xeon

  sql/log_event.cc
    1.177 05/03/17 17:00:41 gbichot@quadxeon.mysql.com +9 -14
    Auto merged

  BitKeeper/etc/logging_ok
    1.370 05/03/17 17:00:13 gbichot@quadxeon.mysql.com +1 -1
    auto-union

ChangeSet
  1.1346.814.12 05/03/17 15:51:52 gbichot@quadxeon.mysql.com +1 -0
  Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
  into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon

  BitKeeper/etc/logging_ok
    1.206.1.124 05/03/17 15:51:29 gbichot@quadxeon.mysql.com +0 -0
    auto-union

ChangeSet
  1.1346.818.1 05/03/17 14:39:39 gbichot@quadxeon.mysql.com +2 -0
  safer creation of temp files used in replication of LOAD DATA INFILE.
  When we come to create these, they may already exist and it's necessary to delete these old, useless copies.

  BitKeeper/etc/logging_ok
    1.206.34.1 05/03/17 14:39:38 gbichot@quadxeon.mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/log_event.cc
    1.77.1.84 05/03/17 14:39:14 gbichot@quadxeon.mysql.com +10 -6
    safer creation of temp files used in replication of LOAD DATA INFILE.
    When we come to create these, they may already exist and it's necessary to delete these old, useless copies.

ChangeSet
  1.2131 05/03/17 10:59:25 ramil@mysql.com +3 -0
  Merge

  mysql-test/t/update.test
    1.18 05/03/17 10:59:24 ramil@mysql.com +0 -0
    SCCS merged

  mysql-test/r/update.result
    1.21 05/03/17 10:59:24 ramil@mysql.com +0 -0
    SCCS merged

  sql/key.cc
    1.26 05/03/17 10:57:50 ramil@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.814.11 05/03/17 10:24:50 ramil@mysql.com +3 -0
  A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes internal loop).

  sql/key.cc
    1.13.1.6 05/03/17 10:24:48 ramil@mysql.com +1 -1
    A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes internal loop).
    For "partial" key parts (e.g. key(a(20), ...) we create different
    key_part->field, see sql/table.cc; so we have to use the eq() 
    function here to compare fields.

  mysql-test/t/update.test
    1.6.1.9 05/03/17 10:24:48 ramil@mysql.com +10 -0
    A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes internal loop).

  mysql-test/r/update.result
    1.8.1.9 05/03/17 10:24:48 ramil@mysql.com +7 -0
    A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes internal loop).

ChangeSet
  1.2130 05/03/16 17:50:03 igor@rurik.mysql.com +1 -0
  Merge rurik.mysql.com:/home/igor/mysql-4.1
  into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  sql/item.h
    1.174 05/03/16 17:49:58 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2120.1.2 05/03/16 15:55:04 igor@rurik.mysql.com +3 -0
  olap.result, olap.test:
    Added a test for bug #8615.
  sql_select.cc:
    Fixed bug #8615.
    This fix only removed the cause of the reported crash.
    It does not resolve other problems of rollup queries
    with DISTINCT. They were fixed in the previous patch 
    for bug 8616.

  mysql-test/r/olap.result
    1.14 05/03/16 15:51:55 igor@rurik.mysql.com +18 -0
    Added a test for bug #8615.

  mysql-test/t/olap.test
    1.11 05/03/16 15:51:24 igor@rurik.mysql.com +4 -1
    Added a test for bug #8615.

  sql/sql_select.cc
    1.387 05/03/16 15:50:06 igor@rurik.mysql.com +4 -3
    Fixed bug #8615.
    This fix only removed the cause of the reported crash.
    It does not resolve other problems of rollup queries
    with DISTINCT. They were fixed in the previous patch 
    for bug 8616.

ChangeSet
  1.2127.2.1 05/03/16 21:56:56 lars@mysql.com +1 -0
  Fixes after Sinisa and Serg comments after push of patch for BUG#9123.
  BUG#9123 is solved earlier than this patch though.

  client/mysqldump.c
    1.183 05/03/16 21:56:38 lars@mysql.com +57 -36
    Fixes after Sinisa and Serg comments after push of patch for BUG#9123.
    BUG#9123 is solved earlier than this patch though.

ChangeSet
  1.2116.2.2 05/03/16 16:33:06 joerg@mysql.com +1 -0
  Add information to the log file written by 'Do-compile' that allows to calculate
  the time spent in the various steps.

  Build-tools/Do-compile
    1.107 05/03/16 16:33:02 joerg@mysql.com +41 -15
    Add information to the log file that allows to calculate the time spent in the
    various steps:
    
    1) Introduce a global variable 'global_step'.
    2) Before each major step, set it to some descriptive value.
    3) Expand the 'log_timestamp()' function to take a parameter (typical: "START",
       "DONE", or "ABORT") and append that to the timestamp in the log file,
       followed by the contents of 'global_step'.
    4) Add the "START" string as parameter to the 'log_timestamp' calls preceding a step.
    5) Add 'log_timestamp("DONE");' calls after the relevant steps.
    6) Add 'log_timestamp("ABORT");' calls to the error exits.

ChangeSet
  1.2121.1.4 05/03/16 16:52:40 bar@mysql.com +4 -0
  Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
  not always correct for NULL values.
  Now they always result a non NULL value even
  the argument is NULL. It is more usefull for 
  debugging purposes.

ChangeSet
  1.2121.1.3 05/03/16 16:44:28 gluh@gluh.mysql.r18.ru +3 -0
  Fix for bug#8656: Crash with group_concat on alias in outer table
  fixed result_field support of Item_ref

  sql/item.h
    1.172.1.1 05/03/16 16:44:22 gluh@gluh.mysql.r18.ru +1 -0
    Fix for bug#8656: Crash with group_concat on alias in outer table
    fixed result_field support of Item_ref

  mysql-test/t/func_gconcat.test
    1.25 05/03/16 16:44:22 gluh@gluh.mysql.r18.ru +8 -0
    Fix for bug#8656: Crash with group_concat on alias in outer table
    fixed result_field support of Item_ref

  mysql-test/r/func_gconcat.result
    1.34 05/03/16 16:44:22 gluh@gluh.mysql.r18.ru +7 -0
    Fix for bug#8656: Crash with group_concat on alias in outer table
    fixed result_field support of Item_ref

ChangeSet
  1.2118.2.2 05/03/16 15:32:43 monty@mysql.com +1 -0
  Fix to get --skip-ndb to work

  mysql-test/mysql-test-run.sh
    1.246 05/03/16 15:32:40 monty@mysql.com +2 -2
    Fix to get --skip-ndb to work

ChangeSet
  1.2125 05/03/16 13:48:34 lars@mysql.com +1 -0
  BUG#9123: Updates after Mats review

ChangeSet
  1.2121.1.2 05/03/16 15:57:57 gluh@gluh.mysql.r18.ru +3 -0
  Fix for bug #7100: relay_log_space_max missing from SHOW VARIABLES

  sql/set_var.cc
    1.162 05/03/16 15:57:51 gluh@gluh.mysql.r18.ru +1 -0
    Fix for bug #7100: relay_log_space_max missing from SHOW VARIABLES

  mysql-test/t/rpl000005.test
    1.13 05/03/16 15:57:51 gluh@gluh.mysql.r18.ru +5 -0
    Fix for bug #7100: relay_log_space_max missing from SHOW VARIABLES

  mysql-test/r/rpl000005.result
    1.12 05/03/16 15:57:51 gluh@gluh.mysql.r18.ru +3 -0
    Fix for bug #7100: relay_log_space_max missing from SHOW VARIABLES

  sql/item_strfunc.cc
    1.221 05/03/16 16:52:31 bar@mysql.com +7 -8
    Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
    not always correct for NULL values.
    
    A minor mistake in EXPORT_SET() was fixed.

  sql/item_func.cc
    1.237 05/03/16 16:52:30 bar@mysql.com +0 -5
    Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
    not always correct for NULL values.

  mysql-test/t/func_str.test
    1.70 05/03/16 16:52:30 bar@mysql.com +9 -0
    Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
    not always correct for NULL values.

  mysql-test/r/func_str.result
    1.89 05/03/16 16:52:30 bar@mysql.com +10 -1
    Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
    not always correct for NULL values.
    
    Also, a mistake in EXPORT_SET was fixed.

  client/mysqldump.c
    1.182 05/03/16 13:48:28 lars@mysql.com +2 -2
    BUG#9123: Updates after Mats review

ChangeSet
  1.2120.2.1 05/03/16 08:14:05 lars@mysql.com +1 -0
  Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b9123-4.1

  client/mysqldump.c
    1.181 05/03/16 08:14:01 lars@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2120.1.1 05/03/15 22:50:54 igor@rurik.mysql.com +5 -0
  olap.result, olap.test:
    Added a test case for bug #8616.
  item.h:
    Fixed bug #8616.
    Added class Item_null_result used in rollup processing.
  sql_select.h, sql_select.cc:
    Fixed bug #8616.
    Added JOIN::rollup_write_data to cover rollup queries
    with DISTINCT. Modified other rollup methods.

  mysql-test/r/olap.result
    1.13 05/03/15 22:49:41 igor@rurik.mysql.com +54 -0
    Added a test case for bug #8616.

  mysql-test/t/olap.test
    1.10 05/03/15 22:49:21 igor@rurik.mysql.com +27 -0
    Added a test case for bug #8616.

  sql/item.h
    1.173 05/03/15 22:47:26 igor@rurik.mysql.com +11 -0
    Fixed bug #8616.
    Added class Item_null_result used in rollup processing.

  sql/sql_select.h
    1.72 05/03/15 22:46:11 igor@rurik.mysql.com +2 -1
    Fixed bug #8616.
    Added JOIN::rollup_write_data to cover rollup queries
    with DISTINCT. Modified other rollup methods.

  sql/sql_select.cc
    1.386 05/03/15 22:44:45 igor@rurik.mysql.com +92 -26
    Fixed bug #8616.
    Added JOIN::rollup_write_data to cover rollup queries
    with DISTINCT. Modified other rollup methods.

ChangeSet
  1.2118.3.1 05/03/15 16:37:05 jimw@mysql.com +1 -0
  Fix 'tee' command in mysql client. (Bug #8499)

  client/mysql.cc
    1.200 05/03/15 16:37:03 jimw@mysql.com +6 -1
    A va_list can't be reused without being copied or reset, so
    don't try to reuse it in tee_fprintf().

ChangeSet
  1.2118.2.1 05/03/16 01:15:45 monty@mysql.com +4 -0
  Partly reverty back patch (in heap-auto-increment-key detection) to ensure that auto_key and auto_key_type are calculated the same way

  sql/ha_heap.cc
    1.51 05/03/16 01:15:42 monty@mysql.com +11 -9
    Partly reverty back patch to ensure that auto_key and auto_key_type are calculated the same way

  mysql-test/mysql-test-run.sh
    1.245 05/03/16 01:15:42 monty@mysql.com +1 -1
    made --skip-ndb a synonyme for --skip-ndbcluster

  include/heap.h
    1.24 05/03/16 01:15:42 monty@mysql.com +2 -0
    Partly reverty back patch to ensure that auto_key and auto_key_type are calculated the same way

  heap/hp_create.c
    1.17 05/03/16 01:15:42 monty@mysql.com +1 -2
    Partly reverty back patch to ensure that auto_key and auto_key_type are calculated the same way

ChangeSet
  1.2120 05/03/15 16:24:37 reggie@mdk10.(none) +1 -0
  Bug #6660  mysqldump creates bad pathnames on Windows
  
  sql_show.cc:
    changed strdup to thd->memdup per Serg's advice

  sql/sql_show.cc
    1.196 05/03/15 16:23:59 reggie@mdk10.(none) +1 -2
    changed strdup to thd->memdup per Serg's advice

ChangeSet
  1.2116.4.1 05/03/15 22:19:55 mskold@mysql.com +1 -0
  Fix for bug#9166: Cluster compile failure on Solaris 10

  ndb/src/common/util/basestring_vsnprintf.c
    1.11 05/03/15 22:19:23 mskold@mysql.com +2 -0
    Fix for bug#9166: Cluster compile failure on Solaris 10

ChangeSet
  1.2119 05/03/15 11:37:14 reggie@mdk10.(none) +1 -0
  Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mdk10.(none):/home/reggie/bk/mysql-4.1

  BitKeeper/etc/logging_ok
    1.369 05/03/15 11:36:29 reggie@mdk10.(none) +0 -0
    auto-union

ChangeSet
  1.2112.1.2 05/03/15 11:33:06 reggie@mdk10.(none) +2 -0
  Bug #6660  mysqldump creates bad pathnames on Windows
  
  This is a modifiction of my previous patch after receiving feedback. This is a better way to fix the problem.  With this patch, data directory and index directory will use only forward slashes (/) when on Windows.
  
  mysqldump.c:
    Removed fixPaths routine.  Was improper fix for bug #6660
  sql_show.cc:
    Changed append_directory to convert backslashes to foward slashes when on Windows.

  client/mysqldump.c
    1.180 05/03/15 11:31:47 reggie@mdk10.(none) +0 -21
    Removed fixPaths routine.  Was improper fix for bug #6660

  sql/sql_show.cc
    1.195 05/03/15 11:31:24 reggie@mdk10.(none) +9 -0
    Changed append_directory to convert backslashes to foward slashes when on Windows.

ChangeSet
  1.2112.4.1 05/03/15 16:23:02 lars@mysql.com +1 -0
  BUG#9123: If a table name is given with an underscore, 
  then this must be properly quoted when sent to 
  SHOW TABLES LIKE ...

  client/mysqldump.c
    1.178.1.1 05/03/15 16:22:53 lars@mysql.com +3 -1
    BUG#9123: If a table name is given with an underscore, 
    then this must be properly quoted when sent to 
    SHOW TABLES LIKE ...

ChangeSet
  1.2116.1.4 05/03/15 17:15:47 bar@mysql.com +5 -0
  # Bug#8785 Problem with nested concats and
  character set conversion of a string constant.

  sql/sql_string.h
    1.55 05/03/15 17:15:43 bar@mysql.com +4 -0
    A new method to cut Alloced_length to str_length for
    string constants, to avoid reusing them as a buffer
    in things like CONCAT().

  sql/item_strfunc.cc
    1.220 05/03/15 17:15:43 bar@mysql.com +1 -2
    Remove previous fix: it was not 100% correct.
    A non const_item() can return a constant String.

  sql/item.cc
    1.194 05/03/15 17:15:43 bar@mysql.com +12 -0
    # Bug#8785 Problem with nested concats and
    character set conversion of a string constant.

  mysql-test/t/ctype_utf8.test
    1.50 05/03/15 17:15:43 bar@mysql.com +9 -0
    Addign test

  mysql-test/r/ctype_utf8.result
    1.50 05/03/15 17:15:43 bar@mysql.com +7 -0
    Adding test

ChangeSet
  1.2116.2.1 05/03/15 12:40:28 joerg@mysql.com +1 -0
  Proactive compile fix (in case we ever enable "EVENT_DEBUG" on IRIX).

  ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.9 05/03/15 12:40:25 joerg@mysql.com +3 -2
    Proactive compile fix (in case we ever enable "EVENT_DEBUG" on IRIX):
    Two identical declarations on loop level will collide at function level.

ChangeSet
  1.2116.1.2 05/03/15 15:32:11 ramil@mysql.com +1 -0
  A fix (bug #8799: Killed filesorts can fail inited==RND assertion in ha_rnd_end).

  sql/filesort.cc
    1.93 05/03/15 15:32:06 ramil@mysql.com +5 -2
    A fix (bug #8799: Killed filesorts can fail inited==RND assertion in ha_rnd_end).              
    Should call ha_rnd_end() only if ha_rnd_init() was called.

ChangeSet
  1.2112.3.2 05/03/15 12:27:44 lenz@mysql.com +1 -0
  - Build fix for Do-solaris-pkg: fixed package name matching regex to be satisfied with 
    "mysql-pro-gpl-cert" packages as well (thanks to Kent for the suggestion)

  Build-tools/Do-solaris-pkg
    1.5 05/03/15 12:27:40 lenz@mysql.com +1 -1
    - fixed package name matching regex to be satisfied with "mysql-pro-gpl-cert" packages as well
      (thanks to Kent for the suggestion)

ChangeSet
  1.2112.3.1 05/03/15 12:23:14 lenz@mysql.com +1 -0
  Applied some changes to the mysql.server init script that are already shipped as an additional patch
  in the 4.1.10a RPMs for SLES9/RHEL3:
  
  - small improvement: use LSB functions to display startup success and failure, if available.
    Fall back to more primitive builtin functions otherwise.
  - joined two pieces of code performing the same functionality into one "wait_for_pid" function
  - added a "reload" function (LSB requirement)

  support-files/mysql.server.sh
    1.35 05/03/15 12:23:09 lenz@mysql.com +44 -17
    - small improvement: use LSB functions to display startup success and failure, if available.
      Fall back to builtin functions otherwise.
    - joined two pieces of code performing the same functionality into one "wait_for_pid" function
    - added a "reload" function (LSB requirement)

ChangeSet
  1.2111.1.1 05/03/15 13:32:12 ramil@mysql.com +5 -0
  A fix (bug #8489: Strange auto_increment behaviour with HEAP table).

  sql/ha_heap.cc
    1.50 05/03/15 13:32:08 ramil@mysql.com +8 -4
    A fix (bug #8489: Strange auto_increment behaviour with HEAP table).
    Handle autoincrement keys MyISAM-way.

  mysql-test/t/heap.test
    1.20 05/03/15 13:32:08 ramil@mysql.com +29 -0
    A fix (bug #8489: Strange auto_increment behaviour with HEAP table).

  mysql-test/r/heap.result
    1.28 05/03/15 13:32:08 ramil@mysql.com +42 -0
    A fix (bug #8489: Strange auto_increment behaviour with HEAP table).

  include/heap.h
    1.23 05/03/15 13:32:08 ramil@mysql.com +1 -1
    A fix (bug #8489: Strange auto_increment behaviour with HEAP table).
    Handle autoincrement keys MyISAM-way.

  heap/hp_create.c
    1.16 05/03/15 13:32:08 ramil@mysql.com +2 -1
    A fix (bug #8489: Strange auto_increment behaviour with HEAP table).
    Handle autoincrement keys MyISAM-way.

ChangeSet
  1.2117 05/03/15 11:14:57 marko@hundin.mysql.fi +1 -0
  Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
  into hundin.mysql.fi:/home/marko/mysql-4.1

  innobase/dict/dict0load.c
    1.31 05/03/15 11:14:45 marko@hundin.mysql.fi +0 -0
    SCCS merged

ChangeSet
  1.2116 05/03/15 08:26:17 heikki@hundin.mysql.fi +1 -0
  buf0flu.c:
    Add diagnostics to track why ut_a(block->state == BUF_BLOCK_FILE_PAGE) failed in buf_flush_ready_for_replace() for a user

  innobase/buf/buf0flu.c
    1.26 05/03/15 08:26:02 heikki@hundin.mysql.fi +9 -1
    Add diagnostics to track why ut_a(block->state == BUF_BLOCK_FILE_PAGE) failed in buf_flush_ready_for_replace() for a user

ChangeSet
  1.2112.2.1 05/03/14 19:59:59 paul@snake-hub.snake.net +1 -0
  Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0
  into snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1

  BitKeeper/etc/logging_ok
    1.367.1.1 05/03/14 19:59:52 paul@snake-hub.snake.net +0 -1
    auto-union

ChangeSet
  1.1346.817.1 05/03/14 19:59:00 paul@snake-hub.snake.net +2 -0
  mysql.1.in:
    Fix path that needs no parameterization.

  BitKeeper/etc/logging_ok
    1.206.1.123 05/03/14 19:59:00 paul@snake-hub.snake.net +1 -0
    Logging to logging@openlogging.org accepted

  man/mysql.1.in
    1.10 05/03/14 19:58:09 paul@snake-hub.snake.net +1 -1
    Fix path that needs no parameterization.

ChangeSet
  1.2114 05/03/15 04:09:41 sergefp@mysql.com +1 -0
  Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/psergey/mysql-4.1-bug8510

  sql/set_var.cc
    1.161 05/03/15 04:09:38 sergefp@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2112.1.1 05/03/14 16:47:35 reggie@mdk10.(none) +2 -0
  Bug #6660  mysqldump creates bad pathnames on Windows
  
  This really should not happen on Windows and part of the problem not fixed here is why show create table includes data directory when being run on Windows.  However, this patch fixes the bug in mysqldump.c
  
  mysqldump.c:
    Added fixPaths function to convert \ to / in data directory and index directory entries only on Windows

  BitKeeper/etc/logging_ok
    1.368 05/03/14 16:47:33 reggie@mdk10.(none) +1 -0
    Logging to logging@openlogging.org accepted

  client/mysqldump.c
    1.179 05/03/14 16:45:17 reggie@mdk10.(none) +22 -0
    Added fixPaths function to convert \ to / in data directory and index directory entries only on Windows

ChangeSet
  1.2113 05/03/14 16:59:09 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
  Updated error message to be more informative. Previous error message
  "Access denied to database mysql" was actually not just misleading, but
  also wrong.
  
  Bug#7905.

  sql/sql_parse.cc
    1.428 05/03/14 16:58:22 jani@a193-229-222-105.elisa-laajakaista.fi +5 -2
    Updated error message to be more informative. Previous error message
    "Access denied to database mysql" was actually not just misleading, but
    also wrong.
    
    Bug#7905.

ChangeSet
  1.2112 05/03/14 12:07:49 msvensson@neptunus.(none) +3 -0
  BUG#6554 Problem Building MySql on Fedora Core 3
   - Moved static variables defined inside of function to file scope to avoid this linking problem on FC3

  BitKeeper/etc/logging_ok
    1.367 05/03/14 12:07:49 msvensson@neptunus.(none) +1 -0
    Logging to logging@openlogging.org accepted

  sql/ha_ndbcluster.cc
    1.133 05/03/14 12:07:40 msvensson@neptunus.(none) +2 -2
    Moved list of ndb extesions to file scope

  sql/ha_berkeley.cc
    1.147 05/03/14 12:07:40 msvensson@neptunus.(none) +2 -1
    Moved list of bdb extension to file scope

ChangeSet
  1.1346.814.9 05/03/14 12:43:22 marko@hundin.mysql.fi +1 -0
  dict0load.c:
    dict_load_table(): Refuse to open ROW_FORMAT=COMPACT tables
    of MySQL 5.0.3 and later.

  innobase/dict/dict0load.c
    1.7.1.11 05/03/14 12:42:32 marko@hundin.mysql.fi +8 -1
    dict_load_table(): Refuse to open ROW_FORMAT=COMPACT tables
    of MySQL 5.0.3 and later.

ChangeSet
  1.2111 05/03/13 16:34:40 serg@serg.mylan +3 -0
  correct not_null_tables() for XOR and AND
  correct top_level_item for XOR

  sql/item_cmpfunc.h
    1.105 05/03/13 16:34:33 serg@serg.mylan +3 -1
    correct not_null_tables() for XOR and AND
    correct top_level_item for XOR

  mysql-test/t/join_outer.test
    1.19 05/03/13 16:34:33 serg@serg.mylan +1 -0
    one more test

  mysql-test/r/join_outer.result
    1.35 05/03/13 16:34:33 serg@serg.mylan +6 -0
    one more test

ChangeSet
  1.2110 05/03/12 23:31:52 igor@rurik.mysql.com +3 -0
  join_outer.result, join_outer.test:
    Added a test case for bug #9017.
  item_cmpfunc.h:
    A wrong not_null_tables method for Item_cond_xor
    caused a conversion of a left join into an inner join
    that was not valid.

  mysql-test/r/join_outer.result
    1.34 05/03/12 23:31:12 igor@rurik.mysql.com +22 -0
    Added a test case for bug #9017.

  mysql-test/t/join_outer.test
    1.18 05/03/12 23:30:34 igor@rurik.mysql.com +19 -0
    Added a test case for bug #9017.

  sql/item_cmpfunc.h
    1.104 05/03/12 23:29:15 igor@rurik.mysql.com +1 -0
    A wrong not_null_tables method for Item_cond_xor
    caused a conversion of a left join into an inner join
    that was not valid.

ChangeSet
  1.2108 05/03/11 11:07:32 jimw@mysql.com +3 -0
  Merge test and results

  mysql-test/t/query_cache.test
    1.39 05/03/11 11:07:29 jimw@mysql.com +13 -13
    Merge tests

  mysql-test/r/query_cache.result
    1.52 05/03/11 11:07:29 jimw@mysql.com +1 -1
    Update results

  sql/sql_table.cc
    1.275 05/03/11 11:06:18 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/query_cache.test
    1.16.3.2 05/03/11 11:06:18 jimw@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/r/query_cache.result
    1.15.3.2 05/03/11 11:06:18 jimw@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

ChangeSet
  1.2106 05/03/11 11:08:27 joerg@mysql.com +1 -0
  Keep the Perl version of 'mysql-test-run' in sync with the shell script.

  mysql-test/lib/mtr_report.pl
    1.5 05/03/11 11:08:23 joerg@mysql.com +1 -1
    Keep the Perl version in sync with the shell script so that 'Do-compile' will call
    PS and ES tests even after some previous test failures.
    (See previous change to 'mysql-test-run.sh' and 'Do-compile'.)

ChangeSet
  1.2055.552.1 05/03/10 19:42:52 mwagner@here.mwagner.org +1 -0
  Do-solaris-pkg:
    Many changes to improve error handling, and fix problem of multiple packaging processes trampling each other (32 & 64bit at the same time)

  Build-tools/Do-solaris-pkg
    1.4 05/03/10 19:40:39 mwagner@here.mwagner.org +16 -16
    Many changes to improve error handling, and fix problem of multiple packaging processes trampling each other (32 & 64bit at the same time)

ChangeSet
  1.2103.1.1 05/03/11 02:23:16 sergefp@mysql.com +3 -0
  Merge

  mysql-test/t/join_outer.test
    1.17 05/03/11 02:23:15 sergefp@mysql.com +0 -0
    SCCS merged

  mysql-test/r/join_outer.result
    1.33 05/03/11 02:23:15 sergefp@mysql.com +0 -0
    SCCS merged

  sql/item_cmpfunc.h
    1.103 05/03/11 02:22:24 sergefp@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.814.8 05/03/11 02:17:03 sergefp@mysql.com +3 -0
  Fix for BUG#8711: "<=>" may have true value for NULL arguments, so make 
  Item_func_equal::not_null_tables() always return 0.

  sql/item_cmpfunc.h
    1.13.1.23 05/03/11 02:17:02 sergefp@mysql.com +1 -0
    Fix for BUG#8711: "<=>" may have true value for NULL arguments, i.e. it can accept NULL-complemented 
    table rows. This differs from assumptions made in Item_func::not_null_tables(), so add 
    Item_func_equal::not_null_tables().
    Item_func_equal::not_null_tables_cache value doesn't make sense now, but we still let it be
    calculated (and ignore it)

  mysql-test/t/join_outer.test
    1.6.1.6 05/03/11 02:17:02 sergefp@mysql.com +13 -0
    Testcase for BUG#8711

  mysql-test/r/join_outer.result
    1.10.1.10 05/03/11 02:17:02 sergefp@mysql.com +20 -0
    Testcase for BUG#8711

ChangeSet
  1.2105 05/03/10 21:13:46 joerg@mysql.com +3 -0
  Correct "make_win_src_distribution" to not introduce additional directory layers,
  adapt the Windows build files accordingly.

  scripts/make_win_src_distribution.sh
    1.30 05/03/10 21:13:43 joerg@mysql.com +25 -9
    1) The semantics of "cp -R src targ" depend on the (non)existence of "targ".
    By simply doing "$CP -R $i $BASE/$i", the directory hierarchy below $BASE differed
    from the source for each "$i" that already existed as a target directory.
    This is now prevented by checking the existence and adapting the command.
    
    2) Comment where "$BASE" (the target directory) comes into existence.
    
    3) Introduce an "abort" function as a start point for more sanity checks, use it.

  VC++Files/tests/mysql_client_test_ia64.dsp
    1.3 05/03/10 21:13:43 joerg@mysql.com +3 -3
    As the directory structure on Windows now resembles that on Unix (no more
    "tests/tests", by the correction in "make_win_src_distribution.sh"), the location
    of "mysql_client_test.*" has changed. Adapt the build tools accordingly.

  VC++Files/tests/mysql_client_test.dsp
    1.3 05/03/10 21:13:43 joerg@mysql.com +5 -5
    As the directory structure on Windows now resembles that on Unix (no more
    "tests/tests", by the correction in "make_win_src_distribution.sh"), the location
    of "mysql_client_test.*" has changed. Adapt the build tools accordingly.

ChangeSet
  1.2104 05/03/10 20:31:05 joerg@mysql.com +2 -0
  Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1

  mysql-test/mysql-test-run.sh
    1.244 05/03/10 20:31:03 joerg@mysql.com +0 -0
    Auto merged

  Build-tools/Do-compile
    1.106 05/03/10 20:31:02 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.551.1 05/03/10 14:01:22 bell@sanja.is.com.ua +4 -0
  fixed left expression of IN/ALL/ANY subquery transformation support (BUG#8888)

  sql/item_subselect.h
    1.59 05/03/10 14:00:30 bell@sanja.is.com.ua +4 -4
    optimised field initialization and new method

  sql/item_subselect.cc
    1.129 05/03/10 14:00:30 bell@sanja.is.com.ua +111 -67
    fixfields made for left part of IN/ALL/ANY subquery before calling cols() to detect type of transformation (scalar or row)
    similar action of both transformation moved to separate function

  mysql-test/t/subselect.test
    1.142 05/03/10 14:00:30 bell@sanja.is.com.ua +10 -2
    fixed last test
    test of transformation of left expression of subquery

  mysql-test/r/subselect.result
    1.163 05/03/10 14:00:30 bell@sanja.is.com.ua +10 -2
    result changing
    fixed last test
    test of transformation of left expression of subquery

ChangeSet
  1.2100.1.3 05/03/10 07:48:44 joreland@mysql.com +2 -0
  Merge mysql.com:/home/jonas/src/fix
  into mysql.com:/home/jonas/src/mysql-4.1

  ndb/src/mgmsrv/ConfigInfo.cpp
    1.54 05/03/10 07:48:43 joreland@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/trix/Trix.cpp
    1.7 05/03/10 07:48:43 joreland@mysql.com +0 -1
    Auto merged

ChangeSet
  1.2055.445.9 05/03/10 07:45:17 joreland@mysql.com +3 -0
  bug#9089
  ndb - Reenable MAX_OPEN_FILES to enable LCP in some situations

  ndb/src/mgmsrv/ConfigInfo.cpp
    1.52.1.1 05/03/10 07:45:15 joreland@mysql.com +2 -3
    Reenable MAX_OPEN_FILES to enable LCP in some situations

  ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
    1.14 05/03/10 07:45:15 joreland@mysql.com +3 -3
    Reenable MAX_OPEN_FILES to enable LCP in some situations

  ndb/include/mgmapi/mgmapi_config_parameters.h
    1.15 05/03/10 07:45:15 joreland@mysql.com +2 -0
    Reenable MAX_OPEN_FILES to enable LCP in some situations

ChangeSet
  1.2099.1.2 05/03/09 13:20:52 igor@rurik.mysql.com +1 -0
  func_str.result:
    Correction after manual merge.

  mysql-test/r/func_str.result
    1.88 05/03/09 13:19:40 igor@rurik.mysql.com +0 -63
    Correction after manual merge.

ChangeSet
  1.2099.1.1 05/03/09 10:58:52 igor@rurik.mysql.com +4 -0
  Manual merge

  netware/BUILD/mwenv
    1.10 05/03/09 10:58:48 igor@rurik.mysql.com +0 -2
    Manual merge

  mysql-test/t/func_str.test
    1.69 05/03/09 10:58:48 igor@rurik.mysql.com +16 -17
    Manual merge

  mysql-test/r/func_str.result
    1.87 05/03/09 10:58:48 igor@rurik.mysql.com +78 -15
    Manual merge

  sql/item_strfunc.cc
    1.219 05/03/09 10:37:24 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2101 05/03/09 20:30:40 heikki@hundin.mysql.fi +1 -0
  log0recv.c:
    Better ibbackup message
    Add a message explaining why we do a 'crash recovery' after an ibbackup restore; suggested by Tim Smith

  innobase/log/log0recv.c
    1.41 05/03/09 20:30:28 heikki@hundin.mysql.fi +1 -1
    Better ibbackup message

  innobase/log/log0recv.c
    1.40 05/03/09 20:29:08 heikki@hundin.mysql.fi +2 -0
    Add a message explaining why we do a 'crash recovery' after an ibbackup restore; suggested by Tim Smith

ChangeSet
  1.2096.1.1 05/03/09 19:21:57 lars@mysql.com +1 -0
  Fix to make mysql-test-run.pl work with new system tables definitions

  mysql-test/lib/init_db.sql
    1.4 05/03/09 19:21:47 lars@mysql.com +50 -50
    Fixed mysql-test-run.pl's system tables to correspond to the real ones.

ChangeSet
  1.2082.6.1 05/03/09 16:51:03 timour@mysql.com +4 -0
  Fix for BUG#7425.
  The reported problems were due to two completely unrelated omissions.
  1) The file sort procedure didn't correctly create the sort key in
     make_sortkey when the sortkey was an unsigned integer.
  2) The name resolution procedure for column references inside a HAVING
     clause did not propagate the unsigned_flag of the resolved references.
  This patch corrects both problems.

  sql/item.cc
    1.193 05/03/09 16:50:57 timour@mysql.com +1 -0
    Once an Item_ref is resolved, propagate the unsigned_flag to the resolved item.

  sql/filesort.cc
    1.92 05/03/09 16:50:57 timour@mysql.com +8 -2
    Take into account whether 'item' represents a signed or an unsigned integer.

  mysql-test/t/select.test
    1.34 05/03/09 16:50:57 timour@mysql.com +11 -0
    Added test for BUG#7425.

  mysql-test/r/select.result
    1.50 05/03/09 16:50:57 timour@mysql.com +23 -0
    Added test result for BUG#7425.

ChangeSet
  1.2099 05/03/09 15:00:40 kent@mysql.com +1 -0
  mysqldumpslow.sh:
    bug#4914 added --help and usage information

  scripts/mysqldumpslow.sh
    1.8 05/03/09 14:56:28 kent@mysql.com +40 -3
    bug#4914 added --help and usage information

ChangeSet
  1.2098 05/03/09 13:41:57 serg@serg.mylan +1 -0
  sql/mysqld.cc
      preserve backward compatibility

  sql/mysqld.cc
    1.560 05/03/09 13:41:50 serg@serg.mylan +4 -1
    preserve backward compatibility

ChangeSet
  1.2093.1.1 05/03/09 12:59:20 serg@serg.mylan +1 -0
  myisam/myisam_ftdump.c
      recalculate stats/gws for the last word in the index too
      remove unused code

  myisam/myisam_ftdump.c
    1.36 05/03/09 12:59:13 serg@serg.mylan +89 -99
    recalculate stats/gws for the last word in the index too
    remove unused code

ChangeSet
  1.1346.814.7 05/03/09 00:15:51 igor@rurik.mysql.com +3 -0
  func_str.result, func_str.test:
    Added a test case for bug #8669.
  item_strfunc.cc:
    Fixed bug #8669.
    Function AES_DECRYPT can return NULL value.

  mysql-test/r/func_str.result
    1.16.2.17 05/03/09 00:15:26 igor@rurik.mysql.com +15 -0
    Added a test case for bug #8669.

  mysql-test/t/func_str.test
    1.15.2.18 05/03/09 00:14:54 igor@rurik.mysql.com +17 -0
    Added a test case for bug #8669.

  sql/item_strfunc.cc
    1.36.1.49 05/03/09 00:13:35 igor@rurik.mysql.com +1 -0
    Fixed bug #8669.
    Function AES_DECRYPT can return NULL value.

ChangeSet
  1.2055.445.8 05/03/09 07:49:03 joreland@mysql.com +1 -0
  bug#9052 - ndb - Use correct length during unique index build
  (recommit as 4.1->5.0 merge is not possible)

  ndb/src/kernel/blocks/trix/Trix.cpp
    1.5.1.1 05/03/09 07:49:00 joreland@mysql.com +1 -1
    Use correct length during unique index build
    

ChangeSet
  1.2096 05/03/09 02:53:00 kent@mysql.com +1 -0
  configure.in:
    bug#5102, bug#6862 define HAVE_VIS_H to libedit only if header and strvis() exists

  configure.in
    1.354 05/03/09 02:44:01 kent@mysql.com +7 -1
    bug#5102, bug#6862 define HAVE_VIS_H to libedit only if header and strvis() exists

ChangeSet
  1.2095 05/03/09 01:34:22 kent@mysql.com +11 -0
  mysql-test-run.pl:
    Removed -c from /bin/sh call
  make_win_src_distribution.sh:
    Copy all content in mysql-test
  make_win_binary_distribution.sh, make_binary_distribution.sh:
    Add Perl version of mysql-test-run to package
  s_win32_dsp, s_win32, s_vxworks, s_test, s_readme, s_java, s_javah:
    Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris

ChangeSet
  1.2094 05/03/08 21:49:30 marko@hundin.mysql.fi +1 -0
  mysqld.cc:
    main(): add missing parameter to printf(ER(ER_READY),...) call

  sql/mysqld.cc
    1.559 05/03/08 21:48:20 marko@hundin.mysql.fi +1 -3
    main(): add missing parameter to printf(ER(ER_READY),...) call

ChangeSet
  1.2089.1.8 05/03/08 13:13:15 paul@kite-hub.kitebird.com +1 -0
  changelog-4.1.xml:
    Add dummy changelog file. It should merge upward without conflict.

  Docs/changelog-4.1.xml
    1.1 05/03/08 13:12:42 paul@kite-hub.kitebird.com +18 -0

  Docs/changelog-4.1.xml
    1.0 05/03/08 13:12:42 paul@kite-hub.kitebird.com +0 -0
    BitKeeper file /src/extern/MySQL/bk/mysql-4.1/Docs/changelog-4.1.xml

ChangeSet
  1.2091 05/03/08 19:45:55 serg@serg.mylan +3 -0
  BUG#6635 - test_if_skip_sort_order() thought it can skip filesort
  for fulltext searches too

  sql/sql_select.cc
    1.385 05/03/08 19:45:49 serg@serg.mylan +1 -1
    BUG#6635 - test_if_skip_sort_order() thought it can skip filesort
    for fulltext searches too

  mysql-test/t/fulltext_order_by.test
    1.15 05/03/08 19:45:48 serg@serg.mylan +8 -0
    BUG#6635 - test_if_skip_sort_order() thought it can skip filesort
    for fulltext searches too

  mysql-test/r/fulltext_order_by.result
    1.14 05/03/08 19:45:48 serg@serg.mylan +8 -0
    BUG#6635 - test_if_skip_sort_order() thought it can skip filesort
    for fulltext searches too

ChangeSet
  1.2089.1.7 05/03/08 19:45:24 marko@hundin.mysql.fi +1 -0
  dict0load.c:
    dict_load_table(): Do not complain about mix_len != 0,
    because MySQL 3.23.4x left garbage in that column.

ChangeSet
  1.2089.1.6 05/03/08 20:06:08 Sinisa@sinisa.nasamreza.org +2 -0
  Fix to make builds possible

  mysql-test/t/mysqldump.test
    1.27 05/03/08 20:06:00 Sinisa@sinisa.nasamreza.org +1 -1
    Fix for avoiding version text

  mysql-test/r/mysqldump.result
    1.40 05/03/08 20:06:00 Sinisa@sinisa.nasamreza.org +0 -14
    Fix for avoiding version text

ChangeSet
  1.1346.814.6 05/03/08 11:49:56 paul@kite-hub.kitebird.com +1 -0
  changelog-4.0.xml:
    Fix bad root element name in DOCTYPE.  Sheesh.

  Docs/changelog-4.0.xml
    1.2 05/03/08 11:49:17 paul@kite-hub.kitebird.com +1 -1
    Fix bad root element name in DOCTYPE.  Sheesh.

  innobase/dict/dict0load.c
    1.30 05/03/08 19:44:21 marko@hundin.mysql.fi +0 -17
    dict_load_table(): Do not complain about mix_len != 0,
    because MySQL 3.23.4x left garbage in that column.

ChangeSet
  1.1346.816.1 05/03/08 10:43:44 paul@kite-hub.kitebird.com +1 -0
  Add dummy changelog file. It should merge upward without conflict.

  Docs/changelog-4.0.xml
    1.1 05/03/08 10:42:16 paul@kite-hub.kitebird.com +18 -0

  Docs/changelog-4.0.xml
    1.0 05/03/08 10:42:15 paul@kite-hub.kitebird.com +0 -0
    BitKeeper file /src/extern/MySQL/bk/mysql-4.0/Docs/changelog-4.0.xml

ChangeSet
  1.2089.1.5 05/03/08 18:32:31 jani@ua141d10.elisa.omakaista.fi +1 -0
  Added possibility to add disabled tests to mysql-test-run.

  mysql-test/mysql-test-run.sh
    1.242.1.3 05/03/08 18:32:28 jani@ua141d10.elisa.omakaista.fi +18 -0
    Added possibility to add disabled tests to mysql-test-run.

ChangeSet
  1.1346.814.4 05/03/08 18:18:53 jani@ua141d10.elisa.omakaista.fi +1 -0
  Netware build environment script related patch.

  netware/BUILD/mwenv
    1.3.1.4 05/03/08 18:18:52 jani@ua141d10.elisa.omakaista.fi +2 -2
    Netware build environment script related patch.

ChangeSet
  1.2089.1.4 05/03/08 17:18:27 marko@hundin.mysql.fi +1 -0
  After merge fixes

  innobase/dict/dict0load.c
    1.29 05/03/08 17:18:20 marko@hundin.mysql.fi +1 -1
    dict_load_table():
    Display diagnostic output if mix_len differs from 0.

ChangeSet
  1.1346.814.3 05/03/08 17:08:17 marko@hundin.mysql.fi +1 -0
  dict0load.c:
    dict_load_table(): Remove the check for row_format=compact for now,
    because the flag bit we used (high-order bit of mix_len)
    has not been zero for at least two customers.

  innobase/dict/dict0load.c
    1.7.1.10 05/03/08 17:06:01 marko@hundin.mysql.fi +0 -16
    dict_load_table(): Remove the check for row_format=compact for now,
    because the flag bit we used (high-order bit of mix_len)
    has not been zero for at least two customers.

  mysql-test/mysql-test-run.pl
    1.12 05/03/08 15:58:24 kent@mysql.com +14 -4
    Removed -c from /bin/sh call

  scripts/make_win_src_distribution.sh
    1.29 05/03/08 15:42:36 kent@mysql.com +2 -2
    Copy all content in mysql-test

ChangeSet
  1.2089.3.1 05/03/08 15:26:34 joreland@mysql.com +1 -0
  bug#9052 - ndb - Use correct length during unique index build

  ndb/src/kernel/blocks/trix/Trix.cpp
    1.6 05/03/08 15:26:32 joreland@mysql.com +1 -1
    Use correct length during unique index build

ChangeSet
  1.2089.1.3 05/03/08 16:02:13 marko@hundin.mysql.fi +2 -0
  Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
  into hundin.mysql.fi:/home/marko/mysql-4.1

  innobase/srv/srv0srv.c
    1.77 05/03/08 16:01:56 marko@hundin.mysql.fi +0 -0
    Auto merged

  innobase/include/srv0srv.h
    1.43 05/03/08 16:01:55 marko@hundin.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.2082.3.5 05/03/08 14:27:18 joerg@mysql.com +1 -0
  Post-merge manual fix.

  Build-tools/Do-compile
    1.104.1.2 05/03/08 14:26:31 joerg@mysql.com +0 -1
    Post-merge manual fix: Avoid the duplicate line.

ChangeSet
  1.2082.3.4 05/03/08 14:17:57 joerg@mysql.com +3 -0
  Manual merge, no effect on 4.1.

  sql/item_strfunc.cc
    1.218 05/03/08 14:17:54 joerg@mysql.com +0 -5
    No change in 4.1

  configure.in
    1.353 05/03/08 14:17:54 joerg@mysql.com +0 -1
    No change in 4.1 on merging.

  Build-tools/Do-compile
    1.104.1.1 05/03/08 14:17:54 joerg@mysql.com +1 -10
    Change in 4.0 was backport, no effect on 4.1

ChangeSet
  1.1346.815.1 05/03/08 11:42:21 lenz@mysql.com +1 -0
  - bumped up version number in configure.in from 4.0.24 -> 4.0.25 (ChangeSet 1.2073 was already tagged
    as 4.0.24)

  configure.in
    1.191.1.131 05/03/08 11:42:18 lenz@mysql.com +1 -1
    - bumped up version number from 4.0.24 -> 4.0.25

ChangeSet
  1.2055.445.7 05/03/08 10:25:21 joreland@mysql.com +1 -0
  bug#8918 - ndb - improve error message when stopping due to StartFailureTimeout

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
    1.11 05/03/08 10:25:19 joreland@mysql.com +17 -3
    bug#8918 - ndb - improve error message when stopping due to StartFailureTimeout

ChangeSet
  1.1346.814.1 05/03/08 11:12:18 marko@hundin.mysql.fi +2 -0
  InnoDB: Win64 portability fix: add missing declaration and
  correct the definition of srv_max_buf_pool_modified_pct.

  innobase/srv/srv0srv.c
    1.35.1.46 05/03/08 11:12:14 marko@hundin.mysql.fi +1 -1
    Define srv_max_buf_pool_modified_pct as ulong,
    as it is declared in ha_innodb.h.

  innobase/include/srv0srv.h
    1.21.1.16 05/03/08 11:12:14 marko@hundin.mysql.fi +1 -0
    Declare srv_max_buf_pool_modified_pct

ChangeSet
  1.1346.812.3 05/03/07 18:15:19 jimw@mysql.com +3 -0
  Flush entries from the query cache for tables used in
  administrative statements that may alter the table, such
  as REPAIR TABLE. (Bug #8480)

  sql/sql_table.cc
    1.112.1.81 05/03/07 18:15:17 jimw@mysql.com +3 -1
    Make sure entries are flushed from the query cache for
    any administrative command run on a table that acquires
    a write lock on it (and thus might change it), like 
    REPAIR TABLE.

  mysql-test/t/query_cache.test
    1.16.3.1 05/03/07 18:15:17 jimw@mysql.com +12 -0
    Add regression test

  mysql-test/r/query_cache.result
    1.15.3.1 05/03/07 18:15:17 jimw@mysql.com +20 -0
    Add new results

ChangeSet
  1.1346.813.1 05/03/07 18:56:18 gluh@gluh.mysql.r18.ru +1 -0
  Fix for bug#8978 : Crash on 'select format ...'

  sql/item_strfunc.cc
    1.36.1.48 05/03/07 18:55:55 gluh@gluh.mysql.r18.ru +7 -6
    Fix for bug#8978 : Crash on 'select format ...'

ChangeSet
  1.2090 05/03/07 16:45:19 serg@serg.mylan +1 -0
  additional safety

  sql/protocol.cc
    1.98 05/03/07 16:45:12 serg@serg.mylan +3 -2
    additional safety

ChangeSet
  1.1346.812.1 05/03/07 16:23:55 joerg@mysql.com +1 -0
  Avoid empty build (failure) mails on Solaris (backport from 4.1).

  Build-tools/Do-compile
    1.74.1.15 05/03/07 16:23:53 joerg@mysql.com +10 -6
    Backport of a change Lenz did in 4.1 (without it, Solaris sends empty mails):
    
    Improved the abort subroutine to not rely on an external "tail" command (the
    default /usr/bin/tail on Solaris does not understand the "-n" notation).
    Get rid of a "useless use of cat" case in the process.

ChangeSet
  1.2082.1.10 05/03/07 16:23:41 Sinisa@sinisa.nasamreza.org +3 -0
  Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  mysql-test/t/mysqldump.test
    1.26 05/03/07 16:23:29 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/r/mysqldump.result
    1.39 05/03/07 16:23:29 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  BitKeeper/etc/ignore
    1.227 05/03/07 16:22:06 Sinisa@sinisa.nasamreza.org +50 -52
    auto-union

ChangeSet
  1.2082.1.8 05/03/07 14:30:30 heikki@hundin.mysql.fi +1 -0
  trx0trx.c:
    Print a hex dump of the trx_t object if trx->n_mysql_tables_in_use != 0 at trx_free()

ChangeSet
  1.2082.1.7 05/03/07 14:28:09 tomas@poseidon.ndb.mysql.com +1 -0
  mysql-test-run.sh:
    added skip-ndbcluster switch

  mysql-test/mysql-test-run.sh
    1.242.1.2 05/03/07 14:27:39 tomas@poseidon.ndb.mysql.com +5 -0
    added skip-ndbcluster switch

ChangeSet
  1.2086 05/03/07 13:59:28 serg@serg.mylan +2 -0
  Fixed crash if max_connections is exceeded. BUG#8996

  sql/protocol.cc
    1.97 05/03/07 13:59:14 serg@serg.mylan +3 -2
    don't bother remembering warnings if the thread is dying

  sql/mysqld.cc
    1.558 05/03/07 13:59:13 serg@serg.mylan +1 -0
    mark the thread as killed in close_connection

ChangeSet
  1.2082.5.1 05/03/07 13:42:01 tomas@poseidon.ndb.mysql.com +2 -0
  mysql-test-run to default run with ndbcluster if compiled with that support

  mysql-test/mysql-test-run.sh
    1.242.1.1 05/03/07 13:41:53 tomas@poseidon.ndb.mysql.com +1 -1
    mysql-test-run to default run with ndbcluster if compiled with that support

  mysql-test/Makefile.am
    1.41 05/03/07 13:41:53 tomas@poseidon.ndb.mysql.com +3 -0
    mysql-test-run to default run with ndbcluster if compiled with that support

  innobase/trx/trx0trx.c
    1.40 05/03/07 14:30:17 heikki@hundin.mysql.fi +2 -0
    Print a hex dump of the trx_t object if trx->n_mysql_tables_in_use != 0 at trx_free()

ChangeSet
  1.2082.1.4 05/03/07 13:04:05 georg@lmy002.wdf.sap.corp +32 -0
  Various fixes for Windows 2003 Platform SDK SP1 beta

  VC++Files/thr_test/thr_test_ia64.dsp
    1.2 05/03/07 13:04:00 georg@lmy002.wdf.sap.corp +6 -6
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/tests/mysql_client_test_ia64.dsp
    1.2 05/03/07 13:04:00 georg@lmy002.wdf.sap.corp +30 -5
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/test1/test1_ia64.dsp
    1.2 05/03/07 13:04:00 georg@lmy002.wdf.sap.corp +7 -6
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/strings/strings_ia64.dsp
    1.2 05/03/07 13:04:00 georg@lmy002.wdf.sap.corp +1 -1
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/sql/mysqldmax_ia64.dsp
    1.2 05/03/07 13:03:59 georg@lmy002.wdf.sap.corp +5 -5
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/sql/mysqld_ia64.dsp
    1.2 05/03/07 13:03:59 georg@lmy002.wdf.sap.corp +20 -20
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/replace/replace_ia64.dsp
    1.2 05/03/07 13:03:59 georg@lmy002.wdf.sap.corp +8 -8
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/perror/perror_ia64.dsp
    1.2 05/03/07 13:03:59 georg@lmy002.wdf.sap.corp +10 -10
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/pack_isam/pack_isam_ia64.dsp
    1.2 05/03/07 13:03:59 georg@lmy002.wdf.sap.corp +8 -8
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/mysqlwatch/mysqlwatch_ia64.dsp
    1.2 05/03/07 13:03:59 georg@lmy002.wdf.sap.corp +4 -4
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/mysqlshutdown/mysqlshutdown_ia64.dsp
    1.2 05/03/07 13:03:59 georg@lmy002.wdf.sap.corp +6 -6
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/mysqlmanager/MySqlManager_ia64.dsp
    1.2 05/03/07 13:03:59 georg@lmy002.wdf.sap.corp +4 -4
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/mysqlcheck/mysqlcheck_ia64.dsp
    1.2 05/03/07 13:03:59 georg@lmy002.wdf.sap.corp +8 -8
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp
    1.2 05/03/07 13:03:58 georg@lmy002.wdf.sap.corp +8 -8
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/mysql_ia64.dsw
    1.2 05/03/07 13:03:58 georg@lmy002.wdf.sap.corp +114 -215
    Fixes for Platform SDK SP1 beta1 (Window IA64)
    Changed project order (dependency doesn't work with platform SDK)

  VC++Files/mysql-test/mysql_test_run_new_ia64.dsp
    1.2 05/03/07 13:03:58 georg@lmy002.wdf.sap.corp +8 -6
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/myisampack/myisampack_ia64.dsp
    1.2 05/03/07 13:03:58 georg@lmy002.wdf.sap.corp +8 -8
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/myisamlog/myisamlog_ia64.dsp
    1.2 05/03/07 13:03:58 georg@lmy002.wdf.sap.corp +8 -8
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/myisamchk/myisamchk_ia64.dsp
    1.2 05/03/07 13:03:58 georg@lmy002.wdf.sap.corp +8 -8
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp
    1.2 05/03/07 13:03:58 georg@lmy002.wdf.sap.corp +6 -6
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/my_print_defaults/my_print_defaults_ia64.dsp
    1.2 05/03/07 13:03:58 georg@lmy002.wdf.sap.corp +10 -9
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/libmysqltest/myTest_ia64.dsp
    1.2 05/03/07 13:03:58 georg@lmy002.wdf.sap.corp +6 -6
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/libmysqld/libmysqld_ia64.dsp
    1.2 05/03/07 13:03:58 georg@lmy002.wdf.sap.corp +11 -12
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp
    1.2 05/03/07 13:03:58 georg@lmy002.wdf.sap.corp +5 -6
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/libmysql/libmysql_ia64.dsp
    1.2 05/03/07 13:03:58 georg@lmy002.wdf.sap.corp +6 -6
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/isamchk/isamchk_ia64.dsp
    1.2 05/03/07 13:03:58 georg@lmy002.wdf.sap.corp +6 -6
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/comp_err/comp_err_ia64.dsp
    1.2 05/03/07 13:03:58 georg@lmy002.wdf.sap.corp +6 -6
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/client/mysqltest_ia64.dsp
    1.2 05/03/07 13:03:57 georg@lmy002.wdf.sap.corp +11 -10
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/client/mysqlshow_ia64.dsp
    1.2 05/03/07 13:03:57 georg@lmy002.wdf.sap.corp +8 -8
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/client/mysqlimport_ia64.dsp
    1.2 05/03/07 13:03:57 georg@lmy002.wdf.sap.corp +18 -18
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/client/mysqldump_ia64.dsp
    1.2 05/03/07 13:03:57 georg@lmy002.wdf.sap.corp +8 -8
    Fixes for Platform SDK SP1 beta1 (Window IA64)

  VC++Files/client/mysqladmin_ia64.dsp
    1.2 05/03/07 13:03:57 georg@lmy002.wdf.sap.corp +8 -8
    Fixes for Platform SDK SP1 beta1 (Window IA64)

ChangeSet
  1.2082.4.1 05/03/07 12:03:33 marko@hundin.mysql.fi +16 -0
  InnoDB: Portability fixes for warnings reported on IA-64 Windows

  innobase/ut/ut0ut.c
    1.28 05/03/07 12:03:27 marko@hundin.mysql.fi +1 -1
    Make implicit type conversion explicit

  innobase/trx/trx0sys.c
    1.31 05/03/07 12:03:27 marko@hundin.mysql.fi +2 -1
    Declare trx_sys_mysql_bin_log_pos_high and
    trx_sys_mysql_bin_log_pos_low with a matching data type

  innobase/row/row0sel.c
    1.66 05/03/07 12:03:27 marko@hundin.mysql.fi +4 -4
    Portability fix: Use %p for printing pointers

  innobase/row/row0mysql.c
    1.89 05/03/07 12:03:27 marko@hundin.mysql.fi +6 -6
    Make implicit type conversions explicit

  innobase/rem/rem0cmp.c
    1.23 05/03/07 12:03:27 marko@hundin.mysql.fi +8 -5
    Make implicit type conversions explicit

  innobase/os/os0thread.c
    1.27 05/03/07 12:03:27 marko@hundin.mysql.fi +2 -2
    Add DWORD casts for Windows

  innobase/os/os0sync.c
    1.24 05/03/07 12:03:27 marko@hundin.mysql.fi +2 -2
    Add DWORD casts for Windows

  innobase/os/os0file.c
    1.99 05/03/07 12:03:26 marko@hundin.mysql.fi +11 -11
    Add DWORD casts for Windows

  innobase/mem/mem0dbg.c
    1.17 05/03/07 12:03:26 marko@hundin.mysql.fi +1 -1
    Portability fix: Use %p for printing pointers

  innobase/include/pars0sym.h
    1.4 05/03/07 12:03:26 marko@hundin.mysql.fi +1 -1
    Remove implicit type conversion

  innobase/include/pars0pars.h
    1.7 05/03/07 12:03:26 marko@hundin.mysql.fi +1 -1
    Remove implicit type conversion

  innobase/include/page0page.ic
    1.7 05/03/07 12:03:26 marko@hundin.mysql.fi +4 -4
    Portability fix: Use %p for printing pointers

  innobase/include/mem0mem.ic
    1.11 05/03/07 12:03:26 marko@hundin.mysql.fi +1 -1
    Remove implicit type conversion

  innobase/eval/eval0proc.c
    1.2 05/03/07 12:03:26 marko@hundin.mysql.fi +1 -1
    Declare loop_var_value with a matching data type.

  innobase/dict/dict0dict.c
    1.61 05/03/07 12:03:26 marko@hundin.mysql.fi +3 -2
    Properly cast the arguments of toupper()

  innobase/buf/buf0lru.c
    1.21 05/03/07 12:03:26 marko@hundin.mysql.fi +3 -3
    Portability fix: Use %p for printing pointers

ChangeSet
  1.2082.2.2 05/03/07 10:53:16 mskold@mysql.com +2 -0
  Review fixes for Bug #8753 Invalid schema
  object version after dropping index

  sql/ha_ndbcluster.h
    1.49 05/03/07 10:53:03 mskold@mysql.com +1 -1
    Review fixes for Bug #8753 Invalid schema
    object version after dropping index

  sql/ha_ndbcluster.cc
    1.132 05/03/07 10:53:03 mskold@mysql.com +4 -5
    Review fixes for Bug #8753 Invalid schema
    object version after dropping index

ChangeSet
  1.2082.3.3 05/03/07 10:29:50 joerg@mysql.com +1 -0
  Manual merge.

  sql/net_serv.cc
    1.72 05/03/07 10:29:48 joerg@mysql.com +0 -1
    Manual merge.

ChangeSet
  1.2082.3.2 05/03/07 10:28:56 joerg@mysql.com +1 -0
  Merge 4.0.24 compile changes into the 4.1 tree.

  mysys/my_bitmap.c
    1.21 05/03/07 10:28:53 joerg@mysql.com +0 -4
    Resolved merge conflict (identical change in 4.0 and 4.1).

ChangeSet
  1.2082.3.1 05/03/07 10:27:20 joerg@mysql.com +2 -0
  Manual merge of the 4.0.24 compile changes into the 4.1 tree.

  mysys/hash.c
    1.42 05/03/07 10:27:17 joerg@mysql.com +1 -2
    Manually merged: 'static' for all, 'inline' for most platforms.

  include/my_sys.h
    1.132 05/03/07 10:23:12 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2082.2.1 05/03/07 10:21:38 mskold@mysql.com +7 -0
  Fix for Bug #8753 Invalid schema object version after dropping index

  sql/ha_ndbcluster.h
    1.48 05/03/07 10:21:08 mskold@mysql.com +1 -0
    Fix for Bug #8753 Invalid schema object version after dropping index

  sql/ha_ndbcluster.cc
    1.131 05/03/07 10:21:08 mskold@mysql.com +32 -6
    Fix for Bug #8753 Invalid schema object version after dropping index

  mysql-test/t/ndb_alter_table.test
    1.17 05/03/07 10:21:08 mskold@mysql.com +16 -0
    Fix for Bug #8753 Invalid schema object version after dropping index

  mysql-test/r/ndb_alter_table.result
    1.19 05/03/07 10:21:08 mskold@mysql.com +14 -0
    Fix for Bug #8753 Invalid schema object version after dropping index

  mysql-test/t/ndb_multi.test
    1.1 05/03/07 09:54:53 mskold@mysql.com +44 -0

  mysql-test/r/ndb_multi.result
    1.1 05/03/07 09:54:53 mskold@mysql.com +49 -0

  mysql-test/t/ndb_multi.test
    1.0 05/03/07 09:54:53 mskold@mysql.com +0 -0
    BitKeeper file /usr/local/home/marty/MySQL/mysql-4.1/mysql-test/t/ndb_multi.test

  mysql-test/r/ndb_multi.result
    1.0 05/03/07 09:54:53 mskold@mysql.com +0 -0
    BitKeeper file /usr/local/home/marty/MySQL/mysql-4.1/mysql-test/r/ndb_multi.result

  mysql-test/include/have_multi_ndb.inc
    1.1 05/03/07 09:54:52 mskold@mysql.com +28 -0

  mysql-test/include/have_multi_ndb.inc
    1.0 05/03/07 09:54:52 mskold@mysql.com +0 -0
    BitKeeper file /usr/local/home/marty/MySQL/mysql-4.1/mysql-test/include/have_multi_ndb.inc

ChangeSet
  1.2082.1.3 05/03/07 09:47:24 georg@lmy002.wdf.sap.corp +3 -0
  fixed conversion errors (Windows IA64 build)

  client/sql_string.cc
    1.20 05/03/07 09:47:18 georg@lmy002.wdf.sap.corp +2 -2
    fixed conversion errors (Windows IA64 build)

  client/readline.cc
    1.11 05/03/07 09:47:18 georg@lmy002.wdf.sap.corp +1 -1
    fixed conversion errors (Windows IA64 build)

  client/mysql.cc
    1.199 05/03/07 09:47:18 georg@lmy002.wdf.sap.corp +5 -7
    fixed conversion errors (Windows IA64 build)

  scripts/make_win_binary_distribution.sh
    1.3 05/03/06 15:58:56 kent@mysql.com +4 -0
    Add Perl version of mysql-test-run to package

  scripts/make_binary_distribution.sh
    1.74 05/03/06 15:57:21 kent@mysql.com +5 -3
    Add Perl version of mysql-test-run to package

ChangeSet
  1.2082.1.2 05/03/06 14:22:28 georg@lmy002.wdf.sap.corp +51 -0
  New Project files for Windows Ithanium 64-bit builds

  BitKeeper/etc/logging_ok
    1.366 05/03/06 14:22:27 georg@lmy002.wdf.sap.corp +1 -0
    Logging to logging@openlogging.org accepted

  VC++Files/zlib/zlib_ia64.dsp
    1.1 05/03/06 14:22:12 georg@lmy002.wdf.sap.corp +204 -0

  VC++Files/vio/vio_ia64.dsp
    1.1 05/03/06 14:22:12 georg@lmy002.wdf.sap.corp +108 -0

  VC++Files/zlib/zlib_ia64.dsp
    1.0 05/03/06 14:22:12 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/zlib/zlib_ia64.dsp

  VC++Files/vio/vio_ia64.dsp
    1.0 05/03/06 14:22:12 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/vio/vio_ia64.dsp

  VC++Files/thr_test/thr_test_ia64.dsp
    1.1 05/03/06 14:22:11 georg@lmy002.wdf.sap.corp +106 -0

  VC++Files/tests/mysql_client_test_ia64.dsp
    1.1 05/03/06 14:22:11 georg@lmy002.wdf.sap.corp +62 -0

  VC++Files/test1/test1_ia64.dsp
    1.1 05/03/06 14:22:11 georg@lmy002.wdf.sap.corp +103 -0

  VC++Files/strings/strings_ia64.dsp
    1.1 05/03/06 14:22:11 georg@lmy002.wdf.sap.corp +266 -0

  VC++Files/thr_test/thr_test_ia64.dsp
    1.0 05/03/06 14:22:11 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/thr_test/thr_test_ia64.dsp

  VC++Files/tests/mysql_client_test_ia64.dsp
    1.0 05/03/06 14:22:11 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/tests/mysql_client_test_ia64.dsp

  VC++Files/test1/test1_ia64.dsp
    1.0 05/03/06 14:22:11 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/test1/test1_ia64.dsp

  VC++Files/strings/strings_ia64.dsp
    1.0 05/03/06 14:22:11 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/strings/strings_ia64.dsp

  VC++Files/sql/mysqldmax_ia64.dsp
    1.1 05/03/06 14:22:10 georg@lmy002.wdf.sap.corp +1542 -0

  VC++Files/sql/mysqld_ia64.dsp
    1.1 05/03/06 14:22:10 georg@lmy002.wdf.sap.corp +2013 -0

  VC++Files/replace/replace_ia64.dsp
    1.1 05/03/06 14:22:10 georg@lmy002.wdf.sap.corp +125 -0

  VC++Files/regex/regex_ia64.dsp
    1.1 05/03/06 14:22:10 georg@lmy002.wdf.sap.corp +114 -0

  VC++Files/sql/mysqldmax_ia64.dsp
    1.0 05/03/06 14:22:10 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/sql/mysqldmax_ia64.dsp

  VC++Files/sql/mysqld_ia64.dsp
    1.0 05/03/06 14:22:10 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/sql/mysqld_ia64.dsp

  VC++Files/replace/replace_ia64.dsp
    1.0 05/03/06 14:22:10 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/replace/replace_ia64.dsp

  VC++Files/regex/regex_ia64.dsp
    1.0 05/03/06 14:22:10 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/regex/regex_ia64.dsp

  VC++Files/perror/perror_ia64.dsp
    1.1 05/03/06 14:22:09 georg@lmy002.wdf.sap.corp +140 -0

  VC++Files/pack_isam/pack_isam_ia64.dsp
    1.1 05/03/06 14:22:09 georg@lmy002.wdf.sap.corp +133 -0

  VC++Files/mysys/mysys_ia64.dsp
    1.1 05/03/06 14:22:09 georg@lmy002.wdf.sap.corp +619 -0

  VC++Files/mysqlwatch/mysqlwatch_ia64.dsp
    1.1 05/03/06 14:22:09 georg@lmy002.wdf.sap.corp +71 -0

  VC++Files/mysqlshutdown/mysqlshutdown_ia64.dsp
    1.1 05/03/06 14:22:09 georg@lmy002.wdf.sap.corp +119 -0

  VC++Files/perror/perror_ia64.dsp
    1.0 05/03/06 14:22:09 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/perror/perror_ia64.dsp

  VC++Files/pack_isam/pack_isam_ia64.dsp
    1.0 05/03/06 14:22:09 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/pack_isam/pack_isam_ia64.dsp

  VC++Files/mysys/mysys_ia64.dsp
    1.0 05/03/06 14:22:09 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/mysys/mysys_ia64.dsp

  VC++Files/mysqlwatch/mysqlwatch_ia64.dsp
    1.0 05/03/06 14:22:09 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/mysqlwatch/mysqlwatch_ia64.dsp

  VC++Files/mysqlshutdown/mysqlshutdown_ia64.dsp
    1.0 05/03/06 14:22:09 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/mysqlshutdown/mysqlshutdown_ia64.dsp

  VC++Files/mysqlshutdown/myshutdown_ia64.dsp
    1.1 05/03/06 14:22:08 georg@lmy002.wdf.sap.corp +101 -0

  VC++Files/mysqlserver/mysqlserver_ia64.dsp
    1.1 05/03/06 14:22:08 georg@lmy002.wdf.sap.corp +84 -0

  VC++Files/mysqlmanager/MySqlManager_ia64.dsp
    1.1 05/03/06 14:22:08 georg@lmy002.wdf.sap.corp +276 -0

  VC++Files/mysqldemb/mysqldemb_ia64.dsp
    1.1 05/03/06 14:22:08 georg@lmy002.wdf.sap.corp +447 -0

  VC++Files/mysqlshutdown/myshutdown_ia64.dsp
    1.0 05/03/06 14:22:08 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/mysqlshutdown/myshutdown_ia64.dsp

  VC++Files/mysqlserver/mysqlserver_ia64.dsp
    1.0 05/03/06 14:22:08 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/mysqlserver/mysqlserver_ia64.dsp

  VC++Files/mysqlmanager/MySqlManager_ia64.dsp
    1.0 05/03/06 14:22:08 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/mysqlmanager/MySqlManager_ia64.dsp

  VC++Files/mysqldemb/mysqldemb_ia64.dsp
    1.0 05/03/06 14:22:08 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/mysqldemb/mysqldemb_ia64.dsp

  VC++Files/mysqlcheck/mysqlcheck_ia64.dsp
    1.1 05/03/06 14:22:07 georg@lmy002.wdf.sap.corp +132 -0

  VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp
    1.1 05/03/06 14:22:07 georg@lmy002.wdf.sap.corp +139 -0

  VC++Files/mysql_ia64.dsw
    1.1 05/03/06 14:22:07 georg@lmy002.wdf.sap.corp +884 -0

  VC++Files/mysql-test/mysql_test_run_new_ia64.dsp
    1.1 05/03/06 14:22:07 georg@lmy002.wdf.sap.corp +140 -0

  VC++Files/mysqlcheck/mysqlcheck_ia64.dsp
    1.0 05/03/06 14:22:07 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/mysqlcheck/mysqlcheck_ia64.dsp

  VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp
    1.0 05/03/06 14:22:07 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp

  VC++Files/mysql_ia64.dsw
    1.0 05/03/06 14:22:07 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/mysql_ia64.dsw

  VC++Files/mysql-test/mysql_test_run_new_ia64.dsp
    1.0 05/03/06 14:22:07 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/mysql-test/mysql_test_run_new_ia64.dsp

  VC++Files/myisampack/myisampack_ia64.dsp
    1.1 05/03/06 14:22:06 georg@lmy002.wdf.sap.corp +138 -0

  VC++Files/myisammrg/myisammrg_ia64.dsp
    1.1 05/03/06 14:22:06 georg@lmy002.wdf.sap.corp +233 -0

  VC++Files/myisamlog/myisamlog_ia64.dsp
    1.1 05/03/06 14:22:06 georg@lmy002.wdf.sap.corp +138 -0

  VC++Files/myisamchk/myisamchk_ia64.dsp
    1.1 05/03/06 14:22:06 georg@lmy002.wdf.sap.corp +136 -0

  VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp
    1.1 05/03/06 14:22:06 georg@lmy002.wdf.sap.corp +105 -0

  VC++Files/myisampack/myisampack_ia64.dsp
    1.0 05/03/06 14:22:06 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/myisampack/myisampack_ia64.dsp

  VC++Files/myisammrg/myisammrg_ia64.dsp
    1.0 05/03/06 14:22:06 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/myisammrg/myisammrg_ia64.dsp

  VC++Files/myisamlog/myisamlog_ia64.dsp
    1.0 05/03/06 14:22:06 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/myisamlog/myisamlog_ia64.dsp

  VC++Files/myisamchk/myisamchk_ia64.dsp
    1.0 05/03/06 14:22:06 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/myisamchk/myisamchk_ia64.dsp

  VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp
    1.0 05/03/06 14:22:06 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp

  VC++Files/myisam/myisam_ia64.dsp
    1.1 05/03/06 14:22:05 georg@lmy002.wdf.sap.corp +366 -0

  VC++Files/my_print_defaults/my_print_defaults_ia64.dsp
    1.1 05/03/06 14:22:05 georg@lmy002.wdf.sap.corp +132 -0

  VC++Files/merge/merge_ia64.dsp
    1.1 05/03/06 14:22:05 georg@lmy002.wdf.sap.corp +134 -0

  VC++Files/libmysqltest/myTest_ia64.dsp
    1.1 05/03/06 14:22:05 georg@lmy002.wdf.sap.corp +94 -0

  VC++Files/myisam/myisam_ia64.dsp
    1.0 05/03/06 14:22:05 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/myisam/myisam_ia64.dsp

  VC++Files/my_print_defaults/my_print_defaults_ia64.dsp
    1.0 05/03/06 14:22:05 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/my_print_defaults/my_print_defaults_ia64.dsp

  VC++Files/merge/merge_ia64.dsp
    1.0 05/03/06 14:22:05 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/merge/merge_ia64.dsp

  VC++Files/libmysqltest/myTest_ia64.dsp
    1.0 05/03/06 14:22:05 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/libmysqltest/myTest_ia64.dsp

  VC++Files/libmysqltest/myTest-package_ia64.dsp
    1.1 05/03/06 14:22:04 georg@lmy002.wdf.sap.corp +92 -0

  VC++Files/libmysqld/libmysqld_ia64.dsp
    1.1 05/03/06 14:22:04 georg@lmy002.wdf.sap.corp +581 -0

  VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp
    1.1 05/03/06 14:22:04 georg@lmy002.wdf.sap.corp +80 -0

  VC++Files/libmysql/libmysql_ia64.dsp
    1.1 05/03/06 14:22:04 georg@lmy002.wdf.sap.corp +544 -0

  VC++Files/libmysqltest/myTest-package_ia64.dsp
    1.0 05/03/06 14:22:04 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/libmysqltest/myTest-package_ia64.dsp

  VC++Files/libmysqld/libmysqld_ia64.dsp
    1.0 05/03/06 14:22:04 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/libmysqld/libmysqld_ia64.dsp

  VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp
    1.0 05/03/06 14:22:04 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp

  VC++Files/libmysql/libmysql_ia64.dsp
    1.0 05/03/06 14:22:04 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/libmysql/libmysql_ia64.dsp

  VC++Files/isamchk/isamchk_ia64.dsp
    1.1 05/03/06 14:22:03 georg@lmy002.wdf.sap.corp +100 -0

  VC++Files/isam/isam_ia64.dsp
    1.1 05/03/06 14:22:03 georg@lmy002.wdf.sap.corp +260 -0

  VC++Files/innobase/innobase_ia64.dsp
    1.1 05/03/06 14:22:03 georg@lmy002.wdf.sap.corp +450 -0

  VC++Files/heap/heap_ia64.dsp
    1.1 05/03/06 14:22:03 georg@lmy002.wdf.sap.corp +256 -0

  VC++Files/dbug/dbug_ia64.dsp
    1.1 05/03/06 14:22:03 georg@lmy002.wdf.sap.corp +125 -0

  VC++Files/isamchk/isamchk_ia64.dsp
    1.0 05/03/06 14:22:03 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/isamchk/isamchk_ia64.dsp

  VC++Files/isam/isam_ia64.dsp
    1.0 05/03/06 14:22:03 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/isam/isam_ia64.dsp

  VC++Files/innobase/innobase_ia64.dsp
    1.0 05/03/06 14:22:03 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/innobase/innobase_ia64.dsp

  VC++Files/heap/heap_ia64.dsp
    1.0 05/03/06 14:22:03 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/heap/heap_ia64.dsp

  VC++Files/dbug/dbug_ia64.dsp
    1.0 05/03/06 14:22:03 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/dbug/dbug_ia64.dsp

  VC++Files/comp_err/comp_err_ia64.dsp
    1.1 05/03/06 14:22:02 georg@lmy002.wdf.sap.corp +92 -0

  VC++Files/client/mysqltest_ia64.dsp
    1.1 05/03/06 14:22:02 georg@lmy002.wdf.sap.corp +196 -0

  VC++Files/client/mysqlshow_ia64.dsp
    1.1 05/03/06 14:22:02 georg@lmy002.wdf.sap.corp +124 -0

  VC++Files/client/mysqlimport_ia64.dsp
    1.1 05/03/06 14:22:02 georg@lmy002.wdf.sap.corp +124 -0

  VC++Files/comp_err/comp_err_ia64.dsp
    1.0 05/03/06 14:22:02 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/comp_err/comp_err_ia64.dsp

  VC++Files/client/mysqltest_ia64.dsp
    1.0 05/03/06 14:22:02 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/client/mysqltest_ia64.dsp

  VC++Files/client/mysqlshow_ia64.dsp
    1.0 05/03/06 14:22:02 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/client/mysqlshow_ia64.dsp

  VC++Files/client/mysqlimport_ia64.dsp
    1.0 05/03/06 14:22:02 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/client/mysqlimport_ia64.dsp

  VC++Files/client/mysqldump_ia64.dsp
    1.1 05/03/06 14:22:01 georg@lmy002.wdf.sap.corp +136 -0

  VC++Files/client/mysqlclient_ia64.dsp
    1.1 05/03/06 14:22:01 georg@lmy002.wdf.sap.corp +570 -0

  VC++Files/client/mysqldump_ia64.dsp
    1.0 05/03/06 14:22:01 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/client/mysqldump_ia64.dsp

  VC++Files/client/mysqlclient_ia64.dsp
    1.0 05/03/06 14:22:01 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/client/mysqlclient_ia64.dsp

  VC++Files/client/mysqlcheck_ia64.dsp
    1.1 05/03/06 14:22:00 georg@lmy002.wdf.sap.corp +77 -0

  VC++Files/client/mysqlcheck_ia64.dsp
    1.0 05/03/06 14:22:00 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/client/mysqlcheck_ia64.dsp

  VC++Files/client/mysqladmin_ia64.dsp
    1.1 05/03/06 14:21:58 georg@lmy002.wdf.sap.corp +124 -0

  VC++Files/client/mysqladmin_ia64.dsp
    1.0 05/03/06 14:21:58 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/client/mysqladmin_ia64.dsp

  VC++Files/client/mysql_ia64.dsp
    1.1 05/03/06 14:21:57 georg@lmy002.wdf.sap.corp +136 -0

  VC++Files/client/mysql_ia64.dsp
    1.0 05/03/06 14:21:57 georg@lmy002.wdf.sap.corp +0 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-4.1/VC++Files/client/mysql_ia64.dsp

ChangeSet
  1.2084 05/03/06 12:31:40 serg@serg.mylan +2 -0
  myisam/ft_parser.c
      protection against invalid string in ft_get_word
  mysys/my_symlink2.c
      typo fixed

  mysys/my_symlink2.c
    1.8 05/03/06 12:31:34 serg@serg.mylan +1 -1
    typo fixed

  myisam/ft_parser.c
    1.44 05/03/06 12:31:34 serg@serg.mylan +2 -2
    protection against invalid string in ft_get_word

ChangeSet
  1.2055.550.1 05/03/05 22:06:07 Sinisa@sinisa.nasamreza.org +4 -0
  A fix for a bug #8830, which  occured  when binary data from  blob was
  dumped with --hex-blob and --skip-extended-insert options.

  mysql-test/t/mysqldump.test
    1.24.1.1 05/03/05 22:05:59 Sinisa@sinisa.nasamreza.org +10 -0
    Test case for bug #8830.

  mysql-test/r/mysqldump.result
    1.37.1.1 05/03/05 22:05:59 Sinisa@sinisa.nasamreza.org +46 -0
    A result for   test case for bug #8830.

  client/mysqldump.c
    1.178 05/03/05 22:05:59 Sinisa@sinisa.nasamreza.org +1 -1
    A fix for a bug #8830. All that was necessary was to use unsigned  char
    instead of signed  char.

  BitKeeper/etc/ignore
    1.225.1.1 05/03/05 22:05:59 Sinisa@sinisa.nasamreza.org +1 -0
    Added support-files/ndb-config-2-node.ini to the ignore list

ChangeSet
  1.2082.1.1 05/03/04 20:24:13 igor@linux.local +4 -0
  logging_ok:
    Logging to logging@openlogging.org accepted
  func_group.result, func_group.test:
    Added a test case for bug #8893.
  opt_sum.cc:
    A misplaced initialization for the returned parameter
    prefix_len in the function find_key_for_maxmin caused
    usage of a wrong key prefix by the min/max optimization
    in cases when the matching index was not the first index
    that contained the min/max field.

  BitKeeper/etc/logging_ok
    1.365 05/03/04 20:21:44 igor@linux.local +1 -0
    Logging to logging@openlogging.org accepted

  mysql-test/r/func_group.result
    1.37 05/03/04 20:18:40 igor@linux.local +26 -0
    Added a test case for bug #8893.

  mysql-test/t/func_group.test
    1.29 05/03/04 20:17:49 igor@linux.local +30 -0
    Added a test case for bug #8893.

  sql/opt_sum.cc
    1.42 05/03/04 20:13:42 igor@linux.local +1 -1
    A misplaced initialization for the returned parameter
    prefix_len in the function find_key_for_maxmin caused
    usage of a wrong key prefix by the min/max optimization
    in cases when the matching index was not the first index
    that contained the min/max field.

ChangeSet
  1.2083 05/03/04 19:25:19 serg@serg.mylan +2 -0
  Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  sql/mysqld.cc
    1.557 05/03/04 19:25:05 serg@serg.mylan +0 -0
    Auto merged

  myisam/mi_create.c
    1.42 05/03/04 19:25:05 serg@serg.mylan +0 -1
    Auto merged

ChangeSet
  1.1346.1.728 05/03/04 19:20:45 serg@serg.mylan +1 -0
  Merge bk-internal:/home/bk/mysql-4.0/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.0

  myisam/mi_create.c
    1.21.1.15 05/03/04 19:20:36 serg@serg.mylan +0 -1
    Auto merged

ChangeSet
  1.2075.2.1 05/03/04 19:18:17 serg@serg.mylan +2 -0
  Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  sql/mysqld.cc
    1.555.1.1 05/03/04 19:18:08 serg@serg.mylan +0 -0
    Auto merged

  myisam/mi_create.c
    1.39.2.1 05/03/04 19:18:08 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1346.811.1 05/03/04 19:16:14 serg@serg.mylan +1 -0
  typo fixed

  myisam/mi_create.c
    1.21.2.1 05/03/04 19:16:11 serg@serg.mylan +1 -1
    typo fixed

ChangeSet
  1.2082 05/03/04 18:17:29 heikki@hundin.mysql.fi +1 -0
  ut0mem.c:
    If InnoDB cannot allocate memory, keep retrying for 60 seconds before we crash mysqld; maybe the memory shortage is just temporary

  innobase/ut/ut0mem.c
    1.25 05/03/04 18:17:13 heikki@hundin.mysql.fi +28 -8
    If InnoDB cannot allocate memory, keep retrying for 60 seconds before we crash mysqld; maybe the memory shortage is just temporary

ChangeSet
  1.2081 05/03/04 17:58:06 heikki@hundin.mysql.fi +1 -0
  trx0trx.c:
    Do not assert, but print diagnostics if MySQL tries to free a trx where n_mysql_tables_in_use > 0

  innobase/trx/trx0trx.c
    1.39 05/03/04 17:57:52 heikki@hundin.mysql.fi +14 -3
    Do not assert, but print diagnostics if MySQL tries to free a trx where n_mysql_tables_in_use > 0

ChangeSet
  1.2080 05/03/04 15:53:05 marko@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    write_row(): Detect SQLCOM_OPTIMIZE, so that also OPTIMIZE TABLE
    will commit at every 10,000 copied rows.

  sql/ha_innodb.cc
    1.185 05/03/04 15:52:16 marko@hundin.mysql.fi +1 -0
    write_row(): Detect SQLCOM_OPTIMIZE, so that also OPTIMIZE TABLE
    will commit at every 10,000 copied rows.

ChangeSet
  1.1346.1.727 05/03/04 12:31:30 joerg@mysql.com +1 -0
  Please the Sun C compiler by qualifying 'inline' as 'static inline'.

  mysys/my_bitmap.c
    1.11.1.1 05/03/04 12:31:28 joerg@mysql.com +2 -2
    Please the Sun C compiler by qualifying 'inline' as 'static inline'.

ChangeSet
  1.1346.1.726 05/03/04 11:26:08 joerg@mysql.com +1 -0
  Qualify 'inline' functions as 'static inline' to please the Sun C compiler.

  mysys/hash.c
    1.15.1.7 05/03/04 11:26:06 joerg@mysql.com +3 -3
    The Sun C compiler insists on seeing 'static inline', or else it will not resolve the symbol.

ChangeSet
  1.2078 05/03/04 14:20:49 bar@mysql.com +11 -0
  type_blob.result, func_system.result, func_str.result, ctype_collate.result:
    fixing test results accordingly.
  func_system.test:
    New test that illegal mix of collations does not happen anymore.
  item_strfunc.h:
      safe_charset_converter() was added for system constants.
  item_strfunc.cc:
    safe_charset_converter() was added for system constants.
  item_func.cc, item.h, item.cc:
    Bug#8291: Illegal collation mix with USER() function.
    After discussion with PeterG and Serge, a new coercibility
    level for "system constants" was introduced, between
    COERRIBLE and IMPLICIT. Thus:
    SELECT col1 = USER() FROM t1; - is done according to col1 collation.
    SELECT 'string' = USER(); - is done according to USER() collation.
    At the same time, "nagg" and "strong" members were removed as unused.
  item_create.cc:
    Version is a system constant too.

  mysql-test/r/type_blob.result
    1.42 05/03/04 14:20:16 bar@mysql.com +1 -1
    fixing test results accordingly.

  mysql-test/r/func_system.result
    1.19 05/03/04 14:20:09 bar@mysql.com +8 -0
    fixing test results accordingly.

  mysql-test/r/func_str.result
    1.86 05/03/04 14:19:59 bar@mysql.com +31 -31
    fixing test results accordingly.

  mysql-test/r/ctype_collate.result
    1.28 05/03/04 14:19:46 bar@mysql.com +2 -2
    fixing test results accordingly.

  mysql-test/t/func_system.test
    1.11 05/03/04 14:19:11 bar@mysql.com +9 -0
    New test that illegal mix of collations does not happen anymore.

  sql/item_strfunc.h
    1.91 05/03/04 14:18:04 bar@mysql.com +12 -4
      safe_charset_converter() was added for system constants.

  sql/item_strfunc.cc
    1.217 05/03/04 14:17:10 bar@mysql.com +17 -0
    safe_charset_converter() was added for system constants.

  sql/item_func.cc
    1.236 05/03/04 14:16:47 bar@mysql.com +0 -2
    Bug#8291: Illegal collation mix with USER() function.
    After discussion with PeterG and Serge, a new coercibility
    level for "system constants" was introduced, between
    COERRIBLE and IMPLICIT. Thus:
    SELECT col1 = USER() FROM t1; - is done according to col1 collation.
    SELECT 'string' = USER(); - is done according to USER() collation.
    At the same time, "nagg" and "strong" members were removed as unused.

  sql/item_create.cc
    1.70 05/03/04 14:16:28 bar@mysql.com +1 -1
    Version is a system constant too.

  sql/item.h
    1.172 05/03/04 14:16:24 bar@mysql.com +4 -8
    Bug#8291: Illegal collation mix with USER() function.
    After discussion with PeterG and Serge, a new coercibility
    level for "system constants" was introduced, between
    COERRIBLE and IMPLICIT. Thus:
    SELECT col1 = USER() FROM t1; - is done according to col1 collation.
    SELECT 'string' = USER(); - is done according to USER() collation.
    At the same time, "nagg" and "strong" members were removed as unused.

  sql/item.cc
    1.192 05/03/04 14:15:39 bar@mysql.com +2 -8
    Bug#8291: Illegal collation mix with USER() function.
    After discussion with PeterG and Serge, a new coercibility
    level for "system constants" was introduced, between
    COERRIBLE and IMPLICIT. Thus:
    SELECT col1 = USER() FROM t1; - is done according to col1 collation.
    SELECT 'string' = USER(); - is done according to USER() collation.
    At the same time, "nagg" and "strong" members were removed as unused.

ChangeSet
  1.1346.1.725 05/03/04 11:07:56 joerg@mysql.com +1 -0
  Changed C++ style comment to C style for 'sql/net_serv.cc' which will be symlinked
  to 'libmysql/net.c'.

  sql/net_serv.cc
    1.46.1.17 05/03/04 11:07:54 joerg@mysql.com +1 -1
    Even though this is (by name) a C++ file, it is later symlinked to 'libmysql/net.c'
    and so the source will be treated as plain C: No C++ comments in here!

ChangeSet
  1.2077 05/03/04 11:06:41 ingo@mysql.com +1 -0
  Merge mysql.com:/home/mydev/mysql-4.1
  into mysql.com:/home/mydev/mysql-4.1-4100

  myisam/mi_create.c
    1.41 05/03/04 11:06:39 ingo@mysql.com +0 -1
    Auto merged

ChangeSet
  1.2075.1.1 05/03/04 12:39:03 konstantin@mysql.com +1 -0
  Fix compilation failure in mi_create.c

  myisam/mi_create.c
    1.39.1.1 05/03/04 12:38:55 konstantin@mysql.com +1 -1
    Fix typo.

ChangeSet
  1.1346.1.724 05/03/04 10:22:50 joerg@mysql.com +1 -0
  Prevent a collision with the system's '#define errno ...' by guarding the variable declaration.

  include/my_sys.h
    1.75.1.36 05/03/04 10:22:48 joerg@mysql.com +2 -0
    There are platforms which use '#define errno ...' and then cause a collision with
    'extern int errno;', one example is OpenBSD.
    Rather than treat them explicitly by the 'HAVE_ERRNO_AS_DEFINE', we can check for these
    by using '#ifndef errno'.
    (Backported from 5.0, as the problem was discovered there first.)

ChangeSet
  1.2076 05/03/04 09:35:21 ingo@mysql.com +2 -0
  Merge mysql.com:/home/mydev/mysql-4.0
  into mysql.com:/home/mydev/mysql-4.1-4100

  sql/mysqld.cc
    1.556 05/03/04 09:35:20 ingo@mysql.com +0 -0
    Auto merged

  myisam/mi_create.c
    1.40 05/03/04 09:35:19 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.1.723 05/03/04 09:30:22 ingo@mysql.com +1 -0
  Fix for a build bug.
  Added a missing comma.

  myisam/mi_create.c
    1.21.1.14 05/03/04 09:30:20 ingo@mysql.com +1 -1
    Fix for a build bug.
    Added a missing comma.

ChangeSet
  1.2070.1.2 05/03/03 23:57:48 serg@serg.mylan +1 -0
  after merge fixes

  sql/sql_udf.cc
    1.39 05/03/03 23:57:42 serg@serg.mylan +7 -7
    after merge fixes

ChangeSet
  1.1346.1.722 05/03/03 23:10:23 serg@serg.mylan +1 -0
  typos fixed

  sql/mysqld.cc
    1.297.51.2 05/03/03 23:10:10 serg@serg.mylan +2 -2
    typos fixed

ChangeSet
  1.2070.1.1 05/03/03 23:07:20 serg@serg.mylan +9 -0
  merge

  sql/sql_udf.cc
    1.38 05/03/03 23:07:13 serg@serg.mylan +10 -15
    merge

  sql/mysqld.cc
    1.555 05/03/03 23:07:13 serg@serg.mylan +1 -2
    merge

  sql/mysql_priv.h
    1.342 05/03/03 23:07:13 serg@serg.mylan +0 -0
    merge

  myisam/mi_create.c
    1.39 05/03/03 23:07:13 serg@serg.mylan +0 -0
    merge

  sql/table.cc
    1.126 05/03/03 22:51:18 serg@serg.mylan +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.143 05/03/03 22:51:18 serg@serg.mylan +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.154 05/03/03 22:51:17 serg@serg.mylan +0 -0
    Auto merged

  mysys/mf_tempfile.c
    1.23 05/03/03 22:51:17 serg@serg.mylan +0 -0
    Auto merged

  include/my_global.h
    1.80 05/03/03 22:51:17 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.2074 05/03/03 12:36:27 jimw@mysql.com +2 -0
  Fix symlink test to avoid filenames with paths

  mysql-test/t/symlink.test
    1.13 05/03/03 12:36:25 jimw@mysql.com +4 -0
    Fix test to avoid filenames including path in results

  mysql-test/r/symlink.result
    1.19 05/03/03 12:36:25 jimw@mysql.com +0 -2
    Update test results

ChangeSet
  1.1346.810.2 05/03/03 21:13:33 serg@serg.mylan +1 -0
  uninit variable fixed

  sql/ha_myisam.cc
    1.92.1.43 05/03/03 21:13:30 serg@serg.mylan +1 -1
    uninit variable fixed

ChangeSet
  1.1346.810.1 05/03/03 19:51:29 serg@serg.mylan +12 -0
  Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)

  sql/table.cc
    1.46.1.33 05/03/03 19:51:26 serg@serg.mylan +5 -1
    create frm of temporary table with O_EXCL|O_NOFOLLOW

  sql/sql_udf.cc
    1.15.1.13 05/03/03 19:51:26 serg@serg.mylan +67 -31
    --allow_suspicious_udfs
    don't allow xxx() udf without any of xxx_init/deinit/add/reset
    check paths when loading from mysql.func

  sql/share/english/errmsg.txt
    1.51.1.22 05/03/03 19:51:26 serg@serg.mylan +1 -1
    typo

  sql/mysqld.cc
    1.297.51.1 05/03/03 19:51:26 serg@serg.mylan +9 -2
    --allow_suspicious_udfs

  sql/mysql_priv.h
    1.150.1.81 05/03/03 19:51:26 serg@serg.mylan +1 -1
    --allow_suspicious_udfs

  sql/ha_myisam.cc
    1.92.1.42 05/03/03 19:51:26 serg@serg.mylan +11 -7
    let mi_create know if the table is TEMPORARY

  mysys/mf_tempfile.c
    1.19.1.3 05/03/03 19:51:26 serg@serg.mylan +4 -4
    create temporary files with O_EXCL|O_NOFOLLOW

  myisammrg/myrg_create.c
    1.9 05/03/03 19:51:26 serg@serg.mylan +1 -1
    create table files with O_EXCL|O_NOFOLLOW

  myisam/mi_create.c
    1.21.1.13 05/03/03 19:51:26 serg@serg.mylan +8 -8
    create files of temporary tables with O_EXCL|O_NOFOLLOW

  merge/mrg_create.c
    1.7 05/03/03 19:51:26 serg@serg.mylan +1 -1
    create table files with O_EXCL|O_NOFOLLOW

  isam/create.c
    1.11 05/03/03 19:51:26 serg@serg.mylan +3 -2
    create table files with O_EXCL|O_NOFOLLOW

  include/my_global.h
    1.34.1.36 05/03/03 19:51:26 serg@serg.mylan +3 -0
    O_NOFOLLOW

ChangeSet
  1.2070 05/03/03 18:00:34 heikki@hundin.mysql.fi +1 -0
  srv0start.c:
    Work around the AIX 5.1 security patch ML7 problem in errno when it should be EEXIST

  innobase/srv/srv0start.c
    1.77 05/03/03 17:59:48 heikki@hundin.mysql.fi +16 -2
    Work around the AIX 5.1 security patch ML7 problem in errno when it should be EEXIST

ChangeSet
  1.2069 05/03/03 17:50:04 heikki@hundin.mysql.fi +2 -0
  Merge

  innobase/srv/srv0start.c
    1.76 05/03/03 17:49:56 heikki@hundin.mysql.fi +0 -17
    SCCS merged

  innobase/os/os0file.c
    1.98 05/03/03 17:49:12 heikki@hundin.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.1.720 05/03/03 17:46:56 heikki@hundin.mysql.fi +2 -0
  srv0start.c:
    Work around the AIX 5.1 ML7 patch problem in errno at a higher level, in srv0start.c
  os0file.c:
    Revert the AIX patch here

  innobase/srv/srv0start.c
    1.37.1.25 05/03/03 17:46:41 heikki@hundin.mysql.fi +17 -2
    Work around the AIX 5.1 ML7 patch problem in errno at a higher level, in srv0start.c

  innobase/os/os0file.c
    1.44.1.39 05/03/03 17:35:42 heikki@hundin.mysql.fi +0 -9
    Revert the AIX patch here

ChangeSet
  1.2068 05/03/03 17:26:12 heikki@hundin.mysql.fi +1 -0
  Merge hundin.mysql.fi:/home/heikki/mysql-4.0
  into hundin.mysql.fi:/home/heikki/mysql-4.1

  innobase/os/os0file.c
    1.97 05/03/03 17:26:04 heikki@hundin.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.1.719 05/03/03 17:20:05 heikki@hundin.mysql.fi +1 -0
  os0file.c:
    AIX 5.1 after security patch ML7 seems to contain a bug that instead of EEXIST it sets errno to 0 if a file creation fails because the file already exists. Work around that bug by interpreting errno 0 in AIX as EEXIST.

  innobase/os/os0file.c
    1.44.1.38 05/03/03 17:19:52 heikki@hundin.mysql.fi +9 -0
    AIX 5.1 after security patch ML7 seems to contain a bug that instead of EEXIST it sets errno to 0 if a file creation fails because the file already exists. Work around that bug by interpreting errno 0 in AIX as EEXIST.

ChangeSet
  1.2064.2.1 05/03/03 13:04:44 joerg@mysql.com +2 -0
  Ensure that the tests with '--ps-protocol' and '--embedded-server' are taken even
  after the previous run had some failures, provided it did not totally crash.

  mysql-test/mysql-test-run.sh
    1.243 05/03/03 13:04:39 joerg@mysql.com +1 -1
    Change the message even after test failures so that it is fairly safe to identify
    the end of the run from it (as opposed to a crash of the script).
    It is essential that both a run without any and with some test failures
    write "were successful" so that it can be grepped.

  Build-tools/Do-compile
    1.105 05/03/03 13:04:39 joerg@mysql.com +3 -3
    Change the search string for a test run from "tests were successful" to just
    "were successful", which is written by the test run even after some failures.
    This is necessary to start the next test suite ('--ps-protocol', '--embedded-server')
    even after the previous one had some test failures.

ChangeSet
  1.2067 05/03/03 12:45:49 pekka@mysql.com +1 -0
  ndb - bug#8876 third and final solution

ChangeSet
  1.2064.1.1 05/03/03 15:43:00 bar@mysql.com +2 -0
  Bugs: #8063: make test mysqldump [ fail ]
  See mysqldump.test diff for more details

  mysql-test/t/mysqldump.test
    1.25 05/03/03 15:42:55 bar@mysql.com +8 -1
    Bugs: #8063: make test mysqldump [ fail ]
    See mysqldump.test diff for more details

  mysql-test/r/mysqldump.result
    1.38 05/03/03 15:42:55 bar@mysql.com +0 -21
    Bugs: #8063: make test mysqldump [ fail ]
    See mysqldump.test diff for more details

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.52 05/03/03 12:31:56 pekka@mysql.com +8 -0
    lqh to forward abort within ng

ChangeSet
  1.2065 05/03/03 11:38:50 pekka@mysql.com +1 -0
  ndb - bug#8876

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.51 05/03/03 11:28:07 pekka@mysql.com +0 -1
    merge error?

ChangeSet
  1.2064 05/03/03 14:15:37 bar@mysql.com +5 -0
  Bug#8840 Empty string comparison and character set 'cp1250'
  Secondary weight out of bounds was picked up in mistake when
  the string is empty, instead of returning 0.

  mysql-test/t/ctype_cp1250_ch.test
    1.1 05/03/03 14:15:31 bar@mysql.com +12 -0

  mysql-test/r/have_cp1250_ch.require
    1.1 05/03/03 14:15:31 bar@mysql.com +2 -0

  mysql-test/r/ctype_cp1250_ch.result
    1.1 05/03/03 14:15:31 bar@mysql.com +9 -0

  mysql-test/t/ctype_cp1250_ch.test
    1.0 05/03/03 14:15:31 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/t/ctype_cp1250_ch.test

  mysql-test/r/have_cp1250_ch.require
    1.0 05/03/03 14:15:31 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/r/have_cp1250_ch.require

  mysql-test/r/ctype_cp1250_ch.result
    1.0 05/03/03 14:15:31 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/r/ctype_cp1250_ch.result

  mysql-test/include/have_cp1250_ch.inc
    1.1 05/03/03 14:15:30 bar@mysql.com +4 -0

  strings/ctype-win1250ch.c
    1.44 05/03/03 14:15:30 bar@mysql.com +1 -1
    Bug#8840 Empty string comparison and character set 'cp1250'
    Secondary weight out of bounds was picked up in mistake when
    the string is empty, instead of returning 0.

  mysql-test/include/have_cp1250_ch.inc
    1.0 05/03/03 14:15:30 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/include/have_cp1250_ch.inc

ChangeSet
  1.2063 05/03/03 08:38:10 joreland@mysql.com +1 -0
  Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/jonas/src/mysql-4.1

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.50 05/03/03 08:38:08 joreland@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.547.2 05/03/03 05:03:21 sergefp@mysql.com +1 -0
  Comments added 

  sql/item.h
    1.171 05/03/03 05:03:18 sergefp@mysql.com +2 -0
    Comments added 

ChangeSet
  1.2061.5.1 05/03/02 16:30:24 jimw@mysql.com +3 -0
  Fix bug in checking of table-specific grats that caused IP/NETMASK
  hostnames to not be matched correctly. (Bug #3309)

  mysql-test/t/grant2.test
    1.9 05/03/02 16:30:21 jimw@mysql.com +14 -0
    Add new regression test

  mysql-test/r/grant2.result
    1.10 05/03/02 16:30:21 jimw@mysql.com +16 -0
    Add new results

ChangeSet
  1.2061.4.1 05/03/03 01:07:03 pekka@mysql.com +1 -0
  ndb - bug#8876

  sql/sql_acl.cc
    1.161 05/03/02 16:02:25 jimw@mysql.com +14 -28
    Use an acl_host_or_ip in the GRANT_TABLE struct instead of storing the host
    itself, and use compare_hostname() in testing it. This adds support for IP
    addresses with netmasks to table-specific grants, and results in simplified
    code by making use of compare_hostname() in more places.

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.48.1.1 05/03/03 00:54:38 pekka@mysql.com +1 -1
    typo - use of global var, spotted by mikael

ChangeSet
  1.2061.2.4 05/03/02 12:19:44 jimw@mysql.com +1 -0
  Create directory for UNIX socket in mysqld_safe if it doesn't already exist.
  (Bug #8513)

  scripts/mysqld_safe.sh
    1.73 05/03/02 12:18:54 jimw@mysql.com +9 -0
    Create directory for UNIX socket if it doesn't exist

ChangeSet
  1.2061.3.1 05/03/02 20:00:48 ramil@mysql.com +3 -0
  a fix for --ps-protocol (bug #6089: FOUND_ROWS returns wrong values when no table/view is used)

  sql/sql_union.cc
    1.139 05/03/02 20:00:43 ramil@mysql.com +11 -19
    a fix for --ps-protocol (bug #6089: FOUND_ROWS returns wrong values when no table/view is used)
    Don't touch options as itit's not needed.

  mysql-test/t/ps.test
    1.31 05/03/02 20:00:43 ramil@mysql.com +11 -0
    a fix for --ps-protocol (bug #6089: FOUND_ROWS returns wrong values when no table/view is used)

  mysql-test/r/ps.result
    1.32 05/03/02 20:00:43 ramil@mysql.com +12 -0
    a fix for --ps-protocol (bug #6089: FOUND_ROWS returns wrong values when no table/view is used)

ChangeSet
  1.2061.2.2 05/03/02 11:38:38 guilhem@mysql.com +1 -0
  Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/mysql_src/mysql-4.1-clean

  sql/mysqld.cc
    1.554 05/03/02 11:38:33 guilhem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.549.1 05/03/02 11:29:48 guilhem@mysql.com +8 -0
  Fix for BUG#8325 "Deadlock in replication thread stops replication":
  in slave SQL thread: if a transaction fails because of InnoDB deadlock or innodb_lock_wait_timeout exceeded,
  optionally retry the transaction a certain number of times (new variable --slave_transaction_retries).

  mysql-test/t/rpl_deadlock.test
    1.1 05/03/02 11:29:34 guilhem@mysql.com +107 -0

  mysql-test/t/rpl_deadlock.test
    1.0 05/03/02 11:29:34 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.1-clean/mysql-test/t/rpl_deadlock.test

  mysql-test/t/rpl_deadlock-slave.opt
    1.1 05/03/02 11:29:33 guilhem@mysql.com +1 -0

  mysql-test/t/rpl_deadlock-slave.opt
    1.0 05/03/02 11:29:33 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.1-clean/mysql-test/t/rpl_deadlock-slave.opt

  mysql-test/r/rpl_deadlock.result
    1.1 05/03/02 11:29:32 guilhem@mysql.com +81 -0

  sql/slave.h
    1.84 05/03/02 11:29:32 guilhem@mysql.com +3 -1
    new RELAY_LOG_INFO::trans_retries.

  sql/slave.cc
    1.267 05/03/02 11:29:32 guilhem@mysql.com +57 -0
    Slave SQL thread: if a transaction fails because of InnoDB deadlock or innodb_lock_wait_timeout exceeded,
    optionally retry the transaction a certain number of times (--slave_transaction_retries).

  sql/set_var.cc
    1.159.1.3 05/03/02 11:29:32 guilhem@mysql.com +4 -0
    new global variable slave_transaction_retries (will be one per subslave, when we have multimaster).

  mysql-test/r/rpl_deadlock.result
    1.0 05/03/02 11:29:32 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.1-clean/mysql-test/r/rpl_deadlock.result

  sql/mysqld.cc
    1.551.1.1 05/03/02 11:29:31 guilhem@mysql.com +9 -3
    new variable slave_transaction_retries. Plus fixing a typo.

  sql/mysql_priv.h
    1.341 05/03/02 11:29:30 guilhem@mysql.com +1 -1
    new var slave_transaction_retries

ChangeSet
  1.2061.2.1 05/03/02 10:35:00 ingo@mysql.com +5 -0
  Bug#8306 - TRUNCATE leads to index corruption
  Added a check, if the table, which we are going to create, is open.
  This can happen if a MERGE mapped table is TRUNCATEd.

  mysql-test/t/myisam.test
    1.35 05/03/02 10:34:56 ingo@mysql.com +26 -0
    Bug#8306 - TRUNCATE leads to index corruption
    The test case.

  mysql-test/r/myisam.result
    1.47 05/03/02 10:34:56 ingo@mysql.com +18 -0
    Bug#8306 - TRUNCATE leads to index corruption
    The test result.

  myisam/myisamdef.h
    1.77 05/03/02 10:34:56 ingo@mysql.com +1 -0
    Bug#8306 - TRUNCATE leads to index corruption
    Declared test_if_reopen() as globally available.

  myisam/mi_open.c
    1.83 05/03/02 10:34:56 ingo@mysql.com +1 -1
    Bug#8306 - TRUNCATE leads to index corruption
    Made test_if_reopen() globally available.

  myisam/mi_create.c
    1.38 05/03/02 10:34:56 ingo@mysql.com +15 -0
    Bug#8306 - TRUNCATE leads to index corruption
    Added a check, if the table, which we are going to create, is open.
    This can happen if a MERGE mapped table is TRUNCATEd.

ChangeSet
  1.2061.1.2 05/03/01 20:46:23 marko@hundin.mysql.fi +1 -0
  row0sel.c:
    row_sel_store_mysql_rec(): Do not try to space-pad BLOB fields. (Bug #8771)

  innobase/row/row0sel.c
    1.65 05/03/01 20:45:38 marko@hundin.mysql.fi +3 -2
    row_sel_store_mysql_rec(): Do not try to space-pad BLOB fields. (Bug #8771)

ChangeSet
  1.2061.1.1 05/03/01 16:09:22 marko@hundin.mysql.fi +2 -0
  InnoDB: Commit inserts to the temporary tables created by
  CREATE INDEX and DROP INDEX every 10,000 rows,
  similar to ALTER TABLE.

  sql/ha_innodb.h
    1.78 05/03/01 16:08:27 marko@hundin.mysql.fi +0 -1
    Remove duplicate declaration of srv_max_purge_lag.

  sql/ha_innodb.cc
    1.184 05/03/01 16:08:27 marko@hundin.mysql.fi +3 -1
    Commit inserts to the temporary tables created by
    CREATE INDEX and DROP INDEX every 10,000 rows, similar
    to ALTER TABLE.

ChangeSet
  1.2055.548.1 05/03/01 13:35:57 joreland@mysql.com +3 -0
  Merge mysql.com:/home/jonas/src/fix
  into mysql.com:/home/jonas/src/mysql-4.1

  ndb/test/run-test/daily-devel-tests.txt
    1.17 05/03/01 13:35:56 joreland@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.49 05/03/01 13:35:56 joreland@mysql.com +0 -0
    Auto merged

  ndb/include/ndbapi/NdbConnection.hpp
    1.23 05/03/01 13:35:56 joreland@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.445.6 05/03/01 13:32:11 joreland@mysql.com +4 -0
  bug#8853 - ndb - commit after nodefailure on not TC node
    set exec_flag in execTC_COMMITREQ so that api will get rollbackrep

  ndb/test/run-test/daily-devel-tests.txt
    1.14.1.1 05/03/01 13:32:08 joreland@mysql.com +4 -0
    Testcase for bug#8853

  ndb/test/ndbapi/testNodeRestart.cpp
    1.9 05/03/01 13:32:08 joreland@mysql.com +71 -0
    Testcase for bug#8853

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.47.1.1 05/03/01 13:32:08 joreland@mysql.com +2 -1
    Fix TC_COMMITREQ in abort cases

  ndb/include/ndbapi/NdbConnection.hpp
    1.20.1.1 05/03/01 13:32:08 joreland@mysql.com +2 -1
    Make getConnectedNode public

ChangeSet
  1.2060 05/03/01 14:13:25 jani@ua141d10.elisa.omakaista.fi +1 -0
  Fixed Bug#7906, "Cmdline help for mysqld --ansi option misses some info".

  sql/mysqld.cc
    1.553 05/03/01 14:13:21 jani@ua141d10.elisa.omakaista.fi +1 -1
    Fixed Bug#7906, "Cmdline help for mysqld --ansi option misses some info".

ChangeSet
  1.2059 05/03/01 14:19:32 ramil@mysql.com +1 -0
  Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/usr/home/ram/work/4.1.b6089

  sql/sql_select.cc
    1.384 05/03/01 14:19:30 ramil@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2058 05/03/01 12:31:05 ramil@mysql.com +1 -0
  Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/usr/home/ram/work/4.1.b6089

  sql/sql_select.cc
    1.380.1.4 05/03/01 12:31:03 ramil@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.1.147 05/03/01 12:20:55 ramil@mysql.com +2 -0
  Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/usr/home/ram/work/4.1.b5615

  sql/sql_select.cc
    1.383 05/03/01 12:20:53 ramil@mysql.com +0 -0
    Auto merged

  mysql-test/r/show_check.result
    1.61 05/03/01 12:20:53 ramil@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.546.3 05/03/01 09:51:32 marko@hundin.mysql.fi +2 -0
  After merge fixes

  innobase/srv/srv0srv.c
    1.76 05/03/01 09:51:25 marko@hundin.mysql.fi +1 -3
    After merge fixes

  innobase/include/srv0srv.h
    1.42 05/03/01 09:51:25 marko@hundin.mysql.fi +0 -3
    After merge fixes

ChangeSet
  1.1346.1.718 05/03/01 09:27:09 marko@hundin.mysql.fi +2 -0
  InnoDB: Fix compilation errors on IA-64 Windows

  innobase/srv/srv0srv.c
    1.35.1.45 05/03/01 09:27:04 marko@hundin.mysql.fi +2 -2
    Declare srv_auto_extend_increment and srv_max_purge_lag as ulong,
    because ulint and ulong are of different size on Win64.

  innobase/include/srv0srv.h
    1.21.1.15 05/03/01 09:27:04 marko@hundin.mysql.fi +2 -2
    Declare srv_auto_extend_increment and srv_max_purge_lag as ulong,
    because ulint and ulong are of different size on Win64.

ChangeSet
  1.2055.547.1 05/02/28 23:50:06 sergefp@mysql.com +3 -0
  Fix for BUG#8562: In Item_int_with_ref::new_item() create Item_int or Item_uint
  depending on ref->unsigned_flag. Item_int_with_ref can refer to both signed and 
  unsigned integers.

  sql/item.h
    1.170 05/02/28 23:50:02 sergefp@mysql.com +5 -0
    Fix for BUG#8562: In Item_int_with_ref::new_item() create Item_int or Item_uint
    depending on ref->unsigned_flag. Item_int_with_ref can refer to both signed and 
    unsigned integers.

  mysql-test/t/bigint.test
    1.22 05/02/28 23:50:02 sergefp@mysql.com +33 -0
    Test case for BUG#8562

  mysql-test/r/bigint.result
    1.24 05/02/28 23:50:02 sergefp@mysql.com +39 -0
    Test case for BUG#8562

ChangeSet
  1.2055.546.2 05/02/28 20:21:21 sergefp@mysql.com +3 -0
  Fix for BUG#8726: In JOIN::optimize on ER_TOO_BIG_SELECT error set JOIN::error to -1 to cause
  the error to be sent to the client.

  sql/sql_select.cc
    1.380.2.26 05/02/28 20:21:19 sergefp@mysql.com +1 -1
    Fix for BUG#8726: On ER_TOO_BIG_SELECT set JOIN::error to -1 to cause the error to be sent to the client.

  mysql-test/t/select_safe.test
    1.8 05/02/28 20:21:19 sergefp@mysql.com +20 -0
    Testcase for BUG#8726

  mysql-test/r/select_safe.result
    1.15 05/02/28 20:21:19 sergefp@mysql.com +15 -0
    Testcase for BUG#8726

ChangeSet
  1.2057 05/02/28 19:59:38 ramil@mysql.com +5 -0
  merging

  mysql-test/t/select_found.test
    1.22 05/02/28 19:59:34 ramil@mysql.com +10 -10
    merging

  mysql-test/r/select_found.result
    1.23 05/02/28 19:59:34 ramil@mysql.com +9 -9
    merging

  sql/sql_select.cc
    1.380.1.3 05/02/28 19:53:08 ramil@mysql.com +0 -0
    Auto merged

  sql/sql_class.cc
    1.195 05/02/28 19:53:07 ramil@mysql.com +0 -0
    Auto merged

  mysql-test/r/ps.result
    1.31 05/02/28 19:53:07 ramil@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.546.1 05/02/28 18:49:35 sergefp@mysql.com +3 -0
  Merging fix for BUG#7519 - not applying changes to 4.1 as 4.1 is not affected.

  sql/sql_show.cc
    1.194 05/02/28 18:49:32 sergefp@mysql.com +1 -2
    Merging fix for BUG#7519 - not applying changes to 4.1 as 4.1 is not affected.

  mysql-test/t/show_check.test
    1.40 05/02/28 18:49:32 sergefp@mysql.com +0 -16
    Merging fix for BUG#7519 - not applying changes to 4.1 as 4.1 is not affected.

  mysql-test/r/show_check.result
    1.58.1.3 05/02/28 18:49:32 sergefp@mysql.com +0 -22
    Merging fix for BUG#7519 - not applying changes to 4.1 as 4.1 is not affected.

ChangeSet
  1.2055.1.146 05/02/28 18:11:18 ramil@mysql.com +4 -0
  merging

  mysql-test/t/func_group.test
    1.28 05/02/28 18:11:15 ramil@mysql.com +9 -10
    merging

  mysql-test/r/func_group.result
    1.36 05/02/28 18:11:15 ramil@mysql.com +9 -9
    merging

  sql/sql_select.cc
    1.382 05/02/28 18:05:49 ramil@mysql.com +0 -0
    Auto merged

  mysql-test/r/show_check.result
    1.60 05/02/28 18:05:48 ramil@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.545.1 05/02/28 12:00:18 monty@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/my/mysql-4.1

ChangeSet
  1.2055.544.1 05/02/28 11:59:46 monty@mysql.com +15 -0
  Fixed wrong memory references found by purify
  (No really critical errors found, but a few possible wrong results)

  strings/ctype-simple.c
    1.62 05/02/28 11:59:41 monty@mysql.com +5 -4
    Fixes to not access uninitialized memory
    (Not critical)

  sql/sql_select.cc
    1.380.2.25 05/02/28 11:59:41 monty@mysql.com +23 -10
    Fix for out-of-bound memory reference when doing DISTINCT on const expressions

  sql/sql_repl.cc
    1.132 05/02/28 11:59:41 monty@mysql.com +1 -1
    memcmp -> bcmp() to avoid warning from purify

  sql/sql_lex.h
    1.183 05/02/28 11:59:41 monty@mysql.com +49 -20
    Better comments

  sql/sql_insert.cc
    1.155 05/02/28 11:59:41 monty@mysql.com +2 -1
    Initialize slot used by innodb.cc (not critical)

  sql/mysqld.cc
    1.552 05/02/28 11:59:41 monty@mysql.com +27 -15
    Wait for signal handler to stop when running --bootstrap
    (Fixes warning from purify)

  sql/item_cmpfunc.cc
    1.184 05/02/28 11:59:41 monty@mysql.com +7 -1
    Fixed warning from purify. (Not critical as the arguments are passed to a function but not used)
    Allocate Arg_comparator() with 'new' instead of sql_alloc() to ensure proper initialization

  sql/filesort.cc
    1.91 05/02/28 11:59:41 monty@mysql.com +1 -1
    enum & set are sorted as numbers. This fixes an access to uninitialized memory when enum/set are multi-byte characters

  sql/field.h
    1.124 05/02/28 11:59:41 monty@mysql.com +3 -0
    enum & set are sorted as numbers. This fixes an access to uninitialized memory when enum/set are multi-byte characters

  mysys/my_init.c
    1.39 05/02/28 11:59:41 monty@mysql.com +4 -0
    Avoid warning from purify (purify doesn't handle getrusage() properly)

  mysql-test/t/type_set.test
    1.8 05/02/28 11:59:41 monty@mysql.com +2 -0
    More tests

  mysql-test/t/select_found.test
    1.20.1.2 05/02/28 11:59:40 monty@mysql.com +1 -0
    Add missing drop table

  mysql-test/r/type_set.result
    1.12 05/02/28 11:59:40 monty@mysql.com +18 -0
    More tests

  mysql-test/r/select_found.result
    1.21.1.2 05/02/28 11:59:40 monty@mysql.com +1 -0
    Add missing drop table

  innobase/dict/dict0dict.c
    1.60 05/02/28 11:59:40 monty@mysql.com +2 -1
    Replace memcmp with comparison of characters to avoid warnings from purify when 'sptr' points to a very short string

  BitKeeper/etc/ignore
    1.226 05/02/28 11:57:13 monty@mysql.com +1 -0
    added support-files/ndb-config-2-node.ini

ChangeSet
  1.2055.1.144 05/02/26 17:15:04 sergefp@mysql.com +3 -0
  Fix for BUG#8560: Set max_sort_char for any 8-bit charset with binary collation. max_sort_char is needed by
  my_like_range_simple to produce upper bound constants for LIKE "str_%" and similar expressions.

  strings/ctype-bin.c
    1.57 05/02/26 17:15:01 sergefp@mysql.com +8 -1
    Fix for BUG#8560: Set max_sort_char for any 8-bit charset with binary collation. max_sort_char is needed by
    my_like_range_simple to produce upper bound constants for LIKE "str_%" and similar expressions.

  mysql-test/t/ctype_cp1251.test
    1.4 05/02/26 17:15:01 sergefp@mysql.com +14 -0
    Test for BUG#8560

  mysql-test/r/ctype_cp1251.result
    1.5 05/02/26 17:15:01 sergefp@mysql.com +16 -0
    Test for BUG#8560

ChangeSet
  1.2055.1.143 05/02/25 22:16:14 heikki@hundin.mysql.fi +1 -0
  fil0fil.c:
    Check if node == NULL, which means we are outside tablespace bounds, and print a big fatal error message

  innobase/fil/fil0fil.c
    1.49 05/02/25 22:15:59 heikki@hundin.mysql.fi +7 -7
    Check if node == NULL, which means we are outside tablespace bounds, and print a big fatal error message

ChangeSet
  1.2055.543.1 05/02/25 18:12:53 bar@mysql.com +1 -0
  mysqldump.c:
    Bug#7997 Add implicit --skip-set-charset when mysqldump from 4.0 server w/ 4.1 client

  client/mysqldump.c
    1.177 05/02/25 18:11:40 bar@mysql.com +5 -0
    Bug#7997 Add implicit --skip-set-charset when mysqldump from 4.0 server w/ 4.1 client

ChangeSet
  1.2055.1.140 05/02/25 17:28:47 ramil@mysql.com +1 -0
  merge

  mysys/default.c
    1.47 05/02/25 17:28:37 ramil@mysql.com +2 -8
    merge

ChangeSet
  1.1346.1.716 05/02/25 16:34:17 ramil@mysql.com +1 -0
  merge

  mysys/default.c
    1.17.1.20 05/02/25 16:34:16 ramil@mysql.com +4 -3
    merge

ChangeSet
  1.2055.1.139 05/02/25 15:47:36 ramil@mysql.com +2 -0
  Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/usr/home/ram/work/4.1.b4802

  client/mysql.cc
    1.198 05/02/25 15:47:32 ramil@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.364 05/02/25 15:47:08 ramil@mysql.com +0 -1
    auto-union

ChangeSet
  1.2055.1.138 05/02/25 11:47:27 joreland@mysql.com +1 -0
  add auto generated ndb dsp-files (for msvc++ 6.0) to ignore file

  BitKeeper/etc/ignore
    1.225 05/02/25 11:45:29 joreland@mysql.com +45 -46
    added ndb/src/common/debugger/signaldata/libsignaldataprint.dsp ndb/src/common/debugger/libtrace.dsp ndb/src/common/logger/liblogger.dsp ndb/src/common/mgmcommon/libmgmsrvcommon.dsp ndb/src/common/portlib/libportlib.dsp ndb/src/common/transporter/libtransporter.dsp ndb/src/common/util/libgeneral.dsp ndb/src/kernel/blocks/backup/libbackup.dsp ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp ndb/src/kernel/blocks/dbacc/libdbacc.dsp ndb/src/kernel/blocks/dbdict/libdbdict.dsp ndb/src/kernel/blocks/dbdih/libdbdih.dsp ndb/src/kernel/blocks/dblqh/libdblqh.dsp ndb/src/kernel/blocks/dbtc/libdbtc.dsp ndb/src/kernel/blocks/dbtup/libdbtup.dsp ndb/src/kernel/blocks/dbtux/libdbtux.dsp ndb/src/kernel/blocks/dbutil/libdbutil.dsp ndb/src/kernel/blocks/grep/libgrep.dsp ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp ndb/src/kernel/blocks/ndbfs/libndbfs.dsp ndb/src/kernel/blocks/qmgr/libqmgr.dsp ndb/src/kernel/blocks/suma/libsuma.dsp ndb/src/kernel/blocks/trix/libtrix.dsp ndb/src/kernel/error/liberror.dsp ndb/src/kernel/vm/libkernel.d
    sp ndb/src/kernel/ndbd.dsp ndb/src/mgmapi/libmgmapi.dsp ndb/src/mgmclient/ndb_mgm.dsp ndb/src/mgmclient/libndbmgmclient.dsp ndb/src/mgmsrv/ndb_mgmd.dsp ndb/src/ndbapi/libndbapi.dsp ndb/src/libndbclient.dsp ndb/test/ndbapi/flexBench.dsp ndb/test/ndbapi/testBasic.dsp ndb/test/ndbapi/testBlobs.dsp ndb/test/ndbapi/testScan.dsp ndb/test/src/libNDBT.dsp ndb/tools/ndb_waiter.dsp ndb/tools/ndb_drop_table.dsp ndb/tools/ndb_delete_all.dsp ndb/tools/ndb_desc.dsp ndb/tools/ndb_drop_index.dsp ndb/tools/ndb_show_tables.dsp ndb/tools/ndb_select_all.dsp ndb/tools/ndb_select_count.dsp

  BitKeeper/etc/ignore
    1.224 05/02/25 11:43:16 joreland@mysql.com +45 -0
    added ./src/common/debugger/signaldata/libsignaldataprint.dsp ./src/common/debugger/libtrace.dsp ./src/common/logger/liblogger.dsp ./src/common/mgmcommon/libmgmsrvcommon.dsp ./src/common/portlib/libportlib.dsp ./src/common/transporter/libtransporter.dsp ./src/common/util/libgeneral.dsp ./src/kernel/blocks/backup/libbackup.dsp ./src/kernel/blocks/cmvmi/libcmvmi.dsp ./src/kernel/blocks/dbacc/libdbacc.dsp ./src/kernel/blocks/dbdict/libdbdict.dsp ./src/kernel/blocks/dbdih/libdbdih.dsp ./src/kernel/blocks/dblqh/libdblqh.dsp ./src/kernel/blocks/dbtc/libdbtc.dsp ./src/kernel/blocks/dbtup/libdbtup.dsp ./src/kernel/blocks/dbtux/libdbtux.dsp ./src/kernel/blocks/dbutil/libdbutil.dsp ./src/kernel/blocks/grep/libgrep.dsp ./src/kernel/blocks/ndbcntr/libndbcntr.dsp ./src/kernel/blocks/ndbfs/libndbfs.dsp ./src/kernel/blocks/qmgr/libqmgr.dsp ./src/kernel/blocks/suma/libsuma.dsp ./src/kernel/blocks/trix/libtrix.dsp ./src/kernel/error/liberror.dsp ./src/kernel/vm/libkernel.dsp ./src/kernel/ndbd.dsp ./src/mgmapi/libmgmapi.ds
    p ./src/mgmclient/ndb_mgm.dsp ./src/mgmclient/libndbmgmclient.dsp ./src/mgmsrv/ndb_mgmd.dsp ./src/ndbapi/libndbapi.dsp ./src/libndbclient.dsp ./test/ndbapi/flexBench.dsp ./test/ndbapi/testBasic.dsp ./test/ndbapi/testBlobs.dsp ./test/ndbapi/testScan.dsp ./test/src/libNDBT.dsp ./tools/ndb_waiter.dsp ./tools/ndb_drop_table.dsp ./tools/ndb_delete_all.dsp ./tools/ndb_desc.dsp ./tools/ndb_drop_index.dsp ./tools/ndb_show_tables.dsp ./tools/ndb_select_all.dsp ./tools/ndb_select_count.dsp

ChangeSet
  1.2055.1.136 05/02/25 09:14:43 joreland@mysql.com +1 -0
  Merge mysql.com:/home/jonas/src/fix
  into mysql.com:/home/jonas/src/mysql-4.1

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.49 05/02/25 09:14:42 joreland@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.445.5 05/02/25 09:10:35 joreland@mysql.com +7 -0
  BUG#8786 - ndb_autodiscover, post review
    More explicit naming of variables

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.45.1.2 05/02/25 09:10:32 joreland@mysql.com +2 -2
    Use masterNodeId instead of errornode

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.29 05/02/25 09:10:32 joreland@mysql.com +1 -0
    Set error/master node also on BuildIndxRef

  ndb/include/kernel/signaldata/DropIndx.hpp
    1.3 05/02/25 09:10:32 joreland@mysql.com +4 -2
    Add union to indicate where master node is passed in ref

  ndb/include/kernel/signaldata/CreateTrig.hpp
    1.3 05/02/25 09:10:32 joreland@mysql.com +4 -2
    Add union to indicate where master node is passed in ref

  ndb/include/kernel/signaldata/CreateIndx.hpp
    1.3 05/02/25 09:10:32 joreland@mysql.com +4 -2
    Add union to indicate where master node is passed in ref

  ndb/include/kernel/signaldata/BuildIndx.hpp
    1.5 05/02/25 09:10:32 joreland@mysql.com +2 -2
    Add union to indicate where master node is passed in ref

  ndb/include/kernel/signaldata/AlterIndx.hpp
    1.3 05/02/25 09:10:32 joreland@mysql.com +4 -2
    Add union to indicate where master node is passed in ref

ChangeSet
  1.2055.1.135 05/02/24 18:59:56 joreland@mysql.com +3 -0
  Merge mysql.com:/home/jonas/src/fix
  into mysql.com:/home/jonas/src/mysql-4.1

  sql/ha_ndbcluster.cc
    1.130 05/02/24 18:59:55 joreland@mysql.com +0 -0
    Auto merged

  ndb/src/ndbapi/ndb_cluster_connection.cpp
    1.18 05/02/24 18:59:55 joreland@mysql.com +0 -0
    Auto merged

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.48 05/02/24 18:59:55 joreland@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.445.4 05/02/24 18:58:56 joreland@mysql.com +9 -0
  bug#8786 - ndb autodiscover, sometimes fails
    remove dict forwarding
    add api retries on NotMaster
    

  sql/ha_ndbcluster.cc
    1.125.1.1 05/02/24 18:58:54 joreland@mysql.com +1 -1
    Wait 3 sec for all nodes to connect...

  ndb/src/ndbapi/ndb_cluster_connection.cpp
    1.16.1.1 05/02/24 18:58:54 joreland@mysql.com +2 -1
    Fix so that input values is in seconds and not 100ms's

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.45.1.1 05/02/24 18:58:54 joreland@mysql.com +14 -4
    1) Set error code for timeout
    2) Handle NotMaster with retry in all DICT requests

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.28 05/02/24 18:58:54 joreland@mysql.com +45 -17
    Never forward requests,
      instead REF to API who will retry towards correct node

  ndb/include/kernel/signaldata/DropIndx.hpp
    1.2 05/02/24 18:58:54 joreland@mysql.com +2 -2
    Add NotMaster error code

  ndb/include/kernel/signaldata/CreateTrig.hpp
    1.2 05/02/24 18:58:54 joreland@mysql.com +1 -0
    Add NotMaster error code

  ndb/include/kernel/signaldata/CreateIndx.hpp
    1.2 05/02/24 18:58:54 joreland@mysql.com +1 -2
    Add NotMaster error code

  ndb/include/kernel/signaldata/BuildIndx.hpp
    1.4 05/02/24 18:58:54 joreland@mysql.com +1 -0
    Add NotMaster error code

  ndb/include/kernel/signaldata/AlterIndx.hpp
    1.2 05/02/24 18:58:54 joreland@mysql.com +1 -0
    Add NotMaster error code

ChangeSet
  1.2055.542.2 05/02/24 17:25:06 lars@mysql.com +1 -0
  Fix of an incorrect merge

  mysql-test/r/rpl_insert_id.result
    1.11 05/02/24 17:24:17 lars@mysql.com +1 -1
    Fix of an incorrect merge

ChangeSet
  1.2055.541.1 05/02/23 23:44:13 mwagner@here.mwagner.org +1 -0
  Bootstrap:
    Add new manual.texi include files

  Build-tools/Bootstrap
    1.24 05/02/23 23:43:39 mwagner@here.mwagner.org +1 -1
    Add new manual.texi include files

ChangeSet
  1.2055.540.1 05/02/23 13:59:04 jimw@mysql.com +3 -0
  Don't try to create a symlink if the DATA DIRECTORY specified for a table
  is the same as the normal datadir for that database. (Bug #8707)

  mysql-test/r/symlink.result
    1.18 05/02/23 13:05:41 jimw@mysql.com +14 -0
    Add new results

  mysql-test/t/symlink.test
    1.12 05/02/23 13:05:38 jimw@mysql.com +11 -0
    Add new regression test

  mysys/my_symlink2.c
    1.7 05/02/23 13:04:48 jimw@mysql.com +6 -1
    Expand path of linkname before checking it against filename to decide if
    we need to create a link.

ChangeSet
  1.2055.1.133 05/02/23 20:59:00 mats@mysql.com +1 -0
  Bug#8412: Setting error code to 0 on statements that cannot fail.

  sql/log.cc
    1.162 05/02/23 20:58:56 mats@mysql.com +3 -1
    Setting error code to 0 on SQL statements that cannot fail.

ChangeSet
  1.2055.1.132 05/02/23 19:58:54 mats@mysql.com +3 -0
  Bug#8412: Merge from 4.0

  sql/log.cc
    1.161 05/02/23 19:58:51 mats@mysql.com +0 -1
    Merge from 4.0

  mysql-test/t/rpl_insert_id.test
    1.8 05/02/23 19:54:12 mats@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_insert_id.test
    1.1.1.7 05/02/23 19:54:12 mats@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/r/rpl_insert_id.result
    1.10 05/02/23 19:54:12 mats@mysql.com +0 -0
    Auto merged

  mysql-test/r/rpl_insert_id.result
    1.2.1.6 05/02/23 19:54:11 mats@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

ChangeSet
  1.2055.1.130 05/02/23 20:18:21 gluh@gluh.mysql.r18.ru +3 -0
  Fix for bug #6572: SHOW ERRORS doesn't

  sql/protocol.cc
    1.96 05/02/23 20:18:15 gluh@gluh.mysql.r18.ru +6 -0
    Fix for bug #6572: SHOW ERRORS doesn't

  mysql-test/t/warnings.test
    1.18 05/02/23 20:18:15 gluh@gluh.mysql.r18.ru +13 -0
    Fix for bug #6572: SHOW ERRORS doesn't

  mysql-test/r/warnings.result
    1.28 05/02/23 20:18:15 gluh@gluh.mysql.r18.ru +27 -0
    Fix for bug #6572: SHOW ERRORS doesn't

ChangeSet
  1.2055.539.1 05/02/23 17:38:51 guilhem@mysql.com +1 -0
  FIx for BUG#8682 "flush_block_commit test hangs on HPUX":
  start_waiting_global_read_lock() should wake up all those who are waiting
  for protect_against_global_read_lock to go down to 0: those registered in waiting_for_read_lock
  AND those registered in global_read_lock_blocks_commit.

  sql/lock.cc
    1.55 05/02/23 17:38:39 guilhem@mysql.com +3 -2
    start_waiting_global_read_lock() should wake up all those who are waiting
    for protect_against_global_read_lock to go down to 0: those registered in waiting_for_read_lock
    AND those registered in global_read_lock_blocks_commit.

ChangeSet
  1.2055.1.129 05/02/23 18:15:45 gluh@gluh.mysql.r18.ru +3 -0
  Fix for bug#6317: string function CHAR, parameter is NULL, wrong result

  sql/item_strfunc.cc
    1.216 05/02/23 18:14:45 gluh@gluh.mysql.r18.ru +2 -0
    Fix for bug#6317: string function CHAR, parameter is NULL, wrong result

  mysql-test/t/func_str.test
    1.68 05/02/23 18:14:45 gluh@gluh.mysql.r18.ru +6 -0
    Fix for bug#6317: string function CHAR, parameter is NULL, wrong result

  mysql-test/r/func_str.result
    1.85 05/02/23 18:14:45 gluh@gluh.mysql.r18.ru +6 -0
    Fix for bug#6317: string function CHAR, parameter is NULL, wrong result

ChangeSet
  1.2055.537.2 05/02/23 16:28:10 bar@mysql.com +1 -0
  config-win.h:
    Activate Unicode collations in Windows version.

  include/config-win.h
    1.51 05/02/23 16:27:42 bar@mysql.com +1 -0
    Activate Unicode collations in Windows version.

ChangeSet
  1.2055.1.127 05/02/23 10:12:26 tomas@poseidon.ndb.mysql.com +4 -0
     removed printout "- Repeated 1 times"
     make sure transporter connections are close early in shutdown

  ndb/src/kernel/vm/Emulator.hpp
    1.5 05/02/23 10:12:20 tomas@poseidon.ndb.mysql.com +2 -1
    make sure transporter connections are close early in shutdown

  ndb/src/kernel/vm/Emulator.cpp
    1.14 05/02/23 10:12:20 tomas@poseidon.ndb.mysql.com +17 -1
    make sure transporter connections are close early in shutdown

  ndb/src/kernel/main.cpp
    1.40 05/02/23 10:12:20 tomas@poseidon.ndb.mysql.com +2 -9
    make sure transporter connections are close early in shutdown

  ndb/src/common/logger/LogHandler.cpp
    1.8 05/02/23 10:12:20 tomas@poseidon.ndb.mysql.com +2 -2
    removed printout "- Repeated 1 times"

ChangeSet
  1.2055.1.126 05/02/22 13:15:34 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-7989
  into mysql.com:/home/jimw/my/mysql-4.1-clean

  sql/sql_acl.cc
    1.160 05/02/22 13:15:33 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.1.125 05/02/22 13:14:49 jimw@mysql.com +2 -0
  Merge bk-internal:/home/bk/mysql-4.1
  into mysql.com:/home/jimw/my/mysql-4.1-clean

  sql/sql_parse.cc
    1.427 05/02/22 13:14:48 jimw@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.551 05/02/22 13:14:48 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.529.13 05/02/22 21:05:17 heikki@hundin.mysql.fi +1 -0
  row0sel.c:
    Fix bug #8677: if one used LOCK TABLES, created an InnoDB temp table, and did a multi-table update where a MyISAM table was the update table and the temp table was a read table, then InnoDB aserted in row0sel.c because n_mysql_tables_in_use was 0. Also, we remove the assertion altogether and just print an error to the .err log if this important consistency check fails. Then it is up to the user to read the .err log and notice the problem if there still are errors in MySQL's table locking.

  innobase/row/row0sel.c
    1.64 05/02/22 21:04:36 heikki@hundin.mysql.fi +7 -2
    Fix bug #8677: if one used LOCK TABLES, created an InnoDB temp table, and did a multi-table update where a MyISAM table was the update table and the temp table was a read table, then InnoDB aserted in row0sel.c because n_mysql_tables_in_use was 0. Also, we remove the assertion altogether and just print an error to the .err log if this important consistency check fails. Then it is up to the user to read the .err log and notice the problem if there still are errors in MySQL's table locking.

ChangeSet
  1.2055.535.4 05/02/22 14:12:23 lars@mysql.com +1 -0
  Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1

  sql/log_event.cc
    1.176 05/02/22 14:12:14 lars@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.529.10 05/02/22 15:08:12 monty@mysql.com +1 -0
  Fix errors in my last changeset

  libmysql/libmysql.c
    1.290 05/02/22 15:08:06 monty@mysql.com +5 -2
    Fix errors in my last changeset

ChangeSet
  1.2055.537.1 05/02/22 16:37:25 bar@mysql.com +4 -0
  Bug#8349 myisamchk: --set-charset does not work
  What we need to be able to set in myisamchk is
  actually a collation, not a character set. This
  fix just changes to display the proper error message. 

  mysys/errors.c
    1.16 05/02/22 16:37:07 bar@mysql.com +2 -0
    New "unknown collation" error. 

  mysys/charset.c
    1.135 05/02/22 16:37:07 bar@mysql.com +1 -1
    Display more proper error when a collation is not found.

  myisam/myisamchk.c
    1.123 05/02/22 16:37:07 bar@mysql.com +13 -11
    Bug#8349 myisamchk: --set-charset does not work
    What we need to be able to set in myisamchk is
    actually a collation, not a character set. This
    fix just changes to display the proper error message. 

  include/mysys_err.h
    1.12 05/02/22 16:37:07 bar@mysql.com +2 -1
    New mysys error message "unknown collation".

ChangeSet
  1.2055.535.2 05/02/22 13:22:34 lars@mysql.com +3 -0
  Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1

  sql/set_var.cc
    1.159.1.2 05/02/22 13:22:32 lars@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.549.1.1 05/02/22 13:22:32 lars@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.340 05/02/22 13:22:31 lars@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.535.1 05/02/22 15:55:40 bar@mysql.com +3 -0
  A user variable are now always have IMPLICIT coercibility,
  independently from the expression it is initialized from.
  In other words, this change treats a user variable like
  a table with one column and one record. Discussed with 
  PeterG, Serg and Lars. This change also simplifies replication
  allowing not to replicate variables' coercibility.

  sql/item_func.cc
    1.235 05/02/22 15:55:33 bar@mysql.com +5 -5
    A user variable are now always have IMPLICIT coercibility,
    independently from the expression it is initialized from.
    In other words, this change treats a user variable like
    a table with one column and one record. Discussed with 
    PeterG, Serg and Lars. This change also simplifies replication
    allowing not to replicate variables' coercibility.

  mysql-test/t/user_var.test
    1.17 05/02/22 15:55:33 bar@mysql.com +0 -2
    Test changes accordintly

  mysql-test/r/user_var.result
    1.24 05/02/22 15:55:33 bar@mysql.com +9 -7
    Test changes accordintly

ChangeSet
  1.2055.532.2 05/02/22 12:40:31 lars@mysql.com +6 -0
  BUG#6662: Changes after Guilhems and Sergs review

  sql/sql_error.cc
    1.22 05/02/22 12:40:27 lars@mysql.com +1 -1
    BUG#6662: Changes after Guilhems and Sergs review

  sql/set_var.cc
    1.159.2.2 05/02/22 12:40:27 lars@mysql.com +3 -1
    BUG#6662: Changes after Guilhems and Sergs review

  sql/mysqld.cc
    1.548.1.2 05/02/22 12:40:26 lars@mysql.com +1 -1
    BUG#6662: Changes after Guilhems and Sergs review

  sql/mysql_priv.h
    1.338.1.2 05/02/22 12:40:26 lars@mysql.com +2 -2
    BUG#6662: Changes after Guilhems and Sergs review

  mysql-test/r/mysqldump.result
    1.37 05/02/22 12:40:26 lars@mysql.com +18 -0
    BUG#6662: Changes after Guilhems and Sergs review

  client/mysqldump.c
    1.176 05/02/22 12:40:26 lars@mysql.com +3 -4
    BUG#6662: Changes after Guilhems and Sergs review

ChangeSet
  1.2055.445.3 05/02/22 12:15:27 joreland@mysql.com +1 -0
  wl1292 - ndb autotest - fix html reporting bug

  ndb/test/run-test/ndb-autotest.sh
    1.2 05/02/22 12:15:24 joreland@mysql.com +4 -2
    use correct path when packing result tar ball

ChangeSet
  1.2055.534.1 05/02/22 13:00:00 bell@51.0.168.192.in-addr.arpa +1 -0
  Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
  into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1

  BitKeeper/etc/logging_ok
    1.362.1.7 05/02/22 12:59:57 bell@51.0.168.192.in-addr.arpa +1 -0
    Logging to logging@openlogging.org accepted

ChangeSet
  1.2055.529.8 05/02/22 12:51:54 monty@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/my/mysql-4.1

  sql/field.cc
    1.211 05/02/22 12:51:53 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.533.1 05/02/22 12:51:23 monty@mysql.com +19 -0
  Backport my_strntod() from 5.0
  Change string->float conversion to delay division as long as possible.
  This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740)
  
  

  strings/strtod.c
    1.16 05/02/22 12:51:20 monty@mysql.com +119 -48
    Backport my_strntod() from 5.0
    Change conversion to delay division as long as possible.
    This gives us more exact integer-> float conversion for numbers of type '123.45E+02'

  strings/ctype-ucs2.c
    1.37 05/02/22 12:51:20 monty@mysql.com +3 -6
    Backport my_strntod() from 5.0

  strings/ctype-simple.c
    1.61 05/02/22 12:51:20 monty@mysql.com +3 -24
    Backport my_strntod() from 5.0

  sql/procedure.h
    1.16 05/02/22 12:51:20 monty@mysql.com +8 -3
    Backport my_strntod() from 5.0

  sql/item_sum.h
    1.78 05/02/22 12:51:20 monty@mysql.com +4 -2
    Backport my_strntod() from 5.0

  sql/item_sum.cc
    1.132 05/02/22 12:51:20 monty@mysql.com +2 -1
    Backport my_strntod() from 5.0

  sql/item_strfunc.cc
    1.215 05/02/22 12:51:20 monty@mysql.com +2 -1
    Backport my_strntod() from 5.0

  sql/item_func.h
    1.119 05/02/22 12:51:19 monty@mysql.com +5 -2
    Backport my_strntod() from 5.0

  sql/item.h
    1.169 05/02/22 12:51:19 monty@mysql.com +4 -2
    Backport my_strntod() from 5.0

  sql/item.cc
    1.191 05/02/22 12:51:19 monty@mysql.com +7 -4
    Backport my_strntod() from 5.0

  sql/field.cc
    1.209.1.1 05/02/22 12:51:19 monty@mysql.com +10 -4
    Backport my_strntod() from 5.0

  mysql-test/t/type_float.test
    1.17 05/02/22 12:51:19 monty@mysql.com +25 -1
    More test to better test new strtod() function
    Test also bug #7740 (wrong comparsion between integer and float-in-integer-range)

  mysql-test/t/ps_1general.test
    1.13 05/02/22 12:51:19 monty@mysql.com +1 -0
    Safety fix (if mysql_client_test.test fails)

  mysql-test/t/mysql_client_test.test
    1.12 05/02/22 12:51:19 monty@mysql.com +7 -0
    Comments for what to do if this test fails

  mysql-test/r/type_float.result
    1.30 05/02/22 12:51:19 monty@mysql.com +33 -1
    More test

  mysql-test/r/ps_1general.result
    1.16 05/02/22 12:51:19 monty@mysql.com +1 -0
    Safety fix (if mysql_client_test.test fails)

  mysql-test/mysql-test-run.sh
    1.242 05/02/22 12:51:19 monty@mysql.com +2 -1
    Run also mysql_client_test with --debug

  include/m_string.h
    1.34 05/02/22 12:51:19 monty@mysql.com +1 -1
    Backported my_strtod() from 5.0

  client/mysql.cc
    1.194.1.10 05/02/22 12:51:19 monty@mysql.com +2 -2
    Fix wront usage of charset (found during review of pushed code)

ChangeSet
  1.2055.527.6 05/02/22 10:20:35 joreland@mysql.com +2 -0
  Merge mysql.com:/home/jonas/src/fix
  into mysql.com:/home/jonas/src/mysql-4.1

  BitKeeper/deleted/.del-ndb-autotest.sh
    1.2 05/02/22 10:20:33 joreland@mysql.com +0 -0
    Delete: ndb/test/run-test/ndb-autotest.sh

  BitKeeper/deleted/.del-example.conf
    1.2 05/02/22 10:20:28 joreland@mysql.com +0 -0
    Delete: ndb/test/run-test/example.conf

ChangeSet
  1.2055.445.2 05/02/22 10:18:38 joreland@mysql.com +2 -0
  wl1292 - ndb autotest scripts
    split into script/conf for easier deployment

  ndb/test/run-test/ndb-autotest.sh
    1.1 05/02/22 10:17:31 joreland@mysql.com +226 -0

  ndb/test/run-test/example.conf
    1.1 05/02/22 10:17:31 joreland@mysql.com +10 -0

  ndb/test/run-test/ndb-autotest.sh
    1.0 05/02/22 10:17:31 joreland@mysql.com +0 -0
    BitKeeper file /home/jonas/src/fix/ndb/test/run-test/ndb-autotest.sh

  ndb/test/run-test/example.conf
    1.0 05/02/22 10:17:31 joreland@mysql.com +0 -0
    BitKeeper file /home/jonas/src/fix/ndb/test/run-test/example.conf

  ndb/test/run-test/ndb-autotest.sh
    1.1 05/02/22 08:22:54 joreland@mysql.com +226 -0

  ndb/test/run-test/example.conf
    1.1 05/02/22 08:22:54 joreland@mysql.com +10 -0

  ndb/test/run-test/ndb-autotest.sh
    1.0 05/02/22 08:22:54 joreland@mysql.com +0 -0
    BitKeeper file /home/jonas/src/mysql-4.1/ndb/test/run-test/ndb-autotest.sh

  ndb/test/run-test/example.conf
    1.0 05/02/22 08:22:54 joreland@mysql.com +0 -0
    BitKeeper file /home/jonas/src/mysql-4.1/ndb/test/run-test/example.conf

ChangeSet
  1.2055.529.7 05/02/22 09:56:07 bar@mysql.com +3 -0
  ctype_latin1.result, ctype_latin1.test, charset.c:
    Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.

  mysql-test/r/ctype_latin1.result
    1.4 05/02/22 09:55:47 bar@mysql.com +5 -0
    Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.

  mysql-test/t/ctype_latin1.test
    1.4 05/02/22 09:55:36 bar@mysql.com +9 -0
    Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.

  mysys/charset.c
    1.134 05/02/22 09:54:56 bar@mysql.com +1 -1
    Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.

ChangeSet
  1.2055.529.6 05/02/22 08:35:15 bar@mysql.com +1 -0
  field.cc:
    optimize test_if_minus() when not UCS2 support is compiled.

  sql/field.cc
    1.210 05/02/22 08:34:42 bar@mysql.com +11 -1
    optimize test_if_minus() when not UCS2 support is compiled.

ChangeSet
  1.2055.529.5 05/02/21 17:28:33 paul@snake-hub.snake.net +1 -0
  Merge.

  sql/sql_parse.cc
    1.424.1.2 05/02/21 17:28:31 paul@snake-hub.snake.net +0 -1
    Merge.

ChangeSet
  1.2055.532.1 05/02/21 18:40:28 lars@mysql.com +6 -0
  BUG#6662: Importing mysqldumps should not show any warnings of level "notes".

  sql/sql_error.cc
    1.21 05/02/21 18:39:40 lars@mysql.com +4 -0
    BUG#6662: Importing mysqldumps should not show any warnings of level "notes".

  sql/set_var.cc
    1.159.2.1 05/02/21 18:39:40 lars@mysql.com +4 -0
    BUG#6662: Importing mysqldumps should not show any warnings of level "notes".

  sql/mysqld.cc
    1.548.1.1 05/02/21 18:39:40 lars@mysql.com +2 -1
    BUG#6662: Importing mysqldumps should not show any warnings of level "notes".

  sql/mysql_priv.h
    1.338.1.1 05/02/21 18:39:40 lars@mysql.com +4 -0
    BUG#6662: Importing mysqldumps should not show any warnings of level "notes".

  mysql-test/r/mysqldump.result
    1.36 05/02/21 18:39:40 lars@mysql.com +36 -18
    BUG#6662: Importing mysqldumps should not show any warnings of level "notes".

  client/mysqldump.c
    1.175 05/02/21 18:39:40 lars@mysql.com +4 -0
    BUG#6662: Importing mysqldumps should not show any warnings of level "notes".

ChangeSet
  1.2055.531.2 05/02/21 17:52:15 lars@mysql.com +1 -0
  BUG#6676: Added comment for the fix

  sql/log_event.cc
    1.174.1.2 05/02/21 17:52:11 lars@mysql.com +5 -0
    BUG#6676: Added comment for the fix

ChangeSet
  1.2055.531.1 05/02/21 16:26:04 lars@mysql.com +3 -0
  BUG#6676: Derivation of user variables should be of derivation "IMPLICIT"

  sql/log_event.cc
    1.174.1.1 05/02/21 16:23:26 lars@mysql.com +1 -1
    BUG#6676: Derivation of user variables should be of derivation "IMPLICIT"

  mysql-test/t/rpl_charset.test
    1.6 05/02/21 16:23:25 lars@mysql.com +13 -0
    BUG#6676: Derivation of user variables should be of derivation "IMPLICIT"

  mysql-test/r/rpl_charset.result
    1.8 05/02/21 16:23:25 lars@mysql.com +7 -0
    BUG#6676: Derivation of user variables should be of derivation "IMPLICIT"

ChangeSet
  1.2055.530.1 05/02/21 09:15:43 paul@snake-hub.snake.net +1 -0
  sql_parse.cc:
    Fix compiler complaint.

  sql/sql_parse.cc
    1.424.2.1 05/02/21 09:15:17 paul@snake-hub.snake.net +1 -1
    Fix compiler complaint.

ChangeSet
  1.2055.529.4 05/02/21 17:27:36 konstantin@mysql.com +1 -0
  Fix -ansi -pedantic compilation failure.

  sql/sql_parse.cc
    1.424.1.1 05/02/21 17:27:31 konstantin@mysql.com +2 -2
    Fix -ansi -pedantic compilation failure.

ChangeSet
  1.2055.527.4 05/02/21 15:22:01 joreland@mysql.com +2 -0
  bug#8645 - ndb - ndb_mgmd nodeid handling
    (not to be merged as code has changed in 5.0)

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.56 05/02/21 15:21:58 joreland@mysql.com +0 -3
    remove incorrect asserts

  ndb/src/mgmapi/LocalConfig.cpp
    1.20 05/02/21 15:21:58 joreland@mysql.com +7 -1
    Allow connecstring = "nodeid=X"

ChangeSet
  1.2055.529.3 05/02/21 17:17:30 bar@mysql.com +3 -0
  ctype_utf8.result, ctype_utf8.test, ctype-utf8.c:
    Bugs: #8385: utf8_general_ci treats cyrillic letters I and SHORT I as the same

  mysql-test/r/ctype_utf8.result
    1.49 05/02/21 17:17:13 bar@mysql.com +3 -0
    Bugs: #8385: utf8_general_ci treats cyrillic letters I and SHORT I as the same

  mysql-test/t/ctype_utf8.test
    1.49 05/02/21 17:17:10 bar@mysql.com +5 -0
    Bugs: #8385: utf8_general_ci treats cyrillic letters I and SHORT I as the same

  strings/ctype-utf8.c
    1.81 05/02/21 17:16:57 bar@mysql.com +2 -2
    Bugs: #8385: utf8_general_ci treats cyrillic letters I and SHORT I as the same

ChangeSet
  1.2055.529.2 05/02/21 15:43:25 bar@mysql.com +1 -0
  mysql.cc:
    bug#7571:
    Server & Client characterset are shown under different decriptions
    Switch them into the correct order.

  client/mysql.cc
    1.194.1.9 05/02/21 15:42:31 bar@mysql.com +2 -2
    bug#7571:
    Server & Client characterset are shown under different decriptions
    Switch them into the correct order.

ChangeSet
  1.2055.529.1 05/02/21 10:54:23 tulin@mysql.com +1 -0
  Merge bk-internal:/home/bk/mysql-4.1
  into mysql.com:/home/mysqldev/tulin/mysql-4.1

  scripts/make_binary_distribution.sh
    1.73 05/02/21 10:54:21 tulin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.528.1 05/02/21 10:52:29 tulin@mysql.com +1 -0
  bug #8611, ndb includes in lib dir instead of include dir

  scripts/make_binary_distribution.sh
    1.71.1.1 05/02/21 10:52:27 tulin@mysql.com +1 -1
    bug #8611, ndb includes in lib dir instead of include dir

ChangeSet
  1.2055.527.1 05/02/19 19:51:47 Sinisa@sinisa.nasamreza.org +1 -0
  fix for a bug with my_print_defaults with --defaults-extra-file= option

  extra/my_print_defaults.c
    1.18 05/02/19 19:51:33 Sinisa@sinisa.nasamreza.org +13 -5
    fix for a bug with my_print_defaults with --defaults-extra-file= option

ChangeSet
  1.2055.1.124 05/02/18 15:40:17 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-8475
  into mysql.com:/home/jimw/my/mysql-4.1-clean

  sql/sql_parse.cc
    1.426 05/02/18 15:40:16 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.1.122 05/02/18 15:23:17 jimw@mysql.com +1 -0
  Clean up merge for fix for Bug #8350.

  sql/sql_parse.cc
    1.425 05/02/18 15:23:14 jimw@mysql.com +7 -9
    Clean up merge

ChangeSet
  1.2055.1.121 05/02/18 15:02:54 jimw@mysql.com +1 -0
  Fix merge of fix for Bug #4872.

  sql/mysqld.cc
    1.550 05/02/18 15:02:52 jimw@mysql.com +1 -2
    Clean up merge

  bdb/dist/s_win32_dsp
    1.4 05/02/18 23:46:28 kent@mysql.com +4 -2
    Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris

  bdb/dist/s_win32
    1.4 05/02/18 23:46:27 kent@mysql.com +1 -1
    Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris

  bdb/dist/s_vxworks
    1.4 05/02/18 23:46:27 kent@mysql.com +1 -1
    Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris

  bdb/dist/s_test
    1.2 05/02/18 23:46:27 kent@mysql.com +1 -1
    Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris

  bdb/dist/s_readme
    1.4 05/02/18 23:46:27 kent@mysql.com +1 -1
    Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris

  bdb/dist/s_java
    1.5 05/02/18 23:46:26 kent@mysql.com +1 -1
    Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris

  bdb/dist/s_javah
    1.2 05/02/18 23:46:26 kent@mysql.com +1 -1
    Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris

ChangeSet
  1.2055.526.1 05/02/18 12:47:33 jimw@mysql.com +1 -0
  Clean up fix for Bug #7989 by avoiding extra memory copy, and adding some
  more information to the error message.

  sql/sql_acl.cc
    1.158.1.1 05/02/18 12:46:15 jimw@mysql.com +10 -12
    Change strmov() call to strnmov(), and don't do redundant copy.
    Add to warning message that privilege can't be removed with REVOKE.

ChangeSet
  1.2055.420.2 05/02/18 12:37:18 jimw@mysql.com +1 -0
  Remove doubled quotes (used for escaping) in table names in mysqlhotcopy.
  Part of fix for Bug #8136.

  scripts/mysqlhotcopy.sh
    1.49 05/02/18 12:36:14 jimw@mysql.com +4 -1
    Un-escape doubled quotes within table names.

ChangeSet
  1.2055.1.120 05/02/18 14:19:08 mats@mysql.com +2 -0
  Merge from 4.0

  sql/sql_yacc.yy
    1.379 05/02/18 14:19:04 mats@mysql.com +0 -1
    Merged from 4.0

  sql/sql_update.cc
    1.142 05/02/18 14:14:10 mats@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.802.7 05/02/18 13:50:19 mats@mysql.com +2 -0
  Merge mysql.com:/home/bkroot/mysql-4.0
  into mysql.com:/home/bk/b7879-mysql-4.0

  sql/sql_yacc.yy
    1.145.1.89 05/02/18 13:50:18 mats@mysql.com +0 -0
    Auto merged

  sql/sql_update.cc
    1.54.1.53 05/02/18 13:50:18 mats@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.1.119 05/02/18 16:10:12 bar@mysql.com +4 -0
  Bug #7878 with utf_general_ci, equals (=) has problem with accent insensitivity
  Backporting Monty's fix for 5.0 into 4.1.

  mysql-test/t/ctype_latin1_de.test
    1.20 05/02/18 16:10:05 bar@mysql.com +16 -0
    Bug #7878 with utf_general_ci, equals (=) has problem with accent insensitivity
    Backporting Monty's fix for 5.0 into 4.1.

  mysql-test/r/ctype_latin1_de.result
    1.20 05/02/18 16:10:05 bar@mysql.com +12 -0
    Bug #7878 with utf_general_ci, equals (=) has problem with accent insensitivity
    Backporting Monty's fix for 5.0 into 4.1.

  myisam/mi_rnext_same.c
    1.15 05/02/18 16:10:05 bar@mysql.com +6 -2
    Bug #7878 with utf_general_ci, equals (=) has problem with accent insensitivity
    Backporting Monty's fix for 5.0 into 4.1.

  include/my_base.h
    1.62 05/02/18 16:10:05 bar@mysql.com +1 -0
    Bug #7878 with utf_general_ci, equals (=) has problem with accent insensitivity
    Backporting Monty's fix for 5.0 into 4.1.

ChangeSet
  1.2055.525.1 05/02/18 15:51:55 hf@deer.(none) +2 -0
  Fix for the bug #7344 (multiple server_init/server_end lead to crash)
  Some variable wasn't moved to the initial state during mysql_server_end

  sql/mysqld.cc
    1.549 05/02/18 15:51:52 hf@deer.(none) +1 -0
    free_charsets() call added

  myisam/ft_stopwords.c
    1.21 05/02/18 15:51:52 hf@deer.(none) +1 -0
    resetting ft_stopword_file

ChangeSet
  1.2055.1.117 05/02/18 12:58:16 bar@mysql.com +4 -0
  A way not to compile UCA collations

  strings/ctype-uca.c
    1.29 05/02/18 12:58:10 bar@mysql.com +4 -1
    A way not to compile UCA collations

  mysys/charset.c
    1.133 05/02/18 12:58:10 bar@mysql.com +1 -1
    A way not to compile UCA collations

  mysys/charset-def.c
    1.8 05/02/18 12:58:10 bar@mysql.com +8 -0
    A way not to compile UCA collations

  configure.in
    1.352 05/02/18 12:58:10 bar@mysql.com +18 -0
    A way not to compile UCA collations

ChangeSet
  1.2055.1.114 05/02/17 13:53:35 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-7617
  into mysql.com:/home/jimw/my/mysql-4.1-clean

  scripts/mysql_create_system_tables.sh
    1.19 05/02/17 13:53:34 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.1.113 05/02/17 13:53:07 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-8471
  into mysql.com:/home/jimw/my/mysql-4.1-clean

  sql/sql_acl.cc
    1.159 05/02/17 13:53:06 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.508.3 05/02/17 13:52:39 jimw@mysql.com +1 -0
  Merge

  tests/mysql_client_test.c
    1.149 05/02/17 13:52:38 jimw@mysql.com +0 -0
    SCCS merged

ChangeSet
  1.2055.508.2 05/02/17 13:48:34 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-8355
  into mysql.com:/home/jimw/my/mysql-4.1-clean

  sql/sql_base.cc
    1.245 05/02/17 13:48:33 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.524.2 05/02/17 13:46:33 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.0-clean
  into mysql.com:/home/jimw/my/mysql-4.1-clean

  BitKeeper/triggers/post-commit
    1.32 05/02/17 13:46:32 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.519.2 05/02/17 11:48:44 jimw@mysql.com +4 -0
  Log each slow query in a multi-statement query to the slow query log.
  (Bug #8475)

  mysql-test/t/multi_statement-master.opt
    1.1 05/02/17 11:44:58 jimw@mysql.com +2 -0

  mysql-test/t/multi_statement-master.opt
    1.0 05/02/17 11:44:58 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-8475/mysql-test/t/multi_statement-master.opt

  mysql-test/t/multi_statement.test
    1.4 05/02/17 11:44:44 jimw@mysql.com +15 -0
    Add new regression test

  mysql-test/r/multi_statement.result
    1.3 05/02/17 11:44:38 jimw@mysql.com +17 -0
    Add new results

  sql/sql_parse.cc
    1.423.1.1 05/02/17 11:43:51 jimw@mysql.com +22 -11
    Reset the start time before each statement before each statement in
    a multi-statement query, and check whether each statement should
    be logged to the slow query log independently.

ChangeSet
  1.2055.501.18 05/02/17 17:52:49 acurtis@pcgem.rdg.cyberkinetica.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.1

  sql/sql_parse.cc
    1.424 05/02/17 17:52:39 acurtis@pcgem.rdg.cyberkinetica.com +0 -0
    Auto merged

ChangeSet
  1.2055.523.1 05/02/17 15:04:04 svoj@mysql.com +4 -0
  bug#6958
  Fixed that negative arguments to certain integer options wrap around.

  sql/set_var.h
    1.57 05/02/17 15:04:00 svoj@mysql.com +1 -0
    Use sys_var_long_ptr::check function for sys_var_long_ptr class.

  sql/set_var.cc
    1.159.1.1 05/02/17 15:04:00 svoj@mysql.com +6 -0
    sys_var_long_ptr::check function was added.

  mysql-test/t/variables.test
    1.45 05/02/17 15:04:00 svoj@mysql.com +8 -0
    Added a test case for bug#6958.

  mysql-test/r/variables.result
    1.57 05/02/17 15:04:00 svoj@mysql.com +5 -0
    Added a test case for bug#6958.

ChangeSet
  1.2055.501.16 05/02/17 11:07:33 lenz@mysql.com +1 -0
  - fixed a changelog entry in the RPM spec file (wrong author)

  support-files/mysql.spec.sh
    1.88 05/02/17 11:07:27 lenz@mysql.com +1 -1
    - fixed a changelog entry (wrong author)

ChangeSet
  1.2055.501.14 05/02/17 02:57:40 mwagner@here.mwagner.org +1 -0
  Do-hpux-depot:
    Perl script to create HP depot packages.

  Build-tools/Do-hpux-depot
    1.1 05/02/17 02:56:23 mwagner@here.mwagner.org +85 -0

  Build-tools/Do-hpux-depot
    1.0 05/02/17 02:56:23 mwagner@here.mwagner.org +0 -0
    BitKeeper file /Users/mwagner/work/bk/mysql-4.1/Build-tools/Do-hpux-depot

ChangeSet
  1.2055.501.12 05/02/16 22:51:32 igor@rurik.mysql.com +2 -0
  item.h:
    Revised the fix for bug #7098.
    Corrected the method Item_string::new_item.
  sql_select.cc:
    Revised the fix for bug #7098.
    Aborted the previous modifications.

  sql/item.h
    1.168 05/02/16 22:49:39 igor@rurik.mysql.com +1 -1
    Revised the fix for bug #7098.
    Corrected the method Item_string::new_item.

  sql/sql_select.cc
    1.380.2.24 05/02/16 22:48:06 igor@rurik.mysql.com +0 -4
    Revised the fix for bug #7098.
    Aborted the previous modifications.

ChangeSet
  1.2055.522.1 05/02/17 07:36:54 tomas@poseidon.ndb.mysql.com +1 -0
  Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
  into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

  mysql-test/mysql-test-run.pl
    1.11 05/02/17 07:36:52 tomas@poseidon.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.521.1 05/02/16 21:17:20 igor@rurik.mysql.com +3 -0
  select.result, select.test:
    Added a test case for bug #7098.
  sql_select.cc:
    Fixed bug #7098.
    When a string field was substituted for an equal constant
    the collation of the constant was changed by mistake for 
    the binary collation.

  mysql-test/r/select.result
    1.49 05/02/16 21:16:54 igor@rurik.mysql.com +22 -0
    Added a test case for bug #7098.

  mysql-test/t/select.test
    1.33 05/02/16 21:16:15 igor@rurik.mysql.com +19 -0
    Added a test case for bug #7098.

  sql/sql_select.cc
    1.380.2.23 05/02/16 21:13:44 igor@rurik.mysql.com +4 -0
    Fixed bug #7098.
    When a string field was substituted for an equal constant
    the collation of the constant was changed by mistake for 
    the binary collation.

ChangeSet
  1.2055.501.10 05/02/17 05:22:14 kent@mysql.com +2 -0
  init_db.sql:
    Make SQL more readable, substitute hostname at runtime
  mysql-test-run.pl:
    Run init scripts with /bin/sh, ignore return code

  mysql-test/lib/init_db.sql
    1.3 05/02/17 05:18:00 kent@mysql.com +446 -32
    Make SQL more readable, substitute hostname at runtime

  mysql-test/mysql-test-run.pl
    1.10 05/02/17 05:16:37 kent@mysql.com +11 -11
    Run init scripts with /bin/sh, ignore return code

ChangeSet
  1.2055.520.1 05/02/17 07:12:31 sergefp@mysql.com +3 -0
  A "fix" for problem discovered in BUG#8510: remove ONLY_FULL_GROUP_BY mode from ANSI mode, as currently
  ONLY_FULL_GROUP_BY mode is overly restrictive.

  sql/set_var.cc
    1.160 05/02/17 07:12:28 sergefp@mysql.com +7 -1
    A "fix" for problem discovered in BUG#8510: remove ONLY_FULL_GROUP_BY mode from ANSI mode.

  mysql-test/t/ansi.test
    1.6 05/02/17 07:12:28 sergefp@mysql.com +2 -1
    A "fix" for problem discovered in BUG#8510: remove ONLY_FULL_GROUP_BY mode from ANSI mode.

  mysql-test/r/ansi.result
    1.5 05/02/17 07:12:28 sergefp@mysql.com +2 -2
    A "fix" for problem discovered in BUG#8510: remove ONLY_FULL_GROUP_BY mode from ANSI mode.

ChangeSet
  1.2055.501.8 05/02/17 02:59:39 kent@mysql.com +6 -0
  Windows compatibility changes of the 'rpl_delete_all',
  'ps_1general' and 'fulltext_cache' test cases.

  mysql-test/lib/mtr_process.pl
    1.6 05/02/17 02:50:14 kent@mysql.com +28 -5
    Check error from exec() to avoid becoming a fork() bomb

  mysql-test/mysql-test-run.pl
    1.9 05/02/17 02:48:37 kent@mysql.com +2 -0
    Pass mysqld --console to catch output on Windows

  mysql-test/t/rpl_delete_all.test
    1.4 05/02/17 02:46:47 kent@mysql.com +1 -1
    To pass on Windows, change \\ to / in result

  mysql-test/t/ps_1general.test
    1.12 05/02/17 02:46:46 kent@mysql.com +1 -0
    To pass on Windows, change \\ to / in result

  mysql-test/t/fulltext_cache.test
    1.9 05/02/17 02:44:45 kent@mysql.com +2 -2
    To pass on Windows, round to less digits

  mysql-test/r/fulltext_cache.result
    1.13 05/02/17 02:44:43 kent@mysql.com +18 -18
    To pass on Windows, round to less digits

ChangeSet
  1.2055.516.2 05/02/16 17:37:56 jimw@mysql.com +1 -0
  Fix output of perror to include whether the error message
  corresponds to an OS or MySQL error. (Bug #8517)

  extra/perror.c
    1.37 05/02/16 17:37:54 jimw@mysql.com +7 -6
    Don't report OS errors that start with 'Unknown Error', and
    always make clear whether we are reporting an OS or MySQL error
    message.

ChangeSet
  1.2055.518.1 05/02/17 01:33:59 acurtis@pcgem.rdg.cyberkinetica.com +3 -0
  Bug#8147
    Fix ambigious table error for INSERT..SELECT..UPDATE

  sql/sql_parse.cc
    1.421.2.1 05/02/17 01:33:46 acurtis@pcgem.rdg.cyberkinetica.com +14 -8
    Bug#8147
      Change order of code - 
      skip insert table before calling mysql_prepare_insert()

  mysql-test/t/insert_update.test
    1.11 05/02/17 01:33:46 acurtis@pcgem.rdg.cyberkinetica.com +4 -3
    Bug#8147
      Alter test for bug

  mysql-test/r/insert_update.result
    1.11 05/02/17 01:33:45 acurtis@pcgem.rdg.cyberkinetica.com +3 -3
    Bug#8147
      Alter test for bug

ChangeSet
  1.2055.517.1 05/02/17 00:28:04 lars@mysql.com +1 -0
  BUG#8297: If query is filtered on slave, do not put it in general log.

  sql/log_event.cc
    1.175 05/02/17 00:26:42 lars@mysql.com +4 -1
    If query is filtered on slave, do not put info in general log.

ChangeSet
  1.1346.809.1 05/02/16 14:03:16 jimw@mysql.com +1 -0
  Make post-commit trigger not send emails when the message would not contain
  any actual changes. (Often the case in merges where the only change involves
  renumbering ChangeSet entries.)

  BitKeeper/triggers/post-commit
    1.19.1.14 05/02/16 14:02:09 jimw@mysql.com +7 -0
    Suppress emails when there's no changes actually reported

ChangeSet
  1.2055.513.4 05/02/16 21:54:35 tomas@poseidon.ndb.mysql.com +1 -0
  bug #8556 corrupt ndb_mgm show printout for certain configurations

  ndb/src/mgmclient/CommandInterpreter.cpp
    1.46 05/02/16 21:54:31 tomas@poseidon.ndb.mysql.com +11 -8
    bug #8556 corrupt ndb_mgm show printout for certain configurations

ChangeSet
  1.1346.808.1 05/02/16 11:58:35 jimw@mysql.com +1 -0
  When calling initgroups(), set a flag that the segfault handler checks
  in order to output a special warning about a particular case of segfaults
  due to a mix of static binaries, NSS, and LDAP. (Bug #4872)

ChangeSet
  1.2055.515.1 05/02/16 20:46:34 tomas@poseidon.ndb.mysql.com +6 -0
  reuse nodeid if ndbd is restarted

  ndb/src/mgmapi/mgmapi.cpp
    1.25 05/02/16 20:46:28 tomas@poseidon.ndb.mysql.com +9 -0
    reuse nodeid if ndbd is restarted

  ndb/src/kernel/vm/Configuration.cpp
    1.33 05/02/16 20:46:28 tomas@poseidon.ndb.mysql.com +9 -0
    reuse nodeid if ndbd is restarted

  ndb/src/common/mgmcommon/ConfigRetriever.cpp
    1.23 05/02/16 20:46:28 tomas@poseidon.ndb.mysql.com +6 -0
    reuse nodeid if ndbd is restarted

  ndb/include/mgmcommon/ConfigRetriever.hpp
    1.14 05/02/16 20:46:28 tomas@poseidon.ndb.mysql.com +2 -0
    reuse nodeid if ndbd is restarted

  ndb/include/mgmapi/mgmapi.h
    1.20 05/02/16 20:46:28 tomas@poseidon.ndb.mysql.com +1 -0
    reuse nodeid if ndbd is restarted

  mysql-test/mysql-test-run.pl
    1.6.1.2 05/02/16 20:46:27 tomas@poseidon.ndb.mysql.com +5 -1
    start and exit fix for ndbcluster

ChangeSet
  1.2055.513.2 05/02/16 16:33:57 acurtis@pcgem.rdg.cyberkinetica.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.1

  sql/ha_innodb.cc
    1.183 05/02/16 16:33:53 acurtis@pcgem.rdg.cyberkinetica.com +0 -0
    Auto merged

ChangeSet
  1.2055.514.1 05/02/16 16:29:56 acurtis@pcgem.rdg.cyberkinetica.com +2 -0
  Merge

  include/config-win.h
    1.50 05/02/16 16:29:55 acurtis@pcgem.rdg.cyberkinetica.com +0 -0
    SCCS merged

  sql/ha_innodb.cc
    1.181.1.1 05/02/16 16:25:32 acurtis@pcgem.rdg.cyberkinetica.com +0 -0
    Auto merged

ChangeSet
  1.1346.807.1 05/02/16 16:05:18 acurtis@pcgem.rdg.cyberkinetica.com +1 -0
  Bug#4445
    Make a more informative platform info for Windows

  include/config-win.h
    1.23.1.14 05/02/16 16:05:11 acurtis@pcgem.rdg.cyberkinetica.com +15 -8
    Bug#4445
      Make a more informative platform info for Windows

ChangeSet
  1.2055.512.1 05/02/16 12:45:59 pekka@mysql.com +12 -0
  ndb - fix old decimal type mysql vs ndb

  sql/ha_ndbcluster.cc
    1.129 05/02/16 12:43:56 pekka@mysql.com +27 -7
    fix old decimal type mysql vs ndb (re-commit 3)

  ndb/tools/restore/consumer.cpp
    1.5 05/02/16 12:43:56 pekka@mysql.com +4 -1
    fix old decimal type mysql vs ndb (re-commit 3)

  ndb/test/include/NdbSchemaOp.hpp
    1.10 05/02/16 12:43:56 pekka@mysql.com +2 -1
    fix old decimal type mysql vs ndb (re-commit 3)

  ndb/src/ndbapi/NdbRecAttr.cpp
    1.13 05/02/16 12:43:56 pekka@mysql.com +14 -1
    fix old decimal type mysql vs ndb (re-commit 3)

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.47 05/02/16 12:43:56 pekka@mysql.com +4 -2
    fix old decimal type mysql vs ndb (re-commit 3)

  ndb/src/ndbapi/NdbDictionary.cpp
    1.22 05/02/16 12:43:56 pekka@mysql.com +5 -2
    fix old decimal type mysql vs ndb (re-commit 3)

  ndb/src/common/util/NdbSqlUtil.cpp
    1.17 05/02/16 12:43:55 pekka@mysql.com +80 -34
    fix old decimal type mysql vs ndb (re-commit 3)

  ndb/include/util/NdbSqlUtil.hpp
    1.14 05/02/16 12:43:55 pekka@mysql.com +10 -3
    fix old decimal type mysql vs ndb (re-commit 3)

  ndb/include/ndbapi/NdbDictionary.hpp
    1.19 05/02/16 12:43:55 pekka@mysql.com +7 -6
    fix old decimal type mysql vs ndb (re-commit 3)

  ndb/include/kernel/signaldata/DictTabInfo.hpp
    1.12 05/02/16 12:43:55 pekka@mysql.com +16 -4
    fix old decimal type mysql vs ndb (re-commit 3)

  mysql-test/t/ndb_index_ordered.test
    1.20 05/02/16 12:43:55 pekka@mysql.com +52 -0
    fix old decimal type mysql vs ndb (re-commit 3)

  mysql-test/r/ndb_index_ordered.result
    1.19 05/02/16 12:43:55 pekka@mysql.com +83 -0
    fix old decimal type mysql vs ndb (re-commit 3)

ChangeSet
  1.2055.504.6 05/02/16 04:04:34 dean@mysql.com +2 -0
  Merge

  mysql-test/t/fulltext.test
    1.71 05/02/16 04:04:34 dean@mysql.com +0 -0
    SCCS merged

  mysql-test/r/fulltext.result
    1.73 05/02/16 04:04:34 dean@mysql.com +0 -0
    SCCS merged

ChangeSet
  1.1346.802.4 05/02/16 03:13:29 dean@mysql.com +2 -0
  fulltext.test, fulltext.result:
    Test case for bug#8522, to test for out of bounds memory access in ft_nlq_find_relevance().

  mysql-test/t/fulltext.test
    1.34.2.14 05/02/16 03:13:01 dean@mysql.com +8 -0
    Test case for bug#8522, to test for out of bounds memory access in ft_nlq_find_relevance().

  mysql-test/r/fulltext.result
    1.29.1.20 05/02/16 03:13:01 dean@mysql.com +6 -0
    Test case for bug#8522, to test for out of bounds memory access in ft_nlq_find_relevance().

ChangeSet
  1.2055.511.1 05/02/16 10:01:05 guilhem@mysql.com +1 -0
  rpl_multi_query.test: disable ps-protocol as PS don't support multi-queries

  mysql-test/t/rpl_multi_query.test
    1.2 05/02/16 09:54:06 guilhem@mysql.com +3 -0
    disable ps-protocol as PS don't support multi-queries

ChangeSet
  1.2055.510.1 05/02/15 21:03:17 igor@rurik.mysql.com +3 -0
  Manual merge

  mysql-test/r/delete.result
    1.21 05/02/15 21:03:13 igor@rurik.mysql.com +9 -9
    Manual merge

  sql/sql_delete.cc
    1.133 05/02/15 20:50:29 igor@rurik.mysql.com +0 -0
    Auto merged

  mysql-test/t/delete.test
    1.19 05/02/15 20:50:29 igor@rurik.mysql.com +0 -0
    Auto merged

  mysql-test/r/delete.result
    1.6.3.2 05/02/15 20:50:29 igor@rurik.mysql.com +0 -0
    Turn off EOLN_NATIVE flag

ChangeSet
  1.1346.805.1 05/02/15 18:45:42 igor@rurik.mysql.com +3 -0
  delete.result, delete.test:
    Added a test case for bug #8392.
  sql_delete.cc:
    Fixed bug #8392.
    The bug caused a crash for a delete statement with ORDER BY
    that explicitly referred to the modified table.

  mysql-test/r/delete.result
    1.6.3.1 05/02/15 18:44:57 igor@rurik.mysql.com +9 -0
    Added a test case for bug #8392.

  mysql-test/t/delete.test
    1.7.1.5 05/02/15 18:44:24 igor@rurik.mysql.com +11 -0
    Added a test case for bug #8392.

  sql/sql_delete.cc
    1.74.1.35 05/02/15 18:43:07 igor@rurik.mysql.com +1 -0
    Fixed bug #8392.
    The bug caused a crash for a delete statement with ORDER BY
    that explicitly referred to the modified table.

  sql/mysqld.cc
    1.297.1.226 05/02/15 18:17:48 jimw@mysql.com +22 -0
    Add code to output a special message when we get a segfault when calling
    initgroups() to explain the problem.

ChangeSet
  1.2055.504.5 05/02/15 17:30:40 dean@mysql.com +2 -0
  Merge mysql.com:/home/dellis/mysqlab/bk/mysql-4.0
  into mysql.com:/home/dellis/bkl/bug-4.1

  myisam/ft_nlq_search.c
    1.38 05/02/15 17:30:39 dean@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.362.1.6 05/02/15 17:30:34 dean@mysql.com +0 -0
    auto-union

ChangeSet
  1.1346.802.3 05/02/15 17:27:23 dean@mysql.com +2 -0
  ft_nlq_search.c:
    Added bounds check to avoid accessing unallocated FT_DOC array.  (BUG #8522)

  BitKeeper/etc/logging_ok
    1.206.1.122 05/02/15 17:27:23 dean@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  myisam/ft_nlq_search.c
    1.14.1.7 05/02/15 17:26:19 dean@mysql.com +6 -1
    Added bounds check to avoid accessing unallocated FT_DOC array.  (BUG #8522)

ChangeSet
  1.2055.509.1 05/02/15 13:36:46 jimw@mysql.com +4 -0
  Always lowercase database names from 'host' and 'db' grant tables when they
  are loaded and lower_case_table_names is set, but issue a warning when it is
  done. (Bug #7989)

  sql/sql_acl.cc
    1.158 05/02/15 12:28:57 jimw@mysql.com +31 -2
    Lowercase database names in 'host' and 'db' grant tables when loading,
    but issue a warning to the log about them.

  mysql-test/r/lowercase_table_grant.result
    1.1 05/02/15 12:28:48 jimw@mysql.com +23 -0

  mysql-test/r/lowercase_table_grant.result
    1.0 05/02/15 12:28:48 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-7989/mysql-test/r/lowercase_table_grant.result

  mysql-test/t/lowercase_table_grant.test
    1.1 05/02/15 12:28:40 jimw@mysql.com +25 -0

  mysql-test/t/lowercase_table_grant-master.opt
    1.1 05/02/15 12:28:40 jimw@mysql.com +1 -0

  mysql-test/t/lowercase_table_grant.test
    1.0 05/02/15 12:28:40 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-7989/mysql-test/t/lowercase_table_grant.test

  mysql-test/t/lowercase_table_grant-master.opt
    1.0 05/02/15 12:28:40 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-7989/mysql-test/t/lowercase_table_grant-master.opt

ChangeSet
  1.2055.483.2 05/02/15 11:31:01 jimw@mysql.com +2 -0
  Only escape the first character in a sequence of bytes that appears to be
  a multibyte character, but was not a valid multibyte character. Refinement
  of fix for Bug #8378.

  mysys/charset.c
    1.132 05/02/15 09:46:50 jimw@mysql.com +6 -9
    Fix to only escape the first character in a sequence that appears
    to be a multibyte character, but was not a valid one.

  tests/mysql_client_test.c
    1.148 05/02/15 09:46:12 jimw@mysql.com +10 -10
    Fix test (and fix number) for Bug #8378

ChangeSet
  1.2055.507.2 05/02/15 15:57:21 marko@hundin.mysql.fi +1 -0
  Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
  into hundin.mysql.fi:/home/marko/mysql-4.1

ChangeSet
  1.2055.507.1 05/02/15 15:12:50 guilhem@mysql.com +1 -0
  Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/mysql_src/mysql-4.1-clean

  sql/sql_parse.cc
    1.423 05/02/15 15:12:44 guilhem@mysql.com +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.182 05/02/15 15:57:13 marko@hundin.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.2055.506.1 05/02/15 14:13:18 joerg@mysql.com +1 -0
  1) Tag the 4.1.10 released version:  bk tag -r 1.2159.8.1 "mysql-4.1.10"
  2) Raise the version number to 4.1.11.

  configure.in
    1.351 05/02/15 14:13:14 joerg@mysql.com +2 -2
    Raise the version number from 4.1.10 to 4.1.11.

ChangeSet
  1.2055.504.2 05/02/15 14:49:52 monty@mysql.com +3 -0
  Merge with 4.0

  sql/sql_parse.cc
    1.421.1.1 05/02/15 14:49:50 monty@mysql.com +3 -15
    Merge with 4.0 to get bug fix for reconnect problem

  mysql-test/t/group_by.test
    1.32 05/02/15 14:49:50 monty@mysql.com +0 -0
    Use local file

  vio/viosocket.c
    1.28 05/02/15 14:43:25 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.804.1 05/02/15 14:42:13 monty@mysql.com +3 -0
  Better bug fix for #5569: "Incorrect "Access Denied" error with SAME login DIFFERENT host"
  This fixes also the reverse lookup bug introduced by the previous patch
  

  vio/viosocket.c
    1.15.1.6 05/02/15 14:42:11 monty@mysql.com +12 -0
    Added function comment

  sql/sql_parse.cc
    1.218.44.1 05/02/15 14:42:11 monty@mysql.com +13 -10
    Better bug fix for #5569: "Incorrect "Access Denied" error with SAME login DIFFERENT host"
    This fixes also the reverse lookup bug introduced by the previous patch
    

  mysql-test/t/group_by.test
    1.13.1.14 05/02/15 14:42:11 monty@mysql.com +0 -1
    Remove empty line

ChangeSet
  1.2055.504.1 05/02/15 15:01:20 ramil@mysql.com +1 -0
  A fix. "(int) var" type cast doesn't work correctly for uint32 var
  on some 64-bit platforms (e.g. IRIX, non-debug build).

  sql/item_strfunc.cc
    1.214 05/02/15 15:01:14 ramil@mysql.com +8 -4
    A fix. "(int) var" type cast doesn't work correctly for uint32 var
    on some 64-bit platforms (e.g. IRIX, non-debug build).

ChangeSet
  1.1346.803.1 05/02/15 11:02:01 mats@mysql.com +2 -0
  Bug#7879: Using TL_READ_NO_INSERT locks instead of TL_READ locks when 
  reading tables in "complex" SQL statements. If inserts happen in a
  table being read, the statements have no serialization order and the
  change can therefore not be reproduced on the slave.

  sql/sql_yacc.yy
    1.145.22.1 05/02/15 11:01:58 mats@mysql.com +2 -2
    Switching to using T_READ_NO_INSERT when the binlog is used.

  sql/sql_update.cc
    1.54.9.1 05/02/15 11:01:58 mats@mysql.com +4 -1
    Switching to using T_READ_NO_INSERT when the binlog is used.

ChangeSet
  1.1346.802.1 05/02/15 11:16:17 marko@hundin.mysql.fi +1 -0
  InnoDB: Create temporary files in the MySQL tmpdir instead of $TMPDIR.
  (Bug #5822)

  sql/ha_innodb.cc
    1.73.1.159 05/02/15 11:16:13 marko@hundin.mysql.fi +1 -1
    innobase_mysql_tmpfile(): pass mysql_tmpdir to create_temp_file(),
    so that the MySQL startup option tmpdir will be honored instead of
    the environment variable TMPDIR. (Bug #5822)

ChangeSet
  1.2055.1.112 05/02/14 20:33:14 jimw@mysql.com +4 -0
  Allow hostnames that are IP addresses with a netmask even when
  running with --skip-name-resolve. (Bug #8471)

  mysql-test/t/skip_name_resolve.test
    1.1 05/02/14 20:32:41 jimw@mysql.com +5 -0

  mysql-test/t/skip_name_resolve-master.opt
    1.1 05/02/14 20:32:41 jimw@mysql.com +1 -0

  mysql-test/r/skip_name_resolve.result
    1.1 05/02/14 20:32:41 jimw@mysql.com +7 -0

  mysql-test/t/skip_name_resolve.test
    1.0 05/02/14 20:32:41 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-8471/mysql-test/t/skip_name_resolve.test

  mysql-test/t/skip_name_resolve-master.opt
    1.0 05/02/14 20:32:41 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-8471/mysql-test/t/skip_name_resolve-master.opt

  mysql-test/r/skip_name_resolve.result
    1.0 05/02/14 20:32:41 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-8471/mysql-test/r/skip_name_resolve.result

  sql/sql_acl.cc
    1.156.1.1 05/02/14 20:31:46 jimw@mysql.com +1 -1
    Add '/' to list of characters that doesn't trigger a need for resolving the
    hostname, so that the IP mask syntax works with skip-name-resolve.

  sql/sql_acl.cc
    1.157 05/02/14 18:57:39 jimw@mysql.com +8 -0
    When lower_case_table_names is set, lowercase the database names read
    from the grant tables.

ChangeSet
  1.2055.503.1 05/02/15 03:55:44 konstantin@mysql.com +5 -0
  Fix signatures of placement operator delete in places where placement 
  delete is declared. As we don't use exceptions placement delete is never 
  called and the fix only affects numerous warnings when
  compiling with MS Visual C++.
  For more info see http://www.gotw.ca/gotw/010.htm.

  sql/sql_string.h
    1.54 05/02/15 03:55:37 konstantin@mysql.com +1 -1
    Fix the signature of placement operator delete for class Sql_string

  sql/sql_list.h
    1.29 05/02/15 03:55:37 konstantin@mysql.com +2 -2
    Fix the signature of placement operator delete for class Sql_alloc

  sql/sql_lex.h
    1.182 05/02/15 03:55:37 konstantin@mysql.com +1 -1
    Fix the signature of placement operator delete for class LEX

  sql/sql_class.cc
    1.193.1.9 05/02/15 03:55:37 konstantin@mysql.com +2 -0
    Add placement delete operator to suppress a warning under Windows.

  sql/item.h
    1.167 05/02/15 03:55:37 konstantin@mysql.com +1 -1
    Fix the signature of placement operator delete for class Item.

ChangeSet
  1.2055.502.1 05/02/14 23:47:17 guilhem@mysql.com +8 -0
  1) undoing my fix for BUG#8055 "Trouble with replication from temporary tables and ignores"
  and fixing it another way (per Monty; a simpler solution which does not increase the number
  of binlog events is to always execute DROP TEMPORARY TABLE IF EXISTS on slave). A new test rpl_drop_temp.
  2) fixing BUG#8436 "Multiple "stacked" SQL statements cause replication to stop" by setting
  thd->query_length to the length of the query being executed, not counting the next queries
  if this is a multi-query. Should also improve display of SHOW PROCESSLIST. A new test rpl_multi_query.
  

  mysql-test/t/rpl_multi_query.test
    1.1 05/02/14 23:46:50 guilhem@mysql.com +26 -0

  mysql-test/t/rpl_multi_query.test
    1.0 05/02/14 23:46:50 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.1-clean/mysql-test/t/rpl_multi_query.test

  mysql-test/t/rpl_drop_temp.test
    1.1 05/02/14 23:46:49 guilhem@mysql.com +13 -0

  mysql-test/t/rpl_drop_temp.test
    1.0 05/02/14 23:46:49 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.1-clean/mysql-test/t/rpl_drop_temp.test

  mysql-test/t/rpl_drop_temp-slave.opt
    1.1 05/02/14 23:46:48 guilhem@mysql.com +2 -0

  mysql-test/t/rpl_drop_temp-slave.opt
    1.0 05/02/14 23:46:48 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.1-clean/mysql-test/t/rpl_drop_temp-slave.opt

  mysql-test/r/rpl_multi_query.result
    1.1 05/02/14 23:46:47 guilhem@mysql.com +32 -0

  mysql-test/r/rpl_multi_query.result
    1.0 05/02/14 23:46:47 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.1-clean/mysql-test/r/rpl_multi_query.result

  mysql-test/r/rpl_drop_temp.result
    1.1 05/02/14 23:46:45 guilhem@mysql.com +12 -0

  sql/sql_parse.cc
    1.422 05/02/14 23:46:45 guilhem@mysql.com +23 -3
    1) set thd->query_length to the length of the query being executed, excluding the other next queries
    if this is a multi-query. The setting happens ASAP, ie. just after we know it's a multi-query, ie. just after yyparse().
    Don't include the ';' in thd->query_length, because this is not good for storage in binlog.
    2) always execute a DROP TEMPORARY TABLE IF EXISTS on slave, don't skip it even if --replicate-ignore-table

  sql/sql_base.cc
    1.243.1.1 05/02/14 23:46:45 guilhem@mysql.com +35 -31
    undoing the fix I had made some days ago: we are back to one single DROP TEMPORARY TABLE for all temp tables.

  mysql-test/r/rpl_drop_temp.result
    1.0 05/02/14 23:46:45 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.1-clean/mysql-test/r/rpl_drop_temp.result

  mysql-test/r/drop_temp_table.result
    1.10 05/02/14 23:46:44 guilhem@mysql.com +1 -3
    back to one single DROP

ChangeSet
  1.2055.501.2 05/02/14 23:49:01 sergefp@mysql.com +3 -0
  Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/psergey/mysql-4.1-bug8218

  sql/sql_select.cc
    1.380.2.22 05/02/14 23:48:59 sergefp@mysql.com +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.141 05/02/14 23:48:59 sergefp@mysql.com +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.162 05/02/14 23:48:59 sergefp@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2055.498.2 05/02/14 23:45:48 sergefp@mysql.com +2 -0
  Remove redundant DROP TABLE from test case

  mysql-test/t/subselect.test
    1.139.1.2 05/02/14 23:45:45 sergefp@mysql.com +0 -1
    Remove redundant DROP TABLE from test case

  mysql-test/r/subselect.result
    1.160.1.2 05/02/14 23:45:45 sergefp@mysql.com +0 -7
    Remove redundant DROP TABLE from test case

ChangeSet
  1.2055.1.111 05/02/14 10:57:47 jimw@mysql.com +1 -0
  Merge bk-internal:/home/bk/mysql-4.1
  into mysql.com:/home/jimw/my/mysql-4.1-clean

  BitKeeper/triggers/post-commit
    1.31 05/02/14 10:57:46 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.1.714 05/02/14 18:39:33 mats@mysql.com +3 -0
  Bug#8412: For replication to work correctly, the prologue and 
  epilogue to an SQL statement should not have an error code even
  when the SQL statement itself has an error code.

  sql/log.cc
    1.80.1.81 05/02/14 18:39:32 mats@mysql.com +14 -1
    Setting error code to 0 for SQL statement prologue and epilogue.

  mysql-test/t/rpl_insert_id.test
    1.1.1.6 05/02/14 18:39:32 mats@mysql.com +16 -0
    Adding test to ensure that slave handles error statement gracefully.

  mysql-test/r/rpl_insert_id.result
    1.2.1.5 05/02/14 18:39:31 mats@mysql.com +5 -0
    Adding test to ensure that slave handles error statement gracefully.

ChangeSet
  1.2055.500.2 05/02/14 18:54:12 svoj@mysql.com +4 -0
  Bug#8351
  Fix for crash when using a double quote in boolean fulltext query.

  BitKeeper/etc/logging_ok
    1.362.1.5 05/02/14 18:54:12 svoj@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  mysql-test/t/fulltext.test
    1.70 05/02/14 18:12:06 svoj@mysql.com +8 -0
    Added a test case for bug #8351.

  mysql-test/r/fulltext.result
    1.72 05/02/14 18:12:06 svoj@mysql.com +7 -0
    Added a test case for bug #8351.

  myisam/ft_boolean_search.c
    1.87 05/02/14 18:12:06 svoj@mysql.com +14 -22
    Bug#8351
    Fix for crash when using a double quote in boolean fulltext query.

ChangeSet
  1.2055.500.1 05/02/14 11:14:04 serg@serg.mylan +1 -0
  remove passwordless remote accounts from windows distro

  scripts/mysql_create_system_tables.sh
    1.17.1.1 05/02/14 11:13:58 serg@serg.mylan +1 -3
    remove passwordless remote accounts from windows distro

ChangeSet
  1.2055.492.12 05/02/14 11:12:39 lenz@mysql.com +1 -0
  - fixed the compilation comments
  - fixed a broken changelog entry

  support-files/mysql.spec.sh
    1.87 05/02/14 11:12:33 lenz@mysql.com +8 -2
    - fixed the compilation comments
    - fixed a broken changelog entry

ChangeSet
  1.2055.478.18 05/02/14 08:28:47 joreland@mysql.com +1 -0
  wl1292 - ndb autotest
  fix log reports

  ndb/test/run-test/make-html-reports.sh
    1.5 05/02/14 08:28:44 joreland@mysql.com +1 -2
    fix log reports

ChangeSet
  1.2055.499.1 05/02/14 02:06:21 bell@sanja.is.com.ua +3 -0
  removed wrong distinct UNION detection (BUG#6565)

  sql/sql_derived.cc
    1.78 05/02/14 02:05:39 bell@sanja.is.com.ua +8 -2
    removed wrong distinct UNION detection

  mysql-test/t/derived.test
    1.45 05/02/14 02:05:39 bell@sanja.is.com.ua +12 -0
    test of union subquery in the FROM clause with complex distinct/all

  mysql-test/r/derived.result
    1.50 05/02/14 02:05:38 bell@sanja.is.com.ua +19 -0
    test of union subquery in the FROM clause with complex distinct/all

ChangeSet
  1.2055.492.11 05/02/13 22:35:52 acurtis@pcgem.rdg.cyberkinetica.com +3 -0
  Bug#2435
    Alter handling for UNION syntax
    Tests for UNION and parentheses

  sql/sql_yacc.yy
    1.378 05/02/13 22:35:36 acurtis@pcgem.rdg.cyberkinetica.com +28 -7
    Bug#2435
      Amend handling of UNION with parentheses.

  mysql-test/t/union.test
    1.80 05/02/13 22:35:36 acurtis@pcgem.rdg.cyberkinetica.com +12 -0
    Bug#2435
      Tests for UNION and parentheses

  mysql-test/r/union.result
    1.86 05/02/13 22:35:36 acurtis@pcgem.rdg.cyberkinetica.com +22 -0
    Bug#2435
      Tests for UNION and parentheses

ChangeSet
  1.2055.492.10 05/02/13 21:05:18 heikki@hundin.mysql.fi +2 -0
  Merge hundin.mysql.fi:/home/heikki/mysql-4.0
  into hundin.mysql.fi:/home/heikki/mysql-4.1

  sql/sql_cache.cc
    1.90 05/02/13 21:05:10 heikki@hundin.mysql.fi +0 -0
    Auto merged

  innobase/row/row0mysql.c
    1.88 05/02/13 21:05:10 heikki@hundin.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.1.713 05/02/13 21:00:07 heikki@hundin.mysql.fi +1 -0
  row0mysql.c:
    Backport the column prefix memory corruption fix from 5.0

  innobase/row/row0mysql.c
    1.39.1.39 05/02/13 20:59:58 heikki@hundin.mysql.fi +1 -1
    Backport the column prefix memory corruption fix from 5.0

ChangeSet
  1.2055.498.1 05/02/12 22:58:54 sergefp@mysql.com +4 -0
  Fix for BUG#8218:
  Remove TMP_TABLE_PARAM::copy_funcs_it. TMP_TABLE_PARAM is a member of JOIN which is 
  copied via memcpy, and List_iterator_fast TMP_TABLE_PARAM::copy_funcs_it ends up 
  pointing to the wrong List.

  sql/sql_select.cc
    1.380.9.1 05/02/12 22:58:51 sergefp@mysql.com +1 -2
    Fix for BUG#8218: Create/use own iterator since TMP_TABLE_PARAM::copy_funcs_it is removed.

  sql/sql_class.h
    1.277 05/02/12 22:58:51 sergefp@mysql.com +6 -3
    Fix for BUG#8218:
    Remove TMP_TABLE_PARAM::copy_funcs_it. TMP_TABLE_PARAM is a member of JOIN which is 
    copied via memcpy, and List_iterator_fast TMP_TABLE_PARAM::copy_funcs_it ends up 
    pointing to the wrong List.

  mysql-test/t/subselect.test
    1.139.1.1 05/02/12 22:58:51 sergefp@mysql.com +102 -0
    Testcase for BUG#8218

  mysql-test/r/subselect.result
    1.160.1.1 05/02/12 22:58:51 sergefp@mysql.com +107 -0
    Testcase for BUG#8218

ChangeSet
  1.2055.497.1 05/02/12 19:17:33 guilhem@mysql.com +1 -0
  new static archive_inited variable, so that archive_db_end() will do something only if archive_db_init() was run before
  (protection against destroying uninited mutex in the case where mysqld fails early at startup (before archive_db_init() was called)
  and then calls archive_db_end() to clean up).

  sql/examples/ha_archive.cc
    1.20 05/02/12 19:17:22 guilhem@mysql.com +9 -2
    new static archive_inited variable, so that archive_db_end() will do something only if archive_db_init() was run before.

