ChangeSet
  1.2470 06/04/29 01:28:04 kent@mysql.com +1 -0
  mysql.spec.sh:
    Backport of changes in 5.0 (bug#18294)

  support-files/mysql.spec.sh
    1.115 06/04/29 01:26:46 kent@mysql.com +57 -15
    Backport of changes in 5.0 (bug#18294)

ChangeSet
  1.2465.1.5 06/04/28 12:15:29 elliot@mysql.com +3 -0
  BUG#19145: mysqld crashes if you set the default value of an enum field to NULL
  
  Now test for NULLness the pointers returned from objects created from the
  default value. Pushing patch on behalf of cmiller.

  sql/sql_table.cc
    1.308 06/04/28 12:15:27 elliot@mysql.com +39 -10
    No longer blindly dereference pointer of the string representation of the
    values, where "NULL" is NUL. Raise INVALID DEFAULT error messages where
    appropriate.
    
    Note that the -O1 optimization flag made debugging this extremely tricky, with
    misleading results, and that removing it from the Makefile during debugging can
    be invaluable.

  mysql-test/t/null.test
    1.16 06/04/28 12:15:26 elliot@mysql.com +41 -0
    Add test case

  mysql-test/r/null.result
    1.27 06/04/28 12:15:26 elliot@mysql.com +42 -0
    Add test case

ChangeSet
  1.2465.2.2 06/04/28 11:23:31 gkodinov@lsmy3.wdf.sap.corp +6 -0
  BUG#18492: mysqld reports ER_ILLEGAL_REFERENCE in --ps-protocol
  
  In the code that converts IN predicates to EXISTS predicates it is changing
  the select list elements to constant 1. Example :
  SELECT ... FROM ...  WHERE a IN (SELECT c FROM ...)
  is transformed to :
  SELECT ... FROM ... WHERE EXISTS (SELECT 1 FROM ...  HAVING a = c)
  However there can be no FROM clause in the IN subquery and it may not be
  a simple select : SELECT ... FROM ... WHERE a IN (SELECT f(..) AS
  c UNION SELECT ...) This query is transformed to : SELECT ... FROM ...
  WHERE EXISTS (SELECT 1 FROM (SELECT f(..) AS c UNION SELECT ...)
  x HAVING a = c) In the above query c in the HAVING clause is made to be
  an Item_null_helper (a subclass of Item_ref) pointing to the real
  Item_field (which is not referenced anywhere else in the query anymore).
  This is done because Item_ref_null_helper collects information whether
  there are NULL values in the result.  This is OK for directly executed
  statements, because the Item_field pointed by the Item_null_helper is
  already fixed when the transformation is done.  But when executed as
  a prepared statement all the Item instances are "un-fixed" before the
  recompilation of the prepared statement. So when the Item_null_helper
  gets fixed it discovers that the Item_field it points to is not fixed
  and issues an error.  The remedy is to keep the original select list
  references when there are no tables in the FROM clause. So the above
  becomes : SELECT ... FROM ...  WHERE EXISTS (SELECT c FROM (SELECT f(..)
  AS c UNION SELECT ...) x HAVING a = c) In this way c is referenced
  directly in the select list as well as by reference in the HAVING
  clause. So it gets correctly fixed even with prepared statements.  And
  since the Item_null_helper subclass of Item_ref_null_helper is not used
  anywhere else it's taken out.

  sql/item_subselect.cc
    1.140 06/04/28 11:23:28 gkodinov@lsmy3.wdf.sap.corp +9 -7
    The described change to the IN->EXISTS transformation

  sql/item.h
    1.193 06/04/28 11:23:28 gkodinov@lsmy3.wdf.sap.corp +0 -13
    Taking out Item_null_helper as it's no longer needed

  sql/item.cc
    1.232 06/04/28 11:23:28 gkodinov@lsmy3.wdf.sap.corp +0 -8
    Taking out Item_null_helper as it's no longer needed

  mysql-test/t/ps_11bugs.test
    1.6 06/04/28 11:23:28 gkodinov@lsmy3.wdf.sap.corp +14 -0
    Testcase for the bug

  mysql-test/r/subselect.result
    1.175 06/04/28 11:23:28 gkodinov@lsmy3.wdf.sap.corp +1 -1
    Explain updated because of the tranformation

  mysql-test/r/ps_11bugs.result
    1.4 06/04/28 11:23:28 gkodinov@lsmy3.wdf.sap.corp +14 -0
    Test case for the bug

ChangeSet
  1.2465.2.1 06/04/27 07:51:56 paul@polar.kitebird.com +1 -0
  set_var.cc:
    System variable was added out of lexical order.

  sql/set_var.cc
    1.180 06/04/27 07:51:25 paul@polar.kitebird.com +1 -1
    System variable was added out of lexical order.

ChangeSet
  1.2463.1.1 06/04/26 10:10:31 serg@sergbook.mysql.com +1 -0
  merged ul

  sql/sql_parse.cc
    1.480 06/04/26 10:10:15 serg@sergbook.mysql.com +0 -1
    merged ul

ChangeSet
  1.2458.12.2 06/04/26 11:15:09 aivanov@mysql.com +2 -0
  Make innodb_mysql produce a non-empty output.

  mysql-test/t/innodb_mysql.test
    1.2 06/04/26 11:15:06 aivanov@mysql.com +4 -0
    Make innodb_mysql produce a non-empty output.

  mysql-test/r/innodb_mysql.result
    1.2 06/04/26 11:15:06 aivanov@mysql.com +1 -1
    Fix result.

ChangeSet
  1.2458.12.1 06/04/26 09:51:57 aivanov@mysql.com +3 -0
  Files innodb.[test|result] are to be used by Innobase only.
   Use files innodb_mysql.[test|result] instead.

  mysql-test/t/innodb_mysql.test
    1.1 06/04/26 09:51:53 aivanov@mysql.com +1 -0
    New BitKeeper file ``mysql-test/t/innodb_mysql.test''
     Use this file instead of innodb.test.
    

  mysql-test/r/innodb_mysql.result
    1.1 06/04/26 09:51:53 aivanov@mysql.com +1 -0
    New BitKeeper file ``mysql-test/r/innodb_mysql.result''
     Use this file instead of innodb.result.
    

  mysql-test/t/innodb_mysql.test
    1.0 06/04/26 09:51:53 aivanov@mysql.com +0 -0
    BitKeeper file /home/alexi/innodb/mysql-4.1-innodb-work/mysql-test/t/innodb_mysql.test

  mysql-test/t/innodb.test
    1.80 06/04/26 09:51:53 aivanov@mysql.com +13 -0
    This file is to be used by Innobase only.

  mysql-test/r/innodb_mysql.result
    1.0 06/04/26 09:51:53 aivanov@mysql.com +0 -0
    BitKeeper file /home/alexi/innodb/mysql-4.1-innodb-work/mysql-test/r/innodb_mysql.result

ChangeSet
  1.2463 06/04/25 17:12:06 serg@sergbook.mysql.com +1 -0
  after merge fix

  sql/sql_parse.cc
    1.479 06/04/25 17:11:28 serg@sergbook.mysql.com +3 -3
    after merge fix

ChangeSet
  1.1346.1.830 06/04/25 16:41:12 serg@sergbook.mysql.com +1 -0
  small optimization of the previous bugfix
  (based on the fact that packet is ALWAYS \0 terminated, see my_net_read)

  sql/sql_parse.cc
    1.218.44.8 06/04/25 16:41:10 serg@sergbook.mysql.com +1 -1
    small optimization of the previous bugfix
    (based on the fact that packet is ALWAYS \0 terminated, see my_net_read)

ChangeSet
  1.2462 06/04/25 14:06:04 serg@sergbook.mysql.com +1 -0
  merged

  sql/sql_parse.cc
    1.478 06/04/25 14:06:00 serg@sergbook.mysql.com +18 -16
    merged

ChangeSet
  1.1346.1.829 06/04/25 13:37:33 serg@sergbook.mysql.com +1 -0
  buffer overflow and information exposure bugs fixed
  (reported by Stefano Di Paola)

  sql/sql_parse.cc
    1.218.44.7 06/04/25 13:37:30 serg@sergbook.mysql.com +15 -0
    buffer overflow and information exposure bugs fixed
    (reported by Stefano Di Paola)

ChangeSet
  1.2453.39.3 06/04/25 16:01:08 jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#18597
    Handle early abort of scan, so that resources are correctly freed

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.65 06/04/25 16:01:06 jonas@perch.ndb.mysql.com +25 -12
    Handle early abort so that require on running.empty() does not fire

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp
    1.24 06/04/25 16:01:06 jonas@perch.ndb.mysql.com +3 -2
    Handle early abort

ChangeSet
  1.2461 06/04/24 15:34:01 knielsen@mysql.com +1 -0
  Fix typo in mysql-test-run.pl (not caught by aotupush since it uses mysql-test-run.sh).

  mysql-test/mysql-test-run.pl
    1.64 06/04/24 15:33:44 knielsen@mysql.com +1 -1
    Fix typo.

ChangeSet
  1.2458.11.1 06/04/23 19:26:56 paul@polar.kitebird.com +1 -0
  myisam_ftdump.c:
    myisam_ftdump options: --help first, then rest in
    lexical order.

  myisam/myisam_ftdump.c
    1.38 06/04/23 19:25:28 paul@polar.kitebird.com +7 -7
    myisam_ftdump options: --help first, then rest in
    lexical order.

ChangeSet
  1.2458.1.12 06/04/23 19:42:26 aelkin@mysql.com +1 -0
  Bug#17263: incorrect DROP query in temporary tables replication
  accounting non-ai32 in tmpkeyval. This changeset is supposed to be specifically for 4.1.
  Another changeset is going to push into 5. 

  sql/sql_base.cc
    1.267 06/04/23 19:42:21 aelkin@mysql.com +3 -4
    correction due to uint4korr definition: can not sizeof on not ia32.

ChangeSet
  1.2458.1.11 06/04/23 11:55:08 aelkin@mysql.com +3 -0
  Bug#17263 temporary tables and replication
    Backporting a changeset made for 5.0. Comments from there:
  
    The fix refines the algorithm of generating DROPs for binlog.
    Temp tables with common pseudo_thread_id are clustered into one query.
    Consequently one replication event per pseudo_thread_id is generated.
  
  

  sql/sql_base.cc
    1.266 06/04/23 11:55:04 aelkin@mysql.com +121 -40
    change in drop temprorary tables alg in close_temporary_tables.
    
    

  mysql-test/t/rpl_temporary.test
    1.15 06/04/23 11:55:04 aelkin@mysql.com +27 -1
    test to generate problematic drop in binlog to feed it to restarting slave
    to see no stop.

  mysql-test/r/rpl_temporary.result
    1.13 06/04/23 11:55:04 aelkin@mysql.com +14 -0
    results changed

ChangeSet
  1.2453.20.2 06/04/21 11:48:00 ramil@mysql.com +1 -0
  Bug #17896: MIN of CASE WHEN returns non-minimum value!
  - after review fixes

  sql/item_cmpfunc.cc
    1.207 06/04/21 11:47:53 ramil@mysql.com +5 -1
    Bug #17896: MIN of CASE WHEN returns non-minimum value!
    - after review fixes.

ChangeSet
  1.2458.9.1 06/04/20 22:15:38 igor@rurik.mysql.com +7 -0
  Fixed bug #18767.
  The bug caused wrong result sets for union constructs of the form
  (SELECT ... ORDER BY order_list1 [LIMIT n]) ORDER BY order_list2.
  For such queries order lists were concatenated and limit clause was
  completely neglected. 

  sql/sql_yacc.yy
    1.398 06/04/20 22:15:34 igor@rurik.mysql.com +21 -3
    Fixed bug #18767.
    Changed the condition at which a SELECT is treated as part of a UNION.
    The SELECT in 
    (SELECT ... ORDER BY order_list1 [LIMIT n]) ORDER BY order_list2 
    now is handled in the same way as the first SELECT in a UNION
    sequence. In the same way is handled the SELECT in
    (SELECT ... LIMIT n) ORDER BY order list.
    Yet if there is neither ORDER BY nor LIMIT in the single-select
    union construct
    (SELECT ...) ORDER BY order_list
    then it is still handled as simple select with an order clause.

  sql/sql_union.cc
    1.145 06/04/20 22:15:34 igor@rurik.mysql.com +1 -1
    Fixed bug #18767.
    Changed the condition at which a SELECT is treated as part of a UNION.
    The SELECT in 
    (SELECT ... ORDER BY order_list1 [LIMIT n]) ORDER BY order_list2 
    now is handled in the same way as the first SELECT in a UNION
    sequence.

  sql/sql_select.cc
    1.452 06/04/20 22:15:34 igor@rurik.mysql.com +1 -1
    Fixed bug #18767.
    Changed the condition on which a SELECT is treated as part of a UNION.
    The SELECT in 
    (SELECT ... ORDER BY order_list1 [LIMIT n]) ORDER BY order_list2 
    now is handled in the same way as the first SELECT in a UNION
    sequence.  

  sql/sql_parse.cc
    1.477 06/04/20 22:15:34 igor@rurik.mysql.com +57 -17
    Fixed bug #18767.
    Placed the code the created a fake SELECT_LEX into a separate function.

  sql/sql_lex.h
    1.188 06/04/20 22:15:34 igor@rurik.mysql.com +1 -0
    Fixed bug #18767.
    Placed the code the created a fake SELECT_LEX into a separate function.  

  mysql-test/t/order_by.test
    1.34 06/04/20 22:15:34 igor@rurik.mysql.com +14 -0
    Added a test case for bug #18767.

  mysql-test/r/order_by.result
    1.47 06/04/20 22:15:34 igor@rurik.mysql.com +32 -0
    Added a test case for bug #18767.

ChangeSet
  1.2453.42.1 06/04/20 23:09:49 aivanov@mysql.com +6 -0
  Applied innodb-4.1-ss22 snapshot.
   Fix BUG#16814: "SHOW INNODB STATUS format error in LATEST FOREIGN KEY ERROR section"
       Add a missing newline to the LAST FOREIGN KEY ERROR section in SHOW INNODB STATUS
       output.
   Fix BUG#18934: "InnoDB crashes when table uses column names like DB_ROW_ID".
       Refuse tables that use reserved column names.

  innobase/row/row0mysql.c
    1.94 06/04/20 23:09:46 aivanov@mysql.com +14 -0
    Applied innodb-4.1-ss22 snapshot.
     Refuse tables that use reserved column names (Bug#18934).

  innobase/include/univ.i
    1.39 06/04/20 23:09:46 aivanov@mysql.com +3 -0
    Applied innodb-4.1-ss22 snapshot.

  innobase/include/dict0mem.h
    1.23 06/04/20 23:09:46 aivanov@mysql.com +7 -0
    Applied innodb-4.1-ss22 snapshot.
     Refuse tables that use reserved column names (Bug#18934).

  innobase/include/dict0dict.h
    1.34 06/04/20 23:09:46 aivanov@mysql.com +9 -0
    Applied innodb-4.1-ss22 snapshot.
     Refuse tables that use reserved column names (Bug#18934).

  innobase/dict/dict0mem.c
    1.16 06/04/20 23:09:46 aivanov@mysql.com +15 -0
    Applied innodb-4.1-ss22 snapshot.
     Refuse tables that use reserved column names (Bug#18934).

  innobase/dict/dict0dict.c
    1.67 06/04/20 23:09:46 aivanov@mysql.com +34 -1
    Applied innodb-4.1-ss22 snapshot.
     dict_foreign_error_report(): Always print a newline after invoking
      dict_print_info_on_foreign_key_in_create_format() (Bug#16814).
     Refuse tables that use reserved column names (Bug#18934).

ChangeSet
  1.2458.4.4 06/04/20 12:35:33 evgen@moonbone.local +1 -0
  func_gconcat.test:
    Clean up test case for bug#14169

  mysql-test/t/func_gconcat.test
    1.37 06/04/20 12:34:12 evgen@moonbone.local +0 -1
    Clean up test case for bug#14169

ChangeSet
  1.2458.4.3 06/04/19 16:08:37 igor@rurik.mysql.com +2 -0
  Temporarily commented out a query from the test case for bug 14169 to make it pass with --ps-protocol.

  mysql-test/t/func_gconcat.test
    1.36 06/04/19 16:08:33 igor@rurik.mysql.com +3 -1
    Temporarily commented out a query from the test case for bug 14169 to make it pass with --ps-protocol.

  mysql-test/r/func_gconcat.result
    1.46 06/04/19 16:08:32 igor@rurik.mysql.com +1 -0
    Added DROP TABLE command to the test case for bug 14169.

ChangeSet
  1.2458.8.1 06/04/20 00:27:43 evgen@moonbone.local +1 -0
  func_gconcat.result:
    Corrected test case for the bug#14169 to make it pass in --ps-protocol mode.

  mysql-test/r/func_gconcat.result
    1.45 06/04/20 00:26:29 evgen@moonbone.local +0 -7
    Corrected test case for the bug#14169 to make it pass in --ps-protocol mode.

ChangeSet
  1.2458.7.1 06/04/19 20:26:40 msvensson@neptunus.(none) +1 -0
  Bug#18818 configure: No longer finds OpenSSL on Mac OS X
   - Eval shrext_cmds variable before using it

  acinclude.m4
    1.141 06/04/19 20:26:36 msvensson@neptunus.(none) +5 -3
    eval the shrext_cmds variable before using it. This is the same fix as in ltmain.sh which has a comment describing how this works on Darwin.
    The bug describes it as not working for openSSL but as the same syntax and variable is used for zlib it has to be fixed there as well.

ChangeSet
  1.2458.6.1 06/04/19 22:54:25 svoj@april.(none) +1 -0
  Bug#18544 - LOCK TABLES timeout causes MyISAM table corruption
  
  After a locking error the open table(s) were not fully
  cleaned up for reuse. But they were put into the open table
  cache even before the lock was tried. The next statement
  reused the table(s) with a wrong lock type set up. This
  tricked MyISAM into believing that it don't need to update
  the table statistics. Hence CHECK TABLE reported a mismatch
  of record count and table size.
  
  Fortunately nothing worse has been detected yet. The effect
  of the test case was that the insert worked on a read locked
  table. (!)
  
  I added a new function that clears the lock type from all
  tables that were prepared for a lock. I call this function
  when a lock failes.
  
  No test case. One test would add 50 seconds to the
  test suite. Another test requires file mode modifications.
  I added a test script to the bug report. It contains three
  cases for failing locks. All could reproduce a table
  corruption. All are fixed by this patch.
  
  This bug was not lock timeout specific.

  sql/lock.cc
    1.67 06/04/19 22:54:22 svoj@april.(none) +53 -1
    Bug#18544 - LOCK TABLES timeout causes MyISAM table corruption
    Resetting the lock type in the open table(s) lock data
    after a locking error.

ChangeSet
  1.2458.5.1 06/04/19 15:41:56 kent@mysql.com +1 -0
  Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new

  configure.in
    1.406 06/04/19 15:41:49 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2458.4.1 06/04/18 20:57:31 igor@rurik.mysql.com +3 -0
  Fixed bug #19079.
  The bug caused a reported index corruption in the cases when
  key_cache_block_size was not a multiple of myisam_block_size,
  e.g. when key_cache_block_size=1536 while myisam_block_size=1024.

  mysys/mf_keycache.c
    1.53 06/04/18 20:57:27 igor@rurik.mysql.com +7 -5
    Fixed bug #19079.
    The bug caused a reported index corruption in the cases when
    key_cache_block_size was not a multiple of myisam_block_size,
    e.g. when key_cache_block_size=1536 while myisam_block_size=1024.

  mysql-test/t/key_cache.test
    1.17 06/04/18 20:57:27 igor@rurik.mysql.com +40 -1
    Added a test case for bug #19079.

  mysql-test/r/key_cache.result
    1.15 06/04/18 20:57:27 igor@rurik.mysql.com +42 -0
    Added a test case for bug #19079.

ChangeSet
  1.2453.39.2 06/04/18 14:34:11 jonas@perch.ndb.mysql.com +3 -0
  ndb -
    fix api_signal_log print of uncond signals

  ndb/src/ndbapi/TransporterFacade.hpp
    1.21 06/04/18 14:34:09 jonas@perch.ndb.mysql.com +2 -1
    Fix printout of uncond signals

  ndb/src/ndbapi/TransporterFacade.cpp
    1.35 06/04/18 14:34:09 jonas@perch.ndb.mysql.com +4 -3
    Fix printout of uncond signals

  ndb/src/ndbapi/Ndbif.cpp
    1.28 06/04/18 14:34:09 jonas@perch.ndb.mysql.com +2 -2
    Send TC_COMMIT_ACK uncond

ChangeSet
  1.2458.1.5 06/04/18 17:22:25 stewart@mysql.com +1 -0
  Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug18843
  into  mysql.com:/home/stewart/Documents/MySQL/4.1/merge

  ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
    1.8 06/04/18 17:22:22 stewart@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2453.38.2 06/04/13 20:42:48 mleich@mysql.com +6 -0
  Fixes for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs related to
  MySQL 4.1
    and Bug#16920 rpl_deadlock_innodb fails in show slave status (reported for MySQL 5.1)
    - backport of several fixes done in MySQL 5.0 to 4.1
    - fix for new discovered instability (see comment on Bug#12429 + Bug#16920)
    - reenabling of testcases

  mysql-test/t/rpl_until.test
    1.18 06/04/13 20:42:43 mleich@mysql.com +4 -0
    Add wait_for_slave_to_stop like in the current MySQL 5.0 version of this test.
    I assume this makes the test results more predictable.

  mysql-test/t/rpl_relayrotate.test
    1.13 06/04/13 20:42:43 mleich@mysql.com +3 -5
    - Replace select ... with select max(a)
    - add sync_with_master (backport fix done by Kristian in MySQL 5.0 because of timing
      problems similar to Bug#15624)

  mysql-test/t/rpl_deadlock.test
    1.6 06/04/13 20:42:43 mleich@mysql.com +11 -5
    - replace sleep with real_sleep (backport fix for Bug#15624 MySQL 5.0)
    - egalized value for Slave_IO_Running 
    - line 105 (backport fix for Bug#12429 MySQL 5.0)
    - line 85 (see comment in Bug#12429 
               + Bug#16920 rpl_deadlock_innodb fails in show slave status)
    - improve readability of show slave status output (--vertical_results)

  mysql-test/t/disabled.def
    1.3 06/04/13 20:42:43 mleich@mysql.com +0 -3
    Reenabling of tests

  mysql-test/r/rpl_relayrotate.result
    1.8 06/04/13 20:42:43 mleich@mysql.com +2 -5
    Updated results

  mysql-test/r/rpl_deadlock.result
    1.4 06/04/13 20:42:43 mleich@mysql.com +99 -6
    Updated results

ChangeSet
  1.2453.41.1 06/04/13 16:19:21 ramil@mysql.com +3 -0
  Fix for bug #18643: crazy UNCOMPRESS().

  sql/item_strfunc.cc
    1.240 06/04/13 16:19:16 ramil@mysql.com +1 -0
    Fix for bug #18643: crazy UNCOMPRESS().
      - set null_value.

  mysql-test/t/func_compress.test
    1.12 06/04/13 16:19:16 ramil@mysql.com +9 -0
    Fix for bug #18643: crazy UNCOMPRESS().
      - test-case

  mysql-test/r/func_compress.result
    1.16 06/04/13 16:19:16 ramil@mysql.com +7 -0
    Fix for bug #18643: crazy UNCOMPRESS().
      - test-case

ChangeSet
  1.2458.3.1 06/04/13 14:06:46 konstantin@mysql.com +1 -0
  Fix a typo in the help message.

  sql/mysqld.cc
    1.611 06/04/13 14:06:37 konstantin@mysql.com +1 -1
    Fix a typo.

ChangeSet
  1.2453.40.1 06/04/13 14:37:03 svoj@april.(none) +1 -0
  BUG#17917 - SELECT from compressed MyISAM table crashes MySQL server
  
  Retrieving data from compressed MyISAM table which is bigger than 4G on 32-bit box
  with mmap() support results in server crash.
  
  mmap() accepts length of bytes to be mapped in second param, which is 32-bit
  size_t. But we pass data_file_length, which is 64-bit my_off_t. As a result only
  first data_file_length % 4G were mapped.
  
  This fix adds additional condition for mmap() usage, that is use mmap() for
  compressed table which size is no more than 4G on 32-bit platform.

  myisam/mi_packrec.c
    1.28 06/04/13 14:37:00 svoj@april.(none) +10 -4
    Use mmap() for compressed table which size is no more than 4G on 32-bit platform.

ChangeSet
  1.2458.1.1 06/04/13 10:55:48 bar@mysql.com +4 -0
  Bug#18691: Converting number to UNICODE string returns invalid result.
  
  Conversion from int and real numbers to UCS2 didn't work fine: 
  CONVERT(100, CHAR(50) UNICODE)
  CONVERT(103.9, CHAR(50) UNICODE)
  
  The problem appeared because numbers have binary charset, so,
  simple charset recast binary->ucs2 was performed
  instead of real conversion.
  
  Fixed to make numbers pretend to be non-binary.

  sql/item_timefunc.h
    1.56 06/04/13 10:55:41 bar@mysql.com +1 -1
    Adding new member from_cs, to replace my_charset_bin
    to a non-binary charset when converting from numbers to UCS2

  sql/item_timefunc.cc
    1.98 06/04/13 10:55:41 bar@mysql.com +23 -5
    Adding new member from_cs, to replace my_charset_bin
    to a non-binary charset when converting from numbers to UCS2

  mysql-test/t/ctype_ucs.test
    1.29 06/04/13 10:55:41 bar@mysql.com +8 -0
    Adding test case

  mysql-test/r/ctype_ucs.result
    1.29 06/04/13 10:55:41 bar@mysql.com +12 -0
    Adding test case

ChangeSet
  1.2453.34.7 06/04/12 23:05:38 evgen@moonbone.local +6 -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.

  sql/item_func.cc
    1.259 06/04/12 23:02:02 evgen@moonbone.local +1 -1
    Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was used
    In the Item_func::tmp_table_field() function the unnamed constant 255 is changed to the CONVERT_IF_BIGGER_TO_BLOB constant.
    The Item_func::tmp_table_field() function now measures the result length in chars rather than bytes when converting string result to a blob.

  sql/item_sum.h
    1.83 06/04/12 23:00:06 evgen@moonbone.local +7 -0
    Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was used
    To the Item_func_group_concat calls added the member function field_type() which returns the BLOB or VAR_STRING type based on the items length.

  sql/sql_select.cc
    1.451 06/04/12 22:54:11 evgen@moonbone.local +4 -2
    Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was used
    The unnamed constant 255 in the create_tmp_field() and create_tmp_field_from_item() functions now defined as the CONVERT_IF_BIGGER_TO_BLOB constant.
    The create_tmp_field() function now converts the Item_sum string result to a blob field based on its char length.

  sql/unireg.h
    1.35 06/04/12 22:47:53 evgen@moonbone.local +1 -0
    Added the CONVERT_IF_BIGGER_TO_BLOB constant

  mysql-test/r/func_gconcat.result
    1.44 06/04/12 22:46:59 evgen@moonbone.local +16 -0
    Added test case for bug#14169: type of group_concat() result changed to blob if tmp_table was used

  mysql-test/t/func_gconcat.test
    1.35 06/04/12 22:46:32 evgen@moonbone.local +10 -0
    Added test case for bug#14169: type of group_concat() result changed to blob if tmp_table was used

ChangeSet
  1.2459 06/04/12 14:32:34 knielsen@mysql.com +1 -0
  Fix broken --valgrind-options option.

  mysql-test/mysql-test-run.pl
    1.63 06/04/12 14:32:15 knielsen@mysql.com +1 -1
    Fix broken --valgrind-options option.

ChangeSet
  1.2453.34.6 06/04/11 14:49:33 bell@sanja.is.com.ua +2 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.1

  configure.in
    1.404.1.1 06/04/11 14:49:29 bell@sanja.is.com.ua +0 -0
    Auto merged

  acinclude.m4
    1.140 06/04/11 14:49:29 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.2453.34.5 06/04/11 15:26:18 ramil@mysql.com +1 -0
  after merge fix.

  mysql-test/t/func_op.test
    1.8 06/04/11 15:25:24 ramil@mysql.com +2 -0
    after merge fix.

ChangeSet
  1.2453.34.4 06/04/11 13:53:44 ramil@mysql.com +3 -0
  Merge mysql.com:/usr/home/ram/work/mysql-4.0
  into  mysql.com:/usr/home/ram/work/mysql-4.1

  mysql-test/t/func_op.test
    1.7 06/04/11 13:53:30 ramil@mysql.com +0 -0
    SCCS merged

  sql/item_func.cc
    1.258 06/04/11 13:51:22 ramil@mysql.com +0 -0
    Auto merged

  mysql-test/r/func_op.result
    1.9 06/04/11 13:51:21 ramil@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.871.2 06/04/10 21:57:29 bell@sanja.is.com.ua +1 -0
  Avoid trying to include <asm/atomic.h> when it doesn't work in C++
  code. (Bug #13621)

  configure.in
    1.191.1.143 06/04/10 21:57:28 bell@sanja.is.com.ua +5 -0
    Test whether atomic_add() and atomic_sub() are available in C++
    code, since that is primarily where we will be using them.

ChangeSet
  1.2453.39.1 06/04/10 13:45:33 jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#17607
    fix correct frag count in Backup block

  ndb/src/kernel/blocks/backup/BackupInit.cpp
    1.12 06/04/10 13:45:31 jonas@perch.ndb.mysql.com +4 -5
    Fix correct no of fragment records

ChangeSet
  1.2453.38.1 06/04/08 22:27:43 knielsen@mysql.com +1 -0
  $MYSQL_TEST was broken with --valgrind.

  mysql-test/mysql-test-run.pl
    1.62 06/04/08 22:27:27 knielsen@mysql.com +11 -5
    $MYSQL_TEST was broken with --valgrind.

ChangeSet
  1.1346.871.1 06/04/08 23:19:52 bell@sanja.is.com.ua +1 -0
  Check tinfo library presence and use it. (BUG#18912)

  acinclude.m4
    1.77.1.25 06/04/08 23:19:51 bell@sanja.is.com.ua +4 -1
    Check tinfo library presence and use it.

ChangeSet
  1.2453.35.6 06/04/07 23:50:45 konstantin@mysql.com +4 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/opt/local/work/mysql-4.1-16365

  mysql-test/t/ps.test
    1.50 06/04/07 23:50:37 konstantin@mysql.com +18 -18
    Manual merge

  mysql-test/r/ps.result
    1.49 06/04/07 23:50:37 konstantin@mysql.com +20 -20
    Manual merge

  sql/sql_class.h
    1.285 06/04/07 23:48:18 konstantin@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.375 06/04/07 23:48:18 konstantin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2453.37.1 06/04/07 23:37:06 konstantin@mysql.com +9 -0
  A fix and a test case for Bug#16365 "Prepared Statements: DoS with 
  too many open statements". The patch adds a new global variable
  @@max_prepared_stmt_count. This variable limits the total number
  of prepared statements in the server. The default value of
  @@max_prepared_stmt_count is 16382. 16382 small statements
  (a select against 3 tables with GROUP, ORDER and LIMIT) consume 
  100MB of RAM. Once this limit has been reached, the server will 
  refuse to prepare a new statement and return ER_UNKNOWN_ERROR 
  (unfortunately, we can't add new errors to 4.1 without breaking 5.0). The limit is changeable after startup
  and can accept any value from 0 to 1 million. In case
  the new value of the limit is less than the current
  statement count, no new statements can be added, while the old
  still can be used. Additionally, the current count of prepared 
  statements is now available through a global read-only variable 
  @@prepared_stmt_count.

  sql/sql_prepare.cc
    1.156 06/04/07 23:36:57 konstantin@mysql.com +5 -3
    Statement_map::insert will now send a message in case of an
    error.

  sql/sql_class.h
    1.283.1.1 06/04/07 23:36:57 konstantin@mysql.com +5 -23
    Add accounting of the total number of prepared statements in the
    server to the methods of Statement_map.

  sql/sql_class.cc
    1.205 06/04/07 23:36:57 konstantin@mysql.com +110 -9
    Add accounting of the total number of prepared statements in the
    server to the methods of Statement_map.

  sql/set_var.h
    1.60 06/04/07 23:36:57 konstantin@mysql.com +41 -18
    New declarations to add support for @@max_prepared_stmt_count.
    Implement a new class, where the lock to be used when updating
    a variable is a parameter.

  sql/set_var.cc
    1.179 06/04/07 23:36:57 konstantin@mysql.com +37 -5
    Implement support for @@prepared_stmt_count and 
    @@max_prepared_stmt_count. Currently these variables are queried
    without acquiring LOCK_prepared_stmt_count due to limitations of
    the set_var/sys_var class design. Updates are, however, protected 
    with a lock.

  sql/mysqld.cc
    1.610 06/04/07 23:36:56 konstantin@mysql.com +32 -1
    Add definitions of max_prepared_stmt_count, prepared_stmt_count.

  sql/mysql_priv.h
    1.373.1.1 06/04/07 23:36:56 konstantin@mysql.com +3 -1
    Add declarations for new global variables.

  mysql-test/t/ps.test
    1.48.1.1 06/04/07 23:36:56 konstantin@mysql.com +123 -0
    A test case for Bug#16365 "Prepared Statements: DoS with too many 
    open statements". Also fix statement leaks in other tests.

  mysql-test/r/ps.result
    1.47.1.1 06/04/07 23:36:56 konstantin@mysql.com +108 -0
    Test results fixed (a test case for Bug#16365)

ChangeSet
  1.2453.36.1 06/04/07 22:26:25 konstantin@mysql.com +4 -0
  A fix and a test case for Bug#16248 "WHERE (col1,col2) IN ((?,?)) 
  gives wrong results". Implement previously missing 
  Item_row::cleanup. The bug is not repeatable in 5.0, probably 
  due to a coincidence: the problem is present in 5.0 as well.

  sql/item_row.h
    1.17 06/04/07 22:26:15 konstantin@mysql.com +1 -2
    Remove a never used member 'array_holder'. Add declaration for
    Item_row::cleanup.

  sql/item_row.cc
    1.29 06/04/07 22:26:15 konstantin@mysql.com +15 -1
    Implement Item_row::cleanup(): we should reset used_tables_cache
    before reexecution of a prepared statement. In case ROW
    arguments contain a placeholder, used_tables_cache has PARAM_TABLE
    bit set in statement prepare. As a result, when executing a statement,
    the condition push down algorithm (make_cond_for_table) would think
    that the WHERE clause belongs to the non-existent PARAM_TABLE and
    wouldn't attach the WHERE clause to any of the real tables, 
    effectively optimizing the clause away.

  mysql-test/t/ps.test
    1.49 06/04/07 22:26:15 konstantin@mysql.com +18 -0
    Add a test case for Bug#16248 "WHERE (col1,col2) IN ((?,?)) gives 
    wrong results"

  mysql-test/r/ps.result
    1.48 06/04/07 22:26:15 konstantin@mysql.com +20 -0
    Update the result file (Bug#16248)

ChangeSet
  1.2453.35.4 06/04/07 19:42:46 joerg@mysql.com +1 -0
  Manual merge.

  mysql-test/mysql-test-run.sh
    1.264 06/04/07 19:42:42 joerg@mysql.com +2 -2
    Manual merge.

ChangeSet
  1.1346.868.9 06/04/07 19:27:19 joerg@mysql.com +1 -0
  mysql-test/mysql-test-run.sh  :  Provide info about the options used.

  mysql-test/mysql-test-run.sh
    1.146.1.59 06/04/07 19:27:16 joerg@mysql.com +2 -0
    Provide info about the options used for this run to any evaluation tool.

ChangeSet
  1.2453.35.3 06/04/07 13:34:39 joerg@mysql.com +1 -0
  mysql-test/mysql-test-run.pl  :   Add option "with-ndbcluster-only" (ignored).

  mysql-test/mysql-test-run.pl
    1.61 06/04/07 13:34:35 joerg@mysql.com +8 -0
    Add option "with-ndbcluster-only" (ignored) for compatibility with newer "Do-compile".

ChangeSet
  1.2453.35.2 06/04/07 13:02:15 joerg@mysql.com +1 -0
  Perl test script:  Avoid some aborts, which made the whole build/test process terminate.

  mysql-test/lib/mtr_process.pl
    1.22 06/04/07 13:02:11 joerg@mysql.com +2 -3
    Change from "mtr_error()" to "mtr_warning()" on some problems,
    because "error" makes the whole suite abort which then makes "Do-compile" terminate,
    so none of the following steps (including other etst suites) will be done. 

ChangeSet
  1.2453.35.1 06/04/07 12:22:55 joerg@mysql.com +1 -0
  mysql-test/mysql-test-run.sh  :   Add option "--with-ndbcluster-only" (backport from 5.1)

  mysql-test/mysql-test-run.sh
    1.263 06/04/07 12:22:51 joerg@mysql.com +10 -11
    Manual merge from 4.0 (which was a 5.1 backport):
    "--with-ndbcluster" is already present,
    "--with-ndbcluster-only" is really usable here.

ChangeSet
  1.1346.868.8 06/04/06 18:42:07 joerg@mysql.com +1 -0
  Backport of 5.1 test options "--with-ndbcluster" and "--with-ndbcluster-only" as dummies (ignored).

  mysql-test/mysql-test-run.sh
    1.146.1.58 06/04/06 18:42:05 joerg@mysql.com +11 -0
    Make "mysql-test-run.sh" accept (and ignore) the options "--with-ndbcluster" 
    and "--with-ndbcluster-only".
    This is necessary because newer build tools will issue them, and the test 
    script should tolerate that.
    Backport from 5.1 (Tomas Ulin, 2006-01-17)

ChangeSet
  1.2453.26.21 06/04/06 16:18:42 jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#18612 - post review fixes
    1) make sure that check_multi_node_shutdown does not proceed (in stop case)
    2) Fix printout

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.21 06/04/06 16:18:41 jonas@perch.ndb.mysql.com +15 -5
    make sure that check_multi_node_shutdown does not proceed (in stop case)

  ndb/src/kernel/blocks/qmgr/Qmgr.hpp
    1.8 06/04/06 16:18:40 jonas@perch.ndb.mysql.com +1 -1
    make sure that check_multi_node_shutdown does not proceed (in stop case)

ChangeSet
  1.2453.33.1 06/04/06 21:59:20 stewart@mysql.com +1 -0
  BUG#18833 valgrind: Mismatched free()/delete/delete[] in SimBlockList

  ndb/src/kernel/SimBlockList.cpp
    1.8 06/04/06 21:59:15 stewart@mysql.com +4 -0
    NEW_BLOCK allocates the elements with new, we should free them with delete
    but only if we're not building with VM_TRACE

ChangeSet
  1.2453.32.4 06/04/06 21:59:13 stewart@mysql.com +1 -0
  BUG#18843 valgrind: cond jump on uninit in Qmgr::execAPI_REGREQ

  ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
    1.6.1.1 06/04/06 21:59:08 stewart@mysql.com +4 -1
    Also init a few internals before start phase 1 as they can be accessed before that

ChangeSet
  1.2453.32.3 06/04/06 11:47:46 bar@mysql.com +1 -0
  libmysql.c:
    Bug#18830: incompatibility new libraries with old server
    Don't execute SET NAMES with pre-4.1 server.

  libmysql/libmysql.c
    1.302 06/04/06 11:46:21 bar@mysql.com +3 -0
    Bug#18830: incompatibility new libraries with old server
    Don't execute SET NAMES with pre-4.1 server.

ChangeSet
  1.2453.32.2 06/04/06 10:51:23 bar@mysql.com +2 -0
  This problem has already been fixed by one of the previous changes.
  Adding test case to cover queries which worked incorrectly earlier:
  Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci

  mysql-test/t/ctype_latin1.test
    1.8 06/04/06 10:51:17 bar@mysql.com +14 -0
    Adding test case for Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci

  mysql-test/r/ctype_latin1.result
    1.8 06/04/06 10:51:17 bar@mysql.com +22 -0
    Adding test case for Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci

ChangeSet
  1.2453.32.1 06/04/06 10:17:01 bar@mysql.com +2 -0
  conf_to_src.c:
    Backporting a 5.0 change:
    MAX_BUF was too small for Index.xml
    Changeing MAX_BUF and adding assert to easier
    catch the same problem in the future.
  ctype-extra.c:
    Regenerating ctype-extra.c with the fixed conf_to_src.

  strings/conf_to_src.c
    1.16 06/04/06 10:15:32 bar@mysql.com +2 -1
    Backporting a 5.0 change:
    MAX_BUF was too small for Index.xml
    Changeing MAX_BUF and adding assert to easier
    catch the same problem in the future.

  strings/ctype-extra.c
    1.20 06/04/06 10:15:16 bar@mysql.com +592 -54
    Regenerating ctype-extra.c with the fixed conf_to_src.

ChangeSet
  1.2453.1.43 06/04/06 00:43:58 kent@mysql.com +1 -0
  configure.in:
    Check for crypt() in libc first (bug#16478)

  configure.in
    1.405 06/04/06 00:39:50 kent@mysql.com +2 -3
    Check for crypt() in libc first (bug#16478)

ChangeSet
  1.2453.26.20 06/04/03 20:43:14 jonas@perch.ndb.mysql.com +1 -0
  ndb -
    fix testprogam if only 1 node group

  ndb/test/ndbapi/testNodeRestart.cpp
    1.21 06/04/03 20:43:12 jonas@perch.ndb.mysql.com +8 -2
    fix testprogam if only 1 node group

ChangeSet
  1.2453.26.19 06/04/03 13:12:23 jonas@perch.ndb.mysql.com +1 -0
  ndb -
    Fix compile error...when compiling debug

  ndb/include/kernel/signaldata/FailRep.hpp
    1.4 06/04/03 13:12:21 jonas@perch.ndb.mysql.com +1 -0
    Fix compile error...when compiling debug

ChangeSet
  1.2453.26.18 06/04/03 12:09:50 jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#18612 - partitioned startup
    add testprg for SR case aswell

  ndb/test/run-test/daily-basic-tests.txt
    1.31 06/04/03 12:09:48 jonas@perch.ndb.mysql.com +5 -1
    Test also partitioned start during SR

  ndb/test/ndbapi/testNodeRestart.cpp
    1.20 06/04/03 12:09:48 jonas@perch.ndb.mysql.com +96 -0
    Test also partitioned start during SR

ChangeSet
  1.2453.26.17 06/04/03 11:26:29 jonas@perch.ndb.mysql.com +5 -0
  ndb - bug#18612
    post weeked fixes :-)
    change impl. to use READ_NODESREQ to query state of other qmgr(partition)
      this as it has no (current) side effects, so that it's possible only to kill
      starting cluster (if one started and one starting)

  ndb/test/ndbapi/testNodeRestart.cpp
    1.19 06/04/03 11:26:27 jonas@perch.ndb.mysql.com +2 -2
    Require that only starting cluster dies

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.20 06/04/03 11:26:27 jonas@perch.ndb.mysql.com +105 -121
    Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)

  ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
    1.6 06/04/03 11:26:27 jonas@perch.ndb.mysql.com +3 -0
    Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)

  ndb/src/kernel/blocks/qmgr/Qmgr.hpp
    1.7 06/04/03 11:26:27 jonas@perch.ndb.mysql.com +5 -2
    Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)

  ndb/include/kernel/signaldata/FailRep.hpp
    1.3 06/04/03 11:26:27 jonas@perch.ndb.mysql.com +9 -2
    Add paritioned FAIL_REP

ChangeSet
  1.2453.1.41 06/04/03 03:47:28 kent@mysql.com +1 -0
  Makefile.am:
    Distribute mysql-test-run.pl

  mysql-test/Makefile.am
    1.53 06/04/03 03:47:10 kent@mysql.com +1 -1
    Distribute mysql-test-run.pl

ChangeSet
  1.2453.1.40 06/04/03 03:40:54 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-new

  scripts/mysql_install_db.sh
    1.73 06/04/03 03:40:50 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.868.7 06/04/03 03:37:43 kent@mysql.com +3 -0
  mysql_install_db.sh, MySQLEULA.txt, mysql_install_db.c:
    Changed web address order.mysql.com to shop.mysql.com

  scripts/mysql_install_db.sh
    1.35.1.21 06/04/03 03:36:30 kent@mysql.com +2 -1
    Changed web address order.mysql.com to shop.mysql.com

  Docs/MySQLEULA.txt
    1.3 06/04/03 03:36:30 kent@mysql.com +1 -1
    Changed web address order.mysql.com to shop.mysql.com

  netware/mysql_install_db.c
    1.5 06/04/03 03:36:29 kent@mysql.com +1 -1
    Changed web address order.mysql.com to shop.mysql.com

ChangeSet
  1.2453.1.39 06/04/02 02:10:41 kent@mysql.com +1 -0
  Makefile.am:
    Install Perl mysql-test-run into test directory

  mysql-test/Makefile.am
    1.52 06/04/02 02:10:14 kent@mysql.com +4 -3
    Install Perl mysql-test-run into test directory

ChangeSet
  1.2453.1.38 06/04/01 05:44:10 kent@mysql.com +2 -0
  Makefile.am:
    Let "make install" install mysql-test-run.pl
  mysql.spec.sh:
    Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)

  mysql-test/Makefile.am
    1.51 06/04/01 05:43:37 kent@mysql.com +2 -1
    Let "make install" install mysql-test-run.pl

  support-files/mysql.spec.sh
    1.114 06/04/01 04:35:33 kent@mysql.com +5 -0
    Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)

ChangeSet
  1.2453.1.37 06/04/01 04:17: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-new

  README
    1.8 06/04/01 04:17:20 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.868.6 06/04/01 04:13:33 kent@mysql.com +1 -0
  README:
    Typo (bug#17167)

  README
    1.4.1.4 06/04/01 04:12:54 kent@mysql.com +1 -1
    Typo (bug#17167)

ChangeSet
  1.2453.1.36 06/04/01 03:28:07 kent@mysql.com +1 -0
  acinclude.m4:
    Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
    and search the given include directory first (bug#18369)

  acinclude.m4
    1.139 06/04/01 03:22:01 kent@mysql.com +3 -3
    Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
    and search the given include directory first (bug#18369)

ChangeSet
  1.2453.1.35 06/04/01 02:14:54 kent@mysql.com +6 -0
  vcproj files:
    Set MYSQL_SERVER_SUFFIX from build scripts, not hard
    code it into Visual Studio project files, bug#15974

  VC++Files/sql/mysqld.vcproj
    1.2 06/04/01 02:12:20 kent@mysql.com +0 -7
    Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974

  VC++Files/mysys/mysys.vcproj
    1.2 06/04/01 02:12:19 kent@mysql.com +0 -1
    Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974

  VC++Files/mysqldemb/mysqldemb.vcproj
    1.2 06/04/01 02:12:19 kent@mysql.com +0 -1
    Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974

  VC++Files/libmysqld/libmysqld.vcproj
    1.2 06/04/01 02:12:19 kent@mysql.com +0 -1
    Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974

  VC++Files/innobase/innobase.vcproj
    1.2 06/04/01 02:12:18 kent@mysql.com +0 -2
    Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974

  VC++Files/bdb/bdb.vcproj
    1.2 06/04/01 02:12:18 kent@mysql.com +0 -1
    Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974

ChangeSet
  1.2453.26.16 06/03/31 18:53:07 jonas@perch.ndb.mysql.com +1 -0
  ndb - autotest
    add new testpgrom for bug#18612 to autotest

  ndb/test/run-test/daily-basic-tests.txt
    1.30 06/03/31 18:53:06 jonas@perch.ndb.mysql.com +5 -1
    Add new testprogram to autotest

ChangeSet
  1.2453.26.15 06/03/31 16:46:28 jonas@perch.ndb.mysql.com +10 -0
  ndb - bug#18612 (detection of partitioned cluster)
    this also impl. gcp safe multi node shutdown
    1) block gcp
    2) wait for ongoing gcp
    3) inform all stopping QMGR's (so that they don't start with error handler)
    4) wait for all QMGR's to reply
    5) broadcast failrep for stopping nodes
    6) (if !master died) unblock gcp
  
    

  ndb/test/ndbapi/testNodeRestart.cpp
    1.18 06/03/31 16:46:26 jonas@perch.ndb.mysql.com +111 -1
    test program for bug#18612

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.19 06/03/31 16:46:26 jonas@perch.ndb.mysql.com +45 -1
    Impl. GCP safe multi node shutdown in order to test bug#18612

  ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
    1.5 06/03/31 16:46:26 jonas@perch.ndb.mysql.com +2 -0
    Impl. GCP safe multi node shutdown in order to test bug#18612

  ndb/src/kernel/blocks/qmgr/Qmgr.hpp
    1.6 06/03/31 16:46:26 jonas@perch.ndb.mysql.com +5 -1
    Impl. GCP safe multi node shutdown in order to test bug#18612

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
    1.16 06/03/31 16:46:26 jonas@perch.ndb.mysql.com +301 -50
    Impl. GCP safe multi node shutdown in order to test bug#18612

  ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
    1.7 06/03/31 16:46:26 jonas@perch.ndb.mysql.com +1 -0
    Impl. GCP safe multi node shutdown in order to test bug#18612

  ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp
    1.4 06/03/31 16:46:26 jonas@perch.ndb.mysql.com +11 -0
    Impl. GCP safe multi node shutdown in order to test bug#18612

  ndb/include/kernel/signaldata/StopReq.hpp
    1.3 06/03/31 16:46:25 jonas@perch.ndb.mysql.com +22 -16
    Impl. GCP safe multi node shutdown in order to test bug#18612

  ndb/include/kernel/signaldata/FailRep.hpp
    1.2 06/03/31 16:46:25 jonas@perch.ndb.mysql.com +4 -2
    Impl. GCP safe multi node shutdown in order to test bug#18612

  ndb/include/kernel/signaldata/DumpStateOrd.hpp
    1.8 06/03/31 16:46:25 jonas@perch.ndb.mysql.com +1 -0
    Impl. GCP safe multi node shutdown in order to test bug#18612

ChangeSet
  1.2453.26.14 06/03/31 16:36:43 jonas@perch.ndb.mysql.com +2 -0
  ndb - add support for blocking/unblocking GCP using WAIT_GCP_REQ

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.36 06/03/31 16:36:41 jonas@perch.ndb.mysql.com +28 -0
    Add supprt for block/unblocking GCP

  ndb/include/kernel/signaldata/WaitGCP.hpp
    1.2 06/03/31 16:36:41 jonas@perch.ndb.mysql.com +5 -2
    Add supprt for block/unblocking GCP

ChangeSet
  1.2453.26.13 06/03/31 11:39:35 jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#16447
    correct return value in check_cm_cmregreq

  ndb/test/src/NdbRestarts.cpp
    1.6 06/03/31 11:39:34 jonas@perch.ndb.mysql.com +1 -2
    Fix bug in test program

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.18 06/03/31 11:39:34 jonas@perch.ndb.mysql.com +8 -2
    Fix bug in bug#16447

ChangeSet
  1.2453.26.12 06/03/30 14:20:54 jonas@perch.ndb.mysql.com +3 -0
  ndb - bug#15695 bug#16447 bug#18612
    For various reasone have a partitioned cluster been created
    This patch makes sure that when they connect
    1) it's detected
    2) shutdown is forced

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.17 06/03/30 14:20:52 jonas@perch.ndb.mysql.com +251 -30
    1) Activly detect paritioned cluster(s)
    2) add some documentation

  ndb/src/kernel/blocks/qmgr/Qmgr.hpp
    1.5 06/03/30 14:20:52 jonas@perch.ndb.mysql.com +17 -2
    1) Activly detect paritioned cluster(s)
    2) add some documentation

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
    1.20 06/03/30 14:20:52 jonas@perch.ndb.mysql.com +53 -13
    New dump/error insert for simulating network failure

ChangeSet
  1.2453.1.34 06/03/30 10:22:03 evgen@sunlight.local +1 -0
  Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
  into sunlight.local:/local_work/15560-bug-4.1-mysql

  sql/sql_table.cc
    1.307 06/03/30 10:22:02 evgen@sunlight.local +0 -0
    Auto merged

ChangeSet
  1.2453.31.2 06/03/30 03:11:37 monty@mysql.com +3 -0
  Cleanup during review of new pushed code

  tests/mysql_client_test.c
    1.166 06/03/30 03:11:35 monty@mysql.com +3 -3
    Remove compiler warnings

  strings/ctype-ucs2.c
    1.48 06/03/30 03:11:35 monty@mysql.com +2 -2
    Simplify code

  sql/ha_heap.cc
    1.60 06/03/30 03:11:35 monty@mysql.com +7 -11
    Indentation fixes

ChangeSet
  1.2453.31.1 06/03/30 01:50:52 monty@mysql.com +3 -0
  Fix error in prefix compression of keys in MyISAM when key length changed from 254 -> 255
  Bug #17705 "FT Index corruption occurs with UTF8 data..."
  (Actually, the bug had nothing to do with FT index but with general key compression)
  

  mysql-test/t/ctype_utf8.test
    1.71 06/03/30 01:50:50 monty@mysql.com +34 -0
    Test of fix for key compression bug

  mysql-test/r/ctype_utf8.result
    1.69 06/03/30 01:50:50 monty@mysql.com +46 -0
    Test of fix for key compression bug

  myisam/mi_search.c
    1.56 06/03/30 01:50:50 monty@mysql.com +4 -7
    Fix error in prefix compression of keys in MyISAM when key length changed from 254 -> 255

ChangeSet
  1.2453.1.32 06/03/30 00:48:46 kent@mysql.com +1 -0
  mysql-test-run.pl:
    Check that port range is valid, bug#16807

  mysql-test/mysql-test-run.pl
    1.60 06/03/30 00:47:34 kent@mysql.com +11 -0
    Check that port range is valid, bug#16807

ChangeSet
  1.2453.1.31 06/03/29 23:51:23 kent@mysql.com +2 -0
  mysqld_safe.sh:
    Added --help option, bug#16392
  acinclude.m4:
    Use "$shrext_cmds" when testing if shared library exists, bug#16332

  scripts/mysqld_safe.sh
    1.77 06/03/29 23:49:48 kent@mysql.com +28 -0
    Added --help option, bug#16392

  acinclude.m4
    1.138 06/03/29 23:40:19 kent@mysql.com +6 -3
    Use "$shrext_cmds" when testing if shared library exists, bug#16332

ChangeSet
  1.2453.30.1 06/03/29 22:33:27 kent@mysql.com +1 -0
  Makefile.am:
    Use "dist_bin_SCRIPTS" to get a script distributed

  ndb/tools/Makefile.am
    1.19 06/03/29 22:32:59 kent@mysql.com +1 -1
    Use "dist_bin_SCRIPTS" to get a script distributed

ChangeSet
  1.2453.29.1 06/03/29 23:30:34 evgen@moonbone.local +8 -0
  Fixed bug#15560: GROUP_CONCAT wasn't ready for WITH ROLLUP queries
  
  The GROUP_CONCAT uses its own temporary table. When ROLLUP is present
  it creates the second copy of Item_func_group_concat. This copy receives the
  same list of arguments that original group_concat does. When the copy is
  set up the result_fields of functions from the argument list are reset to the
  temporary table of this copy.
  As a result of this action data from functions flow directly to the ROLLUP copy
  and the original group_concat functions shows wrong result.
  Since queries with COUNT(DISTINCT ...) use temporary tables to store
  the results the COUNT function they are also affected by this bug.
  
  The idea of the fix is to copy content of the result_field for the function
  under GROUP_CONCAT/COUNT from  the first temporary table to the second one,
  rather than setting result_field to point to the second temporary table.
  To achieve this goal force_copy_fields flag is added to Item_func_group_concat
  and Item_sum_count_distinct classes. This flag is initialized to 0 and set to 1
  into the make_unique() member function of both classes.
  To the TMP_TABLE_PARAM structure is modified to include the similar flag as
  well.
  The create_tmp_table() function passes that flag to create_tmp_field().
  When the flag is set the create_tmp_field() function will set result_field
  as a source field and will not reset that result field to newly created 
  field for Item_func_result_field and its descendants. Due to this there
  will be created copy func to copy data from old result_field to newly 
  created field.

  sql/item_sum.h
    1.82 06/03/29 23:28:47 evgen@moonbone.local +6 -3
    Fixed bug#15560: GROUP_CONCAT wasn't ready for WITH ROLLUP queries
    Added the flag 'force_copy_fields' to the Item_func_group_concat and Item_sum_count_distinct classes.

  sql/item_sum.cc
    1.147 06/03/29 23:25:19 evgen@moonbone.local +6 -0
    Fixed bug#15560: GROUP_CONCAT wasn't ready for WITH ROLLUP queries
    Added initialization of the force_copy_fields flag and passing it to create_tmp_table() through TMP_TBLE_PARAM in the Item_func_group_concat and Item_sum_count_distinct member functions.

  sql/mysql_priv.h
    1.374 06/03/29 23:20:58 evgen@moonbone.local +3 -2
    Fixed bug#15560: GROUP_CONCAT wasn't ready for WITH ROLLUP queries
    Added the bool parameter 'make_copy_field' to create_tmp_field().

  sql/sql_class.h
    1.284 06/03/29 23:18:44 evgen@moonbone.local +3 -2
    Fixed bug#15560: GROUP_CONCAT wasn't ready for WITH ROLLUP queries
    Added the flag 'force_copy_fields' to the structure TMP_TABLE_PARAM in order to make create_tmp_field() force the creation of 'copy_field' objects.

  sql/sql_select.cc
    1.450 06/03/29 23:17:40 evgen@moonbone.local +15 -6
    Fixed bug#15560: GROUP_CONCAT wasn't ready for WITH ROLLUP queries
    
    Added the flag 'make_copy_field' to create_tmp_field(), so that for Item_result_field descendants create_tmp_field() sets the item's result field as a source field and deny resetting that result field to a new value.

  sql/sql_table.cc
    1.304.1.1 06/03/29 23:15:39 evgen@moonbone.local +1 -1
    Fixed bug#15560: GROUP_CONCAT wasn't ready for WITH ROLLUP queries
    Added 0 as a last parameter to create_tmp_field()  to force old behaviour.

  mysql-test/r/func_gconcat.result
    1.43 06/03/29 23:15:07 evgen@moonbone.local +15 -0
    Added test for bug#15560: GROUP_CONCAT wasn't ready for WITH ROLLUP queries

  mysql-test/t/func_gconcat.test
    1.34 06/03/29 23:14:58 evgen@moonbone.local +8 -0
    Added test for bug#15560: GROUP_CONCAT wasn't ready for WITH ROLLUP queries

ChangeSet
  1.2453.28.1 06/03/29 19:52:26 gluh@eagle.intranet.mysql.r18.ru +3 -0
  Fix for bug#15316 SET value having comma not correctly handled
   disallow the use of comma in SET members

  sql/sql_table.cc
    1.306 06/03/29 19:52:22 gluh@mysql.com +17 -0
    Fix for bug#15316 SET value having comma not correctly handled
     disallow the use of comma in SET members

  mysql-test/t/create.test
    1.61 06/03/29 19:52:22 gluh@mysql.com +6 -0
    Fix for bug#15316 SET value having comma not correctly handled
     test case

  mysql-test/r/create.result
    1.88 06/03/29 19:52:22 gluh@mysql.com +2 -0
    Fix for bug#15316 SET value having comma not correctly handled
     test case

ChangeSet
  1.2453.1.28 06/03/29 14:59:53 kent@mysql.com +1 -0
  mysql_config.sh:
    If installed, search built in lib path first, bug#13158

  scripts/mysql_config.sh
    1.23 06/03/29 14:59:29 kent@mysql.com +6 -1
    If installed, search built in lib path first, bug#13158

ChangeSet
  1.2453.27.1 06/03/29 14:07:13 kent@mysql.com +1 -0
  Makefile.am:
    Install "ndb_size.pl" script and template, bug#18421

  ndb/tools/Makefile.am
    1.18 06/03/29 14:06:14 kent@mysql.com +3 -0
    Install "ndb_size.pl" script and template, bug#18421

ChangeSet
  1.2453.1.26 06/03/28 18:32:58 bar@mysql.com +1 -0
  Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/usr/home/bar/mysql-4.1.b15098

  sql/field.cc
    1.229 06/03/28 18:32:37 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2453.1.25 06/03/27 23:04:44 kent@mysql.com +1 -0
  mysql_config.sh:
    Remove Solaris -xc99=none C option as C++ compiler can't handle it

  scripts/mysql_config.sh
    1.22 06/03/27 23:04:21 kent@mysql.com +1 -1
    Remove Solaris -xc99=none C option as C++ compiler can't handle it

ChangeSet
  1.2453.1.24 06/03/27 19:25:25 kent@mysql.com +1 -0
  mysql_config.sh:
    We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322

  scripts/mysql_config.sh
    1.21 06/03/27 19:17:54 kent@mysql.com +19 -8
    We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322

ChangeSet
  1.2453.26.11 06/03/27 10:18:48 jonas@perch.ndb.mysql.com +4 -0
  ndb - autotest
    Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert()
      Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)

  ndb/test/src/NdbRestarts.cpp
    1.5 06/03/27 10:18:46 jonas@perch.ndb.mysql.com +8 -8
    Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
      Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)

  ndb/test/src/NdbBackup.cpp
    1.24 06/03/27 10:18:46 jonas@perch.ndb.mysql.com +2 -2
    Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
      Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)

  ndb/test/ndbapi/testNodeRestart.cpp
    1.17 06/03/27 10:18:46 jonas@perch.ndb.mysql.com +12 -0
    Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
      Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
    1.19 06/03/27 10:18:46 jonas@perch.ndb.mysql.com +15 -2
    Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
      Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)

