ChangeSet
  1.2105 06/03/04 23:04:48 konstantin@mysql.com +2 -0
  Undo the patch for Bug#16144 "mysql_stmt_attr_get type error",
  it breaks binary compatibility. The patch will be left intact
  in 5.1. Warning: this changeset should be null-merged into 5.1.
  A separate commit in order to push into the release clone of 
  5.0.19.

  tests/mysql_client_test.c
    1.178 06/03/04 23:04:39 konstantin@mysql.com +0 -19
    Undo the patch for Bug#16144

  libmysql/libmysql.c
    1.238 06/03/04 23:04:39 konstantin@mysql.com +1 -1
    Undo the patch for Bug#16144

ChangeSet
  1.2104 06/03/04 16:55:06 dlenev@mysql.com +4 -0
  Fix for bug #17866 "Problem with renaming table with triggers with fully
  qualified subject table" which was introduced during work on bug #13525
  "Rename table does not keep info of triggers".
  
  The bug was caused by the fact that during reconstruction of CREATE TRIGGER
  statement stored in .TRG file which happened during RENAME TABLE we damaged
  trigger definition in case when it contained fully qualified name of subject
  table (see comment for sql_yacc.yy for more info).

  sql/sql_yacc.yy
    1.456 06/03/04 16:55:00 dlenev@mysql.com +2 -2
    trigger_tail:
      In this rule we can't rely on using remember_end token after table_ident token,
      since value returned depends on whether table name is fully qualified or not.
      So instead of trying to get pointer to the end of table identifier we use
      pointer to the beginning of FOR lexeme.

  sql/sql_trigger.cc
    1.44 06/03/04 16:54:59 dlenev@mysql.com +1 -0
    Table_triggers_list::change_table_name_in_triggers():
      Instead of trying to use pointer to the end of subject table identifier
      we use pointer to the beginning of FOR lexeme now, so during reconstruction
      of CREATE TRIGGER statement in this function we need to add extra space
      before part which begins with FOR to get nice trigger definition.

  mysql-test/t/trigger.test
    1.37 06/03/04 16:54:59 dlenev@mysql.com +9 -5
    Added test for bug #17866 "Problem with renaming table with triggers with fully
    qualified subject table".

  mysql-test/r/trigger.result
    1.32 06/03/04 16:54:59 dlenev@mysql.com +18 -12
    Added test for bug #17866 "Problem with renaming table with triggers with fully
    qualified subject table".

ChangeSet
  1.2100.1.1 06/03/03 16:26:38 cmiller@zippy.(none) +3 -0
  Bug#16859 involves truncating column data at NUL characters.  Instead, the 
  client will now substitute spaces for NULs, so that the grid isn't messed up
  due to silently consumed NULs and that the full field is shown.

  mysql-test/t/mysql.test
    1.7 06/03/03 16:26:34 cmiller@zippy.(none) +5 -0
    Add a test. 

  mysql-test/r/mysql.result
    1.6 06/03/03 16:26:34 cmiller@zippy.(none) +7 -0
    Add a test.

  client/mysql.cc
    1.197 06/03/03 16:26:34 cmiller@zippy.(none) +47 -8
    For non-numbers, print each character at a time, instead of using the 
    fprintf() facility, which interprets an array of chars as a C string, which 
    is necessarily NUL terminated.  We mustn't terminate on NULs, and since we 
    know the length of the data, we needn't.

ChangeSet
  1.2102 06/03/03 20:30:28 kent@mysql.com +1 -0
  mysql.spec.sh:
    Use installed libz.a to avoid hard to solve static linking problems

  support-files/mysql.spec.sh
    1.133 06/03/03 20:29:52 kent@mysql.com +9 -1
    Use installed libz.a to avoid hard to solve static linking problems

ChangeSet
  1.2101 06/03/03 18:51:13 pem@mysql.com +3 -0
  Merge mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-runtime
  into  mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-release

  mysql-test/t/sp.test
    1.176 06/03/03 18:51:10 pem@mysql.com +0 -0
    SCCS merged

  mysql-test/r/sp.result
    1.187 06/03/03 18:51:10 pem@mysql.com +0 -0
    SCCS merged

  sql/sql_yacc.yy
    1.455 06/03/03 18:49:15 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2099 06/03/03 15:29:39 gluh@eagle.intranet.mysql.r18.ru +3 -0
  Fix for bug#17826 'type_decimal' fails with ps-protocol
   removed unnecessary calculation of cache value 
   otherwise Join::preapre tries to calculate 
   undefined values(filed values)

  sql/item_cmpfunc.cc
    1.193 06/03/03 15:28:16 gluh@mysql.com +0 -6
    Fix for bug#17826 'type_decimal' fails with ps-protocol
     removed unnecessary calculation of cache value 
     otherwise Join::preapre tries to calculate 
     undefined values(filed values)

  mysql-test/t/type_decimal.test
    1.31 06/03/03 15:28:16 gluh@mysql.com +8 -0
    Fix for bug#17826 'type_decimal' fails with ps-protocol
     test case, this test case reproduce the same bug but without PS protocol

  mysql-test/r/type_decimal.result
    1.41 06/03/03 15:28:16 gluh@mysql.com +7 -0
    Fix for bug#17826 'type_decimal' fails with ps-protocol
     test case, this test case reproduce the same bug but without PS protocol

ChangeSet
  1.2098 06/03/03 03:27:27 kent@mysql.com +1 -0
  mysql.spec.sh:
    Don't create empty embedded RPM, bug#15769

  support-files/mysql.spec.sh
    1.132 06/03/03 03:26:21 kent@mysql.com +24 -20
    Don't create empty embedded RPM, bug#15769

ChangeSet
  1.2095.1.1 06/03/02 20:49:10 cmiller@zippy.(none) +3 -0
  Expanding a binary field should result in 0x00-filled positions, not 0x20 
  (ASCII space).  For Bug#16857.

  sql/field_conv.cc
    1.53 06/03/02 20:48:23 cmiller@zippy.(none) +17 -1
    Bug#16857:  Do not expand BINARY fields as if they are strings (which 
    presumably /should/ be filled with spaces).  Instead, fill BINARY fields
    with 0x00 bytes.

  mysql-test/t/binary.test
    1.16 06/03/02 20:48:23 cmiller@zippy.(none) +12 -0
    Expanding a binary field should result in 0x00-filled positions, not 0x20 
    (ASCII space).  For Bug#16857.
    

  mysql-test/r/binary.result
    1.21 06/03/02 20:48:23 cmiller@zippy.(none) +19 -0
    Expanding a binary field should result in 0x00-filled positions, not 0x20 
    (ASCII space).  For Bug#16857.
    

ChangeSet
  1.2096 06/03/03 02:46:47 kent@mysql.com +1 -0
  Makefile.am:
    Use libtool convenience lib, to access get_password object correctly, bug#17155

  server-tools/instance-manager/Makefile.am
    1.31 06/03/03 02:46:23 kent@mysql.com +6 -5
    Use libtool convenience lib, to access get_password object correctly, bug#17155

ChangeSet
  1.2095 06/03/02 14:54:04 pem@mysql.com +4 -0
  Fixed BUG#17476: Stored procedure not returning data when it is called first
                   time per connection
    Removed const_string() method from Item_string (it was only used in one
    place, in a bad way). Defer possible SP variable, and access data directly
    instead, in date_format item.

  sql/item_timefunc.cc
    1.103 06/03/02 14:54:00 pem@mysql.com +10 -3
    Must defer a (possible) local SP variable to use max_length and str_value
    in Item_func_date_format::fix_length_and_dec(), and refer to str_value
    directly without the const_string() method (now removed); the cast didn't
    work in all cases anyway.

  sql/item.h
    1.189 06/03/02 14:54:00 pem@mysql.com +0 -1
    Removed const_string() from Item_string.
    It was only used in one place, and we can just use str_value in Item directly.

  mysql-test/t/sp.test
    1.174.1.4 06/03/02 14:54:00 pem@mysql.com +25 -0
    New test case (BUG#17476)

  mysql-test/r/sp.result
    1.185.1.4 06/03/02 14:54:00 pem@mysql.com +19 -0
    Updated results for new test (BUG#17476).

ChangeSet
  1.2094 06/03/02 11:09:16 joerg@mysql.com +0 -0
  Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/merge-5.0

ChangeSet
  1.2093 06/03/02 11:04:05 joerg@mysql.com +2 -0
  Merge mysql.com:/M41/merge-4.1 into mysql.com:/M50/merge-5.0

  scripts/make_binary_distribution.sh
    1.105 06/03/02 11:04:02 joerg@mysql.com +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.297 06/03/02 11:04:01 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2089.1.10 06/03/02 11:01:58 msvensson@neptunus.(none) +2 -0
  Bug#17279 user with no global privs and with create priv in db can create
  database
   - Fix test case for systems with "lowercase names"

  mysql-test/t/grant2.test
    1.32 06/03/02 11:01:54 msvensson@neptunus.(none) +2 -1
    Fix for system with "lowercase names", allow error 1007 to be returned

  mysql-test/r/grant2.result
    1.26 06/03/02 11:01:54 msvensson@neptunus.(none) +1 -1
    Fix for system with "lowercase names", allow error 1007 to be returned

ChangeSet
  1.2089.1.9 06/03/02 10:55:55 msvensson@neptunus.(none) +1 -0
  Make the define start at "start of line"

  sql/net_serv.cc
    1.88 06/03/02 10:55:51 msvensson@neptunus.(none) +1 -1
    Make the define start at "start of line"

ChangeSet
  1.1616.2144.130 06/03/02 10:48:46 joerg@mysql.com +1 -0
  Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1

  scripts/make_binary_distribution.sh
    1.55.8.1 06/03/02 10:48:44 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2092 06/03/02 10:31:42 joerg@mysql.com +1 -0
  Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/M50/mysql-5.0

  mysql-test/mysql-test-run.sh
    1.296 06/03/02 10:31:40 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2144.129 06/03/01 18:51:33 paul@snake-hub.snake.net +1 -0
  Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
  into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478

  mysql-test/README
    1.12 06/03/01 18:51:31 paul@snake-hub.snake.net +0 -0
    SCCS merged

ChangeSet
  1.1616.2499.3 06/03/01 18:38:19 paul@snake-hub.snake.net +1 -0
  Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
  into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478

  mysql-test/README
    1.10.1.2 06/03/01 18:38:15 paul@snake-hub.snake.net +0 -0
    Auto merged

ChangeSet
  1.1346.869.3 06/03/01 18:37:41 paul@snake-hub.snake.net +1 -0
  README:
    revise README.

  mysql-test/README
    1.5.1.3 06/03/01 18:37:29 paul@snake-hub.snake.net +33 -27
    revise README.

ChangeSet
  1.1346.869.2 06/03/01 17:55:10 paul@snake-hub.snake.net +1 -0
  README.gcov:
    Revise README.gcov.

  mysql-test/README.gcov
    1.2 06/03/01 17:54:57 paul@snake-hub.snake.net +9 -7
    Revise README.gcov.

ChangeSet
  1.1616.2499.1 06/03/01 17:41:34 paul@snake-hub.snake.net +1 -0
  Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
  into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478

  mysql-test/README
    1.10.1.1 06/03/01 17:41:29 paul@snake-hub.snake.net +0 -15
    Auto merged

ChangeSet
  1.1616.2144.128 06/03/01 17:37:49 paul@snake-hub.snake.net +1 -0
  Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
  into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1

  mysql-test/README
    1.11 06/03/01 17:37:45 paul@snake-hub.snake.net +0 -15
    Auto merged

ChangeSet
  1.1346.869.1 06/03/01 17:37:07 paul@snake-hub.snake.net +1 -0
  README:
    Revise mysql-test README.

  mysql-test/README
    1.5.1.2 06/03/01 17:36:35 paul@snake-hub.snake.net +15 -3
    Revise mysql-test README.

ChangeSet
  1.1616.2144.127 06/03/01 17:43:16 joerg@mysql.com +1 -0
  Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/M41/comment-4.1

  mysql-test/mysql-test-run.sh
    1.208.1.54 06/03/01 17:43:12 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2089.1.1 06/03/01 17:43:55 aivanov@mysql.com +1 -0
  Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/alexi/bugs/mysql-5.0-merged

  sql/sql_db.cc
    1.127 06/03/01 17:43:51 aivanov@mysql.com +3 -3
    Merge

ChangeSet
  1.2087.3.2 06/03/01 15:22:47 msvensson@shellback.(none) +1 -0
  Dont' run the mysql_protocols on Windows

  mysql-test/t/mysql_protocols.test
    1.5 06/03/01 15:22:39 msvensson@shellback.(none) +2 -0
    Dont' run the mysql_protocols on Windows

ChangeSet
  1.2087.3.1 06/03/01 15:21:03 msvensson@shellback.(none) +1 -0
  Bug#2845 client fails to reconnect if using TCP/IP
   - Change to use non blocking read to empty channel in case of too large sd number
   - Don't check for too large socket number on Windows.

  sql/net_serv.cc
    1.87 06/03/01 15:20:57 msvensson@shellback.(none) +21 -5
    Windows does not need protection from sd >= FD_SETSIZE, it uses an array to store the sd's it should read from.
    Change the handler for when "net_data_is_ready" returns -1 to perform nonblocking read to empty the net.
    Only include that handler if HAVE_POLL is not defined  and not windows

ChangeSet
  1.2063.6.1 06/03/01 16:21:01 aivanov@mysql.com +1 -0
  Fixed BUG #16175: Memory leak in rpl_trigger.test
    Allocating/freeing memory for the db member of THD
    is wholy managed by slave thread.

  sql/sql_db.cc
    1.123.1.1 06/03/01 16:20:56 aivanov@mysql.com +10 -5
    Fixed BUG #16175: Memory leak in rpl_trigger.test
      Allocating/freeing memory for the db member of THD
      is wholy managed by slave thread.

ChangeSet
  1.2086.1.1 06/03/01 13:29:37 joerg@mysql.com +2 -0
  Manual merge of the added "--comment=<string>" option
  to both the Shell and the Perl vaerion of "mysql-test-run"-

  mysql-test/mysql-test-run.sh
    1.294.1.1 06/03/01 13:29:27 joerg@mysql.com +3 -3
    Manual merge

  mysql-test/mysql-test-run.pl
    1.73 06/03/01 13:29:27 joerg@mysql.com +1 -1
    Manual merge.

ChangeSet
  1.1616.2498.2 06/03/01 13:15:37 joerg@mysql.com +1 -0
  mysql-test/mysql-test-run.pl  :  Add a "--comment=<string>" option (backport from 5.1).

  mysql-test/mysql-test-run.pl
    1.8.8.1 06/03/01 13:15:33 joerg@mysql.com +11 -0
    Add a "--comment=<string>" option (backport from 5.1).
    Its sole purpose is to get logged, so that test evaluation gets easier.
    See "Do-compile" for how it is called, and "gen-build-status-page" for its effect.

ChangeSet
  1.1616.2498.1 06/03/01 13:10:59 joerg@mysql.com +1 -0
  Merge mysql.com:/M40/comment-4.0 into mysql.com:/M41/comment-4.1

  mysql-test/mysql-test-run.sh
    1.208.15.1 06/03/01 13:10:57 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2087.2.1 06/03/01 15:50:15 holyfoot@deer.(none) +4 -0
  bug #9088 (bigint WHERE fails)

  sql/item_cmpfunc.cc
    1.192 06/03/01 15:48:52 holyfoot@mysql.com +2 -1
    we can get unsigned field from the signed Item - from string
    like '1234'

  sql/item.h
    1.188 06/03/01 15:48:52 holyfoot@mysql.com +3 -2
    unsigned_arg is a separate parameter now

  mysql-test/t/bigint.test
    1.28 06/03/01 15:48:52 holyfoot@mysql.com +9 -0
    testcase

  mysql-test/r/bigint.result
    1.32 06/03/01 15:48:52 holyfoot@mysql.com +9 -0
    test result

ChangeSet
  1.1346.868.1 06/03/01 12:21:44 joerg@mysql.com +1 -0
  mysql-test/mysql-test-run.sh  :  Add a "--comment=<string>" option, to get it logged when the test is run.

  mysql-test/mysql-test-run.sh
    1.146.1.57 06/03/01 12:19:50 joerg@mysql.com +7 -0
    Add a "--comment=<string>" option, to get it logged when the test is run.
    The purpose is to allow a better analysis when generating the status page 
    ("gen-build-status-page").
    See "Do-compile" for how it is used.

ChangeSet
  1.2085.1.7 06/02/28 17:54:50 paul@snake-hub.snake.net +1 -0
  Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
  into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

  mysql-test/t/mysqltest.test
    1.38 06/02/28 17:54:45 paul@snake-hub.snake.net +0 -0
    Auto merged

ChangeSet
  1.1616.2144.126 06/02/28 17:54:11 paul@snake-hub.snake.net +1 -0
  mysqltest.test:
    Add real_sleep tests.

  mysql-test/t/mysqltest.test
    1.3.1.15 06/02/28 17:52:50 paul@snake-hub.snake.net +4 -0
    Add real_sleep tests.

ChangeSet
  1.2085.1.6 06/02/28 15:11:44 paul@snake-hub.snake.net +1 -0
  mysqltest.c:
    expand tab

  client/mysqltest.c
    1.215 06/02/28 15:11:12 paul@snake-hub.snake.net +1 -1
    expand tab

ChangeSet
  1.2085.1.5 06/02/28 15:09:45 paul@snake-hub.snake.net +3 -0
  Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
  into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

  mysql-test/r/mysqltest.result
    1.31 06/02/28 15:09:40 paul@snake-hub.snake.net +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.295 06/02/28 15:09:40 paul@snake-hub.snake.net +0 -0
    Auto merged

  client/mysqltest.c
    1.214 06/02/28 15:09:40 paul@snake-hub.snake.net +0 -0
    Auto merged

ChangeSet
  1.1616.2144.125 06/02/28 15:08:16 paul@snake-hub.snake.net +4 -0
  mysql-test-run.sh:
    Fix URLs.
  README:
    Fix URL.
  mysqltest.result:
    Update test result for real_sleep error message.
  mysqltest.c:
    Fix do_sleep() to print correct command name for real_sleep.

  mysql-test/mysql-test-run.sh
    1.208.1.53 06/02/28 15:07:53 paul@snake-hub.snake.net +2 -2
    Fix URLs.

  mysql-test/README
    1.10 06/02/28 15:07:46 paul@snake-hub.snake.net +1 -1
    Fix URL.

  mysql-test/r/mysqltest.result
    1.3.1.11 06/02/28 14:37:15 paul@snake-hub.snake.net +2 -0
    Update test result for real_sleep error message.

  client/mysqltest.c
    1.92.20.5 06/02/28 14:36:39 paul@snake-hub.snake.net +4 -3
    Fix do_sleep() to print correct command name for real_sleep.

ChangeSet
  1.2085.1.4 06/02/28 14:04:21 paul@snake-hub.snake.net +1 -0
  mysqltest.c:
    Fix reference to incorrect (non-existent) options in comment.

  client/mysqltest.c
    1.213 06/02/28 14:03:34 paul@snake-hub.snake.net +1 -1
    Fix reference to incorrect (non-existent) options in comment.

ChangeSet
  1.2085.1.3 06/02/28 14:01:16 paul@snake-hub.snake.net +1 -0
  Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
  into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

  client/mysqltest.c
    1.212 06/02/28 14:01:11 paul@snake-hub.snake.net +0 -0
    Auto merged

ChangeSet
  1.1616.2144.124 06/02/28 14:00:17 paul@snake-hub.snake.net +1 -0
  mysqltest.c:
    Correct/clarify comments.

  client/mysqltest.c
    1.92.20.4 06/02/28 13:59:49 paul@snake-hub.snake.net +9 -8
    Correct/clarify comments.

ChangeSet
  1.2085.1.2 06/02/28 12:19:30 paul@snake-hub.snake.net +1 -0
  mysqltest.c:
    Fix typos.

  client/mysqltest.c
    1.211 06/02/28 12:19:14 paul@snake-hub.snake.net +3 -3
    Fix typos.

ChangeSet
  1.2085.1.1 06/02/28 12:10:38 paul@snake-hub.snake.net +1 -0
  Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
  into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

  client/mysqltest.c
    1.210 06/02/28 12:10:16 paul@snake-hub.snake.net +2 -4
    y
    manual merge

ChangeSet
  1.1616.2144.123 06/02/28 12:01:24 paul@snake-hub.snake.net +1 -0
  mysqltest.c:
    Fix typos.

  client/mysqltest.c
    1.92.20.3 06/02/28 12:01:05 paul@snake-hub.snake.net +8 -8
    Fix typos.

ChangeSet
  1.2087.1.3 06/02/28 19:42:11 evgen@sunlight.local +1 -0
  Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
  into sunlight.local:/work_local/14169-bug-5.0-mysql

  tests/mysql_client_test.c
    1.177 06/02/28 19:42:10 evgen@sunlight.local +0 -0
    Auto merged

ChangeSet
  1.2063.5.1 06/02/28 19:30:30 evgen@moonbone.local +2 -0
  Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was 
  used
  
  In a simple queries a result of the GROUP_CONCAT() function was always of 
  varchar type.
  But if length of GROUP_CONCAT() result is greater than 512 chars and temporary
  table is used during select then the result is converted to blob, due to
  policy to not to store fields longer than 512 chars in tmp table as varchar
  fields.
  
  In order to provide consistent behaviour, result of GROUP_CONCAT() now
  will always be converted to blob if it is longer than 512 chars.
  Item_func_group_concat::field_type() is modified accordingly.

  tests/mysql_client_test.c
    1.175.1.1 06/02/28 19:29:57 evgen@moonbone.local +35 -0
    Added test case for bug#14169: type of group_concat() result changed to blob if tmp_table was used

  sql/item_sum.h
    1.98 06/02/28 19:29:47 evgen@moonbone.local +7 -0
    Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was 
    used
    The Item_func_group_concat::field_type() now returns FIELD_TYPE_BLOB if the result is longer than 512 chars.

ChangeSet
  1.2088 06/02/28 13:36:41 gluh@eagle.intranet.mysql.r18.ru +1 -0
  Fix for bug#17602 Server crash on AVG/SUM over DECIMAL column(2nd ver)
  The table may be corrupted and decimal columns may have invalid values in this case.
  To prevent crash we need to check that decimal column has allowable value.
  In case of invalid value generate warning and set the value to 0.

  strings/decimal.c
    1.67 06/02/28 13:36:35 gluh@mysql.com +13 -0
    Fix for bug#17602 Server crash on AVG/SUM over DECIMAL column(2nd ver)
    The table may be corrupted and decimal columns may have invalid values in this case.
    To prevent crash we need to check that decimal column has allowable value.
    In case of invalid value generate warning and set the value to 0.

ChangeSet
  1.2079.1.11 06/02/27 22:14:48 SergeyV@selena. +1 -0
  Postfix for #17595. few lines in a test were accidentally commented.
  Comments removed.

  mysql-test/t/skip_grants.test
    1.9 06/02/27 22:14:37 SergeyV@selena. +2 -2
    Postfix for #17595. few lines in a test were accidentally commented.
    Comments removed.

ChangeSet
  1.2087 06/02/27 19:26:31 lars@mysql.com +1 -0
  Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
  into  mysql.com:/users/lthalmann/bk/mysql-5.0-bug13418

  sql/field.h
    1.173 06/02/27 19:26:21 lars@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2079.8.3 06/02/27 18:34:04 lars@mysql.com +1 -0
  BUG#13418: Virtualized some functions so that Bit_field class will use correct cmp functions

  sql/field.h
    1.171.1.1 06/02/27 18:33:56 lars@mysql.com +5 -2
    Virtualized some functions so that Bit_field class will use correct cmp functions

ChangeSet
  1.2086 06/02/27 20:32:32 dlenev@mysql.com +1 -0
  Fix for trigger.test failures on pushbuild hosts introduced by fix for 
  bug #13525 "Rename table does not keep info of triggers".
  
  Now we use MYSQLTEST_VARDIR in order to be able to run this test in different
  vardir. Also improved cleanup after the test.

  mysql-test/t/trigger.test
    1.36 06/02/27 20:32:23 dlenev@mysql.com +4 -3
    Now we use MYSQLTEST_VARDIR in order to be able to run this test in different
    vardir. Also improved cleanup after the test.

ChangeSet
  1.2085 06/02/27 17:51:21 dlenev@mysql.com +1 -0
  Fixed test results after bad auto-merge.

ChangeSet
  1.2083 06/02/27 15:51:39 dlenev@mysql.com +5 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525

ChangeSet
  1.2079.8.2 06/02/27 16:56:25 SergeyV@selena. +2 -0
  Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  selena.:H:/MYSQL/src/#15943-mysql-5.0

ChangeSet
  1.2079.7.1 06/02/27 16:44:23 msvensson@neptunus.(none) +1 -0
  BUG#2845 client fails to reconnect if using TCP/IP
   - Use 'poll' if available
   - Check that sd <= FD_SETSIZE if using 'select'
   - Handle case when 'net_data_is_ready' returns -1, ie. sd > FD_SETSIZE and 'select' is used 

  sql/net_serv.cc
    1.86 06/02/27 16:44:19 msvensson@neptunus.(none) +25 -4
    Use 'poll' in favor of 'select' if avaliable
    This is to avoid the limitation with 'select' only being able to handle fd's with numbers <= 1024 as default.
    If 'poll' is not available use 'select' but check that we are not having a number higher than FD_SETSIZE
    Handle the case when 'net_data_is_ready' can't check if there is data to read, since the sd number is too high

ChangeSet
  1.2063.4.1 06/02/27 16:41:58 msvensson@devsrv-b.mysql.com +3 -0
  Bug#17279 user with no global privs and with create priv in db can create databases
   - Use binary charset in acl_cache, to make searches case sensitive
   - Add testcase 

  sql/sql_acl.cc
    1.188 06/02/27 16:41:51 msvensson@devsrv-b.mysql.com +3 -1
    Use binary charset for the acl_cache to make the hash lookups case sensitive.
    Thus denying user with access to "TESTDB" access to "TEStdb" 

  mysql-test/t/grant2.test
    1.31 06/02/27 16:41:50 msvensson@devsrv-b.mysql.com +35 -0
    Add test case for bug#17279, checking that user with access to TESTDB can't create TEStdb

  mysql-test/r/grant2.result
    1.25 06/02/27 16:41:50 msvensson@devsrv-b.mysql.com +22 -0
    Update test result

  mysql-test/r/ps.result
    1.61 06/02/27 17:51:11 dlenev@mysql.com +14 -0
    Fixed test results after bad auto-merge.

  mysql-test/t/view.test
    1.136 06/02/27 16:56:10 SergeyV@selena. +0 -0
    Auto merged

  mysql-test/r/view.result
    1.147 06/02/27 16:56:10 SergeyV@selena. +0 -0
    Auto merged

ChangeSet
  1.2040.1.3 06/02/27 16:52:14 SergeyV@selena. +1 -0
  Postfix for #15943. Explicit call of thd->clear_error() is added.

  sql/sql_show.cc
    1.309 06/02/27 16:52:05 SergeyV@selena. +2 -6
    Postfix for #15943. Explicit call of thd->clear_error() is added.

ChangeSet
  1.2079.1.10 06/02/27 16:30:14 SergeyV@selena. +3 -0
  project files update for win32 build

  VC++Files/sql/gen_lex_hash.vcproj
    1.1 06/02/27 16:30:04 SergeyV@selena. +158 -0
    gen_lex_hash project file is added for win32 build.

  VC++Files/sql/gen_lex_hash.vcproj
    1.0 06/02/27 16:30:04 SergeyV@selena. +0 -0
    BitKeeper file H:/MYSQL/src/#17595-mysql-5.0/VC++Files/sql/gen_lex_hash.vcproj

  VC++Files/sql/gen_lex_hash.dsp
    1.1 06/02/27 16:30:03 SergeyV@selena. +98 -0
    gen_lex_hash project file is added for win32 build.

  VC++Files/sql/gen_lex_hash.dsp
    1.0 06/02/27 16:30:03 SergeyV@selena. +0 -0
    BitKeeper file H:/MYSQL/src/#17595-mysql-5.0/VC++Files/sql/gen_lex_hash.dsp

  VC++Files/mysql.sln
    1.6 06/02/27 16:30:03 SergeyV@selena. +121 -83
    gen_lex_hash.vcproj is added into mysql.sln for win32 build.

ChangeSet
  1.2079.1.9 06/02/27 16:27:34 SergeyV@selena. +3 -0
  Fixes bug #17595. UDFs are not initialized when running mysqld with 
  --skip-grant-tables. However when deleting functions UDFs list was checked
  regardless of whther UDFs are initialized or not. Additional check is added
  into free_udf() and find_udf() functions to prevent possible runtime errors.

  sql/sql_udf.cc
    1.55 06/02/27 16:27:23 SergeyV@selena. +7 -0
    Fixes bug #17595. UDFs are not initialized when running mysqld with 
    --skip-grant-tables. However when deleting functions UDFs list was checked
    regardless of whther UDFs are initialized or not. Additional check is added
    into free_udf() and find_udf() functions to prevent possible runtime errors.

  mysql-test/t/skip_grants.test
    1.8 06/02/27 16:27:22 SergeyV@selena. +5 -2
    Test for #17595 patch.

  mysql-test/r/skip_grants.result
    1.7 06/02/27 16:27:21 SergeyV@selena. +3 -0
    Test result for #17595 patch.

  sql/sql_select.h
    1.107 06/02/27 15:51:34 dlenev@mysql.com +0 -2
    Manual merge.

  sql/sql_table.cc
    1.298 06/02/27 15:50:30 dlenev@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.529 06/02/27 15:50:30 dlenev@mysql.com +0 -0
    Auto merged

  sql/sql_base.cc
    1.329 06/02/27 15:50:29 dlenev@mysql.com +0 -0
    Auto merged

  sql/field.cc
    1.300 06/02/27 15:50:29 dlenev@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2079.6.1 06/02/27 10:29:55 msvensson@neptunus.(none) +3 -0
  Bug#16795 ndb_cache_multi2
   - Change && to ||
   - Check for return value != 0 in "ndb->init()"

  sql/ha_ndbcluster.cc
    1.234 06/02/27 10:29:51 msvensson@neptunus.(none) +1 -1
    && => ||, to call both the function "thd->store_global()" and "ndb->init()" 
    ndb_init returns 0 on sucess. Fail if not zero.

  mysql-test/t/ndb_cache_multi2.test
    1.5 06/02/27 10:29:51 msvensson@neptunus.(none) +8 -6
    Update test case
    - add printouts for what server the queries are from
    - Run the query from "while" once on server1 to cache it

  mysql-test/r/ndb_cache_multi2.result
    1.4 06/02/27 10:29:51 msvensson@neptunus.(none) +10 -14
    Update test result

ChangeSet
  1.2079.1.8 06/02/27 10:08:35 msvensson@neptunus.(none) +1 -0
  Bug#17716 Slave crash in net_clear on qnx
   - Set FD_SETSIZE before including "sys/select.h"

  include/my_global.h
    1.116 06/02/27 10:08:30 msvensson@neptunus.(none) +9 -0
    Define FD_SETSIZE on QNX before including "sys/select.h" or "sys/time.h". This defines number of bits in fd_set type used for 'select'

ChangeSet
  1.2079.1.7 06/02/26 23:36:53 msvensson@neptunus.(none) +1 -0
  Trace mysqlcheck to file mysqlcheck.trcae

  mysql-test/mysql-test-run.pl
    1.72 06/02/26 23:36:45 msvensson@neptunus.(none) +1 -1
    Let mysqlcheck have it's own trace file

ChangeSet
  1.2079.1.6 06/02/26 20:25:33 msvensson@neptunus.(none) +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  mysql-test/mysql-test-run.sh
    1.294 06/02/26 20:25:27 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2079.4.1 06/02/26 19:54:09 msvensson@neptunus.(none) +3 -0
  Look for and "convert" paths that start with $MYSQL_TMP_DIR

  mysql-test/mysql-test-run.sh
    1.292.1.1 06/02/26 19:54:05 msvensson@neptunus.(none) +1 -0
    Export $MYSQL_TMP_DIR

  mysql-test/mysql-test-run.pl
    1.71 06/02/26 19:54:05 msvensson@neptunus.(none) +1 -0
    Export $MYSQL_TMP_DIR

  client/mysqltest.c
    1.209 06/02/26 19:54:04 msvensson@neptunus.(none) +4 -2
    Also look for "$MYSQL_TMP_DIR" when looking for paths to convert

ChangeSet
  1.2082 06/02/26 21:20:13 dlenev@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
  into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525

  sql/sql_table.cc
    1.296.1.2 06/02/26 21:20:06 dlenev@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2075.2.2 06/02/26 20:25:24 dlenev@mysql.com +1 -0
  Fixed test for bug #13525 "Rename table does not keep info of triggers"
  after merging fix for it with main tree.

  mysql-test/r/trigger.result
    1.31 06/02/26 20:25:16 dlenev@mysql.com +10 -10
    Fixed test for bug #13525 "Rename table does not keep info of triggers"
    after merging fix for it with main tree.

ChangeSet
  1.2075.2.1 06/02/26 16:38:48 dlenev@mysql.com +6 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
  into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525

  mysql-test/t/trigger.test
    1.35 06/02/26 16:38:43 dlenev@mysql.com +0 -0
    SCCS merged

  mysql-test/r/trigger.result
    1.30 06/02/26 16:38:43 dlenev@mysql.com +0 -0
    SCCS merged

  sql/sql_yacc.yy
    1.453.1.2 06/02/26 16:32:52 dlenev@mysql.com +0 -0
    Auto merged

  sql/sql_trigger.h
    1.19 06/02/26 16:32:52 dlenev@mysql.com +0 -0
    Auto merged

  sql/sql_trigger.cc
    1.43 06/02/26 16:32:52 dlenev@mysql.com +0 -0
    Auto merged

  sql/sql_table.cc
    1.296.2.1 06/02/26 16:32:52 dlenev@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2079.3.5 06/02/25 17:46:30 monty@mysql.com +21 -0
  Fixed compiler warnings from gcc 4.0.2:
  - Added empty constructors and virtual destructors to many classes and structs
  - Removed some usage of the offsetof() macro to instead use C++ class pointers

  sql/tztime.h
    1.13 06/02/25 17:46:27 monty@mysql.com +1 -0
    Fixed compiler warnings from gcc 4.0.2

  sql/tztime.cc
    1.30 06/02/25 17:46:27 monty@mysql.com +2 -0
    Fixed compiler warnings from gcc 4.0.2

  sql/table.h
    1.124 06/02/25 17:46:27 monty@mysql.com +4 -0
    Fixed compiler warnings from gcc 4.0.2

  sql/sql_update.cc
    1.186 06/02/25 17:46:27 monty@mysql.com +1 -1
    Fixed compiler warnings from gcc 4.0.2

  sql/sql_select.h
    1.105.1.1 06/02/25 17:46:27 monty@mysql.com +2 -1
    Fixed compiler warnings from gcc 4.0.2

  sql/sql_parse.cc
    1.526.1.2 06/02/25 17:46:26 monty@mysql.com +4 -3
    Fixed compiler warnings from gcc 4.0.2
    (Not pretty, but seams to work...)

  sql/sql_class.h
    1.282 06/02/25 17:46:26 monty@mysql.com +5 -1
    Fixed compiler warnings from gcc 4.0.2

  sql/sql_cache.h
    1.32 06/02/25 17:46:26 monty@mysql.com +6 -0
    Fixed compiler warnings from gcc 4.0.2

  sql/sql_base.cc
    1.327.1.2 06/02/25 17:46:26 monty@mysql.com +2 -2
    Fixed compiler warnings from gcc 4.0.2

  sql/spatial.h
    1.19 06/02/25 17:46:26 monty@mysql.com +16 -0
    Fixed compiler warnings from gcc 4.0.2

  sql/sp_rcontext.h
    1.30 06/02/25 17:46:26 monty@mysql.com +1 -0
    Fixed compiler warnings from gcc 4.0.2

  sql/parse_file.h
    1.11 06/02/25 17:46:26 monty@mysql.com +3 -0
    Fixed compiler warnings from gcc 4.0.2

  sql/opt_range.cc
    1.205 06/02/25 17:46:26 monty@mysql.com +10 -0
    Fixed compiler warnings from gcc 4.0.2

  sql/mysql_priv.h
    1.374 06/02/25 17:46:26 monty@mysql.com +4 -3
    Fixed compiler warnings from gcc 4.0.2
    For find_table_in_list I fixed it to use proper C++ class pointers instead of C style pointers
     

  sql/log_event.h
    1.123 06/02/25 17:46:25 monty@mysql.com +1 -0
    Fixed compiler warnings from gcc 4.0.2

  sql/item_cmpfunc.h
    1.120 06/02/25 17:46:25 monty@mysql.com +17 -0
    Fixed compiler warnings from gcc 4.0.2

  sql/item.h
    1.187 06/02/25 17:46:25 monty@mysql.com +4 -1
    Fixed compiler warnings from gcc 4.0.2

  sql/handler.h
    1.167 06/02/25 17:46:25 monty@mysql.com +2 -0
    Fixed compiler warnings from gcc 4.0.2

  sql/field.cc
    1.297.1.1 06/02/25 17:46:25 monty@mysql.com +1 -1
    Fixed compiler warnings from gcc 4.0.2

  ndb/include/ndbapi/NdbDictionary.hpp
    1.52 06/02/25 17:46:25 monty@mysql.com +3 -0
    Fixed compiler warnings from gcc 4.0.2

  configure.in
    1.375 06/02/25 17:46:25 monty@mysql.com +3 -0
    Added comment

ChangeSet
  1.2079.3.4 06/02/25 13:58:00 monty@mysql.com +1 -0
  Add back free that I accidently removed in last patch

  sql/sql_db.cc
    1.126 06/02/25 13:57:54 monty@mysql.com +1 -0
    Add back free that I accidently removed in last patch

ChangeSet
  1.2079.3.3 06/02/25 13:49:43 monty@mysql.com +1 -0
  Fixed typo

  sql/sql_db.cc
    1.125 06/02/25 13:49:37 monty@mysql.com +1 -1
    Move LINT_INIT() to correct place

ChangeSet
  1.2079.3.2 06/02/25 13:24:18 monty@mysql.com +3 -0
  Fixed new introduced bug in binlog.test with --ps-protocol

  tests/mysql_client_test.c
    1.176 06/02/25 13:24:15 monty@mysql.com +2 -2
    Removed compiler warnings

  sql/sql_db.cc
    1.124 06/02/25 13:24:15 monty@mysql.com +4 -3
    Removed compiler warning
    Fixed memory loss on slave

  mysql-test/t/binlog.test
    1.6 06/02/25 13:24:15 monty@mysql.com +2 -2
    Fixed --ps-protocol (Side effect from last patch)

ChangeSet
  1.1981.67.1 06/02/24 23:50:36 dlenev@mysql.com +7 -0
  Fix for bug #13525 "Rename table does not keep info of triggers".
  
  Let us transfer triggers associated with table when we rename it (but only if
  we are not changing database to which table belongs, in the latter case we will
  emit error).

  sql/sql_yacc.yy
    1.445.3.1 06/02/24 23:50:30 dlenev@mysql.com +7 -9
    trigger_tail:
      To be able properly update triggers' definitions with new table names
      when renaming tables we need to know where in CREATE TRIGGER statement
      "ON db_name.table_name" part resides.
      Small cleanup - let us emphasize that for CREATE TRIGGER statement 
      lock type which is specified in table list is unimportant since
      name-locking is used.

  sql/sql_trigger.h
    1.17.1.1 06/02/24 23:50:30 dlenev@mysql.com +16 -1
    Table_triggers_list:
      Added on_table_names_list member to store pointers and lenghts of
      "ON table_name" parts in triggers' definitions to be able easily
      change them during RENAME TABLE.
      Added change_table_name() method and change_table_name_in_trignames/triggers()
      helper methods responsible for updating .TRG and .TRN files.

  sql/sql_trigger.cc
    1.38.1.1 06/02/24 23:50:30 dlenev@mysql.com +269 -21
    Added Table_triggers_list::change_table_name() method and
    change_table_name_in_triggers()/trignames() methods responsible for updating
    .TRG and .TRN files for table during its renaming.
    
    Two small cleanups - removed versioning for .TRG files (since it was not working
    before anyway) and emphasized that type of lock specified in tables list is
    unimportant for DROP TABLE (since this statement uses name-locking). 

  sql/sql_table.cc
    1.291.1.1 06/02/24 23:50:30 dlenev@mysql.com +12 -1
    mysql_alter_table():
      Now in case when ALTER should rename table we call
      Table_triggers_list::change_table_name() which is responsible
      for updating .TRG and .TRN files after renaming table.

  sql/sql_rename.cc
    1.32 06/02/24 23:50:30 dlenev@mysql.com +21 -2
    rename_tables():
      Now after renaming table's .FRM file and updating handler data we call
      Table_triggers_list::change_table_name() which is reponsible for
      updating .TRG and .TRN files.

  mysql-test/t/trigger.test
    1.31.1.1 06/02/24 23:50:30 dlenev@mysql.com +86 -1
    Added test for bug #13525 "Rename table does not keep info of triggers".

  mysql-test/r/trigger.result
    1.25.1.1 06/02/24 23:50:30 dlenev@mysql.com +102 -1
    Added test for bug #13525 "Rename table does not keep info of triggers".

ChangeSet
  1.2079.3.1 06/02/24 18:34:15 monty@mysql.com +66 -0
  Fixes to embedded server to be able to run tests with it
  (Needed for "list of pushes" web page and autopush)

  mysql-test/t/subselect_notembedded.test
    1.1 06/02/24 18:34:11 monty@mysql.com +8 -0
    New BitKeeper file ``mysql-test/t/subselect_notembedded.test''

  mysql-test/t/sp_notembedded.test
    1.1 06/02/24 18:34:11 monty@mysql.com +262 -0
    New BitKeeper file ``mysql-test/t/sp_notembedded.test''

  mysql-test/t/sp.test.orig
    1.1 06/02/24 18:34:11 monty@mysql.com +5716 -0
    New BitKeeper file ``mysql-test/t/sp.test.orig''

  mysql-test/t/subselect_notembedded.test
    1.0 06/02/24 18:34:11 monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.0/mysql-test/t/subselect_notembedded.test

  mysql-test/t/sp_notembedded.test
    1.0 06/02/24 18:34:11 monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.0/mysql-test/t/sp_notembedded.test

  mysql-test/t/sp.test.orig
    1.0 06/02/24 18:34:11 monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.0/mysql-test/t/sp.test.orig

  mysql-test/t/innodb_notembedded.test
    1.1 06/02/24 18:34:10 monty@mysql.com +40 -0
    New BitKeeper file ``mysql-test/t/innodb_notembedded.test''

  mysql-test/t/ctype_cp932_notembedded.test
    1.1 06/02/24 18:34:10 monty@mysql.com +32 -0
    New BitKeeper file ``mysql-test/t/ctype_cp932_notembedded.test''

  mysql-test/r/subselect_notembedded.result
    1.1 06/02/24 18:34:10 monty@mysql.com +1 -0
    New BitKeeper file ``mysql-test/r/subselect_notembedded.result''

  mysql-test/r/sp_notembedded.result
    1.1 06/02/24 18:34:10 monty@mysql.com +206 -0
    New BitKeeper file ``mysql-test/r/sp_notembedded.result''

  mysql-test/r/sp.result.orig
    1.1 06/02/24 18:34:10 monty@mysql.com +4853 -0
    New BitKeeper file ``mysql-test/r/sp.result.orig''

  mysql-test/t/innodb_notembedded.test
    1.0 06/02/24 18:34:10 monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.0/mysql-test/t/innodb_notembedded.test

  mysql-test/t/ctype_cp932_notembedded.test
    1.0 06/02/24 18:34:10 monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.0/mysql-test/t/ctype_cp932_notembedded.test

  mysql-test/r/subselect_notembedded.result
    1.0 06/02/24 18:34:10 monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.0/mysql-test/r/subselect_notembedded.result

  mysql-test/r/sp_notembedded.result
    1.0 06/02/24 18:34:10 monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.0/mysql-test/r/sp_notembedded.result

  mysql-test/r/sp.result.orig
    1.0 06/02/24 18:34:10 monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.0/mysql-test/r/sp.result.orig

  mysql-test/r/innodb_notembedded.result
    1.1 06/02/24 18:34:09 monty@mysql.com +20 -0
    New BitKeeper file ``mysql-test/r/innodb_notembedded.result''

  mysql-test/r/ctype_cp932_notembedded.result
    1.1 06/02/24 18:34:09 monty@mysql.com +17 -0
    New BitKeeper file ``mysql-test/r/ctype_cp932_notembedded.result''

  sql/sql_prepare.cc
    1.171 06/02/24 18:34:09 monty@mysql.com +9 -2
    Fix to embedded server to be able to run tests on it

  sql/sql_parse.cc
    1.526.1.1 06/02/24 18:34:09 monty@mysql.com +2 -31
    Fix to embedded server to be able to run tests on it
    Don't crash for disabled commands when using embedded server

  sql/sql_cursor.cc
    1.5 06/02/24 18:34:09 monty@mysql.com +1 -0
    Fix to embedded server to be able to run tests on it

  sql/sql_class.h
    1.281 06/02/24 18:34:09 monty@mysql.com +10 -2
    Fix to embedded server to be able to run tests on it

  sql/sql_class.cc
    1.228 06/02/24 18:34:09 monty@mysql.com +1 -2
    Fix to embedded server to be able to run tests on it

  sql/sql_base.cc
    1.327.1.1 06/02/24 18:34:09 monty@mysql.com +9 -0
    Better comment

  sql/protocol.h
    1.32 06/02/24 18:34:09 monty@mysql.com +9 -0
    Fix to embedded server to be able to run tests on it

  sql/protocol.cc
    1.113 06/02/24 18:34:09 monty@mysql.com +43 -39
    Fix to embedded server to be able to run tests on it
    (Trivial reconstruction of code)

  sql/mysqld.cc
    1.536 06/02/24 18:34:09 monty@mysql.com +0 -2
    Fix to embedded server to be able to run tests on it

  sql/item.cc
    1.207 06/02/24 18:34:09 monty@mysql.com +0 -3
    Remove DBUG_PRINT statement that can cause crashes when running with --debug

  sql-common/client.c
    1.84 06/02/24 18:34:09 monty@mysql.com +5 -4
    Updated test for embedded server

  scripts/mysql_fix_privilege_tables.sql
    1.34 06/02/24 18:34:09 monty@mysql.com +6 -0
    Add flush privileges to .sql script so that one doesn't have to reboot mysqld when one runs the mysql_fix_privilege_script

  mysys/my_bitmap.c
    1.30 06/02/24 18:34:09 monty@mysql.com +2 -2
    Remove compiler warnings

  mysys/mf_dirname.c
    1.12 06/02/24 18:34:09 monty@mysql.com +1 -1
    Review fix: Don't access data outside of array

  mysql-test/t/wait_timeout.test
    1.3 06/02/24 18:34:09 monty@mysql.com +3 -0
    Updated test for embedded server

  mysql-test/r/innodb_notembedded.result
    1.0 06/02/24 18:34:09 monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.0/mysql-test/r/innodb_notembedded.result

  mysql-test/r/ctype_cp932_notembedded.result
    1.0 06/02/24 18:34:09 monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.0/mysql-test/r/ctype_cp932_notembedded.result

  mysql-test/t/view_grant.test
    1.10 06/02/24 18:34:08 monty@mysql.com +11 -0
    Updated test for embedded server

  mysql-test/t/view.test
    1.134.1.1 06/02/24 18:34:08 monty@mysql.com +0 -10
    Updated test for embedded server

  mysql-test/t/temp_table.test
    1.14 06/02/24 18:34:08 monty@mysql.com +2 -0
    Updated test for embedded server

  mysql-test/t/subselect.test
    1.114 06/02/24 18:34:08 monty@mysql.com +0 -6
    Updated test for embedded server

  mysql-test/t/sp.test
    1.174.1.3 06/02/24 18:34:08 monty@mysql.com +10 -97
    Updated test for embedded server

  mysql-test/t/sp-threads.test
    1.8 06/02/24 18:34:08 monty@mysql.com +2 -0
    Updated test for embedded server

  mysql-test/t/sp-error.test
    1.105 06/02/24 18:34:08 monty@mysql.com +0 -22
    Updated test for embedded server

  mysql-test/t/sp-destruct.test
    1.6 06/02/24 18:34:08 monty@mysql.com +3 -0
    Updated test for embedded server

  mysql-test/t/skip_grants.test
    1.7 06/02/24 18:34:08 monty@mysql.com +3 -0
    Updated test for embedded server

  mysql-test/t/read_only.test
    1.3 06/02/24 18:34:08 monty@mysql.com +3 -0
    Updated test for embedded server

  mysql-test/t/query_cache_notembedded.test
    1.3 06/02/24 18:34:08 monty@mysql.com +84 -0
    Updated test for embedded server

  mysql-test/t/query_cache.test
    1.54 06/02/24 18:34:08 monty@mysql.com +0 -15
    Updated test for embedded server

  mysql-test/t/mysqltest.test
    1.37 06/02/24 18:34:08 monty@mysql.com +2 -0
    Updated test for embedded server

  mysql-test/t/mysql_client_test.test
    1.17 06/02/24 18:34:08 monty@mysql.com +3 -0
    Updated test for embedded server

  mysql-test/t/mysql.test
    1.6 06/02/24 18:34:08 monty@mysql.com +2 -0
    Updated test for embedded server

  mysql-test/t/innodb.test
    1.126 06/02/24 18:34:08 monty@mysql.com +3 -26
    Updated test for embedded server

  mysql-test/t/handler.test
    1.27 06/02/24 18:34:08 monty@mysql.com +3 -0
    Updated test for embedded server

  mysql-test/t/delayed.test
    1.12 06/02/24 18:34:08 monty@mysql.com +3 -0
    Updated test for embedded server

  mysql-test/t/ctype_cp932.test
    1.10 06/02/24 18:34:08 monty@mysql.com +0 -22
    Updated test for embedded server

  mysql-test/t/compress.test
    1.4 06/02/24 18:34:08 monty@mysql.com +3 -0
    Updated test for embedded server

  mysql-test/t/blackhole.test
    1.6 06/02/24 18:34:08 monty@mysql.com +1 -0
    Updated test for embedded server

  mysql-test/t/binlog.test
    1.5 06/02/24 18:34:08 monty@mysql.com +3 -2
    Updated test for embedded server

  mysql-test/t/backup.test
    1.18 06/02/24 18:34:08 monty@mysql.com +3 -0
    Updated test for embedded server

  mysql-test/r/view_grant.result
    1.11 06/02/24 18:34:08 monty@mysql.com +9 -0
    Updated test for embedded server

  mysql-test/r/view.result
    1.145.1.1 06/02/24 18:34:08 monty@mysql.com +0 -9
    Updated test for embedded server

  mysql-test/r/subselect.result
    1.135 06/02/24 18:34:08 monty@mysql.com +0 -1
    Updated test for embedded server

  mysql-test/r/sp.result
    1.185.1.3 06/02/24 18:34:08 monty@mysql.com +0 -82
    Updated test for embedded server

  mysql-test/r/sp-error.result
    1.104 06/02/24 18:34:08 monty@mysql.com +0 -13
    Updated test for embedded server

  mysql-test/r/query_cache_notembedded.result
    1.3 06/02/24 18:34:08 monty@mysql.com +220 -0
    Updated test for embedded server

  mysql-test/r/query_cache.result
    1.71 06/02/24 18:34:08 monty@mysql.com +0 -45
    Updated test for embedded server

  mysql-test/r/mysqltest.result
    1.30 06/02/24 18:34:07 monty@mysql.com +2 -2
    Updated test for embedded server

  mysql-test/r/innodb.result
    1.157 06/02/24 18:34:07 monty@mysql.com +0 -19
    Updated test for embedded server

  mysql-test/r/ctype_cp932.result
    1.8 06/02/24 18:34:07 monty@mysql.com +0 -14
    Updated test for embedded server

  mysql-test/r/binlog.result
    1.5 06/02/24 18:34:07 monty@mysql.com +2 -2
    Updated test for embedded server

  mysql-test/mysql-test-run.sh
    1.293 06/02/24 18:34:07 monty@mysql.com +1 -0
    Fix to embedded server to be able to run tests on it

  libmysqld/libmysqld.c
    1.67 06/02/24 18:34:07 monty@mysql.com +12 -2
    Fix to embedded server to be able to run tests on it

  libmysqld/lib_sql.cc
    1.108 06/02/24 18:34:07 monty@mysql.com +366 -144
    Fix to embedded server to be able to run tests on it

  libmysqld/embedded_priv.h
    1.13 06/02/24 18:34:07 monty@mysql.com +14 -7
    Fix to embedded server to be able to run tests on it

  libmysqld/emb_qcache.cc
    1.8 06/02/24 18:34:07 monty@mysql.com +69 -60
    Fix to embedded server to be able to run tests on it

  libmysql/libmysql.c
    1.237 06/02/24 18:34:07 monty@mysql.com +6 -6
    Fix to embedded server to be able to run tests on it

  include/mysql.h
    1.155 06/02/24 18:34:07 monty@mysql.com +6 -3
    Fix to embedded server to be able to run tests on it

ChangeSet
  1.2079.2.1 06/02/24 13:51:04 knielsen@mysql.com +1 -0
  Fix mysqldump.test to work with non-standard --vardir.
  (Backported from mysql-5.1-new)

  mysql-test/t/mysqldump.test
    1.83 06/02/24 13:50:22 knielsen@mysql.com +4 -4
    Fix mysqldump.test to work with non-standard --vardir.

ChangeSet
  1.2081 06/02/24 00:12:04 konstantin@mysql.com +2 -0
  After-merge fixes (Bug#13134)

  sql/sql_parse.cc
    1.528 06/02/24 00:11:57 konstantin@mysql.com +0 -1
    After-merge fixes (Bug#13134)

  sql/field.cc
    1.299 06/02/24 00:11:57 konstantin@mysql.com +3 -1
    After-merge fixes (Bug#13134)

ChangeSet
  1.2075.1.2 06/02/24 00:00:15 konstantin@mysql.com +8 -0
  Merge mysql.com:/opt/local/work/mysql-4.1-13134
  into  mysql.com:/opt/local/work/mysql-5.0-runtime

  sql/sql_table.cc
    1.296.1.1 06/02/24 00:00:02 konstantin@mysql.com +2 -2
    Manual merge.

  sql/sql_parse.cc
    1.527 06/02/24 00:00:01 konstantin@mysql.com +1 -2
    Manual merge.

  sql/field.h
    1.172 06/02/24 00:00:01 konstantin@mysql.com +3 -3
    Manual merge.

  sql/field.cc
    1.298 06/02/24 00:00:01 konstantin@mysql.com +1 -1
    Manual merge.

  mysql-test/t/ps.test
    1.59 06/02/24 00:00:01 konstantin@mysql.com +21 -22
    Manual merge.

  mysql-test/r/ps.result
    1.60 06/02/24 00:00:01 konstantin@mysql.com +0 -14
    Manual merge (use local)

  mysql-test/r/heap.result
    1.47 06/02/24 00:00:01 konstantin@mysql.com +0 -2
    Manual merge (use local)

  mysql-test/t/heap.test
    1.33 06/02/23 23:47:51 konstantin@mysql.com +0 -2
    Auto merged

ChangeSet
  1.1616.2497.2 06/02/23 23:41:15 konstantin@mysql.com +4 -0
  Remove 'delayed' to make the test deterministic (already
  fixed in 5.0).
  A post-review fix (Bug#13134)

  mysql-test/t/ps.test
    1.27.1.21 06/02/23 23:41:06 konstantin@mysql.com +0 -1
    A post-review fix (Bug#13134)

  mysql-test/t/heap.test
    1.19.2.1 06/02/23 23:41:06 konstantin@mysql.com +2 -2
    Remove 'delayed' to make the test deterministic.

  mysql-test/r/ps.result
    1.31.1.16 06/02/23 23:41:06 konstantin@mysql.com +0 -3
    Remove an unneeded drop table (test case for Bug#13134)

  mysql-test/r/heap.result
    1.20.3.1 06/02/23 23:41:06 konstantin@mysql.com +2 -2
    Remove 'delayed' to make the test deterministic.

ChangeSet
  1.2079 06/02/23 13:54:55 paul@snake-hub.snake.net +1 -0
  mysqltest.c:
    Rearrange out of order options in option struct.

  client/mysqltest.c
    1.208 06/02/23 13:54:22 paul@snake-hub.snake.net +9 -9
    Rearrange out of order options in option struct.

ChangeSet
  1.2063.3.1 06/02/23 09:11:05 paul@snake-hub.snake.net +1 -0
  mysqld.cc:
    Fix out of order entries in option struct.

  sql/mysqld.cc
    1.535 06/02/23 09:10:04 paul@snake-hub.snake.net +37 -37
    Fix out of order entries in option struct.

ChangeSet
  1.2077 06/02/23 16:08:28 msvensson@neptunus.(none) +1 -0
  Change snprintf to my_snprintf

  client/mysqldump.c
    1.223 06/02/23 16:08:23 msvensson@neptunus.(none) +5 -5
    snprintf =>  my_snprintf

ChangeSet
  1.2075.1.1 06/02/23 16:21:43 konstantin@mysql.com +2 -0
  Cleanup.

  sql/sql_select.h
    1.106 06/02/23 16:21:35 konstantin@mysql.com +3 -7
    Cleanup: remove a warning.

  sql/sql_base.cc
    1.328 06/02/23 16:21:34 konstantin@mysql.com +1 -2
    Cleanup, remove a warning.

ChangeSet
  1.2076 06/02/23 14:06:29 msvensson@neptunus.(none) +1 -0
  Aix52 build fix

  client/mysqldump.c
    1.222 06/02/23 14:06:25 msvensson@neptunus.(none) +1 -1
    Declare variable in start of function

ChangeSet
  1.2075 06/02/23 10:45:39 msvensson@neptunus.(none) +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  mysql-test/t/sp.test
    1.174.1.2 06/02/23 10:45:34 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/sp.result
    1.185.1.2 06/02/23 10:45:34 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2074 06/02/23 10:35:53 msvensson@neptunus.(none) +1 -0
  Merge fixup

  client/mysqltest.c
    1.207 06/02/23 10:35:49 msvensson@neptunus.(none) +1 -2
    Fix after merge, do_eval has three args
    Remove extre return in do_block

ChangeSet
  1.2073 06/02/23 10:30:31 msvensson@neptunus.(none) +4 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  mysql-test/t/mysqltest.test
    1.36 06/02/23 10:30:27 msvensson@neptunus.(none) +7 -15
    Merge

  mysql-test/t/mysqldump.test
    1.82 06/02/23 10:28:06 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/mysqltest.result
    1.29 06/02/23 10:28:06 msvensson@neptunus.(none) +0 -0
    Auto merged

  client/mysqltest.c
    1.206 06/02/23 10:28:06 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1981.65.9 06/02/23 10:11:57 msvensson@neptunus.(none) +4 -0
  Add new parameter to do_eval so that only unescaped variables in input string is expanded and rest of string is left untouched.

  mysql-test/t/mysqltest.test
    1.28.3.2 06/02/23 10:11:51 msvensson@neptunus.(none) +13 -13
    Revert previous patch that added extra \\ in exec command

  mysql-test/t/mysqldump.test
    1.77.2.3 06/02/23 10:11:50 msvensson@neptunus.(none) +1 -1
    Revert previous patch that added extra \\ in "exec" command

  mysql-test/r/mysqltest.result
    1.24.3.1 06/02/23 10:11:50 msvensson@neptunus.(none) +1 -1
    Update test result

  client/mysqltest.c
    1.196.5.3 06/02/23 10:11:50 msvensson@neptunus.(none) +14 -6
    Add new parameter to 'do_eval' that will add any escape chars found in the input string to the output string. 
    This is used in 'do_system' and in 'do_exec' where only unescaped variables
    will be expanded, rest of the string will be left untouched.

ChangeSet
  1.2058.1.1 06/02/22 17:07:18 aelkin@mysql.com +1 -0
  BUG#17265 Assertion failure in rpl_row_view01.
  To quote Timour review lines:
  
  The actual cause of the bug is that sql_base.cc:setup_wild()
  sets "select_lex->with_wild = 0" (in the end of the function) once
  it expands all wild-cards, and wild-card expansion is done during
  the prepare phase. During this phase we replace all "*" with the
  corresponding items, which for views happen to be references to
  references. When we do execute, select_lex->with_wild = 0, and
  all "*" are already replaced by the corresponding items, which
  in the case of views need to be dereferenced first.
  
  Fixed by refining the assert. Regression test for the bug is rpl_row_view01,
  as was reported.

  sql/item.cc
    1.206 06/02/22 17:07:12 aelkin@mysql.com +3 -3
    Refined asssert, suggested by Evgen, due to BUG#17265 prepared statement for select with ps-protocol 
    does not hold the former. 

ChangeSet
  1.2063.2.2 06/02/22 13:44:04 anozdrin@mysql.com +3 -0
  Fix for BUG#7787: Stored procedures: improper warning for "grant execute" statement.
  
  The problem was that error flag was not reset.

  sql/sp.cc
    1.107 06/02/22 13:44:01 anozdrin@mysql.com +7 -4
    Reset errors after sp_find_routine().

  mysql-test/t/sp-security.test
    1.29 06/02/22 13:44:01 anozdrin@mysql.com +22 -0
    A test case for BUG#7787.

  mysql-test/r/sp-security.result
    1.26 06/02/22 13:44:01 anozdrin@mysql.com +9 -0
    Results for test case for BUG#7787.

ChangeSet
  1.2040.14.1 06/02/22 10:04:10 timour@mysql.com +3 -0
  Fix for BUG#17523: natural join and information schema.
  
  The cause of the bug was an ASSERT that checked the consistency
  of TABLE_SHARE::db and TABLE_LIST::db and failed for I_S tables.
  The fix relaxes the requirement for consistency for I_S.

  sql/table.cc
    1.216 06/02/22 10:04:07 timour@mysql.com +17 -2
    Take into account that for I_S tables, TABLE_SHARE::db == 0,
    while TABLE_LIST::db contains the database name of a table.
    The only change is in the ASSERTs.

  mysql-test/t/join.test
    1.30 06/02/22 10:04:07 timour@mysql.com +6 -0
    Added test for BUG#17523

  mysql-test/r/join.result
    1.35 06/02/22 10:04:07 timour@mysql.com +5 -0
    Added test for BUG#17523

ChangeSet
  1.2063.2.1 06/02/22 01:20:47 konstantin@mysql.com +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/opt/local/work/mysql-5.0-runtime

  sql/share/errmsg.txt
    1.60 06/02/22 01:20:42 konstantin@mysql.com +0 -0
    SCCS merged

  sql/sql_yacc.yy
    1.453.1.1 06/02/22 01:19:07 konstantin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2497.1 06/02/21 19:52:20 konstantin@mysql.com +6 -0
  A fix and a test case for Bug#13134 "Length of VARCHAR() utf8 
  column is increasing when table is recreated with PS/SP":
  make use of create_field::char_length more consistent in the code.
  Reinit create_field::length from create_field::char_length
  for every execution of a prepared statement (actually fixes the 
  bug).

  sql/sql_table.cc
    1.157.2.148 06/02/21 19:52:15 konstantin@mysql.com +7 -1
    Reinit length from char_length for every field in 
    mysql_prepare_table. This is not needed if we're executing
    a statement for the first time, however, at subsequent executions
    length contains the number of bytes, not characters (as it's expected 
    to).

  sql/sql_parse.cc
    1.271.1.205 06/02/21 19:52:15 konstantin@mysql.com +2 -0
    Initialize char_length in add_field_to_list. This function
    effectively works as another create_field constructor.

  sql/field.h
    1.120.1.11 06/02/21 19:52:15 konstantin@mysql.com +1 -1
    Rename chars_length to char_length (to be consistent with
    how this term is used throughout the rest of the code).

  sql/field.cc
    1.197.1.32 06/02/21 19:52:15 konstantin@mysql.com +2 -3
    Move initialization of create_field::char_length to the constructor
    of create_field.

  mysql-test/t/ps.test
    1.27.1.20 06/02/21 19:52:15 konstantin@mysql.com +23 -1
    A test case for Bug#13134 "Length of VARCHAR() utf8 column is 
    increasing when table is recreated with PS/SP"

  mysql-test/r/ps.result
    1.31.1.15 06/02/21 19:52:14 konstantin@mysql.com +17 -0
    Test results fixed (Bug#13134)

ChangeSet
  1.2071 06/02/21 17:19:46 msvensson@neptunus.(none) +3 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug16878/my50-bug16878
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  mysql-test/t/mysqldump.test
    1.81 06/02/21 17:19:43 msvensson@neptunus.(none) +0 -1
    Merge

  mysql-test/r/mysqldump.result
    1.90 06/02/21 17:19:43 msvensson@neptunus.(none) +0 -0
    Merge

  sql/sp_head.cc
    1.202 06/02/21 17:18:20 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2063.1.3 06/02/21 18:09:32 evgen@moonbone.local +3 -0
  Fixed bug#17530: Incorrect key truncation on table creation caused server crash.
  
  When a too long field is used for a key, only a prefix part of the field is 
  used. Length is reduced to the max key length allowed for storage. But if the
  field have a multibyte charset it is possible to break multibyte char
  sequence. This leads to the failed assertion in the innodb code and 
  server crash when a record is inserted.
  
  The make_prepare_table() now aligns truncated key length to the boundary of
  multibyte char.

  sql/sql_table.cc
    1.297 06/02/21 18:05:16 evgen@moonbone.local +3 -1
    Fixed bug#17530: Incorrect key truncation on table creation caused server crash.
    The make_prepare_table() now aligns truncated key length to the boundary of
    multibyte char.

  mysql-test/r/create.result
    1.113 06/02/21 18:05:03 evgen@moonbone.local +6 -0
    Added test case for bug#17530: Incorrect key truncation on table creation caused server crash.

  mysql-test/t/create.test
    1.75 06/02/21 18:04:40 evgen@moonbone.local +8 -0
    Added test case for bug#17530: Incorrect key truncation on table creation caused server crash.

ChangeSet
  1.2070 06/02/21 15:05:58 msvensson@neptunus.(none) +3 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug14871/my50-bug14871
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  mysql-test/t/mysqldump.test
    1.80 06/02/21 15:05:53 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/mysqldump.result
    1.87.1.2 06/02/21 15:05:53 msvensson@neptunus.(none) +0 -0
    Auto merged

  client/mysqldump.c
    1.221 06/02/21 15:05:53 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2063.1.2 06/02/21 15:59:41 petr@mysql.com +1 -0
  Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/cps/mysql/devel/im/5.0-im-fix-race

  server-tools/instance-manager/instance_map.cc
    1.26 06/02/21 15:59:35 petr@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1999.2.1 06/02/21 15:57:56 petr@mysql.com +4 -0
  Fix race condition: instance map wasn't locked for the
  duration of the whole 'flush instances'. As a consequence,
  it was possible to query instance map, while it is in the
  inconsistent state. The patch was reworked after review.

  server-tools/instance-manager/manager.cc
    1.31 06/02/21 15:57:54 petr@mysql.com +7 -15
    use instance_map.flush_instances instead of instance_map.load() and guardian_thread.init()

  server-tools/instance-manager/instance_map.h
    1.18 06/02/21 15:57:54 petr@mysql.com +10 -7
    add new method. cleanup interface. add comments.

  server-tools/instance-manager/instance_map.cc
    1.24.1.1 06/02/21 15:57:54 petr@mysql.com +68 -15
    Eliminate race condition: lock instance map and guardian
    for the duration of the whole "FLUSH INSTANCES" execution.

  server-tools/instance-manager/guardian.cc
    1.20 06/02/21 15:57:54 petr@mysql.com +0 -2
    do not lock instance map in Guardian_thread::init()

ChangeSet
  1.1981.45.5 06/02/21 13:43:29 msvensson@neptunus.(none) +2 -0
  Bug#14857 Reading dump files with single statement stored routines fails.Bug #14857  	Reading dump files with single statement stored routines fails.
   - Add tests, fixed by patch for 16878

  mysql-test/t/mysqldump.test
    1.77.1.2 06/02/21 13:43:23 msvensson@neptunus.(none) +18 -0
    Add tests for bug 14857

  mysql-test/r/mysqldump.result
    1.89 06/02/21 13:43:23 msvensson@neptunus.(none) +14 -0
    Update test results

ChangeSet
  1.2060.3.1 06/02/21 15:32:52 petr@mysql.com +2 -0
  Fix for Bug #12674  "Instance Manager: IM doesn't handle client
  connections correctly".
  Recommit with the max timeout value in sync with the comment.

  server-tools/instance-manager/priv.h
    1.10 06/02/21 15:32:49 petr@mysql.com +2 -0
    add a const for max wait timeout

  server-tools/instance-manager/options.cc
    1.30 06/02/21 15:32:49 petr@mysql.com +6 -0
    add new option to set wait timeout

ChangeSet
  1.1981.66.1 06/02/21 13:21:17 msvensson@neptunus.(none) +3 -0
  Bug#14871 mysqldump: invalid view dump output
   - Add comments with embeded veriosn info around the parts of the view syntax that are only supported by a certain version of MySQL Server

  mysql-test/t/mysqldump.test
    1.77.3.1 06/02/21 13:21:13 msvensson@neptunus.(none) +30 -0
    Add test to see that views can be deumped and reloaded alos when they contain "SECURITY TYPE", "CHECK OPTION" and "DEFINER"

  mysql-test/r/mysqldump.result
    1.87.2.1 06/02/21 13:21:13 msvensson@neptunus.(none) +55 -9
    Update results

  client/mysqldump.c
    1.217.1.2 06/02/21 13:21:13 msvensson@neptunus.(none) +168 -33
    Use information_schema.views to gather information about the view, then replace some parts of the output from "SHOW CREATE VIEW" with comment markers with version, to make thos parts of the view syntax become parsed only of MySQL servers that supports it.
    Create common function "open_sql_file_for_table" to open the individual .sql file where to dump the table or view.

ChangeSet
  1.2069 06/02/21 09:40:18 msvensson@neptunus.(none) +6 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  mysql-test/t/mysqltest.test
    1.35 06/02/21 09:40:14 msvensson@neptunus.(none) +7 -14
    Merge

  mysql-test/t/mysqldump.test
    1.79 06/02/21 09:40:14 msvensson@neptunus.(none) +3 -6
    Merge

  mysql-test/mysql-test-run.pl
    1.70 06/02/21 09:40:14 msvensson@neptunus.(none) +1 -0
    Merge, undo removal

  client/mysqltest.c
    1.205 06/02/21 09:40:14 msvensson@neptunus.(none) +0 -4
    Merge

  mysql-test/t/sp.test
    1.174.2.1 06/02/21 09:37:37 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/sp.result
    1.185.2.1 06/02/21 09:37:37 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2068 06/02/21 09:11:03 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug13809/my50-bug13809
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  client/mysqltest.c
    1.204 06/02/21 09:10:58 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2066 06/02/21 08:55:13 msvensson@neptunus.(none) +3 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  mysql-test/t/mysqltest.test
    1.34 06/02/21 08:55:08 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/mysqltest.result
    1.28 06/02/21 08:55:08 msvensson@neptunus.(none) +0 -0
    Auto merged

  client/mysqltest.c
    1.203 06/02/21 08:55:08 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2065 06/02/21 08:50:26 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  libmysql/libmysql.c
    1.236 06/02/21 08:50:21 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1981.65.8 06/02/20 15:03:16 msvensson@neptunus.(none) +1 -0
  Escape \ in "exec"

  mysql-test/t/ndb_config.test
    1.11 06/02/20 15:03:12 msvensson@neptunus.(none) +1 -1
    Add extra \ to escape \. 
    \\\n => \n

ChangeSet
  1.1981.65.7 06/02/20 12:05:45 msvensson@neptunus.(none) +1 -0
  Fix typo

  client/mysqltest.c
    1.196.5.2 06/02/20 12:05:41 msvensson@neptunus.(none) +1 -1
    Typo % should be %s

ChangeSet
  1.2062 06/02/20 14:26:32 holyfoot@deer.(none) +1 -0
  Messgges corrected in mysql_upgrade script

  scripts/mysql_upgrade.sh
    1.3 06/02/20 14:26:26 holyfoot@mysql.com +5 -5
    messages corrected

ChangeSet
  1.2060.2.1 06/02/20 09:34:02 knielsen@mysql.com +2 -0
  Remove hard-coded ../var/.. path in test mix_innodb_myisam_binlog,
  fails with --vardir option.

  mysql-test/t/mix_innodb_myisam_binlog.test
    1.23 06/02/20 09:33:38 knielsen@mysql.com +3 -3
    Remove hard-coded ../var/.. path in test mix_innodb_myisam_binlog,
    fails with --vardir option.

  mysql-test/r/mix_innodb_myisam_binlog.result
    1.27 06/02/20 09:33:38 knielsen@mysql.com +2 -2
    Remove hard-coded ../var/.. path in test mix_innodb_myisam_binlog,
    fails with --vardir option.

ChangeSet
  1.2060.1.5 06/02/19 17:26:06 igor@rurik.mysql.com +2 -0
  Merge rurik.mysql.com:/home/igor/mysql-5.0
  into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0

  sql/sql_select.cc
    1.395 06/02/19 17:25:59 igor@rurik.mysql.com +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.134 06/02/19 17:25:59 igor@rurik.mysql.com +0 -3
    Auto merged

ChangeSet
  1.2060.1.4 06/02/18 21:08:41 guilhem@mysql.com +2 -0
  In previous push, a DROP TABLE at the end of test was missing.

  mysql-test/t/mix_innodb_myisam_binlog.test
    1.22 06/02/18 21:08:37 guilhem@mysql.com +1 -0
    cleanup in the end

  mysql-test/r/mix_innodb_myisam_binlog.result
    1.26 06/02/18 21:08:37 guilhem@mysql.com +1 -0
    result update

ChangeSet
  1.2060.1.3 06/02/18 17:32:15 guilhem@mysql.com +3 -0
  Fix for BUG#13897 "failure to do SET SQL_MODE=N where N is a number > 31" (the original bug's title isn't the simplest
  symptom). sys_var::check_set() was wrong. mysqlbinlog makes use of such SET SQL_MODE=N
  (where N is interpreted like if SQL_MODE was a field of type SET), so
  this bug affected recovery from binlogs if the server was running with certain SQL_MODE values,
  for example the default values on Windows (STRICT_TRANS_TABLES); to work around this bug people
  had to edit mysqlbinlog's output.

  sql/set_var.cc
    1.150 06/02/18 17:32:11 guilhem@mysql.com +6 -1
    For a set, it does not make sense to test if the supplied argument exceeds the number of elements in the set
    (such test would make sense for an enum), but rather to check if it exceeds 2^this (to verify
    that only reasonable bits are set).

  mysql-test/t/sql_mode.test
    1.17 06/02/18 17:32:11 guilhem@mysql.com +9 -0
    test for various numeric SQL_MODE values

  mysql-test/r/sql_mode.result
    1.33 06/02/18 17:32:11 guilhem@mysql.com +16 -0
    result update

ChangeSet
  1.2060.1.2 06/02/18 17:26:30 guilhem@mysql.com +5 -0
  Fix for BUG#14769 "Function fails to replicate if fails half-way (slave stops)":
  if the function, invoked in a non-binlogged caller (e.g. SELECT, DO), failed half-way on the master,
  slave would stop and complain that error code between him and master mismatch. 
  To solve this, when a stored function is invoked in a non-binlogged caller (e.g. SELECT, DO), we binlog the function
  call as SELECT instead of as DO (see revision comment of sp_head.cc for more).
  And: minor wording change in the help text.
  This cset will cause conflicts in 5.1, I'll merge.

  sql/sp_head.cc
    1.201 06/02/18 17:26:26 guilhem@mysql.com +3 -9
    When a function updates data and is called from a non-binlogged statement (SELECT, DO), we binlog it 
    as SELECT myfunc(), and not DO myfunc() like before.

  sql/mysqld.cc
    1.534 06/02/18 17:26:25 guilhem@mysql.com +2 -2
    function -> stored function (change suggested by Paul)

  mysql-test/t/rpl_sp.test
    1.12 06/02/18 17:26:25 guilhem@mysql.com +5 -7
    test for more half-failed functions with DO and SELECT, to test the bug of this changeset.
    cleanup at the end.

  mysql-test/t/rpl_sp-slave.opt
    1.3 06/02/18 17:26:25 guilhem@mysql.com +1 -1
    bug just fixed so option not needed

  mysql-test/r/rpl_sp.result
    1.16 06/02/18 17:26:25 guilhem@mysql.com +13 -8
    result update

ChangeSet
  1.2060.1.1 06/02/18 17:19:16 guilhem@mysql.com +3 -0
  Fix for BUG#16559 "Replication Problems with Non transactional tables inside an interrupted trans.":
  problem was: when a connection disconnects having an open transaction affecting MyISAM and InnoDB, the ROLLBACK event stored in the binary log
  contained a non-zero error code (1053 because of the disconnection), so when slave applied the transaction, slave complained that its ROLLBACK succeeded
  (error_code=0) while master's had 1053, so slave stopped. But internally generated binlog events such as this ROLLBACK
  should always have 0 as error code, as is true in 4.1 and was accidentally broken in 5.0,
  so that there is no false alarm.

  sql/log.cc
    1.187 06/02/18 17:19:10 guilhem@mysql.com +5 -1
    Internally generated binlog events should always have an error code of zero (like in 4.1; in 5.0 this was accidentally broken).

  mysql-test/t/mix_innodb_myisam_binlog.test
    1.21 06/02/18 17:19:10 guilhem@mysql.com +32 -1
    test for BUG#16559

  mysql-test/r/mix_innodb_myisam_binlog.result
    1.25 06/02/18 17:19:10 guilhem@mysql.com +23 -0
    result update

ChangeSet
  1.2061 06/02/18 14:55:31 holyfoot@deer.(none) +1 -0
  --help option added to mysql_upgrade script

  scripts/mysql_upgrade.sh
    1.2 06/02/18 14:55:26 holyfoot@mysql.com +18 -0
    --help option implemented

ChangeSet
  1.2060 06/02/18 03:22:13 petr@mysql.com +1 -0
  Add a shift in the parser. Forgotten in the previous commit.

  server-tools/instance-manager/parse.cc
    1.13 06/02/18 03:22:10 petr@mysql.com +1 -0
    shift the second value for the log

ChangeSet
  1.2058 06/02/17 10:02:59 jimw@mysql.com +2 -0
  Fix subselect results (there was a bad merge when subselect test was disabled)

  mysql-test/r/subselect.result
    1.132.1.1 06/02/17 10:02:56 jimw@mysql.com +3 -3
    Update results

  BitKeeper/etc/ignore
    1.215 06/02/17 10:02:56 jimw@mysql.com +1 -0
    Added scripts/mysql_upgrade to the ignore list

ChangeSet
  1.2057 06/02/17 08:32:50 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-5.0-14676
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  sql/item_strfunc.cc
    1.263 06/02/17 08:32:46 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2054.1.1 06/02/17 08:32:52 paul@snake-hub.snake.net +1 -0
  mysqlcheck.c:
    Tweak --check-upgrade help text.

  client/mysqlcheck.c
    1.56 06/02/17 08:31:23 paul@snake-hub.snake.net +1 -1
    Tweak --check-upgrade help text.

ChangeSet
  1.1981.65.6 06/02/17 12:19:05 msvensson@neptunus.(none) +1 -0
  Set opt_vardir_trace for path for tracefiles 

  mysql-test/mysql-test-run.pl
    1.60.3.2 06/02/17 12:19:01 msvensson@neptunus.(none) +10 -10
    Set opt_vardir_trace for path for tracefiles 

ChangeSet
  1.1981.65.5 06/02/17 12:07:45 msvensson@neptunus.(none) +8 -0
  Replace win filename s with unix equivalent
  Evaluate commands passed to "exec" and "system" to expand any $variables before executing command.

  mysql-test/t/system_mysql_db_fix.test
    1.18 06/02/17 12:07:41 msvensson@neptunus.(none) +2 -1
    Call the "shell script" $MYSQL_FIX_SYSTEM_TABLE using --system

  mysql-test/t/rpl000015.test
    1.32 06/02/17 12:07:41 msvensson@neptunus.(none) +1 -1
    Remove unneccessary replace

  mysql-test/t/mysqltest.test
    1.28.3.1 06/02/17 12:07:41 msvensson@neptunus.(none) +18 -18
    Escape $variables passed to --exec, that should not be evaluated in exec.

  mysql-test/t/mysql_client_test.test
    1.16 06/02/17 12:07:41 msvensson@neptunus.(none) +0 -1
    Remove the useless "exec echo" command 

  mysql-test/t/client_xml.test
    1.4 06/02/17 12:07:41 msvensson@neptunus.(none) +6 -6
    Use " instead of '

  mysql-test/r/mysqldump.result
    1.87.1.1 06/02/17 12:07:41 msvensson@neptunus.(none) +1 -1
    Update test result

  mysql-test/mysql-test-run.pl
    1.60.3.1 06/02/17 12:07:41 msvensson@neptunus.(none) +13 -23
    Always pass path for DBUG .trace file in unix format
    Add search path client_debug to find debug compiled windows binaries
    Remove unused MYSQL_TEST_WINDIR and MASTER_WINMYSOCK

  client/mysqltest.c
    1.196.5.1 06/02/17 12:07:40 msvensson@neptunus.(none) +251 -227
    do_exec, do_system 
     - call do_eval on the command to be executed in order to expand any $variables
     - Remove old subst_env_var and my_popen, not needed anymore
    Rewrite 'replace_strings' into 'replace_strings_append'
     - copy whole strings instead of byte by byte copy
     - insert result directly inito dynamic_string, no need to check if out 
       string needs to be realloced for every byte.
     - Add comments and DBUG_PRINT's
    New function 'fix_win_paths', detect filenames in win format that should be converted 
    do_eval
    - Only set "escaped" if next char is \ or $

ChangeSet
  1.2054 06/02/17 10:56:54 holyfoot@mysql.com +1 -0
  Merge bk@192.168.21.1:mysql-5.0
  into mysql.com:/home/hf/work/mysql-5.0.w2645

  sql/sql_table.cc
    1.296 06/02/17 10:56:47 holyfoot@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2049.2.1 06/02/17 10:52:32 holyfoot@deer.(none) +12 -0
  WL#2645 (CHECK TABLE FOR UPGRADE)
  necessary implementation in the server
  mysql_upgrade script added

  scripts/mysql_upgrade.sh
    1.1 06/02/17 10:51:11 holyfoot@mysql.com +185 -0

  sql/sql_yacc.yy
    1.452.1.2 06/02/17 10:51:11 holyfoot@mysql.com +3 -1
    CHECK ... FOR UPGRADE added to syntax

  scripts/mysql_upgrade.sh
    1.0 06/02/17 10:51:11 holyfoot@mysql.com +0 -0
    BitKeeper file /home/hf/work/mysql-5.0.w2645/scripts/mysql_upgrade.sh

  sql/sql_table.cc
    1.294.1.1 06/02/17 10:51:10 holyfoot@mysql.com +31 -3
    upgrade in ha_repair implemented

  sql/slave.cc
    1.265 06/02/17 10:51:10 holyfoot@mysql.com +1 -1
    now ha_repair is for public use

  sql/share/errmsg.txt
    1.58.1.1 06/02/17 10:51:10 holyfoot@mysql.com +2 -0
    error message added

  sql/lex.h
    1.143 06/02/17 10:51:10 holyfoot@mysql.com +1 -0
    sym added

  sql/handler.h
    1.166 06/02/17 10:51:10 holyfoot@mysql.com +22 -0
    declarations regarding checks for upgrade

  sql/handler.cc
    1.210 06/02/17 10:51:10 holyfoot@mysql.com +152 -0
    checks for old types/bugs added

  scripts/Makefile.am
    1.50 06/02/17 10:51:10 holyfoot@mysql.com +3 -0
    mysql_upgrade script added

  include/myisam.h
    1.72 06/02/17 10:51:10 holyfoot@mysql.com +1 -0
    option added

  include/my_base.h
    1.76 06/02/17 10:51:10 holyfoot@mysql.com +2 -1
    errcode added

  client/mysqlcheck.c
    1.55 06/02/17 10:51:10 holyfoot@mysql.com +9 -1
    --check-upgrade option added

ChangeSet
  1.1981.65.4 06/02/16 23:05:15 msvensson@neptunus.(none) +1 -0
  #define popen(A,B) _popen((A),(B))

  include/config-win.h
    1.75 06/02/16 23:05:11 msvensson@neptunus.(none) +1 -1
    Fix strange "double" define for popen.

ChangeSet
  1.1981.65.3 06/02/16 22:10:25 msvensson@neptunus.(none) +2 -0
  Use the tmp dir of MYSQLTEST_VARDIR 

  mysql-test/t/sp.test
    1.167.2.1 06/02/16 22:10:21 msvensson@neptunus.(none) +6 -6
    Use the tmp dir of MYSQLTEST_VARDIR 

  mysql-test/r/sp.result
    1.178.2.1 06/02/16 22:10:21 msvensson@neptunus.(none) +2 -2
    Use the tmp dir of MYSQLTEST_VARDIR 

ChangeSet
  1.1981.65.2 06/02/16 22:06:07 msvensson@neptunus.(none) +1 -0
  Don't disable warnings when dropping objects that should exist

  mysql-test/t/mysqldump.test
    1.77.2.2 06/02/16 22:06:03 msvensson@neptunus.(none) +4 -4
    Don't disable warnings when dropping objects that should exist

ChangeSet
  1.1981.65.1 06/02/16 21:34:01 msvensson@neptunus.(none) +1 -0
  Use --system for unix command's

  mysql-test/t/mysqldump.test
    1.77.2.1 06/02/16 21:33:57 msvensson@neptunus.(none) +4 -4
    Use --system for unix command's

ChangeSet
  1.2049.1.4 06/02/16 21:11:38 evgen@moonbone.local +3 -0
  Merge

  mysql-test/t/disabled.def
    1.23 06/02/16 21:11:38 evgen@moonbone.local +0 -0
    SCCS merged

  sql/item.h
    1.186 06/02/16 20:54:42 evgen@moonbone.local +0 -0
    Auto merged

  sql/item.cc
    1.205 06/02/16 20:54:42 evgen@moonbone.local +0 -0
    Auto merged

ChangeSet
  1.2049.1.3 06/02/16 10:00:14 paul@snake-hub.snake.net +1 -0
  mysqlcheck.c:
    Fix out of order options.

  client/mysqlcheck.c
    1.54 06/02/16 09:59:46 paul@snake-hub.snake.net +4 -4
    Fix out of order options.

ChangeSet
  1.2040.11.2 06/02/16 16:22:53 dlenev@mysql.com +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
  into  mysql.com:/home/dlenev/src/mysql-5.0-bg16593

  sql/sql_update.cc
    1.185 06/02/16 16:22:46 dlenev@mysql.com +0 -0
    Auto merged

  sql/sql_prepare.cc
    1.170 06/02/16 16:22:46 dlenev@mysql.com +0 -0
    Auto merged

  sql/sql_base.cc
    1.327 06/02/16 16:22:46 dlenev@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2022.26.1 06/02/16 16:19:24 dlenev@mysql.com +4 -0
  Fix for bug #16593 "Deadlock or crash in stress test for case where
  trigger starts trigger".
  
  In short, the deadlock/crash happened when execution of statement, which used
  stored functions or activated triggers, coincided with alteration of the
  tables used by these functions or triggers (in highly concurrent environment).
  
  Bug was caused by the incorrect handling of tables from prelocked set in
  open_tables() functions in situations when refresh happened. This fix replaces
  old smart but not very robust way of handling tables after refresh (which was
  closing only old tables), with new one which simply closes all tables opened so
  far and restarts open_tables().
  Also fixed handling of temporary tables in close_tables_for_reopen().
  
  No test case present since bug manifests itself only in concurrent environment.

  sql/sql_update.cc
    1.183.1.1 06/02/16 16:19:19 dlenev@mysql.com +2 -2
    In order to handle correctly case when table list completely consists from tables
    from prelocked set close_tables_for_reopen() have to accept table list as in/out
    parameter.

  sql/sql_prepare.cc
    1.167.2.1 06/02/16 16:19:19 dlenev@mysql.com +1 -1
    In order to handle correctly case when table list completely consists from tables
    from prelocked set close_tables_for_reopen() have to accept table list as in/out
    parameter.

  sql/sql_base.cc
    1.324.1.1 06/02/16 16:19:19 dlenev@mysql.com +27 -57
    open_tables():
      Removed part of comment  which was out of date.
      Changed handling of case when refresh happens during opening of tables, now
      instead of having code which decides for each table if it should be closed
      we simply close all tables. Old code also incorrectly handled tables from
      prelocked set in this situation which resulted in bug #16593 "Deadlock or
      crash in stress test for case where triggers starting trigger".
    close_tables_for_reopen():
      Now we correctly handle the case when table list completely consists from
      tables from prelocked set. Also now we simply close all tables instead
      leaving temporary tables non-closed (such approach allows easily handle
      correctly tables from prelocked set).

  sql/mysql_priv.h
    1.373 06/02/16 16:19:18 dlenev@mysql.com +1 -1
    In order to handle correctly case when table list completely consists from tables
    from prelocked set close_tables_for_reopen() have to accept table list as in/out
    parameter.

ChangeSet
  1.1981.64.1 06/02/16 13:44:56 msvensson@neptunus.(none) +1 -0
  Bug#14057 mysql_ping() handles TCP and UNIX socket connections in different ways
   - Retry the ping if reconnect is turned on and the error was CR_SERVER_LOST

  libmysql/libmysql.c
    1.230.2.1 06/02/16 13:44:52 msvensson@neptunus.(none) +5 -1
    Send a new ping if first ping fails with CR_SERVER_LOST and reconnect is turned on 

ChangeSet
  1.2040.13.1 06/02/16 12:02:38 msvensson@neptunus.(none) +4 -0
  Bug#2845 client fails to reconnect if using TCP/IP
  - Detect that connection to server has been broken in "net_clear". Since 
    net_clear is always called before we send command to server, we can be sure
    that server has not received the command.

  sql/net_serv.cc
    1.85 06/02/16 12:02:34 msvensson@neptunus.(none) +74 -11
    Make "net_clear" detect if connection with server has been broken by 
    performing a select. If the select returns that there are data to read but
    no data can be read, that means the connection is broken. Signal disconnected
    to "write" functions by setting error to 2. 

  mysql-test/t/wait_timeout.test
    1.2 06/02/16 12:02:34 msvensson@neptunus.(none) +18 -2
    Test that same error message is returned when disconnected regardless of connection is socket or TCP
    Decrease sleep times

  mysql-test/t/wait_timeout-master.opt
    1.2 06/02/16 12:02:34 msvensson@neptunus.(none) +1 -1
    Decrease wait_timeout value to avoid unneccessary sleeps 

  mysql-test/r/wait_timeout.result
    1.2 06/02/16 12:02:34 msvensson@neptunus.(none) +8 -0
    Update test result

ChangeSet
  1.2049.1.1 06/02/16 10:03:13 msvensson@neptunus.(none) +1 -0
  ndb_load disabled

  mysql-test/t/disabled.def
    1.22 06/02/16 10:03:09 msvensson@neptunus.(none) +1 -0
    Disable ndb_load again...

ChangeSet
  1.2050 06/02/16 08:59:55 ingo@mysql.com +2 -0
  Merge mysql.com:/home/mydev/mysql-5.0
  into  mysql.com:/home/mydev/mysql-5.0-bug8841

  mysql-test/r/myisam.result
    1.73 06/02/16 08:59:48 ingo@mysql.com +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.156 06/02/16 08:59:48 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2040.12.1 06/02/16 00:53:55 msvensson@neptunus.(none) +1 -0
  Bug#13809 mysql-test: --replace_result option works on Windows incorrect

  client/mysqltest.c
    1.200.1.1 06/02/16 00:53:51 msvensson@neptunus.(none) +7 -1
    Convert cr/lf to lf

ChangeSet
  1.1981.63.2 06/02/15 22:46:16 msvensson@neptunus.(none) +2 -0
  Bug#16795 ndb_cache_multi2
   - remove timing dependent part of test, wait until condition occurs or sleep max 10 seconds

  mysql-test/t/ndb_cache_multi2.test
    1.4 06/02/15 22:46:12 msvensson@neptunus.(none) +19 -8
    Convert long sleeps to a while leep whith small sleeps and a check if condition has occured.
    This allows slower machines to sleep longer if needed.

  mysql-test/r/ndb_cache_multi2.result
    1.3 06/02/15 22:46:12 msvensson@neptunus.(none) +2 -5
    Update test results

ChangeSet
  1.1981.63.1 06/02/15 22:43:42 msvensson@neptunus.(none) +3 -0
  Add possibility to have a negative expression in "if" and "while" in mysqltest 

  mysql-test/t/mysqltest.test
    1.28.2.1 06/02/15 22:43:38 msvensson@neptunus.(none) +30 -1
    Add test for if
    Add test for while with ! expr

  mysql-test/r/mysqltest.result
    1.24.2.1 06/02/15 22:43:38 msvensson@neptunus.(none) +3 -0
    Update test results

  client/mysqltest.c
    1.196.2.3 06/02/15 22:43:38 msvensson@neptunus.(none) +45 -4
    Extend 'do_block' to be able to process a !<expression>. 
    Making it possible to do 'if(!$i)' and 'while(!$i)'

ChangeSet
  1.2048 06/02/15 20:16:33 msvensson@neptunus.(none) +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  tests/mysql_client_test.c
    1.175 06/02/15 20:16:27 msvensson@neptunus.(none) +0 -0
    Auto merged

  libmysql/libmysql.c
    1.235 06/02/15 20:16:27 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1974.9.1 06/02/15 19:45:06 evgen@moonbone.local +4 -0
  Fix bug #15706 find_field_in_tables() returns field from outer select
  
  If item->cached_table is set, find_field_in_tables() returns found field
  even if it doesn't belong to current select. Because Item_field::fix_fields
  doesn't expect such behaviour, reported bug occurs.
  
  Item_field::fix_fields() was modifed to detect when find_field_in_tables() 
  can return field from outer select and process such fields accordingly.
  In order to ease this code which was searching and processing outed fields was
  moved into separate function called Item_field::fix_outer_field().

  mysql-test/t/disabled.def
    1.16.1.1 06/02/15 19:44:41 evgen@moonbone.local +0 -1
    Fixed bug #15706: find_field_in_tables() returns field from outer select
    Enable subselect test

  sql/item.cc
    1.200.1.1 06/02/15 19:33:48 evgen@moonbone.local +283 -194
    Fixed bug #15706: find_field_in_tables() returns field from outer select
    
    Item_ref::fix_fields() and Item_field::fix_fields() were modifed to detect when
    find_field_in_tables() can return field from outer select and process such
    fields accordingly.
    In order to ease this, code Item_field::fix_fields() which was searching and
    processing outer fields was moved into separate function called
    Item_field::fix_outer_field().
    To the Item_field::fix_field() added a loop for finding context for found field.
    
    

  sql/item.h
    1.183.1.1 06/02/15 19:33:26 evgen@moonbone.local +1 -0
    Fixed bug #15706: find_field_in_tables() returns field from outer select
    fix_outer_field() function is added to the Item_field class.

  sql/item_subselect.h
    1.76 06/02/15 19:33:15 evgen@moonbone.local +1 -0
    Fixed bug #15706: find_field_in_tables() returns field from outer select
    Item_field::fix_outer_field() was marked as friend to Item_subselect class.

ChangeSet
  1.2040.11.1 06/02/15 17:28:34 pem@mysql.com +2 -0
  Additional tests for nested handlers added to sp.test.
  A follow-up to BUG#15011 (already fixed).

  mysql-test/t/sp.test
    1.174.1.1 06/02/15 17:28:30 pem@mysql.com +392 -1
    Additional tests for nested handlers.

  mysql-test/r/sp.result
    1.185.1.1 06/02/15 17:28:30 pem@mysql.com +333 -2
    Updated results for new handler tests.

ChangeSet
  1.2040.3.8 06/02/15 13:45:03 msvensson@devsrv-b.mysql.com +2 -0
  Bug#16143 mysql_stmt_sqlstate returns an empty string instead of '00000'
   - Init sql_state in mysql_stmt_init

  tests/mysql_client_test.c
    1.173.1.1 06/02/15 13:44:59 msvensson@devsrv-b.mysql.com +16 -0
    Add test for mysql_stmt_sqlstate after mysql_stmt_init

  libmysql/libmysql.c
    1.233.1.1 06/02/15 13:44:59 msvensson@devsrv-b.mysql.com +1 -0
    Init sql_state to not_error_sql_state in mysql_init

ChangeSet
  1.2040.2.2 06/02/15 12:11:29 pem@mysql.com +5 -0
  Fixed BUG#16887: Cursor causes server segfault
    The problem was a code generation bug: cpop instructions were not generated
    when using ITERATE back to an outer block from a context with a declared
    cursor; this would make it push a new cursor without popping in-between,
    eventually overrunning the cursor stack with a crash as the result.
    Fixed the calculation of how many cursors to pop (in sp_pcontext.cc:
    diff_cursors()), and also corrected diff_cursors() and diff_handlers()
    to when doing a "leave"; don't include the last context we're leaving
    (we are then jumping to the appropriate pop instructions).

  sql/sql_yacc.yy
    1.454 06/02/15 12:11:25 pem@mysql.com +4 -4
    Added parameter to diff_handlers/diff_cursors depending on if it's an
    iterate or leave jump.
    For "leave", we don't have to include the last context we're leaving since
    we will jump to the appropriate pop instructions.

  sql/sp_pcontext.h
    1.27 06/02/15 12:11:25 pem@mysql.com +7 -3
    Added new parameter to sp_pcontext::diff_handlers() and diff_cursors():
    They can either include (for iterate jumps) or exclude (for leave jumps)
    the outer context.

  sql/sp_pcontext.cc
    1.29 06/02/15 12:11:25 pem@mysql.com +12 -4
    Added new parameter to sp_pcontext::diff_handlers() and diff_cursors():
    They can either include (for iterate jumps) or exclude (for leave jumps)
    the outer context.
    Fixed bug in diff_cursors(); it was just plain wrong and would return
    zero in some situations when it shouldn't.

  mysql-test/t/sp.test
    1.175 06/02/15 12:11:25 pem@mysql.com +54 -0
    New test case for BUG#16887

  mysql-test/r/sp.result
    1.186 06/02/15 12:11:25 pem@mysql.com +56 -0
    Updated result for new test case (BUG#16887)

ChangeSet
  1.2040.10.1 06/02/15 16:37:09 stewart@mysql.com +3 -0
  BUG#17411 cannot have path longer than 128 characters
  
  Use the POSIX limits.h define of PATH_MAX for maximum path length.
  
  This has been being hit in pushbuild

  ndb/src/common/util/File.cpp
    1.10 06/02/15 16:37:06 stewart@mysql.com +2 -2
    use PATH_MAX for maximum filename length

  ndb/src/common/portlib/NdbConfig.c
    1.17 06/02/15 16:37:06 stewart@mysql.com +17 -17
    use PATH_MAX for max path name length instead of hardcoding 128

  ndb/include/util/File.hpp
    1.5 06/02/15 16:37:06 stewart@mysql.com +1 -3
    use PATH_MAX for maximum filename length

ChangeSet
  1.2040.7.4 06/02/14 18:14:04 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-clean
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  client/mysqldump.c
    1.220 06/02/14 18:14:01 jimw@mysql.com +0 -5
    Resolve conflict by using local version

ChangeSet
  1.2040.9.2 06/02/14 17:21:18 msvensson@neptunus.(none) +1 -0
  Enable ndb_load test case

  mysql-test/t/disabled.def
    1.21 06/02/14 17:21:13 msvensson@neptunus.(none) +0 -1
    Enable test case

ChangeSet
  1.2040.9.1 06/02/14 17:15:24 msvensson@neptunus.(none) +2 -0
  Change from std_data to std_data_ln

  mysql-test/t/ndb_load.test
    1.2 06/02/14 17:15:09 msvensson@neptunus.(none) +2 -2
    Change from std_data to std_data_ln

  mysql-test/r/ndb_load.result
    1.2 06/02/14 17:15:09 msvensson@neptunus.(none) +2 -2
    Change from std_data to std_data_ln

ChangeSet
  1.2043 06/02/14 15:34:30 msvensson@neptunus.(none) +3 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug17280/my50-bug17280
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  mysql-test/t/mysqltest.test
    1.33 06/02/14 15:34:24 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/mysqltest.result
    1.27 06/02/14 15:34:24 msvensson@neptunus.(none) +0 -0
    Auto merged

  client/mysqltest.c
    1.202 06/02/14 15:34:24 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2038.3.1 06/02/14 16:22:37 evgen@moonbone.local +3 -0
  Fixed bug#16272: IF function with decimal args can produce wrong result
  
  The Item_func_if::fix_length_and_dec() function when calculating length of 
  result doesn't take into account unsigned_flag. But it is taken when 
  calculating length of temporary field. This result in creating field that 
  shorter than needed. Due to this, in the reported query 40.0 converted to 9.99.
  
  The function Item_func_if::fix_length_and_dec() now adds 1 to the max_length if 
  the unsigned_flag isn't set.

  mysql-test/t/func_if.test
    1.19 06/02/14 15:24:31 evgen@moonbone.local +8 -0
    Added test case for bug#16272: IF function with decimal args can produce wrong result

  mysql-test/r/func_if.result
    1.21 06/02/14 15:24:07 evgen@moonbone.local +7 -0
    Added test case for bug#16272: IF function with decimal args can produce wrong result

  sql/item_cmpfunc.cc
    1.191 06/02/14 15:21:59 evgen@moonbone.local +2 -1
    Fixed bug#16272: IF function with decimal args can produce wrong result
    The function Item_func_if::fix_length_and_dec() now adds 1 to the max_length if 
    the unsigned_flag isn't set.

ChangeSet
  1.2038.2.1 06/02/14 11:34:46 msvensson@neptunus.(none) +1 -0
  Bug#16333 Assertion failure in lock.cc in the sysbench test
   - Set the value of mp->thread before mp->count to avoid race condition.

  mysys/thr_mutex.c
    1.28 06/02/14 11:34:30 msvensson@neptunus.(none) +5 -4
    Set mp->thread before mp->count is changed. 
    Since mp->count is used in the macros 'safe_mutex_assert_not_owner' and 
    'safe_mutex_assert_owner' as an inidicator wheter to look at the mp->thread
    variable or not. This means that when mp->count is changed, the mp->thread
    should akready be set to the owning thread.
    Also set mp->thread to 0 when unlocking the mutex.

ChangeSet
  1.2040.7.2 06/02/14 11:33:46 evgen@moonbone.local +1 -0
  Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
  into moonbone.local:/work/16752-bug-5.0-mysql

  sql/sql_select.cc
    1.393.1.1 06/02/14 11:33:44 evgen@moonbone.local +0 -0
    Auto merged

ChangeSet
  1.2040.7.1 06/02/14 08:25:09 bar@mysql.com +1 -0
  Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/usr/home/bar/mysql-5.0.cs_fs

  sql/set_var.cc
    1.149 06/02/14 08:24:58 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2038.1.1 06/02/14 08:24:01 bar@mysql.com +8 -0
  Many files:
    Backporting character_set_filesystem from 5.0 to 5.1.

  mysql-test/r/variables.result
    1.79 06/02/14 08:23:44 bar@mysql.com +18 -0
    Backporting character_set_filesystem from 5.0 to 5.1.

  mysql-test/t/variables.test
    1.54 06/02/14 08:23:40 bar@mysql.com +14 -0
    Backporting character_set_filesystem from 5.0 to 5.1.

  sql/sql_yacc.yy
    1.452.1.1 06/02/14 08:22:32 bar@mysql.com +16 -4
    Backporting character_set_filesystem from 5.0 to 5.1.

  sql/sql_class.h
    1.280 06/02/14 08:22:30 bar@mysql.com +2 -0
    Backporting character_set_filesystem from 5.0 to 5.1.

  sql/sql_class.cc
    1.227 06/02/14 08:22:28 bar@mysql.com +3 -0
    Backporting character_set_filesystem from 5.0 to 5.1.

  sql/set_var.h
    1.73 06/02/14 08:22:27 bar@mysql.com +9 -0
    Backporting character_set_filesystem from 5.0 to 5.1.

  sql/set_var.cc
    1.147.1.1 06/02/14 08:22:24 bar@mysql.com +29 -0
    Backporting character_set_filesystem from 5.0 to 5.1.

  sql/mysqld.cc
    1.533 06/02/14 08:22:02 bar@mysql.com +16 -0
    Backporting character_set_filesystem from 5.0 to 5.1.

ChangeSet
  1.2022.25.1 06/02/13 18:50:06 igor@rurik.mysql.com +3 -0
  Fixed bug #16603.
  A subquery transformation changes the HAVING clause of the embedding query if the subquery contains
  a GROUP BY clause. Yet the split_sum_func2 function was not applied to the modified HAVING clause.
  This could result in wrong answers.

  sql/sql_select.cc
    1.394 06/02/13 18:50:00 igor@rurik.mysql.com +15 -14
    Fixed bug #16603.
    A subquery transformation changes the HAVING clause of the embedding query if the subquery contains
    a GROUP BY clause. Yet the split_sum_func2 function was not applied to the modified HAVING clause.
    This could result in wrong answers.  

  mysql-test/t/subselect.test
    1.113 06/02/13 18:50:00 igor@rurik.mysql.com +22 -0
    Added a test case for bug #16603.

  mysql-test/r/subselect.result
    1.133 06/02/13 18:50:00 igor@rurik.mysql.com +29 -3
    Added a test case for bug #16603.

ChangeSet
  1.2040.4.2 06/02/14 03:09:17 petr@mysql.com +3 -0
  fix Bug#12813 "Instance Manager: START/STOP INSTANCE
                 commands accept a list as argument"

  server-tools/instance-manager/parse.cc
    1.12 06/02/14 03:09:14 petr@mysql.com +10 -7
    check for nonaplhanumeric symbols at the end of the commands

  mysql-test/t/im_life_cycle.imtest
    1.4 06/02/14 03:09:14 petr@mysql.com +15 -0
    add a test for the bug

  mysql-test/r/im_life_cycle.result
    1.4 06/02/14 03:09:14 petr@mysql.com +4 -0
    update result file

ChangeSet
  1.2040.3.5 06/02/13 23:38:12 aelkin@mysql.com +4 -0
  Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug16217
  into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0

  sql/log_event.cc
    1.203 06/02/13 23:38:06 aelkin@mysql.com +0 -0
    Auto merged

  mysql-test/t/mysqlbinlog.test
    1.24 06/02/13 23:38:06 aelkin@mysql.com +0 -1
    Auto merged

  mysql-test/r/mysqlbinlog.result
    1.21 06/02/13 23:38:06 aelkin@mysql.com +0 -1
    Auto merged

  client/mysql.cc
    1.196 06/02/13 23:38:06 aelkin@mysql.com +0 -1
    Auto merged

ChangeSet
  1.2040.5.2 06/02/13 23:36:23 aelkin@mysql.com +4 -0
  Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217
  into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0

  sql/log_event.cc
    1.201.1.1 06/02/13 23:36:18 aelkin@mysql.com +0 -12
    manual merge use local

  mysql-test/t/mysqlbinlog.test
    1.22.1.1 06/02/13 23:36:18 aelkin@mysql.com +1 -18
    manual merge use local

  mysql-test/r/mysqlbinlog.result
    1.19.1.1 06/02/13 23:36:18 aelkin@mysql.com +1 -18
    manual merge use local

  client/mysql.cc
    1.194.1.1 06/02/13 23:36:18 aelkin@mysql.com +1 -25
    manual merge use local

ChangeSet
  1.2039.1.1 06/02/13 11:20:15 paul@snake-hub.snake.net +1 -0
  set_var.cc:
    Fix out-of-order system variable.

  sql/set_var.cc
    1.148 06/02/13 11:19:43 paul@snake-hub.snake.net +1 -1
    Fix out-of-order system variable.

ChangeSet
  1.2040.1.2 06/02/13 19:53:34 SergeyV@selena. +3 -0
  Fixes bug #15943. resets error flag for show create view command, to allow 
  proper processing of multiple sql statements sent as a single command.

  sql/sql_show.cc
    1.308 06/02/13 19:53:24 SergeyV@selena. +7 -0
    Fixes bug #15943. resets error flag for show create view command, to allow 
    proper processing of multiple sql statements sent as a single command.

  mysql-test/t/view.test
    1.135 06/02/13 19:53:23 SergeyV@selena. +15 -0
    test case added for bug #15943

  mysql-test/r/view.result
    1.146 06/02/13 19:53:22 SergeyV@selena. +10 -0
    result file update for #15943 test case

ChangeSet
  1.2040.1.1 06/02/13 17:51:22 SergeyV@selena. +1 -0
  Merge selena.:H:/MYSQL/bkt/mysql-4.1
  into  selena.:H:/MYSQL/bkt/mysql-5.0

  mysys/my_init.c
    1.44 06/02/13 17:51:11 SergeyV@selena. +0 -1
    Auto merged

ChangeSet
  1.2041 06/02/13 14:55:56 msvensson@neptunus.(none) +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  tests/mysql_client_test.c
    1.174 06/02/13 14:55:46 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1981.61.2 06/02/13 14:02:39 msvensson@neptunus.(none) +1 -0
  Bug#16557 mysql cmd-line client does not rename .mysql_history.TMP to .mysql_history
   - Return error only if 'history' returns -1

  cmd-line-utils/libedit/readline.c
    1.10 06/02/13 14:02:35 msvensson@neptunus.(none) +2 -2
    Return 1 to indicate error only if 'history' returned -1, since the history function normally will return the number of entries written or read. Only -1 indicates error. 

ChangeSet
  1.2039 06/02/13 04:11:22 brian@zim.tangent.org +2 -0
  Discoved while debugging in 5.1 that there was a bug where a certain crash could lead to two problems. 1) An additional share in memory that was allocated but did not have the correct use_count (so it would never be fulled deleted). Also discovered that a thread that called repair would write new rows, but would not see them. All other threads were ok, and the data was fine, but the thread doing the repair was unable to see the new rows.

  sql/ha_archive.h
    1.32 06/02/13 04:11:15 brian@zim.tangent.org +1 -1
    Change in method

  sql/ha_archive.cc
    1.66 06/02/13 04:11:15 brian@zim.tangent.org +58 -10
    Fix for leaked share and hidden rows.

ChangeSet
  1.2033.1.1 06/02/13 12:58:12 tomas@poseidon.ndb.mysql.com +9 -0
  ndb:
  add optional reporting of of a "name" tied to a nodeid in the cluster log
  reporting added for mysql server and ndb_restore

  sql/ha_ndbcluster.cc
    1.233 06/02/13 12:58:03 tomas@poseidon.ndb.mysql.com +5 -1
    ndb:
    add optional reporting of of a "name" tied to a nodeid in the cluster log
    reporting added for mysql server and ndb_restore

  ndb/tools/restore/restore_main.cpp
    1.34 06/02/13 12:58:03 tomas@poseidon.ndb.mysql.com +10 -1
    ndb:
    add optional reporting of of a "name" tied to a nodeid in the cluster log
    reporting added for mysql server and ndb_restore

  ndb/tools/restore/consumer_restore.cpp
    1.21 06/02/13 12:58:03 tomas@poseidon.ndb.mysql.com +3 -0
    ndb:
    add optional reporting of of a "name" tied to a nodeid in the cluster log
    reporting added for mysql server and ndb_restore

  ndb/src/ndbapi/ndb_cluster_connection_impl.hpp
    1.3 06/02/13 12:58:03 tomas@poseidon.ndb.mysql.com +2 -0
    ndb:
    add optional reporting of of a "name" tied to a nodeid in the cluster log
    reporting added for mysql server and ndb_restore

  ndb/src/ndbapi/ndb_cluster_connection.cpp
    1.35 06/02/13 12:58:03 tomas@poseidon.ndb.mysql.com +28 -2
    ndb:
    add optional reporting of of a "name" tied to a nodeid in the cluster log
    reporting added for mysql server and ndb_restore

  ndb/src/mgmsrv/Services.cpp
    1.59 06/02/13 12:58:03 tomas@poseidon.ndb.mysql.com +7 -0
    ndb:
    add optional reporting of of a "name" tied to a nodeid in the cluster log
    reporting added for mysql server and ndb_restore

  ndb/src/mgmapi/mgmapi.cpp
    1.58 06/02/13 12:58:03 tomas@poseidon.ndb.mysql.com +13 -0
    ndb:
    add optional reporting of of a "name" tied to a nodeid in the cluster log
    reporting added for mysql server and ndb_restore

  ndb/include/ndbapi/ndb_cluster_connection.hpp
    1.11 06/02/13 12:58:03 tomas@poseidon.ndb.mysql.com +8 -0
    ndb:
    add optional reporting of of a "name" tied to a nodeid in the cluster log
    reporting added for mysql server and ndb_restore

  ndb/include/mgmapi/mgmapi.h
    1.47 06/02/13 12:58:03 tomas@poseidon.ndb.mysql.com +8 -0
    ndb:
    add optional reporting of of a "name" tied to a nodeid in the cluster log
    reporting added for mysql server and ndb_restore

ChangeSet
  1.2022.23.1 06/02/13 10:56:45 msvensson@neptunus.(none) +3 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug14013/my50-bug14013
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  tests/mysql_client_test.c
    1.172.1.1 06/02/13 10:56:20 msvensson@neptunus.(none) +0 -0
    Auto merged

  libmysql/libmysql.c
    1.234 06/02/13 10:56:20 msvensson@neptunus.(none) +0 -0
    Auto merged

  client/mysqltest.c
    1.201 06/02/13 10:56:19 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2038 06/02/12 04:33:50 kent@mysql.com +6 -0
  Merge

  mysql-test/mysql-test-run.pl
    1.69 06/02/12 04:33:44 kent@mysql.com +4 -84

  sql/spatial.cc
    1.27 06/02/12 04:26:43 kent@mysql.com +0 -2
    Auto merged

  scripts/make_binary_distribution.sh
    1.104 06/02/12 04:26:43 kent@mysql.com +0 -0
    Auto merged

  mysql-test/lib/mtr_report.pl
    1.19 06/02/12 04:26:43 kent@mysql.com +0 -0
    Auto merged

  mysql-test/lib/mtr_process.pl
    1.27 06/02/12 04:26:43 kent@mysql.com +0 -17
    Auto merged

  mysql-test/lib/mtr_cases.pl
    1.14 06/02/12 04:26:42 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2495.2 06/02/12 04:13:24 kent@mysql.com +5 -0
  spatial.cc:
    Added { ... } around float8get() macro, avoids VC7 error
    message "illegal else without matching if"
  mtr_report.pl:
    Parse error logs to create "warnings" file
  mtr_cases.pl:
    Added optoion --ignore-disabled-def
    Windows build now let TZ pass, removed
    work around
  mysql-test-run.pl, mtr_process.pl:
    Back port of changes from 5.0

  sql/spatial.cc
    1.19.1.5 06/02/12 04:10:47 kent@mysql.com +2 -0
    Added { ... } around float8get() macro, avoids VC7 error
    message "illegal else without matching if"

  mysql-test/lib/mtr_report.pl
    1.11.1.5 06/02/12 04:09:20 kent@mysql.com +45 -27
    Parse error logs to create "warnings" file

  mysql-test/lib/mtr_cases.pl
    1.6.1.3 06/02/12 04:05:48 kent@mysql.com +3 -4
    Added optoion --ignore-disabled-def
    Windows build now let TZ pass, removed
    work around

  mysql-test/mysql-test-run.pl
    1.8.2.44 06/02/12 03:58:06 kent@mysql.com +85 -19
    Back port of changes from 5.0

ChangeSet
  1.1616.2495.1 06/02/12 01:35:30 kent@mysql.com +1 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
  into mysql.com:/Users/kent/mysql/bk/mysql-4.1

  scripts/make_binary_distribution.sh
    1.55.1.36 06/02/12 01:35:26 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.1.828 06/02/12 01:33:43 kent@mysql.com +1 -0
  make_binary_distribution.sh:
    print => echo in shell script

  scripts/make_binary_distribution.sh
    1.49.1.13 06/02/12 01:33:13 kent@mysql.com +1 -1
    print => echo in shell script

  mysql-test/lib/mtr_process.pl
    1.15.2.1 06/02/12 00:45:04 kent@mysql.com +17 -8
    Back port of changes from 5.0

ChangeSet
  1.2037 06/02/12 00:10:43 knielsen@mysql.com +1 -0
  Merge mysql.com:/usr/local/mysql/mysql-4.1-fixrace
  into  mysql.com:/usr/local/mysql/mysql-5.0

  mysql-test/lib/mtr_process.pl
    1.26 06/02/12 00:10:32 knielsen@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2036 06/02/11 23:44:56 kent@mysql.com +2 -0
  Merge

  mysql-test/mysql-test-run.pl
    1.68 06/02/11 23:44:48 kent@mysql.com +9 -8

  mysql-test/mysql-test-run.sh
    1.292 06/02/11 23:39:00 kent@mysql.com +0 -1
    Auto merged

ChangeSet
  1.1616.2144.117 06/02/11 23:35:23 kent@mysql.com +2 -0
  mysql-test-run.{pl,sh}:
    Give space for second and third slave port

  mysql-test/mysql-test-run.sh
    1.208.1.52 06/02/11 23:33:54 kent@mysql.com +1 -1
    Give space for second and third slave port

  mysql-test/mysql-test-run.pl
    1.8.2.43 06/02/11 23:32:40 kent@mysql.com +10 -4
    Give space for second and third slave port
    Define shell variables for all ports, and
    list these at startup

ChangeSet
  1.1616.2494.1 06/02/11 22:50:59 knielsen@mysql.com +1 -0
  Fix a race on some platforms in mysql-test-run.pl, where it would sometimes
  errorneously abort reporting failure to kill child processes, where in
  reality the problem was merely that the child had become a zombie because
  of missing waitpid() call.

  mysql-test/lib/mtr_process.pl
    1.15.1.6 06/02/11 22:50:52 knielsen@mysql.com +9 -1
    Fix race (on some platforms) when killing processes.

ChangeSet
  1.2022.22.1 06/02/11 21:51:43 sergefp@mysql.com +5 -0
  BUG#17314: Can't use index_merge/intersection for MERGE tables
  1. Fix index access costs for MERGE tables, set block_size=myisam_block_size/#underlying_tables 
     instead of 0 which it was before.
  2. Make index scans on MERGE table to return records in (key_tuple, merge_table_rowid) order, 
     instead of just (key_tuple) order. This makes an index scan on MERGE table to be truly a ROR-scan
     which is a requirement for index_merge union/intersection.

  sql/ha_myisammrg.cc
    1.76 06/02/11 21:51:37 sergefp@mysql.com +21 -1
    BUG#17314: For MERGE tables, set handler::block_size to myisam_block_size/#underlying_tables, and not to 0.

  mysql-test/t/index_merge.test
    1.14 06/02/11 21:51:37 sergefp@mysql.com +26 -0
    Testcase for BUG#17314

  mysql-test/r/merge.result
    1.46 06/02/11 21:51:37 sergefp@mysql.com +1 -1
    BUG#17314: update testcase result

  mysql-test/r/index_merge.result
    1.19 06/02/11 21:51:37 sergefp@mysql.com +22 -0
    Testcase for BUG#17314

  myisammrg/myrg_queue.c
    1.12 06/02/11 21:51:37 sergefp@mysql.com +17 -3
    BUG#17314: Make index scans on MERGE table return records ordered by (keytuple, merge_table_rowid). 

ChangeSet
  1.2035 06/02/10 19:56:34 kent@mysql.com +2 -0
  mysql-test-run.pl:
    Display instance manager port
  mysql-test-run.sh:
    Give port space for more than one slave

  mysql-test/mysql-test-run.pl
    1.67 06/02/10 19:56:19 kent@mysql.com +1 -0
    Display instance manager port

  mysql-test/mysql-test-run.sh
    1.291 06/02/10 19:55:46 kent@mysql.com +1 -1
    Give port space for more than one slave

ChangeSet
  1.2034 06/02/10 19:47:46 kent@mysql.com +4 -0
  Merge

  mysql-test/mysql-test-run.pl
    1.66 06/02/10 19:47:00 kent@mysql.com +7 -6
    Rearranged the port numbers to fit into the range

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.83 06/02/10 19:25:41 kent@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.43 06/02/10 19:25:40 kent@mysql.com +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.290 06/02/10 19:25:39 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1981.62.1 06/02/10 18:07:14 joerg@mysql.com +1 -0
  support-files/mysql.spec.sh  :   Manual merge: new "-i" in "make -i test-force", changelog.

  support-files/mysql.spec.sh
    1.131 06/02/10 18:07:09 joerg@mysql.com +5 -5
    Manual merge: new "-i" in "make -i test-force", changelog.

ChangeSet
  1.2030.1.2 06/02/10 17:59:53 tomas@poseidon.ndb.mysql.com +1 -0
  manual merge

  sql/ha_ndbcluster.cc
    1.232 06/02/10 17:59:41 tomas@poseidon.ndb.mysql.com +2 -2
    manual merge

ChangeSet
  1.2030.1.1 06/02/10 17:50:17 tomas@poseidon.ndb.mysql.com +4 -0
  Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
  into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

  sql/ha_ndbcluster.cc
    1.231 06/02/10 17:50:12 tomas@poseidon.ndb.mysql.com +2 -5
    manual merge

  mysql-test/t/ndb_basic.test
    1.35 06/02/10 17:50:12 tomas@poseidon.ndb.mysql.com +20 -20
    manual merge

  mysql-test/r/ndb_basic.result
    1.34 06/02/10 17:50:12 tomas@poseidon.ndb.mysql.com +22 -22
    manual merge

  sql/ha_ndbcluster.h
    1.95 06/02/10 17:44:42 tomas@poseidon.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2493.1 06/02/10 17:40:22 tomas@poseidon.ndb.mysql.com +4 -0
  Bug #17249 ndb, delete statement with join where clause fails when table do not have pk
  Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key
  
  change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead

  sql/ha_ndbcluster.h
    1.40.6.14 06/02/10 17:40:18 tomas@poseidon.ndb.mysql.com +3 -0
    Bug #17249 delete statement with join where clause fails when table do not have pk
    Bug #17257 update fails for inner joins if tables do not have Primary Key
    
    change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead

  sql/ha_ndbcluster.cc
    1.114.3.63 06/02/10 17:40:18 tomas@poseidon.ndb.mysql.com +6 -14
    Bug #17249 delete statement with join where clause fails when table do not have pk
    Bug #17257 update fails for inner joins if tables do not have Primary Key
    
    change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead

  mysql-test/t/ndb_basic.test
    1.22.1.6 06/02/10 17:40:18 tomas@poseidon.ndb.mysql.com +66 -0
    Bug #17249 delete statement with join where clause fails when table do not have pk
    Bug #17257 update fails for inner joins if tables do not have Primary Key

  mysql-test/r/ndb_basic.result
    1.22.1.4 06/02/10 17:40:18 tomas@poseidon.ndb.mysql.com +55 -0
    Bug #17249 delete statement with join where clause fails when table do not have pk
    Bug #17257 update fails for inner joins if tables do not have Primary Key

ChangeSet
  1.1616.2492.1 06/02/10 17:40:04 joerg@mysql.com +1 -0
  support-files/mysql.spec.sh  :  Use "-i" on "make test-force", essential for log file evaluation.

  support-files/mysql.spec.sh
    1.83.1.30 06/02/10 17:40:00 joerg@mysql.com +7 -2
    Use "-i" on "make test-force";
    this will prevent "make" from writing "***" which in turn was treated as a _build_ error
    by the log evaluation tool, causing it not to list the failing tests.

ChangeSet
  1.1981.61.1 06/02/10 14:50:29 msvensson@neptunus.(none) +3 -0
  Bug#14013 mysql_stmt_store_result() bombs if a cursor is open
   - Add code to 'mysql_stmt_store_result' to allow it to be called on 
     a prepared statement with open server side cursor.
   - Add tests to mysql_client_test that uses 'mysql_stmt_store_result'

  tests/mysql_client_test.c
    1.167.2.1 06/02/10 14:50:25 msvensson@neptunus.(none) +17 -3
    Update 'fetch_n' function to take parameter indicating if 'mysql_stmt_store_result' should be used on the statement.
    Call fetch_n with parameter set to use 'mysql_stmt_store_result'

  libmysql/libmysql.c
    1.230.1.1 06/02/10 14:50:25 msvensson@neptunus.(none) +33 -2
    Allow 'mysql_stmt_store_result' to be called on a statement with an open server side cursor.
    Detect that a server side cursor is open and send a "fetch" to ask for all rows to be sent to the client.
    Read all binary rows as normal store.
    Check that server said last row was sent after all binary rows has been sent. 

  client/mysqltest.c
    1.196.4.1 06/02/10 14:50:25 msvensson@neptunus.(none) +23 -17
    Enable cursor protocol(remove the ifdef BUG14013_FIXED)
    When running in cursor mode, the warnings from execute needs 
    to be extracted after mysql_stmt_execute, put them in a dynamic string 
    for later use.
    Untabify some tabs.

ChangeSet
  1.2032 06/02/10 14:42:08 andrey@lmy004. +1 -0
  fix test of bug 12744 on OSX

  tests/mysql_client_test.c
    1.173 06/02/10 14:42:00 andrey@lmy004. +2 -2
    fix test of bug 12744 on OSX

ChangeSet
  1.1616.2491.1 06/02/10 15:12:27 aelkin@mysql.com +4 -0
  BUG#16217 fix partly backported from 5.0. It is different in mysqlbinlog part.
  This changeset is assumed to stay in 4.1.

  sql/log_event.cc
    1.113.1.75 06/02/10 15:12:22 aelkin@mysql.com +12 -0
    Inserting exclaiming comment command for mysql client made differently than in 5.0.
    Parsing still is cheap enough not to think to modify server code instead. 

  mysql-test/t/mysqlbinlog.test
    1.8.1.8 06/02/10 15:12:22 aelkin@mysql.com +18 -1
    backported from 5.0. The last part of the test to mimic bug#16217

  mysql-test/r/mysqlbinlog.result
    1.3.1.7 06/02/10 15:12:21 aelkin@mysql.com +18 -1
    changed in 5.0 

  client/mysql.cc
    1.121.1.97 06/02/10 15:12:20 aelkin@mysql.com +25 -1
    BUG#16217 forced to introduce a separate mysql client command.
    Feature is backported from 5.0, precisely 
    ChangeSet 1.2034 06/02/09 16:23:09 aelkin@mysql.com
    (under second review at the moment)

ChangeSet
  1.1981.60.1 06/02/10 12:11:16 msvensson@neptunus.(none) +3 -0
  Bug#17280 mysqltest, --echo sometimes does not expand $variables
   - Evaluate all variables in the text before printing it to result file

  mysql-test/t/mysqltest.test
    1.28.1.1 06/02/10 12:11:11 msvensson@neptunus.(none) +13 -0
    Add more advanced tests for echo of strings with several variables 
    and/or text plus variables. Also test that variables can be escaped

  mysql-test/r/mysqltest.result
    1.24.1.1 06/02/10 12:11:11 msvensson@neptunus.(none) +17 -2
    Update results for echo

  client/mysqltest.c
    1.196.3.1 06/02/10 12:11:10 msvensson@neptunus.(none) +15 -13
    Update echo command to vvaluate all variables in the string before printing, allow
    for variable names to be escaped using \

ChangeSet
  1.2022.21.2 06/02/10 10:11:30 jonas@perch.ndb.mysql.com +1 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/50-work
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.82 06/02/10 10:11:25 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1974.8.4 06/02/10 10:10:52 jonas@perch.ndb.mysql.com +2 -0
  merge

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.75.1.5 06/02/10 10:10:49 jonas@perch.ndb.mysql.com +1 -1
    merge

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.61 06/02/10 10:10:49 jonas@perch.ndb.mysql.com +1 -1
    merge

ChangeSet
  1.1616.2484.11 06/02/10 09:42:35 jonas@perch.ndb.mysql.com +2 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/41-work
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.39.1.21 06/02/10 09:42:32 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.14.1.17 06/02/10 09:42:32 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2022.20.1 06/02/10 09:39:45 jonas@perch.ndb.mysql.com +2 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/50-work
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.81 06/02/10 09:39:42 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.42 06/02/10 09:39:42 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1974.8.3 06/02/10 09:38:10 jonas@perch.ndb.mysql.com +2 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/41-work
  into  perch.ndb.mysql.com:/home/jonas/src/50-work

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.37.1.3 06/02/10 09:38:07 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbdih/Dbdih.hpp
    1.9 06/02/10 09:38:07 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2452.6 06/02/10 09:37:36 jonas@perch.ndb.mysql.com +2 -0
  bug#10987 - ndb - unable to find restorable replica
    Introduce new variable c_newest_restorable_gci
      which is set _after_ both GCP_SAVE and COPY_GCI
      
    This variable is used when cutting redo (calcKeepGci)
    
    Also make sure complete GCI is run inbetween LCP's

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.14.4.3 06/02/10 09:37:34 jonas@perch.ndb.mysql.com +17 -11
    Introduce new variable c_newest_restorable_gci
      which is set _after_ both GCP_SAVE and COPY_GCI
    
    This variable is used when cutting redo (calcKeepGci)
    Also make sure complete GCI is run inbetween LCP's

  ndb/src/kernel/blocks/dbdih/Dbdih.hpp
    1.6.1.2 06/02/10 09:37:34 jonas@perch.ndb.mysql.com +4 -3
    Introduce new variable c_newest_restorable_gci
      which is set _after_ both GCP_SAVE and COPY_GCI
    
    This variable is used when cutting redo (calcKeepGci)
    Also make sure complete GCI is run inbetween LCP's

ChangeSet
  1.1974.8.2 06/02/10 09:18:50 jonas@perch.ndb.mysql.com +1 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/41-work
  into  perch.ndb.mysql.com:/home/jonas/src/50-work

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.75.1.4 06/02/10 09:18:46 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2452.5 06/02/10 09:17:53 jonas@perch.ndb.mysql.com +1 -0
  bug#17295 - ndb - error while reading REDO log
    fix corruption due to page 0, file 0 gets released

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.39.7.5 06/02/10 09:17:51 jonas@perch.ndb.mysql.com +11 -3
    Make sure that page 0, file 0 isnt released

ChangeSet
  1.1999.1.1 06/02/10 02:15:55 petr@mysql.com +13 -0
  a bunch of IM fixes from the GUI team

  server-tools/instance-manager/priv.h
    1.9 06/02/10 02:15:52 petr@mysql.com +5 -0
    move platform-independent ifdefs here

  server-tools/instance-manager/priv.cc
    1.10 06/02/10 02:15:52 petr@mysql.com +2 -1
    increase net timeout. it should be equal to mysqld's

  server-tools/instance-manager/portability.h
    1.8 06/02/10 02:15:52 petr@mysql.com +1 -2
    add _snprintf define, move platfrom-independent
    ifdefs to priv.h

  server-tools/instance-manager/parse.cc
    1.11 06/02/10 02:15:52 petr@mysql.com +6 -4
    check for get_text_id return value

  server-tools/instance-manager/options.h
    1.14 06/02/10 02:15:52 petr@mysql.com +1 -0
    add an option

  server-tools/instance-manager/options.cc
    1.29 06/02/10 02:15:52 petr@mysql.com +4 -1
    add vars to allow relative paths in --defaults-file option

  server-tools/instance-manager/mysqlmanager.cc
    1.16 06/02/10 02:15:52 petr@mysql.com +2 -1
    fix windows warning

  server-tools/instance-manager/instance_map.cc
    1.25 06/02/10 02:15:52 petr@mysql.com +24 -2
    allow relative paths in --defaults-file option

  server-tools/instance-manager/instance.cc
    1.32 06/02/10 02:15:52 petr@mysql.com +4 -0
    fix monitoring capabilities, when no port was specified
    for an instance

  server-tools/instance-manager/commands.cc
    1.32 06/02/10 02:15:52 petr@mysql.com +1 -1
    fix warning

  server-tools/instance-manager/Makefile.am
    1.30 06/02/10 02:15:52 petr@mysql.com +2 -4
    always look for passwords in /etc/ on unixes

  mysql-test/t/im_life_cycle.imtest
    1.3 06/02/10 02:15:52 petr@mysql.com +9 -0
    check that wrong command is processed correctly

  mysql-test/r/im_life_cycle.result
    1.3 06/02/10 02:15:52 petr@mysql.com +2 -0
    correct result

ChangeSet
  1.2022.7.16 06/02/09 18:23:37 ramil@mysql.com +2 -0
  Merge mysql.com:/usr/home/ram/work/4.1.heap
  into  mysql.com:/usr/home/ram/work/mysql-5.0

  mysql-test/r/heap.result
    1.46 06/02/09 18:23:32 ramil@mysql.com +2 -4
    merge

ChangeSet
  1.2022.19.1 06/02/09 16:23:09 aelkin@mysql.com +11 -0
  BUG#16217 forced to introduce a separate mysql client command to adopt its 
  internal charset to one associated with currently being handled query. 
  To note such a query can come from interactive client either.
  
  There was a discussion within replication team and Monty who's suggestion won.
  It avoids straightforward parsing of all `set' queries that could affect client side 
  character set. 
  According to the idea, mysql client does not parse `set' queries but rather cares of
  `charset new_cs_name' command.
  This command is generated by mysqlbinlog in form of exclaiming comment (Lars' suggestion)
  so that enlightened clients like `mysql' knows what to do with it.
  
  Interactive human can switch between many multi-byte charsets during the session 
  providing the command explicitly. 
  To note that setting new internal mysql's charset does not
  trigger sending any `SET' sql statement to the server. 

  sql/log_event.cc
    1.202 06/02/09 16:23:04 aelkin@mysql.com +5 -0
    Sending into output instructions for mysql client to switch internally 
    to appropriate charset.
    mysql client is supposed to be invoked with --default-character-set=
    "to default character set of the server created the binlog".

  mysql-test/t/mysqlbinlog.test
    1.23 06/02/09 16:23:04 aelkin@mysql.com +18 -1
    Checking how /*! \C cs_name */ are added to the output of mysqlbinlog.
    The exclaiming comment is for further processing by mysql client.
    The added part mimics the failure to recover tables from binlog - see BUG#16217.

  mysql-test/t/mysql.test
    1.5 06/02/09 16:23:04 aelkin@mysql.com +13 -0
    Main test for mysql client is extended to check `charset' command.

  mysql-test/r/user_var-binlog.result
    1.6 06/02/09 16:23:04 aelkin@mysql.com +1 -0
    commented command for mysql client due to multi-byte binlogs

  mysql-test/r/rpl_timezone.result
    1.14 06/02/09 16:23:04 aelkin@mysql.com +1 -0
    commented command for mysql client due to multi-byte binlogs

  mysql-test/r/rpl_charset.result
    1.21 06/02/09 16:23:04 aelkin@mysql.com +8 -0
    commented command for mysql due to multi-byte binlogs

  mysql-test/r/mysqlbinlog2.result
    1.9 06/02/09 16:23:03 aelkin@mysql.com +33 -0
    commeted command for mysql client due to multi-byte binlog 

  mysql-test/r/mysqlbinlog.result
    1.20 06/02/09 16:23:03 aelkin@mysql.com +24 -1
    Results are altered due to #16217

  mysql-test/r/mysql.result
    1.5 06/02/09 16:23:03 aelkin@mysql.com +10 -0
    results are altered due to #16217

  mysql-test/r/ctype_ucs_binlog.result
    1.5 06/02/09 16:23:03 aelkin@mysql.com +1 -0
    comment line generated by mysqlbinlog for processing of logs with multi-byte chars.

  client/mysql.cc
    1.195 06/02/09 16:23:03 aelkin@mysql.com +25 -1
    BUG#16217 revealed the problem of switching between charsets in mysql client.
    Such switching is necessary in a case when being scanned query consists of 
    multi-byte chars and internal charset was initialized differently. mysql finds 
    `/' escape and misiterprete it 
    while in fact one could be a part of a multi-byte symbol like the bug page reported. 
    
    This patch extends mysql `charset' command, '\C' shortcut.

  mysql-test/t/heap.test
    1.32 06/02/09 18:20:39 ramil@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2022.18.1 06/02/09 13:00:32 pem@mysql.com +5 -0
  Fixed BUG#16896: Stored function: unused AGGREGATE-clause in CREATE FUNCTION
    Check if AGGREGATE was given with a stored (non-UDF) function, and return
    error in that case.
    Also made udf_example/udf_test work again, by adding a missing *_init()
    function. (_init() functions required unless --allow_suspicious_udfs is
    given to the server, since March 2005 - it seems udf_example wasn't updated
    at the time.)

  sql/udf_example.cc
    1.19 06/02/09 13:00:28 pem@mysql.com +9 -0
    Added myfunc_int_init() function to make it work when the server is running without
    --allow_suspicious_udfs.

  sql/sql_yacc.yy
    1.453 06/02/09 13:00:28 pem@mysql.com +10 -0
    Check if AGGREGATE was used when creating a stored function (i.e. not an UDF).

  sql/share/errmsg.txt
    1.59 06/02/09 13:00:28 pem@mysql.com +2 -0
    New error message: ER_SP_NO_AGGREGATE

  mysql-test/t/sp-error.test
    1.104 06/02/09 13:00:28 pem@mysql.com +12 -0
    Added test case for BUG#16896.

  mysql-test/r/sp-error.result
    1.103 06/02/09 13:00:28 pem@mysql.com +3 -0
    Updated results for BUG#16896.

ChangeSet
  1.1981.45.4 06/02/09 11:05:28 msvensson@neptunus.(none) +3 -0
  Bug#16878 dump of trigger
   - Pass "in_comment" variable on to new lex in sp_head::reset_lex
   - Add testcases for dumping and reloading trigger without BEGIN/END

  sql/sp_head.cc
    1.193.1.15 06/02/09 11:05:19 msvensson@neptunus.(none) +2 -0
    If already in a comment before parsing a substatement, set in_comment in the new lex as well.
    This will handle cases where the comment starts before the substatement, which is common in 
    output from mysqldump to mask away syntax not supported by earlier versions of MySQL.
    Ex:
    /*!50003 CREATE TRIGGER `tr1` BEFORE INSERT ON `t1` FOR EACH ROW
    set new.created=now() */;
    ^=== sp_head::reset_lex is called when already in comment

  mysql-test/t/mysqldump.test
    1.77.1.1 06/02/09 11:05:19 msvensson@neptunus.(none) +30 -0
    Add test for dumping trigger without begin/end, and test that the output from mysqldump can be reloaded.

  mysql-test/r/mysqldump.result
    1.88 06/02/09 11:05:19 msvensson@neptunus.(none) +22 -0
    Update test result

ChangeSet
  1.2022.17.4 06/02/09 10:35:47 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  mysql-test/mysql-test-run.pl
    1.65 06/02/09 10:35:38 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1981.59.4 06/02/09 10:25:14 msvensson@neptunus.(none) +1 -0
  Force stop of old cluster

  mysql-test/mysql-test-run.pl
    1.60.2.2 06/02/09 10:25:08 msvensson@neptunus.(none) +1 -1
    Set $using_ndbcluster_master to 1 if cluster is supported, to force a stop of old running cluster

ChangeSet
  1.2022.17.3 06/02/09 09:57:07 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  mysql-test/mysql-test-run.pl
    1.64 06/02/09 09:57:01 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1981.59.3 06/02/09 09:40:48 msvensson@neptunus.(none) +4 -0
  Start cluster only for testcases that really needs it and stop it when 
  not needed by the tescases. This will save test time for those testcases
  that does not need cluster, but need a restart, as they dont have to wait
  the extra time it would take for cluster to restart. It will also save
  time for other testcases, as cluster does not 
  need to be contacted for each table to be dropped or created.
  Backport from 5.1

  mysql-test/mysql-test-run.pl
    1.60.2.1 06/02/09 09:40:43 msvensson@neptunus.(none) +65 -33
    Only start ndbcluster for testcases that needs it.

  mysql-test/lib/mtr_stress.pl
    1.3 06/02/09 09:40:43 msvensson@neptunus.(none) +1 -1
    Extre param to mysqld_start

  mysql-test/lib/mtr_match.pl
    1.2 06/02/09 09:40:43 msvensson@neptunus.(none) +17 -0
    Add mtr_match_substring function

  mysql-test/lib/mtr_cases.pl
    1.13 06/02/09 09:40:43 msvensson@neptunus.(none) +20 -0
    Mark all test cases where name contains "ndb" as ndbcluster needed

ChangeSet
  1.2022.17.2 06/02/08 17:17:27 tomas@poseidon.ndb.mysql.com +1 -0
  Bug #17235  	perror prints wrong prefix for ndb error codes

  extra/perror.c
    1.43 06/02/08 17:17:22 tomas@poseidon.ndb.mysql.com +15 -1
    Bug #17235  	perror prints wrong prefix for ndb error codes

ChangeSet
  1.2022.16.1 06/02/08 14:07:52 tomas@poseidon.ndb.mysql.com +1 -0
  Bug#17233, disabled test in waiting for bug fix

  mysql-test/t/disabled.def
    1.20 06/02/08 14:07:47 tomas@poseidon.ndb.mysql.com +1 -0
    Bug#17233, disabled test in waiting for bug fix

ChangeSet
  1.2022.15.1 06/02/08 15:12:48 evgen@moonbone.local +1 -0
  Fixed bug#16752 Binary table files created in mysqld v4.1 caused buffer overrun 
    and possibly server crash in mysqld v5.0.
  
  Reported MyISAM table was created in mysqld 4.1 and contains varchar field.
  When binary files of that table was moved to 5.0, mysqld treats that varchar 
  field as a string field. 
  In order to make grouping server calculates group buffer, and because
  that field is string server assumes it has fixed length and doesn't add
  space for length, but later that field is converted to varchar field. 
  Due to this, when field values were actually copied, additional space for
  length bytes is taken and buffer overrun occurs, which may lead to server crash.
  
  The calc_group_buffer() function now reserves additional space for length
  bytes for VAR_STRING fields, like for VARCHAR fields.

  sql/sql_select.cc
    1.389.2.1 06/02/08 15:10:08 evgen@moonbone.local +4 -3
    Fixed bug#16752 Binary table files created in mysqld v4.1 caused buffer overrun and possibly server crash in mysqld v5.0.
    The calc_group_buffer() function now reserves additional space for length
    bytes for VAR_STRING fields, like for VARCHAR fields.

ChangeSet
  1.1616.2484.10 06/02/08 16:00:39 ramil@mysql.com +2 -0
  Removed 'delayed' to make the test deterministic (as the bug itself has nothing to do with 'delayed').

  mysql-test/t/heap.test
    1.19.1.5 06/02/08 16:00:23 ramil@mysql.com +2 -2
    Removed 'delayed' to make the test deterministic (as the bug itself has nothing to do with 'delayed').

  mysql-test/r/heap.result
    1.20.1.11 06/02/08 16:00:23 ramil@mysql.com +2 -2
    Removed 'delayed' to make the test deterministic (as the bug itself has nothing to do with 'delayed').

ChangeSet
  1.2022.14.1 06/02/07 22:10:44 bell@sanja.is.com.ua +2 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0

  mysql-test/r/kill.result
    1.12 06/02/07 22:10:39 bell@sanja.is.com.ua +1 -2
    merge

  mysql-test/t/kill.test
    1.21 06/02/07 22:03:05 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.2022.7.11 06/02/07 20:04:54 pekka@mysql.com +1 -0
  Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/space/pekka/ndb/version/my50

  sql/ha_ndbcluster.cc
    1.230 06/02/07 20:04:38 pekka@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2022.11.3 06/02/07 19:57:31 pekka@mysql.com +5 -0
  ndb - bug#15918 fix

  sql/ha_ndbcluster.h
    1.94 06/02/07 19:56:49 pekka@mysql.com +1 -0
    bug#15918 fix

  sql/ha_ndbcluster.cc
    1.226.1.1 06/02/07 19:56:49 pekka@mysql.com +4 -0
    bug#15918 fix

  ndb/src/kernel/blocks/dbacc/Dbacc.hpp
    1.23 06/02/07 19:56:49 pekka@mysql.com +1 -1
    bug#15918 fix

  mysql-test/t/ndb_index_unique.test
    1.17 06/02/07 19:56:49 pekka@mysql.com +14 -0
    bug#15918 fix

  mysql-test/r/ndb_index_unique.result
    1.17 06/02/07 19:56:49 pekka@mysql.com +9 -0
    bug#15918 fix

ChangeSet
  1.2022.11.2 06/02/07 18:10:42 pekka@mysql.com +3 -0
  ndb - add option ndbd --foreground for manual debugging

  ndb/src/kernel/vm/Configuration.hpp
    1.18 06/02/07 18:09:44 pekka@mysql.com +9 -1
    add option ndbd --foreground for manual debugging

  ndb/src/kernel/vm/Configuration.cpp
    1.43 06/02/07 18:09:44 pekka@mysql.com +14 -3
    add option ndbd --foreground for manual debugging

  ndb/src/kernel/main.cpp
    1.60 06/02/07 18:09:44 pekka@mysql.com +11 -7
    add option ndbd --foreground for manual debugging

ChangeSet
  1.2022.11.1 06/02/07 14:03:25 pekka@mysql.com +1 -0
  ndb - main.cpp: avoid SEGV if fetch_configuration fails before fork

  ndb/src/kernel/main.cpp
    1.59 06/02/07 14:02:12 pekka@mysql.com +4 -2
    avoid SEGV if fetch_configuration fails before fork

ChangeSet
  1.2022.10.1 06/02/07 13:26:35 gunnar@mysql.com. +3 -0
  item_func.cc:
    fix for bug#8461
  
    BUG 8461 - TRUNCATE returns incorrect result if 2nd argument is negative
    Reason: Both TRUNCATE/ROUND converts INTEGERS to DOUBLE and back to INTEGERS
    Changed the integer routine to work on integers only.
    This bug affects 4.1, 5.0 and 5.1
    Fixing in 4.1 will need to change the routine to handle different types individually.
    5.0 did had different routines for different types already just the INTEGER routine was bad.

  mysql-test/r/func_math.result
    1.33 06/02/07 13:24:39 gunnar@mysql.com. +15 -0

  mysql-test/t/func_math.test
    1.26 06/02/07 13:24:35 gunnar@mysql.com. +14 -0

  sql/item_func.cc
    1.273 06/02/07 13:21:41 gunnar@mysql.com. +18 -16
    fix for bug#8461
    BUG 8461 - TRUNCATE returns incorrect result if 2nd argument is negative
    Reason: TRUNCATE converts INTEGERS to DOUBLE and back to INTEGERS
    Both ROUND and TRUNCATE are affected by this.
    Changed the integer routine to work on integers only.
    This bug affects 4.1 5,0 and 5
    Fixing in 4.1 will need to change the routine to handle different types individually.

ChangeSet
  1.1616.2490.5 06/02/07 13:45:16 bell@sanja.is.com.ua +2 -0
  kill.test fixed for kill on Mac OS X (which do not send OK)

  mysql-test/t/kill.test
    1.6.1.6 06/02/07 13:45:13 bell@sanja.is.com.ua +1 -1
    This test fixed for kill on Mac OS X (which do not send OK)

  mysql-test/r/kill.result
    1.3.1.4 06/02/07 13:45:13 bell@sanja.is.com.ua +1 -1
    This result chenged because of the correspondent test change.

ChangeSet
  1.2022.7.10 06/02/07 15:30:32 svoj@april.(none) +4 -0
  Merge april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
  into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0

  sql/sql_base.cc
    1.326 06/02/07 15:30:19 svoj@april.(none) +0 -2
    Manual merge: use local.

  sql/item_func.h
    1.135 06/02/07 15:29:59 svoj@april.(none) +0 -2
    Manual merge.

  mysql-test/t/fulltext.test
    1.80 06/02/07 15:26:23 svoj@april.(none) +8 -8
    Manual merge.

  mysql-test/r/fulltext.result
    1.84 06/02/07 15:25:55 svoj@april.(none) +8 -8
    Manual merge.

ChangeSet
  1.2022.7.9 06/02/07 11:31:52 tomas@poseidon.ndb.mysql.com +1 -0
  Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
  into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

  sql/ha_ndbcluster.cc
    1.229 06/02/07 11:31:45 tomas@poseidon.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2490.4 06/02/07 11:30:42 tomas@poseidon.ndb.mysql.com +1 -0
  Bug #17081  	"LOAD DATA INFILE" may not load all the data

  sql/ha_ndbcluster.cc
    1.114.3.62 06/02/07 11:30:38 tomas@poseidon.ndb.mysql.com +5 -2
    Bug #17081  	"LOAD DATA INFILE" may not load all the data

ChangeSet
  1.1616.2484.7 06/02/07 13:49:55 svoj@april.(none) +1 -0
  Merge april.(none):/home/svoj/devel/mysql/BUG16893/mysql-4.1
  into  april.(none):/home/svoj/devel/mysql/merge/mysql-4.1

  sql/item_func.h
    1.68.1.61 06/02/07 13:49:52 svoj@april.(none) +0 -0
    Auto merged

ChangeSet
  1.2022.7.8 06/02/07 00:26:47 tomas@poseidon.ndb.mysql.com +1 -0
  ndb, transaction should be refgistred even if m_transaction_on is not set

  sql/ha_ndbcluster.cc
    1.228 06/02/07 00:26:41 tomas@poseidon.ndb.mysql.com +2 -4
    ndb, transaction should be refgistred even if m_transaction_on is not set

ChangeSet
  1.2022.7.7 06/02/07 00:06:28 tomas@poseidon.ndb.mysql.com +2 -0
  Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
  into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

  sql/sql_load.cc
    1.91 06/02/07 00:06:16 tomas@poseidon.ndb.mysql.com +0 -0
    Auto merged

  sql/ha_ndbcluster.cc
    1.227 06/02/07 00:06:16 tomas@poseidon.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2490.3 06/02/07 00:03:39 tomas@poseidon.ndb.mysql.com +4 -0
  Bug #17154  	load data infile of char values into a table of char(PK) hangs
  Bug #17158  	load data infile of char values into table of char with no (PK) fails to load
  Bug #17081  	Doing "LOAD DATA INFILE" directly after delete can cause missing data

  mysql-test/t/ndb_load.test
    1.1 06/02/07 00:03:34 tomas@poseidon.ndb.mysql.com +24 -0
    New BitKeeper file ``mysql-test/t/ndb_load.test''

  mysql-test/r/ndb_load.result
    1.1 06/02/07 00:03:34 tomas@poseidon.ndb.mysql.com +80 -0
    New BitKeeper file ``mysql-test/r/ndb_load.result''

  sql/sql_load.cc
    1.46.3.40 06/02/07 00:03:34 tomas@poseidon.ndb.mysql.com +5 -2
    Bug #17154  	load data infile of char values into a table of char(PK) hangs
    Bug #17158  	load data infile of char values into table of char with no (PK) fails to load
    Bug #17081  	Doing "LOAD DATA INFILE" directly after delete can cause missing data

  sql/ha_ndbcluster.cc
    1.114.3.61 06/02/07 00:03:34 tomas@poseidon.ndb.mysql.com +18 -4
    Bug #17154  	load data infile of char values into a table of char(PK) hangs
    Bug #17158  	load data infile of char values into table of char with no (PK) fails to load
    Bug #17081  	Doing "LOAD DATA INFILE" directly after delete can cause missing data

  mysql-test/t/ndb_load.test
    1.0 06/02/07 00:03:34 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-4.1/mysql-test/t/ndb_load.test

  mysql-test/r/ndb_load.result
    1.0 06/02/07 00:03:34 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-4.1/mysql-test/r/ndb_load.result

ChangeSet
  1.2022.9.1 06/02/06 11:35:13 igor@rurik.mysql.com +3 -0
  Fixed bug #16203.
  If check_quick_select returns non-empty range then the function cost_group_min_max
  cannot return 0 as an estimate of the number of retrieved records.
  Yet the function erroneously returned 0 as the estimate in some situations.

  sql/opt_range.cc
    1.204 06/02/06 11:35:06 igor@rurik.mysql.com +1 -0
    Fixed bug #16203.
    If check_quick_select returns non-empty range then the function cost_group_min_max
    cannot return 0 as an estimate of the number of retrieved records.
    Yet the function erroneously returned 0 as the estimate in some situations. 

  mysql-test/t/group_min_max.test
    1.18 06/02/06 11:35:06 igor@rurik.mysql.com +21 -0
    Added a test case for bug #16203.

  mysql-test/r/group_min_max.result
    1.20 06/02/06 11:35:05 igor@rurik.mysql.com +27 -0
    Added a test case for bug #16203.

ChangeSet
  1.2022.7.5 06/02/06 17:58:15 pem@mysql.com +1 -0
  Merge mysql.com:/extern/mysql/bk/mysql-5.0
  into  mysql.com:/extern/mysql/work/bug16303/mysql-5.0

  sql/sql_parse.cc
    1.526 06/02/06 17:58:10 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2022.8.1 06/02/06 16:07:13 pem@mysql.com +2 -0
  Merge mysql.com:/extern/mysql/bk/mysql-5.0
  into  mysql.com:/extern/mysql/work/bug16303/mysql-5.0

  sql/sql_parse.cc
    1.525 06/02/06 16:07:07 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/sp-destruct.test
    1.5 06/02/06 16:07:07 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2022.7.4 06/02/06 16:05:46 pem@mysql.com +1 -0
  Updated sp-code.result after merge (BUG#16568)

  mysql-test/r/sp-code.result
    1.5 06/02/06 16:05:43 pem@mysql.com +1 -1
    Updated result after merge (BUG#16568)

ChangeSet
  1.2022.7.3 06/02/06 14:09:14 pem@mysql.com +6 -0
  Merge mysql.com:/extern/mysql/bk/mysql-5.0
  into  mysql.com:/extern/mysql/work/bug16568/mysql-5.0

  sql/sql_yacc.yy
    1.452 06/02/06 14:09:08 pem@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.523.1.2 06/02/06 14:09:08 pem@mysql.com +0 -0
    Auto merged

  sql/sp_head.h
    1.79 06/02/06 14:09:07 pem@mysql.com +0 -0
    Auto merged

  sql/sp_head.cc
    1.200 06/02/06 14:09:07 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/sp.test
    1.174 06/02/06 14:09:07 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/sp.result
    1.185 06/02/06 14:09:07 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1974.8.1 06/02/06 11:46:40 jonas@perch.ndb.mysql.com +2 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/41-work
  into  perch.ndb.mysql.com:/home/jonas/src/50-work

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.75.1.3 06/02/06 11:46:37 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.60 06/02/06 11:46:37 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2452.4 06/02/06 11:42:44 jonas@perch.ndb.mysql.com +2 -0
  bug#13966 - ndb
    better error message on invalid config change

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.39.7.4 06/02/06 11:42:43 jonas@perch.ndb.mysql.com +14 -0
    Change error message...note that this is a guess

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.26.2.18 06/02/06 11:42:43 jonas@perch.ndb.mysql.com +1 -1
    fix typo

ChangeSet
  1.1616.2452.3 06/02/06 11:30:56 jonas@perch.ndb.mysql.com +1 -0
  bug#13965
    ndb - error while restarting in dict
          improve error message when changed config leads to failed restart

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.26.2.17 06/02/06 11:30:55 jonas@perch.ndb.mysql.com +13 -1
    improve error message

ChangeSet
  1.2022.1.11 06/02/06 09:55:20 aelkin@mysql.com +0 -0
  Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0

ChangeSet
  1.2022.7.2 06/02/05 23:06:08 pekka@mysql.com +1 -0
  ndb - testBlobs needs more tx in 5.0 ?

  ndb/test/ndbapi/testBlobs.cpp
    1.28 06/02/05 23:05:16 pekka@mysql.com +1 -1
    more tx per Ndb

ChangeSet
  1.2022.7.1 06/02/05 22:51:13 pekka@mysql.com +2 -0
  Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/space/pekka/ndb/version/my50

  ndb/tools/delete_all.cpp
    1.17 06/02/05 22:50:58 pekka@mysql.com +4 -3

  ndb/test/ndbapi/testBlobs.cpp
    1.27 06/02/05 22:47:14 pekka@mysql.com +3 -4

ChangeSet
  1.1616.2490.2 06/02/05 22:12:06 pekka@mysql.com +2 -0
  ndb - bug#16693 (4.1) test + workaround, analyze later

  ndb/tools/delete_all.cpp
    1.9.1.3 06/02/05 22:10:18 pekka@mysql.com +25 -5
    if blobs, no commit across open cursor (single trans)
    cases listed in testBlobs.cpp, analyze later (in 5.0 maybe)

  ndb/test/ndbapi/testBlobs.cpp
    1.18.1.6 06/02/05 22:06:16 pekka@mysql.com +63 -19
    do batched deletes + list commit across open cursor test cases

ChangeSet
  1.2022.1.9 06/02/03 15:27:26 pekka@mysql.com +3 -0
  Merge mysql.com:/space/pekka/ndb/version/my41
  into  mysql.com:/space/pekka/ndb/version/my50

  ndb/src/ndbapi/NdbBlob.cpp
    1.26 06/02/03 15:27:06 pekka@mysql.com +0 -2
    ul

  mysql-test/t/ndb_blob.test
    1.16 06/02/03 15:26:07 pekka@mysql.com +0 -5
    Auto merged

  mysql-test/r/ndb_blob.result
    1.17 06/02/03 15:26:07 pekka@mysql.com +0 -7
    Auto merged

ChangeSet
  1.1616.2490.1 06/02/03 15:23:58 pekka@mysql.com +3 -0
  ndb - replace+tinyblob back-patch from 5.0 [ discard on 4.1->5.0 merge ]

  ndb/src/ndbapi/NdbBlob.cpp
    1.17.3.2 06/02/03 15:22:46 pekka@mysql.com +2 -0
    replace+tinyblob back-patch from 5.0

  mysql-test/t/ndb_blob.test
    1.14.1.1 06/02/03 15:22:46 pekka@mysql.com +5 -1
    replace+tinyblob back-patch from 5.0

  mysql-test/r/ndb_blob.result
    1.13.1.2 06/02/03 15:22:46 pekka@mysql.com +7 -0
    replace+tinyblob back-patch from 5.0

ChangeSet
  1.2022.1.8 06/02/03 14:35:29 pekka@mysql.com +3 -0
  ndb - bugfix: tinyblob + replace => mysqld crash (no bug#)

  ndb/src/ndbapi/NdbBlob.cpp
    1.25 06/02/03 14:33:33 pekka@mysql.com +2 -0
    do not delete unknown parts of tinyblob

  mysql-test/t/ndb_blob.test
    1.15 06/02/03 14:33:33 pekka@mysql.com +5 -1
    do not delete unknown parts of tinyblob

  mysql-test/r/ndb_blob.result
    1.16 06/02/03 14:33:33 pekka@mysql.com +7 -0
    do not delete unknown parts of tinyblob

ChangeSet
  1.1616.2489.1 06/02/03 14:09:33 svoj@april.(none) +2 -0
  BUG#16893: Crash in test 'fulltext_order_by'
  Fixed that fulltext query + union results in unexpected behaviour.

  sql/sql_base.cc
    1.145.1.120 06/02/03 14:09:30 svoj@april.(none) +2 -0
    Reset variables used by fulltext

  sql/item_func.h
    1.68.20.1 06/02/03 14:09:30 svoj@april.(none) +0 -3
    Remove access to table object from cleanup() as the table object
    may have been dropped earlier (In case of temporary tables or of
    close_thread_tables() is run before cleanup())
    This fixed a bug with access to already freed memory

ChangeSet
  1.2025 06/02/03 12:34:25 ramil@mysql.com +1 -0
  Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/usr/home/ram/work/5.0.b16511

  sql/sql_prepare.cc
    1.169 06/02/03 12:34:16 ramil@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2022.6.2 06/02/02 23:56:08 igor@rurik.mysql.com +3 -0
  Fixes after manual merge

  sql/sql_select.cc
    1.393 06/02/02 23:56:02 igor@rurik.mysql.com +2 -2
    Fixes after manual merge

  sql/sql_prepare.cc
    1.167.1.2 06/02/02 23:56:02 igor@rurik.mysql.com +5 -98
    Fixes after manual merge

  mysql-test/r/having.result
    1.20 06/02/02 23:56:02 igor@rurik.mysql.com +0 -17
    Fixes after manual merge

ChangeSet
  1.2022.6.1 06/02/02 21:23:36 igor@rurik.mysql.com +6 -0
  Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
  into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0

  sql/sql_select.cc
    1.392 06/02/02 21:23:30 igor@rurik.mysql.com +8 -2
    Manual merge

  sql/sql_prepare.cc
    1.167.1.1 06/02/02 21:23:30 igor@rurik.mysql.com +110 -20
    Manual merge

  sql/sql_lex.h
    1.211 06/02/02 21:23:30 igor@rurik.mysql.com +0 -0
    Manual merge

  sql/sql_lex.cc
    1.177 06/02/02 21:23:30 igor@rurik.mysql.com +1 -3
    Manual merge

  mysql-test/r/having.result
    1.19 06/02/02 21:23:30 igor@rurik.mysql.com +17 -0
    Manual merge

  mysql-test/t/having.test
    1.18 06/02/02 20:39:19 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2487.3 06/02/02 20:37:58 igor@rurik.mysql.com +1 -0
  Post-review fix for bug #14927.

  sql/sql_select.cc
    1.216.1.235 06/02/02 20:37:54 igor@rurik.mysql.com +6 -0
    Post-review fix for bug #14927.

ChangeSet
  1.2022.4.5 06/02/03 02:01:01 konstantin@mysql.com +1 -0
  One more post-merge fix.

  mysql-test/r/heap.result
    1.45 06/02/03 02:00:50 konstantin@mysql.com +1 -0
    It turns out that I didn't commit one test result (it's identical 
    to 4.1)

ChangeSet
  1.2022.1.5 06/02/02 13:47:21 igor@rurik.mysql.com +1 -0
  Merge rurik.mysql.com:/home/igor/mysql-5.0
  into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0

  sql/sql_select.cc
    1.391 06/02/02 13:47:15 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2022.4.4 06/02/03 00:07:36 konstantin@mysql.com +6 -0
  Post-merge fixes.

  tests/mysql_client_test.c
    1.172 06/02/03 00:07:27 konstantin@mysql.com +0 -17
    Post-merge fixes.

  sql/ha_heap.cc
    1.76 06/02/03 00:07:27 konstantin@mysql.com +2 -2
    Post-merge fixes.

  mysql-test/t/kill.test
    1.20 06/02/03 00:07:27 konstantin@mysql.com +0 -3
    Post-merge fixes.

  mysql-test/r/kill.result
    1.11 06/02/03 00:07:26 konstantin@mysql.com +12 -12
    Post-merge fixes.

  mysql-test/r/heap_hash.result
    1.19 06/02/03 00:07:26 konstantin@mysql.com +11 -11
    Post-merge fixes.

  mysql-test/r/heap.result
    1.44 06/02/03 00:07:26 konstantin@mysql.com +11 -2
    Post-merge fixes.

ChangeSet
  1.2022.4.3 06/02/02 23:35:23 konstantin@mysql.com +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/opt/local/work/mysql-5.0-root

  sql/item_timefunc.cc
    1.102 06/02/02 23:35:16 konstantin@mysql.com +0 -2
    Auto merged

  mysql-test/t/date_formats.test
    1.16 06/02/02 23:35:16 konstantin@mysql.com +0 -0
    Auto merged

  mysql-test/r/date_formats.result
    1.20 06/02/02 23:35:15 konstantin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2022.5.2 06/02/02 21:27:23 gunnar@mysql.com. +1 -0
  item_timefunc.cc:
    manual adding the fix for bug#15828 which did not automerge

  sql/item_timefunc.cc
    1.100.1.2 06/02/02 21:24:48 gunnar@mysql.com. +2 -2
    manual adding the fix for bug#15828 which did not automerge

ChangeSet
  1.2022.5.1 06/02/02 19:10:27 gunnar@mysql.com. +3 -0
  Merge mysql.com.:/data/BK/mysql-4.1_15828
  into  mysql.com.:/data/BK/mysql-5.0_15828

  sql/item_timefunc.cc
    1.100.1.1 06/02/02 19:10:18 gunnar@mysql.com. +0 -2
    manually merging fix for bug 15282 - automerge failed as 5.0 was heavely changed
    step one using local for file item_timefunc 

  mysql-test/t/date_formats.test
    1.14.1.1 06/02/02 19:07:27 gunnar@mysql.com. +0 -0
    Auto merged

  mysql-test/r/date_formats.result
    1.18.1.1 06/02/02 19:07:27 gunnar@mysql.com. +0 -0
    Auto merged

ChangeSet
  1.2022.4.2 06/02/02 18:17:18 konstantin@mysql.com +32 -0
  Merge mysql.com:/opt/local/work/mysql-4.1-root
  into  mysql.com:/opt/local/work/mysql-5.0-root

  tests/mysql_client_test.c
    1.171 06/02/02 18:17:13 konstantin@mysql.com +51 -33
    Manual merge.

  sql/sql_update.cc
    1.184 06/02/02 18:17:13 konstantin@mysql.com +5 -5
    Manual merge.

  sql/sql_parse.cc
    1.523.2.1 06/02/02 18:17:13 konstantin@mysql.com +0 -10
    Manual merge.

  sql/sql_class.cc
    1.226 06/02/02 18:17:12 konstantin@mysql.com +1 -1
    Manual merge.

  sql/item_timefunc.cc
    1.101 06/02/02 18:17:12 konstantin@mysql.com +2 -4
    Manual merge.

  sql/ha_heap.h
    1.39 06/02/02 18:17:12 konstantin@mysql.com +0 -1
    Manual merge.

  sql/ha_heap.cc
    1.75 06/02/02 18:17:12 konstantin@mysql.com +7 -12
    Manual merge.

  mysql-test/r/kill.result
    1.10 06/02/02 18:17:12 konstantin@mysql.com +12 -12
    Manual merge.

  mysql-test/r/heap_hash.result
    1.18 06/02/02 18:17:12 konstantin@mysql.com +6 -10
    Manual merge.

  mysql-test/r/heap.result
    1.43 06/02/02 18:17:12 konstantin@mysql.com +1 -11
    Manual merge.

  libmysql/libmysql.c
    1.233 06/02/02 18:17:12 konstantin@mysql.com +1 -1
    Manual merge.

  configure.in
    1.374 06/02/02 18:17:12 konstantin@mysql.com +1 -4
    Manual merge.

ChangeSet
  1.2004.6.2 06/02/02 15:37:29 pem@mysql.com +1 -0
  Minor fix for BUG#16303 in sp.cc: Simplified code in sp_routine_exists_in_table().
  (No change of functionality)

  sql/sp.cc
    1.106 06/02/02 15:37:25 pem@mysql.com +1 -3
    Simplified code in sp_routine_exists_in_table().

  sql/sql_select.h
    1.105 06/02/02 17:25:23 konstantin@mysql.com +0 -0
    Auto merged

  sql/sql_select.cc
    1.389.1.1 06/02/02 17:25:23 konstantin@mysql.com +0 -0
    Auto merged

  sql/sql_base.cc
    1.325 06/02/02 17:25:22 konstantin@mysql.com +0 -0
    Auto merged

  ndb/test/ndbapi/testBlobs.cpp
    1.26 06/02/02 17:25:22 konstantin@mysql.com +0 -0
    Auto merged

  ndb/include/mgmapi/mgmapi_config_parameters.h
    1.20 06/02/02 17:25:22 konstantin@mysql.com +0 -0
    Auto merged

  mysql-test/t/update.test
    1.28 06/02/02 17:25:22 konstantin@mysql.com +0 -0
    Auto merged

  mysql-test/t/kill.test
    1.19 06/02/02 17:25:22 konstantin@mysql.com +0 -0
    Auto merged

  mysql-test/t/heap.test
    1.31 06/02/02 17:25:22 konstantin@mysql.com +0 -0
    Auto merged

  mysql-test/t/date_formats.test
    1.15 06/02/02 17:25:22 konstantin@mysql.com +0 -0
    Auto merged

  mysql-test/r/update.result
    1.30 06/02/02 17:25:22 konstantin@mysql.com +0 -0
    Auto merged

  mysql-test/r/myisam.result
    1.71.1.1 06/02/02 17:25:22 konstantin@mysql.com +0 -0
    Auto merged

  mysql-test/r/date_formats.result
    1.19 06/02/02 17:25:22 konstantin@mysql.com +0 -0
    Auto merged

  heap/hp_create.c
    1.22 06/02/02 17:25:21 konstantin@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-rpl_multi_update4.test
    1.2 06/02/02 17:25:21 konstantin@mysql.com +0 -0
    Delete: mysql-test/t/rpl_multi_update4.test

  BitKeeper/deleted/.del-disabled.def
    1.3 06/02/02 17:25:21 konstantin@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-rpl_multi_update4-slave.opt
    1.2 06/02/02 17:25:05 konstantin@mysql.com +0 -0
    Delete: mysql-test/t/rpl_multi_update4-slave.opt

  BitKeeper/deleted/.del-rpl_ignore_table.test
    1.2 06/02/02 17:24:57 konstantin@mysql.com +0 -0
    Delete: mysql-test/t/rpl_ignore_table.test

  BitKeeper/deleted/.del-rpl_ignore_table-slave.opt
    1.2 06/02/02 17:24:47 konstantin@mysql.com +0 -0
    Delete: mysql-test/t/rpl_ignore_table-slave.opt

  BitKeeper/deleted/.del-rpl_multi_update4.result
    1.2 06/02/02 17:24:37 konstantin@mysql.com +0 -0
    Delete: mysql-test/r/rpl_multi_update4.result

  BitKeeper/deleted/.del-rpl_ignore_table.result
    1.2 06/02/02 17:24:06 konstantin@mysql.com +0 -0
    Delete: mysql-test/r/rpl_ignore_table.result

  BitKeeper/deleted/.del-disabled.def
    1.1.1.2 06/02/02 17:10:58 konstantin@mysql.com +0 -0
    Merge rename: mysql-test/t/disabled.def -> BitKeeper/deleted/.del-disabled.def

ChangeSet
  1.2022.4.1 06/02/02 11:47:01 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my50-mysqltest_float_result
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  client/mysqltest.c
    1.200 06/02/02 11:46:53 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1981.59.2 06/02/02 11:45:37 msvensson@neptunus.(none) +1 -0
  Convert exponent results for MYSQL_TYPE_FLOAT on Windows

  client/mysqltest.c
    1.196.2.2 06/02/02 11:45:30 msvensson@neptunus.(none) +2 -1
    Do the magic for MYSQL_TYPE_FLOAT as well

ChangeSet
  1.2022.1.4 06/02/01 20:43:43 igor@rurik.mysql.com +3 -0
  Fixed bug #16382.
  When an ambiguous field name is used in a group by clause a warning is issued
  in the find_order_in_list function by a call to push_warning_printf.
  An expression that was not always valid was passed to this call as the field
  name parameter.

  sql/sql_select.cc
    1.390 06/02/01 20:43:37 igor@rurik.mysql.com +2 -1
    Fixed bug #16382.
    When an ambiguous field name is used in a group by clause a warning is issued
    in the find_order_in_list function by a call to push_warning_printf.
    An expression that was not always valid was passed to this call as the field
    name parameter.   

  mysql-test/t/view.test
    1.134 06/02/01 20:43:37 igor@rurik.mysql.com +17 -0
    Added a test case for bug #16382.

  mysql-test/r/view.result
    1.145 06/02/01 20:43:37 igor@rurik.mysql.com +34 -0
    Added a test case for bug #16382.

ChangeSet
  1.1616.2488.1 06/02/01 12:28:39 jimw@mysql.com +1 -0
  Fix mysqldump crash when encountering a VIEW (when used against a
  5.0 or later server, obviously). (Bug #16389)

  client/mysqldump.c
    1.143.13.2 06/02/01 12:28:34 jimw@mysql.com +5 -2
    Prevent dumping data from a view (and crashing when we see one)

ChangeSet
  1.1616.2487.1 06/02/01 20:35:16 andrey@lmy004. +2 -0
  fix for bug #12744 (MYSQL_STMT operations cause seg fault after connection reset)

  tests/mysql_client_test.c
    1.51.1.113 06/02/01 20:35:11 andrey@lmy004. +32 -0
    test for bug #12744 (MYSQL_STMT operations cause seg fault after connection reset)

  libmysql/libmysql.c
    1.156.1.144 06/02/01 20:35:11 andrey@lmy004. +6 -0
    stmt->mysql could be 0x0 if the connection has failed between prepare and execute
    or any other operation. thus if the user decides to use mysql_stmt_reset()
    we should not segfault.

ChangeSet
  1.1616.2484.5 06/02/01 20:40:12 svoj@april.(none) +3 -0
  BUG#14496: Crash or strange results with prepared statement,
             MATCH and FULLTEXT
  Fixed that fulltext query using PS results in unexpected behaviour
  when executed 2 or more times.

  sql/item_func.h
    1.68.1.60 06/02/01 20:40:10 svoj@april.(none) +1 -1
    In Item_func_match::cleanup() always reset ft_handler to 0.

  mysql-test/t/fulltext.test
    1.71.1.6 06/02/01 20:40:10 svoj@april.(none) +12 -0
    Testcase for BUG#14496.

  mysql-test/r/fulltext.result
    1.65.1.13 06/02/01 20:40:10 svoj@april.(none) +11 -0
    Testcase for BUG#14496.

ChangeSet
  1.2004.11.1 06/02/01 16:46:44 ingo@mysql.com +3 -0
  Bug#8841 - CHECKSUM TABLE is broken in MyISAM
  There are (at least) two implementations of the checksum
  computation. One is in MyISAM for the quick checksum. It
  is executed on every row change. The other is in the
  SQL layer for the extended checksum. It retrieves all rows
  of a table via the respective storage engine.
  
  In former MySQL versions varchars were stored with their 
  maximum length, but now with their real length similar to
  blobs.
  
  This change had been forgotten to take care of in the
  extended checksum calculation. Hence too much data was
  checksumed. In MyISAM this change had been taken care of 
  already. Only the real data is included in the checksum.
  
  I changed mysql_checksum_table() so that it uses the
  length information of true varchar fields instead
  of the field length like in former varchar 
  implementations.

  sql/sql_table.cc
    1.295 06/02/01 16:46:39 ingo@mysql.com +2 -1
    Bug#8841 - CHECKSUM TABLE is broken in MyISAM
    Changed mysql_checksum_table() so that it uses the
    length information of true varchar fields instead
    of the field length like in former varchar 
    implementations.

  mysql-test/r/myisam.result
    1.72 06/02/01 16:46:39 ingo@mysql.com +3 -3
    Bug#8841 - CHECKSUM TABLE is broken in MyISAM
    Fixed test results.

  mysql-test/r/innodb.result
    1.153.1.1 06/02/01 16:46:38 ingo@mysql.com +5 -5
    Bug#8841 - CHECKSUM TABLE is broken in MyISAM
    Fixed test results.

ChangeSet
  1.2004.4.2 06/02/01 16:00:11 pem@mysql.com +1 -0
  Post-review fix for BUG#15011.
  Added comments.

  sql/sp_rcontext.cc
    1.40 06/02/01 16:00:08 pem@mysql.com +29 -0
    Added comments to sp_rcontext::find_handler()

ChangeSet
  1.2022.2.1 06/02/01 15:02:36 msvensson@neptunus.(none) +4 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my50-mysqltest_float_result
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  mysql-test/t/variables.test
    1.53 06/02/01 15:02:30 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/type_float.test
    1.29 06/02/01 15:02:30 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/type_float.result
    1.45 06/02/01 15:02:30 msvensson@neptunus.(none) +0 -0
    Auto merged

  client/mysqltest.c
    1.199 06/02/01 15:02:30 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2022.1.2 06/02/01 14:46:30 pem@mysql.com +2 -0
  Added new test case for BUG#14533: 'desc tbl' in stored procedure causes error 1142
    which is no longer repeatable. (Unclear when this was fixed.)

  mysql-test/t/sp-security.test
    1.28 06/02/01 14:46:26 pem@mysql.com +38 -0
    New test case for BUG#14533.

  mysql-test/r/sp-security.result
    1.25 06/02/01 14:46:26 pem@mysql.com +23 -0
    Updated results for new test case (BUG#14533)

ChangeSet
  1.1981.59.1 06/02/01 11:36:32 msvensson@neptunus.(none) +5 -0
  Use common function 'append_field' to output the value of one field to the result.
  Fix for extra zero in exponent of double values on windows.

  mysql-test/t/variables.test
    1.51.1.1 06/02/01 11:36:27 msvensson@neptunus.(none) +0 -1
    Remove the "replace_result" for extra zero in  exponent

  mysql-test/t/type_float.test
    1.27.1.1 06/02/01 11:36:27 msvensson@neptunus.(none) +0 -3
    Remove the "replace_result" for extra zero in  exponent

  mysql-test/t/insert.test
    1.21 06/02/01 11:36:27 msvensson@neptunus.(none) +0 -9
    Remove the "replace_result" for extra zero in  exponent

  mysql-test/r/type_float.result
    1.42.1.1 06/02/01 11:36:27 msvensson@neptunus.(none) +2 -2
    One zero too much was removed( I think )

  client/mysqltest.c
    1.196.2.1 06/02/01 11:36:27 msvensson@neptunus.(none) +74 -90
    Write new function 'append_field' which takes care of appending one field to the dynamic string.
    Use function 'append_field' from both ps and normal execution
    Add hack to 'append_field' that removes the extra '0' in exponent for double values on Windows.

ChangeSet
  1.1616.2486.1 06/01/31 21:48:32 igor@rurik.mysql.com +6 -0
  FIxed bug #14927.
  A query with a group by and having clauses could return a wrong
  result set if the having condition contained a constant conjunct 
  evaluated to FALSE.
  It happened because the pushdown condition for table with
  grouping columns lost its constant conjuncts.
  Pushdown conditions are always built by the function make_cond_for_table
  that ignores constant conjuncts. This is apparently not correct when
  constant false conjuncts are present.

  sql/sql_select.cc
    1.216.1.234 06/01/31 21:48:28 igor@rurik.mysql.com +13 -9
    Fixed bug #14927.
    Performed evaluation of constant expressions in having clauses.
    If the having condition contains a constant conjunct that is always false
    an empty result set is returned after the optimization phase.
    In this case the corresponding EXPLAIN command now returns 
    "Impossible HAVING" in the last column.

  sql/sql_prepare.cc
    1.34.35.1 06/01/31 21:48:27 igor@rurik.mysql.com +8 -2
    Fixed bug #14927.
    Added code to restore havinf conditions for execution in SP and PS.

  sql/sql_lex.h
    1.102.1.86 06/01/31 21:48:27 igor@rurik.mysql.com +1 -0
    Fixed bug #14927.
    Added a field to restore having condititions for execution in SP and PS.

  sql/sql_lex.cc
    1.97.1.55 06/01/31 21:48:27 igor@rurik.mysql.com +2 -0
    Fixed bug #14927.
    Initialized fields for having conditions in  st_select_lex::init_query().

  mysql-test/t/having.test
    1.11.1.3 06/01/31 21:48:27 igor@rurik.mysql.com +16 -0
    Added A test case for bug #14927.

  mysql-test/r/having.result
    1.10.1.5 06/01/31 21:48:27 igor@rurik.mysql.com +17 -0
    Added A test case for bug #14927.

ChangeSet
  1.2015.7.1 06/01/31 21:41:48 aivanov@mysql.com +11 -0
  Fixed: BUG#15653, BUG#16157, BUG#16229, BUG#16298, BUG#16387, BUG#16582.
    Applied innodb-5.0-ss149/162 snapshots.

  sql/ha_innodb.h
    1.110 06/01/31 21:41:43 aivanov@mysql.com +1 -12
    Applied innodb-5.0-149/162 snapshots.
      Remove some declarations of unused global variables and member
      variables of class ha_innobase.

  sql/ha_innodb.cc
    1.286 06/01/31 21:41:42 aivanov@mysql.com +36 -23
    Applied innodb-5.0-149/162 snapshots.
      Remove some declarations of unused global variables and member
        variables of class ha_innobase.
      Added diagnostic code trx_print() to
        innobase_query_caching_of_table_permitted() to find reason
        why we are holding adaptive search latch.
      Fixed bug #16229 MySQL/InnoDB uses full explicit table locks
        in trigger processing. Take a InnoDB table lock only if user
        has explicitly requested a table lock. Added some additional
        comments to store_lock() and external_lock(). Fixed some
        code style errors.
      Remember to use noninlined versions of the functions on
        ha_innodb.cc !

  mysql-test/t/innodb.test
    1.125 06/01/31 21:41:42 aivanov@mysql.com +102 -0
    Applied innodb-5.0-149/162 snapshots.
      Added test cases.

  mysql-test/r/innodb.result
    1.155 06/01/31 21:41:42 aivanov@mysql.com +71 -0
    Applied innodb-5.0-149/162 snapshots.
      Fixed results for added test cases.

  innobase/srv/srv0start.c
    1.88 06/01/31 21:41:42 aivanov@mysql.com +14 -0
    Applied innodb-5.0-149/162 snapshots.
      Fix bug #16157, a crash when innodb_log_group_home_dir is set
      to an empty string. This patch is from Heikki.

  innobase/os/os0sync.c
    1.27 06/01/31 21:41:42 aivanov@mysql.com +15 -15
    Applied innodb-5.0-149/162 snapshots.
      Replace goto in os_event_wait with a normal loop.

  innobase/include/univ.i
    1.45 06/01/31 21:41:42 aivanov@mysql.com +0 -6
    Applied innodb-5.0-149/162 snapshots.
      Avoid breaking --with-debug builds on QNS and other systems
      whose compiler pretends to be GCC 2.
      Outside __WIN__ define UNIV_INLINE as static inline.

  innobase/fil/fil0fil.c
    1.63 06/01/31 21:41:42 aivanov@mysql.com +81 -2
    Applied innodb-5.0-149/162 snapshots.
      Keep track on unflushed modifications to file spaces. When there
      are tens of thousands of file spaces, flushing all files in
      fil_flush_file_spaces() would be very slow (Bug #15653).
      fil_flush_file_spaces(): Only flush unflushed file spaces.
      fil_space_t, fil_system_t: Add a list of unflushed spaces.

  innobase/dict/dict0load.c
    1.41 06/01/31 21:41:42 aivanov@mysql.com +15 -5
    Applied innodb-5.0-149/162 snapshots.
      dict_load_columns(): Set the charset-collation code
      DATA_MYSQL_BINARY_CHARSET_COLL for those binary string columns
      that lack a charset-collation code, i.e., the tables were created
      with an older version of MySQL/InnoDB than 4.1.2 (Bug #16298).

  innobase/dict/dict0dict.c
    1.72 06/01/31 21:41:42 aivanov@mysql.com +2 -1
    Applied innodb-5.0-149/162 snapshots.
      Do not mistake TABLENAME_ibfk_0 for auto generated id (Bug #16387).
      dict_table_get_highest_foreign_id(): Ignore foreign constraint
        identifiers starting with the pattern TABLENAME_ibfk_0.

  innobase/btr/btr0sea.c
    1.38 06/01/31 21:41:42 aivanov@mysql.com +39 -5
    Applied innodb-5.0-149/162 snapshots.
      Account for a race condition when dropping the adaptive hash
      index for a B-tree page (Bug #16582).
      btr_search_drop_page_hash_index(): Retry the operation if a
        hash index with different parameters was built meanwhile.
        Add diagnostics for the case that hash node pointers to
        the page remain. This fix is from Heikki.
      btr_search_info-update_hash(), btr_search_info_update_slow():
        Document the parameter "info" as in/out.

ChangeSet
  1.2018.3.2 06/01/31 17:00:50 pem@mysql.com +2 -0
  Added test case for BUG#15091: Sp Returns Unknown error in order clause....and there is
                                 no order by clause
  which was fixed by earlier changesets.
  The error message is now the more generic "Unknown table ... in field list".

  mysql-test/t/sp-error.test
    1.103 06/01/31 17:00:35 pem@mysql.com +31 -0
    New test case for BUG#15091.

  mysql-test/r/sp-error.result
    1.102 06/01/31 17:00:34 pem@mysql.com +13 -0
    Updated results for new test case (BUG#15091).

ChangeSet
  1.2018.3.1 06/01/31 16:27:57 pem@mysql.com +2 -0
  Added test case for BUG#14270: Stored procedures: crash if load index
    which was fixed by earlier changesets; LOAD INDEX is not allowed in functions.
    Also testing CACHE INDEX, while OPTIMIZE and CHECK were covered by existing tests already.

  mysql-test/t/sp-error.test
    1.102 06/01/31 16:27:43 pem@mysql.com +29 -0
    New test case for BUG#14270.

  mysql-test/r/sp-error.result
    1.101 06/01/31 16:27:43 pem@mysql.com +16 -0
    Updated result for new test case (BUG#14270).

ChangeSet
  1.2018.2.1 06/01/31 15:14:46 msvensson@devsrv-b.mysql.com +2 -0
  Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15302/my50-bug15302
  into  devsrv-b.mysql.com:/space/magnus/my50-bug15302

  sql/sql_db.cc
    1.123 06/01/31 15:14:40 msvensson@devsrv-b.mysql.com +0 -0
    Auto merged

  client/mysqltest.c
    1.198 06/01/31 15:14:40 msvensson@devsrv-b.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2019 06/01/31 15:51:55 dlenev@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/dlenev/src/mysql-5.0-bg16829

  sql/sql_yacc.yy
    1.451 06/01/31 15:51:46 dlenev@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1981.58.1 06/01/31 12:52:25 msvensson@neptunus.(none) +2 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug15302/my41-bug15302
  into  neptunus.(none):/home/msvensson/mysql/bug15302/my50-bug15302

  sql/sql_db.cc
    1.121.1.1 06/01/31 12:52:22 msvensson@neptunus.(none) +0 -2
    "mysql_create_db" is already silent in 5.0

  client/mysqltest.c
    1.196.1.1 06/01/31 12:52:22 msvensson@neptunus.(none) +0 -4
    Already in 5.0

ChangeSet
  1.1616.2485.1 06/01/31 12:47:22 msvensson@neptunus.(none) +2 -0
  Bug #15302 LOAD DATA FROM MASTER -> Packets out of order (Found: 2, expected 1)
   - Change "mysql_create_db" to not call "send_ok" if in silent mode i.e. called from "load_master_data"
   - Change mysqltest to detect when there aren't as many warnings available as was reported.

  sql/sql_db.cc
    1.68.1.64 06/01/31 12:47:19 msvensson@neptunus.(none) +10 -3
    Don't call "send_ok" if in silent mode.

  client/mysqltest.c
    1.92.20.2 06/01/31 12:47:19 msvensson@neptunus.(none) +4 -4
    Call "die" if warnings were reported but there weren't any warnings to retrieve

ChangeSet
  1.2015.6.3 06/01/31 14:43:41 dlenev@mysql.com +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/dlenev/src/mysql-5.0-bg16829

  mysql-test/t/trigger.test
    1.34 06/01/31 14:43:34 dlenev@mysql.com +0 -0
    Auto merged

  mysql-test/r/trigger.result
    1.29 06/01/31 14:43:34 dlenev@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2015.6.2 06/01/31 10:48:40 msvensson@neptunus.(none) +1 -0
  Check std_data_ln already created
  Add / to std_data in ln command

  mysql-test/mysql-test-run.sh
    1.289 06/01/31 10:48:33 msvensson@neptunus.(none) +4 -2
    Check if std_data_ln is already created
    Add / to std_data to create a symlink to a dir an not a file.

ChangeSet
  1.2015.4.2 06/01/31 09:38:40 msvensson@neptunus.(none) +1 -0
  Bug #16919 some tests fail in 5.0
   - Use "../tmp" as --slave-load-tmpdir. Same as in mysql-test-run.pl

  mysql-test/mysql-test-run.sh
    1.288 06/01/31 09:38:36 msvensson@neptunus.(none) +8 -1
    Use same --slave-load-tmpdir as in mysql-test-run.pl

ChangeSet
  1.2015.5.1 06/01/31 09:15:28 knielsen@mysql.com +2 -0
  Fix missing --replace_result on $SLAVE_MYPORT in federated.

  mysql-test/r/federated.result
    1.25 06/01/31 09:15:01 knielsen@mysql.com +1 -1
    Fix missing --replace_result on $SLAVE_MYPORT to work with MTR_BUILD_THREAD.

  mysql-test/t/federated.test
    1.21 06/01/31 09:14:53 knielsen@mysql.com +1 -0
    Fix missing --replace_result on $SLAVE_MYPORT to work with MTR_BUILD_THREAD.

ChangeSet
  1.2015.4.1 06/01/31 08:51:21 msvensson@neptunus.(none) +1 -0
  Update trigger-grant-test to use MYSQLTEST_VARDIR

  mysql-test/t/trigger-grant.test
    1.5 06/01/31 08:51:16 msvensson@neptunus.(none) +3 -3
    Update trigger-grant-test to use MYSQLTEST_VARDIR

ChangeSet
  1.1616.2484.3 06/01/31 08:13:42 pekka@mysql.com +1 -0
  ndb - testBlobs 'perf test' fix

  ndb/test/ndbapi/testBlobs.cpp
    1.18.1.5 06/01/31 08:12:02 pekka@mysql.com +12 -6
    setValue buffer was not fullsize

ChangeSet
  1.2015.3.1 06/01/30 22:52:15 aivanov@mysql.com +2 -0
  Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss20
  into  mysql.com:/home/alexi/innodb/mysql-5.0-ss20

  innobase/fil/fil0fil.c
    1.62 06/01/30 22:52:11 aivanov@mysql.com +2 -91
    Null merged

  innobase/btr/btr0sea.c
    1.37 06/01/30 22:52:11 aivanov@mysql.com +4 -37
    Null merged

ChangeSet
  1.1616.2478.3 06/01/30 22:33:02 aivanov@mysql.com +3 -0
  Fixed BUG#15653, BUG#16582.
    Applied innodb-4.1-ss20 snapshot.

  innobase/include/btr0sea.ic
    1.3 06/01/30 22:32:59 aivanov@mysql.com +1 -1
    Applied innodb-4.1-ss20 snapshot.
      btr_search_info_update_hash(), btr_search_info_update_slow():
      Document the parameter "info" as in/out.
    

  innobase/fil/fil0fil.c
    1.41.1.13 06/01/30 22:32:59 aivanov@mysql.com +91 -12
    Applied innodb-4.1-ss20 snapshot.
      Keep track on unflushed modifications to file spaces. When
      there are tens of thousnads of file spaces, flushing all files
      in fil_flush_file_spaces() would be very slow (Bug #16582).
      fil_flush_file_spaces(): Only flush unflushed file spaces.
      fil_space_t, fil_system_t: Add a list of unflushed spaces.

  innobase/btr/btr0sea.c
    1.22.1.1 06/01/30 22:32:59 aivanov@mysql.com +37 -4
    Applied innodb-4.1-ss20 snapshot.
      Account for a race condition when dropping the adaptive
      hash index for a B-tree page (Bug #16582).
      btr_search_drop_page_hash_index(): Retry the operation if a hash
      index with different parameters was built meanwhile. Add
      diagnostics for the case that hash node pointers to the page
      remain. This fix is from Heikki.
      btr_search_info_update_hash(), btr_search_info_update_slow():
      Document the parameter "info" as in/out.

ChangeSet
  1.2004.3.2 06/01/30 15:04:00 pem@mysql.com +1 -0
  Post-review fix for BUG#15737 (corrected typo in sp-code.test comment)

  mysql-test/t/sp-code.test
    1.4 06/01/30 15:03:56 pem@mysql.com +1 -1
    Corrected typo in comment.

ChangeSet
  1.2015 06/01/30 17:03:09 SergeyV@selena. +1 -0
  Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  selena.:H:/MYSQL/src/#15634-mysql-5.0

  sql/field.cc
    1.297 06/01/30 17:02:51 SergeyV@selena. +0 -0
    Auto merged

ChangeSet
  1.2004.10.1 06/01/30 15:50:53 aivanov@mysql.com +3 -0
  Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss17
  into  mysql.com:/home/alexi/innodb/mysql-5.0-ss17

  mysql-test/t/innodb.test
    1.124 06/01/30 15:50:49 aivanov@mysql.com +0 -13
    Null merged

  mysql-test/r/innodb.result
    1.154 06/01/30 15:50:49 aivanov@mysql.com +0 -13
    Null merged

  innobase/dict/dict0dict.c
    1.71 06/01/30 15:50:49 aivanov@mysql.com +1 -2
    Null merged

ChangeSet
  1.2004.8.3 06/01/30 14:33:15 aelkin@mysql.com +2 -0
  BUG#13227 test case to examine that local slave's triggers that use select work ok even if they fire
      for replicated update.

  mysql-test/t/rpl_trigger.test
    1.5 06/01/30 14:33:11 aelkin@mysql.com +97 -1
    BUG#13227 test case is added.

  mysql-test/r/rpl_trigger.result
    1.4 06/01/30 14:33:11 aelkin@mysql.com +721 -0
    results are changed to account 13227 addon.

ChangeSet
  1.1616.2478.2 06/01/30 15:17:33 aivanov@mysql.com +3 -0
  Fixed BUG#16387.
    Applied innodb-4.1-ss17 snapshot.
    Do not mistake TABLENAME_ibfk_0 for auto-generated id.

  mysql-test/t/innodb.test
    1.62.1.17 06/01/30 15:17:30 aivanov@mysql.com +13 -0
    Applied innodb-4.1-ss17 snapshot.
      Added test case.

  mysql-test/r/innodb.result
    1.75.4.15 06/01/30 15:17:30 aivanov@mysql.com +13 -0
    Applied innodb-4.1-ss17 snapshot.
      Fixed results for added test case.

  innobase/dict/dict0dict.c
    1.52.1.14 06/01/30 15:17:30 aivanov@mysql.com +2 -1
    Applied innodb-4.1-ss17 snapshot.
      dict_table_get_highest_foreign_id(): Ignore foreign
      constraint identifiers starting with the pattern
      TABLENAME_ibfk_0 (BUG#16387).

ChangeSet
  1.2013 06/01/30 11:02:09 msvensson@neptunus.(none) +2 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug15719/my50-bug15719
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  tests/mysql_client_test.c
    1.170 06/01/30 11:02:05 msvensson@neptunus.(none) +0 -1
    Merge

  sql-common/client.c
    1.83 06/01/30 11:01:31 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2004.8.2 06/01/28 19:44:51 paul@snake-hub.snake.net +4 -0
  information_schema_db.result, information_schema.result:
    Fix test result.
  table.h, sql_show.cc:
    Put I_S tables in lexical order.

  mysql-test/r/information_schema_db.result
    1.5 06/01/28 19:44:11 paul@snake-hub.snake.net +1 -1
    Fix test result.

  mysql-test/r/information_schema.result
    1.97 06/01/28 19:44:11 paul@snake-hub.snake.net +1 -1
    Fix test result.

  sql/table.h
    1.123 06/01/28 19:43:20 paul@snake-hub.snake.net +2 -2
    Put I_S tables in lexical order.

  sql/sql_show.cc
    1.307 06/01/28 19:43:08 paul@snake-hub.snake.net +2 -2
    Put I_S tables in lexical order.

ChangeSet
  1.1616.2144.115 06/01/28 13:04:01 kent@mysql.com +1 -0
  mysql-test-run.pl:
    Aligned the MTR_BUILD_THREAD policy to shell version

  mysql-test/mysql-test-run.pl
    1.8.2.42 06/01/28 13:03:27 kent@mysql.com +13 -3
    Aligned the MTR_BUILD_THREAD policy to shell version

ChangeSet
  1.1616.2144.114 06/01/28 12:39:25 kent@mysql.com +1 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
  into mysql.com:/Users/kent/mysql/bk/mysql-4.1

  mysql-test/mysql-test-run.sh
    1.208.1.51 06/01/28 12:39:22 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.1.827 06/01/28 12:35:46 kent@mysql.com +1 -0
  mysql-test-run.sh:
    Bug#16780: Extend port range to make space for 5.1 NDBCLUSTER_PORT_SLAVE

  mysql-test/mysql-test-run.sh
    1.146.1.56 06/01/28 12:35:35 kent@mysql.com +6 -1
    Bug#16780: Extend port range to make space for 5.1 NDBCLUSTER_PORT_SLAVE

ChangeSet
  1.2004.9.1 06/01/28 12:50:16 dlenev@mysql.com +3 -0
  Fix for bug #16829 "Firing trigger with RETURN crashes the server"
  
  We should disallow usage of RETURN statement in triggers and emit
  error at parsing time (instead of crashing when trigger is fired).

  sql/sql_yacc.yy
    1.449.2.1 06/01/28 12:50:09 dlenev@mysql.com +1 -1
    We should disallow usage of RETURN statement in triggers and emit
    error at parsing time (instead of crashing when trigger is fired). 

  mysql-test/t/trigger.test
    1.32.1.1 06/01/28 12:50:08 dlenev@mysql.com +9 -0
    Added test for bug #16829 "Firing trigger with RETURN crashes the server".

  mysql-test/r/trigger.result
    1.27.1.1 06/01/28 12:50:08 dlenev@mysql.com +5 -0
    Added test for bug #16829 "Firing trigger with RETURN crashes the server".

ChangeSet
  1.2004.8.1 06/01/27 21:20:28 igor@rurik.mysql.com +3 -0
  Fixed bug #16260.
  The problem has manifested itself in the cases when we have a nested outer join
  for which it can be inferred that one of the inner tables is a single row table.

  sql/sql_select.cc
    1.389 06/01/27 21:20:09 igor@rurik.mysql.com +2 -1
    Fixed bug #16260.
    The problem has manifested itself in the cases when we have a nested outer join
    for which it can be inferred that one of the inner tables is a single row table.
    A table is never considered as a const table if it is used in a nested join 
    that serves as an inner operand of an outer join.  

  mysql-test/t/join_nested.test
    1.18 06/01/27 21:20:09 igor@rurik.mysql.com +28 -0
    Added a test case for bug #16260.

  mysql-test/r/join_nested.result
    1.22 06/01/27 21:20:09 igor@rurik.mysql.com +23 -0
    Added a test case for bug #16260.

ChangeSet
  1.2004.1.6 06/01/27 15:43:44 patg@govinda.patg.net +4 -0
  BUG# 14768
  
  Added fixes to make last_insert_id() to work.

  sql/ha_federated.h
    1.23 06/01/27 15:43:40 patg@govinda.patg.net +1 -0
    BUG #14768
    
    New method for setting last_insert_id()

  sql/ha_federated.cc
    1.59 06/01/27 15:43:40 patg@govinda.patg.net +30 -0
    BUG# 14768
    
    * Added code to set last_insert_id()
    * Added code to free share->scheme

  mysql-test/t/federated.test
    1.20 06/01/27 15:43:40 patg@govinda.patg.net +30 -0
    BUG #14768
    
    Tests for last_insert_id()

  mysql-test/r/federated.result
    1.24 06/01/27 15:43:40 patg@govinda.patg.net +42 -0
    BUG #14768
    
    New test results for last_insert_id()

ChangeSet
  1.1616.2483.2 06/01/27 12:44:33 pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  Added comments to specify why no much mutex is needed.

  sql/ha_heap.cc
    1.47.1.12 06/01/27 12:44:30 pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +24 -0
    Added comments to specify why no much mutex is needed.

ChangeSet
  1.1616.2482.1 06/01/27 13:23:10 msvensson@neptunus.(none) +1 -0
  Enable kill test

  mysql-test/t/disabled.def
    1.1.1.1 06/01/27 13:23:07 msvensson@neptunus.(none) +0 -1
    Enable the kill test

ChangeSet
  1.1616.2144.111 06/01/27 12:10:40 kent@mysql.com +1 -0
  configure.in:
    Cloned off 4.1.18, new release number 4.1.19

  configure.in
    1.201.1.203 06/01/27 12:09:14 kent@mysql.com +2 -2
    New release number

ChangeSet
  1.2010 06/01/27 10:49:07 msvensson@neptunus.(none) +21 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases
  into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration

  mysql-test/r/trigger-compat.result
    1.3 06/01/27 10:49:04 msvensson@neptunus.(none) +2 -2
    Merge

  mysql-test/t/trigger-compat.test
    1.4 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/sp-security.test
    1.27 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_replicate_do.test
    1.24 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_misc_functions.test
    1.5 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_loaddata_rule_s.test
    1.11 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_loaddata_rule_m.test
    1.14 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl_loaddata.test
    1.23 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl000001.test
    1.44 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/query_cache.test
    1.53 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -1
    Auto merged

  mysql-test/r/view_grant.result
    1.10 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/variables.result
    1.78 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/sp-security.result
    1.24 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/rpl_replicate_do.result
    1.32 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/rpl_misc_functions.result
    1.4 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/rpl_loaddata_rule_s.result
    1.9 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/rpl_loaddata_rule_m.result
    1.15 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/rpl_loaddata.result
    1.30 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/rpl000001.result
    1.32 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/query_cache.result
    1.70 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -1
    Auto merged

  mysql-test/mysql-test-run.pl
    1.63 06/01/27 10:47:56 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2009 06/01/27 09:24:45 msvensson@neptunus.(none) +1 -0
  Use MYSQLTEST_VARDIR

  mysql-test/t/information_schema.test
    1.69 06/01/27 09:24:41 msvensson@neptunus.(none) +2 -2
    Use MYSQLTEST_VARDIR instead of MYSQL_TEST_DIR/var

ChangeSet
  1.1616.2144.110 06/01/27 01:38:05 kent@mysql.com +1 -0
  configure.in:
    Generated "libmysql.ver" will be in \$(top_builddir)

  configure.in
    1.201.1.202 06/01/27 01:37:13 kent@mysql.com +1 -1
    Generated "libmysql.ver" will be in \$(top_builddir)

ChangeSet
  1.1981.57.1 06/01/26 17:54:34 msvensson@neptunus.(none) +65 -0
  Add new option "check-testcases" to mysql-test-run.pl
  Cleanup the sideeffects from most of the  testcases with sideeffects.

  mysql-test/include/check-testcase.test
    1.1 06/01/26 17:54:29 msvensson@neptunus.(none) +51 -0
    New BitKeeper file ``mysql-test/include/check-testcase.test''

  mysql-test/t/view_grant.test
    1.9 06/01/26 17:54:29 msvensson@neptunus.(none) +2 -0
    Drop the user "test@localhost"

  mysql-test/t/variables.test
    1.52 06/01/26 17:54:29 msvensson@neptunus.(none) +1 -1
    Set max_join_size to 10, which was the original value in variables-master.opt

  mysql-test/t/variables-master.opt
    1.7 06/01/26 17:54:29 msvensson@neptunus.(none) +1 -1
    Increase max_join_size to 100.

  mysql-test/include/check-testcase.test
    1.0 06/01/26 17:54:29 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases/mysql-test/include/check-testcase.test

  mysql-test/t/type_bit.test
    1.14 06/01/26 17:54:28 msvensson@neptunus.(none) +1 -0
    drop table t1 and t2 to cleanup

  mysql-test/t/trigger-compat.test
    1.2.1.1 06/01/26 17:54:28 msvensson@neptunus.(none) +13 -0
    Drop trigger wl2818_trg1 and wl2818_trg2 to cleanup
    Drop table t1, t2
    Drop users
    drop database mysqltest_db1

  mysql-test/t/subselect_innodb.test
    1.16 06/01/26 17:54:28 msvensson@neptunus.(none) +1 -0
    Drop procedure p1 to cleanup

  mysql-test/t/sp-security.test
    1.25.1.1 06/01/26 17:54:28 msvensson@neptunus.(none) +8 -2
    Delete  test users from mysql.user, mysql.db, mysql.procs_priv and mysql.tables_priv
    Drop table t1 to cleanup

  mysql-test/t/sp-prelocking.test
    1.3 06/01/26 17:54:28 msvensson@neptunus.(none) +2 -1
    Drop table t1, t2 t3 and t4 to cleanup
    Drop view v1

  mysql-test/t/rpl_slave_status.test
    1.7 06/01/26 17:54:28 msvensson@neptunus.(none) +4 -0
    Drop table t1 to cleanup

  mysql-test/t/rpl_skip_error.test
    1.7 06/01/26 17:54:28 msvensson@neptunus.(none) +3 -0
    Drop table t1 to cleanup

  mysql-test/t/rpl_replicate_do.test
    1.22.1.1 06/01/26 17:54:28 msvensson@neptunus.(none) +4 -0
    Drop table t1 to cleanup

  mysql-test/t/rpl_multi_update3.test
    1.6 06/01/26 17:54:28 msvensson@neptunus.(none) +3 -0
    Drop table t1 and t2 to cleanup

  mysql-test/t/rpl_misc_functions.test
    1.3.1.1 06/01/26 17:54:28 msvensson@neptunus.(none) +4 -0
    Drop table t1 to cleanup

  mysql-test/t/rpl_loaddata_rule_s.test
    1.9.1.1 06/01/26 17:54:28 msvensson@neptunus.(none) +3 -0
    Drop table t1 to cleanup

  mysql-test/t/rpl_loaddata_rule_m.test
    1.12.1.1 06/01/26 17:54:28 msvensson@neptunus.(none) +3 -0
    Drop table t1 to cleanup

  mysql-test/t/rpl_loaddata.test
    1.21.1.1 06/01/26 17:54:28 msvensson@neptunus.(none) +2 -1
    Drop table t1 to cleanup

  mysql-test/t/rpl_insert_id.test
    1.14 06/01/26 17:54:28 msvensson@neptunus.(none) +3 -0
    drop table t1 to cleanup

  mysql-test/t/rpl_ignore_revoke.test
    1.2 06/01/26 17:54:28 msvensson@neptunus.(none) +4 -0
    Delet user "user_foo" to cleanup

  mysql-test/t/rpl_flush_tables.test
    1.12 06/01/26 17:54:28 msvensson@neptunus.(none) +3 -0
    Droip table t3, t4 and t5 to cleanup

  mysql-test/t/rpl_failed_optimize.test
    1.3 06/01/26 17:54:28 msvensson@neptunus.(none) +3 -0
    Drop table t1 to cleanup

  mysql-test/t/rpl000017.test
    1.14 06/01/26 17:54:28 msvensson@neptunus.(none) +1 -0
    Delete user "replicate" to cleanup

  mysql-test/t/rpl000001.test
    1.42.1.1 06/01/26 17:54:28 msvensson@neptunus.(none) +1 -0
    Delete user "blafasel2" to cleanup

  mysql-test/t/read_only.test
    1.2 06/01/26 17:54:27 msvensson@neptunus.(none) +2 -0
    Reset the readonly flag

  mysql-test/t/query_cache.test
    1.51.1.1 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -0
    Drop function "f1" to cleanup

  mysql-test/t/ps_1general.test
    1.26 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -1
    Drop table t1 to cleanup

  mysql-test/t/join_outer.test
    1.34 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -0
    Drop view v1 to cleanup

  mysql-test/t/innodb_cache.test
    1.12 06/01/26 17:54:27 msvensson@neptunus.(none) +4 -0
    Reset query_cache_size to original value

  mysql-test/t/grant2.test
    1.30 06/01/26 17:54:27 msvensson@neptunus.(none) +2 -0
    Drop users "mysqltest_2" and "mysqltest_A@'%'" to cleanup

  mysql-test/t/fulltext_var.test
    1.5 06/01/26 17:54:27 msvensson@neptunus.(none) +8 -0
    Restore the original ft_boolean_syntax

  mysql-test/t/ctype_recoding.test
    1.22 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -1
    Drop table t1 to cleanup

  mysql-test/t/ctype_cp932.test
    1.9 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -0
    Drop table t1 to cleanup

  mysql-test/t/create_select_tmp.test
    1.10 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -0
    Drop table t1 to cleanup

  mysql-test/t/analyze.test
    1.8 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -0
    Drop table t1 to cleanup

  mysql-test/r/view_grant.result
    1.8.1.1 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -0
    Dop user "test@localhost" to cleanup

  mysql-test/r/variables.result
    1.76.1.1 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -0
    Set GLOBAL max_join_size to 10 as it originally was in variables-master.opt

  mysql-test/r/type_bit.result
    1.15 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -0
    Drop tables t1 and t2 to cleanup

  mysql-test/r/trigger-compat.result
    1.1.1.1 06/01/26 17:54:27 msvensson@neptunus.(none) +10 -0
    Drop trigger wl2818_trg1 and wl2818_trg2.
    Drop table t1, t2
    Drop database mysqltest_db1
    And the users "mysqltest_dfn@localhost" and "mysqltest_inv@localhost"

  mysql-test/r/subselect_innodb.result
    1.13 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -0
    Drop procedure p1 to cleanup

  mysql-test/r/sp-security.result
    1.22.1.1 06/01/26 17:54:27 msvensson@neptunus.(none) +7 -0
    Delete users to cleanup
    Delete remaining traces in tables_priv and procs_priv

  mysql-test/r/sp-prelocking.result
    1.3 06/01/26 17:54:27 msvensson@neptunus.(none) +2 -1
    Drop view v1 and tables t1, t2, t3 and t4 to cleanup

  mysql-test/r/rpl_slave_status.result
    1.5 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -0
    Drop tyable t1 to cleanup

  mysql-test/r/rpl_skip_error.result
    1.7 06/01/26 17:54:27 msvensson@neptunus.(none) +1 -0
    Drop tyable t1 to cleanup

  mysql-test/r/rpl_replicate_do.result
    1.30.1.1 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop tyable t1 to cleanup

  mysql-test/r/rpl_multi_update3.result
    1.5 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop tyable t1 and t2 to cleanup

  mysql-test/r/rpl_misc_functions.result
    1.2.1.1 06/01/26 17:54:26 msvensson@neptunus.(none) +2 -0
    Drop tyable t1 to cleanup

  mysql-test/r/rpl_loaddata_rule_s.result
    1.7.1.1 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop tyable t1 to cleanup

  mysql-test/r/rpl_loaddata_rule_m.result
    1.13.1.1 06/01/26 17:54:26 msvensson@neptunus.(none) +2 -0
    Drop tyable t1 to cleanup

  mysql-test/r/rpl_loaddata.result
    1.28.1.1 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop tyable t1 to cleanup

  mysql-test/r/rpl_insert_id.result
    1.13 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop table t1 to cleanup

  mysql-test/r/rpl_ignore_revoke.result
    1.2 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Delete user "user_foo"

  mysql-test/r/rpl_flush_tables.result
    1.13 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop tables t3, t4, t5

  mysql-test/r/rpl_failed_optimize.result
    1.4 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop table t1 to cleanup

  mysql-test/r/rpl000017.result
    1.7 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Remove user "replicate"

  mysql-test/r/rpl000001.result
    1.30.1.1 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Remove user "blafasel2"

  mysql-test/r/read_only.result
    1.3 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Reset the "read_only" flag

  mysql-test/r/query_cache.result
    1.68.1.1 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop function "f1"

  mysql-test/r/ps_1general.result
    1.52 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -1
    Drop table t1 at end of test

  mysql-test/r/join_outer.result
    1.45 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop view v1 to cleanup

  mysql-test/r/grant2.result
    1.24 06/01/26 17:54:26 msvensson@neptunus.(none) +2 -0
    Drop user mysqltest_2 and mysqltest_A@'%'

  mysql-test/r/ctype_recoding.result
    1.30 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop table t1 at end of test

  mysql-test/r/ctype_cp932.result
    1.7 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop table t1 at end of test

  mysql-test/r/create_select_tmp.result
    1.5 06/01/26 17:54:26 msvensson@neptunus.(none) +1 -0
    Drop table t1 at end of test

  mysql-test/r/analyze.result
    1.5 06/01/26 17:54:25 msvensson@neptunus.(none) +1 -0
    Drop table t1 at end of test

  mysql-test/mysql-test-run.pl
    1.60.1.1 06/01/26 17:54:25 msvensson@neptunus.(none) +63 -1
    Add option "check-testcases" to mysql-test-run.pl
    Will execute "include/check-testcase.test" once before each tescase and record the output into "var/tmp/check-testcase.result"
    After the teastcase it will run again and this time compare the output with previously recorded file.

ChangeSet
  1.2004.7.1 06/01/26 17:26:25 pem@mysql.com +6 -0
   Fixed on BUG#16568: Continue handler with simple CASE not working correctly
    After trying multiple inheritance (to messy and hard make it work) and
    sublassing jump_if_not (worked, but ugly), decided to on this solution
    instead:
    Inserting an abstract sp_instr_opt_meta class as parent for all instructions
    with destinations makes it possible to handle a continuation pointer for
    sp_instr_set_case_expr too.
    Note: No special test case; the fix is captured by the changed behaviour of
    bug14643_2, and bug14498_4 (formerly disabled), in sp.test.

  sql/sql_yacc.yy
    1.449.1.1 06/01/26 17:26:22 pem@mysql.com +9 -8
    sp_instr_set_case_expr is now added to backpatch list (for the new cont. destination).

  sql/sql_parse.cc
    1.523.1.1 06/01/26 17:26:21 pem@mysql.com +1 -1
    Fixed small bug at show_routine_code() call (tested return value the wrong way).

  sql/sp_head.h
    1.77.1.1 06/01/26 17:26:21 pem@mysql.com +69 -27
    New abstract class between sp_instr and instructions with destinations, in particular
    sp_instr_set_case_expr, for continuation destination handling.
    Changed type of some parameters and variables (sp_instr_opt_meta instead of sp_instr_jump*).
    Added opt_mark(), opt_move() and set_destination() methods to
    sp_instr_set_case_expr.

  sql/sp_head.cc
    1.198.1.1 06/01/26 17:26:21 pem@mysql.com +64 -21
    Changed type of some parameters and variables (sp_instr_opt_meta instead of sp_instr_jump*).
    Added consistency check of m_ip member in instructions in sp_head::show_routine_code().
    Updated print() method of, and added opt_mark() and opt_move() methods to
    sp_instr_set_case_expr, to handle the new continuation destination.

  mysql-test/t/sp.test
    1.172.1.1 06/01/26 17:26:21 pem@mysql.com +1 -4
    Enabled test bug14498_4 for BUG#16568.

  mysql-test/r/sp.result
    1.183.1.1 06/01/26 17:26:21 pem@mysql.com +5 -2
    Updated results for BUG#16568 (affects results for bug14643_2 and bug14498_4)

ChangeSet
  1.1616.2144.108 06/01/26 16:00:49 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-4.1

  sql/sql_select.cc
    1.216.1.233 06/01/26 16:00:46 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.2004.6.1 06/01/26 13:29:46 pem@mysql.com +6 -0
  Fixed BUG#16303: erroneus stored procedures and functions should be droppable
    Use a special lookup function for DROP, which doesn't attempt to parse the
    definition.

  sql/sql_parse.cc
    1.524 06/01/26 13:29:42 pem@mysql.com +7 -11
    Use the new sp_routine_exists_in_table() instead of sp_find_routine(), since we don't
    want the routine definition parsed when doing DROP PROCEDURE/FUNCTION.

  sql/sql_acl.cc
    1.187 06/01/26 13:29:42 pem@mysql.com +1 -1
    Call to sp_exists_routine() renamed to sp_exist_routines().

  sql/sp.h
    1.33 06/01/26 13:29:42 pem@mysql.com +4 -1
    New function sp_routine_exists_in_table() for DROP PROCEDURE/FUNCTION.
    
    Renamed sp_exists_routine to sp_exist_routines,
    and changed the misnamed parameter 'tables' to 'routines'.

  sql/sp.cc
    1.105 06/01/26 13:29:42 pem@mysql.com +47 -8
    New function sp_routine_exists_in_table() for DROP PROCEDURE/FUNCTION; which doesn't
    want to parse the definition, only know if it exists.
    
    Renamed sp_exists_routine to sp_exist_routines and added comment,
    and changed the misnamed parameter/variable 'tables'/'table' to
    'routines'/'routine'.
    

  mysql-test/t/sp-destruct.test
    1.3.1.1 06/01/26 13:29:42 pem@mysql.com +10 -1
    Added test case for BUG#16303.

  mysql-test/r/sp-destruct.result
    1.4 06/01/26 13:29:42 pem@mysql.com +7 -1
    Updated test result for BUG#16303.

ChangeSet
  1.2008 06/01/26 12:51:27 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration

  mysql-test/t/trigger-grant.test
    1.4 06/01/26 12:51:14 msvensson@neptunus.(none) +0 -3
    Merge

ChangeSet
  1.2007 06/01/26 12:38:47 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var
  into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration

  mysql-test/t/mysqltest.test
    1.32 06/01/26 12:38:41 msvensson@neptunus.(none) +0 -1
    Auto merged

ChangeSet
  1.1974.7.3 06/01/26 12:38:01 msvensson@neptunus.(none) +1 -0
  Merge

  mysql-test/t/mysqltest.test
    1.19.2.2 06/01/26 12:37:57 msvensson@neptunus.(none) +1 -1
    Merge

ChangeSet
  1.1616.2480.2 06/01/26 12:51:34 aelkin@mysql.com +2 -0
  BUG#16487 importing the test case from 5.0 (the fix is done in BUG#15699)

  mysql-test/t/rpl_ignore_table.test
    1.1 06/01/26 12:51:31 aelkin@mysql.com +28 -0
    New BitKeeper file ``mysql-test/t/rpl_ignore_table.test''

  mysql-test/t/rpl_ignore_table-slave.opt
    1.1 06/01/26 12:51:31 aelkin@mysql.com +1 -0
    New BitKeeper file ``mysql-test/t/rpl_ignore_table-slave.opt''

  mysql-test/t/rpl_ignore_table.test
    1.0 06/01/26 12:51:31 aelkin@mysql.com +0 -0
    BitKeeper file /usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16487/mysql-test/t/rpl_ignore_table.test

  mysql-test/t/rpl_ignore_table-slave.opt
    1.0 06/01/26 12:51:31 aelkin@mysql.com +0 -0
    BitKeeper file /usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16487/mysql-test/t/rpl_ignore_table-slave.opt

ChangeSet
  1.1616.2480.1 06/01/26 12:49:55 aelkin@mysql.com +5 -0
  BUG#15699 importing the fix from 5.0

  mysql-test/r/rpl_ignore_table.result
    1.1 06/01/26 12:49:52 aelkin@mysql.com +16 -0
    New BitKeeper file ``mysql-test/r/rpl_ignore_table.result''

  mysql-test/r/rpl_ignore_table.result
    1.0 06/01/26 12:49:52 aelkin@mysql.com +0 -0
    BitKeeper file /usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16487/mysql-test/r/rpl_ignore_table.result

  mysql-test/t/rpl_multi_update4.test
    1.1 06/01/26 12:47:59 aelkin@mysql.com +44 -0
    New BitKeeper file ``mysql-test/t/rpl_multi_update4.test''

  mysql-test/t/rpl_multi_update4-slave.opt
    1.1 06/01/26 12:47:59 aelkin@mysql.com +1 -0
    New BitKeeper file ``mysql-test/t/rpl_multi_update4-slave.opt''

  mysql-test/r/rpl_multi_update4.result
    1.1 06/01/26 12:47:59 aelkin@mysql.com +25 -0
    New BitKeeper file ``mysql-test/r/rpl_multi_update4.result''

  sql/sql_parse.cc
    1.271.1.204 06/01/26 12:47:59 aelkin@mysql.com +10 -5
    BUG#15699,16487 merge of the fix made in 5.0

  mysql-test/t/rpl_multi_update4.test
    1.0 06/01/26 12:47:59 aelkin@mysql.com +0 -0
    BitKeeper file /usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16487/mysql-test/t/rpl_multi_update4.test

  mysql-test/t/rpl_multi_update4-slave.opt
    1.0 06/01/26 12:47:59 aelkin@mysql.com +0 -0
    BitKeeper file /usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16487/mysql-test/t/rpl_multi_update4-slave.opt

  mysql-test/r/rpl_multi_update4.result
    1.0 06/01/26 12:47:59 aelkin@mysql.com +0 -0
    BitKeeper file /usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16487/mysql-test/r/rpl_multi_update4.result

ChangeSet
  1.1981.45.3 06/01/26 11:20:59 msvensson@neptunus.(none) +2 -0
  Bug #15719  MYSQL_OPT_RECONNECT option is modified by mysql_real_connect
   - Move init of "reconnect" variable to mysql_init 
   - Add test case to mysql_client_test.

  tests/mysql_client_test.c
    1.167.1.1 06/01/26 11:20:53 msvensson@neptunus.(none) +78 -2
    Add test to check that reconnect is not modified by a call to mysql_real_connect

  sql-common/client.c
    1.81.1.1 06/01/26 11:20:53 msvensson@neptunus.(none) +18 -17
    Move initialisation of reconnect variable to mysql_init instead of doing it in mysql_real_connect.

ChangeSet
  1.1616.2144.107 06/01/26 10:16:28 tomas@poseidon.ndb.mysql.com +1 -0
  reserved config numbers in ndb

  ndb/include/mgmapi/mgmapi_config_parameters.h
    1.13.1.4 06/01/26 10:16:20 tomas@poseidon.ndb.mysql.com +5 -0
    reserved config numbers in ndb

ChangeSet
  1.2004.5.1 06/01/26 13:15:47 ramil@mysql.com +1 -0
  Fix for bug #16511: Decimal data types broken with prepared statements.

  sql/sql_prepare.cc
    1.168 06/01/26 13:15:39 ramil@mysql.com +1 -1
    Fix for bug #16511: Decimal data types broken with prepared statements.
    - should add the real length.

ChangeSet
  1.1616.2144.106 06/01/26 00:09:04 sergefp@mysql.com +1 -0
  BUG#15935: post-review fixes: added comment

  sql/sql_update.cc
    1.83.2.70 06/01/26 00:09:01 sergefp@mysql.com +10 -0
    BUG#15935: post-review fixes: added comment

ChangeSet
  1.1616.2144.105 06/01/26 00:06:20 sergefp@mysql.com +2 -0
  Merge

  mysql-test/t/update.test
    1.19.1.9 06/01/26 00:06:17 sergefp@mysql.com +0 -1
    Merge

  mysql-test/r/update.result
    1.22.1.8 06/01/26 00:06:17 sergefp@mysql.com +0 -0
    Merge

ChangeSet
  1.1616.2144.104 06/01/25 23:28:39 evgen@moonbone.local +1 -0
  sql_base.cc:
    Small fix after merge of fix for bug#16510

  sql/sql_base.cc
    1.145.1.119 06/01/25 23:25:50 evgen@moonbone.local +0 -1
    Small fix after merge of fix for bug#16510

ChangeSet
  1.1616.2479.1 06/01/25 23:25:23 sergefp@mysql.com +3 -0
  BUG#15935: In mysql_update, don't use full index scan when we could have used quick select scan.

  sql/sql_update.cc
    1.83.2.69 06/01/25 23:25:19 sergefp@mysql.com +1 -2
    BUG#15935: 
    - Do account for the fact that used_index!=MAX_KEY is also true for cases
      when quick select is used, and use quick select then (and not full index scan).
    - Also removed the redundant "used_index= MAX_KEY" statement

  mysql-test/t/update.test
    1.19.2.1 06/01/25 23:25:19 sergefp@mysql.com +12 -0
    Testcase for BUG#15935

  mysql-test/r/update.result
    1.22.2.1 06/01/25 23:25:19 sergefp@mysql.com +15 -0
    Testcase for BUG#15935

ChangeSet
  1.2004.4.1 06/01/25 17:19:54 pem@mysql.com +3 -0
  Fixed BUGS#15011: error handler for mysql errno in nested block not activated
    For nested sql errno handlers (unlike sqlexception and other), we didn't stop
    searching when the innermost handler was found - now make sure we do.

  sql/sp_rcontext.cc
    1.39 06/01/25 17:19:50 pem@mysql.com +2 -1
    Make sure we stop at the innermost sql_errno handler.

  mysql-test/t/sp.test
    1.173 06/01/25 17:19:50 pem@mysql.com +31 -0
    New testcase for BUG#15011.

  mysql-test/r/sp.result
    1.184 06/01/25 17:19:50 pem@mysql.com +19 -0
    Updated result for BUG#15011.

ChangeSet
  1.2000.4.1 06/01/25 16:14:27 lars@mysql.com +3 -0
  BUG#16487: New test for ignored table and multi-update

  mysql-test/t/rpl_ignore_table.test
    1.1 06/01/25 16:14:20 lars@mysql.com +28 -0
    New test for ignored table and multi-update

  mysql-test/t/rpl_ignore_table-slave.opt
    1.1 06/01/25 16:14:20 lars@mysql.com +1 -0
    New option file

  mysql-test/t/rpl_ignore_table.test
    1.0 06/01/25 16:14:20 lars@mysql.com +0 -0
    BitKeeper file /users/lthalmann/bk/mysql-5.0-bug16487/mysql-test/t/rpl_ignore_table.test

  mysql-test/t/rpl_ignore_table-slave.opt
    1.0 06/01/25 16:14:20 lars@mysql.com +0 -0
    BitKeeper file /users/lthalmann/bk/mysql-5.0-bug16487/mysql-test/t/rpl_ignore_table-slave.opt

  mysql-test/r/rpl_ignore_table.result
    1.1 06/01/25 16:14:19 lars@mysql.com +16 -0
    New result file

  mysql-test/r/rpl_ignore_table.result
    1.0 06/01/25 16:14:19 lars@mysql.com +0 -0
    BitKeeper file /users/lthalmann/bk/mysql-5.0-bug16487/mysql-test/r/rpl_ignore_table.result

ChangeSet
  1.2004.3.1 06/01/25 15:11:49 pem@mysql.com +5 -0
  Fixed BUG#15737: Stored procedure optimizer bug with LEAVE
    Second version.
    The problem was that the optimizer didn't work correctly with forwards jumps
    to "no-op" hpop and cpop instructions.
    Don't generate "no-op" instructions (hpop 0 and cpop 0), it isn't actually
    necessary.

  sql/sql_yacc.yy
    1.450 06/01/25 15:11:45 pem@mysql.com +8 -9
    Don't generate "no-op" hpop and cpop instructions for LEAVE, it's not necessary.
    Just generate them when needed.

  sql/sp_head.h
    1.78 06/01/25 15:11:45 pem@mysql.com +22 -18
    Removed backpatch and opt_mark methods from sp_instr_hpop/cpop, since they're not needed
    any more.
    Added comments to optimizer methods in sp_instr.

  sql/sp_head.cc
    1.199 06/01/25 15:11:45 pem@mysql.com +9 -12
    Removed backpatch methods from sp_instr_hpop/cpop, since they're not needed any more.
    Added more documentation to sp_head::optimize()

  mysql-test/t/sp-code.test
    1.3 06/01/25 15:11:45 pem@mysql.com +143 -0
    New test case (BUG#15737)

  mysql-test/r/sp-code.result
    1.4 06/01/25 15:11:44 pem@mysql.com +139 -0
    Updated results for new test case (BUG#15737)

ChangeSet
  1.2004.2.2 06/01/24 21:43:41 brian@zim.tangent.org +1 -0
  Complaint from a user who was getting sick of repairing their tables do to their lousy setup (their words). All crashed archive tables will now be repaired on open. 

  sql/ha_archive.cc
    1.65 06/01/24 21:43:35 brian@zim.tangent.org +8 -11
    Fix for repair table.

ChangeSet
  1.1616.2144.103 06/01/24 22:10:39 evgen@moonbone.local +3 -0
  Manually merged

  mysql-test/t/update.test
    1.19.1.8 06/01/24 22:10:37 evgen@moonbone.local +8 -8
    Manually merged

  mysql-test/r/update.result
    1.22.1.7 06/01/24 22:10:37 evgen@moonbone.local +4 -4
    Manually merged

  sql/sql_base.cc
    1.145.1.118 06/01/24 21:50:09 evgen@moonbone.local +0 -0
    Auto merged

ChangeSet
  1.2004.2.1 06/01/24 20:15:12 anozdrin@mysql.com +7 -0
  Fix for the following bugs:
    - BUG#15166: Wrong update permissions required to execute triggers
    - BUG#15196: Wrong select permission required to execute triggers
  
  The idea of the fix is to check necessary privileges
  in Item_trigger_field::fix_fields(), instead of having "special variables"
  technique. To achieve this, we should pass to an Item_trigger_field instance
  a flag, which will indicate the usage/access type of this trigger variable.

  sql/sql_yacc.yy
    1.449 06/01/24 20:15:09 anozdrin@mysql.com +5 -2
    Specify access type for trigger fields.

  sql/sql_trigger.h
    1.18 06/01/24 20:15:08 anozdrin@mysql.com +3 -8
    "Special variable" technique of checking privileges for NEW/OLD variables
    was replaced by checking table- and column-level privileges in
    Item_trigger_field::fix_fields().

  sql/sql_trigger.cc
    1.42 06/01/24 20:15:08 anozdrin@mysql.com +20 -34
    "Special variable" technique of checking privileges for NEW/OLD variables
    was replaced by checking table- and column-level privileges in
    Item_trigger_field::fix_fields().

  sql/item.h
    1.185 06/01/24 20:15:08 anozdrin@mysql.com +11 -3
    Add a flag to specify access type for trigger field.

  sql/item.cc
    1.204 06/01/24 20:15:08 anozdrin@mysql.com +27 -4
    Item_trigger_field: check appropriate (SELECT/UPDATE) privilege in fix_fields().

  mysql-test/t/trigger-grant.test
    1.2.1.1 06/01/24 20:15:08 anozdrin@mysql.com +306 -215
    Add test cases for BUG#15166 and BUG#15196

  mysql-test/r/trigger-grant.result
    1.3 06/01/24 20:15:08 anozdrin@mysql.com +184 -103
    Update the result file.

ChangeSet
  1.2004.1.1 06/01/24 18:00:23 joerg@mysql.com +1 -0
  Merge mysql.com:/M41/bug16730-4.1 into mysql.com:/M50/bug16730-5.0

  mysql-test/t/ctype_ucs.test
    1.39 06/01/24 18:00:20 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2006 06/01/24 15:52:08 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var
  into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration

  mysql-test/mysql-test-run.sh
    1.287 06/01/24 15:51:59 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1974.7.2 06/01/24 15:51:02 msvensson@neptunus.(none) +1 -0
  Make mysql-test-run.sh compatible

  mysql-test/mysql-test-run.sh
    1.283.2.2 06/01/24 15:50:58 msvensson@neptunus.(none) +2 -1
    Add a symlink from std_data to var/std_data_ln

ChangeSet
  1.1616.2478.1 06/01/24 13:54:34 joerg@mysql.com +1 -0
  Test "ctype_ucs":  Disable warnings if "InnoDB" is not configured ("classic" build) (bug#16730).

  mysql-test/t/ctype_ucs.test
    1.15.1.13 06/01/24 13:54:30 joerg@mysql.com +2 -0
    Disable warnings if "InnoDB" is not configured ("classic" build) (bug#16730).

ChangeSet
  1.2000.2.3 06/01/24 16:48:19 gluh@eagle.intranet.mysql.r18.ru +6 -0
  Fix for bug#15307 GROUP_CONCAT() with ORDER BY returns empty set on information_schema(2nd ver)
    Fill schema tables with data before filesort if it's necessary

  sql/table.h
    1.122 06/01/24 16:48:13 gluh@mysql.com +1 -0
    Fix for bug#15307 GROUP_CONCAT() with ORDER BY returns empty set on information_schema(2nd ver)
      Fill schema tables with data before filesort if it's necessary

  sql/sql_show.cc
    1.306 06/01/24 16:48:13 gluh@mysql.com +11 -1
    Fix for bug#15307 GROUP_CONCAT() with ORDER BY returns empty set on information_schema(2nd ver)
      Fill schema tables with data before filesort if it's necessary

  sql/sql_select.cc
    1.388 06/01/24 16:48:13 gluh@mysql.com +6 -0
    Fix for bug#15307 GROUP_CONCAT() with ORDER BY returns empty set on information_schema(2nd ver)
      Fill schema tables with data before filesort if it's necessary

  sql/sql_prepare.cc
    1.167 06/01/24 16:48:13 gluh@mysql.com +2 -0
    Fix for bug#15307 GROUP_CONCAT() with ORDER BY returns empty set on information_schema(2nd ver)
      Fill schema tables with data before filesort if it's necessary

  mysql-test/t/information_schema.test
    1.68 06/01/24 16:48:13 gluh@mysql.com +9 -0
    Fix for bug#15307 GROUP_CONCAT() with ORDER BY returns empty set on information_schema(2nd ver)
      test case

  mysql-test/r/information_schema.result
    1.96 06/01/24 16:48:13 gluh@mysql.com +8 -0
    Fix for bug#15307 GROUP_CONCAT() with ORDER BY returns empty set on information_schema(2nd ver)
      test result

ChangeSet
  1.2000.1.5 06/01/24 13:33:00 msvensson@neptunus.(none) +1 -0
  Merge

  mysql-test/t/mysqltest.test
    1.31 06/01/24 13:32:53 msvensson@neptunus.(none) +14 -19
    Update after merge

ChangeSet
  1.2000.3.1 06/01/24 15:59:08 gluh@eagle.intranet.mysql.r18.ru +3 -0
  Fix for bug#15851 Unlistable directories yield no info from information_schema
    to skip directories which are not allowed for read

  mysys/my_lib.c
    1.22 06/01/24 15:59:02 gluh@mysql.com +2 -0
    Fix for bug#15851 Unlistable directories yield no info from information_schema
      to skip directories which are not allowed for read

  mysql-test/t/information_schema.test
    1.67 06/01/24 15:59:02 gluh@mysql.com +10 -0
    Fix for bug#15851 Unlistable directories yield no info from information_schema
      test case

  mysql-test/r/information_schema.result
    1.95 06/01/24 15:59:02 gluh@mysql.com +5 -0
    Fix for bug#15851 Unlistable directories yield no info from information_schema
      test result

  mysql-test/t/variables-master.opt
    1.6 06/01/24 12:55:40 msvensson@neptunus.(none) +0 -0
    Rename: BitKeeper/deleted/.del-variables-master.opt~8a6cb6459b54545 -> mysql-test/t/variables-master.opt

  BitKeeper/deleted/.del-variables-master.opt~8a6cb6459b54545
    1.5 06/01/24 11:02:58 msvensson@neptunus.(none) +0 -0
    Delete: mysql-test/t/variables-master.opt

ChangeSet
  1.2000.1.4 06/01/24 08:43:34 msvensson@neptunus.(none) +14 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var
  into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration

  mysql-test/t/trigger-grant.test
    1.3 06/01/24 08:43:30 msvensson@neptunus.(none) +1 -1
    Manual merge, remove the "--text" argument, not portable

  mysql-test/t/trigger-compat.test
    1.3 06/01/24 08:43:30 msvensson@neptunus.(none) +1 -1
    Manual merge, remove the "--text" argument, not portable

  mysql-test/t/mysqltest.test
    1.30 06/01/24 08:43:30 msvensson@neptunus.(none) +4 -14
    Manual merge

  mysql-test/r/mysqltest.result
    1.26 06/01/24 08:43:30 msvensson@neptunus.(none) +0 -0
    Manual merge

  mysql-test/mysql-test-run.pl
    1.62 06/01/24 08:43:30 msvensson@neptunus.(none) +0 -0
    Manual merge

  mysql-test/t/view.test
    1.133 06/01/24 08:36:39 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/type_varchar.test
    1.8 06/01/24 08:36:39 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/trigger.test
    1.33 06/01/24 08:36:39 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/symlink.test
    1.18 06/01/24 08:36:39 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/rpl000001.test
    1.43 06/01/24 08:36:39 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/view.result
    1.144 06/01/24 08:36:39 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/trigger.result
    1.28 06/01/24 08:36:39 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/rpl000001.result
    1.31 06/01/24 08:36:39 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.286 06/01/24 08:36:39 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1974.7.1 06/01/24 08:30:54 msvensson@neptunus.(none) +82 -0
  Make it possible to run mysql-test-run.pl with default test suite in different vardir.

  mysql-test/include/sourced1.inc
    1.1 06/01/24 08:30:50 msvensson@neptunus.(none) +1 -0
    New BitKeeper file ``mysql-test/include/sourced1.inc''

  mysql-test/include/sourced1.inc
    1.0 06/01/24 08:30:50 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysqltest_var/my50-mysqltest_var/mysql-test/include/sourced1.inc

  mysql-test/include/sourced.inc
    1.1 06/01/24 08:30:49 msvensson@neptunus.(none) +1 -0
    New BitKeeper file ``mysql-test/include/sourced.inc''

  mysql-test/t/warnings.test
    1.23 06/01/24 08:30:49 msvensson@neptunus.(none) +1 -1
    Use "../std_data_ln" to find std_data files

  mysql-test/t/view.test
    1.129.1.1 06/01/24 08:30:49 msvensson@neptunus.(none) +4 -4
    Use "../std_data_ln" to find std_data files

  mysql-test/t/user_var-binlog.test
    1.4 06/01/24 08:30:49 msvensson@neptunus.(none) +1 -1
    Use MYSQLTEST_VARDIR

  mysql-test/t/type_varchar.test
    1.6.1.1 06/01/24 08:30:49 msvensson@neptunus.(none) +1 -1
    Use MYSQLTEST_VARDIR

  mysql-test/t/trigger.test
    1.30.2.1 06/01/24 08:30:49 msvensson@neptunus.(none) +4 -4
    Use "../std_data_ln" to find std_data files

  mysql-test/t/trigger-grant.test
    1.1.1.1 06/01/24 08:30:49 msvensson@neptunus.(none) +3 -3
    Use MYSQLTEST_VARDIR

  mysql-test/t/trigger-compat.test
    1.1.1.1 06/01/24 08:30:49 msvensson@neptunus.(none) +2 -2
    Use MYSQLTEST_VARDIR

  mysql-test/t/temp_table-master.opt
    1.2 06/01/24 08:30:49 msvensson@neptunus.(none) +1 -1
    Use MYSQLTEST_VARDIR

  mysql-test/t/symlink.test
    1.16.1.1 06/01/24 08:30:49 msvensson@neptunus.(none) +13 -13
    Use MYSQLTEST_VARDIR

  mysql-test/t/sp-destruct.test
    1.4 06/01/24 08:30:49 msvensson@neptunus.(none) +7 -7
    Use MYSQLTEST_VARDIR

  mysql-test/t/show_check.test
    1.56 06/01/24 08:30:49 msvensson@neptunus.(none) +1 -1
    Use MYSQLTEST_VARDIR

  mysql-test/t/rpl_timezone.test
    1.9 06/01/24 08:30:49 msvensson@neptunus.(none) +3 -3
    Use MYSQLTEST_VARDIR

  mysql-test/t/rpl_rotate_logs.test
    1.64 06/01/24 08:30:49 msvensson@neptunus.(none) +3 -3
    Use MYSQLTEST_VARDIR

  mysql-test/t/rpl_rotate_logs-slave.sh
    1.7 06/01/24 08:30:49 msvensson@neptunus.(none) +2 -2
    Use MYSQLTEST_VARDIR

  mysql-test/t/rpl_rewrite_db.test
    1.5 06/01/24 08:30:49 msvensson@neptunus.(none) +6 -6
    Use "../std_data_ln" to find std_data files

  mysql-test/t/rpl_replicate_do.test
    1.23 06/01/24 08:30:49 msvensson@neptunus.(none) +1 -1
    Use "../std_data_ln" to find std_data files

  mysql-test/t/rpl_misc_functions.test
    1.4 06/01/24 08:30:49 msvensson@neptunus.(none) +2 -1
    Use MYSQLTEST_VARDIR

  mysql-test/t/rpl_misc_functions-slave.sh
    1.3 06/01/24 08:30:49 msvensson@neptunus.(none) +1 -1
    Use MYSQLTEST_VARDIR

  mysql-test/t/rpl_log.test
    1.28 06/01/24 08:30:49 msvensson@neptunus.(none) +1 -1
    Use "../std_data_ln" to find std_data files

  mysql-test/include/sourced.inc
    1.0 06/01/24 08:30:49 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysqltest_var/my50-mysqltest_var/mysql-test/include/sourced.inc

  mysql-test/t/rpl_loaddatalocal.test
    1.8 06/01/24 08:30:48 msvensson@neptunus.(none) +11 -8
    Use MYSQLTEST_VARDIR

  mysql-test/t/rpl_loaddata_rule_s.test
    1.10 06/01/24 08:30:48 msvensson@neptunus.(none) +1 -1
    Use "../std_data_ln" to find std_data files

  mysql-test/t/rpl_loaddata_rule_m.test
    1.13 06/01/24 08:30:48 msvensson@neptunus.(none) +1 -1
    Use "../std_data_ln" to find std_data files

  mysql-test/t/rpl_loaddata.test
    1.22 06/01/24 08:30:48 msvensson@neptunus.(none) +7 -7
    Use "../std_data_ln" to find std_data files

  mysql-test/t/rpl_innodb.test
    1.3 06/01/24 08:30:48 msvensson@neptunus.(none) +2 -2
    Use "../std_data_ln" to find std_data files

  mysql-test/t/rpl_flush_log_loop-slave.sh
    1.4 06/01/24 08:30:48 msvensson@neptunus.(none) +3 -3
    Use MYSQLTEST_VARDIR

  mysql-test/t/rpl_flush_log_loop-slave.opt
    1.5 06/01/24 08:30:48 msvensson@neptunus.(none) +1 -1
    Use MYSQLTEST_VARDIR

  mysql-test/t/rpl_flush_log_loop-master.sh
    1.4 06/01/24 08:30:48 msvensson@neptunus.(none) +3 -3
    Use MYSQLTEST_VARDIR

  mysql-test/t/rpl_flush_log_loop-master.opt
    1.5 06/01/24 08:30:48 msvensson@neptunus.(none) +1 -1
    Use MYSQLTEST_VARDIR

  mysql-test/t/rpl_drop_db.test
    1.7 06/01/24 08:30:48 msvensson@neptunus.(none) +1 -1
    Use MYSQLTEST_VARDIR

  mysql-test/t/rpl_charset.test
    1.17 06/01/24 08:30:48 msvensson@neptunus.(none) +1 -1
    Use MYSQLTEST_VARDIR

  mysql-test/t/rpl_EE_error.test
    1.10 06/01/24 08:30:48 msvensson@neptunus.(none) +1 -1
    Use MYSQLTEST_VARDIR

  mysql-test/t/rpl000017-slave.sh
    1.11 06/01/24 08:30:48 msvensson@neptunus.(none) +3 -3
    Use MYSQLTEST_VARDIR

  mysql-test/t/rpl000015-slave.sh
    1.4 06/01/24 08:30:48 msvensson@neptunus.(none) +1 -1
    Use MYSQLTEST_VARDIR

  mysql-test/t/rpl000009.test
    1.25 06/01/24 08:30:48 msvensson@neptunus.(none) +2 -2
    Use MYSQLTEST_VARDIR

  mysql-test/t/rpl000004.test
    1.14 06/01/24 08:30:48 msvensson@neptunus.(none) +2 -2
    Use "../std_data_ln" to find std_data files

  mysql-test/t/rpl000001.test
    1.41.1.1 06/01/24 08:30:48 msvensson@neptunus.(none) +1 -1
    Use "../std_data_ln" to find std_data files

  mysql-test/t/repair.test
    1.13 06/01/24 08:30:48 msvensson@neptunus.(none) +1 -1
    Use MYSQLTEST_VARDIR

  mysql-test/t/query_cache.test
    1.52 06/01/24 08:30:48 msvensson@neptunus.(none) +1 -0
    Add missing drop function

  mysql-test/t/outfile.test
    1.13 06/01/24 08:30:48 msvensson@neptunus.(none) +24 -22
    Use MYSQLTEST_VARDIR

  mysql-test/t/ndb_autodiscover.test
    1.23 06/01/24 08:30:48 msvensson@neptunus.(none) +17 -17
    Use MYSQLTEST_VARDIR

  mysql-test/t/mysqltest.test
    1.19.2.1 06/01/24 08:30:47 msvensson@neptunus.(none) +68 -65
    Use MYSQLTEST_VARDIR

  mysql-test/t/mysqldump.test
    1.78 06/01/24 08:30:47 msvensson@neptunus.(none) +22 -22
    Use MYSQLTEST_VARDIR

  mysql-test/t/mysqlbinlog2.test
    1.8 06/01/24 08:30:47 msvensson@neptunus.(none) +12 -12
    Use MYSQLTEST_VARDIR

  mysql-test/t/mysqlbinlog.test
    1.22 06/01/24 08:30:47 msvensson@neptunus.(none) +21 -21
    Use "../std_data_ln" to find std_data files

  mysql-test/t/myisam.test
    1.54 06/01/24 08:30:47 msvensson@neptunus.(none) +3 -3
    Use MYSQLTEST_VARDIR

  mysql-test/t/loaddata.test
    1.16 06/01/24 08:30:47 msvensson@neptunus.(none) +21 -21
    Use "../std_data_ln" to find std_data files

  mysql-test/t/im_options_unset.imtest
    1.2 06/01/24 08:30:47 msvensson@neptunus.(none) +4 -4
    Use MYSQLTEST_VARDIR

  mysql-test/t/im_options_set.imtest
    1.2 06/01/24 08:30:47 msvensson@neptunus.(none) +4 -4
    Use MYSQLTEST_VARDIR

  mysql-test/t/im_daemon_life_cycle-im.opt
    1.2 06/01/24 08:30:47 msvensson@neptunus.(none) +1 -1
    Use MYSQLTEST_VARDIR

  mysql-test/t/ctype_ucs_binlog.test
    1.6 06/01/24 08:30:47 msvensson@neptunus.(none) +1 -1
    Use MYSQLTEST_VARDIR

  mysql-test/t/blackhole.test
    1.5 06/01/24 08:30:47 msvensson@neptunus.(none) +1 -1
    Use "../std_data_ln" to find std_data files

  mysql-test/t/backup.test
    1.17 06/01/24 08:30:47 msvensson@neptunus.(none) +4 -4
    Use MYSQLTEST_VARDIR

  mysql-test/t/backup-master.sh
    1.4 06/01/24 08:30:47 msvensson@neptunus.(none) +1 -1
    Use MYSQLTEST_VARDIR

  mysql-test/r/warnings.result
    1.35 06/01/24 08:30:47 msvensson@neptunus.(none) +1 -1
    Use "../std_data_ln" to find std_data files

  mysql-test/r/view.result
    1.140.1.1 06/01/24 08:30:47 msvensson@neptunus.(none) +4 -4
    Use "../std_data_ln" to find std_data files

  mysql-test/r/trigger.result
    1.24.2.1 06/01/24 08:30:47 msvensson@neptunus.(none) +4 -4
    Use "../std_data_ln" to find std_data files

  mysql-test/r/symlink.result
    1.21 06/01/24 08:30:47 msvensson@neptunus.(none) +3 -3
    Use MYSQLTEST_VARDIR

  mysql-test/r/rpl_timezone.result
    1.13 06/01/24 08:30:47 msvensson@neptunus.(none) +1 -1
    Use "../std_data_ln" to find std_data files

  mysql-test/r/rpl_rewrite_db.result
    1.5 06/01/24 08:30:47 msvensson@neptunus.(none) +6 -6
    Use "../std_data_ln" to find std_data files

  mysql-test/r/rpl_replicate_do.result
    1.31 06/01/24 08:30:47 msvensson@neptunus.(none) +1 -1
    Use "../std_data_ln" to find std_data files

  mysql-test/r/rpl_misc_functions.result
    1.3 06/01/24 08:30:46 msvensson@neptunus.(none) +1 -1
    Use MYSQLTEST_VARDIR

  mysql-test/r/rpl_log.result
    1.63 06/01/24 08:30:46 msvensson@neptunus.(none) +9 -9
    Use "../std_data_ln" to find std_data files

  mysql-test/r/rpl_loaddatalocal.result
    1.6 06/01/24 08:30:46 msvensson@neptunus.(none) +4 -4
    Use MYSQLTEST_VARDIR

  mysql-test/r/rpl_loaddata_rule_s.result
    1.8 06/01/24 08:30:46 msvensson@neptunus.(none) +1 -1
    Use "../std_data_ln" to find std_data files

  mysql-test/r/rpl_loaddata_rule_m.result
    1.14 06/01/24 08:30:46 msvensson@neptunus.(none) +2 -2
    Use "../std_data_ln" to find std_data files

  mysql-test/r/rpl_loaddata.result
    1.29 06/01/24 08:30:46 msvensson@neptunus.(none) +8 -8
    Use "../std_data_ln" to find std_data files

  mysql-test/r/rpl_innodb.result
    1.2 06/01/24 08:30:46 msvensson@neptunus.(none) +2 -2
    Use "../std_data_ln" to find std_data files

  mysql-test/r/rpl000004.result
    1.8 06/01/24 08:30:46 msvensson@neptunus.(none) +2 -2
    Use "../std_data_ln" to find std_data files

  mysql-test/r/rpl000001.result
    1.29.1.1 06/01/24 08:30:46 msvensson@neptunus.(none) +1 -1
    Use "../std_data_ln" to find std_data files

  mysql-test/r/query_cache.result
    1.69 06/01/24 08:30:46 msvensson@neptunus.(none) +1 -0
    Add missing drop function

  mysql-test/r/outfile.result
    1.4 06/01/24 08:30:46 msvensson@neptunus.(none) +17 -13
    Use MYSQLTEST_VARDIR

  mysql-test/r/mysqltest.result
    1.15.1.3 06/01/24 08:30:46 msvensson@neptunus.(none) +5 -5
    Use MYSQLTEST_VARDIR

  mysql-test/r/mysqlbinlog.result
    1.19 06/01/24 08:30:46 msvensson@neptunus.(none) +13 -13
    Use "../std_data_ln" to find std_data files

  mysql-test/r/loaddata.result
    1.21 06/01/24 08:30:46 msvensson@neptunus.(none) +15 -15
    Use "../std_data_ln" to find std_data files

  mysql-test/r/blackhole.result
    1.6 06/01/24 08:30:46 msvensson@neptunus.(none) +2 -2
    Use "../std_data_ln" to find std_data files

  mysql-test/r/backup.result
    1.12 06/01/24 08:30:46 msvensson@neptunus.(none) +3 -3
    Use MYSQLTEST_VARDIR

  mysql-test/mysql-test-run.sh
    1.283.2.1 06/01/24 08:30:46 msvensson@neptunus.(none) +2 -1
    Export MYSQLTEST_VARDIR, always pointing at mysql-test/var

  mysql-test/mysql-test-run.pl
    1.56.3.1 06/01/24 08:30:46 msvensson@neptunus.(none) +59 -18
    Create variable $MYSQLTEST_VARDIR that points to  the vardir
    Don't create a symlink from var/ to the physical vardir if it's somewhere else
    Setup a symlink(or copy dir on windows) for std_data so it is available in the physical vardir
    Use "../tmp" as slave-load-tmpdir, since the server is started in var/master-data and slave in var/slave-data they will both find the dumps in "../tmp"

  mysql-test/include/test_outfile.inc
    1.4 06/01/24 08:30:46 msvensson@neptunus.(none) +1 -1
    Use MYSQLTEST_VARDIR

  mysql-test/include/have_outfile.inc
    1.4 06/01/24 08:30:46 msvensson@neptunus.(none) +1 -1
    Use MYSQLTEST_VARDIR

ChangeSet
  1.1346.1.826 06/01/23 21:51:32 evgen@moonbone.local +3 -0
  Fixed bug #16510: Updating field named like '*name' caused server crash.
  
  When setup_fields() function finds field named '*' it expands it to the list
  of all table fields. It does so by checking that the first char of
  field_name is '*', but it doesn't checks that the '* is the only char.
  Due to this, when updating table with a field named like '*name', such field
  is wrongly treated as '*' and expanded. This leads to making list of fields
  to update being longer than list of the new values. Later, the fill_record() 
  function crashes by dereferencing null when there is left fields to update,
  but no more values.
  
  Added check in the setup_fields() function which ensures that the field
  expanding will be done only when '*' is the only char in the field name.

  sql/sql_base.cc
    1.117.1.77 06/01/23 21:50:25 evgen@moonbone.local +1 -0
    Fixed bug #16510: Updating field named like '*name' caused server crash.
    Added check in the setup_fields() function which ensures that the field
    expanding will be done only when '*' is the only char in the field name.

  mysql-test/r/update.result
    1.8.1.10 06/01/23 21:47:18 evgen@moonbone.local +4 -0
    Added test case for bug#16510: Updating field named like '*name' caused server crash

  mysql-test/t/update.test
    1.6.1.10 06/01/23 21:46:48 evgen@moonbone.local +8 -0
    Added test case for bug#16510: Updating field named like '*name' caused server crash

ChangeSet
  1.2000.1.3 06/01/23 21:35:11 SergeyV@selena. +3 -0
  Changes after initial patch to #15787

  zlib/zconf.h
    1.7 06/01/23 21:34:56 SergeyV@selena. +1 -1
    restored a code for standard platform dependant definitions

  zlib/README.MySQL
    1.2 06/01/23 21:34:56 SergeyV@selena. +9 -0
    Updated a readme file to emphasize which files we what to keep an eye on
    in case of zlib upgrade.

  zlib/Makefile.am
    1.7 06/01/23 21:34:55 SergeyV@selena. +2 -0
    Added a reference to ../include for my_config.h

ChangeSet
  1.2000.1.1 06/01/23 20:07:26 svoj@april.(none) +2 -0
  Merge april.(none):/home/svoj/devel/mysql/BUG16489/mysql-4.1
  into  april.(none):/home/svoj/devel/mysql/BUG16489/mysql-5.0

  mysql-test/r/fulltext2.result
    1.12 06/01/23 20:07:22 svoj@april.(none) +0 -0
    Auto merged

  mysql-test/r/fulltext2.result
    1.9.2.2 06/01/23 20:07:22 svoj@april.(none) +0 -0
    Change mode to -rw-rw-r--

  myisam/ft_update.c
    1.38 06/01/23 20:06:00 svoj@april.(none) +0 -0
    Auto merged

ChangeSet
  1.2001 06/01/23 18:03:09 aelkin@mysql.com +4 -0
  BUG#15699, failure to apply ignore rule for unexisting table.
    
  Since replication rules execute after `mysql_multi_update_prepare' returns we
  delay to `break' in case this functions returns non-zero (some tables are not found) 
  for to examine if there is an ignore rule for a not-found table. By doing that
  it is guaranteed do/ignore replication rules logically preceed opening table routine.

  mysql-test/t/rpl_multi_update4.test
    1.1 06/01/23 18:03:04 aelkin@mysql.com +44 -0
    New BitKeeper file ``mysql-test/t/rpl_multi_update4.test''

  mysql-test/t/rpl_multi_update4-slave.opt
    1.1 06/01/23 18:03:04 aelkin@mysql.com +1 -0
    New BitKeeper file ``mysql-test/t/rpl_multi_update4-slave.opt''

  mysql-test/t/rpl_multi_update4.test
    1.0 06/01/23 18:03:04 aelkin@mysql.com +0 -0
    BitKeeper file /usr_rh9/home/elkin.rh9/MySQL/mysql-5.0-bug15699-pending/mysql-test/t/rpl_multi_update4.test

  mysql-test/t/rpl_multi_update4-slave.opt
    1.0 06/01/23 18:03:04 aelkin@mysql.com +0 -0
    BitKeeper file /usr_rh9/home/elkin.rh9/MySQL/mysql-5.0-bug15699-pending/mysql-test/t/rpl_multi_update4-slave.opt

  mysql-test/r/rpl_multi_update4.result
    1.1 06/01/23 18:03:03 aelkin@mysql.com +25 -0
    New BitKeeper file ``mysql-test/r/rpl_multi_update4.result''

  sql/sql_parse.cc
    1.523 06/01/23 18:03:03 aelkin@mysql.com +40 -25
    BUG#15699. We delay to `break' in case of unexisted tables for multi-update.
    First it is checked whether an ignore rule for such a table exists.
    
    More to the fix:
    if (opt_readonly && ...' in two places got be idented because it were
    enclosed explicitly into corresponding `else' groups. For that 
    the preceding lines with `else' were changed in to be 
    `else 
     {'.
    This grouping is necessary to avoid any inattentive
    insertion in between of `else' and belonging to the else 
    `if (opt_readonly && ...' statement.

  mysql-test/r/rpl_multi_update4.result
    1.0 06/01/23 18:03:03 aelkin@mysql.com +0 -0
    BitKeeper file /usr_rh9/home/elkin.rh9/MySQL/mysql-5.0-bug15699-pending/mysql-test/r/rpl_multi_update4.result

ChangeSet
  1.1616.2477.1 06/01/23 17:15:33 svoj@april.(none) +3 -0
  BUG#16489 - utf8 + fulltext leads to corrupt index file.
  Fixed that UPDATE statement crashes multi-byte charset fulltext index.

  mysql-test/t/fulltext2.test
    1.13 06/01/23 17:15:31 svoj@april.(none) +8 -0
    Added a testcase for BUG#16489.

  mysql-test/r/fulltext2.result
    1.9.2.1 06/01/23 17:15:31 svoj@april.(none) +5 -0
    Added a testcase for BUG#16489.

  myisam/ft_update.c
    1.35.1.1 06/01/23 17:15:31 svoj@april.(none) +4 -0
    Fixed that UPDATE statement crashes multi-byte charset fulltext index.
    While updating, always rewrite multi-byte charset fulltext index.

ChangeSet
  1.2000 06/01/23 13:07:49 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/bug14634/my50-bug14634

  sql/sql_select.cc
    1.387 06/01/23 13:07:42 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1997.1.2 06/01/21 21:50:54 holyfoot@eagle.intranet.mysql.r18.ru +2 -0
  Merging

  mysql-test/r/type_float.result
    1.44 06/01/21 21:02:11 hf@eagle.intranet.mysql.r18.ru +4 -4
    merging

  mysql-test/r/func_gconcat.result
    1.52 06/01/21 21:02:11 hf@eagle.intranet.mysql.r18.ru +3 -3
    merging

ChangeSet
  1.1997.1.1 06/01/21 18:50:06 hf@eagle.intranet.mysql.r18.ru +8 -0
  Merging

  sql/item_func.cc
    1.272 06/01/21 18:50:01 hf@eagle.intranet.mysql.r18.ru +10 -12
    merging

  mysql-test/r/type_float.result
    1.43 06/01/21 18:50:01 hf@eagle.intranet.mysql.r18.ru +0 -0
    merging

  sql/spatial.h
    1.18 06/01/21 18:39:33 hf@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

  mysql-test/t/type_float.test
    1.28 06/01/21 18:39:33 hf@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

  mysql-test/t/func_math.test
    1.25 06/01/21 18:39:32 hf@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.132 06/01/21 18:39:32 hf@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

  mysql-test/r/func_gconcat.result
    1.51 06/01/21 18:39:32 hf@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

  mysql-test/ndb/ndbcluster.sh
    1.43 06/01/21 18:39:32 hf@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1616.2144.97 06/01/21 17:53:29 hf@eagle.intranet.mysql.r18.ru +1 -0
  Merge hf@192.168.21.12:work/mysql-4.1.9855
  into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg

  sql/item_func.cc
    1.124.42.5 06/01/21 17:53:24 hf@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1998 06/01/21 04:49:26 brian@zim.tangent.org +1 -0
  Turns out that the bulk interface was not well documented. I fixed the issue in archive and I will go and update the comments in handler next. I should probably also look through the other engines and see if this an issue elsewhere as well. 

  sql/ha_archive.cc
    1.64 06/01/21 04:38:18 brian@zim.tangent.org +9 -1
    Fixed for bulk_insert

ChangeSet
  1.1997 06/01/20 17:21:39 anozdrin@mysql.com +2 -0
  Test case for BUG#16621: INSERTs in Stored Procedures causes data corruption
  in the Binary Log.

  mysql-test/t/rpl_sp.test
    1.11 06/01/20 17:21:33 anozdrin@mysql.com +36 -0
    Add test case for BUG#16621: INSERTs in Stored Procedures causes data corruption
    in the Binary Log.

  mysql-test/r/rpl_sp.result
    1.15 06/01/20 17:21:33 anozdrin@mysql.com +13 -0
    Update result file.

ChangeSet
  1.1996 06/01/20 15:59:22 anozdrin@mysql.com +5 -0
  Fix for BUG#15588: String overrun during sp-vars.test
  
  The bug appears after implementation of WL#2984
  (Make stored routine variables work according to the standard).

  sql/sql_select.cc
    1.385.1.2 06/01/20 15:59:18 anozdrin@mysql.com +1 -1
    Polishing: should have been done in WL#2984.

  sql/sp_head.cc
    1.198 06/01/20 15:59:18 anozdrin@mysql.com +24 -11
    - Work correctly with String:
      - String length has to be be reset before use;
      - qs_append() does not allocate memory, so the memory should
        be reserved beforehand.

  sql/field.cc
    1.295.1.4 06/01/20 15:59:18 anozdrin@mysql.com +2 -2
    - use memmove() instead of memcpy() -- after implementation of WL#2984
      (Make stored routine variables work according to the standard) it is
      possible to store in the field the value from this field. For instance,
      this can happen for the following statement:
        SET sp_var = SUBSTR(sp_var, 1, 3);

  mysql-test/t/type_varchar.test
    1.7 06/01/20 15:59:18 anozdrin@mysql.com +16 -0
    Add a test for BUG#15588.

  mysql-test/r/type_varchar.result
    1.8 06/01/20 15:59:18 anozdrin@mysql.com +7 -0
    Update result file.

ChangeSet
  1.1995 06/01/20 08:32:22 pem@mysql.com +2 -0
  Fix of fix for BUG#15866. (Actually change the fib() call in sp.test)

  mysql-test/t/sp.test
    1.172 06/01/20 08:32:18 pem@mysql.com +1 -1
    Actually change the fib(20) into fib(10).  (Doh!)

  mysql-test/r/sp.result
    1.183 06/01/20 08:32:18 pem@mysql.com +1 -11
    Updated results.

ChangeSet
  1.1994 06/01/19 17:55:54 pem@mysql.com +4 -0
  Fixed BUG#15866: Thread stack limit insufficient for recursive call "fib(20)"
    Lowered the parameter to 10, and also renamed non-standard table names to t3.

  mysql-test/t/sp_trans.test
    1.7 06/01/19 17:55:50 pem@mysql.com +1 -1
    Added drop of t3 for safety. (Might be left from sp.test after certain test failures.)

  mysql-test/t/sp.test
    1.171 06/01/19 17:55:50 pem@mysql.com +24 -23
    Renamed fac, primes and fib tables to t3.
    Lowered fib() test parameter to 10 (20 hit the stack overrun check on some machines).

  mysql-test/r/sp_trans.result
    1.7 06/01/19 17:55:50 pem@mysql.com +1 -1
    Updated results.

  mysql-test/r/sp.result
    1.182 06/01/19 17:55:50 pem@mysql.com +23 -23
    Updated results.

ChangeSet
  1.1992 06/01/19 16:13:04 pem@mysql.com +3 -0
  Post-review fixes (BUG#15658).

  sql/sql_yacc.yy
    1.448 06/01/19 16:13:00 pem@mysql.com +2 -2
    Post-review fix.

  sql/sp_head.h
    1.77 06/01/19 16:13:00 pem@mysql.com +1 -1
    Post-review fix.

  sql/sp_head.cc
    1.197 06/01/19 16:13:00 pem@mysql.com +11 -11
    Post-review fix.

ChangeSet
  1.1988.1.4 06/01/19 15:36:41 knielsen@mysql.com +1 -0
  Fix option type error, crashes on 64-bit big endian.

  sql/mysqld.cc
    1.532 06/01/19 15:36:12 knielsen@mysql.com +1 -1
    Fix option type error, crashes on 64-bit big endian.

ChangeSet
  1.1616.2474.3 06/01/20 00:08:26 stewart@mysql.com +1 -0
  reintroduce --no-defaults to ndb_mgmd

  mysql-test/ndb/ndbcluster.sh
    1.38.1.3 06/01/20 00:08:22 stewart@mysql.com +1 -1
    have made a real fix for mgmd not starting with --no-defaults. re-introduce it to the test suite

ChangeSet
  1.1988.3.1 06/01/20 00:06:17 stewart@mysql.com +1 -0
  fix ndb_mgmd --no-defaults option processing

  ndb/src/mgmsrv/main.cpp
    1.47 06/01/20 00:06:12 stewart@mysql.com +3 -3
    fix --no-defaults option processing

ChangeSet
  1.1988.1.2 06/01/19 15:23:01 konstantin@mysql.com +1 -0
  Merge mysql.com:/opt/local/work/mysql-4.1-root
  into  mysql.com:/opt/local/work/mysql-5.0-root

  mysql-test/ndb/ndbcluster.sh
    1.42 06/01/19 15:22:50 konstantin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2475.1 06/01/19 22:50:54 stewart@mysql.com +2 -0
  small typo fixes

  ndb/tools/ndb_size.pl
    1.6 06/01/19 22:50:51 stewart@mysql.com +1 -1
    small typo

  mysql-test/ndb/ndbcluster.sh
    1.38.1.2 06/01/19 22:50:51 stewart@mysql.com +1 -1
    small fix to make ndb_mgmd run

ChangeSet
  1.1988.2.1 06/01/19 12:12:47 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/bug15020/my50-bug15020

  sql/table.cc
    1.215 06/01/19 12:12:37 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1988.1.1 06/01/19 14:01:20 konstantin@mysql.com +2 -0
  Merge mysql.com:/opt/local/work/mysql-4.1-15613
  into  mysql.com:/opt/local/work/mysql-5.0-root

  tests/mysql_client_test.c
    1.169 06/01/19 14:01:15 konstantin@mysql.com +64 -65
    Manual merge.

  sql/protocol.cc
    1.112 06/01/19 13:58:38 konstantin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1989 06/01/19 11:48:07 pem@mysql.com +5 -0
  Merge mysql.com:/extern/mysql/bk/mysql-5.0
  into  mysql.com:/extern/mysql/work/bug15658/mysql-5.0

  sql/share/errmsg.txt
    1.58 06/01/19 11:48:02 pem@mysql.com +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.447 06/01/19 11:48:01 pem@mysql.com +0 -0
    Auto merged

  sql/sp_head.h
    1.76 06/01/19 11:48:01 pem@mysql.com +0 -0
    Auto merged

  sql/sp_head.cc
    1.196 06/01/19 11:48:01 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/sp-error.result
    1.100 06/01/19 11:48:01 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1960.109.1 06/01/19 11:35:27 msvensson@neptunus.(none) +1 -0
  Bug#15020 "Can't find files" message incorrect for error 24

  sql/table.cc
    1.211.1.1 06/01/19 11:35:23 msvensson@neptunus.(none) +2 -1
    Use error message "Can't open file" if errno EMFILE is returned.

ChangeSet
  1.1985.1.1 06/01/19 10:44:44 joerg@mysql.com +1 -0
  Update the spec file for the shared compat RPM with version info.

  support-files/MySQL-shared-compat.spec.sh
    1.7 06/01/19 10:44:39 joerg@mysql.com +7 -4
    Prevent "libndbclient" (which is not included in the "shared compat" RPM)
    from breaking the RPM packaging.
    
    Also, adapt the specification to the newer versions of the older release families.
    This needs to be repeated periodically.
    Take care of the RPM build version: For 4.1.16, it is 4.1.16-1 !

ChangeSet
  1.1987 06/01/19 19:14:17 stewart@mysql.com +1 -0
  Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
  into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug12124

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.94 06/01/19 19:14:13 stewart@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1986 06/01/19 19:03:47 stewart@mysql.com +3 -0
  Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
  into  mysql.com:/home/stewart/Documents/MySQL/5.0/main

  sql/sql_select.cc
    1.385.1.1 06/01/19 19:03:43 stewart@mysql.com +0 -5
    Auto merged

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.92.1.1 06/01/19 19:03:42 stewart@mysql.com +0 -0
    Auto merged

  ndb/src/common/logger/Logger.cpp
    1.13 06/01/19 19:03:42 stewart@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2474.1 06/01/18 22:50:31 konstantin@mysql.com +2 -0
  A fix and a test case for Bug#15613 "libmysqlclient API function
   mysql_stmt_prepare returns wrong field length"

  tests/mysql_client_test.c
    1.51.1.112 06/01/18 22:50:26 konstantin@mysql.com +65 -0
    A test case for Bug#15613

  sql/protocol.cc
    1.56.1.49 06/01/18 22:50:26 konstantin@mysql.com +16 -2
    A fix for Bug#15613: make sure that result set column length
    is evaluated correctly for BLOB/TEXT columns.

ChangeSet
  1.1983 06/01/18 17:09:23 pem@mysql.com +1 -0
  Merge mysql.com:/extern/mysql/bk/mysql-5.0
  into  mysql.com:/extern/mysql/work/bug14834/mysql-5.0

  sql/sql_acl.cc
    1.186 06/01/18 17:09:18 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2473.1 06/01/18 14:12:27 msvensson@neptunus.(none) +1 -0
  Merge bk-internal:/home/bk/mysql-4.1
  into  neptunus.(none):/home/msvensson/mysql/bug14634/my41-bug14634

  sql/sql_select.cc
    1.216.124.1 06/01/18 14:12:21 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1981.1.50 06/01/18 15:20:56 aivanov@mysql.com +6 -0
  Applied patch recieved from Marko:
   Make innodb_thread_concurrency 0 by default, and extend the usable
   range from 0 to 1000 (0 disables the thread throttling).

  sql/mysqld.cc
    1.531 06/01/18 15:20:47 aivanov@mysql.com +4 -2
    innodb_thread_concurrency is 0..1000 now, and 0 (the default)
     disables the thread throttling.
    

  sql/ha_innodb.cc
    1.285 06/01/18 15:20:47 aivanov@mysql.com +2 -2
    Remove SRV_CONCURRENCY_THRESHOLD. The magic value is 0 from now on.

  mysql-test/t/innodb.test
    1.123 06/01/18 15:20:47 aivanov@mysql.com +1 -1
    innodb_thread_concurrency is 0..1000 now.

  mysql-test/r/innodb.result
    1.153 06/01/18 15:20:47 aivanov@mysql.com +3 -3
    innodb_thread_concurrency is 0..1000 now, and the default is 0.

  innobase/srv/srv0srv.c
    1.97 06/01/18 15:20:46 aivanov@mysql.com +5 -4
    Remove SRV_CONCURRENCY_THRESHOLD. The magic value is 0 from now on.

  innobase/include/srv0srv.h
    1.60 06/01/18 15:20:46 aivanov@mysql.com +0 -1
    Remove SRV_CONCURRENCY_THRESHOLD. The magic value is 0 from now on.

ChangeSet
  1.1981.55.1 06/01/18 15:15:09 konstantin@mysql.com +5 -0
  Merge mysql.com:/opt/local/work/mysql-4.1-root
  into  mysql.com:/opt/local/work/mysql-5.0-root

  tests/mysql_client_test.c
    1.168 06/01/18 15:14:58 konstantin@mysql.com +19 -20
    Manual merge.

  libmysql/libmysql.c
    1.232 06/01/18 15:14:58 konstantin@mysql.com +0 -1
    Manual merge.

  configure.in
    1.373 06/01/18 15:14:58 konstantin@mysql.com +8 -11
    Manual merge.

  libmysql/Makefile.shared
    1.66 06/01/18 15:09:42 konstantin@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/ignore
    1.214 06/01/18 15:09:22 konstantin@mysql.com +142 -142
    auto-union

ChangeSet
  1.1981.1.49 06/01/18 15:02:03 aivanov@mysql.com +6 -0
  Applied patch recieved from Marko:
   Make innodb_flush_log_at_trx_commit a settable global variable.

  sql/set_var.cc
    1.147 06/01/18 15:01:54 aivanov@mysql.com +5 -1
    Make innodb_flush_log_at_trx_commit a settable global variable.

  sql/mysqld.cc
    1.530 06/01/18 15:01:54 aivanov@mysql.com +2 -2
    Bypass the variable innobase innobase_flush_log_at_trx_commit.

  sql/ha_innodb.h
    1.109 06/01/18 15:01:54 aivanov@mysql.com +1 -1
    Remove innobase_flush_log_at_trx_commit.
     (Set srv_flush_log_at_trx_commit directly).

  sql/ha_innodb.cc
    1.284 06/01/18 15:01:53 aivanov@mysql.com +1 -3
    Remove innobase_flush_log_at_trx_commit.
     (Set srv_flush_log_at_trx_commit directly).

  innobase/srv/srv0srv.c
    1.96 06/01/18 15:01:53 aivanov@mysql.com +1 -1
    Change the type of srv_flush_log_at_trx_commit.

  innobase/include/srv0srv.h
    1.59 06/01/18 15:01:53 aivanov@mysql.com +1 -1
    Change the type of srv_flush_log_at_trx_commit.

ChangeSet
  1.1616.2450.16 06/01/18 13:49:37 bell@sanja.is.com.ua +2 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-4.1

  sql/sql_select.cc
    1.216.1.232 06/01/18 13:49:33 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_class.cc
    1.105.1.99 06/01/18 13:49:33 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1616.2472.1 06/01/18 13:48:57 bell@sanja.is.com.ua +5 -0
  Excluded posibility of tmp_table_param.copy_field double deletion (BUG#14851).

  sql/sql_select.h
    1.60.1.19 06/01/18 13:48:54 bell@sanja.is.com.ua +9 -2
    JOINs constructor added, initialization of them fixed (it is not related to the bug directly but might cause other problems).

  sql/sql_select.cc
    1.216.123.1 06/01/18 13:48:54 bell@sanja.is.com.ua +14 -0
    Allocation of tmp_join fixed to involve constructor (it is not related to the bug directly but might cause other problems).
    Excluded posibility of tmp_table_param.copy_field double deletion (BUG#14851).

  sql/sql_class.cc
    1.105.36.1 06/01/18 13:48:54 bell@sanja.is.com.ua +3 -0
    Debug prints are added.

  mysql-test/t/kill.test
    1.6.1.5 06/01/18 13:48:54 bell@sanja.is.com.ua +48 -1
    BUG#14851 test

  mysql-test/r/kill.result
    1.3.1.3 06/01/18 13:48:54 bell@sanja.is.com.ua +13 -1
    BUG#14851 test

ChangeSet
  1.1981.54.1 06/01/18 12:45:07 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/bug14634/my50-bug14634

  sql/sql_select.cc
    1.386 06/01/18 12:44:59 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.2471.1 06/01/18 12:28:52 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
  into  neptunus.(none):/home/msvensson/mysql/bug14634/my41-bug14634

  sql/sql_select.cc
    1.216.122.1 06/01/18 12:28:46 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1981.46.10 06/01/18 17:28:51 stewart@mysql.com +1 -0
  Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
  into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug12124

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.93 06/01/18 17:28:47 stewart@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2470.2 06/01/17 23:19:43 konstantin@mysql.com +2 -0
  A fix and a test case for Bug#16144 "mysql_stmt_attr_get type error":
  use the right type in mysql_stmt_attr_get

  tests/mysql_client_test.c
    1.51.1.111 06/01/17 23:19:39 konstantin@mysql.com +20 -0
    A test case for Bug#16144

  libmysql/libmysql.c
    1.156.1.143 06/01/17 23:19:38 konstantin@mysql.com +1 -1
    Fix Bug#16144 "mysql_stmt_attr_get type error"

ChangeSet
  1.1616.2470.1 06/01/18 00:02:25 svoj@april.(none) +1 -0
  Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  april.(none):/home/svoj/devel/mysql/BUG3074/mysql-4.1

  configure.in
    1.201.1.201 06/01/18 00:02:21 svoj@april.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.2450.13 06/01/17 19:40:40 msvensson@devsrv-b.mysql.com +1 -0
  Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug14634/my41-bug14634
  into  devsrv-b.mysql.com:/space/magnus/my41-bug14634

  sql/sql_select.cc
    1.216.1.231 06/01/17 19:40:33 msvensson@devsrv-b.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1981.52.1 06/01/17 21:10:47 konstantin@mysql.com +7 -0
  Bug#15206: "Misleading message "No data to FETCH":
  reword the misleading message.

  sql/share/errmsg.txt
    1.56.1.1 06/01/17 21:10:41 konstantin@mysql.com +2 -2
    Bug#15206: "Misleading message "No data to FETCH":
    reword the misleading message.

  mysql-test/t/type_decimal.test
    1.30 06/01/17 21:10:41 konstantin@mysql.com +0 -12
    Remove an unportable (QNX) test case (Bug#7670). The test output
    depends on system-specific sprintf() implementation.
    The original complain was about erroneous conversion to long long,
    which was applied prior to conversion to double: but the expected
    behaviour can't be achieved until we have an own string -> double
    conversion function.

  mysql-test/r/view_grant.result
    1.9 06/01/17 21:10:41 konstantin@mysql.com +4 -4
    Test results fixed (Bug#15206)

  mysql-test/r/variables.result
    1.77 06/01/17 21:10:41 konstantin@mysql.com +2 -2
    Test results fixed (Bug#15206)

  mysql-test/r/type_decimal.result
    1.40 06/01/17 21:10:41 konstantin@mysql.com +0 -13
    Disable an unportable test case (Bug#7670)

  mysql-test/r/sp.result
    1.181 06/01/17 21:10:41 konstantin@mysql.com +8 -8
    Test results fixed (Bug#15206)

  mysql-test/r/sp-error.result
    1.98.1.1 06/01/17 21:10:41 konstantin@mysql.com +1 -1
    Test results fixed (Bug#15206)

ChangeSet
  1.1981.51.1 06/01/17 19:02:42 msvensson@neptunus.(none) +3 -0
  Fix for connection not being added to connection pool if "disable_abort_on_error" was used.

  mysql-test/t/mysqltest.test
    1.29 06/01/17 19:02:38 msvensson@neptunus.(none) +7 -1
    Add test for connection not being added to connection pool if "disable_abort_on_error" was used

  mysql-test/r/mysqltest.result
    1.25 06/01/17 19:02:38 msvensson@neptunus.(none) +1 -0
    Update test result

  client/mysqltest.c
    1.197 06/01/17 19:02:37 msvensson@neptunus.(none) +1 -12
    If connection suceeded don't close it, just call handle_no_error which will check if an error was expected

ChangeSet
  1.1981.1.46 06/01/17 17:25:10 serg@serg.mylan +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into serg.mylan:/usr/home/serg/Abk/mysql-5.0

  sql/sql_handler.cc
    1.80 06/01/17 17:24:54 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1960.108.1 06/01/17 16:49:12 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug14634/my41-bug14634
  into  neptunus.(none):/home/msvensson/mysql/bug14634/my50-bug14634

  sql/sql_select.cc
    1.367.7.1 06/01/17 16:49:07 msvensson@neptunus.(none) +0 -5
    Auto merged

ChangeSet
  1.1616.2469.1 06/01/17 16:48:26 msvensson@neptunus.(none) +1 -0
  Bug #14634 Running out of diskspace on tmpdir returns an inappropriate error

  sql/sql_select.cc
    1.216.121.1 06/01/17 16:48:23 msvensson@neptunus.(none) +5 -7
    Backport from 5.0, catch the new errno that is returned

ChangeSet
  1.1616.2468.1 06/01/17 18:51:08 svoj@april.(none) +4 -0
  BUG#3074: Unversioned symbols in shared library
  libmysqlclient versioning when linked with GNU ld.

  libmysql/libmysql.ver.in
    1.1 06/01/17 18:51:05 svoj@april.(none) +1 -0
    New BitKeeper file ``libmysql/libmysql.ver.in''

  libmysql/libmysql.ver.in
    1.0 06/01/17 18:51:05 svoj@april.(none) +0 -0
    BitKeeper file /home/svoj/devel/mysql/BUG3074/mysql-4.1/libmysql/libmysql.ver.in

  libmysql/Makefile.shared
    1.55.1.3 06/01/17 18:51:05 svoj@april.(none) +1 -1
    libmysqlclient versioning when linked with GNU ld.

  configure.in
    1.201.63.1 06/01/17 18:51:05 svoj@april.(none) +10 -1
    libmysqlclient versioning when linked with GNU ld.

  BitKeeper/etc/ignore
    1.153.1.81 06/01/17 18:51:05 svoj@april.(none) +1 -0
    Added libmysql/libmysql.ver to the ignore list

ChangeSet
  1.1616.2450.12 06/01/17 12:55:30 joerg@mysql.com +1 -0
  Increase the version number to 4.1.18

  configure.in
    1.201.1.200 06/01/17 12:55:26 joerg@mysql.com +2 -2
    Increase the version number to 4.1.18

ChangeSet
  1.1981.50.2 06/01/17 12:48:48 pem@mysql.com +1 -0
  Post-review fix. (BUG#15231)

  sql/sp_rcontext.cc
    1.38 06/01/17 12:48:44 pem@mysql.com +1 -1
    Post-review fix.

ChangeSet
  1.1981.50.1 06/01/17 12:44:51 pem@mysql.com +2 -0
  Merge mysql.com:/extern/mysql/bk/mysql-5.0
  into  mysql.com:/extern/mysql/work/bug15231/mysql-5.0

  mysql-test/t/sp.test
    1.170 06/01/17 12:44:48 pem@mysql.com +0 -1
    Manual merge.

  mysql-test/r/sp.result
    1.180 06/01/17 12:44:47 pem@mysql.com +0 -0
    Manual merge.

ChangeSet
  1.1981.49.1 06/01/17 10:44:20 jani@a193-229-222-105.elisa-laajakaista.fi +3 -0
  Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0

  sql/sql_table.cc
    1.294 06/01/17 10:44:13 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  mysql-test/t/create.test
    1.74 06/01/17 10:44:13 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  mysql-test/r/create.result
    1.112 06/01/17 10:44:13 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

ChangeSet
  1.1616.2450.11 06/01/17 09:05:18 joerg@mysql.com +0 -0
  Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/M41/mysql-4.1

ChangeSet
  1.1981.48.4 06/01/17 01:22:01 konstantin@mysql.com +1 -0
  A post-merge fix.

  mysql-test/t/ctype_ucs.test
    1.38 06/01/17 01:21:56 konstantin@mysql.com +0 -14
    A post-merge fix.

ChangeSet
  1.1981.48.3 06/01/17 01:18:00 konstantin@mysql.com +4 -0
  Merge mysql.com:/opt/local/work/mysql-4.1-root
  into  mysql.com:/opt/local/work/mysql-5.0-root

  mysql-test/t/ps.test
    1.58 06/01/17 01:17:54 konstantin@mysql.com +0 -0
    SCCS merged

  mysql-test/r/ps.result
    1.59 06/01/17 01:17:54 konstantin@mysql.com +0 -0
    SCCS merged

  mysql-test/t/ctype_ucs.test
    1.37 06/01/17 01:17:33 konstantin@mysql.com +0 -0
    Auto merged

  mysql-test/r/ctype_ucs.result
    1.41 06/01/17 01:17:33 konstantin@mysql.com +0 -19
    Auto merged

ChangeSet
  1.1616.2467.1 06/01/17 01:03:03 konstantin@mysql.com +4 -0
  A fix for Bug#13337 "ps test fails if configure wo/ usc2"

  mysql-test/t/ps.test
    1.27.1.19 06/01/17 01:02:57 konstantin@mysql.com +0 -13
    Fix Bug#13337 (move the test that uses UCS character set to 
    ctype_ucs)

  mysql-test/t/ctype_ucs.test
    1.15.1.12 06/01/17 01:02:57 konstantin@mysql.com +14 -0
    Fix Bug#13337 (move the test that uses UCS character set to 
    ctype_ucs)

  mysql-test/r/ps.result
    1.31.1.14 06/01/17 01:02:57 konstantin@mysql.com +0 -19
    Test results changed (Bug#13337)

  mysql-test/r/ctype_ucs.result
    1.11.1.17 06/01/17 01:02:57 konstantin@mysql.com +19 -0
    Test results changed (Bug#13337)

ChangeSet
  1.1981.48.2 06/01/17 00:44:43 konstantin@mysql.com +3 -0
  Merge mysql.com:/opt/local/work/mysql-4.1-root
  into  mysql.com:/opt/local/work/mysql-5.0-root

  sql/sql_table.cc
    1.292.1.1 06/01/17 00:44:36 konstantin@mysql.com +0 -0
    Auto merged

  mysql-test/t/create.test
    1.72.1.1 06/01/17 00:44:36 konstantin@mysql.com +0 -0
    Auto merged

  mysql-test/r/create.result
    1.110.1.1 06/01/17 00:44:36 konstantin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1981.48.1 06/01/17 00:28:00 konstantin@mysql.com +2 -0
  A test case for Bug#6073 "ALTER TABLE minor glitch" (can't repeat)

  mysql-test/t/alter_table.test
    1.44 06/01/17 00:27:54 konstantin@mysql.com +10 -0
    A test case for Bug#6073

  mysql-test/r/alter_table.result
    1.56 06/01/17 00:27:54 konstantin@mysql.com +4 -0
    Test results fixed (Bug#6073)

ChangeSet
  1.1981.46.3 06/01/16 23:15:00 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
  Changed condition similar to code in 4.1.

  sql/sql_handler.cc
    1.76.1.5 06/01/16 23:12:40 jani@a193-229-222-105.elisa-laajakaista.fi +4 -3
    Changed condition similar to code in 4.1.

ChangeSet
  1.1981.47.1 06/01/16 21:31:22 jani@a193-229-222-105.elisa-laajakaista.fi +3 -0
  Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
  into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0

  sql/sql_table.cc
    1.293 06/01/16 21:31:14 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  mysql-test/t/create.test
    1.73 06/01/16 21:31:14 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  mysql-test/r/create.result
    1.111 06/01/16 21:31:14 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

ChangeSet
  1.1981.46.1 06/01/16 22:31:13 konstantin@mysql.com +2 -0
  A test case for Bug#7670 "Loss of precision for some integer 
  values stored into DOUBLE column" (Can't repeat)

  mysql-test/t/type_decimal.test
    1.29 06/01/16 22:30:59 konstantin@mysql.com +13 -0
    A test case for Bug#7670

  mysql-test/r/type_decimal.result
    1.39 06/01/16 22:30:59 konstantin@mysql.com +13 -0
    Test results fixed (Bug#7670)

ChangeSet
  1.1981.1.45 06/01/16 18:09:04 serg@serg.mylan +6 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into serg.mylan:/usr/home/serg/Abk/mysql-5.0

  sql/sql_show.cc
    1.305 06/01/16 18:08:42 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_parse.cc
    1.522 06/01/16 18:08:41 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_handler.cc
    1.79 06/01/16 18:08:41 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_acl.cc
    1.184.1.5 06/01/16 18:08:40 serg@serg.mylan +0 -0
    Auto merged

  sql/field.cc
    1.295.1.3 06/01/16 18:08:40 serg@serg.mylan +0 -0
    Auto merged

  client/mysqldump.c
    1.219 06/01/16 18:08:39 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1981.43.2 06/01/16 17:55:22 pem@mysql.com +2 -0
  Post-merge fixes (BUG#14498)

  mysql-test/t/sp.test
    1.167.1.3 06/01/16 17:55:17 pem@mysql.com +3 -1
    Post-merge fix; added comment (still can't call bug14498_4 test)

  mysql-test/r/sp-code.result
    1.3 06/01/16 17:55:17 pem@mysql.com +1 -1
    Post-merge fix; updated result.

ChangeSet
  1.1981.45.2 06/01/16 17:23:39 joerg@mysql.com +1 -0
  extra/comp_err.c  :  Fix a merge error.

  extra/comp_err.c
    1.23 06/01/16 17:23:33 joerg@mysql.com +2 -1
    Fix a merge error (closing '}' was lost), correct formatting (tab -> blanks).

ChangeSet
  1.1981.45.1 06/01/16 16:48:05 joerg@mysql.com +2 -0
  Manual merge of the fix for bug#16106.
  
  Currently failing tests (for me) in non-debug build:
  blackhole fulltext fulltext_cache fulltext_left_join fulltext_multi

  extra/comp_err.c
    1.22 06/01/16 16:48:00 joerg@mysql.com +4 -7
    Manual merge: From 4.1 to 5.0, the license line was moved to a different place.

ChangeSet
  1.1616.2465.4 06/01/16 16:21:41 andrey@lmy004. +3 -0
  Merge

  sql/sql_table.cc
    1.157.2.147 06/01/16 16:21:39 andrey@lmy004. +0 -0
    SCCS merged

  mysql-test/t/create.test
    1.48.1.12 06/01/16 16:18:09 andrey@lmy004. +0 -0
    Auto merged

  mysql-test/r/create.result
    1.75.1.12 06/01/16 16:18:09 andrey@lmy004. +0 -0
    Auto merged

ChangeSet
  1.1981.44.1 06/01/16 15:48:55 knielsen@mysql.com +1 -0
  Merge mysql.com:/usr/local/mysql/mysql-5.x-win-test-fixes
  into  mysql.com:/usr/local/mysql/mysql-5.0-win-test-fixes

  mysql-test/mysql-test-run.pl
    1.61 06/01/16 15:48:52 knielsen@mysql.com +0 -1
    Manual merge.

ChangeSet
  1.1616.2455.14 06/01/16 15:46:37 gvb@phoenix.(none) +3 -0
  date_formats.test:
    fix for bug #15828 after review
    doing val_str now before testing of null value secures the function for null values returned by dynamic functions - the fix before was incomplete andy covered constant null values

  sql/item_timefunc.cc
    1.51.1.46 06/01/16 15:44:53 gvb@phoenix.(none) +1 -1

  mysql-test/r/date_formats.result
    1.15.1.3 06/01/16 15:44:52 gvb@phoenix.(none) +3 -0

  mysql-test/t/date_formats.test
    1.11.1.4 06/01/16 15:39:11 gvb@phoenix.(none) +1 -1
    fix for bug #15828 after review
    doing val_str now before testing of null value secures the function for null values returned by dynamic functions - the fix before was incomplete andy covered constant null values

ChangeSet
  1.1981.43.1 06/01/16 15:37:25 pem@mysql.com +6 -0
  Merge mysql.com:/extern/mysql/bk/mysql-5.0
  into  mysql.com:/extern/mysql/work/bug14498/mysql-5.0

  sql/sql_yacc.yy
    1.445.1.3 06/01/16 15:37:22 pem@mysql.com +0 -0
    Manual merge.

  sql/sp_head.cc
    1.195 06/01/16 15:37:22 pem@mysql.com +3 -9
    Manual merge.

  mysql-test/t/sp.test
    1.167.1.2 06/01/16 15:37:22 pem@mysql.com +87 -87
    Manual merge.

  mysql-test/r/sp.result
    1.178.1.2 06/01/16 15:37:22 pem@mysql.com +84 -84
    Manual merge.

  sql/sp_pcontext.h
    1.26 06/01/16 15:25:36 pem@mysql.com +0 -0
    Auto merged

  sql/sp_head.h
    1.75 06/01/16 15:25:36 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1974.6.5 06/01/16 15:25:15 knielsen@mysql.com +1 -0
  Two minor fixes to be able to run tests from within a Windows Max
  build directory.

ChangeSet
  1.1944.66.2 06/01/16 15:22:29 pem@mysql.com +1 -0
  Post-review fix (BUG#14498).

  sql/sp_pcontext.h
    1.21.2.1 06/01/16 15:22:25 pem@mysql.com +9 -0
    Post-review fix.

  mysql-test/mysql-test-run.pl
    1.56.2.1 06/01/16 15:19:17 knielsen@mysql.com +6 -3
    Two minor fixes to be able to run tests from within a Windows Max
    build directory.

ChangeSet
  1.1981.37.6 06/01/17 00:13:18 stewart@mysql.com +14 -0
  BUG#12124 ndb_mgm -e "# stop" does not allow stopping ndb_mgmd processes on other systems
  WL#2703 restart for ndb_mgmd
  
  Solving two problems with one stone.
  
  Allows the stopping and restarting of mgm nodes other than the one the mgmclient
  is connected to.

  ndb/src/mgmsrv/main.cpp
    1.46 06/01/17 00:13:14 stewart@mysql.com +22 -33
    allow mgmd to be restarted.
    
    - add g_RestartServer flag
    - move connecting to our own mgmd into MgmtSrvr (where it belongs)
    - output correct Shutdown/Restart message on shutdown/restart

  ndb/src/mgmsrv/Services.hpp
    1.16 06/01/17 00:13:14 stewart@mysql.com +1 -0
    Add endSession

  ndb/src/mgmsrv/Services.cpp
    1.58 06/01/17 00:13:14 stewart@mysql.com +14 -1
    Add endSession.
    
    - delete Allocated_resources for this connection
    - create new Allocated_resources for this connection
    
    conceivably you could keep the socket open across node restarts (and even
    possibly get a different node id). But I wouldn't try it and expect happiness.

  ndb/src/mgmsrv/MgmtSrvr.hpp
    1.40 06/01/17 00:13:14 stewart@mysql.com +10 -1
    add connect_to_self and remove set_connect_string.

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.91.1.1 06/01/17 00:13:13 stewart@mysql.com +132 -7
    Add code into start for connecting to our own mgmd.
    
    Create sendStopMgmd() which does the same job as sendSTOP_REQ, but for ndb_mgmd
    
    Allow stopping of other ndb_mgmd processes by creating a connection to them
    and issuing the stop command
    
    When stopping all nodes, stop other ndb_mgmd processes as well.
    
    Remove set_connect_string. Replace with connect_to_self. This is a much better
    way of doing things.

  ndb/src/mgmclient/CommandInterpreter.cpp
    1.56 06/01/17 00:13:13 stewart@mysql.com +9 -14
    Correct output of STOP as we can now stop mgmd as well as ndbd

  ndb/src/mgmapi/mgmapi.cpp
    1.57 06/01/17 00:13:13 stewart@mysql.com +19 -0
    Implement ndb_mgm_end_session

  ndb/src/kernel/vm/Configuration.hpp
    1.17 06/01/17 00:13:13 stewart@mysql.com +1 -1
    have option end_session to closeConfiguration

  ndb/src/kernel/vm/Configuration.cpp
    1.42 06/01/17 00:13:13 stewart@mysql.com +2 -1
    have option end_session to closeConfiguration

  ndb/src/kernel/main.cpp
    1.58 06/01/17 00:13:13 stewart@mysql.com +4 -1
    don't purge allocated resources when cleaning up in parent process (nodeid)

  ndb/src/common/util/SocketServer.cpp
    1.17 06/01/17 00:13:13 stewart@mysql.com +2 -0
    When destroying a SocketServer, close the server socket.

  ndb/src/common/mgmcommon/ConfigRetriever.cpp
    1.33 06/01/17 00:13:13 stewart@mysql.com +3 -0
    When destroying ConfigRetreiver, ndb_mgm_end_session - i.e. deallocate the nodeid

  ndb/include/mgmcommon/ConfigRetriever.hpp
    1.18 06/01/17 00:13:13 stewart@mysql.com +3 -0
    Allow configuration on if end_session is going to be called on object destruction.
    
    We need to set this to false for ndbd as we fork()

  ndb/include/mgmapi/mgmapi.h
    1.46 06/01/17 00:13:13 stewart@mysql.com +16 -0
    Add the internal ndb_mgm_end_session command.
    
    This will unreserve the nodeid we have allocated synchronously.
    
    Otherwise we can't do a restart of a node really quickly as the nodeids are cleaned
    up after the connection to mgmd is closed.

ChangeSet
  1.1981.1.42 06/01/16 15:23:02 aivanov@mysql.com +1 -0
  Restore fix for bug #15108 (by ramil) erroneously erased
   by applying innodb-5.0-ss115 snapshot.

  sql/ha_innodb.cc
    1.283 06/01/16 15:22:53 aivanov@mysql.com +2 -2
    Restore fix for bug #15108 (by ramil) erroneously erased
     by applying innodb-5.0-ss115 snapshot.

ChangeSet
  1.1981.28.6 06/01/16 12:47:48 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug6554/my41-bug6554
  into  neptunus.(none):/home/msvensson/mysql/bug6554/my50-bug6554

  sql/ha_berkeley.cc
    1.161 06/01/16 12:47:43 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.2457.2 06/01/16 12:46:07 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug6554/my40-bug6554
  into  neptunus.(none):/home/msvensson/mysql/bug6554/my41-bug6554

  sql/ha_berkeley.cc
    1.117.1.36 06/01/16 12:46:05 msvensson@neptunus.(none) +0 -2
    Merge 4.0 -> 4.1, change is already in 4.1

ChangeSet
  1.1981.42.1 06/01/16 14:32:43 aivanov@mysql.com +17 -0
  Changes from the innodb-5.0-ss115 snapshot.
   Fixed bugs:
   BUG#15991: "innodb-file-per-table + symlink database + rename = crash"
   BUG#15650: "DELETE with LEFT JOIN crashes server"
   BUG#15308: "Problem of Order with Enum Column in Primary Key"
   BUG#14189: "VARBINARY and BINARY variables: trailing space ignored"

ChangeSet
  1.1346.866.1 06/01/16 12:17:30 msvensson@neptunus.(none) +1 -0
  BUG#6554 Problem Building MySql on Fedora Core 3
     - Remove the local static var

  sql/ha_berkeley.cc
    1.105.3.1 06/01/16 12:13:33 msvensson@neptunus.(none) +2 -1
    Remove local static var, make it local in file instead.

  mysql-test/t/innodb_unsafe_binlog.test
    1.1 06/01/16 14:03:57 aivanov@mysql.com +67 -0
    Changes from the innodb-5.0-ss115 snapshot.
     Added testcases for bug #15650.

  mysql-test/t/innodb_unsafe_binlog.test
    1.0 06/01/16 14:03:57 aivanov@mysql.com +0 -0
    BitKeeper file /home/alexi/innodb-ss/mysql-5.0-ss115/mysql-test/t/innodb_unsafe_binlog.test

  mysql-test/t/innodb_unsafe_binlog-master.opt
    1.1 06/01/16 14:03:56 aivanov@mysql.com +1 -0
    Changes from the innodb-5.0-ss115 snapshot.
    

  mysql-test/r/innodb_unsafe_binlog.result
    1.1 06/01/16 14:03:56 aivanov@mysql.com +48 -0
    Changes from the innodb-5.0-ss115 snapshot.
    

  sql/ha_innodb.cc
    1.282 06/01/16 14:03:56 aivanov@mysql.com +106 -66
    Changes from the innodb-5.0-ss115 snapshot.
     Fixed bug #15308.
     Fixed bug #14189: innobase_init(): Assert that
       DATA_MYSQL_BINARY_CHARSET_COLL == my_charset_bin.number.
     After review fixes for unlock bug where unlock released all
       locks transaction requested for a row. Only a latest requested
       lock to a row should be released. Update function comments to
       reflect current state. Persistent cursor should be stored
       whenever select lock type != LOCK_NONE.

  mysql-test/t/innodb_unsafe_binlog-master.opt
    1.0 06/01/16 14:03:56 aivanov@mysql.com +0 -0
    BitKeeper file /home/alexi/innodb-ss/mysql-5.0-ss115/mysql-test/t/innodb_unsafe_binlog-master.opt

  mysql-test/r/innodb_unsafe_binlog.result
    1.0 06/01/16 14:03:56 aivanov@mysql.com +0 -0
    BitKeeper file /home/alexi/innodb-ss/mysql-5.0-ss115/mysql-test/r/innodb_unsafe_binlog.result

  mysql-test/t/innodb.test
    1.122 06/01/16 14:03:55 aivanov@mysql.com +197 -18
    Changes from the innodb-5.0-ss115 snapshot.

  mysql-test/r/innodb.result
    1.152 06/01/16 14:03:55 aivanov@mysql.com +318 -14
    Changes from the innodb-5.0-ss115 snapshot.

  innobase/trx/trx0trx.c
    1.63 06/01/16 14:03:55 aivanov@mysql.com +2 -1
    Changes from the innodb-5.0-ss115 snapshot.
     trx_commit_off_kernel(): Do not write empty trx->mysql_log_file_name.

  innobase/row/row0sel.c
    1.105 06/01/16 14:03:55 aivanov@mysql.com +6 -6
    Changes from the innodb-5.0-ss115 snapshot.
     Fixed bug #15308.
     Fixed bug #14189: innobase_init(): Assert that
       DATA_MYSQL_BINARY_CHARSET_COLL == my_charset_bin.number.
     After review fixes for unlock bug where unlock released all
       locks transaction requested for a row. Only a latest requested
       lock to a row should be released. Update function comments to
       reflect current state. Persistent cursor should be stored
       whenever select lock type != LOCK_NONE.

  innobase/row/row0mysql.c
    1.117 06/01/16 14:03:55 aivanov@mysql.com +13 -13
    Changes from the innodb-5.0-ss115 snapshot.
     Fixed bug on unlock_row. In a unlock_row we may unlock
     only the latest lock granted to this transaction to the row.

  innobase/row/row0ins.c
    1.76 06/01/16 14:03:55 aivanov@mysql.com +9 -0
    Changes from the innodb-5.0-ss115 snapshot.
     Fixed bug #14189. row_ins_cascade_calc_update_vec(): Refuse
     ON UPDATE_CASCADE when trying to change the length of of a
     VARBINARY column that refers to or is referenced by a BINARY
     column. BINARY columns are no longer padded on comparison,
     and thus they cannot be padded on storage either.

  innobase/os/os0file.c
    1.113 06/01/16 14:03:55 aivanov@mysql.com +72 -40
    Changes from the innodb-5.0-ss115 snapshot.
     os_file_handle_error(): Map the error codes EXDEV, ENOTDIR, and
       EISDIR to the new code OS_FILE_PATH_ERROR. Treat this code as
       OS_FILE_PATH_ERROR. This fixes the crash on RENAME TABLE when
       the .ibd file is a symbolic link to a different file system
       (bug#15991).
     Protect the increment and decrement operations on the statistic
       variables os_n_pending_writes/reads with os_file_count_mutes.

  innobase/lock/lock0lock.c
    1.66 06/01/16 14:03:55 aivanov@mysql.com +70 -1
    Changes from the innodb-5.0-ss115 snapshot.
     lock_rec_unlock(): Initialize local variable release_lock,
     in order to avoid dereferencing an uninitialized pointer
     when no lock exists on rec.

  innobase/include/row0mysql.h
    1.46 06/01/16 14:03:55 aivanov@mysql.com +3 -2
    Changes from the innodb-5.0-ss115 snapshot.

  innobase/include/os0file.h
    1.43 06/01/16 14:03:55 aivanov@mysql.com +3 -2
    Changes from the innodb-5.0-ss115 snapshot.
     os_file_handle_error(): Map the error codes EXDEV, ENOTDIR, and
     EISDIR to the new code OS_FILE_PATH_ERROR. Treat this code as
     OS_FILE_PATH_ERROR. This fixes the crash on RENAME TABLE when
     the .ibd file is a symbolic link to a different file system
     (bug#15991).

  innobase/include/lock0lock.h
    1.26 06/01/16 14:03:55 aivanov@mysql.com +12 -8
    Changes from the innodb-5.0-ss115 snapshot.

  innobase/include/data0type.ic
    1.27 06/01/16 14:03:55 aivanov@mysql.com +24 -15
    Changes from the innodb-5.0-ss115 snapshot.
     Fixed bug #14189. dtype_get_pad_char(): Do not pad VARBINARY
     or BINARY cloumns.

  innobase/include/data0type.h
    1.22 06/01/16 14:03:54 aivanov@mysql.com +2 -1
    Changes from the innodb-5.0-ss115 snapshot.

ChangeSet
  1.1981.1.40 06/01/16 09:56:10 knielsen@mysql.com +2 -0
  Windows Visual Studio 2003 fixes.

  VC++Files/sql/mysqld.vcproj
    1.4 06/01/16 09:55:46 knielsen@mysql.com +75 -0
    Add new file that was missing from .vcproj.

  VC++Files/client/mysqldump.vcproj
    1.2 06/01/16 09:55:46 knielsen@mysql.com +27 -0
    Add new file that was missing from .vcproj.

ChangeSet
  1.1981.1.39 06/01/15 16:43:30 aivanov@mysql.com +5 -0
  Null-merge (innodb-4.1-ss14 is not to be applied to
   higher versions)

  sql/ha_innodb.cc
    1.281 06/01/15 16:43:22 aivanov@mysql.com +5 -118
    Null-merge

  mysql-test/t/innodb.test
    1.121 06/01/15 16:43:22 aivanov@mysql.com +0 -36
    Null-merge

  mysql-test/r/innodb.result
    1.151 06/01/15 16:43:22 aivanov@mysql.com +0 -40
    Null-merge

  innobase/os/os0file.c
    1.112 06/01/15 16:43:22 aivanov@mysql.com +2 -6
    Null-merge

  innobase/include/os0file.h
    1.42 06/01/15 16:43:22 aivanov@mysql.com +2 -3
    Null-merge

ChangeSet
  1.1616.2466.1 06/01/15 14:50:47 aivanov@mysql.com +5 -0
  Changes from innodb-4.1-ss14 snapshot
   Fixed BUG#14056: Column prefix index on UTF-8 primary key
   causes "Can't find record.."
   Also fixed bug 15991.

  sql/ha_innodb.cc
    1.90.16.42 06/01/15 14:50:04 aivanov@mysql.com +118 -13
    Changes from innodb-4.1-ss14 snapshot
     Fixed BUG#14056: Column prefix index on UTF-8 primary key
     causes "Can't find record.."

  mysql-test/t/innodb.test
    1.62.1.16 06/01/15 14:50:04 aivanov@mysql.com +36 -0
    Changes from innodb-4.1-ss14 snapshot
     Fixed BUG#14056: Column prefix index on UTF-8 primary key
     causes "Can't find record.."

  mysql-test/r/innodb.result
    1.75.4.14 06/01/15 14:50:04 aivanov@mysql.com +40 -0
    Changes from innodb-4.1-ss14 snapshot
     Fixed BUG#14056: Column prefix index on UTF-8 primary key
     causes "Can't find record.."

  innobase/os/os0file.c
    1.87.1.17 06/01/15 14:50:04 aivanov@mysql.com +6 -2
    Changes from innodb-4.1-ss14 snapshot
     os_file_hadle_error(): Map the error codes EXDEV, ENOTDIR, and EISDIR
     to the new code OS_FILE_PATH_ERROR. Treat this code as OS_FILE_PATH_ERROR.
     This fixes the crash on RENAME TABLE when the .ibd file is a symbolic
     link to a different file system. (Bug 15991)

  innobase/include/os0file.h
    1.32.1.5 06/01/15 14:50:03 aivanov@mysql.com +3 -2
    Changes from innodb-4.1-ss14 snapshot
     os_file_hadle_error(): Map the error codes EXDEV, ENOTDIR, and EISDIR
     to the new code OS_FILE_PATH_ERROR. Treat this code as OS_FILE_PATH_ERROR.
     This fixes the crash on RENAME TABLE when the .ibd file is a symbolic
     link to a different file system. (Bug 15991)

ChangeSet
  1.1981.1.38 06/01/14 21:20:42 konstantin@mysql.com +1 -0
  A post-merge fix (Bug#12734)

  mysql-test/r/ps.result
    1.58 06/01/14 21:20:35 konstantin@mysql.com +34 -0
    A post-merge fix.

ChangeSet
  1.1981.1.37 06/01/14 19:12:07 konstantin@mysql.com +4 -0
  Merge mysql.com:/opt/local/work/mysql-4.1-12734
  into  mysql.com:/opt/local/work/mysql-5.0-root

  sql/item_cmpfunc.h
    1.119 06/01/14 19:12:02 konstantin@mysql.com +1 -1
    Manual merge

  mysql-test/t/ps.test
    1.57 06/01/14 19:12:02 konstantin@mysql.com +30 -30
    Manual merge

  mysql-test/r/ps.result
    1.57 06/01/14 19:12:02 konstantin@mysql.com +0 -34
    Manual merge

  sql/item_cmpfunc.cc
    1.190 06/01/14 19:05:31 konstantin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2455.13 06/01/14 16:06:51 gvb@phoenix.(none) +1 -0
  item_timefunc.cc:
    fix for bug #15828 after review

  sql/item_timefunc.cc
    1.51.1.45 06/01/14 16:06:22 gvb@phoenix.(none) +0 -1
    fix for bug #15828 after review

ChangeSet
  1.1616.2455.12 06/01/14 09:53:12 gvb@phoenix.(none) +1 -0
  item_timefunc.cc:
    fix for bug#15828 after review

  sql/item_timefunc.cc
    1.51.1.44 06/01/14 09:51:39 gvb@phoenix.(none) +2 -1
    fix for bug#15828 after review

ChangeSet
  1.1616.2465.1 06/01/14 04:55:07 konstantin@mysql.com +4 -0
  A fix and a test case for Bug#12734 " prepared statement may 
  return incorrect result set for a select SQL request"

  sql/item_cmpfunc.h
    1.73.1.40 06/01/14 04:55:01 konstantin@mysql.com +1 -0
    Add Item_func_like::cleanup()

  sql/item_cmpfunc.cc
    1.111.23.2 06/01/14 04:55:01 konstantin@mysql.com +6 -0
    Reset canDoTurboBM in Item_func_like::cleanup()

  mysql-test/t/ps.test
    1.27.1.18 06/01/14 04:55:00 konstantin@mysql.com +30 -0
    A test case for Bug#12734

  mysql-test/r/ps.result
    1.31.1.13 06/01/14 04:55:00 konstantin@mysql.com +34 -0
    Test results fixed (Bug#12734)

ChangeSet
  1.1981.1.36 06/01/14 01:28:42 sergefp@mysql.com +1 -0
  Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/psergey/mysql-5.0-bug16393-r2

  sql/sql_select.cc
    1.385 06/01/14 01:28:40 sergefp@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1981.41.2 06/01/14 01:26:42 sergefp@mysql.com +1 -0
  BUG#16393: post-review fixes: fix comments.

  sql/sql_select.cc
    1.378.1.2 06/01/14 01:26:34 sergefp@mysql.com +5 -13
    BUG#16393: post-review fixes: fix comments.

ChangeSet
  1.1981.41.1 06/01/13 23:55:30 sergefp@mysql.com +3 -0
  BUG#16393: Let the 'ref' optimizer use ON condition of nested join to construct 
  'ref' accesses to all tables that are direct children of the nested join and are 
  not inner wrt their siblings.

  sql/sql_select.cc
    1.378.1.1 06/01/13 23:55:23 sergefp@mysql.com +68 -12
    BUG#16393: Let the 'ref' optimizer use ON condition of nested join to construct 
    'ref' accesses to all tables that are direct children of the nested join and are 
    not inner wrt their siblings.

  mysql-test/t/join_nested.test
    1.17 06/01/13 23:55:22 sergefp@mysql.com +14 -0
    Testcase for BUG#16393

  mysql-test/r/join_nested.result
    1.21 06/01/13 23:55:22 sergefp@mysql.com +17 -3
    Testcase for BUG#16393

  scripts/mysqld_multi.sh
    1.29 06/01/13 20:59:35 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1981.40.1 06/01/13 21:25:12 svoj@april.(none) +3 -0
  BUG#13835: max key length is 1000 bytes when trying to create a fulltext index
  Allow fulltext index on VARCHAR columns longer than max key length.

  sql/sql_table.cc
    1.292 06/01/13 21:25:07 svoj@april.(none) +1 -1
    Allow fulltext index on VARCHAR columns longer than max key length.

  mysql-test/t/fulltext.test
    1.79 06/01/13 21:25:07 svoj@april.(none) +8 -0
    A test case for BUG#13835 added.

  mysql-test/r/fulltext.result
    1.83 06/01/13 21:25:07 svoj@april.(none) +8 -0
    A test case for BUG#13835 added.

ChangeSet
  1.1616.2450.10 06/01/13 17:45:01 joerg@mysql.com +2 -0
  Merge mysql.com:/M40/push-4.0 into mysql.com:/M41/merge-4.1

  scripts/mysqld_multi.sh
    1.21.1.2 06/01/13 17:44:58 joerg@mysql.com +0 -0
    Auto merged

  extra/comp_err.c
    1.11.1.1 06/01/13 17:44:58 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.1.824 06/01/13 16:25:20 joerg@mysql.com +2 -0
  extra/comp_err.c  +  scripts/mysqld_multi.sh  :
  Copyright string fixes (bug#16106)

  scripts/mysqld_multi.sh
    1.12.1.2 06/01/13 16:24:25 joerg@mysql.com +0 -3
    The "mysql_copyright" tool will not change non-C files, so do not mention the license.
    (bug#16106)

  extra/comp_err.c
    1.6.1.3 06/01/13 16:24:25 joerg@mysql.com +3 -1
    Ensure that the license spelling is as expected by the "mysql_copyright" tool.
    (bug#16106)

ChangeSet
  1.1616.2455.11 06/01/13 14:42:46 gvb@phoenix.(none) +3 -0
  fix for bug#15828
  problem was not checking 2nd parameter of str_to_date against NULL

  sql/item_timefunc.cc
    1.51.1.43 06/01/13 14:40:51 gvb@phoenix.(none) +1 -1

  mysql-test/r/date_formats.result
    1.15.1.2 06/01/13 14:40:46 gvb@phoenix.(none) +6 -0
    bk commit

  mysql-test/t/date_formats.test
    1.11.1.3 06/01/13 14:39:39 gvb@phoenix.(none) +7 -0
    fix for bug#15828
    problem was not checking 2nd parameter of str_to_date against NULL

ChangeSet
  1.1981.39.1 06/01/13 16:27:38 evgen@moonbone.local +3 -0
  Merge

  mysql-test/t/select.test
    1.97 06/01/13 16:27:37 evgen@moonbone.local +0 -0
    SCCS merged

  mysql-test/r/select.result
    1.118 06/01/13 16:27:37 evgen@moonbone.local +0 -0
    SCCS merged

  sql/sql_select.cc
    1.384 06/01/13 16:26:09 evgen@moonbone.local +0 -0
    Auto merged

ChangeSet
  1.1981.38.1 06/01/13 16:39:33 bar@mysql.com +3 -0
  Merge mysql.com:/usr/home/bar/mysql-4.1.b15377
  into  mysql.com:/usr/home/bar/mysql-5.0

  strings/ctype-gb2312.c
    1.62 06/01/13 16:39:24 bar@mysql.com +0 -0
    Auto merged

  strings/ctype-euc_kr.c
    1.65 06/01/13 16:39:24 bar@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.80 06/01/13 16:39:24 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1981.1.32 06/01/13 14:30:20 evgen@moonbone.local +3 -0
  Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
  into moonbone.local:/work/15538-bug-5.0-mysql

  sql/sql_yacc.yy
    1.445.1.2 06/01/13 14:30:19 evgen@moonbone.local +0 -0
    Auto merged

  mysql-test/t/select.test
    1.96 06/01/13 14:30:19 evgen@moonbone.local +0 -0
    Auto merged

  mysql-test/r/select.result
    1.117 06/01/13 14:30:19 evgen@moonbone.local +0 -0
    Auto merged

ChangeSet
  1.1981.1.31 06/01/13 12:13:50 evgen@moonbone.local +4 -0
  Merge

  mysql-test/t/select.test
    1.94.1.1 06/01/13 12:13:49 evgen@moonbone.local +0 -0
    SCCS merged

  mysql-test/r/select.result
    1.115.1.1 06/01/13 12:13:49 evgen@moonbone.local +0 -0
    SCCS merged

  sql/item_cmpfunc.h
    1.118 06/01/13 12:12:43 evgen@moonbone.local +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.189 06/01/13 12:12:43 evgen@moonbone.local +0 -0
    Auto merged

ChangeSet
  1.1616.2455.9 06/01/13 09:29:24 jonas@perch.ndb.mysql.com +1 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/41-work
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.39.1.20 06/01/13 09:29:21 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1974.6.4 06/01/13 07:40:15 jonas@perch.ndb.mysql.com +1 -0
  bug#15619 - ndb_autodiscover sometimes fails

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.92 06/01/13 07:40:13 jonas@perch.ndb.mysql.com +10 -0
    Make sure that node allocating id is allowed to transporter connect

ChangeSet
  1.1616.2462.1 06/01/13 11:43:50 stewart@mysql.com +7 -0
  BUG#11331 "Warning: could not add log destination" message does not provide enough info
  
  Implement error reporting to Logger and associated classes.

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.51.1.22 06/01/13 11:43:47 stewart@mysql.com +12 -2
    Report error when adding log handler

  ndb/src/common/logger/SysLogHandler.cpp
    1.5 06/01/13 11:43:47 stewart@mysql.com +1 -0
    Report an error on invalid syslog facility

  ndb/src/common/logger/Logger.cpp
    1.7.1.4 06/01/13 11:43:47 stewart@mysql.com +10 -1
    Report back errors when adding a handler via BaseString

  ndb/src/common/logger/LogHandler.cpp
    1.11 06/01/13 11:43:47 stewart@mysql.com +26 -3
    Implement error reporting.
    
    Trim spaces and tabs out of parameter names. This allows "p=v, param=value"

  ndb/src/common/logger/FileLogHandler.cpp
    1.10 06/01/13 11:43:47 stewart@mysql.com +13 -4
    Implement error reporting

  ndb/include/logger/Logger.hpp
    1.7 06/01/13 11:43:47 stewart@mysql.com +4 -1
    Add reporting back of error to addHandler(BaseString).

  ndb/include/logger/LogHandler.hpp
    1.7 06/01/13 11:43:47 stewart@mysql.com +13 -0
    Add error string to LogHandler along with error code

ChangeSet
  1.1981.37.5 06/01/13 01:56:57 dlenev@mysql.com +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/dlenev/src/mysql-5.0-bg12198-2

  sql/sp_head.cc
    1.193.1.14 06/01/13 01:56:47 dlenev@mysql.com +0 -0
    Auto merged

  mysql-test/t/sp.test
    1.167.1.1 06/01/13 01:56:47 dlenev@mysql.com +0 -0
    Auto merged

  mysql-test/r/sp.result
    1.178.1.1 06/01/13 01:56:47 dlenev@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1960.107.1 06/01/13 01:51:56 dlenev@mysql.com +3 -0
  Fix for bug #12198 "Temporary table aliasing does not work inside stored
  functions".
  
  We should ignore alias when we check if table was already marked as temporary
  when we calculate set of tables to be prelocked. Otherwise we will erroneously
  treat tables which are used in same routine and have same name but different
  alias as non-temporary.

  sql/sp_head.cc
    1.193.18.1 06/01/13 01:51:51 dlenev@mysql.com +23 -8
    sp_head::merge_table_list():
      We should ignore alias when we check if table was already marked as temporary
      when we calculate set of tables to be prelocked. Otherwise we will erroneously
      treat tables which are used in same routine and have same name but different
      alias as non-temporary.

  mysql-test/t/sp.test
    1.161.11.1 06/01/13 01:51:50 dlenev@mysql.com +78 -2
    Added test for bug #12198 "Temporary table aliasing does not work inside stored
    functions" and other tests which cover handling of temporary tables in prelocked
    mode.

  mysql-test/r/sp.result
    1.168.9.1 06/01/13 01:51:50 dlenev@mysql.com +67 -0
    Added test for bug #12198 "Temporary table aliasing does not work inside stored
    functions" and other tests which cover handling of temporary tables in prelocked
    mode.

ChangeSet
  1.1981.37.4 06/01/12 20:49:47 jani@ua141d10.elisa.omakaista.fi +1 -0
  Fixed a bug in merge.

  sql/sql_handler.cc
    1.76.1.4 06/01/12 20:49:42 jani@ua141d10.elisa.omakaista.fi +1 -3
    Fixed a bug in merge.

ChangeSet
  1.1981.37.3 06/01/12 20:31:00 jani@ua141d10.elisa.omakaista.fi +1 -0
  Fix for Netware build.

  netware/BUILD/compile-linux-tools
    1.11 06/01/12 20:30:55 jani@ua141d10.elisa.omakaista.fi +1 -1
    Fix for Netware build.

ChangeSet
  1.1981.37.2 06/01/12 20:28:23 jani@ua141d10.elisa.omakaista.fi +9 -0
  Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
  into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

  sql/sql_select.cc
    1.383 06/01/12 20:28:18 jani@ua141d10.elisa.omakaista.fi +2 -4
    Merged from 4.1.

  sql/sql_handler.cc
    1.76.1.3 06/01/12 20:28:18 jani@ua141d10.elisa.omakaista.fi +3 -12
    Merged from 4.1.

  sql/sql_base.cc
    1.324 06/01/12 20:28:18 jani@ua141d10.elisa.omakaista.fi +1 -1
    Merged from 4.1.

  sql/mysqld.cc
    1.529 06/01/12 20:28:18 jani@ua141d10.elisa.omakaista.fi +0 -1
    Merged from 4.1.

  sql/item_cmpfunc.cc
    1.187.1.1 06/01/12 20:07:03 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  netware/mysqld_safe.c
    1.10 06/01/12 20:07:03 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  innobase/os/os0thread.c
    1.29 06/01/12 20:07:03 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  include/config-netware.h
    1.14 06/01/12 20:07:03 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  client/mysqlimport.c
    1.58 06/01/12 20:07:03 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

ChangeSet
  1.1981.28.5 06/01/12 18:19:57 msvensson@neptunus.(none) +1 -0
  Use "test ! -s" to check that file does not exist 

  mysql-test/t/mysqltest.test
    1.28 06/01/12 18:19:51 msvensson@neptunus.(none) +1 -1
    Use "test ! -s" to check that file does not exist 

ChangeSet
  1.1616.2455.8 06/01/12 17:47:58 jani@ua141d10.elisa.omakaista.fi +4 -0
  Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0
  into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1

  sql/mysqld.cc
    1.356.98.21 06/01/12 17:47:55 jani@ua141d10.elisa.omakaista.fi +6 -5
    Merge from 4.0 to 4.1

  netware/mysqld_safe.c
    1.7.1.2 06/01/12 17:47:54 jani@ua141d10.elisa.omakaista.fi +17 -15
    Merge from 4.0 to 4.1

  innobase/os/os0thread.c
    1.26.1.2 06/01/12 17:27:19 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  include/config-netware.h
    1.2.1.9 06/01/12 17:27:19 jani@ua141d10.elisa.omakaista.fi +1 -1
    Auto merged

ChangeSet
  1.1981.15.34 06/01/12 17:32:39 SergeyV@selena. +2 -0
  Fixes bug #15787. Fix makes available _FILE_OFFSET_BITS definition for
  zlib library in order to enable support of files larger than 2Gb.
  Providing an effective test is hardly possible, since the problem starts
  only when archive table becomes larger than 2Gb.

  zlib/zconf.h
    1.6 06/01/12 17:25:01 SergeyV@selena. +4 -0
    Includes config.h in order to make _FILE_OFFSET_BITS definition available.

  zlib/gzio.c
    1.6 06/01/12 17:25:00 SergeyV@selena. +2 -2
    Move include of zutil.h on top of gzio.c to include chain of
    zutil.h->zlib.h->zconf.h->config.h before including anything else.

ChangeSet
  1.1346.1.823 06/01/12 15:10:12 jani@ua141d10.elisa.omakaista.fi +4 -0
  NetWare specific change to increase thread stack size.
  Changes to Netware specific mysqld_safe.c

  sql/mysqld.cc
    1.297.52.8 06/01/12 15:10:10 jani@ua141d10.elisa.omakaista.fi +5 -0
    NetWare specific change to increase thread stack size.

  netware/mysqld_safe.c
    1.6.1.2 06/01/12 15:10:10 jani@ua141d10.elisa.omakaista.fi +15 -27
    NetWare specific change to make multiple mysqld_safe instances
    work when called through a NCF file.

  innobase/os/os0thread.c
    1.24.1.1 06/01/12 15:10:10 jani@ua141d10.elisa.omakaista.fi +9 -0
    NetWare specific change to increase thread stack size.

  include/config-netware.h
    1.2.2.4 06/01/12 15:10:10 jani@ua141d10.elisa.omakaista.fi +3 -0
    NetWare specific change to increase thread stack size.

ChangeSet
  1.1981.15.32 06/01/12 16:05:46 bar@mysql.com +1 -0
  sql_show.cc:
    after-merge fix for
    bug#15581 COALESCE function truncates mutli-byte TINYTEXT values

  sql/sql_show.cc
    1.303.1.2 06/01/12 16:04:45 bar@mysql.com +6 -3
    after-merge fix for bug#15581 COALESCE function truncates mutli-byte TINYTEXT values
    ,

ChangeSet
  1.1981.15.31 06/01/12 13:08:49 bar@mysql.com +1 -0
  ctype_utf8.result:
    After merge fix:
    fixing order of results.

  mysql-test/r/ctype_utf8.result
    1.85 06/01/12 13:08:22 bar@mysql.com +8 -8
    After merge fix:
    fixing order of results.

ChangeSet
  1.1981.34.2 06/01/12 11:11:16 sergefp@mysql.com +1 -0
  Fix typo bug in previous cset

  sql/sql_select.cc
    1.382 06/01/12 11:11:10 sergefp@mysql.com +1 -1
    Fix typo bug in previous cset

ChangeSet
  1.1981.34.1 06/01/12 10:48:27 sergefp@mysql.com +3 -0
  BUG#16166, "Can't use index_merge with FORCE INDEX": adjust the heurstics check to take into
  account that "FORCE INDEX" disables full table scans, and not range/index_merge scans.
  (with post-review fixes)

  sql/sql_select.cc
    1.381 06/01/12 10:48:14 sergefp@mysql.com +28 -7
    BUG#16166: "Can't use index_merge with FORCE INDEX": adjust the heuristics check:
    if (force-index-is-used && there-is-possible-ref-access && 
    +    THERE IS NO POSSIBLE RANGE/INDEX_MERGE ACCESS)
    {
      ...

  mysql-test/t/index_merge.test
    1.13 06/01/12 10:48:13 sergefp@mysql.com +30 -0
    Testcase for BUG#16166

  mysql-test/r/index_merge.result
    1.18 06/01/12 10:48:13 sergefp@mysql.com +18 -0
    Testcase for BUG#16166

ChangeSet
  1.1981.15.30 06/01/12 11:38:09 bar@mysql.com +3 -0
  Merge mysql.com:/usr/home/bar/mysql-4.1.b15581
  into  mysql.com:/usr/home/bar/mysql-5.0

  sql/field.cc
    1.295.2.2 06/01/12 11:37:32 bar@mysql.com +3 -6
    After merge fix.

  mysql-test/r/ctype_utf8.result
    1.84 06/01/12 11:28:16 bar@mysql.com +8 -8
    After-merge fix.

  mysql-test/t/ctype_utf8.test
    1.78 06/01/12 11:25:38 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1981.33.1 06/01/12 03:02:52 anozdrin@mysql.com +7 -0
  Fix for BUG#15103: SHOW TRIGGERS: small output alignment problem.

  sql/sql_yacc.yy
    1.445.2.1 06/01/12 03:02:48 anozdrin@mysql.com +2 -0
    Remove leading spaces.

  mysql-test/r/trigger.result
    1.27 06/01/12 03:02:48 anozdrin@mysql.com +2 -2
    Remove extra spaces from result file.

  mysql-test/r/trigger-grant.result
    1.2 06/01/12 03:02:48 anozdrin@mysql.com +7 -14
    Remove extra spaces from result file.

  mysql-test/r/trigger-compat.result
    1.2 06/01/12 03:02:48 anozdrin@mysql.com +2 -4
    Remove extra spaces from result file.

  mysql-test/r/rpl_ddl.result
    1.10 06/01/12 03:02:48 anozdrin@mysql.com +2 -2
    Remove extra spaces from result file.

  mysql-test/r/mysqldump.result
    1.87 06/01/12 03:02:48 anozdrin@mysql.com +11 -19
    Remove extra spaces from result file.

  mysql-test/r/information_schema.result
    1.94 06/01/12 03:02:48 anozdrin@mysql.com +6 -12
    Remove extra spaces from result file.

ChangeSet
  1.1981.32.1 06/01/11 16:18:11 reggie@linux.site +1 -0
  simple Windows compile fixes.

  include/config-win.h
    1.74 06/01/11 16:18:00 reggie@linux.site +11 -9
    use the ll and ull postfix codes for create longlong and ulonglong
    symbols.  This allows ULL(a) and LL(a) to be used in more complex
    macro definitions than the previous definitions.  This may work on
    other compilers but we just tested on Visual 7.1 and 8.0
    
    Also, define HAVE_STRNLEN for all windows platforms.  Our own strnlen
    offers no performance improvements over the CRT version.

ChangeSet
  1.1981.31.1 06/01/11 23:39:09 evgen@moonbone.local +3 -0
  Fixed bug #15538: unchecked table absence caused server crash.
  
  Absence of table in left part of LEFT/RIGHT join wasn't checked before
  name resolution which resulted in NULL dereferencing and server crash.
  
  Modified rules: 
  "table_ref LEFT opt_outer JOIN_SYM table_ref" and "table_ref RIGHT opt_outer 
  JOIN_SYM table_ref"
  NULL check is moved before push_new_name_resolution_context()

  mysql-test/t/select.test
    1.95 06/01/11 23:37:50 evgen@moonbone.local +6 -0
    Added test case for bug #15538: unchecked table absence caused server crash.

  mysql-test/r/select.result
    1.116 06/01/11 23:37:18 evgen@moonbone.local +2 -0
    Added test case for bug #15538: unchecked table absence caused server crash.

  sql/sql_yacc.yy
    1.445.1.1 06/01/11 23:36:13 evgen@moonbone.local +2 -2
    Fixed bug #15538: unchecked table absence caused server crash.
    Modified rules:
    "table_ref LEFT opt_outer JOIN_SYM table_ref" and "table_ref RIGHT opt_outer 
    JOIN_SYM table_ref"
    NULL check is moved before push_new_name_resolution_context()

ChangeSet
  1.1960.106.1 06/01/11 23:16:21 evgen@moonbone.local +3 -0
  Fixed bug #15347: Wrong result of subselect when records cache and set
  functions are involved.
  
  When subselect is a join with set functions and no record have been found in
  it, end_send_group() sets null_row for all tables in order aggregate functions 
  to calculate their values correctly. Normally this null_row flag is cleared for 
  each table in sub_select(), but flush_cached_records() doesn't do so.
  Due to this all fields from the table processed by flush_cached_records() are 
  always evaluated as nulls and whole select produces wrong result.
  
  flush_cached_records() now clears null_row flag at the very beginning.

  sql/sql_select.cc
    1.367.1.14 06/01/11 23:13:38 evgen@moonbone.local +1 -0
    Fixed bug #15347: Wrong result of subselect when records cache and set functions are involved
    flush_cached_records() now clears null_row flag at the very beginning.

  mysql-test/r/select.result
    1.114.2.1 06/01/11 23:10:50 evgen@moonbone.local +11 -0
    Added test case for bug #15347: Wrong result of subselect when records cache
    and set functions are involved

  mysql-test/t/select.test
    1.93.2.1 06/01/11 23:08:59 evgen@moonbone.local +13 -0
    Added test case for bug #15347: Wrong result of subselect when records cache
    and set functions are involved

ChangeSet
  1.1968.15.1 06/01/11 22:49:43 evgen@moonbone.local +5 -0
  Fixed bug #15633: Evaluation of Item_equal for non-const table caused wrong
  select result
  
  Item equal objects are employed only at the optimize phase. Usually they are not
  supposed to be evaluated.  Yet in some cases we call the method val_int() for
  them. Here we have to take care of restricting the predicate such an object
  represents f1=f2= ...=fn to the projection of known fields fi1=...=fik.
  
  Added a check for field's table being const in Item_equal::val_int().
  If the field's table is not const val_int() just skips that field when
  evaluating Item_equal.

  sql/item_cmpfunc.cc
    1.188 06/01/11 22:45:45 evgen@moonbone.local +8 -3
    Fixed bug #15633: Evaluation of Item_equal for non-const table caused wrong select result
    Added check for field's table being const in Item_equal::val_int().

  sql/item_cmpfunc.h
    1.116.1.1 06/01/11 22:45:11 evgen@moonbone.local +5 -0
    Fixed bug #15633: Evaluation of Item_equal for non-const table caused wrong select result
    Added comment about fields from non-const tables in class description.

  mysql-test/r/func_group.result
    1.47 06/01/11 22:44:34 evgen@moonbone.local +2 -0
    Corrected test result for bug #12882 after fix for bug#15633

  mysql-test/r/select.result
    1.114.1.1 06/01/11 22:44:01 evgen@moonbone.local +13 -0
    Added test case for bug #15633: Evaluation of Item_equal for non-const table caused wrong select result

  mysql-test/t/select.test
    1.93.1.1 06/01/11 22:43:37 evgen@moonbone.local +14 -0
    Added test case for bug #15633: Evaluation of Item_equal for non-const table caused wrong select result

ChangeSet
  1.1981.15.27 06/01/11 17:49:56 konstantin@mysql.com +2 -0
  Merge mysql.com:/opt/local/work/mysql-4.1-root
  into  mysql.com:/opt/local/work/mysql-5.0-root

  sql/password.c
    1.39 06/01/11 17:49:48 konstantin@mysql.com +2 -2
    Manual merge

  sql/item_strfunc.cc
    1.262 06/01/11 17:34:38 konstantin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2461.1 06/01/11 17:31:52 konstantin@mysql.com +4 -0
  A fix for Bug#13944 "libmysqlclient exporting sha1_result function":
  rename sha1_* to mysql_sha1_*

  sql/password.c
    1.32.1.3 06/01/11 17:31:45 konstantin@mysql.com +23 -23
    rename sha1_* to mysql_sha1_*

  sql/item_strfunc.cc
    1.196.6.6 06/01/11 17:31:45 konstantin@mysql.com +5 -3
    rename sha1_* to mysql_sha1_*

  mysys/sha1.c
    1.6 06/01/11 17:31:45 konstantin@mysql.com +8 -8
    rename sha1_* to mysql_sha1_*

  include/sha1.h
    1.4 06/01/11 17:31:45 konstantin@mysql.com +3 -3
    rename sha1_* to mysql_sha1_*

ChangeSet
  1.1981.30.1 06/01/11 15:11:05 pem@mysql.com +6 -0
  Fixing BUG#15658: Server crashes after creating function as empty string
    Empty strings (and names with trailing spaces) should not be allowed.

  sql/sql_yacc.yy
    1.446 06/01/11 15:10:58 pem@mysql.com +15 -0
    Check db and name for stored routines.

  sql/sp_head.h
    1.73.1.8 06/01/11 15:10:57 pem@mysql.com +2 -0
    Added function for checking SP names.

  sql/sp_head.cc
    1.193.17.1 06/01/11 15:10:57 pem@mysql.com +17 -0
    Added function for checking SP names. (Mustn't be empty or contain trailing spaces.)

  sql/share/errmsg.txt
    1.57 06/01/11 15:10:57 pem@mysql.com +2 -0
    New error message for bad stored routine names.

  mysql-test/t/sp-error.test
    1.101 06/01/11 15:10:57 pem@mysql.com +27 -0
    New testcase for BUG#15658

  mysql-test/r/sp-error.result
    1.99 06/01/11 15:10:57 pem@mysql.com +19 -0
    New testcase for BUG#15658

ChangeSet
  1.1981.28.4 06/01/11 11:10:58 msvensson@neptunus.(none) +1 -0
  Add comments that groups and describes the inits

  client/mysqltest.c
    1.196 06/01/11 11:10:53 msvensson@neptunus.(none) +9 -4
    Add comments
    Group inits logically

ChangeSet
  1.1981.28.3 06/01/11 11:07:17 msvensson@neptunus.(none) +1 -0
  Remove obsolete comment

  client/mysqltest.c
    1.195 06/01/11 11:07:11 msvensson@neptunus.(none) +0 -1
    Remove obsolete comment

ChangeSet
  1.1981.28.2 06/01/11 11:06:26 msvensson@neptunus.(none) +2 -0
  Fix problem with strange printout of line numbers, detected on aix52, but existing on all platforms, just being masked by init of vars to zero.

  mysql-test/r/mysqltest.result
    1.24 06/01/11 11:06:20 msvensson@neptunus.(none) +1 -1
    Correct test result, "At line 1" should be printed 

  client/mysqltest.c
    1.194 06/01/11 11:06:20 msvensson@neptunus.(none) +16 -15
    Remove lineno_stack, instead use the already existing file_stack and add a new variable lineno to keep track of what line in the file we are at.

ChangeSet
  1.1981.28.1 06/01/11 00:24:57 msvensson@neptunus.(none) +3 -0
  Disable code for "let" to assign each column from query to it's own variable

  mysql-test/t/mysqltest.test
    1.27 06/01/11 00:24:51 msvensson@neptunus.(none) +2 -2
    Disable test for "let assigns each column of query to own var" 

  mysql-test/r/mysqltest.result
    1.23 06/01/11 00:24:51 msvensson@neptunus.(none) +0 -19
    Remove test results for disabled test

  client/mysqltest.c
    1.193 06/01/11 00:24:51 msvensson@neptunus.(none) +2 -1
    Disable "let" assign each column of query to own var

ChangeSet
  1.1981.15.24 06/01/11 02:10:59 anozdrin@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/alik/MySQL/devel/5.0-bug15110

  sql/sql_parse.cc
    1.519.1.4 06/01/11 02:10:54 anozdrin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1981.27.1 06/01/11 02:07:40 anozdrin@mysql.com +17 -0
  Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause
  
  There are two main idea of this fix:
    - introduce a common function for server and client to split user value
      (<user name>@<host name>) into user name and host name parts;
    - dump DEFINER clause in correct format in mysqldump.

  sql-common/my_user.c
    1.1 06/01/11 02:07:35 anozdrin@mysql.com +57 -0
    A new file for parse_user() implementation.

  include/my_user.h
    1.1 06/01/11 02:07:35 anozdrin@mysql.com +35 -0
    A header file for parse_user().

  sql/sql_trigger.cc
    1.41 06/01/11 02:07:35 anozdrin@mysql.com +1 -1
    Use constant for max user length.

  sql/sql_show.cc
    1.303.1.1 06/01/11 02:07:35 anozdrin@mysql.com +3 -3
    Use constant for max user length.

  sql-common/my_user.c
    1.0 06/01/11 02:07:35 anozdrin@mysql.com +0 -0
    BitKeeper file /home/alik/MySQL/devel/5.0-bug15110/sql-common/my_user.c

  include/my_user.h
    1.0 06/01/11 02:07:35 anozdrin@mysql.com +0 -0
    BitKeeper file /home/alik/MySQL/devel/5.0-bug15110/include/my_user.h

  sql/sql_parse.cc
    1.519.2.1 06/01/11 02:07:34 anozdrin@mysql.com +2 -2
    Use constant for max user length.

  sql/sql_acl.cc
    1.184.3.6 06/01/11 02:07:34 anozdrin@mysql.com +2 -2
    Use constant for max user length.

  sql/sp_head.cc
    1.193.1.13 06/01/11 02:07:34 anozdrin@mysql.com +12 -18
    Use common function to parse user value.

  sql/sp.cc
    1.104 06/01/11 02:07:34 anozdrin@mysql.com +2 -2
    Use constant for max user length.

  sql/Makefile.am
    1.114 06/01/11 02:07:34 anozdrin@mysql.com +3 -1
    Add my_user.c

  sql-common/Makefile.am
    1.3 06/01/11 02:07:34 anozdrin@mysql.com +1 -1
    Add my_user.c

  mysql-test/r/mysqldump.result
    1.86 06/01/11 02:07:34 anozdrin@mysql.com +6 -6
    Update result file.

  libmysqld/Makefile.am
    1.67 06/01/11 02:07:34 anozdrin@mysql.com +1 -1
    Add my_user.c

  include/mysql_com.h
    1.103 06/01/11 02:07:34 anozdrin@mysql.com +8 -0
    Introduce a constant for max user length.

  include/Makefile.am
    1.56 06/01/11 02:07:34 anozdrin@mysql.com +2 -1
    Add my_user.c

  client/mysqldump.c
    1.217.1.1 06/01/11 02:07:34 anozdrin@mysql.com +32 -3
    Fix for BUG#15110(mysqldump --triggers: does not include DEFINER clause)

  client/Makefile.am
    1.53 06/01/11 02:07:34 anozdrin@mysql.com +5 -2
    Use my_user.c in linking of mysqldump executable.

  BitKeeper/etc/ignore
    1.213 06/01/11 02:05:07 anozdrin@mysql.com +3 -0
    added client/my_user.c libmysqld/my_user.c sql/my_user.c

ChangeSet
  1.1981.15.21 06/01/10 21:03:02 aivanov@mysql.com +1 -0
  Post-merge changes

  mysql-test/t/disabled.def
    1.19 06/01/10 21:02:51 aivanov@mysql.com +0 -1
    Enabling type_time.test

ChangeSet
  1.1981.25.2 06/01/10 19:19:56 jani@ua141d10.elisa.omakaista.fi +1 -0
  Changed function prototype.

  sql/sql_parse.cc
    1.519.1.3 06/01/10 19:19:50 jani@ua141d10.elisa.omakaista.fi +1 -1
    Changed function prototype.

ChangeSet
  1.1616.2455.6 06/01/10 19:13:12 monty@mysql.com +2 -0
  Re-run fix-fields on condition if table was reopened in HANDLERREAD

  sql/sql_handler.cc
    1.53.1.13 06/01/10 19:13:08 monty@mysql.com +8 -3
    Re-run fix-fields on condition if table was reopened

  sql/sql_base.cc
    1.145.1.117 06/01/10 19:13:08 monty@mysql.com +16 -4
    Added more comments

ChangeSet
  1.1981.25.1 06/01/10 18:56:23 jani@ua141d10.elisa.omakaista.fi +2 -0
  Fixed refresh_status function.

  sql/sql_parse.cc
    1.519.1.2 06/01/10 18:56:17 jani@ua141d10.elisa.omakaista.fi +7 -9
    Changed refresh status to take thd as argument to avoid current_thd.
    Removed add_to_status away from loop, as it is not necessary for each
    variable, only required for each thread. In this case only the current
    thread.

  sql/sql_class.cc
    1.225 06/01/10 18:56:16 jani@ua141d10.elisa.omakaista.fi +6 -1
    Improved documentation on add_to_status().

ChangeSet
  1.1981.15.20 06/01/10 19:22:47 aivanov@mysql.com +2 -0
  Merge mysql.com:/home/alexi/dev/mysql-4.1-15805
  into  mysql.com:/home/alexi/dev/mysql-5.0-15805

  sql/sql_acl.cc
    1.184.3.5 06/01/10 19:22:35 aivanov@mysql.com +0 -0
    Auto merged

  mysql-test/r/type_time.result
    1.15 06/01/10 19:22:35 aivanov@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2455.5 06/01/10 18:03: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/sql_select.cc
    1.216.1.230 06/01/10 18:03:51 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2455.4 06/01/10 17:57:46 aivanov@mysql.com +2 -0
  Commenting out testcases which cause type_time.test failure.
   To be uncommented after fixing bug 15805.

ChangeSet
  1.1981.15.19 06/01/10 15:56:30 msvensson@neptunus.(none) +1 -0
  Fix for crashing mysqltest

  client/mysqltest.c
    1.192 06/01/10 15:56:24 msvensson@neptunus.(none) +1 -1
    Allocate one extra byte for string terminator in varname

  mysql-test/t/type_time.test
    1.8 06/01/10 17:55:54 aivanov@mysql.com +10 -6
    Temporaly commented out testcases which cause type_time.test failure.
     To be uncommented after fixing bug 15805.

  mysql-test/r/type_time.result
    1.12.1.2 06/01/10 17:55:54 aivanov@mysql.com +0 -24
    Fixing testcases results.

ChangeSet
  1.1981.23.1 06/01/10 13:44:08 aelkin@mysql.com +3 -0
  BUG#9483 test was overworked to account reviews finally to leave only REVOKE check. 
  There is a specific rpl_ignore_grant test case for GRANT.

  mysql-test/t/rpl_ignore_revoke.test
    1.1 06/01/10 13:44:02 aelkin@mysql.com +43 -0
    New BitKeeper file ``mysql-test/t/rpl_ignore_revoke.test''

  mysql-test/t/rpl_ignore_revoke-slave.opt
    1.1 06/01/10 13:44:02 aelkin@mysql.com +1 -0
    New BitKeeper file ``mysql-test/t/rpl_ignore_revoke-slave.opt''

  mysql-test/t/rpl_ignore_revoke.test
    1.0 06/01/10 13:44:02 aelkin@mysql.com +0 -0
    BitKeeper file /usr_rh9/home/elkin.rh9/MySQL/mysql-5.0-bug9483/mysql-test/t/rpl_ignore_revoke.test

  mysql-test/t/rpl_ignore_revoke-slave.opt
    1.0 06/01/10 13:44:02 aelkin@mysql.com +0 -0
    BitKeeper file /usr_rh9/home/elkin.rh9/MySQL/mysql-5.0-bug9483/mysql-test/t/rpl_ignore_revoke-slave.opt

  mysql-test/r/rpl_ignore_revoke.result
    1.1 06/01/10 13:44:02 aelkin@mysql.com +28 -0
    New BitKeeper file ``mysql-test/r/rpl_ignore_revoke.result''

  mysql-test/r/rpl_ignore_revoke.result
    1.0 06/01/10 13:44:01 aelkin@mysql.com +0 -0
    BitKeeper file /usr_rh9/home/elkin.rh9/MySQL/mysql-5.0-bug9483/mysql-test/r/rpl_ignore_revoke.result

ChangeSet
  1.1981.15.15 06/01/09 21:44:42 igor@rurik.mysql.com +1 -0
  Ajustement after merge

  sql/sql_select.cc
    1.380 06/01/09 21:44:32 igor@rurik.mysql.com +2 -1
    Ajustement after merge

ChangeSet
  1.1981.19.4 06/01/09 20:12:18 msvensson@neptunus.(none) +4 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration

  mysql-test/t/mysqltest.test
    1.26 06/01/09 20:12:14 msvensson@neptunus.(none) +0 -1
    Changed to "test ! -e" instead of "test -s"

  mysql-test/mysql-test-run.sh
    1.285 06/01/09 18:16:51 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.60 06/01/09 18:16:51 msvensson@neptunus.(none) +0 -0
    Auto merged

  client/mysqltest.c
    1.191 06/01/09 18:16:51 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1981.22.1 06/01/09 17:18:49 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598

  sql/sql_acl.cc
    1.184.3.4 06/01/09 17:18:43 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1981.21.2 06/01/09 17:12:26 msvensson@neptunus.(none) +2 -0
  Bug #15598 Server crashes in specific case during setting new password
  - Comparing host string against NULL caused crash. 
  - If host.hostname is NULL treat it as ""

  mysql-test/t/grant.test
    1.38 06/01/09 17:12:14 msvensson@neptunus.(none) +2 -2
    Add test for user with host ""

  mysql-test/r/grant.result
    1.48 06/01/09 17:12:14 msvensson@neptunus.(none) +9 -9
    Update test results

ChangeSet
  1.1981.21.1 06/01/09 11:16:29 msvensson@neptunus.(none) +3 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug15598/my41-bug15598
  into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598

  mysql-test/r/grant.result
    1.47 06/01/09 11:16:25 msvensson@neptunus.(none) +0 -0
    SCCS merged

  sql/sql_acl.cc
    1.184.4.1 06/01/09 11:15:28 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/grant.test
    1.37 06/01/09 11:15:27 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.2458.1 06/01/09 10:57:28 msvensson@devsrv-b.mysql.com +1 -0
  Merge msvensson@10.100.68.5:/home/msvensson/mysql/bug15598/my41-bug15598
  into  devsrv-b.mysql.com:/space/magnus/my41-bug15598

  sql/sql_acl.cc
    1.74.1.99 06/01/09 10:57:23 msvensson@devsrv-b.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2457.1 06/01/09 10:31:07 msvensson@neptunus.(none) +3 -0
  Bug #15598 Server crashes in specific case during setting new password
   - When acl_user->host.hostname is NULL compare it as ""

  sql/sql_acl.cc
    1.74.30.1 06/01/09 10:31:01 msvensson@neptunus.(none) +3 -2
    If acl_user->host.hostname is NULL compare it as "" 

  mysql-test/t/grant.test
    1.17.1.16 06/01/09 10:31:01 msvensson@neptunus.(none) +12 -0
    Test user with host ''

  mysql-test/r/grant.result
    1.21.1.19 06/01/09 10:31:01 msvensson@neptunus.(none) +9 -0
    Test user with host ''

ChangeSet
  1.1616.2456.2 06/01/09 11:10:49 monty@mysql.com +1 -0
  After merge fix (Lines lost in manual merge)

  sql/sql_handler.cc
    1.53.1.12 06/01/09 11:10:45 monty@mysql.com +3 -0
    After merge fix (Lines lost in manual merge)

ChangeSet
  1.1981.20.1 06/01/09 10:01:07 msvensson@neptunus.(none) +3 -0
  Add yassl libs to libmysqlclient_r as well.
  Add a symlink to extra/yassl/include/openssl to inlude/ when compiling with yassl
  Similiar to readline)

  libmysql_r/Makefile.am
    1.23 06/01/09 10:00:58 msvensson@neptunus.(none) +2 -2
    Inlude yassl libs into libmysqlclient_r(just as we do in libmysqlclient)

  include/Makefile.am
    1.55 06/01/09 10:00:58 msvensson@neptunus.(none) +2 -1
    Call yassl_h_ln_cmd when linking sources, this will create symlink to openssl in include when compiling with yassl
     

  config/ac-macros/yassl.m4
    1.11 06/01/09 10:00:57 msvensson@neptunus.(none) +3 -1
    Symlink extra/yassl/include/openssl dir to include/

ChangeSet
  1.1981.19.1 06/01/09 01:09:42 pekka@mysql.com +1 -0
  ndb - wl#2972 ndb api test_event_merge 5.0+5.1

  ndb/test/ndbapi/test_event_merge.cpp
    1.3 06/01/09 01:07:22 pekka@mysql.com +877 -368
    5.0 passes. 5.1 has many problems

ChangeSet
  1.1616.2456.1 06/01/08 19:07:49 monty@mysql.com +5 -0
  Merge mysql.com:/home/my/mysql-4.0
  into  mysql.com:/home/my/mysql-4.1

  sql/sql_handler.cc
    1.53.1.11 06/01/08 19:07:47 monty@mysql.com +0 -8
    manual merge

  sql/item_cmpfunc.cc
    1.111.23.1 06/01/08 19:07:47 monty@mysql.com +0 -1
    merge (keep old code)

  sql/sql_select.cc
    1.216.120.1 06/01/08 19:01:20 monty@mysql.com +0 -0
    Auto merged

  myisam/myisam_ftdump.c
    1.37 06/01/08 19:01:20 monty@mysql.com +0 -1
    Auto merged

  client/mysqlimport.c
    1.49.2.3 06/01/08 19:01:20 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1981.15.13 06/01/07 23:10:08 igor@rurik.mysql.com +3 -0
  Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
  into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0

  sql/sql_select.cc
    1.379 06/01/07 23:10:03 igor@rurik.mysql.com +1 -2
    Manual merge.

  mysql-test/r/having.result
    1.18 06/01/07 23:10:03 igor@rurik.mysql.com +0 -0
    Manual merge.

  mysql-test/t/having.test
    1.17 06/01/07 23:04:52 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2455.2 06/01/07 23:00:06 igor@rurik.mysql.com +3 -0
  Fixed bug #14274: a query with a having clause containing only set function returned a wrong result set.

  sql/sql_select.cc
    1.216.1.229 06/01/07 22:59:56 igor@rurik.mysql.com +1 -1
    Fixed bug #14274: a query with a having clause containing only set function returned a wrong result set.
    It happened because processing of the set functions in having started with a call of the split_sum_func
    method, instead of the split_sum_func2 method. 

  mysql-test/t/having.test
    1.11.1.2 06/01/07 22:59:56 igor@rurik.mysql.com +12 -0
    Added a test case for bug #14274.

  mysql-test/r/having.result
    1.10.1.4 06/01/07 22:59:56 igor@rurik.mysql.com +13 -0
    Added a test case for bug #14274.

ChangeSet
  1.1981.18.1 06/01/08 07:42:40 knielsen@mysql.com +3 -0
  BUG#16282: Remove unused gcc.cpp linker input that causes failure in make -j.

  ndb/src/common/portlib/Makefile.am
    1.9 06/01/08 07:42:20 knielsen@mysql.com +0 -2
    BUG#16282: Remove unused gcc.cpp linker input that causes failure in make -j.

  ndb/config/common.mk.am
    1.7 06/01/08 07:42:20 knielsen@mysql.com +1 -1
    BUG#16282: Remove unused gcc.cpp linker input that causes failure in make -j.

  BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838
    1.4 06/01/08 06:55:05 knielsen@mysql.com +0 -0
    Delete: ndb/src/common/portlib/gcc.cpp

ChangeSet
  1.1981.15.12 06/01/06 22:28:26 igor@rurik.mysql.com +3 -0
  Fixed bug #16016: MIN/MAX optimization was not applied to views.

  sql/opt_sum.cc
    1.49 06/01/06 22:28:02 igor@rurik.mysql.com +5 -5
    Fixed bug #16016: MIN/MAX optimization was not applied to views.
    The fix employs the standard way of handling direct references to view fields.

  mysql-test/t/view.test
    1.132 06/01/06 22:28:02 igor@rurik.mysql.com +24 -0
    Added a test case for bug #16016.

  mysql-test/r/view.result
    1.143 06/01/06 22:28:02 igor@rurik.mysql.com +29 -0
    Added a test case for bug #16016.

ChangeSet
  1.1346.1.822 06/01/06 21:42:17 monty@mysql.com +5 -0
  Fixes during review of new pushed code:
  Remove wrong fix for Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Safety fix for bug #13855 "select distinct with group by caused server crash"

  sql/sql_select.cc
    1.152.1.143 06/01/06 21:42:13 monty@mysql.com +8 -1
    Safety fix for bug #13855 "select distinct with group by caused server crash"
    The previous patch only removed the symptomps, this fix removed the cause of the problem
    (Which was that not all hidden_fields was stored in the temporary table)

  sql/sql_handler.cc
    1.19.1.29 06/01/06 21:42:13 monty@mysql.com +12 -34
    Remove wrong fix for Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash.
    It's better to let mysql_lock_tables reopen the TABLE object in case of OPTIMIZE TABLE and fix items AFTER mysql_lock_table() instead of before

  sql/item_cmpfunc.cc
    1.20.1.45 06/01/06 21:42:13 monty@mysql.com +1 -1
    Removed compiler warning

  myisam/myisam_ftdump.c
    1.12.1.13 06/01/06 21:42:13 monty@mysql.com +1 -1
    Fixed compiler warning

  client/mysqlimport.c
    1.29.1.10 06/01/06 21:42:13 monty@mysql.com +0 -1
    Remove not used variable

ChangeSet
  1.1981.14.4 06/01/06 18:26:59 serg@serg.mylan +8 -0
  merged

  sql/sql_handler.cc
    1.78 06/01/06 18:26:46 serg@serg.mylan +1 -1
    ur

  sql/sql_parse.cc
    1.521 06/01/06 17:36:10 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_insert.cc
    1.183 06/01/06 17:36:10 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_acl.cc
    1.184.1.4 06/01/06 17:36:09 serg@serg.mylan +0 -0
    Auto merged

  sql/opt_range.cc
    1.203 06/01/06 17:36:09 serg@serg.mylan +0 -0
    Auto merged

  sql/log_event.cc
    1.201 06/01/06 17:36:08 serg@serg.mylan +0 -0
    Auto merged

  sql/item.cc
    1.203 06/01/06 17:36:08 serg@serg.mylan +0 -0
    Auto merged

  sql/field.cc
    1.295.1.2 06/01/06 17:36:07 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1981.15.11 06/01/06 08:34:55 jimw@mysql.com +4 -0
  Merge mysql.com:/home/jimw/my/mysql-5.0-14212
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  mysql-test/t/bdb.test
    1.51 06/01/06 08:34:51 jimw@mysql.com +9 -11
    Resolve conflict

  mysql-test/r/bdb.result
    1.49 06/01/06 08:34:51 jimw@mysql.com +5 -5
    Resolve conflict

  sql/handler.cc
    1.209 06/01/06 08:33:25 jimw@mysql.com +0 -0
    Auto merged

  sql/ha_ndbcluster.cc
    1.226 06/01/06 08:33:25 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1981.14.3 06/01/06 17:32:25 serg@serg.mylan +1 -0
  BSD make compatibility

  Docs/Makefile.am
    1.57 06/01/06 17:32:12 serg@serg.mylan +5 -5
    BSD make compatibility

ChangeSet
  1.1981.15.10 06/01/06 14:30:25 knielsen@mysql.com +1 -0
  Fix compile failure on QNX.

  sql/sp_head.cc
    1.193.1.12 06/01/06 14:30:05 knielsen@mysql.com +1 -1
    Fix compile failure on QNX.

ChangeSet
  1.1981.15.9 06/01/06 12:48:14 monty@mysql.com +2 -0
  After merge fix and a safety fix for handler

  sql/sql_trigger.cc
    1.40 06/01/06 12:48:09 monty@mysql.com +3 -2
    After merge fix

  sql/sql_handler.cc
    1.76.1.2 06/01/06 12:48:09 monty@mysql.com +7 -7
    Move lock tables before conditions as lock tables may reopen tables

ChangeSet
  1.1981.15.8 06/01/06 01:08:48 monty@mysql.com +23 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/my/mysql-5.0

  sql/sql_trigger.cc
    1.39 06/01/06 01:08:45 monty@mysql.com +1 -1
    Manual merge

  sql/sp_head.cc
    1.193.1.11 06/01/06 01:08:45 monty@mysql.com +10 -14
    Manual merge

  sql/mysqld.cc
    1.528 06/01/06 01:08:45 monty@mysql.com +0 -1
    Manual merge

  mysql-test/t/disabled.def
    1.18 06/01/06 01:08:45 monty@mysql.com +0 -0
    Manual merge

  sql/sql_select.cc
    1.378 06/01/06 00:49:24 monty@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.519.1.1 06/01/06 00:49:24 monty@mysql.com +0 -0
    Auto merged

  sql/sql_insert.cc
    1.181.1.1 06/01/06 00:49:24 monty@mysql.com +0 -0
    Auto merged

  sql/sql_base.cc
    1.323 06/01/06 00:49:24 monty@mysql.com +0 -0
    Auto merged

  sql/sql_acl.cc
    1.184.3.3 06/01/06 00:49:23 monty@mysql.com +0 -0
    Auto merged

  sql/sp_head.h
    1.73.1.7 06/01/06 00:49:23 monty@mysql.com +0 -0
    Auto merged

  sql/sp.cc
    1.103 06/01/06 00:49:23 monty@mysql.com +0 -0
    Auto merged

  sql/opt_range.cc
    1.201.1.1 06/01/06 00:49:23 monty@mysql.com +0 -0
    Auto merged

  sql/log_event.cc
    1.199.1.1 06/01/06 00:49:23 monty@mysql.com +0 -0
    Auto merged

  sql/item.h
    1.184 06/01/06 00:49:23 monty@mysql.com +0 -0
    Auto merged

  sql/item.cc
    1.201.1.1 06/01/06 00:49:23 monty@mysql.com +0 -0
    Auto merged

  sql/ha_ndbcluster.cc
    1.225 06/01/06 00:49:22 monty@mysql.com +0 -0
    Auto merged

  sql/field.cc
    1.295.2.1 06/01/06 00:49:22 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/view.test
    1.131 06/01/06 00:49:22 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/trigger.test
    1.32 06/01/06 00:49:22 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/create.test
    1.72 06/01/06 00:49:22 monty@mysql.com +0 -0
    Auto merged

  mysql-test/r/view.result
    1.142 06/01/06 00:49:22 monty@mysql.com +0 -0
    Auto merged

  mysql-test/r/trigger.result
    1.26 06/01/06 00:49:22 monty@mysql.com +0 -0
    Auto merged

  mysql-test/r/create.result
    1.110 06/01/06 00:49:22 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1960.67.2 06/01/06 00:47:49 monty@mysql.com +31 -0
  Review fixes of new pushed code
  - Fixed tests
  - Optimized new code
  - Fixed some unlikely core dumps
  - Better bug fixes for:
    - #14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
    - #14850 (ERROR 1062 when a quering a view using a Group By on a column that can be null

  sql/sql_trigger.cc
    1.35.1.1 06/01/06 00:47:41 monty@mysql.com +20 -12
    Move sql_modes_parameters outside of function
    Indentation fixes
    Fixed compiler warning
    Ensure that thd->lex->query_tables_own_last is set properly before calling check_table_access()
    (This allows us to remove the extra test in check_grant() and check_table_access())

  sql/sql_select.cc
    1.367.6.1 06/01/06 00:47:41 monty@mysql.com +1 -1
    Use group->field to check if value is null instead of item called by 'save_org_in_field'
    This is a better bug fix for #14850 (ERROR 1062 when a quering a view using a Group By on a column that can be null)

  sql/sql_parse.cc
    1.506.13.2 06/01/06 00:47:40 monty@mysql.com +4 -8
    Removed not needed test of 'tables' (first_not_own_table is the guard)
    Simplify code

  sql/sql_insert.cc
    1.178.1.1 06/01/06 00:47:40 monty@mysql.com +5 -1
    Mark fields that are set in CREATE ... SELECT as used
    (Removed wrong warnings about field not having a default value)

  sql/sql_handler.cc
    1.76.1.1 06/01/06 00:47:40 monty@mysql.com +7 -28
    Don't test table version in mysql_ha_read() as this is already tested in lock_tables()
    Moved call to insert_fields to be after lock_table() to guard aganst reopen of tables
    (Better fix for Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash)

  sql/sql_base.cc
    1.310.10.1 06/01/06 00:47:40 monty@mysql.com +0 -1
    Removed extra empty line

  sql/sql_acl.cc
    1.182.2.1 06/01/06 00:47:40 monty@mysql.com +1 -1
    Removed not needed test (first_not_own_table is the guard)

  sql/sp_head.h
    1.73.5.1 06/01/06 00:47:40 monty@mysql.com +2 -2
    Changed argument to set_definer() to const
    Added THD argument to recursion_level_error() to avoid call to current_thd

  sql/sp_head.cc
    1.193.16.1 06/01/06 00:47:40 monty@mysql.com +38 -30
    Indentation fixes
    Remove core dump when using --debug when m_next_cached_sp == 0
    Fixed compiler warnings
    Trivial optimizations
    

  sql/sp.cc
    1.96.4.1 06/01/06 00:47:40 monty@mysql.com +36 -34
    Simple cleanups
    - Removed not needed {} level
    - Ensure saved variables starts with old_

  sql/parse_file.cc
    1.18 06/01/06 00:47:40 monty@mysql.com +1 -1
    Fixed DBUG_PRINT

  sql/opt_range.cc
    1.198.2.1 06/01/06 00:47:40 monty@mysql.com +9 -5
    Moved code from declaration to function body
    (To make it more readable)

  sql/log_event.cc
    1.198.1.1 06/01/06 00:47:40 monty@mysql.com +54 -39
    Remove inline of slave_load_file_stem()
    Added 'extension' parameter to slave_load_file_stem() to get smaller code
    Removed not critical (or needed) DBUG_ASSERT()'s
    Cleaned up usage of slave_load_file_stem() to not depend on constant string lengths
    Indentation fixes
    

  sql/item.h
    1.175.9.1 06/01/06 00:47:40 monty@mysql.com +1 -5
    Moved save_org_in_field() to item.cc to make it easier to test

  sql/item.cc
    1.190.10.1 06/01/06 00:47:40 monty@mysql.com +6 -0
    Moved save_org_in_field() to item.cc to make it easier to test
    Remove setting of null_value as this is not needed

  sql/ha_ndbcluster.cc
    1.221.1.1 06/01/06 00:47:40 monty@mysql.com +13 -9
    Indentation cleanups and trival optimization

  sql/ha_federated.cc
    1.58 06/01/06 00:47:40 monty@mysql.com +1 -2
    my_snprintf -> strmake()
    (Simple optimization)

  sql/field.cc
    1.292.1.1 06/01/06 00:47:40 monty@mysql.com +2 -2
    Removed compiler warning

  mysql-test/t/view.test
    1.126.3.1 06/01/06 00:47:40 monty@mysql.com +1 -0
    Extra tests

  mysql-test/t/trigger.test
    1.30.1.1 06/01/06 00:47:40 monty@mysql.com +3 -6
    Reuse old procedure name

  mysql-test/t/mysqlshow.test
    1.4 06/01/06 00:47:40 monty@mysql.com +1 -1
    Drop tables used by previous test

  mysql-test/t/kill.test
    1.18 06/01/06 00:47:40 monty@mysql.com +10 -3
    Make test portable even if kill doesn't work at once

  mysql-test/t/handler.test
    1.26 06/01/06 00:47:39 monty@mysql.com +1 -1
    Drop used tables

  mysql-test/t/disabled.def
    1.14.1.1 06/01/06 00:47:39 monty@mysql.com +0 -1
    Enable 'kill' test (should now be portable)

  mysql-test/t/create.test
    1.68.1.1 06/01/06 00:47:39 monty@mysql.com +16 -0
    New tests to test fix of removing wrong warnings for CREATE ... SELECT

  mysql-test/r/view.result
    1.136.4.1 06/01/06 00:47:39 monty@mysql.com +3 -0
    Extra tests

  mysql-test/r/trigger.result
    1.24.1.1 06/01/06 00:47:39 monty@mysql.com +3 -4
    Reuse old procedure name

  mysql-test/r/mysqlshow.result
    1.3 06/01/06 00:47:39 monty@mysql.com +1 -1
    Drop tables used by previous test

  mysql-test/r/kill.result
    1.9 06/01/06 00:47:39 monty@mysql.com +0 -2
    Make test portable

  mysql-test/r/handler.result
    1.25 06/01/06 00:47:39 monty@mysql.com +1 -1
    Drop used tables

  mysql-test/r/create.result
    1.106.1.1 06/01/06 00:47:39 monty@mysql.com +27 -14
    Update results after removing wrong warnings for CREATE ... SELECT
    New tests

ChangeSet
  1.1981.15.7 06/01/05 23:41:10 knielsen@mysql.com +1 -0
  Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes
  into  mysql.com:/usr/local/mysql/mysql-5.0

  include/config-win.h
    1.73 06/01/05 23:41:05 knielsen@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1981.17.2 06/01/05 23:39:45 knielsen@mysql.com +1 -0
  Port to Win64/x64 in Visual Studio 2005

  include/config-win.h
    1.71.1.2 06/01/05 22:38:56 knielsen@mysql.com +5 -0
    Port to Win64/x64 in Visual Studio 2005.
    Avoid endless deprecation warnings.

  include/config-win.h
    1.71.1.1 06/01/05 22:13:44 knielsen@mysql.com +5 -0
    Port to Win64/x64 in Visual Studio 2005

ChangeSet
  1.1981.15.6 06/01/05 10:27:06 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-5.0-15185
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  sql/handler.cc
    1.208 06/01/05 10:27:02 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1981.16.2 06/01/04 21:39:39 konstantin@mysql.com +2 -0
  Post-merge fixes.

  sql/sql_base.cc
    1.322 06/01/04 21:39:33 konstantin@mysql.com +2 -1
    A post-merge fix.

  sql/sql_acl.cc
    1.184.3.2 06/01/04 21:39:33 konstantin@mysql.com +0 -1
    A post-merge fix.

ChangeSet
  1.1981.17.1 06/01/04 16:38:54 knielsen@mysql.com +2 -0
  EADDRINUSE is not defined on Windows.

  sql/mysqld.cc
    1.527 06/01/04 16:37:31 knielsen@mysql.com +1 -1
    EADDRINUSE is not defined on Windows.

  include/my_global.h
    1.115 06/01/04 16:37:31 knielsen@mysql.com +3 -0
    EADDRINUSE is not defined on Windows.

ChangeSet
  1.1981.13.3 06/01/04 16:02:41 knielsen@mysql.com +1 -0
  Fix QNX test abort in release builds and pushbuild, avoid killing our
  parent when we are not the process group leader.

  mysql-test/lib/mtr_process.pl
    1.25 06/01/04 16:02:02 knielsen@mysql.com +8 -1
    Fix QNX test abort in release builds and pushbuild, avoid killing our
    parent when we are not the process group leader.

ChangeSet
  1.1981.16.1 06/01/04 17:49:45 konstantin@mysql.com +6 -0
  Merge mysql.com:/opt/local/work/mysql-4.1-7209-new
  into  mysql.com:/opt/local/work/mysql-5.0-merge

  sql/sql_base.cc
    1.321 06/01/04 17:49:40 konstantin@mysql.com +3 -4
    Manual merge.

  sql/sql_acl.cc
    1.184.3.1 06/01/04 17:49:40 konstantin@mysql.com +5 -5
    Manual merge.

  sql/sql_cache.cc
    1.90 06/01/04 17:46:44 konstantin@mysql.com +0 -0
    Auto merged

  sql/lock.cc
    1.81 06/01/04 17:46:44 konstantin@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
    1.5 06/01/04 17:46:44 konstantin@mysql.com +0 -2
    Auto merged

  mysys/hash.c
    1.47 06/01/04 17:46:44 konstantin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.2455.1 06/01/04 17:35:30 konstantin@mysql.com +7 -0
  A fix for Bug#7209 "Client error with "Access Denied" on updates 
  when high concurrency": remove HASH::current_record and make it
  an external search parameter, so that it can not be the cause of a 
  race condition under high concurrent load.
  The bug was in a race condition in table_hash_search,
  when column_priv_hash.current_record was overwritten simultaneously
  by multiple threads, causing the search for a suitable grant record
  to fail.
  No test case as the bug is repeatable only under concurrent load.

  sql/sql_cache.cc
    1.46.12.11 06/01/04 17:35:18 konstantin@mysql.com +6 -4
    - adjust to a changed declaration of hash_replace

  sql/sql_base.cc
    1.145.1.116 06/01/04 17:35:17 konstantin@mysql.com +15 -7
    - adjust to changed declarations of hash_search, hash_nex

  sql/sql_acl.cc
    1.74.1.98 06/01/04 17:35:17 konstantin@mysql.com +5 -4
    - adjust to changed declarations of hash_search, hash_next

  sql/lock.cc
    1.42.1.22 06/01/04 17:35:17 konstantin@mysql.com +3 -2
    - adjust to changed declarations of hash_search, hash_next

  mysys/testhash.c
    1.8 06/01/04 17:35:17 konstantin@mysql.com +5 -4
    - adjust the test case to changed function declarations

  mysys/hash.c
    1.41.1.3 06/01/04 17:35:16 konstantin@mysql.com +35 -25
    - remove HASH::current_record
    - change declarations of functions that use HASH in read-only mode
      to accept const HASH * instead of HASH *. 
    - implement hash_search; move the old implementation of hash_search
    to hash_first

  include/hash.h
    1.17 06/01/04 17:35:16 konstantin@mysql.com +10 -4
    - remove current_record from HASH, instead modify hash_first,
    hash_next to accept HASH_SEARCH_STATE as an IN/OUT parameter

ChangeSet
  1.1981.15.2 06/01/04 15:25:32 knielsen@mysql.com +2 -0
  BUG#14931: Temporarily add synchronization to avoid sporadic test failures until
  the bug is fixed.

  mysql-test/t/rpl_sp.test
    1.10 06/01/04 15:23:45 knielsen@mysql.com +8 -0
    BUG#14931: Temporarily add synchronization to avoid sporadic failures until
    the bug is fixed.

  mysql-test/r/rpl_sp.result
    1.14 06/01/04 15:23:45 knielsen@mysql.com +3 -0
    BUG#14931: Temporarily add synchronization to avoid sporadic failures until
    the bug is fixed.

ChangeSet
  1.1974.6.3 06/01/04 11:41:43 jonas@perch.ndb.mysql.com +1 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/41-work
  into  perch.ndb.mysql.com:/home/jonas/src/50-work

  ndb/test/ndbapi/testDataBuffers.cpp
    1.15 06/01/04 11:41:40 jonas@perch.ndb.mysql.com +7 -8
    merge

ChangeSet
  1.1616.2452.2 06/01/04 11:38:58 jonas@perch.ndb.mysql.com +1 -0
  ndb - Make testDatabuffer clean up tables

  ndb/test/ndbapi/testDataBuffers.cpp
    1.12.1.1 06/01/04 11:38:56 jonas@perch.ndb.mysql.com +20 -7
    Make testDatabuffer clean up tables

ChangeSet
  1.1981.13.2 06/01/04 10:32:52 knielsen@mysql.com +1 -0
  Avoid double slash (//) in socket paths, breaks on QNX.

  mysql-test/mysql-test-run.pl
    1.56.1.7 06/01/04 10:32:23 knielsen@mysql.com +14 -8
    Avoid double slash (//) in socket paths, breaks on QNX.

ChangeSet
  1.1981.14.2 06/01/03 18:12:03 serg@serg.mylan +11 -0
  merged

  sql/item.cc
    1.202 06/01/03 18:11:52 serg@serg.mylan +1 -4
    merged

  sql/sql_show.cc
    1.304 06/01/03 18:04:34 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_parse.cc
    1.520 06/01/03 18:04:34 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_insert.cc
    1.182 06/01/03 18:04:33 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_db.cc
    1.122 06/01/03 18:04:33 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_acl.cc
    1.184.1.3 06/01/03 18:04:32 serg@serg.mylan +0 -0
    Auto merged

  sql/opt_range.cc
    1.202 06/01/03 18:04:32 serg@serg.mylan +0 -0
    Auto merged

  sql/item_func.cc
    1.271 06/01/03 18:04:31 serg@serg.mylan +0 -0
    Auto merged

  sql/field.h
    1.171 06/01/03 18:04:31 serg@serg.mylan +0 -0
    Auto merged

  sql/field.cc
    1.295.1.1 06/01/03 18:04:31 serg@serg.mylan +0 -0
    Auto merged

  myisam/mi_delete.c
    1.38 06/01/03 18:04:30 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1960.87.18 06/01/03 17:54:54 serg@serg.mylan +38 -0
  many warnings (practically safe but annoying) corrected

  sql/uniques.cc
    1.24 06/01/03 17:54:38 serg@serg.mylan +61 -61
    "return value ignored" warning
    endspaces deleted

  sql/table.cc
    1.214 06/01/03 17:54:38 serg@serg.mylan +4 -1
    memory leak

  sql/sql_test.cc
    1.44 06/01/03 17:54:38 serg@serg.mylan +1 -1
    "return value ignored" warning

  sql/sql_show.cc
    1.300.1.1 06/01/03 17:54:38 serg@serg.mylan +12 -11
    "return value ignored" and "NULL dereference"  warnings

  sql/sql_repl.cc
    1.147 06/01/03 17:54:37 serg@serg.mylan +9 -3
    "return value ignored" and memory leak warnings

  sql/sql_parse.cc
    1.506.17.2 06/01/03 17:54:37 serg@serg.mylan +9 -3
    "return value ignored" warning
    one more DBUG_ASSERT

  sql/sql_insert.cc
    1.179.2.1 06/01/03 17:54:37 serg@serg.mylan +2 -1
    "return value ignored" warning

  sql/sql_help.cc
    1.52 06/01/03 17:54:37 serg@serg.mylan +1 -1
    "NULL dereference" warning

  sql/sql_handler.cc
    1.77 06/01/03 17:54:37 serg@serg.mylan +3 -5
    "NULL dereference" warning

  sql/sql_db.cc
    1.120.1.1 06/01/03 17:54:37 serg@serg.mylan +58 -54
    "return value ignored" warning

  sql/sql_acl.cc
    1.184.2.1 06/01/03 17:54:36 serg@serg.mylan +2 -4
    deadcode and "NULL dereference" warnings

  sql/slave.h
    1.92 06/01/03 17:54:36 serg@serg.mylan +1 -1
    new prototype

  sql/slave.cc
    1.264 06/01/03 17:54:36 serg@serg.mylan +24 -14
    "return value ignored" warnings

  sql/set_var.cc
    1.146 06/01/03 17:54:36 serg@serg.mylan +0 -1
    "return value ignored" warning

  sql/repl_failsafe.cc
    1.60 06/01/03 17:54:36 serg@serg.mylan +2 -1
    "return value ignored" warning

  sql/opt_range.h
    1.58 06/01/03 17:54:36 serg@serg.mylan +1 -1
    "return value ignored" warning

  sql/opt_range.cc
    1.200.1.1 06/01/03 17:54:36 serg@serg.mylan +2 -5
    "double free" and uninitialized warnings

  sql/log_event.cc
    1.200 06/01/03 17:54:35 serg@serg.mylan +4 -0
    uninitialized warning

  sql/item_func.cc
    1.265.6.1 06/01/03 17:54:35 serg@serg.mylan +9 -4
    "return value ignored" warnings

  sql/item.cc
    1.190.9.1 06/01/03 17:54:35 serg@serg.mylan +4 -4
    "return value ignored" warnings
    changed constructor

  sql/ha_myisam.cc
    1.165 06/01/03 17:54:35 serg@serg.mylan +10 -7
    "return value ignored" warnings

  sql/field.h
    1.169.1.1 06/01/03 17:54:35 serg@serg.mylan +2 -2
    unused parameters removed from constructor

  sql/field.cc
    1.294.1.1 06/01/03 17:54:34 serg@serg.mylan +8 -14
    deadcode, "NULL dereference", "uninitialized" warnings

  sql-common/client.c
    1.82 06/01/03 17:54:34 serg@serg.mylan +1 -1
    "NULL dereference" warning

  server-tools/instance-manager/parse.cc
    1.10 06/01/03 17:54:34 serg@serg.mylan +1 -1
    "NULL dereference" warning

  mysys/my_error.c
    1.21 06/01/03 17:54:34 serg@serg.mylan +3 -0
    memory leak

  mysys/my_bitmap.c
    1.29 06/01/03 17:54:34 serg@serg.mylan +1 -1
    s/return/DBUG_RETURN/

  mysys/mf_iocache2.c
    1.26 06/01/03 17:54:34 serg@serg.mylan +5 -5
    "return value ignored" warnings

  mysys/default_modify.c
    1.11 06/01/03 17:54:34 serg@serg.mylan +1 -1
    "double free" warning

  myisam/sort.c
    1.50 06/01/03 17:54:34 serg@serg.mylan +3 -0
    "double free" warning

  myisam/myisampack.c
    1.52 06/01/03 17:54:34 serg@serg.mylan +1 -1
    "out-of-bound access" warning

  myisam/mi_delete.c
    1.36.1.1 06/01/03 17:54:33 serg@serg.mylan +2 -1
    "return value ignored" warning

  libmysql/libmysql.c
    1.231 06/01/03 17:54:33 serg@serg.mylan +1 -1
    "return value ignored" warning

  include/my_base.h
    1.75 06/01/03 17:54:33 serg@serg.mylan +2 -1
    cleanup

  cmd-line-utils/libedit/history.c
    1.9 06/01/03 17:54:33 serg@serg.mylan +2 -2
    memory leak

  client/mysqldump.c
    1.218 06/01/03 17:54:33 serg@serg.mylan +15 -12
    many "ignore return value" warnings, one "NULL dereference"

  client/mysqlbinlog.cc
    1.124 06/01/03 17:54:33 serg@serg.mylan +5 -4
    memory leak

  client/mysqladmin.cc
    1.114 06/01/03 17:54:33 serg@serg.mylan +1 -0
    don't use the handler after it's closed

ChangeSet
  1.1981.14.1 06/01/03 14:25:19 gluh@eagle.intranet.mysql.r18.ru +3 -0
  Fix for bug#15533 crash, information_schema, function, view
    enable view prepared mode during getting metedata for I_S table

  sql/sql_show.cc
    1.303 06/01/03 14:25:13 gluh@mysql.com +3 -0
    Fix for bug#15533 crash, information_schema, function, view
      enable view prepared mode during getting metedata for I_S table

  mysql-test/t/information_schema.test
    1.66 06/01/03 14:25:13 gluh@mysql.com +23 -0
    Fix for bug#15533 crash, information_schema, function, view
      test case

  mysql-test/r/information_schema.result
    1.93 06/01/03 14:25:13 gluh@mysql.com +16 -0
    Fix for bug#15533 crash, information_schema, function, view
      test case

ChangeSet
  1.1981.1.28 06/01/02 14:49:02 jonas@perch.ndb.mysql.com +4 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/50-work
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

  ndb/src/ndbapi/ndb_cluster_connection.cpp
    1.34 06/01/02 14:48:59 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/ndbapi/NdbRecAttr.cpp
    1.25 06/01/02 14:48:59 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

  ndb/src/ndbapi/NdbImpl.hpp
    1.14 06/01/02 14:48:59 jonas@perch.ndb.mysql.com +0 -1
    Auto merged

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.79 06/01/02 14:48:59 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1974.6.2 06/01/02 14:38:38 jonas@perch.ndb.mysql.com +3 -0
  bug#16125 - ndb bitfield of exact 32 bits, incorrect assertion (i.e. only noticable in debug compiled)

  ndb/include/util/Bitmask.hpp
    1.17 06/01/02 14:38:35 jonas@perch.ndb.mysql.com +2 -2
    bug#16125

  mysql-test/t/ndb_bitfield.test
    1.5 06/01/02 14:38:35 jonas@perch.ndb.mysql.com +8 -0
    bug#16125

  mysql-test/r/ndb_bitfield.result
    1.5 06/01/02 14:38:35 jonas@perch.ndb.mysql.com +6 -0
    bug#16125

ChangeSet
  1.1616.2450.7 05/12/31 10:54:36 pekka@mysql.com +1 -0
  ndb - wl#2972 (4.1) copy detached trigger fix from 5.0

  ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
    1.3.1.1 05/12/31 10:52:38 pekka@mysql.com +2 -0
    detached trigger fix from 5.0

ChangeSet
  1.1968.2.8 05/12/29 09:48:43 msvensson@neptunus.(none) +2 -0
  Improved error message for failing with wrong error

  mysql-test/r/mysqltest.result
    1.22 05/12/29 09:48:36 msvensson@neptunus.(none) +4 -4
    Update test results

  client/mysqltest.c
    1.190 05/12/29 09:48:36 msvensson@neptunus.(none) +5 -4
    Display the error message along with error number when query fails with wrong expected error.

ChangeSet
  1.1981.13.1 05/12/28 20:30:57 ingo@mysql.com +2 -0
  Bug#15591 Occasional test suite abort due to port in use
  If the server is started with --port-open-timeout=# 
  retry to bind the TCP port if it fails with EADDRINUSE.
  Use the new option in mysql-test-run.sh.

  sql/mysqld.cc
    1.526 05/12/28 20:30:52 ingo@mysql.com +32 -3
    Bug#15591 Occasional test suite abort due to port in use
    If the server is started with --port-open-timeout=# 
    retry to bind the TCP port if it fails with EADDRINUSE.

  mysql-test/mysql-test-run.sh
    1.283.1.2 05/12/28 20:30:52 ingo@mysql.com +3 -0
    Bug#15591 Occasional test suite abort due to port in use
    Use the new option --port-open-timeout=# for server starts.
    This should fix occasionally late closed TCP ports.

ChangeSet
  1.1981.12.1 05/12/28 18:35:22 kent@mysql.com +1 -0
  config-win.h:
    Backported Windows MAX_INDEXES handling from 5.1

  include/config-win.h
    1.72 05/12/28 18:31:26 kent@mysql.com +4 -0
    Backported Windows MAX_INDEXES handling from 5.1