ChangeSet
  1.2453.1.22 06/03/23 17:25:49 kent@mysql.com +1 -0
  config-win.h:
    If CYBOZU defined, set character sets etc

  include/config-win.h
    1.57 06/03/23 17:19:46 kent@mysql.com +15 -0
    If CYBOZU defined, set character sets etc

ChangeSet
  1.2453.26.10 06/03/23 15:33:40 jonas@perch.ndb.mysql.com +1 -0
  ndb -
    remove bug#18385 from autotest as it only works on 2 node clusters

  ndb/test/run-test/daily-basic-tests.txt
    1.29 06/03/23 15:33:38 jonas@perch.ndb.mysql.com +4 -4
    remove bug#18385 as it only works on 2 node clusters

ChangeSet
  1.2453.26.9 06/03/23 11:53:54 jonas@perch.ndb.mysql.com +3 -0
  ndb -
    minor fixes in test programs

  ndb/test/ndbapi/testNodeRestart.cpp
    1.16 06/03/23 11:53:53 jonas@perch.ndb.mysql.com +8 -0
    Fix test program

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.62 06/03/23 11:53:53 jonas@perch.ndb.mysql.com +1 -1
    Fix conflicting error codes

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.16 06/03/23 11:53:52 jonas@perch.ndb.mysql.com +1 -1
    Fix conflicting error codes

ChangeSet
  1.2453.1.21 06/03/23 14:29:43 bar@mysql.com +5 -0
  Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/usr/home/bar/mysql-4.1.b15376

  strings/ctype-ucs2.c
    1.47 06/03/23 14:29:28 bar@mysql.com +0 -0
    Auto merged

  strings/ctype-gb2312.c
    1.59 06/03/23 14:29:27 bar@mysql.com +0 -0
    Auto merged

  strings/ctype-euc_kr.c
    1.62 06/03/23 14:29:27 bar@mysql.com +0 -0
    Auto merged

  strings/ctype-bin.c
    1.60 06/03/23 14:29:26 bar@mysql.com +0 -0
    Auto merged

  include/m_ctype.h
    1.107 06/03/23 14:29:26 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2453.26.8 06/03/22 15:06:44 jonas@perch.ndb.mysql.com +1 -0
  ndb -
    Add per partition info (optionally to ndb_desc)

  ndb/tools/desc.cpp
    1.14 06/03/22 15:06:42 jonas@perch.ndb.mysql.com +77 -0
    Add per partition info (optionally to ndb_desc)

ChangeSet
  1.2453.26.7 06/03/22 13:38:03 jonas@perch.ndb.mysql.com +1 -0
  ndb - autotest 
    Update makefile for removed files

  ndb/test/run-test/Makefile.am
    1.19 06/03/22 13:38:01 jonas@perch.ndb.mysql.com +4 -5
    Update makefile for removed files

ChangeSet
  1.2453.26.6 06/03/22 12:18:07 jonas@perch.ndb.mysql.com +1 -0
  ndb - 
    some more ndb-autotest updates (previously uncommitted...but in use)

  ndb/test/run-test/ndb-autotest.sh
    1.18 06/03/22 12:18:05 jonas@perch.ndb.mysql.com +5 -4
    More autotest updates

ChangeSet
  1.2453.26.5 06/03/22 12:11:51 jonas@perch.ndb.mysql.com +5 -0
  ndb -
    minor update to ndb-autotest.sh and config files

  ndb/test/run-test/ndb-autotest.sh
    1.17 06/03/22 12:11:49 jonas@perch.ndb.mysql.com +3 -0
    Add support for conf per host

  ndb/test/run-test/conf-shark.txt
    1.3 06/03/22 12:11:49 jonas@perch.ndb.mysql.com +3 -0
    Add SendBufferMemory to remove rare overruns

  ndb/test/run-test/conf-ndbmaster.txt
    1.5 06/03/22 12:11:49 jonas@perch.ndb.mysql.com +3 -0
    Add SendBufferMemory to remove rare overruns

  ndb/test/run-test/conf-dl145a.txt
    1.6 06/03/22 12:11:49 jonas@perch.ndb.mysql.com +3 -0
    Add SendBufferMemory to remove rare overruns

  ndb/test/run-test/conf-daily-devel-ndbmaster.txt
    1.4 06/03/22 12:11:49 jonas@perch.ndb.mysql.com +3 -0
    Add SendBufferMemory to remove rare overruns

  ndb/test/run-test/conf-ndbmaster.txt
    1.4 06/03/22 12:04:50 jonas@perch.ndb.mysql.com +0 -0
    Rename: ndb/test/run-test/conf-daily-basic-ndbmaster.txt -> ndb/test/run-test/conf-ndbmaster.txt

  ndb/test/run-test/conf-shark.txt
    1.2 06/03/22 12:03:51 jonas@perch.ndb.mysql.com +0 -0
    Rename: ndb/test/run-test/conf-daily-basic-shark.txt -> ndb/test/run-test/conf-shark.txt

  ndb/test/run-test/conf-dl145a.txt
    1.5 06/03/22 12:03:14 jonas@perch.ndb.mysql.com +0 -0
    Rename: ndb/test/run-test/conf-daily-basic-dl145a.txt -> ndb/test/run-test/conf-dl145a.txt

ChangeSet
  1.2453.26.4 06/03/22 11:44:31 jonas@perch.ndb.mysql.com +6 -0
  ndb - bug#18414
    Fix timeout during ABORT when ZABORT_TIMEOUT_BREAK is outstanding

  ndb/test/run-test/daily-basic-tests.txt
    1.28 06/03/22 11:44:29 jonas@perch.ndb.mysql.com +4 -0
    Add testcase for bug18414

  ndb/test/ndbapi/testTimeout.cpp
    1.13 06/03/22 11:44:29 jonas@perch.ndb.mysql.com +5 -2
    Fix error code checking

  ndb/test/ndbapi/testNodeRestart.cpp
    1.15 06/03/22 11:44:29 jonas@perch.ndb.mysql.com +73 -0
    Add testcase for bug18414

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.64 06/03/22 11:44:29 jonas@perch.ndb.mysql.com +44 -8
    Fix timeout during ABORT when ZABORT_TIMEOUT_BREAK is outstanding

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.35 06/03/22 11:44:29 jonas@perch.ndb.mysql.com +0 -4
    remove dumping of LCP info during NF

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.15 06/03/22 11:44:29 jonas@perch.ndb.mysql.com +2 -0
    New error code

ChangeSet
  1.2453.26.3 06/03/21 15:13:41 jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#18118
    timeslice DUMP(7015)

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.34 06/03/21 15:13:39 jonas@perch.ndb.mysql.com +74 -52
    timeslice DUMP(7015)

  ndb/include/kernel/signaldata/DumpStateOrd.hpp
    1.7 06/03/21 15:13:39 jonas@perch.ndb.mysql.com +3 -0
    doc...

ChangeSet
  1.2453.26.2 06/03/21 14:47:10 jonas@perch.ndb.mysql.com +9 -0
  ndb - bug#18385
    Partial system restart, can not try to start with higher GCI that own
    even if knowing about a higher number

  ndb/test/src/NdbRestarter.cpp
    1.11 06/03/21 14:47:08 jonas@perch.ndb.mysql.com +33 -0
    Add new method for selecting random node

  ndb/test/run-test/daily-basic-tests.txt
    1.27 06/03/21 14:47:08 jonas@perch.ndb.mysql.com +4 -0
    Run test in daily-basic

  ndb/test/ndbapi/testSystemRestart.cpp
    1.9 06/03/21 14:47:08 jonas@perch.ndb.mysql.com +53 -0
    Add new testcase for bug#18385

  ndb/test/include/NdbRestarter.hpp
    1.5 06/03/21 14:47:08 jonas@perch.ndb.mysql.com +1 -0
    Add new method for selecting random node

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.33 06/03/21 14:47:08 jonas@perch.ndb.mysql.com +77 -22
    Fix so that we don't try to restart to a too new GCI when doing a partial start
    Add new error code when this node later tries to join

  ndb/src/kernel/blocks/dbdih/Dbdih.hpp
    1.10 06/03/21 14:47:08 jonas@perch.ndb.mysql.com +0 -1
    Move error codes into StartPerm + Add new error code

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.14 06/03/21 14:47:08 jonas@perch.ndb.mysql.com +2 -0
    Add new error insert

  ndb/include/kernel/signaldata/StartPerm.hpp
    1.2 06/03/21 14:47:08 jonas@perch.ndb.mysql.com +6 -0
    Move error codes into StartPerm + Add new error code

  ndb/include/kernel/signaldata/DumpStateOrd.hpp
    1.6 06/03/21 14:47:08 jonas@perch.ndb.mysql.com +1 -0
    Add new dump for setting time between gcp

ChangeSet
  1.2453.24.6 06/03/20 14:55:14 jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#18352
    remove debug prinout

  ndb/src/ndbapi/TransporterFacade.cpp
    1.34 06/03/20 14:55:12 jonas@perch.ndb.mysql.com +0 -1
    ndb - bug#18352
      remove debug prinout

ChangeSet
  1.2453.24.5 06/03/20 14:53:29 jonas@perch.ndb.mysql.com +3 -0
  ndb - wl2610, bug#18352
    Remove useless and tricky state fiddleing in TC
      to syncronize NF_CompleteRep as code is already present in DIH aswell
    Keep broadcast of TAKEOVER_TCCONF for online upgrade

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.63 06/03/20 14:53:27 jonas@perch.ndb.mysql.com +42 -144
    Remove useless and tricky state fiddleing in TC
      to syncronize NF_CompleteRep as code is already present in DIH aswell
      Keep broadcast of TAKEOVER_TCCONF for online upgrade

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp
    1.23 06/03/20 14:53:27 jonas@perch.ndb.mysql.com +0 -9
    Remove useless and tricky state fiddleing in TC
      to syncronize NF_CompleteRep as code is already present in DIH aswell
      Keep broadcast of TAKEOVER_TCCONF for online upgrade

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.61 06/03/20 14:53:27 jonas@perch.ndb.mysql.com +166 -0
    Add clever dump for showing active operations

ChangeSet
  1.2453.24.4 06/03/20 14:49:46 jonas@perch.ndb.mysql.com +6 -0
  ndb - bug#18352
    Use variable waitfor_response_timeout (depending on TransactionDeadLockTimeout)
    When getting 4012, set NeedAbort and ReleaseOnClose

  ndb/test/run-test/daily-basic-tests.txt
    1.26 06/03/20 14:49:44 jonas@perch.ndb.mysql.com +4 -0
    Add testcase for 4012

  ndb/test/ndbapi/testTimeout.cpp
    1.12 06/03/20 14:49:44 jonas@perch.ndb.mysql.com +101 -0
    Add testcase for 4012

  ndb/src/ndbapi/TransporterFacade.hpp
    1.20 06/03/20 14:49:44 jonas@perch.ndb.mysql.com +1 -0
    Init wait_for_response_timoue as max TRANSACTION_DEADLOCK_TIMEOUT

  ndb/src/ndbapi/TransporterFacade.cpp
    1.33 06/03/20 14:49:44 jonas@perch.ndb.mysql.com +14 -0
    Init wait_for_response_timoue as max TRANSACTION_DEADLOCK_TIMEOUT

  ndb/src/ndbapi/Ndbif.cpp
    1.27 06/03/20 14:49:44 jonas@perch.ndb.mysql.com +7 -5
    Use variable timeout for waitfor, 
      when receiving 4012, set NeedAbort and ReleaseOnClose

  ndb/src/ndbapi/NdbConnection.cpp
    1.36 06/03/20 14:49:44 jonas@perch.ndb.mysql.com +2 -2
    Use variable for WAITFOR_RESPONSE_TIMEOUT

ChangeSet
  1.2453.25.1 06/03/20 16:28:25 bar@mysql.com +7 -0
  Bug#17374: select ... like 'A%' operator fails to find value on columuns with key
  Fixed that LIKE worked case insensitively for latin2_czech_cs,
  which was wrong for a case sensitive collation.

  mysql-test/t/ctype_latin2_ch.test
    1.1 06/03/20 16:28:20 bar@mysql.com +30 -0
    New BitKeeper file ``mysql-test/t/ctype_latin2_ch.test''

  mysql-test/r/have_latin2_ch.require
    1.1 06/03/20 16:28:20 bar@mysql.com +2 -0
    New BitKeeper file ``mysql-test/r/have_latin2_ch.require''

  mysql-test/r/ctype_latin2_ch.result
    1.1 06/03/20 16:28:20 bar@mysql.com +30 -0
    New BitKeeper file ``mysql-test/r/ctype_latin2_ch.result''

  mysql-test/t/ctype_latin2_ch.test
    1.0 06/03/20 16:28:20 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b17374/mysql-test/t/ctype_latin2_ch.test

  mysql-test/r/have_latin2_ch.require
    1.0 06/03/20 16:28:20 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b17374/mysql-test/r/have_latin2_ch.require

  mysql-test/r/ctype_latin2_ch.result
    1.0 06/03/20 16:28:20 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b17374/mysql-test/r/ctype_latin2_ch.result

  mysql-test/include/have_latin2_ch.inc
    1.1 06/03/20 16:28:19 bar@mysql.com +4 -0
    New BitKeeper file ``mysql-test/include/have_latin2_ch.inc''

  strings/ctype-czech.c
    1.55 06/03/20 16:28:19 bar@mysql.com +1 -1
    Use my_wildcmp_bin instead of case insensitive my_wildcmp_8bit

  strings/ctype-bin.c
    1.58.1.1 06/03/20 16:28:19 bar@mysql.com +4 -4
    Making my_wildcmp_bin public instead of static

  mysql-test/include/have_latin2_ch.inc
    1.0 06/03/20 16:28:19 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b17374/mysql-test/include/have_latin2_ch.inc

  include/m_ctype.h
    1.105.1.1 06/03/20 16:28:19 bar@mysql.com +5 -0
    Making my_wildcmp_bin public instead of static

ChangeSet
  1.2453.1.19 06/03/20 14:43:02 bar@mysql.com +4 -0
    Bug#18004 Connecting crashes server when default charset is UCS2
  table.cc:
    Fixing to use system_charset_info instead of default_charset_info.
    Crash happened because the "ctype" array is empty in UCS2,
    and thus cannot be used with my_isspace().
    The reason why UCS2 appeared in this context was because of
    of default_charset_info variable incorrectly substituted to my_isspace().
    As functions check_db_name(), check_table_name() and check_column_name()
    always get values in utf8, system_charset_info must be used instead.
  ctype_ucs2_def.test, ctype_ucs2_def-master.opt, ctype_ucs2_def.result:
    new file

  sql/table.cc
    1.133 06/03/20 14:36:41 bar@mysql.com +3 -3
    Bug#18004 Connecting crashes server when default charset is UCS2
    Use of default_charset_info was wrong.
    Functions check_db_name, check_table_name and check_column_name
    get values of system_charset_info character set (utf8).

  mysql-test/t/ctype_ucs2_def.test
    1.1 06/03/20 14:36:28 bar@mysql.com +9 -0

  mysql-test/t/ctype_ucs2_def-master.opt
    1.1 06/03/20 14:36:28 bar@mysql.com +1 -0

  mysql-test/r/ctype_ucs2_def.result
    1.1 06/03/20 14:36:28 bar@mysql.com +6 -0

  mysql-test/t/ctype_ucs2_def.test
    1.0 06/03/20 14:36:28 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b18004/mysql-test/t/ctype_ucs2_def.test

  mysql-test/t/ctype_ucs2_def-master.opt
    1.0 06/03/20 14:36:28 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b18004/mysql-test/t/ctype_ucs2_def-master.opt

  mysql-test/r/ctype_ucs2_def.result
    1.0 06/03/20 14:36:28 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b18004/mysql-test/r/ctype_ucs2_def.result

ChangeSet
  1.2453.24.3 06/03/20 11:29:58 jonas@perch.ndb.mysql.com +3 -0
  ndb - wl2610
    Activly abort transactions (that's affected) during NF
    This removes a lot of bugs that can occur otherwise is using
      high value for TransactionDeadLockTimout

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.62 06/03/20 11:29:56 jonas@perch.ndb.mysql.com +145 -47
    Active transaction baortion

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp
    1.22 06/03/20 11:29:56 jonas@perch.ndb.mysql.com +17 -1
    Add bitmask of participating nodes to transaction record
    Add bitmask of node fail steps, so that NF_CompleteRep is not sent until all steps has completed

  ndb/include/kernel/signaldata/TcContinueB.hpp
    1.3 06/03/20 11:29:56 jonas@perch.ndb.mysql.com +2 -1
    New continueb for active transaction abort on nf

ChangeSet
  1.2453.24.2 06/03/17 10:55:02 jonas@perch.ndb.mysql.com +3 -0
  ndb - bug#16772
    dont't allow node to join cluster until all nodes has completed failure handling

  ndb/test/run-test/daily-basic-tests.txt
    1.25 06/03/17 10:55:00 jonas@perch.ndb.mysql.com +4 -0
    Run test in basic suite

  ndb/test/ndbapi/testNodeRestart.cpp
    1.14 06/03/17 10:55:00 jonas@perch.ndb.mysql.com +50 -0
    testcase for bug#16772

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.16 06/03/17 10:55:00 jonas@perch.ndb.mysql.com +87 -14
    When getting CM_ADD for node that I haven't completed failure handling for do _not_ just override.
    But instead set state...and send CM_ACK_ADD on execCONNECT_REP (much...later)

ChangeSet
  1.2453.1.18 06/03/17 10:25:29 elliot@mysql.com +1 -0
  BUG#18283 When InnoDB returns error 'lock table full', MySQL can write
  to binlog too much.
  
  When InnoDB has to rollback a transaction because the lock table has
  filled up, it also needs to inform the upper layer that the transaction
  was rolled back so that the cached transaction is not written to the
  binary log.

  sql/ha_innodb.cc
    1.214 06/03/17 10:25:27 elliot@mysql.com +7 -0
    When InnoDB rolls back a transaction in HA_ERR_LOCK_TABLE_FULL, it
    needs to inform the upper layer to rollback the transaction also.

ChangeSet
  1.2453.24.1 06/03/17 10:09:35 jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#18298
    8 repeated nr with table wo/ logging cause crash
    Dont create crashed replica for temporary tables

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.32 06/03/17 10:09:33 jonas@perch.ndb.mysql.com +13 -3
    Dont create crashed replica for temporary tables

  ndb/src/kernel/blocks/dbdih/Dbdih.hpp
    1.9 06/03/17 10:09:33 jonas@perch.ndb.mysql.com +2 -1
    Dont create crashed replica for temporary tables

ChangeSet
  1.2453.1.17 06/03/16 11:21:18 knielsen@mysql.com +1 -0
  Fix bug in mysql-test-run.pl in ^C signal handler.

  mysql-test/lib/mtr_timer.pl
    1.3 06/03/16 11:20:31 knielsen@mysql.com +6 -0
    Fix bug where ^C would trigger cleanup handler in both parent and
    timeout child processes, causing duplicated messages and potential
    conflicts.

ChangeSet
  1.2453.1.16 06/03/13 14:43:58 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/backup/Backup.cpp
    1.24 06/03/13 14:43:56 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2447.75.7 06/03/13 14:42:16 jonas@perch.ndb.mysql.com +1 -0
  bug#14028 -
      ndb crash if trigger record get to big, fix incorrect max size of trigger record

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.21.1.2 06/03/13 14:42:12 jonas@perch.ndb.mysql.com +2 -2
    Increase size of max trigger record

ChangeSet
  1.2453.23.1 06/03/10 15:03:04 ingo@mysql.com +9 -0
  Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
  
  For "count(*) while index_column = value" an index read
  is done. It consists of an index scan and retrieval of
  each key.
  
  For efficiency reasons the index scan stores the key in
  the special buffer 'lastkey2' once only. At the first 
  iteration it notes this fact with the flag 
  HA_STATE_RNEXT_SAME in 'info->update'.
  
  For efficiency reasons, the key retrieval for blobs
  does not allocate a new buffer, but uses 'lastkey2'...
  
  Now I clear the HA_STATE_RNEXT_SAME flag whenever the 
  buffer has been polluted. In this case, the index scan
  copies the key value again (and sets the flag again).

  mysql-test/t/myisam.test
    1.45 06/03/10 15:03:00 ingo@mysql.com +19 -0
    Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
    Added test.

  mysql-test/r/myisam.result
    1.59 06/03/10 15:03:00 ingo@mysql.com +18 -0
    Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
    Added test result.

  myisam/mi_write.c
    1.50 06/03/10 15:03:00 ingo@mysql.com +4 -0
    Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
    Removing the flag HA_STATE_RNEXT_SAME from info->update
    if info->lastkey2 was reused for another purpose than
    index scanning.

  myisam/mi_update.c
    1.16 06/03/10 15:03:00 ingo@mysql.com +4 -0
    Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
    Removing the flag HA_STATE_RNEXT_SAME from info->update
    if info->lastkey2 was reused for another purpose than
    index scanning.

  myisam/mi_unique.c
    1.21 06/03/10 15:03:00 ingo@mysql.com +3 -0
    Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
    Removing the flag HA_STATE_RNEXT_SAME from info->update
    if info->lastkey2 was reused for another purpose than
    index scanning.

  myisam/mi_rnext_same.c
    1.18 06/03/10 15:03:00 ingo@mysql.com +2 -2
    Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
    Removed trailing space and fixed a comment.

  myisam/mi_key.c
    1.37 06/03/10 15:03:00 ingo@mysql.com +4 -0
    Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
    Removing the flag HA_STATE_RNEXT_SAME from info->update
    if info->lastkey2 was reused for another purpose than
    index scanning.

  myisam/mi_delete.c
    1.34 06/03/10 15:03:00 ingo@mysql.com +2 -0
    Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
    Removing the flag HA_STATE_RNEXT_SAME from info->update
    if info->lastkey2 was reused for another purpose than
    index scanning.

  include/my_base.h
    1.66 06/03/10 15:03:00 ingo@mysql.com +1 -1
    Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
    Changed the comment for HA_STATE_RNEXT_SAME as a warning
    for future uses.

ChangeSet
  1.2453.1.13 06/03/10 11:37:28 joerg@mysql.com +1 -0
  Merge mysql.com:/M41/comment-4.1 into mysql.com:/M41/mysql-4.1

  scripts/make_binary_distribution.sh
    1.92 06/03/10 11:37:25 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2453.22.1 06/03/09 11:10:24 jonas@perch.ndb.mysql.com +1 -0
  bug#18040 - ndb online index build
    (not possible from SQL in 4.1 & 5.0)

  ndb/src/kernel/blocks/suma/Suma.hpp
    1.3 06/03/09 11:10:19 jonas@perch.ndb.mysql.com +2 -1
    fix incorrect union

ChangeSet
  1.2453.1.12 06/03/08 19:15:56 kent@mysql.com +3 -0
  mysql-test-run.pl, mtr_cases.pl
    - Back porting of some changes in later releases
    - Corrected valgrind support
    - Removed work around for TZ needed in VisualStudio 6
    - Don't restart master to add special settings from "<testcase>-master.opt",
      if same settngs as running master, feature request in bug#12433
    - With --reorder, keep tests with same *-master.opt content together,
      to save even more master restarts

  mysql-test/mysql-test-run.pl
    1.59 06/03/08 18:31:00 kent@mysql.com +25 -13
    Handle pseudo option --timezone=<spec> that sets TZ

  mysql-test/lib/mtr_cases.pl
    1.10 06/03/08 11:34:22 kent@mysql.com +2 -3
    Removed special code for Windows as in VC6 we unset
    TZ to avoid library bug

  mysql-test/lib/mtr_cases.pl
    1.9 06/03/08 11:29:17 kent@mysql.com +15 -2
    With --reorder, keep tests with same *-master.opt content together

  mysql-test/lib/mtr_misc.pl
    1.6 06/03/08 11:28:23 kent@mysql.com +42 -0
    Added functions to compare lists of options

ChangeSet
  1.2453.21.1 06/03/08 10:15:48 msvensson@neptunus.(none) +3 -0
  Bug#17137 Running "truncate table" on temporary table leaves the table open on a slave
   - Decrease "slave_open_temp_tables" during reopen of truncated table.
   - Add test "rpl_trunc_temp" 

  mysql-test/t/rpl_trunc_temp.test
    1.1 06/03/08 10:15:44 msvensson@neptunus.(none) +35 -0
    New BitKeeper file ``mysql-test/t/rpl_trunc_temp.test''

  mysql-test/r/rpl_trunc_temp.result
    1.1 06/03/08 10:15:44 msvensson@neptunus.(none) +22 -0
    New BitKeeper file ``mysql-test/r/rpl_trunc_temp.result''

  mysql-test/t/rpl_trunc_temp.test
    1.0 06/03/08 10:15:44 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug17137/my41-bug17137/mysql-test/t/rpl_trunc_temp.test

  mysql-test/r/rpl_trunc_temp.result
    1.0 06/03/08 10:15:44 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug17137/my41-bug17137/mysql-test/r/rpl_trunc_temp.result

  sql/sql_delete.cc
    1.139 06/03/08 10:15:43 msvensson@neptunus.(none) +2 -0
    Decrease "slave_open_temp_tables" after temporary table has been closed, it will be
    increased again when the temp table is reopened after it's been truncated.

  mysql-test/mysql-test-run.pl
    1.58 06/03/08 04:07:20 kent@mysql.com +54 -12
    Back porting of changes in later releases

  mysql-test/mysql-test-run.pl
    1.57 06/03/08 04:04:11 kent@mysql.com +16 -5
    Don't restart master if no <testcase>.sh and next <testcase>-master.opt is the same as previous one, bug#12433

  mysql-test/mysql-test-run.pl
    1.56 06/03/08 04:00:51 kent@mysql.com +31 -7
    Corrected valgrind support

ChangeSet
  1.2453.1.10 06/03/08 03:51:59 kent@mysql.com +1 -0
  mysql-test-run.pl:
    Allow space in base directory path, bug#15736

  mysql-test/mysql-test-run.pl
    1.55 06/03/08 03:51:46 kent@mysql.com +2 -2
    Allow space in base directory path, bug#15736

ChangeSet
  1.2453.1.9 06/03/06 18:34:38 serg@serg.mylan +2 -0
  merged

  mysql-test/t/kill.test
    1.13 06/03/06 18:34:25 serg@serg.mylan +5 -5
    merged

  mysql-test/r/kill.result
    1.8 06/03/06 18:34:25 serg@serg.mylan +0 -0
    merged

ChangeSet
  1.2447.97.4 06/03/06 18:26:39 serg@serg.mylan +3 -0
  kill (subquery) - three years old bugfix that never worked

  sql/sql_yacc.yy
    1.397 06/03/06 18:26:23 serg@serg.mylan +7 -10
    kill (subquery) - three years old bugfix that never worked

  mysql-test/t/kill.test
    1.10.1.1 06/03/06 18:26:23 serg@serg.mylan +3 -0
    kill (subquery) - three years old bugfix that never worked

  mysql-test/r/kill.result
    1.5.1.1 06/03/06 18:26:23 serg@serg.mylan +2 -0
    kill (subquery) - three years old bugfix that never worked

ChangeSet
  1.2453.20.1 06/03/06 16:38:35 ramil@mysql.com +3 -0
  Fix for bug #17896: MIN of CASE WHEN returns non-minimum value!

  sql/item_cmpfunc.cc
    1.206 06/03/06 16:38:28 ramil@mysql.com +15 -4
    Fix for bug #17896: MIN of CASE WHEN returns non-minimum value!
    - NULL items should not affect the result type.

  mysql-test/t/case.test
    1.17 06/03/06 16:38:28 ramil@mysql.com +11 -0
    Fix for bug #17896: MIN of CASE WHEN returns non-minimum value!

  mysql-test/r/case.result
    1.17 06/03/06 16:38:28 ramil@mysql.com +8 -0
    Fix for bug #17896: MIN of CASE WHEN returns non-minimum value!

ChangeSet
  1.2453.1.7 06/03/06 14:03:40 gluh@eagle.intranet.mysql.r18.ru +3 -0
  Fix for bug#14385 GRANT and mapping to correct user account problems
    Check if the host of table hash record exactly matches host from GRANT command

  sql/sql_acl.cc
    1.174 06/03/06 14:02:54 gluh@mysql.com +4 -1
    Fix for bug#14385 GRANT and mapping to correct user account problems
      Check if the host of table hash record exactly matches host from GRANT command

  mysql-test/t/grant.test
    1.34 06/03/06 14:02:53 gluh@mysql.com +16 -0
    Fix for bug#14385 GRANT and mapping to correct user account problems
      test case

  mysql-test/r/grant.result
    1.41 06/03/06 14:02:53 gluh@mysql.com +18 -0
    Fix for bug#14385 GRANT and mapping to correct user account problems
      test case

ChangeSet
  1.2453.1.6 06/03/05 00:38:54 konstantin@mysql.com +2 -0
  Revert the changeset for Bug#16144 "mysql_stmt_attr_get type error":
  it breaks binary compatibility. The patch will be left intact
  in 5.1.

  tests/mysql_client_test.c
    1.165 06/03/05 00:38:41 konstantin@mysql.com +0 -20
    Revert the changeset for Bug#16144: it breaks binary compatibility.

  libmysql/libmysql.c
    1.301 06/03/05 00:38:40 konstantin@mysql.com +1 -1
    Revert the changeset for Bug#16144: it breaks binary compatibility.

ChangeSet
  1.2453.1.5 06/03/04 22:33:19 konstantin@mysql.com +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/opt/local/work/mysql-4.1-root

  mysql-test/t/heap.test
    1.25 06/03/04 22:33:10 konstantin@mysql.com +0 -2
    Auto merged

  mysql-test/r/heap.result
    1.32 06/03/04 22:33:10 konstantin@mysql.com +0 -2
    Auto merged

ChangeSet
  1.2453.2.30 06/03/03 13:57:49 paul@snake-hub.snake.net +1 -0
  mysqltest.c:
    Better fix for do_sleep().

  client/mysqltest.c
    1.194 06/03/03 13:57:16 paul@snake-hub.snake.net +5 -4
    Better fix for do_sleep().

ChangeSet
  1.2453.19.1 06/03/02 18:15:42 joerg@mysql.com +1 -0
  Merge mysql.com:/M40/comment-4.0 into mysql.com:/M41/comment-4.1

  scripts/make_binary_distribution.sh
    1.90.1.1 06/03/02 18:15:39 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2453.2.29 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.91 06/03/02 10:48:44 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2453.2.28 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.2453.18.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.870.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.870.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.2453.18.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.2453.2.27 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.870.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.2453.2.26 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.262 06/03/01 17:43:12 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2453.17.1 06/03/01 17:58:01 bar@mysql.com +3 -0
    Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE)
  union.result, union.test:
    Adding test case.
  item.cc:
    Allow safe character set conversion in UNION
    - string constant to column's charset
    - to unicode
    Thus, UNION now works the same with CONCAT (and other string functions)
    in respect of aggregating arguments with different character sets.

  mysql-test/r/union.result
    1.95 06/03/01 17:54:56 bar@mysql.com +11 -1
    Adding test case.

  mysql-test/t/union.test
    1.89 06/03/01 17:54:50 bar@mysql.com +10 -1
    Adding test case.

  sql/item.cc
    1.231 06/03/01 17:53:13 bar@mysql.com +1 -1
    Allow character set conversion in UNION
    - string to column's charset
    - to unicode
    Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE)

ChangeSet
  1.2453.16.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.54 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.2453.16.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.260.1.1 06/03/01 13:10:57 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.869.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.2453.2.25 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.18 06/02/28 17:52:50 paul@snake-hub.snake.net +4 -0
    Add real_sleep tests.

ChangeSet
  1.2453.2.24 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.261 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.14 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.193 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.2453.2.23 06/02/28 14:00:17 paul@snake-hub.snake.net +1 -0
  mysqltest.c:
    Correct/clarify comments.

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

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

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

ChangeSet
  1.2453.15.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.48 06/02/23 23:41:06 konstantin@mysql.com +0 -1
    A post-review fix (Bug#13134)

  mysql-test/t/heap.test
    1.23.1.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.47 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.30.1.1 06/02/23 23:41:06 konstantin@mysql.com +2 -2
    Remove 'delayed' to make the test deterministic.

ChangeSet
  1.2453.15.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.305 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.476 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.131 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.227.1.2 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.47 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.46 06/02/21 19:52:14 konstantin@mysql.com +17 -0
    Test results fixed (Bug#13134)

ChangeSet
  1.2456 06/02/20 12:28:58 ingo@mysql.com +1 -0
  Merge mysql.com:/home/mydev/mysql-4.0-bug5390
  into  mysql.com:/home/mydev/mysql-4.1-bug5390

  sql/lock.cc
    1.66 06/02/20 12:28:52 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.1.827 06/02/20 12:28:07 ingo@mysql.com +1 -0
  BUG#5390 - problems with merge tables
  This fix is necessary because thr_multi_lock()
  reorderes the lock data references array.

  sql/lock.cc
    1.38.1.19 06/02/20 12:28:05 ingo@mysql.com +16 -4
    BUG#5390 - problems with merge tables
    This fix is necessary because thr_multi_lock()
    reorderes the lock data references array.

ChangeSet
  1.2453.14.1 06/02/16 19:45:57 ingo@mysql.com +1 -0
  Bug#11527 - Setting myisam_repair_threads to >1 leads to corruption
  A wrong cast led to numeric overflow for data files
  greater than 4GB. The parallel repair assumed end of
  file after reading the amount of data that the file
  was bigger than 4GB. It truncated the data file and
  noted the number of records it found so far in the
  index file header as the number of rows in the table.
  Removing the cast fixed the problem.
  I added some cosmetic changes too.
  
  The normal repair worked because it uses a different
  function to read from the data file.

  mysys/mf_iocache.c
    1.48 06/02/16 19:45:54 ingo@mysql.com +75 -28
    Bug#11527 - Setting myisam_repair_threads to >1 leads to corruption
    The pure fix was to remove a cast from a file offset difference.
    Supplemented this with warnings in function comments,
    a change from == to <= to be slightly more safe,
    a renaming from "read_len" to "left_length" to make the
    partial code duplication between _my_b_read() and _my_b_read_r()
    more obvious and easier to compare the functions,
    removed another unnecessary (but harmless) cast,
    and fixed coding sytle around the "left_length" changes.

ChangeSet
  1.1346.868.3 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

ChangeSet
  1.2453.2.16 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.260 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.53 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.2447.102.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.21 06/02/11 22:50:52 knielsen@mysql.com +9 -1
    Fix race (on some platforms) when killing processes.

ChangeSet
  1.2453.12.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.58 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.179 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.28 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.26 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.2447.101.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.113 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.2453.11.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.188 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.16 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.10 06/02/10 15:12:21 aelkin@mysql.com +18 -1
    changed in 5.0 

  client/mysql.cc
    1.218 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.2453.8.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.60 06/02/10 09:42:32 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

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

ChangeSet
  1.2447.75.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.25.1.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.8 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.2447.75.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.56.1.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.2453.8.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.24 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.31 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.2453.10.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.12 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.7 06/02/07 13:45:13 bell@sanja.is.com.ua +1 -1
    This result chenged because of the correspondent test change.

ChangeSet
  1.2453.10.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.178 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.2453.8.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.129 06/02/07 13:49:52 svoj@april.(none) +0 -0
    Auto merged

ChangeSet
  1.2453.10.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.87 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.177 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.2447.75.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.56.1.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.45 06/02/06 11:42:43 jonas@perch.ndb.mysql.com +1 -1
    fix typo

ChangeSet
  1.2447.75.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.44 06/02/06 11:30:55 jonas@perch.ndb.mysql.com +13 -1
    improve error message

ChangeSet
  1.2453.10.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.12 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.24 06/02/05 22:06:16 pekka@mysql.com +63 -19
    do batched deletes + list commit across open cursor test cases

ChangeSet
  1.2453.10.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.20 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.15 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.15 06/02/03 15:22:46 pekka@mysql.com +7 -0
    replace+tinyblob back-patch from 5.0

ChangeSet
  1.2453.9.2 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.265 06/02/03 14:09:30 svoj@april.(none) +2 -0
    Reset variables used by fulltext

  sql/item_func.h
    1.127.1.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.2447.100.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.198 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.2453.9.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.164 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.300 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.2453.8.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.128 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.77 06/02/01 20:40:10 svoj@april.(none) +12 -0
    Testcase for BUG#14496.

  mysql-test/r/fulltext.result
    1.78 06/02/01 20:40:10 svoj@april.(none) +11 -0
    Testcase for BUG#14496.

ChangeSet
  1.2447.99.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.132 06/01/31 12:47:19 msvensson@neptunus.(none) +10 -3
    Don't call "send_ok" if in silent mode.

  client/mysqltest.c
    1.190 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.2453.8.3 06/01/31 08:13:42 pekka@mysql.com +1 -0
  ndb - testBlobs 'perf test' fix

  ndb/test/ndbapi/testBlobs.cpp
    1.23 06/01/31 08:12:02 pekka@mysql.com +12 -6
    setValue buffer was not fullsize

ChangeSet
  1.2451.3.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.54 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.23 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.2451.3.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.79 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.108 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.66 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.2453.2.14 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.52 06/01/28 13:03:27 kent@mysql.com +13 -3
    Aligned the MTR_BUILD_THREAD policy to shell version

ChangeSet
  1.2453.2.13 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.259 06/01/28 12:39:22 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.868.2 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.2453.7.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.59 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.2453.6.1 06/01/27 13:23:10 msvensson@neptunus.(none) +1 -0
  Enable kill test

  mysql-test/t/disabled.def
    1.2 06/01/27 13:23:07 msvensson@neptunus.(none) +0 -1
    Enable the kill test

ChangeSet
  1.2453.2.10 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.404 06/01/27 12:09:14 kent@mysql.com +2 -2
    New release number

ChangeSet
  1.2453.2.9 06/01/27 01:38:05 kent@mysql.com +1 -0
  configure.in:
    Generated "libmysql.ver" will be in \$(top_builddir)

  configure.in
    1.403 06/01/27 01:37:13 kent@mysql.com +1 -1
    Generated "libmysql.ver" will be in \$(top_builddir)

ChangeSet
  1.2453.2.7 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.449 06/01/26 16:00:46 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.2453.4.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.2453.4.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.475 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.2453.2.6 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.17 06/01/26 10:16:20 tomas@poseidon.ndb.mysql.com +5 -0
    reserved config numbers in ndb

ChangeSet
  1.2453.2.5 06/01/26 00:09:04 sergefp@mysql.com +1 -0
  BUG#15935: post-review fixes: added comment

  sql/sql_update.cc
    1.153 06/01/26 00:09:01 sergefp@mysql.com +10 -0
    BUG#15935: post-review fixes: added comment

ChangeSet
  1.2453.2.4 06/01/26 00:06:20 sergefp@mysql.com +2 -0
  Merge

  mysql-test/t/update.test
    1.28 06/01/26 00:06:17 sergefp@mysql.com +0 -1
    Merge

  mysql-test/r/update.result
    1.30 06/01/26 00:06:17 sergefp@mysql.com +0 -0
    Merge

ChangeSet
  1.2453.2.3 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.264 06/01/25 23:25:50 evgen@moonbone.local +0 -1
    Small fix after merge of fix for bug#16510

ChangeSet
  1.2453.3.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.152 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.26.1.1 06/01/25 23:25:19 sergefp@mysql.com +12 -0
    Testcase for BUG#15935

  mysql-test/r/update.result
    1.28.1.1 06/01/25 23:25:19 sergefp@mysql.com +15 -0
    Testcase for BUG#15935

ChangeSet
  1.2453.2.2 06/01/24 22:10:39 evgen@moonbone.local +3 -0
  Manually merged

  mysql-test/t/update.test
    1.27 06/01/24 22:10:37 evgen@moonbone.local +8 -8
    Manually merged

  mysql-test/r/update.result
    1.29 06/01/24 22:10:37 evgen@moonbone.local +4 -4
    Manually merged

  sql/sql_base.cc
    1.263 06/01/24 21:50:09 evgen@moonbone.local +0 -0
    Auto merged

ChangeSet
  1.2451.3.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.28 06/01/24 13:54:30 joerg@mysql.com +2 -0
    Disable warnings if "InnoDB" is not configured ("classic" build) (bug#16730).

ChangeSet
  1.2453.1.1 06/01/24 13:58:28 ramil@mysql.com +1 -0
  Fix for bug #15756: incorrect ip address matching in ACL due to use of latin1 collation.
  Thanks Deomid Ryabkov <mysqlbugs@rojer.pp.ru> for the great help!

  sql/hostname.cc
    1.31 06/01/24 13:58:16 ramil@mysql.com +1 -1
    Fix for bug #15756: incorrect ip address matching in ACL due to use of latin1 collation.
    - use my_charset_bin instead of my_charset_latin1 to properly compare IP addresses.

ChangeSet
  1.1346.868.1 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.2455 06/01/23 19:19:29 ingo@mysql.com +4 -0
  Merge mysql.com:/home/mydev/mysql-4.0-bug5390
  into  mysql.com:/home/mydev/mysql-4.1-bug5390

  sql/lock.cc
    1.65 06/01/23 19:19:26 ingo@mysql.com +25 -77
    BUG#5390 - problems with merge tables
    Manual merge from 4.0.

  mysql-test/t/lock.test
    1.13 06/01/23 19:19:26 ingo@mysql.com +0 -2
    BUG#5390 - problems with merge tables
    Manual merge from 4.0.

  mysql-test/r/lock.result
    1.15 06/01/23 19:19:26 ingo@mysql.com +0 -0
    BUG#5390 - problems with merge tables
    Manual merge from 4.0.

  sql/table.h
    1.75 06/01/23 19:13:13 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.1.826 06/01/23 19:12:29 ingo@mysql.com +4 -0
  BUG#5390 - problems with merge tables
  After-fix optimizations proposed and finally
  implemented by Monty.

  sql/table.h
    1.31.1.17 06/01/23 19:12:27 ingo@mysql.com +3 -0
    BUG#5390 - problems with merge tables
    After-fix optimizations proposed and finally
    implemented by Monty.
    Additional elements of TABLE.

  sql/lock.cc
    1.38.1.18 06/01/23 19:12:27 ingo@mysql.com +166 -73
    BUG#5390 - problems with merge tables
    After-fix optimizations proposed and finally
    implemented by Monty.
    get_lock_data() gets a flag for storing the lock
    positions in the new TABLE elements.
    mysql_lock_remove() can now remove a lock faster
    and more precisely as it has needed info in TABLE now.
    mysql_unlock_read_tables() and mysql_lock_merge() must 
    now adjust the new elements of TABLE when modifying locks.
    mysql_lock_have_duplicate() can now work faster on
    the existing lock as the positions in the lock
    arrays are known for each table.
    get_lock_data() assigns the new TABLE elements 
    on request of the new flag.

  mysql-test/t/lock.test
    1.7.1.2 06/01/23 19:12:27 ingo@mysql.com +20 -0
    BUG#5390 - problems with merge tables
    After-fix optimizations proposed and finally
    implemented by Monty.
    Additional tests.

  mysql-test/r/lock.result
    1.9.1.2 06/01/23 19:12:27 ingo@mysql.com +11 -0
    BUG#5390 - problems with merge tables
    After-fix optimizations proposed and finally
    implemented by Monty.
    Additional test results.

ChangeSet
  1.2451.2.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.11 06/01/23 17:15:31 svoj@april.(none) +5 -0
    Added a testcase for BUG#16489.

  myisam/ft_update.c
    1.36 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.2449 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.257 06/01/21 17:53:24 hf@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.2447.97.3 06/01/20 00:08:26 stewart@mysql.com +1 -0
  reintroduce --no-defaults to ndb_mgmd

  mysql-test/ndb/ndbcluster.sh
    1.41 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.2447.98.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.40 06/01/19 22:50:51 stewart@mysql.com +1 -1
    small fix to make ndb_mgmd run

ChangeSet
  1.2447.97.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.163 06/01/18 22:50:26 konstantin@mysql.com +65 -0
    A test case for Bug#15613

  sql/protocol.cc
    1.105 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.2447.96.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.447.1.1 06/01/18 14:12:21 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2447.73.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.448 06/01/18 13:49:33 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_class.cc
    1.204 06/01/18 13:49:33 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.2447.95.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.79 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.443.1.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.202.1.1 06/01/18 13:48:54 bell@sanja.is.com.ua +3 -0
    Debug prints are added.

  mysql-test/t/kill.test
    1.11 06/01/18 13:48:54 bell@sanja.is.com.ua +48 -1
    BUG#14851 test

  mysql-test/r/kill.result
    1.6 06/01/18 13:48:54 bell@sanja.is.com.ua +13 -1
    BUG#14851 test

ChangeSet
  1.2447.94.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.446.1.1 06/01/18 12:28:46 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2447.93.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.162 06/01/17 23:19:39 konstantin@mysql.com +20 -0
    A test case for Bug#16144

  libmysql/libmysql.c
    1.299 06/01/17 23:19:38 konstantin@mysql.com +1 -1
    Fix Bug#16144 "mysql_stmt_attr_get type error"

ChangeSet
  1.2447.93.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.402 06/01/18 00:02:21 svoj@april.(none) +0 -0
    Auto merged

ChangeSet
  1.2447.73.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.447 06/01/17 19:40:33 msvensson@devsrv-b.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2447.92.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.444.2.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.2447.91.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.58 06/01/17 18:51:05 svoj@april.(none) +1 -1
    libmysqlclient versioning when linked with GNU ld.

  configure.in
    1.400.1.1 06/01/17 18:51:05 svoj@april.(none) +10 -1
    libmysqlclient versioning when linked with GNU ld.

  BitKeeper/etc/ignore
    1.234 06/01/17 18:51:05 svoj@april.(none) +1 -0
    Added libmysql/libmysql.ver to the ignore list

ChangeSet
  1.2447.73.12 06/01/17 12:55:30 joerg@mysql.com +1 -0
  Increase the version number to 4.1.18

  configure.in
    1.401 06/01/17 12:55:26 joerg@mysql.com +2 -2
    Increase the version number to 4.1.18

ChangeSet
  1.2447.73.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.2447.90.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.46 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.27 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.45 06/01/17 01:02:57 konstantin@mysql.com +0 -19
    Test results changed (Bug#13337)

  mysql-test/r/ctype_ucs.result
    1.28 06/01/17 01:02:57 konstantin@mysql.com +19 -0
    Test results changed (Bug#13337)

ChangeSet
  1.2447.88.4 06/01/16 16:21:41 andrey@lmy004. +3 -0
  Merge

  sql/sql_table.cc
    1.304 06/01/16 16:21:39 andrey@lmy004. +0 -0
    SCCS merged

  mysql-test/t/create.test
    1.60 06/01/16 16:18:09 andrey@lmy004. +0 -0
    Auto merged

  mysql-test/r/create.result
    1.87 06/01/16 16:18:09 andrey@lmy004. +0 -0
    Auto merged

ChangeSet
  1.2447.78.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.97 06/01/16 15:44:53 gvb@phoenix.(none) +1 -1

  mysql-test/r/date_formats.result
    1.18 06/01/16 15:44:52 gvb@phoenix.(none) +3 -0

  mysql-test/t/date_formats.test
    1.15 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.2447.80.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.153 06/01/16 12:46:05 msvensson@neptunus.(none) +0 -2
    Merge 4.0 -> 4.1, change is already in 4.1

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.

ChangeSet
  1.2447.89.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.213 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.78 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.107 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.104 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.37 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.2447.78.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.96 06/01/14 16:06:22 gvb@phoenix.(none) +0 -1
    fix for bug #15828 after review

ChangeSet
  1.2447.78.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.95 06/01/14 09:51:39 gvb@phoenix.(none) +2 -1
    fix for bug#15828 after review

ChangeSet
  1.2447.88.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.113 06/01/14 04:55:01 konstantin@mysql.com +1 -0
    Add Item_func_like::cleanup()

  sql/item_cmpfunc.cc
    1.205 06/01/14 04:55:01 konstantin@mysql.com +6 -0
    Reset canDoTurboBM in Item_func_like::cleanup()

  mysql-test/t/ps.test
    1.45 06/01/14 04:55:00 konstantin@mysql.com +30 -0
    A test case for Bug#12734

  mysql-test/r/ps.result
    1.44 06/01/14 04:55:00 konstantin@mysql.com +34 -0
    Test results fixed (Bug#12734)

ChangeSet
  1.2447.73.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.23 06/01/13 17:44:58 joerg@mysql.com +0 -0
    Auto merged

  extra/comp_err.c
    1.12 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.2447.78.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.94 06/01/13 14:40:51 gvb@phoenix.(none) +1 -1

  mysql-test/r/date_formats.result
    1.17 06/01/13 14:40:46 gvb@phoenix.(none) +6 -0
    bk commit

  mysql-test/t/date_formats.test
    1.14 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.2447.78.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.59 06/01/13 09:29:21 jonas@perch.ndb.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2447.85.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.73 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.11 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.2447.78.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.609 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.9 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.28 06/01/12 17:27:19 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

  include/config-netware.h
    1.11 06/01/12 17:27:19 jani@ua141d10.elisa.omakaista.fi +1 -1
    Auto merged

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.51.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.4.1.4 06/01/12 15:10:10 jani@ua141d10.elisa.omakaista.fi +3 -0
    NetWare specific change to increase thread stack size.

ChangeSet
  1.2447.84.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.35 06/01/11 17:31:45 konstantin@mysql.com +23 -23
    rename sha1_* to mysql_sha1_*

  sql/item_strfunc.cc
    1.239 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.2447.78.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.66 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.262 06/01/10 19:13:08 monty@mysql.com +16 -4
    Added more comments

ChangeSet
  1.2447.78.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.446 06/01/10 18:03:51 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2447.78.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.

  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.14 06/01/10 17:55:54 aivanov@mysql.com +0 -24
    Fixing testcases results.

ChangeSet
  1.2447.81.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.173 06/01/09 10:57:23 msvensson@devsrv-b.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2447.80.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.170.1.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.33 06/01/09 10:31:01 msvensson@neptunus.(none) +12 -0
    Test user with host ''

  mysql-test/r/grant.result
    1.40 06/01/09 10:31:01 msvensson@neptunus.(none) +9 -0
    Test user with host ''

ChangeSet
  1.2447.79.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.65 06/01/09 11:10:45 monty@mysql.com +3 -0
    After merge fix (Lines lost in manual merge)

ChangeSet
  1.2447.79.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.64 06/01/08 19:07:47 monty@mysql.com +0 -8
    manual merge

  sql/item_cmpfunc.cc
    1.204 06/01/08 19:07:47 monty@mysql.com +0 -1
    merge (keep old code)

  sql/sql_select.cc
    1.444.1.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.54 06/01/08 19:01:20 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2447.78.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.445 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.13 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.14 06/01/07 22:59:56 igor@rurik.mysql.com +13 -0
    Added a test case for bug #14274.

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.2447.78.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.96 06/01/04 17:35:18 konstantin@mysql.com +6 -4
    - adjust to a changed declaration of hash_replace

  sql/sql_base.cc
    1.261 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.172 06/01/04 17:35:17 konstantin@mysql.com +5 -4
    - adjust to changed declarations of hash_search, hash_next

  sql/lock.cc
    1.64 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.44 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.2447.75.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.13 06/01/04 11:38:56 jonas@perch.ndb.mysql.com +20 -7
    Make testDatabuffer clean up tables

ChangeSet
  1.2447.73.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.4 05/12/31 10:52:38 pekka@mysql.com +2 -0
    detached trigger fix from 5.0

ChangeSet
  1.2447.77.1 05/12/28 09:23:27 msvensson@neptunus.(none) +3 -0
  BUG#15775 "drop user" command does not refresh acl_check_hosts
     - DROP USER command didn't reload the acl_check_hosts cache causing subsequent 
       connect's via TCP to fail randomly.
     - 4.1 version

  sql/sql_acl.cc
    1.171 05/12/28 09:23:21 msvensson@neptunus.(none) +12 -4
    Reload acl_check_hosts as its memory is mapped to acl_user
    Use acl_user->host.hostname when searching the acl_check_hosts list

  mysql-test/t/grant2.test
    1.15 05/12/28 09:23:21 msvensson@neptunus.(none) +33 -0
    Add test for to check that connect via TCP work after "drop user"

  mysql-test/r/grant2.result
    1.14 05/12/28 09:23:21 msvensson@neptunus.(none) +12 -0
    Update test results

ChangeSet
  1.2447.76.1 05/12/27 20:16:59 evgen@moonbone.local +3 -0
  Fix bug#14583 
  
  When InnoDB compares varchar field in ucs2 with given key using bin collation,
  it calls my_strnncollsp_ucs2_bin() to perform comparison.
  Because field length was lesser than length of key field should be padded
  with trailing spaces in order to get correct result. 
  Because  my_strnncollsp_ucs2_bin() was calling my_strnncollp_ucs2_bin(), which
  doesn't pads field, wrong comparison result was returned. This results in
  wrong result set.
  
  my_strnncollsp_ucs2_bin() now compares fields like my_strnncollsp_ucs2 do,
  but using binary collation.

  strings/ctype-ucs2.c
    1.45.1.1 05/12/27 20:15:43 evgen@moonbone.local +39 -2
    Fix bug#14583 Wrong my_strnncollsp_ucs2_bin() behaviour results in skipping
    correct records.my_strnncollsp_ucs2_bin() now compares fields like my_strnncollsp_ucs2 do,
    but using binary collation.

  mysql-test/r/ctype_ucs.result
    1.27 05/12/27 20:15:25 evgen@moonbone.local +7 -0
    Test case for bug#14583  Wrong my_strnncollsp_ucs2_bin() behaviour results in skipping correct records.

  mysql-test/t/ctype_ucs.test
    1.26 05/12/27 20:14:51 evgen@moonbone.local +8 -0
    Test case for bug#14583  Wrong my_strnncollsp_ucs2_bin() behaviour results in skipping
    correct records.

ChangeSet
  1.2447.73.4 05/12/27 10:36:19 ingo@mysql.com +2 -0
  Merge mysql.com:/home/mydev/mysql-4.1
  into  mysql.com:/home/mydev/mysql-4.1-bug5390

  sql/sql_update.cc
    1.151 05/12/27 10:36:11 ingo@mysql.com +0 -0
    Auto merged

  libmysqld/ha_blackhole.cc
    1.3 05/12/27 10:36:11 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2447.73.3 05/12/23 12:38:22 serg@serg.mylan +1 -0
  correct help text

  sql/mysqld.cc
    1.608 05/12/23 12:38:14 serg@serg.mylan +1 -1
    correct help text

ChangeSet
  1.2447.75.1 05/12/21 16:31:58 jonas@perch.ndb.mysql.com +2 -0
  bug#15908 - ndb 
    When scan is completed, but lqhkeyreq is outstanding on primary replica and
    starting node dies, scan will not be closed leading to error handling of failed
    node not completing

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.56.1.3 05/12/21 16:31:56 jonas@perch.ndb.mysql.com +9 -0
    Set scan state to WAIT_LQHKEY_COPY when scan is finished but LQHKEYREQ is outstanding

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.13 05/12/21 16:31:56 jonas@perch.ndb.mysql.com +3 -1
    New error code

ChangeSet
  1.2447.74.1 05/12/20 12:47:44 paul@snake-hub.snake.net +1 -0
  mysql.cc:
    Typo in help message.

  client/mysql.cc
    1.217 05/12/20 12:47:23 paul@snake-hub.snake.net +1 -1
    Typo in help message.

ChangeSet
  1.2447.73.1 05/12/21 00:18:58 stewart@mysql.com +1 -0
  build fix

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.30 05/12/21 00:18:55 stewart@mysql.com +1 -1
    build fix

ChangeSet
  1.2447.72.1 05/12/19 15:52:10 bar@mysql.com +3 -0
    Bug#15581: COALESCE function truncates mutli-byte TINYTEXT values
  field.cc:
    BLOB variations have number-in-bytes limit,
    unlike CHAR/VARCHAR which have number-of-characters limits.
    A tinyblob column can store up to 255 bytes.
    In the case of basic Latin letters (which use 1 byte per character)
    we can store up to 255 characters in a tinyblob column.
    When passing an utf8 tinyblob column as an argument into
    a function (e.g. COALESCE) we need to reserve 3*255 bytes.
    I.e. multiply length in bytes to mbcharlen for the character set.
    Although in reality a tinyblob column can never be 3*255 bytes long,
    we need to set max_length to multiply to make fix_length_and_dec()
    of the function-caller (e.g. COALESCE) calculate the correct max_length
    for the column being created.
  
  ctype_utf8.result, ctype_utf8.test:
    Adding test case.

  sql/field.cc
    1.227.1.1 05/12/19 15:28:38 bar@mysql.com +3 -3
    Bug#15581: COALESCE function truncates mutli-byte TINYTEXT values
    BLOB variations have byte limits,
    unlike CHAR/VARCHAR which have number-of-character limits.
    It means tinyblob can store up to 255 bytes.
    All of them can be basic latin letters which use 1 byte
    per character.
    I.e. we can store up to 255 characters in a tinyblob column.
    When passing a tinyblob column as an argument into
    a function (for example COALESCE or CONCAT) we
    need to reserve 3*255 bytes in the case of utf-8.
    I.e. multiply length in bytes to mbcharlen for the
    character set.

  mysql-test/r/ctype_utf8.result
    1.68 05/12/19 15:28:05 bar@mysql.com +8 -0
    Adding test case.

  mysql-test/t/ctype_utf8.test
    1.70 05/12/19 15:27:57 bar@mysql.com +10 -0
    Adding test case.

ChangeSet
  1.2447.1.17 05/12/19 14:21:42 holyfoot@deer.(none) +1 -0
  bug #15429 (Test 'func_math' not prepared for 'classic' build)

  mysql-test/t/func_math.test
    1.19 05/12/19 14:20:47 holyfoot@mysql.com +2 -0
    warnings disabled on CREATE TABLE INNODB

ChangeSet
  1.2447.1.16 05/12/19 19:06:12 stewart@mysql.com +2 -0
  Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
  into  mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.58 05/12/19 19:06:09 stewart@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.29 05/12/19 19:06:09 stewart@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2447.71.1 05/12/19 19:00:17 stewart@mysql.com +1 -0
  Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
  into  mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.23 05/12/19 19:00:11 stewart@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2447.1.14 05/12/18 14:55:05 kent@mysql.com +1 -0
  Merge

  BUILD/Makefile.am
    1.7 05/12/18 14:55:00 kent@mysql.com +12 -1

ChangeSet
  1.1346.1.820 05/12/18 14:51:19 kent@mysql.com +1 -0
  Makefile.am:
    Adjusted listing of files to put into source TAR

  BUILD/Makefile.am
    1.4.1.2 05/12/18 14:49:51 kent@mysql.com +0 -1

  BUILD/Makefile.am
    1.4.1.1 05/12/18 14:45:14 kent@mysql.com +5 -1
    Adjusted listing of files to put into source TAR

ChangeSet
  1.2447.70.1 05/12/18 13:30:01 serg@serg.mylan +3 -0
  BUG#11336 - fulltext index corruption after repair_by_sort and mi_delete
  
  for uca collation isalnum and strnncollsp don't agree on whether
  0xC2A0 is a space (strnncollsp is right, isalnum is wrong).
  
  they still don't, the bug was fixed by avoiding strnncollsp

  mysql-test/t/fulltext2.test
    1.12 05/12/18 13:29:47 serg@serg.mylan +30 -0
    BUG#11336 - fulltext index corruption after repair_by_sort and mi_delete
    
    for uca collation isalnum and strnncollsp don't agree on whether
    0xC2A0 is a space (strnncollsp is right, isalnum is wrong).
    
    they still don't, the bug was fixed by avoiding strnncollsp

  mysql-test/r/fulltext2.result
    1.10 05/12/18 13:29:47 serg@serg.mylan +21 -0
    BUG#11336 - fulltext index corruption after repair_by_sort and mi_delete
    
    for uca collation isalnum and strnncollsp don't agree on whether
    0xC2A0 is a space (strnncollsp is right, isalnum is wrong).
    
    they still don't, the bug was fixed by avoiding strnncollsp

  myisam/mi_delete.c
    1.33 05/12/18 13:29:47 serg@serg.mylan +1 -1
    BUG#11336 - fulltext index corruption after repair_by_sort and mi_delete
    
    for uca collation isalnum and strnncollsp don't agree on whether
    0xC2A0 is a space (strnncollsp is right, isalnum is wrong).
    
    they still don't, the bug was fixed by avoiding strnncollsp

ChangeSet
  1.2447.69.3 05/12/15 18:48:08 aivanov@mysql.com +3 -0
  Fixed BUG #12440: "Incorrect processing of time values containing
   long fraction and/or large exponent part".

  sql-common/my_time.c
    1.15 05/12/15 18:48:01 aivanov@mysql.com +22 -6
    Fixed bug #12440: "Incorrect processing of time values containing
     long fraction and/or large exponent part".
     Modified str_to_time(). Process properly fraction part containing
     more than 6 digits. Check for existence of exponent part which
     may result from %g formatting applied to time value specified as
     large real number.

  mysql-test/t/type_time.test
    1.7 05/12/15 18:48:01 aivanov@mysql.com +14 -0
    Added testcases for bug #12440

  mysql-test/r/type_time.result
    1.13 05/12/15 18:48:01 aivanov@mysql.com +24 -0
    Fixed testcases results (bug #12440)

ChangeSet
  1.2447.69.2 05/12/15 02:11:21 rparranovo@mysql.com +1 -0
  Makefile.am:
    - libtool wants spaces on parameters for its command line options

  zlib/Makefile.am
    1.5 05/12/15 02:11:07 rparranovo@mysql.com +1 -1
    - libtool wants spaces on parameters for its command line options

ChangeSet
  1.2447.69.1 05/12/15 00:54:15 rparranovo@mysql.com +1 -0
  Makefile.am:
    - Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0

  zlib/Makefile.am
    1.4 05/12/15 00:52:42 rparranovo@mysql.com +2 -0
    - Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0

ChangeSet
  1.2447.68.1 05/12/14 14:45:13 mskold@mysql.com +2 -0
  Fix to make ndb_multi.test (Bug #15401  NDB lock problems) more predictable

  mysql-test/t/ndb_multi.test
    1.6 05/12/14 14:44:43 mskold@mysql.com +1 -0
    Fix to make ndb_multi.test (Bug #15401  NDB lock problems) more preditable

  mysql-test/r/ndb_multi.result
    1.4 05/12/14 14:44:43 mskold@mysql.com +1 -0
    Fix to make ndb_multi.test (Bug #15401  NDB lock problems) more preditable

ChangeSet
  1.2447.57.8 05/12/13 18:30:10 jani@a193-229-222-105.elisa-laajakaista.fi +3 -0
  Minor Netware specific changes.

  sql/tztime.cc
    1.21 05/12/13 18:30:06 jani@a193-229-222-105.elisa-laajakaista.fi +5 -0
    Code not ported to Netware yet.

  scripts/make_binary_distribution.sh
    1.90 05/12/13 18:30:06 jani@a193-229-222-105.elisa-laajakaista.fi +4 -0
    Netware specific changes. Discard platform
    specific files and added a couple of missing files.

  netware/BUILD/compile-linux-tools
    1.8 05/12/13 18:30:06 jani@a193-229-222-105.elisa-laajakaista.fi +3 -2
    Fixed compilation problem with Linux tools.

ChangeSet
  1.2447.57.7 05/12/13 18:22:00 jani@a193-229-222-105.elisa-laajakaista.fi +13 -0
  Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
  into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

  netware/perror.def
    1.5 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/mysqlimport.def
    1.7 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/mysqldump.def
    1.7 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/mysqld_safe.def
    1.4 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/mysqlcheck.def
    1.7 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/mysqlbinlog.def
    1.7 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/mysqladmin.def
    1.6 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/mysql_install_db.def
    1.5 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/mysql.def
    1.6 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/myisampack.def
    1.6 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/myisamlog.def
    1.6 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/my_print_defaults.def
    1.5 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  netware/libmysql.def
    1.5 05/12/13 18:21:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

ChangeSet
  1.1346.1.819 05/12/13 17:53:26 jani@a193-229-222-105.elisa-laajakaista.fi +13 -0
  Increased stack size for clients on Netware.
  New libc suggests doing this.

  netware/perror.def
    1.3.1.1 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/mysqlimport.def
    1.4.1.2 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/mysqldump.def
    1.4.1.2 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/mysqld_safe.def
    1.2.1.1 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/mysqlcheck.def
    1.4.1.2 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/mysqlbinlog.def
    1.4.1.2 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/mysqladmin.def
    1.3.1.2 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/mysql_install_db.def
    1.3.1.1 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/mysql.def
    1.3.1.2 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/myisampack.def
    1.4.1.1 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/myisamlog.def
    1.4.1.1 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/my_print_defaults.def
    1.3.1.1 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

  netware/libmysql.def
    1.3.1.1 05/12/13 17:53:23 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Increased stack size for clients on Netware.
    New libc suggests doing this.

ChangeSet
  1.2447.1.9 05/12/13 11:48:26 jonas@perch.ndb.mysql.com +3 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push

  ndb/src/ndbapi/ndb_cluster_connection.cpp
    1.20 05/12/13 11:48:24 jonas@perch.ndb.mysql.com +0 -13
    Auto merged

  ndb/src/ndbapi/NdbRecAttr.cpp
    1.16 05/12/13 11:48:24 jonas@perch.ndb.mysql.com +0 -4
    Auto merged

  ndb/src/ndbapi/NdbImpl.hpp
    1.9 05/12/13 11:48:23 jonas@perch.ndb.mysql.com +0 -6
    Auto merged

ChangeSet
  1.2447.67.1 05/12/12 21:06:59 aivanov@mysql.com +16 -0
  Fix BUG#12071: "Windows hang: 'Opening tables' or 'Waiting for
   table' lockup".
   Changes from the innodb-4.1-ss11 snapshot.
   Do not call os_file-create_tmpfile() at runtime. Instead, create
   a tempfile at startup and guard access to it with a mutex.
   Also, fix bugs:
   10511: "Wrong padding of UCS2 CHAR columns in ON UPDATE CASCADE";
   13778: "If FOREIGN_KEY_CHECKS=0, one can create inconsistent FOREIGN
   KEYs". When FOREIGN_KEY_CHECKS=0 we still need to check that
   datatypes between foreign key references are compatible.
   Also, added test cases (also for bug 9802).

  sql/ha_innodb.cc
    1.212 05/12/12 21:06:52 aivanov@mysql.com +53 -56
    Changes from the innodb-4.1-ss11 snapshot

  mysql-test/t/innodb.test
    1.77 05/12/12 21:06:52 aivanov@mysql.com +49 -0
    Changes from the innodb-4.1-ss11 snapshot

  mysql-test/r/innodb.result
    1.106 05/12/12 21:06:52 aivanov@mysql.com +32 -0
    Changes from the innodb-4.1-ss11 snapshot

  libmysqld/ha_blackhole.cc
    1.1.1.1 05/12/12 21:06:52 aivanov@mysql.com +0 -0
    Changes from the innodb-4.1-ss11 snapshot

  innobase/srv/srv0start.c
    1.80 05/12/12 21:06:52 aivanov@mysql.com +13 -1
    Changes from the innodb-4.1-ss11 snapshot

  innobase/srv/srv0srv.c
    1.79 05/12/12 21:06:52 aivanov@mysql.com +6 -0
    Changes from the innodb-4.1-ss11 snapshot

  innobase/row/row0mysql.c
    1.93 05/12/12 21:06:52 aivanov@mysql.com +26 -38
    Changes from the innodb-4.1-ss11 snapshot

  innobase/row/row0ins.c
    1.56 05/12/12 21:06:52 aivanov@mysql.com +34 -34
    Changes from the innodb-4.1-ss11 snapshot

  innobase/rem/rem0cmp.c
    1.24 05/12/12 21:06:52 aivanov@mysql.com +6 -5
    Changes from the innodb-4.1-ss11 snapshot

  innobase/include/srv0srv.h
    1.45 05/12/12 21:06:52 aivanov@mysql.com +6 -0
    Changes from the innodb-4.1-ss11 snapshot

  innobase/include/rem0cmp.h
    1.5 05/12/12 21:06:52 aivanov@mysql.com +2 -1
    Changes from the innodb-4.1-ss11 snapshot

  innobase/include/os0file.h
    1.36 05/12/12 21:06:52 aivanov@mysql.com +1 -1
    Changes from the innodb-4.1-ss11 snapshot

  innobase/include/dict0load.h
    1.7 05/12/12 21:06:51 aivanov@mysql.com +2 -1
    Changes from the innodb-4.1-ss11 snapshot

  innobase/include/dict0dict.h
    1.33 05/12/12 21:06:51 aivanov@mysql.com +2 -1
    Changes from the innodb-4.1-ss11 snapshot

  innobase/dict/dict0load.c
    1.33 05/12/12 21:06:51 aivanov@mysql.com +5 -4
    Changes from the innodb-4.1-ss11 snapshot

  innobase/dict/dict0dict.c
    1.65 05/12/12 21:06:51 aivanov@mysql.com +13 -21
    Changes from the innodb-4.1-ss11 snapshot

ChangeSet
  1.2447.65.1 05/12/12 21:42:09 bar@mysql.com +21 -0
    Bug#15375 Unassigned multibyte codes are broken
    into parts when converting to Unicode.
  m_ctype.h:
    Reorganizing mb_wc return codes to be able
    to return "an unassigned N-byte-long character".
  sql_string.cc:
    Adding code to detect and properly handle
    unassigned characters (i.e. the those character
    which are correctly formed according to the 
    character specifications, but don't have Unicode
    mapping).
  Many files:
    Fixing conversion function to return new codes.
  ctype_ujis.test, ctype_gbk.test, ctype_big5.test:
    Adding a test case.
  ctype_ujis.result, ctype_gbk.result, ctype_big5.result:
    Fixing results accordingly.

  strings/ctype-utf8.c
    1.89 05/12/12 21:39:22 bar@mysql.com +7 -7
    Fixing conversion function to return new codes.

  strings/ctype-ujis.c
    1.65 05/12/12 21:39:20 bar@mysql.com +13 -13
    Fixing conversion function to return new codes.

  strings/ctype-ucs2.c
    1.46 05/12/12 21:39:18 bar@mysql.com +2 -2
    Fixing conversion function to return new codes.

  strings/ctype-tis620.c
    1.84 05/12/12 21:39:16 bar@mysql.com +2 -2
    Fixing conversion function to return new codes.

  strings/ctype-sjis.c
    1.82 05/12/12 21:39:14 bar@mysql.com +4 -4
    Fixing conversion function to return new codes.

  strings/ctype-simple.c
    1.68 05/12/12 21:39:13 bar@mysql.com +2 -2
    Fixing conversion function to return new codes.

  strings/ctype-latin1.c
    1.44 05/12/12 21:39:11 bar@mysql.com +2 -2
    Fixing conversion function to return new codes.

  strings/ctype-gbk.c
    1.73 05/12/12 21:39:09 bar@mysql.com +4 -4
    Fixing conversion function to return new codes.

  strings/ctype-gb2312.c
    1.57.1.1 05/12/12 21:39:07 bar@mysql.com +4 -4
    Fixing conversion function to return new codes.

  strings/ctype-euc_kr.c
    1.60.1.1 05/12/12 21:39:06 bar@mysql.com +4 -4
    Fixing conversion function to return new codes.

  strings/ctype-cp932.c
    1.8 05/12/12 21:39:04 bar@mysql.com +3 -3
    Fixing conversion function to return new codes.

  strings/ctype-bin.c
    1.59 05/12/12 21:38:59 bar@mysql.com +1 -1
    Fixing conversion function to return new codes.

  strings/ctype-big5.c
    1.80 05/12/12 21:38:37 bar@mysql.com +3 -3
    Fixing conversion function to return new codes.

  sql/sql_string.cc
    1.94 05/12/12 21:37:01 bar@mysql.com +11 -1
    Adding code to detect and properly hanlde
    unassigned characters (i.e. the those character
    which are correctly formed according to the 
    character specifications, but don't have Unicode
    mapping).

  mysql-test/t/ctype_ujis.test
    1.16 05/12/12 21:36:56 bar@mysql.com +15 -0
    Adding a test case.

  mysql-test/t/ctype_gbk.test
    1.4 05/12/12 21:36:52 bar@mysql.com +10 -0
    Adding a test case.

  mysql-test/t/ctype_big5.test
    1.11 05/12/12 21:36:47 bar@mysql.com +10 -0
    Adding a test case.

  mysql-test/r/ctype_ujis.result
    1.13 05/12/12 21:36:44 bar@mysql.com +6 -0
    Fixing results accordingly.

  mysql-test/r/ctype_gbk.result
    1.3 05/12/12 21:36:39 bar@mysql.com +3 -0
    Fixing results accordingly.

  mysql-test/r/ctype_big5.result
    1.11 05/12/12 21:36:21 bar@mysql.com +3 -0
    Fixing results accordingly.

  include/m_ctype.h
    1.106 05/12/12 21:32:42 bar@mysql.com +13 -4
    Reorganizing mb_wc return codes to be able
    to return "an unassigned N-byte long character".
    Bug#15375 Unassigned multibyte codes are broken into parts when converting to Unicode.

ChangeSet
  1.2447.64.1 05/12/12 17:51:56 joerg@mysql.com +2 -0
  rpl_until.test + rpl_until.result
  
  Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
  The value is not important, and it depends on timing. Mask it.
  
  Backport and extension of a fix made by Matthias in 5.0, originally it was
  1.1976 05/12/05 17:57:48 mleich@mysql.com

  mysql-test/t/rpl_until.test
    1.17 05/12/12 17:51:52 joerg@mysql.com +3 -3
    Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
    The value is not important, and it depends on timing. Mask it.
    
    Backport and extension of a fix made by Matthias in 5.0, originally it was
    1.1976 05/12/05 17:57:48 mleich@mysql.com

  mysql-test/r/rpl_until.result
    1.17 05/12/12 17:51:52 joerg@mysql.com +3 -3
    Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
    The value is not important, and it depends on timing. Mask it.
    
    Backport and extension of a fix made by Matthias in 5.0, originally it was
    1.1976 05/12/05 17:57:48 mleich@mysql.com

ChangeSet
  1.2442.11.13 05/12/12 17:19:04 jonas@perch.ndb.mysql.com +5 -0
  ndb - bug#15685
    Error in abort handling in TC when timeout during abort
    

  ndb/test/run-test/daily-basic-tests.txt
    1.24 05/12/12 17:19:02 jonas@perch.ndb.mysql.com +8 -0
    Test case

  ndb/test/ndbapi/testNodeRestart.cpp
    1.13 05/12/12 17:19:02 jonas@perch.ndb.mysql.com +44 -0
    Test case

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.61 05/12/12 17:19:02 jonas@perch.ndb.mysql.com +1 -2
    Dont release transaction record to early

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.56.1.2 05/12/12 17:19:02 jonas@perch.ndb.mysql.com +10 -1
    New error codes

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.12 05/12/12 17:19:02 jonas@perch.ndb.mysql.com +4 -0
    New error codes

ChangeSet
  1.2447.61.2 05/12/11 09:21:13 kent@mysql.com +1 -0
  make_win_src_distribution.sh:
    Removed Visual Studio 6 project files, as they are not maintained

  scripts/make_win_src_distribution.sh
    1.36 05/12/11 09:20:21 kent@mysql.com +2 -2
    Removed Visual Studio 6 project files, as they are not maintained

ChangeSet
  1.2447.63.1 05/12/10 18:20:00 holyfoot@deer.(none) +1 -0
  Fix for bug #14320 (MBROverlaps does wrong test)

  sql/spatial.h
    1.15 05/12/10 18:19:15 holyfoot@mysql.com +1 -1
    MBR::inner_point fixed

ChangeSet
  1.2442.11.12 05/12/09 13:51:12 jonas@perch.ndb.mysql.com +4 -0
  bug#15632 - ndb
    Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a) by also waiting for starting nodes

  ndb/test/ndbapi/testNodeRestart.cpp
    1.12 05/12/09 13:51:10 jonas@perch.ndb.mysql.com +60 -0
    Add testcase for bug#15632

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.25.1.2 05/12/09 13:51:10 jonas@perch.ndb.mysql.com +35 -3
    Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a)
      by also waiting for starting nodes 

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.11 05/12/09 13:51:10 jonas@perch.ndb.mysql.com +2 -0
    New error code for delaying INCL_NODE_REQ 

  ndb/include/ndb_version.h.in
    1.3 05/12/09 13:51:10 jonas@perch.ndb.mysql.com +3 -0
    Handle upgrade of bug fix

ChangeSet
  1.2447.62.1 05/12/09 16:37:58 bar@mysql.com +10 -0
    Bug#15377 Valid multibyte sequences are truncated on INSERT
  ctype-euc_kr.c:
  ctype-gb2312.c:
    Adding specific well_formed_length functions
    for gb2312 and euckr, to allow storing characters
    which are correct according to the character set
    specifications but just don't have Unicode mapping.
    Previously only those which have Unicode mapping
    could be stored, while unassigned characters lead
    to data truncation.
  Many files:
    new file

  strings/ctype-euc_kr.c
    1.61 05/12/09 16:35:57 bar@mysql.com +36 -1
    Adding specific well_formed_length functions
    for gb2312 and euckr, to allow storing characters
    which are correct according to the character set.
    Previously only those which have Unicode mapping
    could be stored.

  strings/ctype-gb2312.c
    1.58 05/12/09 16:34:08 bar@mysql.com +36 -1
    Bug#15377 Valid multibyte sequences are truncated on INSERT
    Adding specific well_formed_length functions
    for gb2312 and euckr, to allow storing characters
    which are correct according to the character set.
    Previously only those which have Unicode mapping
    could be stored.

  mysql-test/t/ctype_gb2312.test
    1.1 05/12/09 16:33:43 bar@mysql.com +33 -0

  mysql-test/t/ctype_euckr.test
    1.1 05/12/09 16:33:43 bar@mysql.com +33 -0

  mysql-test/t/ctype_gb2312.test
    1.0 05/12/09 16:33:43 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b15377/mysql-test/t/ctype_gb2312.test

  mysql-test/t/ctype_euckr.test
    1.0 05/12/09 16:33:43 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b15377/mysql-test/t/ctype_euckr.test

  mysql-test/include/have_gb2312.inc
    1.1 05/12/09 16:33:31 bar@mysql.com +4 -0

  mysql-test/include/have_euckr.inc
    1.1 05/12/09 16:33:31 bar@mysql.com +4 -0

  mysql-test/include/have_gb2312.inc
    1.0 05/12/09 16:33:31 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b15377/mysql-test/include/have_gb2312.inc

  mysql-test/include/have_euckr.inc
    1.0 05/12/09 16:33:31 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b15377/mysql-test/include/have_euckr.inc

  mysql-test/r/have_gb2312.require
    1.1 05/12/09 16:33:14 bar@mysql.com +2 -0

  mysql-test/r/have_euckr.require
    1.1 05/12/09 16:33:14 bar@mysql.com +2 -0

  mysql-test/r/ctype_gb2312.result
    1.1 05/12/09 16:33:14 bar@mysql.com +167 -0

  mysql-test/r/have_gb2312.require
    1.0 05/12/09 16:33:14 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b15377/mysql-test/r/have_gb2312.require

  mysql-test/r/have_euckr.require
    1.0 05/12/09 16:33:14 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b15377/mysql-test/r/have_euckr.require

  mysql-test/r/ctype_gb2312.result
    1.0 05/12/09 16:33:14 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b15377/mysql-test/r/ctype_gb2312.result

  mysql-test/r/ctype_euckr.result
    1.1 05/12/09 16:33:13 bar@mysql.com +167 -0

  mysql-test/r/ctype_euckr.result
    1.0 05/12/09 16:33:13 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b15377/mysql-test/r/ctype_euckr.result

ChangeSet
  1.2447.57.4 05/12/08 12:33:33 jimw@mysql.com +5 -0
  Fix calls to free_underlaid_joins() in INSERT, DELETE, and UPDATE
  handling so that indexes are closed before trying to commit the
  transaction. (Bug #15536)

  sql/sql_update.cc
    1.148.1.1 05/12/08 12:33:30 jimw@mysql.com +1 -1
    Move call to free_underlaid_joins() to before ha_autocommit_or_rollback().

  sql/sql_insert.cc
    1.172 05/12/08 12:33:30 jimw@mysql.com +6 -3
    Move call to free_underlaid_joins() to before ha_autocommit_or_rollback().

  sql/sql_delete.cc
    1.138 05/12/08 12:33:29 jimw@mysql.com +1 -1
    Move call to free_underlaid_joins() to before ha_autocommit_or_rollback().

  mysql-test/t/bdb.test
    1.41 05/12/08 12:33:29 jimw@mysql.com +19 -1
    Add new test

  mysql-test/r/bdb.result
    1.44 05/12/08 12:33:29 jimw@mysql.com +19 -0
    Add new results

ChangeSet
  1.2447.61.1 05/12/08 16:13:53 kent@mysql.com +2 -0
  mysqld.cc:
    Bug#14960, reverted code to make symdir work on Windows
  symlink.test:
    Disabled test case on Windows

  sql/mysqld.cc
    1.607 05/12/08 16:13:30 kent@mysql.com +2 -2
    Bug#14960, reverted code to make symdir work on Windows

ChangeSet
  1.2442.11.11 05/12/08 15:29:39 jonas@perch.ndb.mysql.com +1 -0
  bug#15587 - ndb
    Fix typo in autotest script

  ndb/test/run-test/daily-basic-tests.txt
    1.23 05/12/08 15:29:37 jonas@perch.ndb.mysql.com +1 -1
    Fix typo in autotest script

ChangeSet
  1.2442.11.10 05/12/08 15:28:15 jonas@perch.ndb.mysql.com +7 -0
  bug#15587 - ndb
    Fix error in NF during NR

  ndb/test/run-test/daily-basic-tests.txt
    1.22 05/12/08 15:28:13 jonas@perch.ndb.mysql.com +4 -0
    Add testcase for bug#15587

  ndb/test/ndbapi/testNodeRestart.cpp
    1.11 05/12/08 15:28:13 jonas@perch.ndb.mysql.com +45 -0
    Add testcase for bug#15587

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.56.1.1 05/12/08 15:28:13 jonas@perch.ndb.mysql.com +7 -2
    Add dump for ERROR 5002 with specified table

  ndb/src/kernel/blocks/dblqh/Dblqh.hpp
    1.30 05/12/08 15:28:13 jonas@perch.ndb.mysql.com +1 -0
    Add dump for ERROR 5002 with specified table

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.25.1.1 05/12/08 15:28:13 jonas@perch.ndb.mysql.com +12 -2
    Run updateNodeInfo if failed node is not in list of storedReplicas

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.10 05/12/08 15:28:13 jonas@perch.ndb.mysql.com +3 -0
    Add dump for ERROR 5002 with specified table

  ndb/include/kernel/signaldata/DumpStateOrd.hpp
    1.5 05/12/08 15:28:13 jonas@perch.ndb.mysql.com +2 -0
    Add dump for ERROR 5002 with specified table

ChangeSet
  1.2447.60.2 05/12/07 19:57:56 ingo@mysql.com +8 -0
  Merge mysql.com:/home/mydev/mysql-4.0-bug5390
  into  mysql.com:/home/mydev/mysql-4.1-bug5390

  sql/sql_parse.cc
    1.474 05/12/07 19:57:53 ingo@mysql.com +4 -6
    BUG#5390 - problems with merge tables
    Manual merge.

  mysql-test/t/merge.test
    1.38 05/12/07 19:57:53 ingo@mysql.com +0 -26
    BUG#5390 - problems with merge tables
    Manual merge.

  sql/sql_update.cc
    1.150 05/12/07 19:54:07 ingo@mysql.com +0 -1
    Auto merged

  sql/mysql_priv.h
    1.373 05/12/07 19:54:07 ingo@mysql.com +0 -1
    Auto merged

  sql/lock.cc
    1.63 05/12/07 19:54:06 ingo@mysql.com +0 -86
    Auto merged

  mysql-test/t/create.test
    1.57.1.7 05/12/07 19:54:06 ingo@mysql.com +0 -0
    Auto merged

  mysql-test/r/merge.result
    1.40 05/12/07 19:54:06 ingo@mysql.com +0 -49
    Auto merged

  mysql-test/r/create.result
    1.84.1.6 05/12/07 19:54:06 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2447.60.1 05/12/07 19:52:26 ingo@mysql.com +9 -0
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 4.1.
  INSERT ... SELECT with the same table on both sides (hidden
  below a MERGE table) does now work by buffering the select result.
  The duplicate detection works now after open_and_lock_tables() 
  on the locks.
  I did not find a test case that failed without the change in
  sql_update.cc. I made the change anyway as it should in theory
  fix a possible MERGE table problem with multi-table update.

  sql/sql_update.cc
    1.149 05/12/07 19:52:19 ingo@mysql.com +1 -2
    BUG#5390 - problems with merge tables
    Problem #1: INSERT...SELECT, Version for 4.1.
    Changed the duplicate tables detection for UPDATE
    to use the new function, which does also work for MERGE tables.

  sql/sql_parse.cc
    1.473 05/12/07 19:52:18 ingo@mysql.com +6 -5
    BUG#5390 - problems with merge tables
    Problem #1: INSERT...SELECT, Version for 4.1.
    Changed the duplicate tables detection for INSERT ... SELECT
    to use the new function, which does also work for MERGE tables.

  sql/mysql_priv.h
    1.372 05/12/07 19:52:18 ingo@mysql.com +1 -0
    BUG#5390 - problems with merge tables
    Problem #1: INSERT...SELECT, Version for 4.1.
    Added a declaration for the new function.

  sql/lock.cc
    1.62 05/12/07 19:52:18 ingo@mysql.com +86 -3
    BUG#5390 - problems with merge tables
    Problem #1: INSERT...SELECT, Version for 4.1.
    Added a new function to find a duplicate lock in a list of tables.

  mysql-test/t/merge.test
    1.37 05/12/07 19:52:18 ingo@mysql.com +26 -0
    BUG#5390 - problems with merge tables
    Problem #1: INSERT...SELECT, Version for 4.1.
    Added tests.

  mysql-test/t/create.test
    1.57.1.6 05/12/07 19:52:18 ingo@mysql.com +0 -7
    BUG#5390 - problems with merge tables
    Removed a duplicate test.

  mysql-test/r/merge.result
    1.39 05/12/07 19:52:18 ingo@mysql.com +49 -0
    BUG#5390 - problems with merge tables
    Problem #1: INSERT...SELECT, Version for 4.1.
    Added test results.

  mysql-test/r/create.result
    1.84.1.5 05/12/07 19:52:18 ingo@mysql.com +0 -15
    BUG#5390 - problems with merge tables
    Removed a duplicate test.

  libmysqld/ha_blackhole.cc
    1.2 05/12/07 19:52:18 ingo@mysql.com +0 -0
    BUG#5390 - problems with merge tables
    No idea, how the symlink change made it into my patch.

ChangeSet
  1.2447.59.1 05/12/07 18:48:46 bar@mysql.com +1 -0
    Bug#13421 problem with sorting turkish
  latin5.xml:
    - Fixing order thee Turkish letters to conform Turkish rules.
    - All non-Turkish accented letters are mappend
      to their non-accented counterparts.

  sql/share/charsets/latin5.xml
    1.6 05/12/07 18:46:12 bar@mysql.com +4 -9
    Bug#13421 problem with sorting turkish
    Fixing order to conform the Turkish rules.
    All non-Turkish accented letters are mappend to
    the non-accented counterparts.

ChangeSet
  1.2447.58.1 05/12/07 15:45:31 msvensson@neptunus.(none) +3 -0
  BUG#9535 Warning for "create table t as select uuid();"
     - Set max_length of Item_func_uuid to max_length*system_charset_info->mbmaxlen
      Note! Item_func_uuid should be set to use 'ascii' charset when hex(), format(), md5()
  etc will use 'ascii'
      - Comitting again, the old patch seems to have been lost.

  sql/item_strfunc.h
    1.100 05/12/07 15:45:28 msvensson@neptunus.(none) +6 -1
    Multiply max_length of Item_func_uuid with system_charset_info->mbmaxlen

  mysql-test/t/func_misc.test
    1.13 05/12/07 15:45:28 msvensson@neptunus.(none) +5 -0
    Test case

  mysql-test/r/func_misc.result
    1.17 05/12/07 15:45:28 msvensson@neptunus.(none) +8 -0
    Test results updated

ChangeSet
  1.2447.53.7 05/12/07 11:11:59 stewart@mysql.com +1 -0
  New tool to collate all information to form a good error report for NDB.
  
  It will copy from each node the logs and trace dumps (if any) and create
  a tarball. Having this tarball attached to a bug report greatly helps
  troubleshooting and avoids user error.
  
  It will (optionally) also get the filesystem.

  ndb/tools/ndb_error_reporter
    1.1 05/12/07 11:11:56 stewart@mysql.com +88 -0
    New BitKeeper file ``ndb/tools/ndb_error_reporter''

  ndb/tools/ndb_error_reporter
    1.0 05/12/07 11:11:56 stewart@mysql.com +0 -0
    BitKeeper file /home/stewart/Documents/MySQL/4.1/cleanup/ndb/tools/ndb_error_reporter

ChangeSet
  1.2447.57.1 05/12/07 06:46:43 lenz@mysql.com +1 -0
  Merge mysql.com:/space/my/mysql-4.0
  into  mysql.com:/space/my/mysql-4.1

  BitKeeper/triggers/post-commit
    1.34 05/12/07 06:46:39 lenz@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.865.1 05/12/06 17:48:31 ingo@mysql.com +1 -0
  Merge mysql.com:/home/mydev/mysql-4.0
  into  mysql.com:/home/mydev/mysql-4.0-bug5390

  sql/sql_parse.cc
    1.218.44.6 05/12/06 17:47:56 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.1.818 05/12/06 14:07:23 lenz@mysql.com +1 -0
   - commit emails are now sent to commits@lists.mysql.com instead of 
     internals@lists.mysql.com to reduce the noise on the internals list.

  BitKeeper/triggers/post-commit
    1.19.1.16 05/12/06 14:07:21 lenz@mysql.com +4 -4
     - commit emails are now sent to commits@lists.mysql.com instead of 
       internals@lists.mysql.com to reduce the noise on the internals list.

ChangeSet
  1.2447.56.7 05/12/06 16:54:13 bar@mysql.com +3 -0
    Bug#15098 CAST(column double TO signed int), wrong result
  field.cc:
    Adding longlong range checking to return
    LONGLONG_MIN or LONGLONG_MAX when out of range. 
    Using (longlong) cast only when range is ok.
  cast.test:
    Adding test case.
  cast.result:
    Fixing results accordingly.

  mysql-test/r/cast.result
    1.25 05/12/06 16:51:12 bar@mysql.com +8 -0
    Fixing results accordingly.

  mysql-test/t/cast.test
    1.21 05/12/06 16:51:00 bar@mysql.com +9 -0
    Bug#15098 CAST(column double TO signed int), wrong result
    Adding longlong range checking.

  sql/field.cc
    1.228 05/12/06 16:50:16 bar@mysql.com +5 -0
    Bug#15098 CAST(column double TO signed int), wrong result
    Adding longlong range checking.

  mysql-test/t/symlink.test
    1.15 05/12/06 00:40:52 kent@mysql.com +2 -0
    Disabled test case on Windows

ChangeSet
  1.2447.56.6 05/12/05 17:53:42 joerg@mysql.com +1 -0
  Not all RPM builds can use the bundled zlib, due to dependency and link conflicts. Solve this.
  (Backport of an identical change from 5.0)

  support-files/mysql.spec.sh
    1.112 05/12/05 17:53:38 joerg@mysql.com +8 -2
    We cannot always use the bundled zlib, as this conflicts with the "shared" build of the "max" binary.
    The fully static RPM build on "build" also does not work with the bundled zlib.
    With this change, we use the bundled zlib for "standard" RPMs (unless fully static, "build")
    and the one already installed on the system for the "max" build which is also labeled "experimental".
    (Backport of an identical change from 5.0)

ChangeSet
  1.2447.56.5 05/12/05 17:10:43 joerg@mysql.com +1 -0
  Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1

  scripts/make_binary_distribution.sh
    1.89 05/12/05 17:10:41 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2447.56.4 05/12/04 15:39:44 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
  Fixes multi_statement test case on NetWare.

  netware/mysql_test_run.c
    1.15 05/12/04 15:39:39 jani@a193-229-222-105.elisa-laajakaista.fi +4 -0
    Fixes multi_statement test case on NetWare.

ChangeSet
  1.2447.56.3 05/12/04 15:34:47 jani@a193-229-222-105.elisa-laajakaista.fi +13 -0
  Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
  into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

  sql/sql_parse.cc
    1.472 05/12/04 15:34:43 jani@a193-229-222-105.elisa-laajakaista.fi +3 -3
    Merged from 4.0.

  sql/mysqld.cc
    1.606 05/12/04 15:32:55 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.371 05/12/04 15:32:55 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  myisam/myisampack.c
    1.43 05/12/04 15:32:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  myisam/myisamchk.c
    1.130 05/12/04 15:32:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  isam/isamchk.c
    1.35 05/12/04 15:32:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  client/mysqlshow.c
    1.40 05/12/04 15:32:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  client/mysqlimport.c
    1.53 05/12/04 15:32:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  client/mysqldump.c
    1.197 05/12/04 15:32:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  client/mysqlcheck.c
    1.49 05/12/04 15:32:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  client/mysqlbinlog.cc
    1.107 05/12/04 15:32:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  client/mysqladmin.cc
    1.107 05/12/04 15:32:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  client/mysql.cc
    1.216 05/12/04 15:32:54 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

  client/mysqladmin.cc
    1.66.4.2 05/12/04 15:32:53 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Merge rename: client/mysqladmin.c -> client/mysqladmin.cc

ChangeSet
  1.1346.1.817 05/12/04 15:02:06 jani@a193-229-222-105.elisa-laajakaista.fi +11 -0
  A set of Netware related patches.

  sql/sql_parse.cc
    1.218.45.1 05/12/04 15:02:03 jani@a193-229-222-105.elisa-laajakaista.fi +3 -0
    Fix problem with kill connection on NetWare.
    

  myisam/myisampack.c
    1.22.1.15 05/12/04 15:02:03 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Fixed option name.

  myisam/myisamchk.c
    1.80.1.37 05/12/04 15:02:03 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Fixed option name.

  isam/isamchk.c
    1.21.1.5 05/12/04 15:02:03 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Fixed option name.

  client/mysqlshow.c
    1.25.1.6 05/12/04 15:02:03 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Fixed option name.

  client/mysqlimport.c
    1.29.1.9 05/12/04 15:02:03 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Fixed option name.

  client/mysqldump.c
    1.65.1.55 05/12/04 15:02:03 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Fixed option name.

  client/mysqlcheck.c
    1.25.1.8 05/12/04 15:02:03 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Fixed option name.

  client/mysqlbinlog.cc
    1.70.1.35 05/12/04 15:02:02 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Fixed option name.

  client/mysqladmin.c
    1.66.4.1 05/12/04 15:02:02 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Fixed option name.

  client/mysql.cc
    1.93.1.68 05/12/04 15:02:02 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Fixed option name.

ChangeSet
  1.2447.56.1 05/12/02 09:27:06 stewart@mysql.com +2 -0
  BUG#15425 Small window for NF during backup failing without error

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.43 05/12/02 09:27:03 stewart@mysql.com +0 -1
    Assert is incorrect for testBackup NFSlave test (causes crash insert 10015 to fail)

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.21.1.1 05/12/02 09:27:03 stewart@mysql.com +10 -5
    If crash 10018 is inserted on a 2 node cluster with fast CPU and slower disk,
    all nodes can respond with BACKUP_FRAGMENT_CONF for all fragments before the
    error in FSAPPENDCONF is hit.
    
    This would mean that no error code was set for the backup and that it would
    be incomplete as not all IO had been written to disk before the node crash.
    This would not be reported to the user.
    
    So the backup would appear to succeed but it really didn't.
    
    The window for this is rather small though.

ChangeSet
  1.2447.55.1 05/12/01 23:22:20 evgen@moonbone.local +3 -0
  Fix bug#15028  Multitable update returns different numbers of matched rows
  depending on table order
  
  multi_update::send_data() was counting updates, not updated rows. Thus if one 
  record have several updates it will be counted several times in 'rows matched'
  but updated only once.
  
  multi_update::send_data() now counts only unique rows.

  mysql-test/r/update.result
    1.28 05/12/01 23:20:44 evgen@moonbone.local +13 -0
    Test case for bug#15028 Multitable update returns different numbers of matched rows depending on table order

  mysql-test/t/update.test
    1.26 05/12/01 23:20:10 evgen@moonbone.local +17 -0
    Test case for bug#15028 Multitable update returns different numbers of matched rows depending on table order

  sql/sql_update.cc
    1.148 05/12/01 23:19:06 evgen@moonbone.local +7 -6
    Fix bug#15028  Multitable update returns different numbers of matched rows
    depending on table order
    multi_update::send_data() now counts only unique rows.

ChangeSet
  1.2447.18.29 05/12/01 23:17:00 SergeyV@selena. +1 -0
  Fixes bug #6536. When MyODBC or any other client do my_init()/my_end() 
  several times, it was causing corruption of charset data stored in once_mem_pool. 
  my_end() deallocated once_mem pool, but did not put a flag that charsets have 
  to be reloaded. The fix addresses this problem.

  mysys/my_init.c
    1.42 05/12/01 23:16:37 SergeyV@selena. +1 -0
    Fixes bug #6536. When MyODBC or any other client do my_init()/my_end() 
    several times, it was causing corruption of charset data stored in once_mem_pool. 
    my_end() deallocated once_mem pool, but did not put a flag that charsets have 
    to be reloaded. The fix addresses this problem.

ChangeSet
  1.2447.53.6 05/12/01 14:55:25 stewart@mysql.com +1 -0
  Backup.cpp:
    convert comment to english

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.22 05/12/01 14:55:04 stewart@mysql.com +1 -1
    convert comment to english

ChangeSet
  1.2447.18.28 05/12/01 14:26:19 bell@sanja.is.com.ua +3 -0
  We should skip beggining '(' characters when test query on possibility
  to be in the query cache. (BUG#14652)

  sql/sql_cache.cc
    1.95 05/12/01 14:26:17 bell@sanja.is.com.ua +19 -9
    We should skip beggining '(' characters when test query on possibility
    to be in the query cache.

  mysql-test/t/query_cache.test
    1.48 05/12/01 14:26:16 bell@sanja.is.com.ua +15 -0
    BUG#14652 test suite.

  mysql-test/r/query_cache.result
    1.60 05/12/01 14:26:16 bell@sanja.is.com.ua +25 -0
    BUG#14652 test suite.

ChangeSet
  1.2447.18.27 05/11/30 21:50:09 joerg@mysql.com +1 -0
  Raise the version number (as 4.1.16 has been cloned).

  configure.in
    1.400 05/11/30 21:50:04 joerg@mysql.com +2 -2
    Raise the version number (as 4.1.16 has been cloned).

ChangeSet
  1.2447.53.5 05/11/30 14:18:43 stewart@mysql.com +1 -0
  DblqhMain.cpp:
    Use DBblock_REF instead of calcBLOCKBlockRef(getOwnNodeId()) as they are the same and the former is more efficient.
  
  Makes it easier to grep for senders of signals to specific blocks

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.57 05/11/30 14:17:24 stewart@mysql.com +12 -18
    Use DBblock_REF instead of calcBLOCKBlockRef(getOwnNodeId()) as they are the same and the former is more efficient.

ChangeSet
  1.2447.18.26 05/11/29 11:52:58 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-14216
  into  mysql.com:/home/jimw/my/mysql-4.1-clean

  sql/item.cc
    1.230 05/11/29 11:52:56 jimw@mysql.com +0 -0
    Auto merged

