ChangeSet@1.2276.1.18, 2006-10-03 13:38:16+04:00, kroki@moonlight.intranet +9 -0
  Fix for the patch for bug#21726: Incorrect result with multiple
  invocations of LAST_INSERT_ID.
  
  Reding of LAST_INSERT_ID inside stored function wasn't noted by caller,
  and no LAST_INSERT_ID_EVENT was issued for binary log.
  
  The solution is to add THD::last_insert_id_used_bin_log, which is much
  like THD::last_insert_id_used, but is reset only for upper-level
  statements.  This new variable is used to issue LAST_INSERT_ID_EVENT.

  mysql-test/r/rpl_insert_id.result@1.20, 2006-10-03 13:38:12+04:00, kroki@moonlight.intranet +18 -0
    For bug#21726, add result for statement-based replication of function
    calls.

  mysql-test/t/rpl_insert_id.test@1.21, 2006-10-03 13:38:12+04:00, kroki@moonlight.intranet +17 -0
    For bug#21726, add test case for statement-based replication of function
    calls.

  sql/item_func.cc@1.306, 2006-10-03 13:38:12+04:00, kroki@moonlight.intranet +1 -0
    Set THD::last_insert_id_used_bin_log for issuing of LAST_INSERT_ID_EVENT.

  sql/log.cc@1.195, 2006-10-03 13:38:13+04:00, kroki@moonlight.intranet +2 -2
    Issue LAST_INSERT_ID_EVENT if THD::last_insert_id_used_bin_log is set.

  sql/set_var.cc@1.165, 2006-10-03 13:38:13+04:00, kroki@moonlight.intranet +1 -0
    Set THD::last_insert_id_used_bin_log for issuing of LAST_INSERT_ID_EVENT.

  sql/sql_class.cc@1.249, 2006-10-03 13:38:13+04:00, kroki@moonlight.intranet +6 -4
    Initialize THD::last_insert_id_used_bin_log.
    Fix typo, add whitespace.

  sql/sql_class.h@1.302, 2006-10-03 13:38:13+04:00, kroki@moonlight.intranet +11 -2
    Add THD::last_insert_id_used_bin_log.

  sql/sql_parse.cc@1.582, 2006-10-03 13:38:13+04:00, kroki@moonlight.intranet +1 -0
    Reset THD::last_insert_id_used_bin_log for upper-level statements.

  sql/sql_select.cc@1.458.1.2, 2006-10-03 13:38:13+04:00, kroki@moonlight.intranet +4 -4
    Set THD::last_insert_id_used_bin_log for issuing of LAST_INSERT_ID_EVENT.

ChangeSet@1.2290, 2006-10-02 23:05:52-04:00, scottlee@calico.site +1 -0
  Back port change from 5.1 that adds the Windows database files to the source package.
  This is needed for WiX pacakging.

  Makefile.am@1.85, 2006-10-02 23:05:48-04:00, scottlee@calico.site +10 -0
    Back port change from 5.1 that adds the Windows database files to the source package.
    This is needed for WiX pacakging.

ChangeSet@1.2276.1.17, 2006-10-02 14:28:23+04:00, kroki@moonlight.intranet +14 -0
  BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID
  
  Non-upper-level INSERTs (the ones in the body of stored procedure,
  stored function, or trigger) into a table that have AUTO_INCREMENT
  column didn't affected the result of LAST_INSERT_ID() on this level.
  
  The problem was introduced with the fix of bug 6880, which in turn was
  introduced with the fix of bug 3117, where current insert_id value was
  remembered on the first call to LAST_INSERT_ID() (bug 3117) and was
  returned from that function until it was reset before the next
  _upper-level_ statement (bug 6880).
  
  The fix for bug#21726 brings back the behaviour of version 4.0, and
  implements the following: remember insert_id value at the beginning
  of the statement or expression (which at that point equals to
  the first insert_id value generated by the previous statement), and
  return that remembered value from LAST_INSERT_ID() or @@LAST_INSERT_ID.
  
  Thus, the value returned by LAST_INSERT_ID() is not affected by values
  generated by current statement, nor by LAST_INSERT_ID(expr) calls in
  this statement.
  
  Version 5.1 does not have this bug (it was fixed by WL 3146).

  mysql-test/r/rpl_insert_id.result@1.19, 2006-10-02 14:28:18+04:00, kroki@moonlight.intranet +129 -0
    Add results for bug#21726: Incorrect result with multiple invocations
    of LAST_INSERT_ID, and bug#20339: stored procedure using LAST_INSERT_ID()
    does not replicate statement-based.

  mysql-test/t/rpl_insert_id.test@1.20, 2006-10-02 14:28:18+04:00, kroki@moonlight.intranet +112 -0
    Add test cases for bug#21726: Incorrect result with multiple invocations
    of LAST_INSERT_ID, and bug#20339: stored procedure using LAST_INSERT_ID()
    does not replicate statement-based.

  sql/item_func.cc@1.305, 2006-10-02 14:28:18+04:00, kroki@moonlight.intranet +32 -3
    Add implementation of Item_func_last_insert_id::fix_fields(), where we
    remember in THD::current_insert_id the first value generated during
    execution of the previous statement, which is returned then from
    Item_func_last_insert_id::val_int().

  sql/item_func.h@1.154, 2006-10-02 14:28:18+04:00, kroki@moonlight.intranet +1 -0
    Add declaration of Item_func_last_insert_id::fix_fields().

  sql/log_event.cc@1.212, 2006-10-02 14:28:18+04:00, kroki@moonlight.intranet +0 -1
    Do not set THD::last_insert_id_used on LAST_INSERT_ID_EVENT.  Though we
    know the statement will call LAST_INSERT_ID(), it wasn't called yet.

  sql/set_var.cc@1.164, 2006-10-02 14:28:18+04:00, kroki@moonlight.intranet +11 -2
    In sys_var_last_insert_id::value_ptr() remember in
    THD::current_insert_id the first value generated during execution of the
    previous statement, and return this value for @@LAST_INSERT_ID.

  sql/sql_class.cc@1.248, 2006-10-02 14:28:19+04:00, kroki@moonlight.intranet +15 -1
    Reset THD::last_insert_id_used after each statement execution.

  sql/sql_class.h@1.301, 2006-10-02 14:28:19+04:00, kroki@moonlight.intranet +33 -15
    Rather then remember current insert_id value on first invocation of
    THD::insert_id(), remember it in Item_func_last_insert_id::fix_fields(),
    sys_var_last_insert_id::value_ptr(), or mysql_execute_command().
    Remove THD::insert_id(), as it lost its value now.

  sql/sql_insert.cc@1.202.1.1, 2006-10-02 14:28:19+04:00, kroki@moonlight.intranet +3 -5
    THD::insert_id() is removed, use THD::last_insert_id directly.

  sql/sql_load.cc@1.99, 2006-10-02 14:28:19+04:00, kroki@moonlight.intranet +4 -8
    THD::insert_id() is removed, using THD::last_insert_id directly is OK.

  sql/sql_parse.cc@1.581, 2006-10-02 14:28:19+04:00, kroki@moonlight.intranet +15 -1
    Remember in THD::current_insert_id first generated insert id value of
    the previous statement in mysql_execute_command().
    No need to reset THD::last_insert_id_used in
    mysql_reset_thd_for_next_command(), it will be reset after each
    statement.

  sql/sql_select.cc@1.458.1.1, 2006-10-02 14:28:19+04:00, kroki@moonlight.intranet +9 -2
    If "IS NULL" is replaced with "= <LAST_INSERT_ID>", use right value,
    which is THD::current_insert_id, and also set THD::last_insert_id_used
    to issue binary log LAST_INSERT_ID_EVENT.

  sql/sql_update.cc@1.198, 2006-10-02 14:28:20+04:00, kroki@moonlight.intranet +2 -2
    THD::insert_id() is removed, use THD::last_insert_id directly.

  tests/mysql_client_test.c@1.209, 2006-10-02 14:28:20+04:00, kroki@moonlight.intranet +39 -1
    Add test case for bug#21726: Incorrect result with multiple invocations
    of LAST_INSERT_ID.

ChangeSet@1.2283.1.2, 2006-09-29 21:36:17+05:00, svoj@mysql.com +1 -0
  Fixed that max_zfile_size was incorrectly calculated on big-endian boxes.
  Was introduced with patch for bug#21675.

  sql/ha_archive.cc@1.74, 2006-09-29 21:36:16+05:00, svoj@mysql.com +11 -1
    Fixed that max_zfile_size was incorrectly calculated on big-endian boxes.
    Was introduced with patch for bug#21675.

ChangeSet@1.1616.2144.200, 2006-09-29 19:00:52+05:00, svoj@mysql.com +2 -0
  Fix a test case according to fix for bug#10974.

  mysql-test/r/lowercase_table3.result@1.5.1.2, 2006-09-29 19:00:51+05:00, svoj@mysql.com +1 -1
    Fix a test case according to fix for bug#10974.

  mysql-test/t/lowercase_table3.test@1.6.1.3, 2006-09-29 19:00:51+05:00, svoj@mysql.com +1 -1
    Fix a test case according to fix for bug#10974.

ChangeSet@1.2276.1.16, 2006-09-29 01:35:11+04:00, evgen@moonbone.local +1 -0
  view.test:
    After merge fix
  TAG: clone-5.0.26-build

  mysql-test/t/view.test@1.166, 2006-09-29 01:34:46+04:00, evgen@moonbone.local +10 -10
    After merge fix

ChangeSet@1.2271.8.1, 2006-09-29 01:00:18+04:00, evgen@moonbone.local +6 -0
  Fixed bug#5505: Wrong error message on INSERT into a view
  
  On an INSERT into an updatable but non-insertable view an error message was
  issued stating the view being not updatable. This can lead to a confusion of a
  user.
  
  A new error message is introduced. Is is showed when a user tries to insert
  into a non-insertable view.

  mysql-test/r/view.result@1.174.2.1, 2006-09-29 01:00:02+04:00, evgen@moonbone.local +17 -10
    Added the test case for bug#5505: Wrong error message on INSERT into a view
    Corrected a few test cases after fixing bug#5505

  mysql-test/t/view.test@1.161.2.1, 2006-09-29 01:00:05+04:00, evgen@moonbone.local +22 -10
    Added the test case for bug#5505: Wrong error message on INSERT into a view
    Corrected a few test cases after fixing bug#5505

  sql/share/errmsg.txt@1.70.1.1, 2006-09-29 01:00:06+04:00, evgen@moonbone.local +3 -0
    Fixed bug#5505: Wrong error message on INSERT into a view
    Added the ER_NON_INSERTABLE_TABLE error definition.

  sql/sql_base.cc@1.350.1.2, 2006-09-29 00:59:58+04:00, evgen@moonbone.local +4 -1
    Fixed bug#5505: Wrong error message on INSERT into a view
    The update_non_unique_table_error() function now issues proper
    error for an INSERT.

  sql/sql_insert.cc@1.202, 2006-09-29 01:00:00+04:00, evgen@moonbone.local +2 -2
    Fixed bug#5505: Wrong error message on INSERT into a view
    Issue the ER_NON_INSERTABLE_TABLE error instead of the 
    ER_NON_UPDATABLE_TABLE on insert into a view.

  sql/sql_view.cc@1.94, 2006-09-29 01:00:01+04:00, evgen@moonbone.local +1 -1
    Fixed bug#5505: Wrong error message on INSERT into a view
    Issue the ER_NON_INSERTABLE_TABLE error instead of the
    ER_NON_UPDATABLE_TABLE on insert into a view.

ChangeSet@1.1616.2754.1, 2006-09-28 22:10:06+05:00, svoj@mysql.com +5 -0
  BUG#21617 - crash when selecting from merge table with inconsistent indexes
  
  Crash may happen when selecting from a merge table that has underlying
  tables with less indexes than in a merge table itself.
  
  If number of keys in merge table is not bigger than requested key number,
  return error.

  myisammrg/myrg_open.c@1.29.2.1, 2006-09-28 22:10:05+05:00, svoj@mysql.com +5 -2
    Store min(number of keys) in m_info instead of number of keys in last
    underlying table.

  myisammrg/myrg_queue.c@1.11.1.1, 2006-09-28 22:10:05+05:00, svoj@mysql.com +2 -0
    Return error if inx passed to _myrg_init_queue function is not less
    than number of keys.

  mysql-test/r/merge.result@1.32.2.1, 2006-09-28 22:10:05+05:00, svoj@mysql.com +6 -0
    A test case for bug#21617.

  mysql-test/t/merge.test@1.28.2.1, 2006-09-28 22:10:05+05:00, svoj@mysql.com +11 -0
    A test case for bug#21617.

  mysys/queues.c@1.16, 2006-09-28 22:10:05+05:00, svoj@mysql.com +19 -29
    Replaced annoying ifndef DBUG_OFF with DBUG_ASSERT, fixed coding style.
    The problem was that having queue overrun in debug build was hidden
    with this ifdef.

ChangeSet@1.2196.73.1, 2006-09-28 20:30:15+05:00, svoj@mysql.com +2 -0
  BUG#21675 - engine=archive 2GB file limit, when reached mysqld restarts on any query
  
  If mysqld is linked against system installed zlib (which is likely compiled w/o
  LFS) and archive table exceedes 2G, mysqld will likely be terminated with SIGXFSZ.
  
  Prior to actual write perform a check if there is space in data file. This fixes
  abnormal process termination with SIGXFSZ.
  
  No test case for this bugfix.

  sql/ha_archive.cc@1.70.1.1, 2006-09-28 20:30:14+05:00, svoj@mysql.com +20 -4
    Prior to actual write perform a check if there is space in data file. This fixes
    abnormal process termination with SIGXFSZ.

  sql/ha_archive.h@1.34, 2006-09-28 20:30:14+05:00, svoj@mysql.com +1 -0
    Added approximate archive data file size to archive share.

ChangeSet@1.1346.882.1, 2006-09-28 11:41:38+02:00, istruewing@chilla.local +1 -0
  Bug#22384 - DELETE FROM table causes "Incorrect key file for table"
  
  Deletes on a big index could crash the index when it needs to
  shrink.
  
  Put a forgotten negation operator in.
  
  No test case. It is too big for the test suite. And it does not
  work with 4.0, only with higher versions. It is attached to the
  bug report.

  myisam/mi_delete.c@1.14.1.1, 2006-09-28 11:41:37+02:00, istruewing@chilla.local +1 -1
    Bug#22384 - DELETE FROM table causes "Incorrect key file for table"
    Put a negation operator ('!') before _mi_get_last_key() in del().
    It returns NULL on error, non-NULL on success.

ChangeSet@1.2276.1.12, 2006-09-27 20:11:11+05:00, gluh@mysql.com +3 -0
  additional 'after merge' fix

  sql/mysql_priv.h@1.410.1.1, 2006-09-27 20:11:08+05:00, gluh@mysql.com +1 -1
    additional 'after merge' fix

  sql/sql_parse.cc@1.580, 2006-09-27 20:11:08+05:00, gluh@mysql.com +5 -6
    additional 'after merge' fix

  sql/sql_yacc.yy@1.490, 2006-09-27 20:11:08+05:00, gluh@mysql.com +3 -3
    additional 'after merge' fix

ChangeSet@1.2276.1.11, 2006-09-27 19:21:29+05:00, gluh@mysql.com +8 -0
  after merge fix

  include/mysql_com.h@1.111, 2006-09-27 19:21:21+05:00, gluh@mysql.com +1 -1
    after merge fix

  sql/slave.h@1.97, 2006-09-27 19:21:21+05:00, gluh@mysql.com +1 -1
    after merge fix

  sql/sp.cc@1.118, 2006-09-27 19:21:21+05:00, gluh@mysql.com +4 -4
    after merge fix

  sql/sp_head.cc@1.224, 2006-09-27 19:21:21+05:00, gluh@mysql.com +3 -3
    after merge fix

  sql/sql_acl.cc@1.210, 2006-09-27 19:21:21+05:00, gluh@mysql.com +10 -11
    after merge fix

  sql/sql_class.h@1.300, 2006-09-27 19:21:21+05:00, gluh@mysql.com +1 -1
    after merge fix

  sql/sql_parse.cc@1.579, 2006-09-27 19:21:22+05:00, gluh@mysql.com +1 -1
    after merge fix

  sql/sql_repl.h@1.39, 2006-09-27 19:21:22+05:00, gluh@mysql.com +1 -1
    after merge fix

ChangeSet@1.2280, 2006-09-27 18:33:31+05:00, svoj@mysql.com +2 -0
  After merge fix.

  mysql-test/r/merge.result@1.52, 2006-09-27 18:33:28+05:00, svoj@mysql.com +9 -9
    After merge fix.

  sql/share/errmsg.txt@1.72, 2006-09-27 18:33:28+05:00, svoj@mysql.com +1 -1
    After merge fix.

ChangeSet@1.1616.2750.4, 2006-09-27 17:49:16+05:00, gluh@mysql.com +7 -0
  Patch for bug#21432 is reverted

  include/mysql_com.h@1.67.1.42, 2006-09-27 17:49:12+05:00, gluh@mysql.com +0 -3
    Patch for bug#21432 is reverted

  mysql-test/r/ctype_utf8.result@1.45.1.28, 2006-09-27 17:49:12+05:00, gluh@mysql.com +0 -12
    Patch for bug#21432 is reverted

  mysql-test/t/ctype_utf8.test@1.57.1.18, 2006-09-27 17:49:12+05:00, gluh@mysql.com +0 -16
    Patch for bug#21432 is reverted

  sql-common/client.c@1.46.1.47, 2006-09-27 17:49:13+05:00, gluh@mysql.com +3 -3
    Patch for bug#21432 is reverted

  sql/sql_acl.cc@1.74.1.106, 2006-09-27 17:49:13+05:00, gluh@mysql.com +1 -5
    Patch for bug#21432 is reverted

  sql/sql_parse.cc@1.271.1.217, 2006-09-27 17:49:13+05:00, gluh@mysql.com +2 -2
    Patch for bug#21432 is reverted

  sql/table.cc@1.111.6.1, 2006-09-27 17:49:13+05:00, gluh@mysql.com +2 -4
    Patch for bug#21432 is reverted

ChangeSet@1.1616.2752.3, 2006-09-27 11:55:30+02:00, istruewing@chilla.local +1 -0
  Bug#20719 - Reading dynamic records with write buffer could fail
  After merge fix.

  myisam/mi_dynrec.c@1.36.1.4, 2006-09-27 11:55:28+02:00, istruewing@chilla.local +0 -3
    Bug#20719 - Reading dynamic records with write buffer could fail
    After merge fix.

ChangeSet@1.2271.1.9, 2006-09-27 12:53:53+03:00, gkodinov@macbook.gmz +3 -0
  Bug #21174: Index degrades sort performance and optimizer does not honor IGNORE INDEX
   - reversed the patch for 5.0 and moved to 5.1

  mysql-test/r/group_by.result@1.72, 2006-09-27 12:53:44+03:00, gkodinov@macbook.gmz +0 -9
    Bug #21174: Index degrades sort performance and optimizer does not honor IGNORE INDEX
     - reversed the patch for 5.0

  mysql-test/t/group_by.test@1.59, 2006-09-27 12:53:45+03:00, gkodinov@macbook.gmz +0 -12
    Bug #21174: Index degrades sort performance and optimizer does not honor IGNORE INDEX
     - reversed the patch for 5.0

  sql/sql_select.cc@1.456, 2006-09-27 12:53:46+03:00, gkodinov@macbook.gmz +0 -2
    Bug #21174: Index degrades sort performance and optimizer does not honor IGNORE INDEX
     - reversed the patch for 5.0

ChangeSet@1.2271.6.1, 2006-09-25 06:15:14-07:00, igor@rurik.mysql.com +5 -0
  Fixed bug #21646.
  Presence of a subquery in the ON expression of a join 
  should not block merging the view that contains this join.
  Before this patch the such views were converted into 
  into temporary table views.

  mysql-test/r/view.result@1.174.1.3, 2006-09-25 06:15:04-07:00, igor@rurik.mysql.com +14 -0
    Added a test case for bug #21646.

  mysql-test/t/view.test@1.161.1.3, 2006-09-25 06:15:04-07:00, igor@rurik.mysql.com +18 -0
    Added a test case for bug #21646.

  sql/mysql_priv.h@1.411, 2006-09-25 06:15:04-07:00, igor@rurik.mysql.com +2 -1
    Fixed bug #21646.
    Added a new parsing state 'IN_ON', true when
    the parser is in an ON expression of a join.

  sql/sql_lex.cc@1.201, 2006-09-25 06:15:04-07:00, igor@rurik.mysql.com +2 -1
    Fixed bug #21646.
    Presence of a subquery in the ON expression of a join 
    should not block merging the view that contains this join.

  sql/sql_yacc.yy@1.487.1.1, 2006-09-25 06:15:04-07:00, igor@rurik.mysql.com +8 -0
    Fixed bug #21646.
    Added a new parsing state 'IN_ON', true when
    the parser is in an ON expression of a join.

ChangeSet@1.1616.2753.1, 2006-09-25 05:24:07-07:00, igor@rurik.mysql.com +3 -0
  Fixed bug #21853: assert failure for a grouping query with
  an ALL/ANY quantified subquery in HAVING.
  The Item::split_sum_func2 method should not create Item_ref
  for objects of any class derived from Item_subselect.

  mysql-test/r/subselect.result@1.67.1.116, 2006-09-25 05:24:04-07:00, igor@rurik.mysql.com +36 -0
    Added a test case for bug #21853.

  mysql-test/t/subselect.test@1.58.1.102, 2006-09-25 05:24:04-07:00, igor@rurik.mysql.com +37 -0
    Added a test case for bug #21853.

  sql/item.cc@1.58.1.175, 2006-09-25 05:24:04-07:00, igor@rurik.mysql.com +1 -0
    Fixed bug #21853: assert failure for a grouping query with
    an ALL/ANY quantified subquery in HAVING.
    The Item::split_sum_func2 method should not create Item_ref
    for objects of any class derived from Item_subselect.

ChangeSet@1.1616.2750.3, 2006-09-25 00:54:46+02:00, kent@mysql.com +1 -0
  mysql_config.sh:
    Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
    Filter out icc specific options from cflags/libs(_r)

  scripts/mysql_config.sh@1.23.1.2, 2006-09-25 00:52:56+02:00, kent@mysql.com +1 -1
    Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>

  scripts/mysql_config.sh@1.23.1.1, 2006-09-25 00:46:34+02:00, kent@mysql.com +7 -6
    Filter out icc specific options from cflags/libs(_r)

ChangeSet@1.1346.1.849, 2006-09-22 17:23:25+02:00, istruewing@chilla.local +1 -0
  Bug#14400 - Query joins wrong rows from table which is subject of
              "concurrent insert"
  After merge fix.

  myisam/mi_rkey.c@1.11.1.7, 2006-09-22 17:23:24+02:00, istruewing@chilla.local +1 -0
    Bug#14400 - Query joins wrong rows from table which is subject of
                "concurrent insert"
    After merge fix.

ChangeSet@1.2276.1.5, 2006-09-22 14:42:43+02:00, georg@lmy002.wdf.sap.corp +6 -0
  Fix for bug #19121: Windows incompatible udf_example

  BitKeeper/etc/collapsed@1.5, 2006-09-22 14:42:01+02:00, georg@lmy002.wdf.sap.corp +1 -0

  mysql-test/mysql-test-run.pl@1.115, 2006-09-22 14:42:40+02:00, georg@lmy002.wdf.sap.corp +3 -1
    fixed path for udf_example.so when running testsuite on Windows

  sql/CMakeLists.txt@1.2, 2006-09-22 14:42:40+02:00, georg@lmy002.wdf.sap.corp +4 -1
    Added missing udf_example

  sql/Makefile.am@1.123, 2006-09-22 14:42:40+02:00, georg@lmy002.wdf.sap.corp +2 -1
    Added udf_example files for make dist

  sql/udf_example.c@1.30, 2006-09-22 14:42:40+02:00, georg@lmy002.wdf.sap.corp +11 -0
    fix for Windows: Windows doesn't have socket.h and friends
    
    Added replacements for strmov,bzero and memcpy_fixed when compiling standalone.

  sql/udf_example.def@1.1, 2006-09-22 14:42:40+02:00, georg@lmy002.wdf.sap.corp +24 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/sql/udf_example.def

  sql/udf_example.def@1.0, 2006-09-22 14:42:40+02:00, georg@lmy002.wdf.sap.corp +0 -0

ChangeSet@1.2276.1.4, 2006-09-22 07:38:24+02:00, georg@lmy002.wdf.sap.corp +1 -0
  Added build rule for mysql_upgrade.exe

  client/CMakeLists.txt@1.2, 2006-09-22 06:50:58+02:00, georg@lmy002.wdf.sap.corp +3 -0
    Added build rule for mysql_upgrade.exe

ChangeSet@1.2271.5.2, 2006-09-21 17:38:42+02:00, joerg@trift2. +1 -0
  Add a dummy file for "Docs/manual.chm" as we need it for "make dist" to work.

  Docs/manual.chm@1.1, 2006-09-21 17:37:19+02:00, joerg@trift2. +14 -0
    BitKeeper file /MySQL/M50/push-5.0/Docs/manual.chm

  Docs/manual.chm@1.0, 2006-09-21 17:37:19+02:00, joerg@trift2. +0 -0

ChangeSet@1.2271.4.5, 2006-09-21 13:38:01+02:00, lars@mysql.com +2 -0
  After merge fixes

  mysql-test/r/rpl_insert_id.result@1.18, 2006-09-21 13:37:57+02:00, lars@mysql.com +4 -1
    After merge fixes

  mysql-test/r/rpl_max_relay_size.result@1.22, 2006-09-21 13:37:57+02:00, lars@mysql.com +32 -29
    After merge fixes

ChangeSet@1.1616.2751.3, 2006-09-21 13:19:52+02:00, lars@mysql.com +2 -0
  Adding proper setup phase for test case rpl_insert_id

  mysql-test/r/rpl_insert_id.result@1.10.1.3, 2006-09-21 13:19:50+02:00, lars@mysql.com +24 -0
    Updated result file

  mysql-test/t/rpl_insert_id.test@1.9.1.4, 2006-09-21 13:19:50+02:00, lars@mysql.com +31 -13
    Adding proper setup phase for test case rpl_insert_id

ChangeSet@1.1616.2751.2, 2006-09-21 03:32:42+02:00, lars@mysql.com +2 -0
  Vertical printout in test to make easier to read

  mysql-test/r/rpl_max_relay_size.result@1.12.1.2, 2006-09-21 03:32:36+02:00, lars@mysql.com +225 -18
    Vertical printout in test to make easier to read

  mysql-test/t/rpl_max_relay_size.test@1.8.1.5, 2006-09-21 03:32:36+02:00, lars@mysql.com +38 -3
    Vertical printout in test to make easier to read

ChangeSet@1.2271.4.2, 2006-09-21 00:59:48+02:00, lars@mysql.com +3 -0
  Fix of result files from merge

  mysql-test/r/mysqldump.result@1.116, 2006-09-21 00:59:41+02:00, lars@mysql.com +241 -1
    Fix of result file (adding the echo's)

  mysql-test/r/rpl_view.result@1.7, 2006-09-21 00:59:41+02:00, lars@mysql.com +1 -0
    Added end of 5.0 echo

  mysql-test/t/rpl_view.test@1.6, 2006-09-21 00:59:41+02:00, lars@mysql.com +1 -0
    Added end of 5.0 echo

ChangeSet@1.1616.2730.28, 2006-09-20 09:46:12-07:00, igor@rurik.mysql.com +4 -0
  Fixed bug #20108.
  Any default value for a enum fields over UCS2 charsets was corrupted
  when we put it into the frm file, as it had been overwritten by its
  HEX representation.
  To fix it now we save a copy of structure that represents the enum
  type and when putting the default values we use this copy. 

  mysql-test/r/ctype_ucs.result@1.11.1.23, 2006-09-20 09:46:10-07:00, igor@rurik.mysql.com +21 -0
    Added a test case for bug #20108.

  mysql-test/t/ctype_ucs.test@1.15.1.19, 2006-09-20 09:46:10-07:00, igor@rurik.mysql.com +21 -0
    Added a test case for bug #20108.

  sql/field.h@1.120.1.13, 2006-09-20 09:46:10-07:00, igor@rurik.mysql.com +2 -0
    Fixed bug #20108.
    Any default value for a enum fields over UCS2 charsets was corrupted
    when we put it into the frm file, as it had been overwritten by its
    HEX representation.
    To fix it now we save a copy of structure that represents the enum
    type and when putting the default values we use this copy. 

  sql/unireg.cc@1.43.1.7, 2006-09-20 09:46:10-07:00, igor@rurik.mysql.com +32 -7
    Fixed bug #20108.
    Any default value for a enum fields over UCS2 charsets was corrupted
    when we put it into the frm file, as it had been overwritten by its
    HEX representation.
    To fix it now we save a copy of structure that represents the enum
    type and when putting the default values we use this copy. 

ChangeSet@1.2271.3.3, 2006-09-20 08:08:57-07:00, igor@rurik.mysql.com +3 -0
  Fixed bug #22015: crash with GROUP_CONCAT over a derived table
  that returns the results of aggregation by GROUP_CONCAT.
  The crash was due to an overflow happened for the field
  sortoder->length.
  The fix prevents this overflow exploiting the fact that the
  value of sortoder->length cannot be greater than the value of
  thd->variables.max_sort_length.   

  mysql-test/r/func_gconcat.result@1.61, 2006-09-20 08:08:54-07:00, igor@rurik.mysql.com +9 -0
    Added a test case for bug #22015.

  mysql-test/t/func_gconcat.test@1.46, 2006-09-20 08:08:54-07:00, igor@rurik.mysql.com +15 -0
    Added a test case for bug #22015.

  sql/filesort.cc@1.106, 2006-09-20 08:08:54-07:00, igor@rurik.mysql.com +1 -0
    Fixed bug #22015: crash with GROUP_CONCAT over a derived table
    that returns the results of aggregation by GROUP_CONCAT.
    The crash was due to an overflow happened for the field
    sortoder->length.
    The fix prevents this overflow exploiting the fact that the
    value of sortoder->length cannot be greater than the value of
    thd->variables.max_sort_length.   

ChangeSet@1.2277, 2006-09-20 17:12:37+05:00, svoj@mysql.com +1 -0
  BUG#21459 - myisam_ftdump gives bad counts for common words
  
  This problem affects myisam_ftdump tool only.
  
  For fulltext index positive subkeys means word weight, negative subkeys
  means number of documents in level 2 fulltext index.
  
  Fixed that document counter was not properly updated for keys having
  level 2 fulltext index.
  
  No test case for this bug.

  myisam/myisam_ftdump.c@1.39, 2006-09-20 17:12:35+05:00, svoj@mysql.com +1 -2
    For fulltext index positive subkeys means word weight, negative subkeys
    means number of documents in level 2 fulltext index.
    
    Fixed that document counter was not properly updated for keys having
    level 2 fulltext index.

ChangeSet@1.2196.72.1, 2006-09-20 11:05:11+02:00, istruewing@chilla.local +3 -0
  Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
  Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
  
  INSERT DELAYED ignored an explicitly set INSERT_ID and session
  specific auto_increment_* variables.
  
  The problem was that the inserts are done by a system thread,
  which does not have access to the session variables of the user
  thread.
  
  On a proposal of Guilhem I fixed it so that the variables are
  copied to the data structure for every delayed row. The system
  thread sets its session variables from these values.

  mysql-test/r/delayed.result@1.12, 2006-09-20 11:05:07+02:00, istruewing@chilla.local +174 -0
    Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
    Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
    Turned some sleeps into FLUSH TABLEs.
    Added test cases.

  mysql-test/t/delayed.test@1.14, 2006-09-20 11:05:07+02:00, istruewing@chilla.local +142 -6
    Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
    Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
    Turned some sleeps into FLUSH TABLEs.
    Added test cases.

  sql/sql_insert.cc@1.194.1.5, 2006-09-20 11:05:07+02:00, istruewing@chilla.local +46 -0
    Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
    Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
    Added auto_increment/insert_id related variables to 'delayed_row'.
    The session values are copied to 'delayed_row' by the user thread.
    The delayed insert thread copies them to his session variables.

ChangeSet@1.2271.1.3, 2006-09-20 12:02:58+03:00, gkodinov@rakia.(none) +1 -0
  fixed merge

  mysql-test/r/func_group.result@1.53, 2006-09-20 12:02:35+03:00, gkodinov@rakia.(none) +1 -1
    fixed merge

ChangeSet@1.1616.2144.196, 2006-09-20 01:40:59+05:00, svoj@mysql.com +6 -0
  BUG#10974 - No error message if merge table based on union of innodb, memory
  
  Fixed confusing error message from the storage engine when
  it fails to open underlying table. The error message is issued
  when a table is _opened_ (not when it is created).

  sql/share/english/errmsg.txt@1.70.33.1, 2006-09-20 01:40:58+05:00, svoj@mysql.com +1 -1
    Better error message if we fail to open underlying table.

  myisammrg/myrg_open.c@1.29.1.2, 2006-09-20 01:40:58+05:00, svoj@mysql.com +3 -0
    Set my_errno to HA_ERR_WRONG_MRG_TABLE_DEF if attempt to open
    underlying table failed.

  mysql-test/r/merge.result@1.32.1.9, 2006-09-20 01:40:58+05:00, svoj@mysql.com +11 -2
    A test case for bug#10974.

  mysql-test/r/repair.result@1.14.1.4, 2006-09-20 01:40:58+05:00, svoj@mysql.com +1 -1
    Fixed a test case according to patch for bug#10974.

  mysql-test/t/merge.test@1.28.1.11, 2006-09-20 01:40:58+05:00, svoj@mysql.com +16 -2
    A test case for bug#10974.

  sql/table.cc@1.111.4.7, 2006-09-20 01:40:58+05:00, svoj@mysql.com +8 -1
    Report error from handler with print_error instead of frm_error. This
    fixes confusing error message from the handler. Actually this is
    backported from 5.0.

ChangeSet@1.2271.3.2, 2006-09-19 12:18:24-07:00, igor@rurik.mysql.com +2 -0
  Post-merge corrections.

  mysql-test/r/ps.result@1.74, 2006-09-19 12:18:21-07:00, igor@rurik.mysql.com +49 -49
    Post-merge corrections.

  mysql-test/t/ps.test@1.71, 2006-09-19 12:18:21-07:00, igor@rurik.mysql.com +54 -54
    Post-merge corrections.

ChangeSet@1.2276, 2006-09-19 14:26:18+02:00, istruewing@chilla.local +1 -0
  After merge fix.

  sql/sql_select.cc@1.451.1.2, 2006-09-19 14:26:16+02:00, istruewing@chilla.local +7 -6
    After merge fix.

ChangeSet@1.2261.3.5, 2006-09-18 12:14:27+02:00, gkodinov@dl145s.mysql.com +9 -0
  merge fixes

  mysql-test/r/func_time.result@1.67.1.2, 2006-09-18 12:12:45+02:00, gkodinov@dl145s.mysql.com +3 -4

  mysql-test/r/query_cache.result@1.73.1.2, 2006-09-18 12:12:45+02:00, gkodinov@dl145s.mysql.com +6 -6

  mysql-test/r/subselect.result@1.159, 2006-09-18 12:12:45+02:00, gkodinov@dl145s.mysql.com +2 -2

  mysql-test/r/view.result@1.174.1.2, 2006-09-18 12:12:45+02:00, gkodinov@dl145s.mysql.com +2 -2

  mysql-test/t/func_time.test@1.55.1.2, 2006-09-18 12:12:45+02:00, gkodinov@dl145s.mysql.com +1 -1

  mysql-test/t/view.test@1.161.1.2, 2006-09-18 12:12:45+02:00, gkodinov@dl145s.mysql.com +2 -2

  sql/item_cmpfunc.cc@1.217.2.3, 2006-09-18 12:12:45+02:00, gkodinov@dl145s.mysql.com +3 -1

  sql/opt_range.cc@1.225, 2006-09-18 12:12:45+02:00, gkodinov@dl145s.mysql.com +0 -15

  sql/opt_range.h@1.62, 2006-09-18 12:12:45+02:00, gkodinov@dl145s.mysql.com +1 -1

ChangeSet@1.2244.31.4, 2006-09-18 03:21:00+04:00, aivanov@mysql.com +3 -0
  BUG#19419: VIEW: View that the column name is different
   by master and slave is made.

  mysql-test/r/rpl_view.result@1.6, 2006-09-18 03:20:56+04:00, aivanov@mysql.com +15 -0
    BUG#19419: VIEW: View that the column name is different
     by master and slave is made.
     Fixed result for the added test case.

  mysql-test/t/rpl_view.test@1.5, 2006-09-18 03:20:56+04:00, aivanov@mysql.com +20 -0
    BUG#19419: VIEW: View that the column name is different
     by master and slave is made.
     Added test case.

  sql/sql_parse.cc@1.563.3.2, 2006-09-18 03:20:56+04:00, aivanov@mysql.com +13 -0
    BUG#19419: VIEW: View that the column name is different
     by master and slave is made.
     Fixed: Add column_list to to the view creation statement
     which is written to binlog.

ChangeSet@1.1616.2748.1, 2006-09-16 11:50:00-07:00, igor@rurik.mysql.com +3 -0
  Fixed bug #22085: Crash on the execution of a prepared 
  statement that uses an aggregating IN subquery with 
  HAVING clause.
  A wrong order of the call of split_sum_func2 for the HAVING
  clause of the subquery and the transformation for the 
  subquery resulted in the creation of a andor structure
  that could not be restored at an execution of the prepared
  statement.

  mysql-test/r/ps.result@1.31.1.20, 2006-09-16 11:49:58-07:00, igor@rurik.mysql.com +47 -0
    Added a test cases for bug #22085.

  mysql-test/t/ps.test@1.27.1.25, 2006-09-16 11:49:58-07:00, igor@rurik.mysql.com +52 -0
    Added a test cases for bug #22085.

  sql/sql_select.cc@1.216.125.9, 2006-09-16 11:49:58-07:00, igor@rurik.mysql.com +3 -2
    Fixed bug #22085: Crash on the execution of a prepared 
    statement that uses an aggregating IN subquery with 
    HAVING clause.
    A wrong order of the call of split_sum_func2 for the HAVING
    clause of the subquery and the transformation for the 
    subquery resulted in the creation of a andor structure
    that could not be restored at an execution of the prepared
    statement.

ChangeSet@1.2244.21.11, 2006-09-16 09:50:48-07:00, igor@rurik.mysql.com +8 -0
  Fixed bug #21493: crash for the second execution of a function
  containing a select statement that uses an aggregating IN subquery.
  Added a parameter to the function fix_prepare_information 
  to restore correctly the having clause for the second execution.
  Saved andor structure of the having conditions at the proper moment
  before any calls of split_sum_func2 that could modify the having structure
  adding new Item_ref objects. (These additions, are produced not with 
  the statement mem_root, but rather with the execution mem_root.)

  mysql-test/r/sp.result@1.206.2.1, 2006-09-16 09:50:44-07:00, igor@rurik.mysql.com +63 -0
    Added a test case for bug #21493.

  mysql-test/t/sp.test@1.194.2.1, 2006-09-16 09:50:44-07:00, igor@rurik.mysql.com +67 -0
    Added a test case for bug #21493.

  sql/sql_delete.cc@1.179, 2006-09-16 09:50:44-07:00, igor@rurik.mysql.com +2 -1
    Fixed bug #21493: crash for the second execution of a function
    containing a select statement that uses an aggregating IN subquery.
    Added a parameter to the function fix_prepare_information 
    to restore correctly the having clause for the second execution.

  sql/sql_insert.cc@1.199.1.1, 2006-09-16 09:50:44-07:00, igor@rurik.mysql.com +1 -1
    Fixed bug #21493: crash for the second execution of a function
    containing a select statement that uses an aggregating IN subquery.
    Added a parameter to the function fix_prepare_information 
    to restore correctly the having clause for the second execution.

  sql/sql_lex.cc@1.195.1.2, 2006-09-16 09:50:44-07:00, igor@rurik.mysql.com +19 -4
    Fixed bug #21493: crash for the second execution of a function
    containing a select statement that uses an aggregating IN subquery.
    Added a parameter to the function fix_prepare_information 
    to restore correctly the having clause for the second execution.

  sql/sql_lex.h@1.225.1.2, 2006-09-16 09:50:44-07:00, igor@rurik.mysql.com +1 -1
    Fixed bug #21493: crash for the second execution of a function
    containing a select statement that uses an aggregating IN subquery.
    Added a parameter to the function fix_prepare_information 
    to restore correctly the having clause for the second execution.

  sql/sql_select.cc@1.447.1.6, 2006-09-16 09:50:44-07:00, igor@rurik.mysql.com +3 -3
    Fixed bug #21493: crash for the second execution of a function
    containing a select statement that uses an aggregating IN subquery.
    Added a parameter to the function fix_prepare_information 
    to restore correctly the having clause for the second execution.
    Saved andor structure of the having conditions at the proper moment
    before any calls of split_sum_func2 that could modify the having structure
    adding new Item_ref objects. (These additions, are produced not with 
    the statement mem_root, but rather with the execution mem_root.)

  sql/sql_update.cc@1.197, 2006-09-16 09:50:44-07:00, igor@rurik.mysql.com +2 -1
    Fixed bug #21493: crash for the second execution of a function
    containing a select statement that uses an aggregating IN subquery.
    Added a parameter to the function fix_prepare_information 
    to restore correctly the having clause for the second execution.

ChangeSet@1.2261.7.9, 2006-09-15 17:53:45+02:00, msvensson@shellback.(none) +1 -0
  Add definition of SHUT_RDWR for compiling on windows

  include/my_net.h@1.16, 2006-09-15 17:53:43+02:00, msvensson@shellback.(none) +8 -0
    Add definition of SHUT_RDWR for compiling on windows

ChangeSet@1.2261.6.5, 2006-09-15 16:35:50+02:00, hartmut@mysql.com +1 -0
  Add SSL specific linker flags to --libmysqld-libs (Bug #21239)

  scripts/mysql_config.sh@1.24, 2006-09-15 16:35:43+02:00, hartmut@mysql.com +1 -1
    Add SSL specific linker flags to --libmysqld-libs (Bug #21239)

ChangeSet@1.2261.7.4, 2006-09-15 15:41:04+02:00, msvensson@shellback.(none) +1 -0
  Bug#22326  	Build problems on hurd-i386: conflicting declaration of socklen_t

  extra/yassl/testsuite/test.hpp@1.6, 2006-09-15 15:41:00+02:00, msvensson@shellback.(none) +1 -1
    Remove define for __MACH__
    http://bugs.debian.org/387369

ChangeSet@1.2261.7.3, 2006-09-15 14:27:45+02:00, msvensson@shellback.(none) +2 -0
  Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown

  sql/mysqld.cc@1.572, 2006-09-15 14:27:41+02:00, msvensson@shellback.(none) +8 -8
    Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown

  vio/viosocket.c@1.38.1.1, 2006-09-15 14:27:42+02:00, msvensson@shellback.(none) +1 -1
    Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown

ChangeSet@1.2244.31.3, 2006-09-15 03:02:01+02:00, lars@mysql.com +2 -0
  Merge fixes, added printout to result file

  mysql-test/r/mysqldump.result@1.110.1.2, 2006-09-15 03:01:57+02:00, lars@mysql.com +168 -56
    Merge fixes, added printout to result file

  mysql-test/t/mysqldump.test@1.100.1.2, 2006-09-15 03:01:58+02:00, lars@mysql.com +173 -173
    Merge fixes, added printout to result file

ChangeSet@1.2261.7.2, 2006-09-15 04:01:47+04:00, ted@ted.mysql.internal +1 -0
  Bug#21011 The [client] group header was overwritten by "password" option in upgrade_defaults file which confused mysqlcheck thus used to prevent the whole thing from running correctly when the "--password=" option is specified on mysql_upgrade command line with no corresponding "--user=" option

  client/mysql_upgrade.c@1.7, 2006-09-15 04:01:45+04:00, ted@ted.mysql.internal +1 -1
    The "password" option should be issued after group header to upgrade_defaults file whenever it is used

ChangeSet@1.2258.2.5, 2006-09-15 02:18:30+04:00, evgen@sunlight.local +8 -0
  type_date.result:
    Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN
    Corrected a test case after removal of fix for bug#16377
  query_cache.result, func_time.test, view.result, view.test, func_time.result:
    Corrected a test case after removal of fix for bug#16377
  type_date.test:
    Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN
     Corrected a test case after removal of fix for bug#16377
  item_cmpfunc.cc:
    Removed changes to the Item_func_between::fix_length_and_dec() made in the fix for bug#16377
  TAG: mysql-5.0.25

  mysql-test/r/func_time.result@1.68, 2006-09-15 02:13:45+04:00, evgen@sunlight.local +11 -14
    Corrected a test case after removal of fix for bug#16377

  mysql-test/r/query_cache.result@1.74, 2006-09-15 02:13:42+04:00, evgen@sunlight.local +6 -6
    Corrected a test case after removal of fix for bug#16377

  mysql-test/r/type_date.result@1.14, 2006-09-15 02:13:24+04:00, evgen@sunlight.local +8 -2
    Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN
    Corrected a test case after removal of fix for bug#16377

  mysql-test/r/view.result@1.175, 2006-09-15 02:13:21+04:00, evgen@sunlight.local +2 -2
    Corrected a test case after removal of fix for bug#16377

  mysql-test/t/func_time.test@1.56, 2006-09-15 02:13:12+04:00, evgen@sunlight.local +11 -11
    Corrected a test case after removal of fix for bug#16377

  mysql-test/t/type_date.test@1.11.1.1, 2006-09-15 02:12:29+04:00, evgen@sunlight.local +9 -2
    Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN
     Corrected a test case after removal of fix for bug#16377

  mysql-test/t/view.test@1.162, 2006-09-15 02:11:17+04:00, evgen@sunlight.local +2 -2
    Corrected a test case after removal of fix for bug#16377

  sql/item_cmpfunc.cc@1.217.1.1, 2006-09-15 02:16:09+04:00, evgen@sunlight.local +29 -122
    Removed changes to the Item_func_between::fix_length_and_dec() made in the fix for bug#16377

ChangeSet@1.2261.7.1, 2006-09-14 14:56:14-04:00, iggy@rolltop.ignatz42.dyndns.org +3 -0
  Bug#21424 mysqldump failing to export/import views.                                                                                                                                                                  
  
  Dumps are created for the tables in each specified database then for the views in each specified database. This bug occurs when any database's views depend on the mysql database's table data while being restored. 
  Added command line option --flush-privileges to the mysqldump utility which causes a FLUSH PRIVILIGES statement to be written to the dump after the mysql database.

  client/mysqldump.c@1.242, 2006-09-14 14:56:11-04:00, iggy@rolltop.ignatz42.dyndns.org +13 -1
    When the flush-privileges command line option is specified, make sure to FLUSH PRIVILEGES after only the mysql database's tables' data is restored so that grant tables are current.

  mysql-test/r/mysqldump.result@1.114, 2006-09-14 14:56:11-04:00, iggy@rolltop.ignatz42.dyndns.org +19 -1
    Added Results.

  mysql-test/t/mysqldump.test@1.104, 2006-09-14 14:56:12-04:00, iggy@rolltop.ignatz42.dyndns.org +34 -3
    Expanded existing test case for bug 21527 to also test for bug 21424. 
    Exercises new --flush-priviliges command line option.
    Test ignores log tables.

ChangeSet@1.2216.61.2, 2006-09-14 10:57:00-04:00, iggy@rolltop.ignatz42.dyndns.org +1 -0
  /usr/sbin not always in PATH environment variable.

  BitKeeper/triggers/post-commit@1.40, 2006-09-14 10:56:57-04:00, iggy@rolltop.ignatz42.dyndns.org +9 -3
    Attempt to default to /usr/sbin/sendmail if it exists, otherwise use sendmail.

ChangeSet@1.1616.2734.3, 2006-09-14 16:55:57+02:00, istruewing@chilla.local +1 -0
  Bug#14400 - Query joins wrong rows from table which is subject of
              "concurrent insert"
  After merge fix.

  myisam/mi_rkey.c@1.16.2.3, 2006-09-14 16:55:56+02:00, istruewing@chilla.local +2 -2
    Bug#14400 - Query joins wrong rows from table which is subject of
                "concurrent insert"
    After merge fix.

ChangeSet@1.1616.2745.3, 2006-09-14 18:45:23+04:00, evgen@moonbone.local +2 -0
  type_date.test, type_date.result:
    Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN

  mysql-test/r/type_date.result@1.12.1.2, 2006-09-14 18:45:04+04:00, evgen@moonbone.local +6 -0
    Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN

  mysql-test/t/type_date.test@1.13, 2006-09-14 18:44:24+04:00, evgen@moonbone.local +7 -0
    Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN

ChangeSet@1.2258.2.4, 2006-09-14 16:34:35+02:00, joerg@trift-lap.fambruehe +2 -0
  Include "manual.chm" in the source distribution, because we now use it for Windows builds unchanged.

  Docs/Makefile.am@1.58, 2006-09-14 16:34:32+02:00, joerg@trift-lap.fambruehe +1 -1
    Include "manual.chm" in the source distribution, because we now use it for Windows builds unchanged.

  configure.in@1.394.5.2, 2006-09-14 16:34:32+02:00, joerg@trift-lap.fambruehe +1 -0
    Include "manual.chm" in the source distribution, because we now use it for Windows builds unchanged.

ChangeSet@1.2216.61.1, 2006-09-13 14:15:22-04:00, iggy@rolltop.ignatz42.dyndns.org +2 -0
  These bitKeeper changes will allow Windows to be used as a primary development platform.

  BitKeeper/etc/ignore@1.227.2.1, 2006-09-13 14:15:20-04:00, iggy@rolltop.ignatz42.dyndns.org +17 -0
    Exclude files created during the Windows build process.

  BitKeeper/triggers/post-commit@1.39, 2006-09-13 14:15:20-04:00, iggy@rolltop.ignatz42.dyndns.org +9 -3
    post-commit trigger writes emails to file in the BitKeeper/tmp directory before sending in case of failure.
    Now uses bk sendmail instead of hardcoded /usr/sbin/sendmail to send message.

ChangeSet@1.2216.60.1, 2006-09-13 11:41:41-04:00, cmiller@zippy.cornsilk.net +3 -0
  Bug #21618: NULL shown as empty string in client
  
  The column's NOT NULL flag doesn't affect what we should print.  Remove the
  wrong logic that does check it.
  
  Also, verify that this and the previous two tests print the same data as 
  other output formats.

  client/mysql.cc@1.209.5.1, 2006-09-13 11:41:39-04:00, cmiller@zippy.cornsilk.net +1 -5
    Don't check the column's NOT NULL flag when determining whether to print 
    "NULL" or not.

  mysql-test/r/mysql.result@1.11.2.1, 2006-09-13 11:41:39-04:00, cmiller@zippy.cornsilk.net +17 -0
    Add results and confirm that the other output forms give the same results
    for other similar tests.

  mysql-test/t/mysql.test@1.11.2.1, 2006-09-13 11:41:39-04:00, cmiller@zippy.cornsilk.net +8 -0
    Add regression tests for this bug and two similar bugs.

ChangeSet@1.2261.1.5, 2006-09-13 19:32:21+04:00, kaa@polly.local +3 -0
  Fixed the faulty merge

  sql/item_func.cc@1.303, 2006-09-13 19:32:17+04:00, kaa@polly.local +5 -3
    Fixed the faulty merge

  sql/log_event.cc@1.211, 2006-09-13 19:32:18+04:00, kaa@polly.local +1 -1
    Fixed the faulty merge

  sql/sql_class.h@1.298, 2006-09-13 19:32:18+04:00, kaa@polly.local +1 -0
    Fixed the faulty merge

ChangeSet@1.1616.2744.5, 2006-09-13 14:41:28+04:00, kaa@polly.local +14 -0
  Cset exclude: kaa@polly.local|ChangeSet|20060912122540|09861
  Cset exclude: kaa@polly.local|ChangeSet|20060908100829|09983

  mysql-test/r/case.result@1.14.1.6, 2006-09-13 14:41:25+04:00, kaa@polly.local +0 -0
    Exclude

  mysql-test/r/func_if.result@1.11.1.7, 2006-09-13 14:41:25+04:00, kaa@polly.local +0 -0
    Exclude

  mysql-test/r/func_test.result@1.20.2.4, 2006-09-13 14:41:25+04:00, kaa@polly.local +0 -0
    Exclude

  mysql-test/r/user_var.result@1.14.2.14, 2006-09-13 14:41:25+04:00, kaa@polly.local +0 -0
    Exclude

  mysql-test/t/case.test@1.14.1.6, 2006-09-13 14:41:25+04:00, kaa@polly.local +0 -0
    Exclude

  mysql-test/t/func_if.test@1.10.1.8, 2006-09-13 14:41:25+04:00, kaa@polly.local +0 -0
    Exclude

  mysql-test/t/func_test.test@1.22.1.4, 2006-09-13 14:41:25+04:00, kaa@polly.local +0 -0
    Exclude

  mysql-test/t/user_var.test@1.13.1.12, 2006-09-13 14:41:25+04:00, kaa@polly.local +0 -0
    Exclude

  sql/item_cmpfunc.cc@1.111.24.2, 2006-09-13 14:41:24+04:00, kaa@polly.local +0 -0
    Exclude

  sql/item_cmpfunc.h@1.73.11.2, 2006-09-13 14:41:24+04:00, kaa@polly.local +0 -0
    Exclude

  sql/item_func.cc@1.124.42.13, 2006-09-13 14:41:24+04:00, kaa@polly.local +0 -0
    Exclude

  sql/item_func.h@1.68.22.3, 2006-09-13 14:41:24+04:00, kaa@polly.local +0 -0
    Exclude

  sql/log_event.cc@1.113.1.77, 2006-09-13 14:41:24+04:00, kaa@polly.local +0 -0
    Exclude

  sql/sql_class.h@1.146.57.2, 2006-09-13 14:41:24+04:00, kaa@polly.local +0 -0
    Exclude

ChangeSet@1.1616.2745.2, 2006-09-12 19:06:26+04:00, evgen@moonbone.local +2 -0
  item_cmpfunc.cc:
    Removed changes to the Item_func_between::fix_length_and_dec() made in the fix for bug#16377
  query_cache.result:
    Corrected a test case after removing a fix for bug#16377

  mysql-test/r/query_cache.result@1.26.1.36, 2006-09-12 19:05:18+04:00, evgen@moonbone.local +3 -0
    Corrected a test case after removing a fix for bug#16377

  sql/item_cmpfunc.cc@1.111.23.12, 2006-09-12 19:06:03+04:00, evgen@moonbone.local +24 -2
    Removed changes to the Item_func_between::fix_length_and_dec() made in the fix for bug#16377

ChangeSet@1.2244.31.1, 2006-09-12 17:50:24+03:00, timour@lamia.home +5 -0
  Fix for BUG#21774: Column count doesn't match value count at row x
  
  The cause of the bug was an incomplete fix for bug 18080.
  The problem was that setup_tables() unconditionally reset the
  name resolution context to its 'tables' argument, which pointed
  to the first table of an SQL statement.
  
  The bug fix limits resetting of the name resolution context in
  setup_tables() only in the cases when the context was not set
  by earlier parser/optimizer phases.

  mysql-test/r/insert_select.result@1.41, 2006-09-12 17:50:21+03:00, timour@lamia.home +10 -0
    Test for BUG#21774.

  mysql-test/t/insert_select.test@1.33, 2006-09-12 17:50:21+03:00, timour@lamia.home +18 -0
    Test for BUG#21774.

  sql/sql_base.cc@1.349.1.1, 2006-09-12 17:50:22+03:00, timour@lamia.home +14 -1
    Do not reset the name resolution contect unconditionally.
    Instead set the context to 'tables' only if it was not
    set before calling setup_tables().

  sql/sql_insert.cc@1.200, 2006-09-12 17:50:22+03:00, timour@lamia.home +9 -0
    Added asserts to make sure that in the case of INSERT ... VALUES ...
    statements it is not necessary to reset the name resolution context
    to the first table, because there is only one table in the list of
    tables anyway. The actual code is not removed in order not to
    confuse it with the actual bug fix.

  sql/sql_parse.cc@1.563.3.1, 2006-09-12 17:50:22+03:00, timour@lamia.home +0 -2
    Removed unnecessary reset of the name resolution context.
    The context is anyway unconditionally reset in mysql_insert()
    and mysql_prepare_insert().

ChangeSet@1.2216.59.2, 2006-09-12 18:28:36+04:00, kaa@polly.local +1 -0
  Fixed compilation

  sql/item_func.cc@1.293.3.2, 2006-09-12 18:28:33+04:00, kaa@polly.local +5 -5
    Fixed compilation

ChangeSet@1.2216.58.1, 2006-09-12 15:47:48+02:00, msvensson@shellback.(none) +1 -0
  Bug#14862 undefined reference to `isinf' on SOLARIS - strings/strtod.c
   - Change the configure test looking for 'isinf' so the value returned from isinf is used. That avoids the call to isinf being optimized away. 

  configure.in@1.392.8.1, 2006-09-12 15:47:45+02:00, msvensson@shellback.(none) +1 -1
    Use the value returned from isinf so it's not optimized away by the compiler(i.e gcc 4.1)

ChangeSet@1.2196.34.12, 2006-09-12 18:25:35+05:00, svoj@april.(none) +7 -0
  BUG#20256 - LOCK WRITE - MyISAM
  Only MyISAM tables locked with LOCK TABLES ... WRITE were affected.
  
  A query that is optimized with index_merge doesn't reflect rows
  inserted within LOCK TABLES.
  
  MyISAM doesn't flush a state within LOCK TABLES. index_merge
  optimization creates a copy of the handler, which thus gets
  outdated MyISAM state.
  
  New handler->clone() method is introduced to fix this problem.
  For non-MyISAM storage engines it allocates a handler and opens
  it with ha_open(). For MyISAM it additionally copies MyISAM state
  pointer to cloned handler.

  mysql-test/r/index_merge.result@1.20, 2006-09-12 18:25:33+05:00, svoj@april.(none) +31 -0
    A test case for bug#20256.

  mysql-test/t/index_merge.test@1.15, 2006-09-12 18:25:33+05:00, svoj@april.(none) +32 -0
    A test case for bug#20256.

  sql/ha_myisam.cc@1.166.1.1, 2006-09-12 18:25:33+05:00, svoj@april.(none) +8 -0
    clone method added to handler class.

  sql/ha_myisam.h@1.69, 2006-09-12 18:25:33+05:00, svoj@april.(none) +1 -0
    clone method added to handler class.

  sql/handler.cc@1.215.1.1, 2006-09-12 18:25:33+05:00, svoj@april.(none) +9 -0
    clone method added to handler class.

  sql/handler.h@1.177.1.1, 2006-09-12 18:25:33+05:00, svoj@april.(none) +1 -0
    clone method added to handler class.

  sql/opt_range.cc@1.217.1.1, 2006-09-12 18:25:33+05:00, svoj@april.(none) +1 -4
    Use handler clone method.

ChangeSet@1.2216.56.3, 2006-09-12 11:34:46+02:00, msvensson@shellback.(none) +1 -0
  Bug#22139 undefined reference to `my_memmem' when compiling tests/mysql_client_test
  - Build mysql_client_test from mysql_client_test.c and mysys/my_memmem.c

  tests/Makefile.am@1.26.1.1, 2006-09-12 11:34:44+02:00, msvensson@shellback.(none) +3 -6
    Build mysql_client_test from mysql_client_test.c and mysys/my_memmem.c

ChangeSet@1.2216.1.31, 2006-09-11 14:45:40+02:00, lars@mysql.com +1 -0
  Fix WARN_DEPRECATED for 5.0 (it is in 5.1 we should have the extra arguments)

  sql/sql_yacc.yy@1.474.4.2, 2006-09-11 14:45:38+02:00, lars@mysql.com +2 -2
    Fix WARN_DEPRECATED for 5.0 (it is in 5.1 we should have the extra arguments)

ChangeSet@1.2244.30.1, 2006-09-09 09:43:09-07:00, igor@rurik.mysql.com +6 -0
  Post-pushbuild corrections for fix of bug #21698.

  mysql-test/r/func_str.result@1.120, 2006-09-09 09:43:03-07:00, igor@rurik.mysql.com +2 -2
    Post-pushbuild corrections for fix of bug #21698.

  mysql-test/t/func_str.test@1.94, 2006-09-09 09:43:04-07:00, igor@rurik.mysql.com +2 -2
    Post-pushbuild corrections for fix of bug #21698.

  sql/item.h@1.206.1.2, 2006-09-09 09:43:04-07:00, igor@rurik.mysql.com +27 -0
    Post-pushbuild corrections for fix of bug #21698.

  sql/item_cmpfunc.cc@1.216.1.2, 2006-09-09 09:43:04-07:00, igor@rurik.mysql.com +1 -1
    Post-pushbuild corrections for fix of bug #21698.

  sql/item_func.cc@1.299.1.2, 2006-09-09 09:43:04-07:00, igor@rurik.mysql.com +1 -1
    Post-pushbuild corrections for fix of bug #21698.

  sql/sql_select.cc@1.447.1.4, 2006-09-09 09:43:04-07:00, igor@rurik.mysql.com +2 -2
    Post-pushbuild corrections for fix of bug #21698.

ChangeSet@1.2244.29.1, 2006-09-08 19:04:46+03:00, gkodinov@macbook.gmz +4 -0
  Bug #21540: Subqueries with no from and aggregate functions return
              wrong results
   Mark the containing Item(s) (Item_subselect descendant usually) of 
   a subselect as containing aggregate functions if it has references
   to aggregates functions that are calculated outside its context.
   This tels end_send_group() not to make an Item_subselect descendant in
   select list a copy and causes the correct value being returned.

  mysql-test/r/func_group.result@1.49.1.1, 2006-09-08 19:04:38+03:00, gkodinov@macbook.gmz +1 -1
    Bug #21540: Subqueries with no from and aggregate functions return
                wrong results
     - test cases

  mysql-test/r/subselect.result@1.154.1.1, 2006-09-08 19:04:39+03:00, gkodinov@macbook.gmz +61 -0
    Bug #21540: Subqueries with no from and aggregate functions return
                wrong results
     - fixed the result of an existing testcase.

  mysql-test/t/subselect.test@1.125.1.1, 2006-09-08 19:04:40+03:00, gkodinov@macbook.gmz +31 -0
    Bug #21540: Subqueries with no from and aggregate functions return
                wrong results
     - test cases

  sql/item_sum.cc@1.179.1.1, 2006-09-08 19:04:41+03:00, gkodinov@macbook.gmz +21 -1
    Bug #21540: Subqueries with no from and aggregate functions return
                wrong results
     Mark the containing Item (Item_subselect descendant usually) of 
     a subselect as containing aggregate functions if it has references
     to aggregates functions that are calculated outside its context.
     This tels end_send_group() not to make an Item_subselect descendant in
     select list a copy and causes the correct value being returned.

ChangeSet@1.2216.57.1, 2006-09-08 11:39:03-04:00, cmiller@zippy.cornsilk.net +1 -0
  Fix initialized memory.  Count the number of failures in shm-closing 
  functions and return it.

  vio/viosocket.c@1.37.1.1, 2006-09-08 11:39:02-04:00, cmiller@zippy.cornsilk.net +27 -2
    Initialize the return code and set it according to errors in the closing 
    functions.

ChangeSet@1.2260.1.3, 2006-09-08 16:16:39+05:00, gluh@mysql.com +4 -0
  after merge fix

  sql/mysql_priv.h@1.409, 2006-09-08 16:16:35+05:00, gluh@mysql.com +2 -1
    after merge fix
    added charset parameter to check_string_length() function

  sql/slave.h@1.96, 2006-09-08 16:16:35+05:00, gluh@mysql.com +1 -1
    after merge fix
    USERNAME_LENGTH const is changed to USERNAME_BYTE_LENGTH

  sql/sql_parse.cc@1.572, 2006-09-08 16:16:35+05:00, gluh@mysql.com +6 -8
    after merge fix
    added charset parameter to check_string_length() function

  sql/sql_yacc.yy@1.485, 2006-09-08 16:16:35+05:00, gluh@mysql.com +6 -4
    after merge fix
    added charset parameter to check_string_length() function

ChangeSet@1.2244.21.9, 2006-09-08 13:10:14+03:00, gkodinov@macbook.gmz +3 -0
  Bug #21772: can not name a column 'upgrade' when create a table in version 5.0.24
  Upgrade was a reserved word. Unreserve UPGRADE so it can be used in unquoted identifiers.

  mysql-test/r/create.result@1.122, 2006-09-08 13:10:05+03:00, gkodinov@macbook.gmz +2 -0
    Bug #21772: can not name a column 'upgrade' when create a table in version 5.0.24
     - test case

  mysql-test/t/create.test@1.81, 2006-09-08 13:10:06+03:00, gkodinov@macbook.gmz +6 -0
    Bug #21772: can not name a column 'upgrade' when create a table in version 5.0.24
     - test case

  sql/sql_yacc.yy@1.480.2.4, 2006-09-08 13:10:07+03:00, gkodinov@macbook.gmz +1 -0
    Bug #21772: can not name a column 'upgrade' when create a table in version 5.0.24
     - unreserve UPGRADE.

ChangeSet@1.2260.2.3, 2006-09-08 11:25:08+02:00, msvensson@shellback.(none) +1 -0
  Speed up "bk citool" for msvensson:

  BitKeeper/etc/config@1.25, 2006-09-08 11:25:04+02:00, msvensson@shellback.(none) +1 -0
    Speed up "bk citool" for msvensson:

ChangeSet@1.1616.2730.23, 2006-09-08 10:24:14+03:00, gkodinov@macbook.gmz +3 -0
  Bug#21555: incorrect behavior with INSERT ... ON DUPL KEY UPDATE and VALUES
   VALUES() was considered a constant. This caused replacing 
   (or pre-calculating) it using uninitialized values before the actual
   execution takes place.
   Mark it as a non-constant (still not dependent of tables) to prevent
   the pre-calculation.

  mysql-test/r/insert_update.result@1.9.7.2, 2006-09-08 10:24:07+03:00, gkodinov@macbook.gmz +24 -2
    Bug#21555: incorrect behavior with INSERT ... ON DUPL KEY UPDATE and VALUES
     - test case.
     - EXPLAIN output changed due to VALUES() not being considered a constant 
       anymore

  mysql-test/t/insert_update.test@1.13.1.5, 2006-09-08 10:24:07+03:00, gkodinov@macbook.gmz +23 -0
    Bug#21555: incorrect behavior with INSERT ... ON DUPL KEY UPDATE and VALUES
     - test case.

  sql/item.h@1.56.1.140, 2006-09-08 10:24:08+03:00, gkodinov@macbook.gmz +5 -1
    Bug#21555: incorrect behavior with INSERT ... ON DUPL KEY UPDATE and VALUES
     - mark Item_insert_value as non-constant to prevent early calculation.

ChangeSet@1.1616.2745.1, 2006-09-08 00:59:34+04:00, evgen@moonbone.local +6 -0
  query_cache.result, func_time.test, type_date.result, func_time.result:
    Corrected test case after removal of fix for bug#16377         
  type_date.test:
    Corrected test case after removal of fix for bug#16377
  item_cmpfunc.cc:
    Removed changes to the agg_cmp_type() made in the for bug#16377

  mysql-test/r/func_time.result@1.23.6.2, 2006-09-08 00:57:42+04:00, evgen@moonbone.local +11 -12
    Corrected test case after removal of fix for bug#16377         

  mysql-test/r/query_cache.result@1.26.1.35, 2006-09-08 00:57:33+04:00, evgen@moonbone.local +0 -3
    Corrected test case after removal of fix for bug#16377         

  mysql-test/r/type_date.result@1.12.1.1, 2006-09-08 00:57:07+04:00, evgen@moonbone.local +2 -2
    Corrected test case after removal of fix for bug#16377         

  mysql-test/t/func_time.test@1.21.5.2, 2006-09-08 00:56:50+04:00, evgen@moonbone.local +11 -11
    Corrected test case after removal of fix for bug#16377         

  mysql-test/t/type_date.test@1.12, 2006-09-08 00:56:11+04:00, evgen@moonbone.local +2 -2
    Corrected test case after removal of fix for bug#16377

  sql/item_cmpfunc.cc@1.111.23.11, 2006-09-08 00:58:26+04:00, evgen@moonbone.local +3 -108
    Removed changes to the agg_cmp_type() made in the for bug#16377

ChangeSet@1.2244.28.1, 2006-09-07 11:06:37-07:00, igor@rurik.mysql.com +10 -0
  Fixed bug #21698: erroneously a field could be replaced by an
  equal constant under any circumstances.
  In fact this substitution can be allowed if the field is
  not of a type string or if the field reference serves as 
  an argument of a comparison predicate.  

  mysql-test/r/func_str.result@1.119, 2006-09-07 11:06:33-07:00, igor@rurik.mysql.com +35 -0
    Added test cases for bug #21698.

  mysql-test/r/heap_hash.result@1.20, 2006-09-07 11:06:33-07:00, igor@rurik.mysql.com +1 -1
    Adjusted results after the fix for bug #21198.

  mysql-test/t/func_str.test@1.93, 2006-09-07 11:06:33-07:00, igor@rurik.mysql.com +27 -0
    Added test cases for bug #21698.

  sql/item.cc@1.232.1.1, 2006-09-07 11:06:33-07:00, igor@rurik.mysql.com +38 -3
    Fixed bug #21198.
    Added a method to check whether a field reference can be 
    substituted for a constant equal to the field.
    This substitution is allowed if the field is not of a type string
    or if the field reference serves as an argument of a comparison
    predicate.  

  sql/item.h@1.206.1.1, 2006-09-07 11:06:33-07:00, igor@rurik.mysql.com +17 -1
    Fixed bug #21698.
    Added a new virtual transformation method for a item 'compile'
    with two callback function parameters.
    Added a new virtual method 'subst_argument_checker' to be used
    as an amnalyzer method.
    This method is supposed to set its in/out argument to NULL for
    the nodes where substitution of a string field for a constant
    is not valid.

  sql/item_cmpfunc.cc@1.216.1.1, 2006-09-07 11:06:34-07:00, igor@rurik.mysql.com +55 -6
    Fixed bug #21698.
    Added an implementation of the compile method for class Item_cond.
    First it processes the Item_cond node with a callback function and if
    the latter returns TRUE it proceeds with a transformation performed by
    another callback function. 

  sql/item_cmpfunc.h@1.130, 2006-09-07 11:06:34-07:00, igor@rurik.mysql.com +4 -0
    Fixed bug #21698.
    Added the implementations of 'subst_argument_checker'
    for the Item_func and Item_cond classes.
    This method is supposed to set its in/out argument to NULL for
    the nodes where substitution of a string field for a constant
    is not valid.
    Added the declaration of an implementation of the compile method for 
    class Item_cond.
    First it processes the Item_cond node with a callback function and if
    the latter returns TRUE it proceeds with a transformation performed by
    another callback function. 

  sql/item_func.cc@1.299.1.1, 2006-09-07 11:06:34-07:00, igor@rurik.mysql.com +56 -8
    Fixed bug #21698.
    Added an implementation of the compile method for class Item_func.
    First it processes the Item_func node with a callback function and if
    the latter returns TRUE it proceeds with a transformation performed by
    another callback function. 

  sql/item_func.h@1.148.1.1, 2006-09-07 11:06:34-07:00, igor@rurik.mysql.com +2 -0
    Fixed bug #21698.
    Added the declaration of the implementation of the compile method for
    class Item_func.
    First it processes the Item_func node with a callback function and if
    the latter returns TRUE it proceeds with a transformation performed by
    another callback function.
     

  sql/sql_select.cc@1.447.3.1, 2006-09-07 11:06:34-07:00, igor@rurik.mysql.com +12 -5
    Fixed bug #21698.
    Limited the conditions at which a field can be substituted 
    a for an equal constant in a formula. 
    This substitution is allowed if the field is not of a type string
    or if the field reference serves as an argument of a comparison
    predicate.  

ChangeSet@1.2260.2.2, 2006-09-07 17:51:28+02:00, joerg@trift2. +1 -0
  configure.in  :    NDB version and general version must be (kept) in sync - do that.

  configure.in@1.394.1.8, 2006-09-07 17:51:25+02:00, joerg@trift2. +1 -1
    NDB version and general version must be (kept) in sync - do that.

ChangeSet@1.2258.2.1, 2006-09-07 17:37:51+02:00, joerg@trift2. +1 -0
  Fix a change to "configure.in" that broke building commercial sources.
  To be pushed to both the cloned 5.0.25 and the general 5.0 tree.

  configure.in@1.394.5.1, 2006-09-07 17:37:48+02:00, joerg@trift2. +2 -1
    When creating "commercial" sources, this file gets modified by "mysql-copyright".
    For this, it is essential that the string 'cmd-line-utils/readline/Makefile'
    be alone on its line ...

ChangeSet@1.1346.879.2, 2006-09-07 15:39:31+02:00, istruewing@chilla.local +3 -0
  Bug#14400 - Query joins wrong rows from table which is subject of
              "concurrent insert"
  Additional fix for full keys and test case.

  myisam/mi_rkey.c@1.11.2.2, 2006-09-07 15:39:30+02:00, istruewing@chilla.local +22 -16
    Bug#14400 - Query joins wrong rows from table which is subject of
                "concurrent insert"
    Additional fix for full keys.

  mysql-test/r/myisam.result@1.10.3.2, 2006-09-07 15:39:30+02:00, istruewing@chilla.local +13 -0
    Bug#14400 - Query joins wrong rows from table which is subject of
                "concurrent insert"
    Additional results.

  mysql-test/t/myisam.test@1.7.3.2, 2006-09-07 15:39:30+02:00, istruewing@chilla.local +18 -0
    Bug#14400 - Query joins wrong rows from table which is subject of
                "concurrent insert"
    Additional test case.

ChangeSet@1.2260.1.2, 2006-09-07 18:09:49+05:00, gluh@mysql.com +9 -0
  after merge fix

  include/mysql_com.h@1.109, 2006-09-07 18:09:43+05:00, gluh@mysql.com +1 -1
    USERNAME_LENGTH is changed to USERNAME_BYTE_LENGTH

  mysql-test/r/ctype_utf8.result@1.97, 2006-09-07 18:09:43+05:00, gluh@mysql.com +9 -8
    result fix

  mysql-test/t/ctype_utf8.test@1.90, 2006-09-07 18:09:43+05:00, gluh@mysql.com +1 -0
    test fix

  sql/sp.cc@1.117, 2006-09-07 18:09:43+05:00, gluh@mysql.com +4 -4
    NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer
    USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer

  sql/sp_head.cc@1.223, 2006-09-07 18:09:43+05:00, gluh@mysql.com +3 -3
    NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer
    USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer

  sql/sql_acl.cc@1.208, 2006-09-07 18:09:43+05:00, gluh@mysql.com +5 -5
    NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer
    USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer

  sql/sql_class.h@1.295, 2006-09-07 18:09:43+05:00, gluh@mysql.com +1 -1
    NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer

  sql/sql_parse.cc@1.571, 2006-09-07 18:09:44+05:00, gluh@mysql.com +5 -2
    NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer
    Function check_string_length() is fixed, now it check string lenght in symbols

  sql/sql_repl.h@1.38, 2006-09-07 18:09:44+05:00, gluh@mysql.com +1 -1
    NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer
    USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer

ChangeSet@1.2216.56.1, 2006-09-07 00:54:48+02:00, tsmith@maint1.mysql.com +2 -0
  Force conflict to avoid bk automerge behavior; will be undone during merge.

  sql/stacktrace.c@1.16.2.1, 2006-09-07 00:54:23+02:00, tsmith@maint1.mysql.com +1 -0
    Force conflict to avoid bk automerge behavior; will be undone during merge.

  sql/stacktrace.h@1.3.2.1, 2006-09-07 00:54:23+02:00, tsmith@maint1.mysql.com +1 -1
    Force conflict to avoid bk automerge behavior; will be undone during merge.

ChangeSet@1.1616.2744.2, 2006-09-07 00:11:43+02:00, tsmith@maint1.mysql.com +1 -0
  Bug #21054: myisam_stats_method ignored in my.cnf and cmdline
  Fix OPT_MYISAM_STATS_METHOD case, where the NULLS_EQUAL and NULLS_NOT_EQUAL methods were mixed up

  sql/mysqld.cc@1.356.107.1, 2006-09-07 00:09:58+02:00, tsmith@maint1.mysql.com +2 -2
    Fix OPT_MYISAM_STATS_METHOD case, bug #21054

ChangeSet@1.1616.2744.1, 2006-09-07 00:01:00+02:00, tsmith@maint1.mysql.com +2 -0
  Bug #21250: esolve stack traces on AMD64 (backport to mysql-4.1)

  sql/stacktrace.c@1.16.1.1, 2006-09-07 00:00:06+02:00, tsmith@maint1.mysql.com +40 -15
    stacktrace dumps for amd64 (backport fix for bug 21250 to mysql-4.1)

  sql/stacktrace.h@1.3.1.1, 2006-09-07 00:00:06+02:00, tsmith@maint1.mysql.com +6 -2
    stacktrace dumps for amd64 (backport fix for bug 21250 to mysql-4.1)

ChangeSet@1.2258.1.2, 2006-09-06 17:56:59+02:00, bteam@mysql.com +1 -0
  Raise version number

  configure.in@1.394.1.6, 2006-09-06 17:56:38+02:00, bteam@mysql.com +1 -1
    Raise version number

ChangeSet@1.2244.27.1, 2006-09-06 08:21:43-07:00, igor@rurik.mysql.com +8 -0
  Fixed bug #5500: EXPLAIN returned a wrong select_type for queries using views.
  Select_type in the EXPLAIN output for the query SELECT * FROM t1 was
  'SIMPLE', while for the query SELECT * FROM v1, where the view v1
  was defined as SELECT * FROM t1, the EXPLAIN output contained 'PRIMARY'
  for the select_type column.
   

  mysql-test/r/group_by.result@1.71, 2006-09-06 08:21:35-07:00, igor@rurik.mysql.com +2 -2
    Adjusted results after the fix for bug #5500.

  mysql-test/r/information_schema.result@1.114, 2006-09-06 08:21:36-07:00, igor@rurik.mysql.com +1 -1
    Adjusted results after the fix for bug #5500.

  mysql-test/r/olap.result@1.34, 2006-09-06 08:21:36-07:00, igor@rurik.mysql.com +1 -1
    Adjusted results after the fix for bug #5500.

  mysql-test/r/range.result@1.50, 2006-09-06 08:21:36-07:00, igor@rurik.mysql.com +4 -4
    Adjusted results after the fix for bug #5500.

  mysql-test/r/view.result@1.171.2.1, 2006-09-06 08:21:36-07:00, igor@rurik.mysql.com +35 -16
    Added a test case for bug #5500.
    Adjusted other results.

  mysql-test/r/view_grant.result@1.19, 2006-09-06 08:21:36-07:00, igor@rurik.mysql.com +3 -3
    Adjusted results after the fix for bug #5500.

  mysql-test/t/view.test@1.158.2.1, 2006-09-06 08:21:36-07:00, igor@rurik.mysql.com +18 -0
    Added a test case for bug #5500.

  sql/sql_select.cc@1.447.2.1, 2006-09-06 08:21:36-07:00, igor@rurik.mysql.com +7 -4
    Fixed bug #5500: EXPLAIN returned a wrong select_type for queries using views.
    Select_type in the EXPLAIN output for the query SELECT * FROM t1 was
    'SIMPLE', while for the query SELECT * FROM v1, where the view v1
    was defined as SELECT * FROM t1, the EXPLAIN output contained 'PRIMARY'
    for the select_type column.
     

ChangeSet@1.1616.2743.1, 2006-09-06 19:56:19+05:00, holyfoot@mysql.com +1 -0
  bug #12991 (compile error --without-geometry)

  myisam/mi_check.c@1.105.8.1, 2006-09-06 19:56:16+05:00, holyfoot@mysql.com +4 -1
    proper #ifdef-s added

ChangeSet@1.2251.4.1, 2006-09-06 15:06:22+02:00, msvensson@neptunus.(none) +1 -0
  Removed unused variable "glob_cygwin_shell"

  mysql-test/mysql-test-run.pl@1.111.1.1, 2006-09-06 15:06:17+02:00, msvensson@neptunus.(none) +0 -4
    Removed unused variable "glob_cygwin_shell"

ChangeSet@1.2244.21.7, 2006-09-05 19:07:55+03:00, gkodinov@macbook.gmz +3 -0
  Merge bug #16792 4.1->5.0

  mysql-test/r/func_group.result@1.51, 2006-09-05 19:07:46+03:00, gkodinov@macbook.gmz +14 -14
    Merge bug #16792 4.1->5.0

  mysql-test/r/innodb_mysql.result@1.9, 2006-09-05 19:07:47+03:00, gkodinov@macbook.gmz +4 -4
    Merge bug #16792 4.1->5.0

  mysql-test/r/union.result@1.86, 2006-09-05 19:07:48+03:00, gkodinov@macbook.gmz +1 -1
    Merge bug #16792 4.1->5.0

ChangeSet@1.2259, 2006-09-05 16:52:05+02:00, guilhem@gbichot3.local +10 -0
  Fix for BUG#11151 "LOAD DATA INFILE commits transaction in 5.0".
  In 5.0 we made LOAD DATA INFILE autocommit in all engines, while
  only NDB wanted that. Users and trainers complained that it affected
  InnoDB and was a change compared to 4.1 where only NDB autocommitted.
  To revert to the behaviour of 4.1, we move the autocommit logic out of mysql_load() into
  ha_ndbcluster::external_lock().
  The result is that LOAD DATA INFILE commits all uncommitted changes
  of NDB if this is an NDB table, its own changes if this is an NDB
  table, but does not affect other engines.
  Note: even though there is no "commit the full transaction at end"
  anymore, LOAD DATA INFILE stays disabled in routines (re-entrency
  problems per a comment of Pem).
  Note: ha_ndbcluster::has_transactions() does not give reliable results
  because it says "yes" even if transactions are disabled in this engine...

  mysql-test/include/loaddata_autocom.inc@1.1, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +21 -0
    test for engines to see if they autocommit or not in LOAD DATA INFILE

  mysql-test/include/loaddata_autocom.inc@1.0, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +0 -0

  mysql-test/r/loaddata_autocom_innodb.result@1.1, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +21 -0
    result for InnoDB (no autocommit)

  mysql-test/r/loaddata_autocom_innodb.result@1.0, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +0 -0

  mysql-test/r/loaddata_autocom_ndb.result@1.1, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +23 -0
    result for NDB (autocommit)

  mysql-test/r/loaddata_autocom_ndb.result@1.0, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +0 -0

  mysql-test/r/rpl_ndb_innodb_trans.result@1.1, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +103 -0
    result for InnoDB+NDB transactions. Observe that when ROLLBACK
    cannot rollback the LOAD DATA INFILE in NDB it issues warning 1196
    as appropriate.

  mysql-test/r/rpl_ndb_innodb_trans.result@1.0, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +0 -0

  mysql-test/t/loaddata_autocom_innodb.test@1.1, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +4 -0
    test that InnoDB does not autocommit in LOAD DATA INFILE.

  mysql-test/t/loaddata_autocom_innodb.test@1.0, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +0 -0

  mysql-test/t/loaddata_autocom_ndb.test@1.1, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +4 -0
    test that NDB does autocommit in LOAD DATA INFIL

  mysql-test/t/loaddata_autocom_ndb.test@1.0, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +0 -0

  mysql-test/t/rpl_ndb_innodb_trans-slave.opt@1.1, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +1 -0
    need to tell the slave to use innodb

  mysql-test/t/rpl_ndb_innodb_trans-slave.opt@1.0, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +0 -0

  mysql-test/t/rpl_ndb_innodb_trans.test@1.1, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +66 -0
    test of transactions mixing NDB and InnoDB. To see if ROLLBACK
    rolls back in both engines, with the exception of LOAD DATA INFILE
    which does not roll back NDB: we see that a LOAD DATA INFILE in NDB
    commits all what has been done in NDB so far, commits its changes,
    but does not commit in other engines.

  mysql-test/t/rpl_ndb_innodb_trans.test@1.0, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +0 -0

  sql/ha_ndbcluster.cc@1.278, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +8 -1
    NDB wants to do autocommit if this is LOAD DATA INFILE.
    For this to not affect all other engines, we move the logic
    inside ha_ndbcluster.

  sql/sql_load.cc@1.98, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +0 -5
    This ha_enable_transaction() in mysql_load() forced an autocommit
    in all engines, while only NDB wants to do that.
    So we move the logic inside ha_ndbcluster.cc.

ChangeSet@1.1616.2732.2, 2006-09-04 18:40:30+03:00, gkodinov@macbook.gmz +5 -0
  Bug #21392: multi-table delete with alias table name fails with
              1003: Incorrect table name
  in multi-table DELETE the set of tables to delete from actually 
  references then tables in the other list, e.g:
  DELETE alias_of_t1 FROM t1 alias_of_t1 WHERE ....
  is a valid statement.
  So we must turn off table name syntactical validity check for alias_of_t1 
  because it's not a table name (even if it looks like one).
  In order to do that we add a special flag (TL_OPTION_ALIAS) to 
  disable the name checking for the aliases in multi-table DELETE.

  mysql-test/r/delete.result@1.21.1.1, 2006-09-04 18:40:20+03:00, gkodinov@macbook.gmz +4 -0
    Bug #21392: multi-table delete with alias table name fails with
                1003: Incorrect table name
     - test case

  mysql-test/t/delete.test@1.19.1.2, 2006-09-04 18:40:20+03:00, gkodinov@macbook.gmz +10 -0
    Bug #21392: multi-table delete with alias table name fails with
                1003: Incorrect table name
     - test case

  sql/mysql_priv.h@1.186.91.54, 2006-09-04 18:40:21+03:00, gkodinov@macbook.gmz +1 -0
    Bug #21392: multi-table delete with alias table name fails with
                1003: Incorrect table name
     - add a special flag to disable the name checking for the aliases
       in multi-table DELETE

  sql/sql_parse.cc@1.271.127.1, 2006-09-04 18:40:22+03:00, gkodinov@macbook.gmz +3 -1
    Bug #21392: multi-table delete with alias table name fails with
                1003: Incorrect table name
     - add a special flag to disable the name checking for the aliases
       in multi-table DELETE

  sql/sql_yacc.yy@1.203.128.1, 2006-09-04 18:40:23+03:00, gkodinov@macbook.gmz +5 -2
    Bug #21392: multi-table delete with alias table name fails with
                1003: Incorrect table name
     - add a special flag to disable the name checking for the aliases
       in multi-table DELETE

ChangeSet@1.1616.2741.1, 2006-09-04 19:47:24+05:00, holyfoot@mysql.com +2 -0
  bug #12620 (UTF-8 indexing causes ER_NO_KEYFILE error)
  
  The problem is that on some Mac OS X-es the file writing/reading
  call with zero bytes to read/write returns error.
  So here i try to eliminate that kinds of calls.

  myisam/mi_check.c@1.105.1.54, 2006-09-04 19:47:21+05:00, holyfoot@mysql.com +6 -3
    zero length copying avoided

  mysys/my_chsize.c@1.15.1.1, 2006-09-04 19:47:21+05:00, holyfoot@mysql.com +3 -1
    no file operations if it's not necessary

ChangeSet@1.1616.2730.20, 2006-09-04 16:53:03+03:00, timour@lamia.home +1 -0
  BUG#21787: COUNT(*) + ORDER BY + LIMIT returns wrong result
  
  Fix an error in the bug fix.

  sql/sql_select.cc@1.216.125.7, 2006-09-04 16:53:01+03:00, timour@lamia.home +8 -7
    Use a local variable to iterate over group items, since
    'group' is used later in a condition.

ChangeSet@1.1616.2709.13, 2006-09-04 13:43:34+02:00, jonas@perch.ndb.mysql.com +3 -0
  bug#21965 - replication
    fix deadlock if master switches log file in parallell with "show master logs"
    

  sql/log.cc@1.108.8.1, 2006-09-04 13:43:32+02:00, jonas@perch.ndb.mysql.com +7 -2
    add raw_get_current_log which dont take log mutex

  sql/sql_class.h@1.146.52.16, 2006-09-04 13:43:32+02:00, jonas@perch.ndb.mysql.com +1 -0
    add raw_get_current_log which dont take log mutex

  sql/sql_repl.cc@1.102.1.36, 2006-09-04 13:43:32+02:00, jonas@perch.ndb.mysql.com +6 -2
    Fix lock order i.e first log_lock then index_lock

ChangeSet@1.2255, 2006-09-04 11:30:04+02:00, msvensson@neptunus.(none) +1 -0
  Fix problem where mysql-test-run.pl fails to start up the mysqld after a failed test. Shows up on win hosts where one failed test case make subsequent ones fails with error "Could not open connection 'default': 2003 Can't connect to MySQL server on 'localhost'" 

  mysql-test/lib/mtr_process.pl@1.35, 2006-09-04 11:30:02+02:00, msvensson@neptunus.(none) +3 -0
    Reset the associated "pid" of masters and slave when building the list of processes to shutdown.

ChangeSet@1.1616.2740.1, 2006-09-04 06:16:34+02:00, tnurnberg@salvation.intern.azundris.com +3 -0
  Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
  
  Variable character_set_results can legally be NULL (for "no conversion.")
  This could result in a NULL deref that crashed the server.  Fixed.
  
  (Although ran some additional precursory tests to see whether I could break
  anything else, but no breakage so far.)

  mysql-test/r/func_time.result@1.23.4.5, 2006-09-04 06:16:28+02:00, tnurnberg@salvation.intern.azundris.com +12 -0
    Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
    
    Prove DATE_FORMAT() no longer crashes the server when character_set_results is
    NULL (which is a legal value and means, "no conversion").

  mysql-test/t/func_time.test@1.21.3.5, 2006-09-04 06:16:28+02:00, tnurnberg@salvation.intern.azundris.com +18 -0
    Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
    
    Prove DATE_FORMAT() no longer crashes the server when character_set_results is
    NULL (which is a legal value and means, "no conversion").

  sql/sql_string.cc@1.77.1.18, 2006-09-04 06:16:28+02:00, tnurnberg@salvation.intern.azundris.com +6 -1
    Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
    
    Avoid NULL deref in my_charset_same() -- if !to_cs, we won't need to compare
    because it is magic for, "no conversion."

ChangeSet@1.2216.30.2, 2006-09-01 21:53:23+02:00, cmiller@maint1.mysql.com +1 -0
  mtr_cases.pl:
    Provide a more extensible, easier-to-change way of reordering
    test cases.

  mysql-test/lib/mtr_cases.pl@1.19, 2006-09-01 21:49:08+02:00, cmiller@maint1.mysql.com +31 -27
    Provide a more extensible, easier-to-change way of reordering
    test cases.

ChangeSet@1.2244.22.5, 2006-09-01 16:55:35+02:00, georg@lmy002.wdf.sap.corp +1 -0
  included make_win_bin_dist (required for pushbuild) into distribution (make dist)

  scripts/Makefile.am@1.52, 2006-09-01 16:55:30+02:00, georg@lmy002.wdf.sap.corp +2 -1
    included make_win_bin_dist (required for pushbuild) into distribution (make dist)

ChangeSet@1.2244.22.4, 2006-09-01 16:04:59+02:00, georg@lmy002.wdf.sap.corp +1 -0
  Modification for win subdirectory

  configure.in@1.394.1.5, 2006-09-01 16:04:54+02:00, georg@lmy002.wdf.sap.corp +1 -1
    added win subdir

ChangeSet@1.2244.22.3, 2006-09-01 14:34:37+02:00, georg@lmy002.wdf.sap.corp +8 -0
  Fixes for crashes and test failures

  client/mysqlbinlog.cc@1.129, 2006-09-01 14:34:32+02:00, georg@lmy002.wdf.sap.corp +2 -3
    Fix for cmake build: Cmake doesn't use the VC++ files

  extra/comp_err.c@1.24, 2006-09-01 14:34:32+02:00, georg@lmy002.wdf.sap.corp +2 -1
    fixed windows crash (debug): We can't call DBUG_RETURN after my_end.

  include/my_dbug.h@1.18, 2006-09-01 14:34:32+02:00, georg@lmy002.wdf.sap.corp +1 -0
    added missing empty define for DBUG_LEAVE to prevent precompiler errors when
    compiling in non_debug mode

  mysql-test/mysql-test-run.pl@1.112, 2006-09-01 14:34:32+02:00, georg@lmy002.wdf.sap.corp +26 -9
    Added support for new cmake release and debug paths.

  mysql-test/t/system_mysql_db_fix.test@1.19, 2006-09-01 14:34:32+02:00, georg@lmy002.wdf.sap.corp +3 -0
    This test requires unix shell script mysql_fix_previleges_tables -> skip under windows

  mysys/my_seek.c@1.12, 2006-09-01 14:34:32+02:00, georg@lmy002.wdf.sap.corp +2 -1
    Fix for windows debug crash. However this solution is bad: we should never
    call lseek with an invalid file pointer.

  scripts/make_win_bin_dist@1.1, 2006-09-01 14:30:56+02:00, georg@lmy002.wdf.sap.corp +345 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/scripts/make_win_bin_dist

  scripts/make_win_bin_dist@1.0, 2006-09-01 14:30:56+02:00, georg@lmy002.wdf.sap.corp +0 -0

  sql/ha_archive.cc@1.72, 2006-09-01 14:34:32+02:00, georg@lmy002.wdf.sap.corp +1 -1
    Fixed windows crash: We need dup in gzdopen to keep the filehandle open,
    otherwise subsequent calls to mysql_close will fail/crash.

ChangeSet@1.1616.2739.1, 2006-09-01 15:07:04+03:00, timour@lamia.home +3 -0
  Fix for BUG#21787: COUNT(*) + ORDER BY + LIMIT returns wrong result
    
  The problem was due to a prior fix for BUG 9676, which limited
  the rows stored in a temporary table to the LIMIT clause. This
  optimization is not applicable to non-group queries with aggregate
  functions. The fix disables the optimization in this case.

  mysql-test/r/limit.result@1.7.1.2, 2006-09-01 15:07:02+03:00, timour@lamia.home +14 -0
    Test case for BUG#21787

  mysql-test/t/limit.test@1.7.1.3, 2006-09-01 15:07:02+03:00, timour@lamia.home +10 -0
    Test case for BUG#21787

  sql/sql_select.cc@1.216.134.1, 2006-09-01 15:07:02+03:00, timour@lamia.home +14 -5
    If there is an aggregate function in a non-group query,
    materialize all rows in the temporary table no matter if
    there is a LIMIT clause. This is necessary, since the
    aggregate functions must be computed over all result rows,
    not just the first LIMIT rows.

ChangeSet@1.2244.1.27, 2006-09-01 13:53:43+02:00, msvensson@neptunus.(none) +1 -0
  Fix problem with windows where stderr is not flushed until end of program.

  client/mysqldump.c@1.241, 2006-09-01 13:53:41+02:00, msvensson@neptunus.(none) +1 -0
    fflush stderr after writing to it.

ChangeSet@1.2216.55.1, 2006-09-01 04:23:04-07:00, igor@rurik.mysql.com +5 -0
  Fixed bug #16081: row equalities were not taken into
  account by the optimizer.
  Now all row equalities are converted into conjunctions of
  equalities between row elements. They are taken into account
  by the optimizer together with the original regular equality
  predicates.

  mysql-test/r/join_outer.result@1.52, 2006-09-01 04:22:57-07:00, igor@rurik.mysql.com +1 -1
    Adjusted results after fix for bug #16081.

  mysql-test/r/row.result@1.24, 2006-09-01 04:22:57-07:00, igor@rurik.mysql.com +125 -0
    Added a test cases for bug #16081.

  mysql-test/t/row.test@1.21, 2006-09-01 04:22:57-07:00, igor@rurik.mysql.com +47 -0
    Added a test cases for bug #16081.

  sql/sql_list.h@1.40, 2006-09-01 04:22:57-07:00, igor@rurik.mysql.com +3 -3
    Corrected the copy constructor for the class base_list.
    The previous implementation resulted in creation of an
    inconsistent base_list if the source list was empty.

  sql/sql_select.cc@1.447.1.1, 2006-09-01 04:22:57-07:00, igor@rurik.mysql.com +304 -152
    Fixed bug #16081: row equalities were not taken into
    account by the optimizer.
    Now all row equalities are converted into conjunctions of
    equalities between row elements. They are taken into account
    by the optimizer together with the original regular equality
    predicates.

ChangeSet@1.2244.24.1, 2006-09-01 13:23:43+04:00, sergefp@mysql.com +4 -0
  BUG#21477 "memory overruns for certain kinds of subqueries":
  make st_select_lex::setup_ref_array() take into account that 
  Item_sum-descendant objects located within descendant SELECTs
  may be added into ref_pointer_array.

  sql/item_sum.cc@1.180, 2006-09-01 13:23:38+04:00, sergefp@mysql.com +3 -1
    BUG#21477 "memory overruns for certain kinds of subqueries":
    Make SELECT_LEX::n_sum_items contain # of Item_sum-derived objects
    that exist within this SELECT.

  sql/sql_lex.cc@1.195.1.1, 2006-09-01 13:23:38+04:00, sergefp@mysql.com +4 -4
    BUG#21477 "memory overruns for certain kinds of subqueries":
    make st_select_lex::setup_ref_array() take into account that 
    Item_sum-descendant objects located within descendant SELECTs
    may be added into ref_pointer_array.

  sql/sql_lex.h@1.225.1.1, 2006-09-01 13:23:38+04:00, sergefp@mysql.com +7 -1
    BUG#21477 "memory overruns for certain kinds of subqueries":
    Add SELECT_LEX::n_sum_items and SELECT_LEXT::n_child_sum_items.

  sql/sql_yacc.yy@1.480.2.1, 2006-09-01 13:23:38+04:00, sergefp@mysql.com +2 -0
    BUG#21477 "memory overruns for certain kinds of subqueries":
    Make SELECT_LEX::n_sum_items contain # of Item_sum-derived objects
    that exist within this SELECT.

ChangeSet@1.1616.2730.18, 2006-09-01 11:21:12+02:00, msvensson@neptunus.(none) +2 -0
  Backport from 5.0
   - Dont test "encrypt" in ctype_ucs

  mysql-test/r/ctype_ucs.result@1.11.1.22, 2006-09-01 11:21:09+02:00, msvensson@neptunus.(none) +0 -4
    Don't test "encrypt" function in ctype_ucs.test

  mysql-test/t/ctype_ucs.test@1.15.1.18, 2006-09-01 11:21:10+02:00, msvensson@neptunus.(none) +0 -6
    Don't test "encrypt" function in ctype_ucs.test

ChangeSet@1.2244.22.2, 2006-09-01 10:32:12+02:00, georg@lmy002.wdf.sap.corp +23 -0
  make dist changes for Cmake build

  Makefile.am@1.84, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +2 -2
    make dist changes for Cmake build

  bdb/Makefile.in@1.7, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -1
    make dist changes for Cmake build

  client/Makefile.am@1.57, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +2 -0
    make dist changes for Cmake build

  dbug/Makefile.am@1.15, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +2 -1
    make dist changes for Cmake build

  extra/Makefile.am@1.33, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -0
    make dist changes for Cmake build

  extra/yassl/Makefile.am@1.4, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -1
    make dist changes for Cmake build

  extra/yassl/taocrypt/Makefile.am@1.4, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -1
    make dist changes for Cmake build

  heap/Makefile.am@1.11, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -1
    make dist changes for Cmake build

  innobase/Makefile.am@1.7, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -0
    make dist changes for Cmake build

  libmysql/Makefile.am@1.51, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -1
    make dist changes for Cmake build

  libmysql/mytest.c@1.3, 2006-09-01 10:20:41+02:00, georg@lmy002.wdf.sap.corp +0 -0
    Rename: BitKeeper/deleted/.del-mytest.c -> libmysql/mytest.c

  BitKeeper/deleted/.del-mytest.c@1.2, 2006-09-01 10:18:44+02:00, georg@lmy002.wdf.sap.corp +0 -0
    Delete: libmysql/mytest.c

  libmysql/mytest.c@1.1, 2006-09-01 10:17:39+02:00, georg@lmy002.wdf.sap.corp +175 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/libmysql/mytest.c

  libmysql/mytest.c@1.0, 2006-09-01 10:17:39+02:00, georg@lmy002.wdf.sap.corp +0 -0

  myisam/Makefile.am@1.32, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -1
    make dist changes for Cmake build

  myisammrg/Makefile.am@1.15, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -1
    make dist changes for Cmake build

  mysys/Makefile.am@1.71, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +2 -1
    make dist changes for Cmake build

  regex/Makefile.am@1.15, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -1
    make dist changes for Cmake build

  server-tools/Makefile.am@1.2, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -0
    make dist changes for Cmake build

  server-tools/instance-manager/Makefile.am@1.33, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +2 -1
    make dist changes for Cmake build

  sql/Makefile.am@1.122, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +2 -1
    make dist changes for Cmake build

  sql/message.mc@1.1, 2006-09-01 10:30:31+02:00, georg@lmy002.wdf.sap.corp +8 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/sql/message.mc

  sql/message.mc@1.0, 2006-09-01 10:30:31+02:00, georg@lmy002.wdf.sap.corp +0 -0

  strings/Makefile.am@1.51, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -1
    make dist changes for Cmake build

  tests/Makefile.am@1.27, 2006-09-01 10:32:07+02:00, georg@lmy002.wdf.sap.corp +2 -1
    make dist changes for Cmake build

  vio/Makefile.am@1.19, 2006-09-01 10:32:07+02:00, georg@lmy002.wdf.sap.corp +1 -1
    make dist changes for Cmake build

  zlib/Makefile.am@1.10, 2006-09-01 10:32:07+02:00, georg@lmy002.wdf.sap.corp +1 -1
    make dist changes for Cmake build

ChangeSet@1.1616.2738.1, 2006-09-01 10:21:08+02:00, msvensson@shellback.(none) +2 -0
  Add target to make "mtr", shortcut for running test suite

  BitKeeper/etc/ignore@1.153.1.83, 2006-09-01 10:21:06+02:00, msvensson@shellback.(none) +1 -0
    Added mysql-test/mtr to the ignore list

  mysql-test/Makefile.am@1.39.1.16, 2006-09-01 10:21:06+02:00, msvensson@shellback.(none) +6 -1
    Add target to make "mtr", shortcut for running test suite

ChangeSet@1.2244.20.3, 2006-08-31 20:53:34-07:00, jimw@rama.(none) +3 -0
  Restore bug fix lost in merge of client/mysqldump.c, and clean up mysqldump.test
  so that 4.1 and 5.0 tests are all in the right place and no tests are duplicated.

  client/mysqldump.c@1.240, 2006-08-31 20:53:30-07:00, jimw@rama.(none) +1 -0
    Restore fix for bug 21215 accidently removed during merge

  mysql-test/r/mysqldump.result@1.113, 2006-08-31 20:53:30-07:00, jimw@rama.(none) +158 -416
    Update results

  mysql-test/t/mysqldump.test@1.103, 2006-08-31 20:53:30-07:00, jimw@rama.(none) +90 -129
    Fix order of tests so that all the tests new to the 5.0 tree come after
    "End of 4.1 tests", and so that each leaves things in the state it found
    them (particularly by returning to the 'test' database. Also remove some
    tests that were duplicated.

ChangeSet@1.2244.1.23, 2006-09-01 05:00:32+02:00, tsmith@maint2.mysql.com +1 -0
  post-merge fix

  mysql-test/r/heap_btree.result@1.24, 2006-09-01 05:00:09+02:00, tsmith@maint2.mysql.com +1 -0
    post-merge fix

ChangeSet@1.2244.22.1, 2006-08-31 19:52:42+02:00, georg@lmy002.wdf.sap.corp +28 -0
  Additional files for cmake support

  CMakeLists.txt@1.1, 2006-08-31 19:52:36+02:00, georg@lmy002.wdf.sap.corp +132 -0
    New BitKeeper file ``CMakeLists.txt''

  CMakeLists.txt@1.0, 2006-08-31 19:52:36+02:00, georg@lmy002.wdf.sap.corp +0 -0

  bdb/CMakeLists.txt@1.1, 2006-08-31 19:52:36+02:00, georg@lmy002.wdf.sap.corp +44 -0
    New BitKeeper file ``bdb/CMakeLists.txt''

  bdb/CMakeLists.txt@1.0, 2006-08-31 19:52:36+02:00, georg@lmy002.wdf.sap.corp +0 -0

  client/CMakeLists.txt@1.1, 2006-08-31 19:52:36+02:00, georg@lmy002.wdf.sap.corp +79 -0
    New BitKeeper file ``client/CMakeLists.txt''

  client/CMakeLists.txt@1.0, 2006-08-31 19:52:36+02:00, georg@lmy002.wdf.sap.corp +0 -0

  dbug/CMakeLists.txt@1.1, 2006-08-31 19:52:36+02:00, georg@lmy002.wdf.sap.corp +5 -0
    New BitKeeper file ``dbug/CMakeLists.txt''

  dbug/CMakeLists.txt@1.0, 2006-08-31 19:52:36+02:00, georg@lmy002.wdf.sap.corp +0 -0

  extra/CMakeLists.txt@1.1, 2006-08-31 19:52:36+02:00, georg@lmy002.wdf.sap.corp +32 -0
    New BitKeeper file ``extra/CMakeLists.txt''

  extra/CMakeLists.txt@1.0, 2006-08-31 19:52:36+02:00, georg@lmy002.wdf.sap.corp +0 -0

  extra/yassl/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +6 -0
    New BitKeeper file ``extra/yassl/CMakeLists.txt''

  extra/yassl/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  extra/yassl/taocrypt/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +10 -0
    New BitKeeper file ``extra/yassl/taocrypt/CMakeLists.txt''

  extra/yassl/taocrypt/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  heap/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +8 -0
    New BitKeeper file ``heap/CMakeLists.txt''

  heap/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  innobase/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +35 -0
    New BitKeeper file ``innobase/CMakeLists.txt''

  innobase/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  libmysql/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +54 -0
    New BitKeeper file ``libmysql/CMakeLists.txt''

  libmysql/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  myisam/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +26 -0
    New BitKeeper file ``myisam/CMakeLists.txt''

  myisam/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  myisammrg/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +9 -0
    New BitKeeper file ``myisammrg/CMakeLists.txt''

  myisammrg/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  mysys/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +29 -0
    New BitKeeper file ``mysys/CMakeLists.txt''

  mysys/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  regex/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +5 -0
    New BitKeeper file ``regex/CMakeLists.txt''

  regex/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  server-tools/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +18 -0
    New BitKeeper file ``server-tools/CMakeLists.txt''

  server-tools/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  server-tools/instance-manager/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +17 -0
    New BitKeeper file ``server-tools/instance-manager/CMakeLists.txt''

  server-tools/instance-manager/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  sql/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +114 -0
    New BitKeeper file ``sql/CMakeLists.txt''

  sql/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  sql/examples/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +11 -0
    New BitKeeper file ``sql/examples/CMakeLists.txt''

  sql/examples/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  strings/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +12 -0
    New BitKeeper file ``strings/CMakeLists.txt''

  strings/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  tests/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +9 -0
    New BitKeeper file ``tests/CMakeLists.txt''

  tests/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  vio/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +6 -0
    New BitKeeper file ``vio/CMakeLists.txt''

  vio/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  win/Makefile.am@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +21 -0
    New BitKeeper file ``win/Makefile.am''

  win/Makefile.am@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  win/README@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +82 -0
    New BitKeeper file ``win/README''

  win/README@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  win/build-vs71.bat@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +7 -0
    New BitKeeper file ``win/build-vs71.bat''

  win/build-vs71.bat@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  win/build-vs8.bat@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +6 -0
    New BitKeeper file ``win/build-vs8.bat''

  win/build-vs8.bat@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  win/build-vs8_x64.bat@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +6 -0
    New BitKeeper file ``win/build-vs8_x64.bat''

  win/build-vs8_x64.bat@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  win/configure.js@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +166 -0
    New BitKeeper file ``win/configure.js''

  win/configure.js@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  zlib/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +8 -0
    New BitKeeper file ``zlib/CMakeLists.txt''

  zlib/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

ChangeSet@1.1616.2737.1, 2006-08-31 11:14:04-04:00, cmiller@zippy.cornsilk.net +1 -0
  Bitkeeper's Tk interface uses UTF8 by default, so mixing charsets in a 
  single file is a bad practice.  

  tests/mysql_client_test.c@1.51.32.1, 2006-08-31 11:14:03-04:00, cmiller@zippy.cornsilk.net +3 -2
    Replace literal characters which don't make sense in UTF8 with ubiquitously-
    understood numbers.

ChangeSet@1.2216.54.1, 2006-08-31 18:00:25+03:00, gkodinov@macbook.gmz +3 -0
  Bug#14654 : Cannot select from the same table twice within a UNION statement     
   Made the parser to support parenthesis around UNION branches.
   This is done by amending the rules of the parser so it generates the correct
   structure.
   Currently it supports arbitrary subquery/join/parenthesis operations in the 
   EXISTS clause. 
   In the IN/scalar subquery case it will allow adding nested parenthesis only 
   if there is an UNION clause after the parenthesis. Otherwise it will just  
   treat the multiple nested parenthesis as a scalar expression.
   It adds extra lex level for ((SELECT ...) UNION ...) to accommodate for the
   UNION clause.

  mysql-test/r/subselect.result@1.153.1.1, 2006-08-31 18:00:18+03:00, gkodinov@macbook.gmz +25 -0
    Bug#14654 : Cannot select from the same table twice within a UNION statement
     - test cases

  mysql-test/t/subselect.test@1.124.1.1, 2006-08-31 18:00:19+03:00, gkodinov@macbook.gmz +26 -0
    Bug#14654 : Cannot select from the same table twice within a UNION statement
     - test cases

  sql/sql_yacc.yy@1.479.1.1, 2006-08-31 18:00:20+03:00, gkodinov@macbook.gmz +72 -70
    Bug#14654 : Cannot select from the same table twice within a UNION statement
     - shuffle around the rules for the parenthesis in subselect

ChangeSet@1.2216.49.4, 2006-08-31 07:27:34-07:00, igor@rurik.mysql.com +4 -0
  Fixed bug #16249: different results for a range with an without index 
  when a range condition use an invalid DATETIME constant.
  Now we do not use invalid DATETIME constants to form end keys for
  range intervals: range analysis just ignores predicates with such
  constants.  

  mysql-test/r/query_cache.result@1.73, 2006-08-31 07:27:29-07:00, igor@rurik.mysql.com +6 -0
    Adjusted result warnings when adding a fix for bug #16249.

  mysql-test/r/range.result@1.49, 2006-08-31 07:27:29-07:00, igor@rurik.mysql.com +45 -0
    Added a test case for bug #16249.

  mysql-test/t/range.test@1.42, 2006-08-31 07:27:29-07:00, igor@rurik.mysql.com +29 -0
    Added a test case for bug #16249.

  sql/opt_range.cc@1.223, 2006-08-31 07:27:29-07:00, igor@rurik.mysql.com +8 -1
    Fixed bug #16249: different results for a range with an without index 
    when a range condition use an invalid DATETIME constant.
    Now we do not use invalid DATETIME constants to form end keys for
    range intervals: range analysis just ignores predicates with such
    constants.  

ChangeSet@1.2244.1.19, 2006-08-31 15:17:35+02:00, msvensson@shellback.(none) +1 -0
  Update the generate_prefix_files.pl

  extra/yassl/include/openssl/generate_prefix_files.pl@1.2, 2006-08-31 15:17:32+02:00, msvensson@shellback.(none) +1 -1
    Allow a '*' to be together with the function name.
    As in this example: "BIGNUM *BN_bin2bn"

ChangeSet@1.2244.1.18, 2006-08-31 15:16:44+02:00, msvensson@shellback.(none) +1 -0
  Bug#21930 libmysqlclient defines BN_bin2bn which belongs to OpenSSL! Breaks other apps!
   - Don't add the signatures for CRYPTO_* when compiling yaSSL for MySQL

  extra/yassl/taocrypt/src/misc.cpp@1.15, 2006-08-31 15:16:41+02:00, msvensson@shellback.(none) +2 -1
    No need to include the CRYPTO_* when compiling yaSSL for MySQL

ChangeSet@1.2244.1.17, 2006-08-31 14:26:12+02:00, msvensson@shellback.(none) +1 -0
  Bug #21930 libmysqlclient defines BN_bin2bn which belongs to OpenSSL! Breaks other apps!
   - Correct bug in perl script that faild to add rename macros for some functions.

  extra/yassl/include/openssl/prefix_ssl.h@1.3, 2006-08-31 14:26:08+02:00, msvensson@shellback.(none) +9 -1
    Add prefixes for a bunch of new functions found with the new version of generate_prefix_files.pl

ChangeSet@1.2244.1.15, 2006-08-31 11:53:08+02:00, msvensson@shellback.(none) +2 -0
  Disable testing of "encrypt" in ctype_ucs.test

  mysql-test/r/ctype_ucs.result@1.47, 2006-08-31 11:53:05+02:00, msvensson@shellback.(none) +0 -4
    Update result file

  mysql-test/t/ctype_ucs.test@1.45, 2006-08-31 11:53:05+02:00, msvensson@shellback.(none) +5 -0
    Disable testing of "encrypt" function in this file. That test has to be guarded by "have_crypt.inc"

ChangeSet@1.1616.2672.11, 2006-08-31 02:00:40+03:00, aelkin@dsl-hkigw8-feaaf900-177.dhcp.inet.fi +1 -0
  BUG#18822 LOAD DATA FROM MASTER corrupts data
  
  there is a bunch of dups. It has been decided to declare this feature as
  deprecated.
    

  sql/sql_yacc.yy@1.203.127.1, 2006-08-31 02:00:29+03:00, aelkin@dsl-hkigw8-feaaf900-177.dhcp.inet.fi +3 -1
    deprecation macro

ChangeSet@1.1346.880.1, 2006-08-30 17:28:34-04:00, cmiller@zippy.cornsilk.net +1 -0
  Bug#4053: too many of "error 1236: 'binlog truncated in the middle of \
  	event' from master"
  
  Since there is no repeatable test case, and this is obviously wrong, this is
  the most conservative change that might possibly work.  
  
  The syscall  read()  wasn't checked for a negative return value for an
  interrupted read.  The kernel  sys_read()  returns -EINTR, and the "library" 
  layer maps that to return value of -1 and sets  errno  to EINTR.  It's 
  impossible (on Linux) for  read()  to set errno EINTR without the return 
  value being -1 .
  
  So, if we're checking for EINTR behavior, we should not require that the
  return value be zero.

  mysys/my_read.c@1.6.1.2, 2006-08-30 17:28:34-04:00, cmiller@zippy.cornsilk.net +4 -1
    The read() syscall should check for negative one, since that (usually) signals
    errors (like being interrupted) and zero (usually) signals end-of-file .

  mysys/my_read.c@1.6.1.1, 2006-08-29 12:21:59-04:00, cmiller@zippy.cornsilk.net +21 -21
    Made styling conform to guidelines.

ChangeSet@1.1616.2735.3, 2006-08-30 22:39:23+02:00, tsmith@maint2.mysql.com +2 -0
  Remove ^Z from ctype_ucs.test data, to avoid problems testing on Windows

  mysql-test/r/ctype_ucs.result@1.11.1.21, 2006-08-30 22:39:04+02:00, tsmith@maint2.mysql.com +7 -7
    Remove ^Z from ctype_ucs.test data, to avoid problems testing on Windows

  mysql-test/t/ctype_ucs.test@1.15.1.17, 2006-08-30 22:39:04+02:00, tsmith@maint2.mysql.com +1 -1
    Remove ^Z from ctype_ucs.test data, to avoid problems testing on Windows

ChangeSet@1.2244.8.2, 2006-08-30 13:20:39-07:00, acurtis@xiphis.org +21 -0
  Bug#20573
    "strict mode: inserts autogenerated auto_increment value bigger than max"
    Strict mode should fail if autoincrement value is out of range

  include/my_base.h@1.80, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +3 -1
    Add new handler error codes

  mysql-test/include/strict_autoinc.inc@1.1, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +28 -0
    New BitKeeper file ``mysql-test/include/strict_autoinc.inc''

  mysql-test/include/strict_autoinc.inc@1.0, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +0 -0

  mysql-test/r/strict_autoinc_1myisam.result@1.1, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +27 -0
    New BitKeeper file ``mysql-test/r/strict_autoinc_1myisam.result''

  mysql-test/r/strict_autoinc_1myisam.result@1.0, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +0 -0

  mysql-test/r/strict_autoinc_2innodb.result@1.1, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +27 -0
    New BitKeeper file ``mysql-test/r/strict_autoinc_2innodb.result''

  mysql-test/r/strict_autoinc_2innodb.result@1.0, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +0 -0

  mysql-test/r/strict_autoinc_3heap.result@1.1, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +27 -0
    New BitKeeper file ``mysql-test/r/strict_autoinc_3heap.result''

  mysql-test/r/strict_autoinc_3heap.result@1.0, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +0 -0

  mysql-test/r/strict_autoinc_4bdb.result@1.1, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +27 -0
    New BitKeeper file ``mysql-test/r/strict_autoinc_4bdb.result''

  mysql-test/r/strict_autoinc_4bdb.result@1.0, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +0 -0

  mysql-test/r/strict_autoinc_5ndb.result@1.1, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +27 -0
    New BitKeeper file ``mysql-test/r/strict_autoinc_5ndb.result''

  mysql-test/r/strict_autoinc_5ndb.result@1.0, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +0 -0

  mysql-test/t/strict_autoinc_1myisam.test@1.1, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +8 -0
    New BitKeeper file ``mysql-test/t/strict_autoinc_1myisam.test''

  mysql-test/t/strict_autoinc_1myisam.test@1.0, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +0 -0

  mysql-test/t/strict_autoinc_2innodb.test@1.1, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +10 -0
    New BitKeeper file ``mysql-test/t/strict_autoinc_2innodb.test''

  mysql-test/t/strict_autoinc_2innodb.test@1.0, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +0 -0

  mysql-test/t/strict_autoinc_3heap.test@1.1, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +8 -0
    New BitKeeper file ``mysql-test/t/strict_autoinc_3heap.test''

  mysql-test/t/strict_autoinc_3heap.test@1.0, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +0 -0

  mysql-test/t/strict_autoinc_4bdb.test@1.1, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +10 -0
    New BitKeeper file ``mysql-test/t/strict_autoinc_4bdb.test''

  mysql-test/t/strict_autoinc_4bdb.test@1.0, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +0 -0

  mysql-test/t/strict_autoinc_5ndb.test@1.1, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +10 -0
    New BitKeeper file ``mysql-test/t/strict_autoinc_5ndb.test''

  mysql-test/t/strict_autoinc_5ndb.test@1.0, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +0 -0

  sql/ha_berkeley.cc@1.162, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +4 -1
    handle error in update_auto_increment()

  sql/ha_heap.cc@1.78, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +4 -1
    handle error in update_auto_increment()

  sql/ha_innodb.cc@1.299, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +2 -1
    handle error in update_auto_increment()

  sql/ha_myisam.cc@1.167, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +5 -1
    handle error in update_auto_increment()

  sql/ha_myisammrg.cc@1.80, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +5 -1
    handle error in update_auto_increment()

  sql/ha_ndbcluster.cc@1.275.1.1, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +3 -1
    handle error in update_auto_increment()

  sql/handler.cc@1.218, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +18 -5
    return error from handler::update_auto_increment()

  sql/handler.h@1.178, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +1 -1
    change return type of handler::update_auto_increment() to int

  sql/share/errmsg.txt@1.68.2.1, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +2 -0
    new error message for auto-increment

ChangeSet@1.1616.2735.2, 2006-08-30 21:24:09+02:00, tsmith@maint2.mysql.com +1 -0
  portability fix in BUILD/* for solaris

  BUILD/check-cpu@1.12.1.1, 2006-08-30 21:23:59+02:00, tsmith@maint2.mysql.com +176 -173
    portability fix in BUILD/* for solaris

ChangeSet@1.2250, 2006-08-30 20:45:43+02:00, hartmut@mysql.com +1 -0
  make DNS based hostname queries work (bug #17582)

  ndb/tools/ndb_config.cpp@1.13, 2006-08-30 20:45:40+02:00, hartmut@mysql.com +2 -2
    make DNS based hostname queries work (bug #17582)

ChangeSet@1.2244.11.2, 2006-08-30 17:11:00+02:00, msvensson@neptunus.(none) +2 -0
  Bug#21813 An attacker has the opportunity to bypass query logging, part2
   - Use the "%.*b" format when printing prepared and exeuted prepared statements to the log.
   - Add test case to check that also prepared statements end up in the query log
  Bug#14346 Prepared statements corrupting general log/server memory
   - Use "stmt->query" when logging the newly prepared query instead of "packet"

  sql/sql_prepare.cc@1.182, 2006-08-30 17:10:57+02:00, msvensson@neptunus.(none) +4 -2
    mysql_stmt_prepare
     - Use "%.*b" format when printing to log
     - Print the query from stmt instead of "packet", packet points at the net in/out buffer and has most likely been overwritten
       when  result for prepare was written to client.
    mysql_stmt_execute 
     - Use "%.*b" format when printing to log
     - Print the query from thd as the expanded query has been specifially set to be valid also after restore from backup statement  

  tests/mysql_client_test.c@1.204.1.1, 2006-08-30 17:10:57+02:00, msvensson@neptunus.(none) +66 -23
    Add tests for bug#21813 to already existing test for bug#17667. Add functionality for also executing prepared statements and making sure they end up in the log as well. 

ChangeSet@1.1616.2733.2, 2006-08-30 15:56:17+05:00, gluh@mysql.com +7 -0
  Bug#20393 User name truncation in mysql client
  Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte

  include/mysql_com.h@1.67.1.41, 2006-08-30 15:56:14+05:00, gluh@mysql.com +3 -0
    Bug#20393 User name truncation in mysql client
    Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
    added new constants NAME_BYTE_LEN, USERNAME_BYTE_LENGTH, SYSTEM_CHARSET_MBMAXLEN

  mysql-test/r/ctype_utf8.result@1.45.1.27, 2006-08-30 15:56:14+05:00, gluh@mysql.com +12 -0
    Bug#20393 User name truncation in mysql client
    Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
    test case

  mysql-test/t/ctype_utf8.test@1.57.1.17, 2006-08-30 15:56:14+05:00, gluh@mysql.com +16 -0
    Bug#20393 User name truncation in mysql client
    Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
    test case

  sql-common/client.c@1.46.1.46, 2006-08-30 15:56:14+05:00, gluh@mysql.com +3 -3
    Bug#20393 User name truncation in mysql client
    Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
    increased buffers for user name & db

  sql/sql_acl.cc@1.74.1.105, 2006-08-30 15:56:14+05:00, gluh@mysql.com +5 -1
    Bug#20393 User name truncation in mysql client
    Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
    check that user name is not longer than USERNAME_LENGTH symbols
    

  sql/sql_parse.cc@1.271.1.215, 2006-08-30 15:56:14+05:00, gluh@mysql.com +2 -2
    Bug#20393 User name truncation in mysql client
    Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
    increased buffers for user name & db

  sql/table.cc@1.111.4.6, 2006-08-30 15:56:14+05:00, gluh@mysql.com +4 -2
    Bug#20393 User name truncation in mysql client
    Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
    check that db name is not longer than NAME_LEN symbols

ChangeSet@1.2244.15.3, 2006-08-30 03:22:59+04:00, kostja@bodhi.local +3 -0
  Post-merge fixes.

  mysql-test/r/view.result@1.173, 2006-08-30 03:22:56+04:00, kostja@bodhi.local +11 -11
    A post-merge fix.

  mysql-test/t/grant.test@1.48, 2006-08-30 03:22:56+04:00, kostja@bodhi.local +1 -1
    A post-merge fix.

  mysql-test/t/view.test@1.160, 2006-08-30 03:22:56+04:00, kostja@bodhi.local +43 -40
    A post-merge fix.

ChangeSet@1.2244.15.2, 2006-08-30 01:48:15+04:00, kostja@bodhi.local +3 -0
  Remove the fix for Bug#10668 "CREATE USER does not enforce username 
  length limit", it's superseded by the fix for Bug#16899 "Possible buffer
  overflow in handling of DEFINER-clause". Update test results.

  mysql-test/r/grant.result@1.59, 2006-08-30 01:48:11+04:00, kostja@bodhi.local +2 -1
    A post-merge fix.

  mysql-test/t/grant.test@1.47, 2006-08-30 01:48:11+04:00, kostja@bodhi.local +3 -2
    A new error is returned, use the default database after drop database.

  sql/sql_acl.cc@1.204.1.2, 2006-08-30 01:48:11+04:00, kostja@bodhi.local +0 -8
    Remove an unneeded check.

ChangeSet@1.2216.29.15, 2006-08-30 00:38:58+04:00, kostja@bodhi.local +4 -0
  A fix for Bug#14897 "ResultSet.getString("table.column") sometimes 
  doesn't find the column"
  
  When a user was using 4.1 tables with VARCHAR column and 5.0 server
  and a query that used a temporary table to resolve itself, the
  table metadata for the varchar column sent to client was incorrect:
  MYSQL_FIELD::table member was empty.
  
  The bug was caused by implicit "upgrade" from old VARCHAR to new
  VARCHAR hard-coded in Field::new_field, which did not preserve
  the information about the original table. Thus, the field metadata
  of the "upgraded" field pointed to an auxiliary temporary table
  created for query execution.
  
  The fix is to copy the pointer to the original table to the new field.

  mysql-test/r/type_varchar.result@1.9, 2006-08-30 00:38:53+04:00, kostja@bodhi.local +31 -0
    Update test results (Bug#14897)

  mysql-test/std_data/14897.frm@1.1, 2006-08-30 00:38:54+04:00, kostja@bodhi.local +193 -0
    New BitKeeper file ``mysql-test/std_data/14897.frm''

  mysql-test/std_data/14897.frm@1.0, 2006-08-30 00:38:54+04:00, kostja@bodhi.local +0 -0

  mysql-test/t/type_varchar.test@1.9, 2006-08-30 00:38:54+04:00, kostja@bodhi.local +41 -0
    Add a test case for Bug#14897 "ResultSet.getString("table.column") 
    sometimes doesn't find the column"

  sql/field.cc@1.318.1.2, 2006-08-30 00:38:54+04:00, kostja@bodhi.local +19 -8
    Preserve the original table name when converting fields from 
    old VARCHAR to new VARCHAR.     

ChangeSet@1.1346.879.1, 2006-08-29 20:45:04+02:00, istruewing@chilla.local +3 -0
  Bug#14400 - Query joins wrong rows from table which is
              subject of "concurrent insert"
  Better fix by Monty: "The previous bug fix didn't work
  when using partial keys."

  myisam/mi_rkey.c@1.11.2.1, 2006-08-29 20:45:03+02:00, istruewing@chilla.local +31 -12
    Bug#14400 - Query joins wrong rows from table which is
                subject of "concurrent insert"
    Better fix by Monty: "The previous bug fix didn't work
    when using partial keys."

  mysql-test/r/myisam.result@1.10.3.1, 2006-08-29 20:45:03+02:00, istruewing@chilla.local +15 -0
    Bug#14400 - Query joins wrong rows from table which is
                subject of "concurrent insert"
    Added test result

  mysql-test/t/myisam.test@1.7.3.1, 2006-08-29 20:45:03+02:00, istruewing@chilla.local +17 -0
    Bug#14400 - Query joins wrong rows from table which is
                subject of "concurrent insert"
    Added test case

ChangeSet@1.2216.53.1, 2006-08-29 15:46:40+04:00, anozdrin@alik. +16 -0
  Preliminary patch for the following bugs:
    - BUG#15934: Instance manager fails to work;
    - BUG#18020: IM connect problem;
    - BUG#18027: IM: Server_ID differs;
    - BUG#18033: IM: Server_ID not reported;
    - BUG#21331: Instance Manager: Connect problems in tests;
  
  The only test suite has been changed
  (server codebase has not been modified).

  BitKeeper/deleted/.del-im_check_os.inc@1.2, 2006-08-29 15:38:17+04:00, anozdrin@alik. +0 -0
    Rename: mysql-test/include/im_check_os.inc -> BitKeeper/deleted/.del-im_check_os.inc

  BitKeeper/etc/collapsed@1.4, 2006-08-29 15:38:17+04:00, anozdrin@alik. +1 -0

  mysql-test/include/im_check_env.inc@1.2, 2006-08-29 15:46:39+04:00, anozdrin@alik. +2 -4
    Include only this file from all IM-tests.

  mysql-test/lib/mtr_io.pl@1.4, 2006-08-29 15:46:39+04:00, anozdrin@alik. +32 -6
    Update mtr_get_pid_from_file() to workaround race,
    described in BUG#21884.

  mysql-test/lib/mtr_process.pl@1.34, 2006-08-29 15:46:39+04:00, anozdrin@alik. +782 -54
    Refactor im_start()/im_stop() so that they will be more
    reliable. There are the following user-visible changes:
      - if one of these functions fails, the test suite
        is aborted;
      - mtr_im_stop() now determines whether the component is
        alive or not not only by checking PID, but also by trying
        to connect to the component;
      - after starting IM, the test suite waits for it to start
        accepting client connections and to start all its guarded
        mysqld instances;
      - a lot of debug-logs have been added in order to simplify
        investigation of future failures.

  mysql-test/mysql-test-run.pl@1.104.1.3, 2006-08-29 15:46:39+04:00, anozdrin@alik. +13 -246
    1. Get rid of kill_and_cleanup();
    2. Move im_start()/im_stop() to mtr_process.pl;
    3. Change default IM port to 9311 so that it does not interfere
       with default slave port;

  mysql-test/r/im_daemon_life_cycle.result@1.5, 2006-08-29 15:46:39+04:00, anozdrin@alik. +0 -1
    Updated result file.

  mysql-test/r/im_life_cycle.result@1.6.1.2, 2006-08-29 15:46:39+04:00, anozdrin@alik. +0 -1
    Updated result file.

  mysql-test/r/im_options_set.result@1.6, 2006-08-29 15:46:39+04:00, anozdrin@alik. +0 -1
    Updated result file.

  mysql-test/r/im_options_unset.result@1.6, 2006-08-29 15:46:39+04:00, anozdrin@alik. +0 -1
    Updated result file.

  mysql-test/r/im_utils.result@1.5, 2006-08-29 15:46:39+04:00, anozdrin@alik. +0 -1
    Updated result file.

  mysql-test/t/im_daemon_life_cycle.imtest@1.4, 2006-08-29 15:46:39+04:00, anozdrin@alik. +0 -1
    Updated IM-test.

  mysql-test/t/im_life_cycle.imtest@1.5.1.2, 2006-08-29 15:46:39+04:00, anozdrin@alik. +0 -1
    Updated IM-test.

  mysql-test/t/im_options_set.imtest@1.4, 2006-08-29 15:46:39+04:00, anozdrin@alik. +0 -1
    Updated IM-test.

  mysql-test/t/im_options_unset.imtest@1.4, 2006-08-29 15:46:39+04:00, anozdrin@alik. +0 -1
    Updated IM-test.

  mysql-test/t/im_utils.imtest@1.4, 2006-08-29 15:46:39+04:00, anozdrin@alik. +0 -1
    Updated IM-test.

ChangeSet@1.2216.52.1, 2006-08-29 14:32:59+04:00, kroki@moonlight.intranet +3 -0
  BUG#17591: Updatable view not possible with trigger or stored function
  
  When a view was used inside a trigger or a function, lock type for
  tables used in a view was always set to READ (thus making the view
  non-updatable), even if we were trying to update the view.
  
  The solution is to set lock type properly.

  mysql-test/r/view.result@1.169.4.1, 2006-08-29 14:32:57+04:00, kroki@moonlight.intranet +27 -1
    Add result for bug#17591: Updatable view not possible with trigger
    or stored function.

  mysql-test/t/view.test@1.154.3.1, 2006-08-29 14:32:57+04:00, kroki@moonlight.intranet +48 -1
    Add test case for bug#17591: Updatable view not possible with trigger
    or stored function.

  sql/sql_view.cc@1.89.7.1, 2006-08-29 14:32:57+04:00, kroki@moonlight.intranet +30 -22
    Move the code that sets requested lock type before the point where
    we exit from mysql_make_view() when we process a placeholder for
    prelocked table.

ChangeSet@1.1346.875.2, 2006-08-29 01:13:06+02:00, tsmith@maint1.mysql.com +1 -0
  minor portability fix in SETUP.sh

  BUILD/SETUP.sh@1.17.1.8, 2006-08-29 01:12:45+02:00, tsmith@maint1.mysql.com +3 -9

ChangeSet@1.2244.1.10, 2006-08-28 17:48:06-04:00, iggy@rolltop.ignatz42.dyndns.org +3 -0
  Bug #21527 mysqldump incorrectly tries to LOCK TABLES on the information_schema database.
      
  init_dumping now accepts a function pointer to the table or view specific init_dumping function.  This allows both tables and views to use the init_dumping function.

  client/mysqldump.c@1.238, 2006-08-28 17:48:04-04:00, iggy@rolltop.ignatz42.dyndns.org +80 -54
    Added functions for table and view specific dumping initalization.

  mysql-test/r/mysqldump.result@1.111, 2006-08-28 17:48:04-04:00, iggy@rolltop.ignatz42.dyndns.org +14 -0
    Added Result.

  mysql-test/t/mysqldump.test@1.101, 2006-08-28 17:48:04-04:00, iggy@rolltop.ignatz42.dyndns.org +30 -0
    Added test case.

ChangeSet@1.2216.1.27, 2006-08-28 10:26:21+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21615
    Improve error message when detecting corrupted REDO log

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.93, 2006-08-28 10:26:19+02:00, jonas@perch.ndb.mysql.com +48 -30
    Improve error message when detecting corrupted REDO log

ChangeSet@1.1616.2730.10, 2006-08-26 18:38:42+02:00, msvensson@neptunus.(none) +1 -0
  Dont' ever use cluster for slave in 4.1

  mysql-test/mysql-test-run.pl@1.8.9.11, 2006-08-26 18:38:40+02:00, msvensson@neptunus.(none) +1 -1
    Dont' ever use cluster for slave in 4.1

ChangeSet@1.2244.12.2, 2006-08-26 10:21:26+04:00, kaa@polly.local +1 -0
  Post-review fix (bug #21250)

  sql/stacktrace.c@1.18, 2006-08-26 10:21:23+04:00, kaa@polly.local +4 -0
    Post-review fix (bug #21250)

ChangeSet@1.1616.2730.9, 2006-08-25 17:01:04+02:00, msvensson@neptunus.(none) +1 -0
  Ignore --skip-im if specified on command line 
  Null merge to 5.0

  mysql-test/mysql-test-run.pl@1.8.9.10, 2006-08-25 17:01:02+02:00, msvensson@neptunus.(none) +2 -0
    Ignore --skip-im if specified on command line 

ChangeSet@1.2244.12.1, 2006-08-25 17:59:47+04:00, kaa@polly.local +2 -0
  Added stacktrace dumps for x86_64 (bug #21250)
  Fixed stacktrace dumps for i386/NPTL

  sql/stacktrace.c@1.17, 2006-08-25 17:59:45+04:00, kaa@polly.local +36 -15
    Added stacktrace dumps for x86_64 (bug #21250)
    Fixed stacktrace dumps for i386/NPTL

  sql/stacktrace.h@1.4, 2006-08-25 17:59:46+04:00, kaa@polly.local +6 -2
    Added stacktrace dumps for x86_64 (bug #21250)
    Fixed stacktrace dumps for i386/NPTL

ChangeSet@1.2216.51.1, 2006-08-25 15:51:29+02:00, andrey@example.com +8 -0
  Fix for bug#21795: SP: sp_head::is_not_allowed_in_function() contains
  erroneous check
  
  Problem: Actually there were two problems in the server code. The check
  for SQLCOM_FLUSH in SF/Triggers were not according to the existing
  architecture which uses sp_get_flags_for_command() from sp_head.cc .
  This function was also missing a check for SQLCOM_FLUSH which has a
  problem combined with prelocking. This changeset fixes both of these
  deficiencies as well as the erroneous check in
  sp_head::is_not_allowed_in_function() which was a copy&paste error.

  mysql-test/r/sp-error.result@1.108, 2006-08-25 15:51:23+02:00, andrey@example.com +39 -0
    update result

  mysql-test/r/trigger.result@1.45, 2006-08-25 15:51:23+02:00, andrey@example.com +72 -1
    update result

  mysql-test/t/sp-error.test@1.108, 2006-08-25 15:51:23+02:00, andrey@example.com +39 -0
    FLUSH can create a problem with prelocking, hence it's disabled.
    There is a better way to check this than a check in the parser.
    Now we use sp_get_flags_for_command() and the error returned is
    different.

  mysql-test/t/trigger.test@1.51, 2006-08-25 15:51:23+02:00, andrey@example.com +89 -1
    FLUSH can create a problem with prelocking, hence it's disabled.
    There is a better way to check this than a check in the parser.
    Now we use sp_get_flags_for_command() and the error returned is
    different.

  sql/sp_head.cc@1.222, 2006-08-25 15:51:23+02:00, andrey@example.com +6 -0
    FLUSH and RESET are not allowed inside a SF/Trigger.
    Because they don't imply a COMMIT sp_head::HAS_COMMIT_OR_ROLLBACK
    cannot be used. Two new flags were introduced for that reason.

  sql/sp_head.h@1.88, 2006-08-25 15:51:23+02:00, andrey@example.com +11 -7
    Don't check m_type as this check is erroneous. This is probably
    a copy and paste error when moving code from somewhere else. Another
    fact which supports this was prefixing the enum value with the name
    of class sp_head.
    
    Adding two new flags HAS_SQLCOM_RESET and HAS_SQLCOM_FLUSH. The values
    are 2048 and 4096 because in the 5.1 branch there are already new flags
    which are with values up-to 1024.

  sql/sql_parse.cc@1.567, 2006-08-25 15:51:23+02:00, andrey@example.com +1 -5
    FLUSH can cause a problem with prelocking in SF/Trigger and
    therefore is already disabled. RESET is also disabled because
    is handled by the same code as FLUSH. We won't allow RESET inside
    SF/Trigger at that stage without thorough analysis. The check for
    them is already done in the parser by calling
    is_not_allowed_in_function()

  sql/sql_yacc.yy@1.474.1.6, 2006-08-25 15:51:23+02:00, andrey@example.com +2 -11
    By listing SQLCOM_FLUSH as command which implies COMMIT
    in sp_get_flags_for_command() the check in sql_yacc.yy is
    obsolete.

ChangeSet@1.1616.2730.8, 2006-08-25 15:23:42+02:00, msvensson@neptunus.(none) +1 -0
  Add mysqld-max-nt to list of mysqld executales to look for on windows

  mysql-test/mysql-test-run.pl@1.8.9.9, 2006-08-25 15:23:40+02:00, msvensson@neptunus.(none) +2 -1
    Add mysqld-max-nt to list of mysqld executales to look for on windows

ChangeSet@1.1616.2730.7, 2006-08-25 15:17:03+02:00, msvensson@neptunus.(none) +3 -0
  Backport from 5.0 a fix that will start ndb only for tests that needs it

  mysql-test/lib/mtr_cases.pl@1.6.2.3, 2006-08-25 15:16:58+02:00, msvensson@neptunus.(none) +22 -0
    Detect which tests that need ndb

  mysql-test/lib/mtr_match.pl@1.1.1.1, 2006-08-25 15:16:58+02:00, msvensson@neptunus.(none) +17 -0
    Add function mtr_match_substring

  mysql-test/mysql-test-run.pl@1.8.9.8, 2006-08-25 15:16:58+02:00, msvensson@neptunus.(none) +26 -2
    Only start cluster for test cases that need it

ChangeSet@1.2216.50.1, 2006-08-25 02:17:41-07:00, igor@rurik.mysql.com +3 -0
  Fixed bug #21390: wrong estimate of rows after elimination of
  const tables. This resulted in choosing extremely inefficient
  execution plans in same cases when distribution of data in
  joined were skewed (see the customer test case for the bug).
  

  mysql-test/r/select.result@1.138, 2006-08-25 02:17:34-07:00, igor@rurik.mysql.com +40 -2
    Added a test case for bug #21390: wrong estimate of rows
    after elimination of const tables.
    Includded a test case that checks the code added by the patch
    that handles outer joins with no matches after substitution of
    a const table in an efficient way.

  mysql-test/t/select.test@1.112, 2006-08-25 02:17:34-07:00, igor@rurik.mysql.com +41 -0
    Added a test case for bug #21390: wrong estimate of rows
    after elimination of const tables.
    Included a test case that checks the code added by the patch
    that handles outer joins with no matches after substitution of
    a const table in an efficient way.
     

  sql/sql_select.cc@1.447, 2006-08-25 02:17:34-07:00, igor@rurik.mysql.com +54 -24
    Fixed bug #21390: wrong estimate of rows after elimination of
    const tables. This resulted in choosing extremely inefficient
    execution plans in same cases when distribution of data in
    joined were skewed (see the customer test case for the bug).
    Also added the code to handle outer joins with no matches after
    substitution of a const table in an efficient way. 
    Corrected calculation of the null rejecting key conditions.

ChangeSet@1.1616.2730.6, 2006-08-25 10:46:14+02:00, msvensson@neptunus.(none) +2 -0
  Fix running tests suite with non standard tmp dir.
  Default is "var/tmp" 

  mysql-test/r/myisam.result@1.45.1.18, 2006-08-25 10:46:12+02:00, msvensson@neptunus.(none) +2 -2
    Update result file

  mysql-test/t/myisam.test@1.33.1.16, 2006-08-25 10:46:12+02:00, msvensson@neptunus.(none) +8 -2
    If running test suite with a non standard tmp dir, the "show create table" will print "DATA DIRECTORY="
    Use replace_result to mask it out
    Set tmpdir to var/log to get the printout of DATA DIRECTORY also when running with standard tmpdir

ChangeSet@1.1616.2731.1, 2006-08-25 10:11:15+02:00, msvensson@neptunus.(none) +1 -0
  Backport fix for finding executables from 5.0

  mysql-test/lib/mtr_misc.pl@1.5.1.2, 2006-08-25 10:11:14+02:00, msvensson@neptunus.(none) +16 -2
    On windows the exe does not need to be executable for it to be found

ChangeSet@1.2216.48.2, 2006-08-25 11:34:13+04:00, kroki@moonlight.intranet +1 -0
  Comment cleanup after push of bug#21166.

  sql/item.cc@1.228.1.4, 2006-08-25 11:34:09+04:00, kroki@moonlight.intranet +7 -7
    Comment cleanup after push of bug#21166.

ChangeSet@1.2216.49.2, 2006-08-25 00:23:42+04:00, evgen@sunlight.local +1 -0
  opt_range.cc:
    Corrected fix for bug#18165

  sql/opt_range.cc@1.222, 2006-08-25 00:23:03+04:00, evgen@sunlight.local +4 -2
    Corrected fix for bug#18165

ChangeSet@1.2216.49.1, 2006-08-24 23:16:54+04:00, evgen@moonbone.local +1 -0
  opt_range.cc:
    Corrected fix for bug#18165

  sql/opt_range.cc@1.221, 2006-08-24 23:16:01+04:00, evgen@moonbone.local +3 -4
    Corrected fix for bug#18165

ChangeSet@1.2216.48.1, 2006-08-24 19:36:26+02:00, andrey@example.com +3 -0
  Fix for bug#21416 SP: Recursion level higher than zero needed for non-recursive call
  
  The following procedure was not possible if max_sp_recursion_depth is 0
  create procedure show_proc() show create procedure show_proc;
    
  Actually there is no recursive call but the limit is checked.
    
  Solved by temporarily increasing the thread's limit just before the fetch from cache
  and decreasing after that.

  mysql-test/r/sp.result@1.210, 2006-08-24 19:36:21+02:00, andrey@example.com +7 -0
    update result

  mysql-test/t/sp.test@1.198, 2006-08-24 19:36:22+02:00, andrey@example.com +10 -0
    Test for bug #21416 SP: Recursion level higher than zero needed for non-recursive call

  sql/sp.cc@1.116, 2006-08-24 19:36:22+02:00, andrey@example.com +15 -6
    Increase the max_sp_recursion_depth temporarily for SHOW CREATE PROCEDURE call.
    This call is in fact not recursive but is counted as such. Outcome, it will work
    always but if max_sp_recursion_depth is reached we are going to cache one more
    sp_head instance.

ChangeSet@1.1616.2725.3, 2006-08-24 19:16:27+04:00, sergefp@mysql.com +2 -0
  BUG#16255: Post-review fixes: adjust the testcase.

  mysql-test/r/subselect.result@1.67.65.2, 2006-08-24 19:16:25+04:00, sergefp@mysql.com +22 -11
    BUG#16255: A proper testcase

  mysql-test/t/subselect.test@1.58.46.2, 2006-08-24 19:16:25+04:00, sergefp@mysql.com +17 -5
    BUG#16255: A proper testcase

ChangeSet@1.2244.4.13, 2006-08-24 11:15:08-04:00, iggy@rolltop.ignatz42.dyndns.org +3 -0
  Bug #11972: client uses wrong character set after reconnect.
  
  The mysql client uses the default character set on reconnect.  The default character set is now controled by the client charset command while the client is running.  The charset command now also issues a SET NAMES command to the server to make sure that the client's charset settings are in sync with the server's.

  client/mysql.cc@1.216, 2006-08-24 11:15:05-04:00, iggy@rolltop.ignatz42.dyndns.org +3 -0
    Client charset command now changes the default character set and issues a SET NAMES command to the server.

  mysql-test/r/mysql.result@1.15, 2006-08-24 11:15:05-04:00, iggy@rolltop.ignatz42.dyndns.org +7 -7
    Corrected results for new behaviour.

  mysql-test/t/mysql.test@1.15, 2006-08-24 11:15:05-04:00, iggy@rolltop.ignatz42.dyndns.org +2 -2
    Removed redundant commands from test.

ChangeSet@1.1616.2725.2, 2006-08-24 19:14:36+04:00, sergefp@mysql.com +3 -0
  Bug #16255: Subquery in WHERE (the cset by Georgi Kodinov)
   Must not use Item_direct_ref in HAVING because it points to
   the new value (witch is not yet calculated for the first row).

  mysql-test/r/subselect.result@1.67.65.1, 2006-08-24 19:14:34+04:00, sergefp@mysql.com +11 -0
    Bug #16255: Subquery in where
     - test case

  mysql-test/t/subselect.test@1.58.46.1, 2006-08-24 19:14:34+04:00, sergefp@mysql.com +12 -0
    Bug #16255: Subquery in where
     - test case

  sql/item_subselect.cc@1.60.1.83, 2006-08-24 19:14:34+04:00, sergefp@mysql.com +5 -5
    Bug #16255: Subquery in where
     Must not use Item_direct_ref in HAVING because it points to
     the new value (witch is not yet calculated for the first row).

ChangeSet@1.2216.29.10, 2006-08-24 18:48:26+04:00, anozdrin@alik. +2 -0
  Polishing (was the part of original patch for BUG#16899):
  Changed trigger-handling code so that there will be the one
  place for generate statement string for replication log
  and for trigger file.

  sql/sql_trigger.cc@1.55, 2006-08-24 18:48:25+04:00, anozdrin@alik. +58 -61
    Changed trigger-handling code so that there will be the one
    place for generate statement string for replication log
    and for trigger file.

  sql/sql_trigger.h@1.21, 2006-08-24 18:48:25+04:00, anozdrin@alik. +2 -4
    Changed trigger-handling code so that there will be the one
    place for generate statement string for replication log
    and for trigger file.

ChangeSet@1.2216.29.9, 2006-08-24 15:49:12+04:00, kroki@moonlight.intranet +9 -0
  BUG#21166: Prepared statement causes signal 11 on second execution
  
  Changes in an item tree done by optimizer weren't properly
  registered and went unnoticed, which resulted in preliminary freeing
  of used memory.

  mysql-test/r/ps.result@1.72, 2006-08-24 15:49:06+04:00, kroki@moonlight.intranet +15 -0
    Add result for bug#21166: Prepared statement causes signal 11
    on second execution.

  mysql-test/t/ps.test@1.69, 2006-08-24 15:49:06+04:00, kroki@moonlight.intranet +30 -1
    Add test case for bug#21166: Prepared statement causes signal 11
    on second execution.

  sql/item.cc@1.228.1.3, 2006-08-24 15:49:06+04:00, kroki@moonlight.intranet +70 -2
    Move Item::transform() and Item_default_value::transform() from
    item.h here and use THD::change_item_tree() instead of plain
    assignment.
    Change Item_field::set_no_const_sub() to be used with Item::walk()
    instead of Item::transform().

  sql/item.h@1.205.1.1, 2006-08-24 15:49:07+04:00, kroki@moonlight.intranet +4 -18
    Move definition of Item::transform() and Item_default_value::transform()
    to item.cc.
    Change Item::set_no_const_sub() to be used with Item::walk()
    instead of Item::transform().

  sql/item_cmpfunc.cc@1.213.1.1, 2006-08-24 15:49:08+04:00, kroki@moonlight.intranet +22 -4
    Use Item::walk() to execute Item::set_no_const_sub().
    Use THD::change_item_tree() instead of plain assignment.

  sql/item_func.cc@1.295.2.1, 2006-08-24 15:49:08+04:00, kroki@moonlight.intranet +9 -0
    Add assert and comment to Item_func::traverse_cond().

  sql/item_row.cc@1.33, 2006-08-24 15:49:08+04:00, kroki@moonlight.intranet +11 -1
    Use THD::change_item_tree() instead of plain assignment.

  sql/item_strfunc.cc@1.275.4.1, 2006-08-24 15:49:08+04:00, kroki@moonlight.intranet +20 -0
    Move Item_func_make_set::transform() from item_strfunc.h here and use
    THD::change_item_tree() instead of plain assignment.

  sql/item_strfunc.h@1.112.2.1, 2006-08-24 15:49:08+04:00, kroki@moonlight.intranet +1 -8
    Move definition of Item_func_make_set::transform() to item_strfunc.cc.

ChangeSet@1.2244.11.1, 2006-08-24 11:39:52+02:00, msvensson@neptunus.(none) +2 -0
  Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060612110740|13873

  configure.in@1.394.1.3, 2006-08-24 11:39:51+02:00, msvensson@neptunus.(none) +0 -0
    Exclude

  dbug/dbug.c@1.24, 2006-08-24 11:39:51+02:00, msvensson@neptunus.(none) +0 -0
    Exclude

ChangeSet@1.1616.2709.12, 2006-08-24 07:14:46+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21800
    read TransactionDeadlockTimeout (for scans) to cater for insane settings

  ndb/src/ndbapi/NdbScanOperation.cpp@1.41.5.2, 2006-08-24 07:14:45+02:00, jonas@perch.ndb.mysql.com +9 -4
    read TransactionDeadlockTimeout to cater for insane settings

ChangeSet@1.1616.2720.3, 2006-08-23 18:02:31-06:00, tsmith@siva.hindu.god +4 -0
  Bug #21531: EXPORT_SET() doesn't accept args with coercible character sets
  
  - Fix typo in Item_func_export_set::fix_length_and_dec() which caused character set aggregation to fail
  - Remove default argument from last arg of agg_arg_charsets() function, to reduce potential errors

  mysql-test/r/func_misc.result@1.16.1.4, 2006-08-23 18:02:28-06:00, tsmith@siva.hindu.god +4 -0
    Test EXPORT_SET() with charset coersion (bug #21531)

  mysql-test/t/func_misc.test@1.11.1.5, 2006-08-23 18:02:28-06:00, tsmith@siva.hindu.god +6 -1
    Test EXPORT_SET() with charset coersion (bug #21531)

  sql/item_func.h@1.68.21.1, 2006-08-23 18:02:28-06:00, tsmith@siva.hindu.god +1 -2
    Remove default argument from last arg of agg_arg_charsets() function, to reduce potential errors.

  sql/item_strfunc.cc@1.196.11.2, 2006-08-23 18:02:28-06:00, tsmith@siva.hindu.god +2 -2
    Fix typo in Item_func_export_set::fix_length_and_dec() which caused character set aggregation to fail.

ChangeSet@1.2216.17.26, 2006-08-24 03:05:13+04:00, evgen@sunlight.local +3 -0
  view.result, view.test:
    Corrected test case for the bug#21261
  sql_parse.cc:
    Corrected fix for bug#21261

  mysql-test/r/view.result@1.169.1.4, 2006-08-24 02:50:19+04:00, evgen@sunlight.local +1 -0
    Corrected test case for the bug#21261

  mysql-test/t/view.test@1.158, 2006-08-24 02:50:02+04:00, evgen@sunlight.local +1 -0
    Corrected test case for the bug#21261

  sql/sql_parse.cc@1.563.1.1, 2006-08-24 02:51:47+04:00, evgen@sunlight.local +13 -2
    Corrected fix for bug#21261

ChangeSet@1.2216.47.2, 2006-08-23 18:29:05-04:00, cmiller@zippy.cornsilk.net +2 -0
  String broken up to avoid silly MICROS~1 string-size limit.

  BitKeeper/etc/ignore@1.227.1.1, 2006-08-23 18:29:04-04:00, cmiller@zippy.cornsilk.net +1 -0
    Added sql/f.c to the ignore list

  sql/gen_lex_hash.cc@1.66.1.2, 2006-08-23 18:29:04-04:00, cmiller@zippy.cornsilk.net +8 -3
    String broken up to avoid silly MICROS~1 string-size limit.

ChangeSet@1.1616.2720.2, 2006-08-23 15:37:54-06:00, tsmith@siva.hindu.god +2 -0
  Bug #20402: DROP USER failure logged as ERROR rather than WARNING
  
  Remove some sql_print_error() calls which were triggered by user error (i.e., not server-level events at all).
  
  Also, convert an sql_print_error -> sql_print_information for a non-error server event.

  sql/slave.cc@1.188.17.1, 2006-08-23 15:37:52-06:00, tsmith@siva.hindu.god +1 -1
    Change sql_print_error to sql_print_information for non-error status message.

  sql/sql_acl.cc@1.74.32.1, 2006-08-23 15:37:52-06:00, tsmith@siva.hindu.god +0 -15
    Remove sql_print_error calls for events which are not server errors

ChangeSet@1.2216.29.8, 2006-08-23 21:31:00+04:00, anozdrin@alik. +14 -0
  Fix for BUG#16899: Possible buffer overflow in handling of DEFINER-clause
    
  User name (host name) has limit on length. The server code relies on these
  limits when storing the names. The problem was that sometimes these limits
  were not checked properly, so that could lead to buffer overflow.
  
  The fix is to check length of user/host name in parser and if string is too
  long, throw an error.

  BitKeeper/etc/collapsed@1.2, 2006-08-23 21:29:51+04:00, anozdrin@alik. +1 -0

  mysql-test/r/grant.result@1.52.4.1, 2006-08-23 21:30:58+04:00, anozdrin@alik. +24 -0
    Updated result file.

  mysql-test/r/sp.result@1.209, 2006-08-23 21:30:58+04:00, anozdrin@alik. +13 -0
    Updated result file.

  mysql-test/r/trigger.result@1.44, 2006-08-23 21:30:58+04:00, anozdrin@alik. +13 -0
    Updated result file.

  mysql-test/r/view.result@1.169.3.1, 2006-08-23 21:30:58+04:00, anozdrin@alik. +11 -0
    Updated result file.

  mysql-test/t/grant.test@1.41.3.1, 2006-08-23 21:30:58+04:00, anozdrin@alik. +49 -0
    Added test for BUG#16899.

  mysql-test/t/sp.test@1.197, 2006-08-23 21:30:58+04:00, anozdrin@alik. +26 -0
    Added test for BUG#16899.

  mysql-test/t/trigger.test@1.50, 2006-08-23 21:30:58+04:00, anozdrin@alik. +30 -0
    Added test for BUG#16899.

  mysql-test/t/view.test@1.154.2.1, 2006-08-23 21:30:58+04:00, anozdrin@alik. +27 -0
    Added test for BUG#16899.

  sql/mysql_priv.h@1.403.1.2, 2006-08-23 21:30:58+04:00, anozdrin@alik. +1 -0
    Added prototype for new function.

  sql/share/errmsg.txt@1.64.3.1, 2006-08-23 21:30:58+04:00, anozdrin@alik. +6 -0
    Added new resources.

  sql/sql_acl.cc@1.199.2.1, 2006-08-23 21:30:58+04:00, anozdrin@alik. +0 -33
    Remove outdated checks.

  sql/sql_parse.cc@1.566, 2006-08-23 21:30:58+04:00, anozdrin@alik. +28 -10
    Add a new function for checking string length.

  sql/sql_yacc.yy@1.474.1.5, 2006-08-23 21:30:58+04:00, anozdrin@alik. +10 -8
    Check length of user/host name.

ChangeSet@1.2216.47.1, 2006-08-23 19:14:58+02:00, cmiller@maint1.mysql.com +4 -0
  Bug #20908: Crash if select @@""
  
  Zero-length variables caused failures when using the length to look
  up the name in a hash.  Instead, signal that no zero-length name can
  ever be found and that to encounter one is a syntax error.

  mysql-test/r/variables.result@1.87.1.1, 2006-08-23 19:14:53+02:00, cmiller@maint1.mysql.com +6 -0
    Results for test.

  mysql-test/t/variables.test@1.62.1.1, 2006-08-23 19:14:54+02:00, cmiller@maint1.mysql.com +11 -0
    Insert tests to prove that zero-length variable names do not cause
    faults.

  sql/gen_lex_hash.cc@1.66.1.1, 2006-08-23 19:14:54+02:00, cmiller@maint1.mysql.com +9 -2
    If the length is zero, then there is nothing to look-up in the 
    hash.

  sql/sql_lex.cc@1.190.3.1, 2006-08-23 19:14:54+02:00, cmiller@maint1.mysql.com +2 -0
    Names of variables must not be empty.  Signal an error of that 
    happens.

ChangeSet@1.1616.2729.1, 2006-08-23 16:46:57+03:00, timour@lamia.home +3 -0
  Bug #21456: SELECT DISTINCT(x) produces incorrect results when using order by
  
  GROUP BY/DISTINCT pruning optimization must be done before ORDER BY 
  optimization because ORDER BY may be removed when GROUP BY/DISTINCT
  sorts as a side effect, e.g. in 
    SELECT DISTINCT <non-key-col>,<pk> FROM t1
    ORDER BY <non-key-col> DISTINCT
  must be removed before ORDER BY as if done the other way around
  it will remove both.

  mysql-test/r/distinct.result@1.27.1.7, 2006-08-23 16:46:55+03:00, timour@lamia.home +11 -0
    Test for BUG#21456.

  mysql-test/t/distinct.test@1.14.1.5, 2006-08-23 16:46:55+03:00, timour@lamia.home +11 -0
    Test for BUG#21456.

  sql/sql_select.cc@1.216.133.1, 2006-08-23 16:46:55+03:00, timour@lamia.home +30 -30
    Bug #21456: SELECT DISTINCT(x) produces incorrect results when using order by
    
    GROUP BY/DISTINCT pruning optimization must be done before ORDER BY 
    optimization because ORDER BY may be removed when GROUP BY/DISTINCT
    sorts as a side effect.

ChangeSet@1.2216.29.7, 2006-08-22 18:58:14-07:00, malff@weblab.(none) +3 -0
  Bug#8153 (Stored procedure with subquery and continue handler, wrong result)
  
  Implemented code review comments
  Test cleanup

  mysql-test/r/sp.result@1.208, 2006-08-22 18:57:45-07:00, malff@weblab.(none) +71 -11
    Bug#8153 (Stored procedure with subquery and continue handler, wrong result)
    
    Implemented code review comments
    Test cleanup

  mysql-test/t/sp.test@1.196, 2006-08-22 18:57:45-07:00, malff@weblab.(none) +50 -14
    Bug#8153 (Stored procedure with subquery and continue handler, wrong result)
    
    Implemented code review comments
    Test cleanup

  sql/protocol.cc@1.116, 2006-08-22 18:57:45-07:00, malff@weblab.(none) +24 -13
    Bug#8153 (Stored procedure with subquery and continue handler, wrong result)
    
    Implemented code review comments

ChangeSet@1.2216.46.1, 2006-08-23 01:03:28+04:00, evgen@moonbone.local +4 -0
  item_cmpfunc.cc, item.cc:
    Additional fix for bug #21475
  item_func.h, item_func.cc:
    Additional fix for bug#16861

  sql/item.cc@1.232, 2006-08-23 01:03:08+04:00, evgen@moonbone.local +5 -2
    Additional fix for bug #21475

  sql/item_cmpfunc.cc@1.216, 2006-08-23 01:02:43+04:00, evgen@moonbone.local +1 -0
    Additional fix for bug #21475

  sql/item_func.cc@1.299, 2006-08-23 01:02:25+04:00, evgen@moonbone.local +13 -0
    Additional fix for bug#16861

  sql/item_func.h@1.148, 2006-08-23 01:01:39+04:00, evgen@moonbone.local +1 -0
    Additional fix for bug#16861

ChangeSet@1.2216.45.1, 2006-08-22 17:51:00+02:00, cmiller@maint1.mysql.com +3 -0
  Bug#15583: BIN()/OCT()/CONV() do not work with BIT values
  
  Converting BIT to a string (an intermediate step in conversion) does 
  not yield an ASCII numeric string, so we skip that step for BIT and
  get the integer value directly from the item.
  
  This site in sql/item_strfunc.cc may be ripe for refactoring for
  other types as well, where converting to a string is a waste of time.

  mysql-test/r/type_bit.result@1.17, 2006-08-22 17:50:56+02:00, cmiller@maint1.mysql.com +30 -0
    Test that conversion functions on BIT types work properly, including 
    NULL.

  mysql-test/t/type_bit.test@1.16, 2006-08-22 17:50:56+02:00, cmiller@maint1.mysql.com +15 -0
    Test that conversion functions on BIT types work properly.

  sql/item_strfunc.cc@1.275.1.5, 2006-08-22 17:50:57+02:00, cmiller@maint1.mysql.com +24 -8
    BIT is unlike the other numeric types, in that when we convert it
    to a String, it becomes a one-byte string with ordinal numeric value
    of the BIT field, not a several-byte string with the ASCII decimal
    representation.  As a special case for conversion functions, we take
    the integer directly from the bit type instead of representing it
    as a string in an intermediate step.

ChangeSet@1.2216.44.1, 2006-08-22 17:37:41+04:00, evgen@sunlight.local +7 -0
  Fixed bug#16861: User defined variable can have a wrong value if a tmp table was
  used.
  
  Sorting by RAND() uses a temporary table in order to get a correct results.
  User defined variable was set during filling the temporary table and later
  on it is substituted for its value from the temporary table. Due to this
  it contains the last value stored in the temporary table.
  
  Now if the result_field is set for the Item_func_set_user_var object it 
  updates variable from the result_field value when being sent to a client.
  
  The Item_func_set_user_var::check() now accepts a use_result_field
  parameter. Depending on its value the result_field or the args[0] is used
  to get current value.

  mysql-test/r/user_var.result@1.40, 2006-08-22 17:37:39+04:00, evgen@sunlight.local +9 -0
    Added a test case for bug#16861: User defined variable can have a wrong value if a tmp table was used.

  mysql-test/t/user_var.test@1.35, 2006-08-22 17:37:39+04:00, evgen@sunlight.local +10 -0
    Added a test case for bug#16861: User defined variable can have a wrong value if a tmp table was used.

  sql/item_func.cc@1.298, 2006-08-22 17:37:39+04:00, evgen@sunlight.local +30 -12
    Fixed bug#16861: User defined variable can have a wrong value if a tmp table was used.
    Now if the result_field is set for the Item_func_set_user_var object it 
    updates variable from the result_field value when being sent to a client.
    
    The Item_func_set_user_var::check() now accepts a use_result_field
    parameter. Depending on its value the result_field or the args[0] is used
    to get current value.

  sql/item_func.h@1.147, 2006-08-22 17:37:39+04:00, evgen@sunlight.local +4 -2
    Fixed bug#16861: User defined variable can have a wrong value if a tmp table was used.
    Added a new SUSERVAR_FUNC function type.
    Updated the Item_func_set_user_var::check() function declaration.
    Added the Item_func_set_user_var::send() member function.

  sql/set_var.cc@1.162, 2006-08-22 17:37:39+04:00, evgen@sunlight.local +1 -1
    Fixed bug#16861: User defined variable can have a wrong value if a tmp table was used.
    Modified to use updated Item_func_set_user_var::check() function.

  sql/sql_class.cc@1.245.1.1, 2006-08-22 17:37:39+04:00, evgen@sunlight.local +1 -1
    Fixed bug#16861: User defined variable can have a wrong value if a tmp table was used.
    Modified to use updated Item_func_set_user_var::check() function.

  sql/sql_select.cc@1.439.3.1, 2006-08-22 17:37:39+04:00, evgen@sunlight.local +3 -1
    Fixed bug#16861: User defined variable can have a wrong value if a tmp table was used.
    Now an Item_func_set_user_var object isn't substituted for an Item_field object after filling a temporary table.

ChangeSet@1.2216.43.1, 2006-08-22 14:29:48+02:00, tnurnberg@salvation.intern.azundris.com +3 -0
  Bug#20411: "GRANT ... REQUIRE ISSUER nnn AND SUBJECT mmm" fails to require both
  
  when X.509 subject was required for a connect, we tested whether it was the right
  one, but did not refuse the connexion if not. fixed.
  
  (corrected CS now --replace_results socket-path)

  mysql-test/r/openssl_1.result@1.15, 2006-08-22 14:29:44+02:00, tnurnberg@salvation.intern.azundris.com +6 -3
    Bug#20411: "GRANT ... REQUIRE ISSUER nnn AND SUBJECT mmm" fails to require both
    
    test not only whether we can connect with a correct X.509 subject when one is
    required, but also assure that we can't without one.

  mysql-test/t/openssl_1.test@1.16, 2006-08-22 14:29:44+02:00, tnurnberg@salvation.intern.azundris.com +7 -3
    Bug#20411: "GRANT ... REQUIRE ISSUER nnn AND SUBJECT mmm" fails to require both
    
    test not only whether we can connect with a correct X.509 subject when one is
    required, but also assure that we can't without one.

  sql/sql_acl.cc@1.200.2.1, 2006-08-22 14:29:44+02:00, tnurnberg@salvation.intern.azundris.com +6 -3
    Bug#20411: "GRANT ... REQUIRE ISSUER nnn AND SUBJECT mmm" fails to require both
    
    actually refuse connexion if X.509 is required, but does not match. kudos to Al Smith.

ChangeSet@1.2244.5.2, 2006-08-22 14:26:56+02:00, pekka@orca.ndb.mysql.com +1 -0
  ndb - post-merge fix 5.0 to 5.0-ndb: number of frags if --without-big-tables

  sql/ha_ndbcluster.cc@1.276, 2006-08-22 14:24:01+02:00, pekka@orca.ndb.mysql.com +7 -2
    calculate frags with (ulonglong)max_rows in case --without-big-tables

ChangeSet@1.2216.42.1, 2006-08-22 04:14:39-07:00, igor@rurik.mysql.com +1 -0
  Fixed bug 16201: a memory corruption causing crashes due to a too small 
  buffer for a MY_BITMAP temporary buffer allocated on stack in the
  function get_best_covering_ror_intersect().
  Now the buffer of a proper size is allocated by a request from this
  function in mem_root.
  
  We succeeded to demonstrate the bug only on Windows with a very large
  database. That's why no test case is provided for in the patch.

  sql/opt_range.cc@1.220, 2006-08-22 04:14:36-07:00, igor@rurik.mysql.com +12 -7
    Fixed bug 16201: a memory corruption causing crashes due to a too small 
    buffer for a MY_BITMAP temporary buffer allocated on stack in the
    function get_best_covering_ror_intersect().
    Now the buffer of a proper size is allocated by a request from this
    function in mem_root.
    

ChangeSet@1.2216.40.3, 2006-08-22 15:03:13+04:00, sergefp@mysql.com +1 -0
  Fix compile errors in VC++ 7.0: fix typo made in previous cset

  sql/mysql_priv.h@1.406, 2006-08-22 15:03:10+04:00, sergefp@mysql.com +1 -1
    Fix compile errors in VC++ 7.0: fix typo made in previous cset

ChangeSet@1.2205.15.3, 2006-08-22 11:55:08+02:00, kent@mysql.com +1 -0
  mysql.spec.sh:
    Added ndb_error_reporter to the RPM install (bug#20426)

  support-files/mysql.spec.sh@1.149.1.2, 2006-08-22 11:54:52+02:00, kent@mysql.com +1 -0
    Added ndb_error_reporter to the RPM install (bug#20426)

ChangeSet@1.1616.2727.1, 2006-08-22 11:48:58+02:00, kent@mysql.com +1 -0
  mysql.spec.sh:
    Added ndb_size.{pl,tmpl} to the RPM install (bug#20426)

  support-files/mysql.spec.sh@1.83.7.1, 2006-08-22 11:47:58+02:00, kent@mysql.com +2 -0
    Added ndb_size.{pl,tmpl} to the RPM install (bug#20426)

ChangeSet@1.2196.71.1, 2006-08-22 11:47:52+04:00, kroki@moonlight.intranet +5 -0
  BUG#21051: RESET QUERY CACHE very slow when query_cache_type=0
  
  There were two problems: RESET QUERY CACHE took a long time to complete
  and other threads were blocked during this time.
  
  The patch does three things:
    1 fixes a bug with improper use of test-lock-test_again technique.
        AKA Double-Checked Locking is applicable here only in few places.
    2 Somewhat improves performance of RESET QUERY CACHE.
        Do my_hash_reset() instead of deleting elements one by one.  Note
        however that the slowdown also happens when inserting into sorted
        list of free blocks, should be rewritten using balanced tree.
    3 Makes RESET QUERY CACHE non-blocking.
        The patch adjusts the locking protocol of the query cache in the
        following way: it introduces a flag flush_in_progress, which is
        set when Query_cache::flush_cache() is in progress.  This call
        sets the flag on enter, and then releases the lock.  Every other
        call is able to acquire the lock, but does nothing if
        flush_in_progress is set (as if the query cache is disabled).
        The only exception is the concurrent calls to
        Query_cache::flush_cache(), that are blocked until the flush is
        over.  When leaving Query_cache::flush_cache(), the lock is
        acquired and the flag is reset, and one thread waiting on
        Query_cache::flush_cache() (if any) is notified that it may
        proceed.

  include/mysql_com.h@1.103.1.1, 2006-08-22 11:47:47+04:00, kroki@moonlight.intranet +6 -0
    Add comment for NET::query_cache_query.

  sql/net_serv.cc@1.90, 2006-08-22 11:47:47+04:00, kroki@moonlight.intranet +11 -6
    Use query_cache_init_query() for initialization of
    NET::query_cache_query if query cache is used.
    Do not access net->query_cache_query without a lock.

  sql/sql_cache.cc@1.93, 2006-08-22 11:47:47+04:00, kroki@moonlight.intranet +354 -228
    Fix bug with accessing query_cache_size, Query_cache_query::wri and
    thd->net.query_cache_query before acquiring the lock---leave
    double-check locking only in safe places.
    Wherever we check that cache is usable (query_cache_size > 0) we now
    also check that flush_in_progress is false, i.e. we are not in the
    middle of cache flush.
    Add Query_cache::not_in_flush_or_wait() method and use it in
    Query_cache::flush_cache(), so that threads doing cache flush will
    wait it to finish, while other threads will bypass the cache as if
    it is disabled.
    Extract Query_cache::free_query_internal() from Query_cache::free_query(),
    which does not removes elements from the hash, and use it together with
    my_hash_reset() in Query_cache::flush_cache().

  sql/sql_cache.h@1.33, 2006-08-22 11:47:47+04:00, kroki@moonlight.intranet +16 -1
    Add declarations for new members and methods.
    Make is_cacheable() a static method.
    Add query_cache_init_query() function.

  sql/sql_class.cc@1.239.2.1, 2006-08-22 11:47:47+04:00, kroki@moonlight.intranet +1 -1
    Use query_cache_init_query() for initialization of
    NET::query_cache_query.

ChangeSet@1.2244.1.4, 2006-08-22 08:30:33+02:00, msvensson@neptunus.(none) +1 -0
  Remove debug printout from mysql_client_test

  tests/mysql_client_test.c@1.203.1.1, 2006-08-22 08:30:30+02:00, msvensson@neptunus.(none) +0 -2
    Remove debug printout

ChangeSet@1.2244.4.1, 2006-08-21 20:29:11-04:00, iggy@rolltop.ignatz42.dyndns.org +1 -0
  Bug#21757: mysql_client_test fails in testcase when reading master.log file

  tests/mysql_client_test.c@1.204, 2006-08-21 20:29:05-04:00, iggy@rolltop.ignatz42.dyndns.org +2 -2
    Replace fopen with my_fopen and specify O_BINARY. Replace fclose with my_fclose.

ChangeSet@1.2244.3.4, 2006-08-21 16:36:03+02:00, rburnett@production.mysql.com +1 -0
  mysqld.cc:
    var was already defined so had to remove extra one

  sql/mysqld.cc@1.569, 2006-08-21 16:35:56+02:00, rburnett@production.mysql.com +0 -1
    var was already defined so had to remove extra one

ChangeSet@1.2216.41.1, 2006-08-21 14:51:59+02:00, msvensson@neptunus.(none) +1 -0
  Bug#19810  	Bundled YASSL in libmysqlclient conflicts with OpenSSL
   - Rename yaSSL version of 'SSL_peek' to 'yaSSL_peek' by using a macro

  extra/yassl/include/openssl/prefix_ssl.h@1.2, 2006-08-21 14:51:57+02:00, msvensson@neptunus.(none) +1 -0
    Rename yaSSL version of SSL_peek to yaSSL_peek

ChangeSet@1.2216.40.2, 2006-08-21 16:21:48+04:00, sergefp@mysql.com +2 -0
  Fix compile errors in VC++ 7.0

  sql/mysql_priv.h@1.405, 2006-08-21 16:21:46+04:00, sergefp@mysql.com +9 -0
    Fix compile errors in VC++ 7.0

  sql/sql_locale.cc@1.7, 2006-08-21 16:21:46+04:00, sergefp@mysql.com +109 -218
    Fix compile errors in VC++ 7.0

ChangeSet@1.2216.35.6, 2006-08-21 14:06:59+02:00, msvensson@shellback.(none) +1 -0
  Print lines from log file to see what's in them

  tests/mysql_client_test.c@1.195.1.7, 2006-08-21 14:06:56+02:00, msvensson@shellback.(none) +2 -0
    Print lines from log file to see what's in them

ChangeSet@1.2216.40.1, 2006-08-21 14:20:03+04:00, sergefp@mysql.com +4 -0
  Fix by Georgi Kodinov:
  Bug #18744 Test 'join_outer' fails if "classic" configuration in 5.0
   - moved an InnoDB dependent test to the appropriate file

  mysql-test/r/innodb_mysql.result@1.8, 2006-08-21 14:20:00+04:00, sergefp@mysql.com +19 -0
    Bug #18744 Test 'join_outer' fails if "classic" configuration in 5.0
     - moved an InnoDB dependent test to the appropriate file

  mysql-test/r/join_outer.result@1.51, 2006-08-21 14:20:00+04:00, sergefp@mysql.com +0 -19
    Bug #18744 Test 'join_outer' fails if "classic" configuration in 5.0
     - moved an InnoDB dependent test to the appropriate file

  mysql-test/t/innodb_mysql.test@1.8, 2006-08-21 14:20:00+04:00, sergefp@mysql.com +20 -0
    Bug #18744 Test 'join_outer' fails if "classic" configuration in 5.0
     - moved an InnoDB dependent test to the appropriate file

  mysql-test/t/join_outer.test@1.38, 2006-08-21 14:20:00+04:00, sergefp@mysql.com +0 -21
    Bug #18744 Test 'join_outer' fails if "classic" configuration in 5.0
     - moved an InnoDB dependent test to the appropriate file

ChangeSet@1.2216.39.1, 2006-08-21 12:18:59+04:00, dlenev@mockturtle.local +3 -0
  Fix for bug#21216 "Simultaneous DROP TABLE and SHOW OPEN TABLES causes
  server to crash".
  
  Crash caused by assertion failure happened when one ran SHOW OPEN TABLES
  while concurrently doing DROP TABLE (or RENAME TABLE, CREATE TABLE LIKE
  or any other command that takes name-lock) in other connection.
  For non-debug version of server problem exposed itself as wrong output
  of SHOW OPEN TABLES statement (it was missing name-locked tables).
  Finally in 5.1 both debug and non-debug versions simply crashed in
  this situation due to NULL-pointer dereference.
  
  This problem was caused by the fact that table placeholders which were
  added to table cache in order to obtain name-lock had TABLE_SHARE::table_name
  set to 0. Therefore they broke assumption that this member is non-0 for
  all tables in table cache which was checked by assert in list_open_tables()
  (in 5.1 this function simply relies on it).
  The fix simply sets this member for such placeholders to appropriate value
  making this assumption true again.
  
  This patch also includes test for similar bug 12212 "Crash that happens
  during removing of database name from cache" reappeared in 5.1 as bug 19403.

  mysql-test/r/drop.result@1.29, 2006-08-21 12:18:56+04:00, dlenev@mockturtle.local +13 -0
    Added test for bug#21216 "Simultaneous DROP TABLE and SHOW OPEN TABLES
    causes server to crash" and bug#12212/19403 "Crash that happens during
    removing of database name from cache".

  mysql-test/t/drop.test@1.23, 2006-08-21 12:18:56+04:00, dlenev@mockturtle.local +41 -0
    Added test for bug#21216 "Simultaneous DROP TABLE and SHOW OPEN TABLES
    causes server to crash" and bug#12212/19403 "Crash that happens during
    removing of database name from cache".

  sql/lock.cc@1.90, 2006-08-21 12:18:56+04:00, dlenev@mockturtle.local +5 -2
    lock_table_name():
      Our code assumes that TABLE_SHARE::table_name for objects in table cache
      is non-NULL (for example look at assertion in list_open_tables()). This
      was not true for table placeholders that were added to table cache for
      name-locking. So let us set this member for such placeholders.

ChangeSet@1.2216.17.21, 2006-08-21 00:23:57+04:00, evgen@moonbone.local +6 -0
  Fixed bug#21475: Wrongly applied constant propagation leads to a false comparison.
  
  A date can be represented as an int (like 20060101) and as a string (like
  "2006.01.01"). When a DATE/TIME field is compared in one SELECT against both
  representations the constant propagation mechanism leads to comparison
  of DATE as a string and DATE as an int. In this example it compares 2006 and
  20060101 integers. Obviously it fails comparison although they represents the
  same date.
  
  
  Now the Item_bool_func2::fix_length_and_dec() function sets the comparison
  context for items being compared. I.e. if items compared as strings the
  comparison context is STRING.
  The constant propagation mechanism now doesn't mix items used in different
  comparison contexts. The context check is done in the
  Item_field::equal_fields_propagator() and in the change_cond_ref_to_const() 
  functions.
  
  Also the better fix for bug 21159 is introduced.

  mysql-test/r/type_datetime.result@1.32, 2006-08-21 00:12:37+04:00, evgen@moonbone.local +11 -0
    Added a test case for bug#21475: Wrongly applied constant propagation leads to a false comparison.

  mysql-test/t/type_datetime.test@1.19, 2006-08-21 00:12:09+04:00, evgen@moonbone.local +11 -0
    Added a test case for bug#21475: Wrongly applied constant propagation leads to a false comparison.

  sql/item.cc@1.231, 2006-08-21 00:20:43+04:00, evgen@moonbone.local +12 -1
    Fixed bug#21475: Wrongly applied constant propagation leads to a false comparison.
    The constant propagation mechanism now doesn't mix items used in different
    comparison contexts. The context check is done in the
    Item_field::equal_fields_propagator() function.

  sql/item.h@1.206, 2006-08-21 00:18:57+04:00, evgen@moonbone.local +1 -1
    Fixed bug#21475: Wrongly applied constant propagation leads to a false comparison.
    To the Item class a new field called cmp_context is added.
    It represents the comparison context of an item.

  sql/item_cmpfunc.cc@1.215, 2006-08-21 00:18:20+04:00, evgen@moonbone.local +4 -1
    Fixed bug#21475: Wrongly applied constant propagation leads to a false comparison.
    Now the Item_bool_func2::fix_length_and_dec() function sets the comparison
    context for items being compared.

  sql/sql_select.cc@1.445, 2006-08-21 00:16:44+04:00, evgen@moonbone.local +4 -16
    Fixed bug#21475: Wrongly applied constant propagation leads to a false comparison.
    The constant propagation mechanism now doesn't mix items used in different
    comparison contexts. The check is done in the change_cond_ref_to_const() function.

ChangeSet@1.2239.1.1, 2006-08-19 15:15:36+05:00, holyfoot@mysql.com +1 -0
  bug #16513 (no mysql_set_server_option in libmysqld.dll export)

  libmysqld/libmysqld.def@1.16, 2006-08-19 15:15:34+05:00, holyfoot@mysql.com +1 -0
    mysql_set_server_option added to libmysqld.dll export

ChangeSet@1.2216.29.3, 2006-08-18 19:16:07-07:00, malff@weblab.(none) +5 -0
  WL#3432 (Compile the Parser with a --debug --verbose option)
  
  Corrected build issues : the build can not be conditional.
  to keep a unique source .tar.gz distribution.

  configure.in@1.392.1.16, 2006-08-18 18:45:36-07:00, malff@weblab.(none) +0 -1
    Rolling back previous change

  sql/Makefile.am@1.121, 2006-08-18 18:45:36-07:00, malff@weblab.(none) +1 -5
    Partially rolling back previous change.
    The build has to be unconditional, for the source .tar.gz distribution

  sql/mysql_priv.h@1.403.1.1, 2006-08-18 18:45:36-07:00, malff@weblab.(none) +3 -0
    WL#3432 (Compile the Parser with a --debug --verbose option)

  sql/sql_parse.cc@1.565, 2006-08-18 18:45:36-07:00, malff@weblab.(none) +0 -21
    WL#3432 (Compile the Parser with a --debug --verbose option)
    
    Moved turn_parser_debug_on to sql_yacc.yy

  sql/sql_yacc.yy@1.474.1.4, 2006-08-18 18:45:36-07:00, malff@weblab.(none) +28 -0
    WL#3432 (Compile the Parser with a --debug --verbose option)
    
    Moved turn_parser_debug_on to sql_yacc.yy

ChangeSet@1.2244.1.1, 2006-08-18 14:16:11+02:00, tnurnberg@salvation.intern.azundris.com +15 -0
  innodb r702
  innodb r719

  innobase/btr/btr0btr.c@1.45, 2006-08-18 14:16:04+02:00, tnurnberg@salvation.intern.azundris.com +1 -1
    innodb r702

  innobase/buf/buf0buf.c@1.53, 2006-08-18 14:16:04+02:00, tnurnberg@salvation.intern.azundris.com +3 -2
    innodb r702

  innobase/dict/dict0dict.c@1.76, 2006-08-18 14:16:04+02:00, tnurnberg@salvation.intern.azundris.com +5 -6
    innodb r702

  innobase/fil/fil0fil.c@1.66, 2006-08-18 14:16:04+02:00, tnurnberg@salvation.intern.azundris.com +3 -6
    innodb r702

  innobase/fsp/fsp0fsp.c@1.27, 2006-08-18 14:16:04+02:00, tnurnberg@salvation.intern.azundris.com +1 -1
    innodb r702

  innobase/include/btr0cur.ic@1.4, 2006-08-18 14:16:04+02:00, tnurnberg@salvation.intern.azundris.com +1 -3
    innodb r719

  innobase/include/buf0buf.ic@1.21, 2006-08-18 14:16:04+02:00, tnurnberg@salvation.intern.azundris.com +4 -4
    innodb r702

  innobase/log/log0log.c@1.46, 2006-08-18 14:16:04+02:00, tnurnberg@salvation.intern.azundris.com +1 -1
    innodb r702

  innobase/log/log0recv.c@1.53, 2006-08-18 14:16:05+02:00, tnurnberg@salvation.intern.azundris.com +2 -2
    innodb r702

  innobase/os/os0file.c@1.116, 2006-08-18 14:16:05+02:00, tnurnberg@salvation.intern.azundris.com +6 -6
    innodb r702

  innobase/row/row0mysql.c@1.122, 2006-08-18 14:16:05+02:00, tnurnberg@salvation.intern.azundris.com +13 -14
    innodb r702

  innobase/row/row0sel.c@1.108, 2006-08-18 14:16:05+02:00, tnurnberg@salvation.intern.azundris.com +1 -1
    innodb r702

  innobase/srv/srv0start.c@1.89, 2006-08-18 14:16:05+02:00, tnurnberg@salvation.intern.azundris.com +1 -1
    innodb r702

  innobase/ut/ut0dbg.c@1.11, 2006-08-18 14:16:05+02:00, tnurnberg@salvation.intern.azundris.com +1 -1
    innodb r702

  sql/ha_innodb.cc@1.298, 2006-08-18 14:16:05+02:00, tnurnberg@salvation.intern.azundris.com +12 -19
    innodb r702

ChangeSet@1.2245, 2006-08-18 09:56:52+02:00, pekka@orca.ndb.mysql.com +8 -0
  ndb - bug#18781 bug#21017 bug#21050 : block index ops during NR + fix asserts

  ndb/include/kernel/signaldata/CreateIndx.hpp@1.7, 2006-08-18 09:44:34+02:00, pekka@orca.ndb.mysql.com +1 -0
    add 711

  ndb/include/kernel/signaldata/DropIndx.hpp@1.4, 2006-08-18 09:44:34+02:00, pekka@orca.ndb.mysql.com +1 -0
    add 711

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.68, 2006-08-18 09:47:24+02:00, pekka@orca.ndb.mysql.com +36 -8
    block index create/drop during NR.
    fix 2 ndbrequires by checking exact schema op types

  ndb/src/kernel/blocks/dbdict/Dbdict.hpp@1.24, 2006-08-18 09:47:25+02:00, pekka@orca.ndb.mysql.com +3 -0
    block index create/drop during NR.
    fix 2 ndbrequires by checking exact schema op types

  ndb/src/kernel/vm/DLHashTable2.hpp@1.4, 2006-08-18 09:36:14+02:00, pekka@orca.ndb.mysql.com +2 -0
    add isEmpty for use in DICT

  ndb/test/include/NDBT_Tables.hpp@1.4, 2006-08-18 09:39:06+02:00, pekka@orca.ndb.mysql.com +2 -0
    getIndexes - return index cols of standard test table

  ndb/test/ndbapi/testDict.cpp@1.27, 2006-08-18 09:43:58+02:00, pekka@orca.ndb.mysql.com +75 -3
    bug#21017: index create/drop during NR

  ndb/test/src/NDBT_Tables.cpp@1.15, 2006-08-18 09:39:06+02:00, pekka@orca.ndb.mysql.com +11 -0
    getIndexes - return index cols of standard test table

ChangeSet@1.2216.29.2, 2006-08-17 16:08:51-07:00, malff@weblab.(none) +3 -0
  WL#3432 (Compile the Parser with a --debug --verbose option)
  
  Changed the automake build process :
  - ./configure.in
  - ./sql/Makefile.am
  to compile an instrumented parser for debug=yes or debug=full builds
  
  Changed the (primary) runtime invocation of the parser :
  - sql/sql_parse.cc
  to generate bison traces in stderr when the DBUG "parser_debug" flag is set.

  configure.in@1.392.1.15, 2006-08-17 15:39:43-07:00, malff@weblab.(none) +1 -0
    WL#3432 (Compile the Parser with a --debug --verbose option)
    
    New Automake condition : MYSQL_CONF_DEBUG

  sql/Makefile.am@1.120, 2006-08-17 15:39:44-07:00, malff@weblab.(none) +6 -1
    WL#3432 (Compile the Parser with a --debug --verbose option)
    
    In Debug mode, compile sql_yacc.yy with --debug --verbose

  sql/sql_parse.cc@1.564, 2006-08-17 15:39:44-07:00, malff@weblab.(none) +23 -0
    WL#3432 (Compile the Parser with a --debug --verbose option)
    
    Conditionally turn the bison parser debug on at runtime.

ChangeSet@1.1616.2715.3, 2006-08-17 14:09:24-07:00, jimw@rama.(none) +3 -0
  Bug #21288: mysqldump segmentation fault when using --where
  
    The problem was that the error handling was using a too-small buffer to
    print the error message generated. We fix this by not using a buffer at
    all, but by using fprintf() directly. There were also some problems with
    the error handling in table dumping that was exposed by this fix that were
    also corrected.

  client/mysqldump.c@1.143.13.6, 2006-08-17 14:09:23-07:00, jimw@rama.(none) +11 -5
    Use fprintf() instead of my_printf_error() to avoid buffer overflow issues.
    Since ME_BELL wasn't specified, calling my_printf_error() offered no advantage
    except for adding my_progname, which we just go ahead and do manually. Also,
    fix the error handling in dumpTable() when queries to get data fail and --force
    was specified.

  mysql-test/r/mysqldump.result@1.9.1.46, 2006-08-17 14:09:23-07:00, jimw@rama.(none) +27 -0
    Add new results

  mysql-test/t/mysqldump.test@1.19.1.27, 2006-08-17 14:09:23-07:00, jimw@rama.(none) +8 -0
    Add new regression test

ChangeSet@1.1616.2726.1, 2006-08-17 21:23:00+05:00, svoj@may.pils.ru +1 -0
  BUG#19702 - Using myisampack/myisamchk on a FULLTEXT indexed
              table results in table corrupt
  
  Fulltext key has always two keysegs, thus we need to update
  FT_SEGS (last) element from seg array in case of compressed table.
  Also we must update ft2_keyinfo.

  myisam/mi_packrec.c@1.25.1.4, 2006-08-17 21:22:57+05:00, svoj@may.pils.ru +14 -6
    Fulltext key has always two keysegs, thus we need to update
    FT_SEGS (last) element from seg array in case of compressed table.
    Also we must update ft2_keyinfo.

ChangeSet@1.2216.17.20, 2006-08-17 18:50:53+04:00, evgen@moonbone.local +3 -0
  ndb_condition_pushdown.result:
    Corrected test case result after fix for bug#18165
  view.result, view.test:
    Corrected test case for bug#21261

  mysql-test/r/ndb_condition_pushdown.result@1.21, 2006-08-17 18:49:48+04:00, evgen@moonbone.local +2 -2
    Corrected test case result after fix for bug#18165

  mysql-test/r/view.result@1.169.1.3, 2006-08-17 18:49:30+04:00, evgen@moonbone.local +2 -0
    Corrected test case for bug#21261

  mysql-test/t/view.test@1.157, 2006-08-17 18:49:02+04:00, evgen@moonbone.local +2 -0
    Corrected test case for bug#21261

ChangeSet@1.2216.38.2, 2006-08-16 19:19:49-04:00, iggy@rolltop.ignatz42.dyndns.org +1 -0
  manual merge

  sql/sql_acl.cc@1.202, 2006-08-16 19:19:46-04:00, iggy@rolltop.ignatz42.dyndns.org +21 -4
    manual merge

ChangeSet@1.2216.35.5, 2006-08-16 20:38:33+02:00, msvensson@shellback.(none) +1 -0
  Remove duplicate free of "ds_res"

  client/mysqltest.c@1.241, 2006-08-16 20:38:29+02:00, msvensson@shellback.(none) +0 -3
    Remove duplicate free of "ds_res"

ChangeSet@1.1616.2717.2, 2006-08-16 13:55:16-04:00, iggy@rolltop.ignatz42.dyndns.org +2 -0
  Bug#20328 - Correction to test/result for broken Windows build.

  mysql-test/r/mysql_client.result@1.2.1.1, 2006-08-16 13:55:15-04:00, iggy@rolltop.ignatz42.dyndns.org +0 -44
    Removed OS dependant output.

  mysql-test/t/mysql_client.test@1.2.1.1, 2006-08-16 13:55:15-04:00, iggy@rolltop.ignatz42.dyndns.org +3 -3
    Re-directed output to a temporary file because the actual output isn't important and was causing a Windows test failure.

ChangeSet@1.2216.37.1, 2006-08-16 09:37:19-07:00, igor@rurik.mysql.com +4 -0
  Fixed bug #18165.
  Made [NOT]BETWEEN predicates SARGable in respect to the second and 
  the third arguments.

  mysql-test/r/range.result@1.48, 2006-08-16 09:37:11-07:00, igor@rurik.mysql.com +36 -0
    Added a test case to bug #18165.

  mysql-test/t/range.test@1.41, 2006-08-16 09:37:11-07:00, igor@rurik.mysql.com +30 -0
    Added a test case to bug #18165.

  sql/opt_range.cc@1.219, 2006-08-16 09:37:12-07:00, igor@rurik.mysql.com +171 -59
    Fixed bug #18165.
    Made [NOT]BETWEEN predicates SARGable in respect to the second and 
    the third arguments.
    Put in a separate function called get_full_func_mm_tree the functionality
    that builds a conjunction of all SEL_TREEs for a simple predicate of the
    form (f op c), where f was a field and c was a constant, applying different
    equalities f=f' with f' being another field.

  sql/sql_select.cc@1.442.1.1, 2006-08-16 09:37:12-07:00, igor@rurik.mysql.com +18 -1
    Fixed bug #18165.
    Made [NOT]BETWEEN predicates SARGable in respect to the second and 
    the third arguments.

ChangeSet@1.2216.19.9, 2006-08-16 19:30:46+03:00, jani@ua141d10.elisa.omakaista.fi +1 -0
  Fix for bug#21537, "Error at startup"
  
  These variables must be defined for Netware, or it fails
  to recognize hard paths starting from the device.
  

  include/config-netware.h@1.15, 2006-08-16 19:30:44+03:00, jani@ua141d10.elisa.omakaista.fi +4 -0
    Fix for bug#21537, "Error at startup"
    
    These variables must be defined for Netware.

ChangeSet@1.2216.19.8, 2006-08-16 10:19:48-05:00, reggie@big_geek. +1 -0
  small fix to enable the test suite to find executables and scripts on Windows

  mysql-test/lib/mtr_misc.pl@1.13, 2006-08-16 10:19:45-05:00, reggie@big_geek. +16 -2
    if running on win32, check for the existence of the file rather than it being executable

ChangeSet@1.2216.36.1, 2006-08-16 17:03:41+02:00, msvensson@shellback.(none) +4 -0
  Bug#20328 mysql client: dumb about trailing spaces on 'help' command
   Fix testcase to also work on windows

  BitKeeper/deleted/.del-mysql_client.result@1.5, 2006-08-16 17:01:23+02:00, msvensson@shellback.(none) +0 -0
    Delete: mysql-test/r/mysql_client.result

  BitKeeper/deleted/.del-mysql_client.test@1.4, 2006-08-16 17:01:16+02:00, msvensson@shellback.(none) +0 -0
    Delete: mysql-test/t/mysql_client.test

  mysql-test/r/mysql.result@1.14, 2006-08-16 17:03:38+02:00, msvensson@shellback.(none) +8 -0
    Update test result

  mysql-test/t/mysql.test@1.14, 2006-08-16 17:03:38+02:00, msvensson@shellback.(none) +45 -1
    Move tests from mysql_client to mysql
    Fix test case for bug#20328 to work on windows by comparing the output from "help" and "help " 

ChangeSet@1.2216.21.5, 2006-08-16 15:25:30+02:00, msvensson@shellback.(none) +1 -0
  Bug#20219  make bin-dist produces unportable for testing tarball
   - Setup LD_LIBRARY_PATH to favor local libs

  mysql-test/mysql-test-run.pl@1.110, 2006-08-16 15:25:27+02:00, msvensson@shellback.(none) +17 -12
    Setup LD_LIBRARY_PATH so the libraries from this distro/clone are
    used in favor of the system installed ones

ChangeSet@1.2216.15.9, 2006-08-16 14:39:27+08:00, stewart@willster.(none) +1 -0
  BUG#21671 memory leak for mgmapi event listeners
  
  fixes the following valgrind warning (when running ndb_mgm under valgrind,
  or, indeed any other mgmapi program listening to events):
  
  ==23291== 190 (20 direct, 170 indirect) bytes in 1 blocks are definitely lost in loss record 13 of 22
  ==23291==    at 0x401C895: operator new(unsigned) (vg_replace_malloc.c:163)
  ==23291==    by 0x8075300: ParserImpl::run(Parser<ParserImpl::Dummy>::Context*, Properties const**, bool volatile*) const (Parser.cpp:178)
  ==23291==    by 0x806D09B: Parser<ParserDummy>::parse(Parser<ParserDummy>::Context&, ParserDummy&) (Parser.hpp:219)
  ==23291==    by 0x80671C4: ndb_mgm_call(ndb_mgm_handle*, ParserRow<ParserDummy> const*, char const*, Properties const*) (mgmapi.cpp:355)
  ==23291==    by 0x806AB79: ndb_mgm_listen_event_internal(ndb_mgm_handle*, int const*, int) (mgmapi.cpp:1419)
  ==23291==    by 0x806AC1F: ndb_mgm_listen_event (mgmapi.cpp:1434)
  ==23291==    by 0x805EB5D: event_thread_run(void*) (CommandInterpreter.cpp:467)
  ==23291==    by 0x806F70A: ndb_thread_wrapper (NdbThread.c:68)
  ==23291==    by 0x4042340: start_thread (in /lib/tls/i686/cmov/libpthread-2.3.6.so)
  ==23291==    by 0x429D4ED: clone (in /lib/tls/i686/cmov/libc-2.3.6.so)

  ndb/src/mgmapi/mgmapi.cpp@1.61, 2006-08-16 14:39:24+08:00, stewart@willster.(none) +6 -5
    fix memory leak for mgmapi event listeners (1 per connect)
    
    (missing delete of reply Properties object returned by ndb_mgm_call)

ChangeSet@1.2216.15.8, 2006-08-16 14:33:31+08:00, stewart@willster.(none) +1 -0
  BUG#21670 memory leak in ndb_mgm -e show
  
  fix the following valgrind warning when running ndb_mgm -e show (leak only in client)
  
  ==20398== 14,596 (11,936 direct, 2,660 indirect) bytes in 4 blocks are definitely lost in loss record 24 of 25
  ==20398==    at 0x401C4A1: malloc (vg_replace_malloc.c:149)
  ==20398==    by 0x80797A3: ConfigValuesFactory::create(unsigned, unsigned) (ConfigValues.cpp:309)
  ==20398==    by 0x8079F03: ConfigValuesFactory::expand(unsigned, unsigned) (ConfigValues.cpp:325)
  ==20398==    by 0x8079967: ConfigValuesFactory::put(ConfigValues::Entry const&) (ConfigValues.cpp:414)
  ==20398==    by 0x807A7B6: ConfigValuesFactory::unpack(void const*, unsigned) (ConfigValues.cpp:701)
  ==20398==    by 0x806CB9D: ConfigValuesFactory::unpack(UtilBuffer const&) (ConfigValues.hpp:252)
  ==20398==    by 0x8069160: ndb_mgm_get_configuration (mgmapi.cpp:1941)
  ==20398==    by 0x8060661: CommandInterpreter::executeShow(char*) (CommandInterpreter.cpp:1242)
  ==20398==    by 0x8063966: CommandInterpreter::execute_impl(char const*) (CommandInterpreter.cpp:715)
  ==20398==    by 0x8064040: CommandInterpreter::execute(char const*, int, int*) (CommandInterpreter.cpp:625)
  ==20398==    by 0x8064189: Ndb_mgmclient::execute(char const*, int, int*) (CommandInterpreter.cpp:203)
  ==20398==    by 0x805E56C: read_and_execute(int) (main.cpp:124)
  ==20398==    by 0x805E754: main (main.cpp:162)
  ==20398==

  ndb/src/mgmclient/CommandInterpreter.cpp@1.64, 2006-08-16 14:33:26+08:00, stewart@willster.(none) +2 -0
    correctly free (destroy) the configuration fetched for show

ChangeSet@1.2216.34.1, 2006-08-15 21:45:24+04:00, evgen@sunlight.local +9 -0
  Fixed bug#21261: Wrong access rights was required for an insert into a view
  
  SELECT right instead of INSERT right was required for an insert into to a view.
  This wrong behaviour appeared after the fix for bug #20989. Its intention was
  to ask only SELECT right for all tables except the very first for a complex
  INSERT query. But that patch has done it in a wrong way and lead to asking 
  a wrong access right for an insert into a view.
  
  The setup_tables_and_check_access() function now accepts two want_access
  parameters. One will be used for the first table and the second for other
  tables.

  mysql-test/r/view.result@1.169.2.1, 2006-08-15 21:42:29+04:00, evgen@sunlight.local +19 -0
    Added a test case for bug#21261: Wrong access rights was required for an insert into a view

  mysql-test/t/view.test@1.154.1.1, 2006-08-15 21:42:25+04:00, evgen@sunlight.local +30 -0
    Added a test case for bug#21261: Wrong access rights was required for an insert into a view

  sql/mysql_priv.h@1.404, 2006-08-15 21:44:09+04:00, evgen@sunlight.local +1 -0
    Fixed bug#21261: Wrong access rights was required for an insert into a view
    The setup_tables_and_check_access() function now accepts two want_access
    parameters.

  sql/sql_base.cc@1.347.1.1, 2006-08-15 21:44:01+04:00, evgen@sunlight.local +7 -2
    Fixed bug#21261: Wrong access rights was required for an insert into a view
    The setup_tables_and_check_access() function now accepts two want_access
    parameters. One will be used for the first table and the second for other
    tables.

  sql/sql_delete.cc@1.178, 2006-08-15 21:43:57+04:00, evgen@sunlight.local +2 -2
    Fixed bug#21261: Wrong access rights was required for an insert into a view
    Modified to use updated setup_tables_and_check_access() function.

  sql/sql_insert.cc@1.197.1.1, 2006-08-15 21:43:56+04:00, evgen@sunlight.local +1 -1
    Fixed bug#21261: Wrong access rights was required for an insert into a view
    Modified to use updated setup_tables_and_check_access() function.

  sql/sql_load.cc@1.97, 2006-08-15 21:43:52+04:00, evgen@sunlight.local +1 -0
    Fixed bug#21261: Wrong access rights was required for an insert into a view
    Modified to use updated setup_tables_and_check_access() function.

  sql/sql_select.cc@1.439.2.1, 2006-08-15 21:43:23+04:00, evgen@sunlight.local +1 -1
    Fixed bug#21261: Wrong access rights was required for an insert into a view
    Modified to use updated setup_tables_and_check_access() function.

  sql/sql_update.cc@1.194.1.1, 2006-08-15 21:42:33+04:00, evgen@sunlight.local +2 -2
    Fixed bug#21261: Wrong access rights was required for an insert into a view
    Modified to use updated setup_tables_and_check_access() function.

ChangeSet@1.2216.17.15, 2006-08-15 21:08:22+04:00, sergefp@mysql.com +3 -0
  BUG#21282: Incorrect query results for "t.key NOT IN (<big const list>) 
  In fix for BUG#15872, a condition of type "t.key NOT IN (c1, .... cN)"
  where N>1000, was incorrectly converted to
    (-inf < X < c_min) OR (c_max < X)
  Now this conversion is removed, we dont produce any range lists for such
  conditions.

  mysql-test/r/range.result@1.47, 2006-08-15 21:08:20+04:00, sergefp@mysql.com +22 -0
    BUG#21282: Testcase

  mysql-test/t/range.test@1.40, 2006-08-15 21:08:20+04:00, sergefp@mysql.com +25 -0
    BUG#21282: Testcase

  sql/opt_range.cc@1.218, 2006-08-15 21:08:20+04:00, sergefp@mysql.com +46 -61
    BUG#21282: Incorrect query results for "t.key NOT IN (<big const list>) 
    In fix for BUG#15872, a condition of type "t.key NOT IN (c1, .... cN)"
    where N>1000, was incorrectly converted to 
      (-inf < X < c_min) OR (c_max < X)
    Now this conversion is removed, we dont produce any range lists for such
    conditions.

ChangeSet@1.2216.31.1, 2006-08-15 21:02:55+04:00, evgen@moonbone.local +3 -0
  Fixed bug#15950: NOW() optimized away in VIEWs
  
  This bug is a side-effect of bug fix #16377. NOW() is optimized in
  BETWEEN to integer constants to speed up query execution. When view is being
  created it saves already modified query and thus becomes wrong.
  
  The agg_cmp_type() function now substitutes constant result DATE/TIME functions 
  for their results only if the current query isn't CREATE VIEW or SHOW CREATE
  VIEW.

  mysql-test/r/view.result@1.169.1.1, 2006-08-15 21:02:05+04:00, evgen@moonbone.local +7 -0
    Added a test case for bug#15950: NOW() optimized away in VIEWs

  mysql-test/t/view.test@1.155, 2006-08-15 21:02:03+04:00, evgen@moonbone.local +9 -0
    Added a test case for bug#15950: NOW() optimized away in VIEWs

  sql/item_cmpfunc.cc@1.214, 2006-08-15 21:02:06+04:00, evgen@moonbone.local +28 -20
    Fixed bug#15950: NOW() optimized away in VIEWs
    The agg_cmp_type() function now substitutes constant result DATE/TIME functions 
    for their results only if the current query isn't CREATE VIEW or SHOW CREATE
    VIEW.

ChangeSet@1.2216.30.1, 2006-08-15 18:41:21+02:00, cmiller@maint1.mysql.com +4 -0
  Bug #20908: Crash if select @@""
  
  Zero-length variables caused failures when using the length to look
  up the name in a hash.  Instead, signal that no zero-length name can
  ever be found and that to encounter one is a syntax error.

  mysql-test/r/variables.result@1.88, 2006-08-15 18:41:15+02:00, cmiller@maint1.mysql.com +6 -0
    Results for test.

  mysql-test/t/variables.test@1.63, 2006-08-15 18:41:16+02:00, cmiller@maint1.mysql.com +11 -0
    Insert tests to prove that zero-length variable names do not cause
    faults.

  sql/gen_lex_hash.cc@1.67, 2006-08-15 18:41:17+02:00, cmiller@maint1.mysql.com +11 -2
    If the length is zero, then there is nothing to look-up in the 
    hash.

  sql/sql_lex.cc@1.190.2.1, 2006-08-15 18:41:17+02:00, cmiller@maint1.mysql.com +2 -0
    Names of variables must not be empty.  Signal an error of that 
    happens.

ChangeSet@1.1616.2725.1, 2006-08-15 20:33:14+04:00, sergefp@mysql.com +3 -0
  BUG#21077: Possible crash caused by invalid sequence of handler::* calls:                                                
  The crash was caused by invalid sequence of handler::** calls:                                                           
    ha_smth->index_init();                                                                                                 
    ha_smth->index_next_same(); (2)                                                                                        
  (2) is an invalid call as it was not preceeded by any 'scan setup' call
  like index_first() or index_read(). The cause was that QUICK_SELECT::reset()
  didn't "fully reset" the quick select- current QUICK_RANGE wasn't forgotten,
  and quick select might attempt to continue reading the range, which would
  result in the above mentioned invalid sequence of handler calls.
  
  5.x versions are not affected by the bug - they already have the missing
  "range=NULL" clause.                                                    
                                                         

  mysql-test/r/innodb_mysql.result@1.3.1.2, 2006-08-15 20:33:12+04:00, sergefp@mysql.com +21 -0
    Testcase for BUG#21077

  mysql-test/t/innodb_mysql.test@1.3.1.2, 2006-08-15 20:33:12+04:00, sergefp@mysql.com +27 -0
    Testcase for BUG#21077

  sql/opt_range.h@1.28.3.1, 2006-08-15 20:33:12+04:00, sergefp@mysql.com +1 -1
    BUG#21077: Possible crash caused by invalid sequence of handler::* calls:                                              
     - Make QUICK_SELECT::reset() really reset the quick select                                                            

ChangeSet@1.2216.17.14, 2006-08-15 15:48:49+03:00, gkodinov@macbook.gmz +2 -0
  Bug #21302: Result not properly sorted when using an ORDER BY on a second table in a join
   - undeterminstic tests fixed

  mysql-test/r/order_by.result@1.55, 2006-08-15 15:48:41+03:00, gkodinov@macbook.gmz +5 -5
    Bug #21302: Result not properly sorted when using an ORDER BY on a second table in a join
     - more undeterminstic tests fixed

  mysql-test/t/order_by.test@1.39, 2006-08-15 15:48:41+03:00, gkodinov@macbook.gmz +1 -1
    Bug #21302: Result not properly sorted when using an ORDER BY on a second table in a join
     - more undeterminstic tests fixed

ChangeSet@1.2216.21.4, 2006-08-15 14:31:21+02:00, mskold@mysql.com +2 -0
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: do not release operation records for on-going read_multi_range

  sql/ha_ndbcluster.cc@1.273.1.2, 2006-08-15 14:30:35+02:00, mskold@mysql.com +41 -21
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: do not release operation records for on-going read_multi_range

  sql/ha_ndbcluster.h@1.100, 2006-08-15 14:30:35+02:00, mskold@mysql.com +9 -3
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: do not release operation records for on-going read_multi_range

ChangeSet@1.2216.1.25, 2006-08-15 14:22:47+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#20708
    init ndb_cache_check_time and honor value in my.cnf

  sql/ha_ndbcluster.cc@1.273.2.1, 2006-08-15 14:22:46+02:00, jonas@perch.ndb.mysql.com +2 -0
    init ndb_cache_check_time and honor value in my.cnf

ChangeSet@1.1616.2724.1, 2006-08-15 13:12:27+02:00, mskold@mysql.com +5 -0
  ndb_lock.test, ndb_lock.result:
    bug #18184  SELECT ... FOR UPDATE does not work..: New test case
  ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

  mysql-test/r/ndb_lock.result@1.7.1.2, 2006-08-15 13:09:09+02:00, mskold@mysql.com +12 -3
    bug #18184  SELECT ... FOR UPDATE does not work..: New test case

  mysql-test/t/ndb_lock.test@1.9.1.2, 2006-08-15 13:09:09+02:00, mskold@mysql.com +13 -2
    bug #18184  SELECT ... FOR UPDATE does not work..: New test case

  ndb/include/ndbapi/NdbConnection.hpp@1.19.8.1, 2006-08-15 13:09:39+02:00, mskold@mysql.com +3 -1
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

  sql/ha_ndbcluster.cc@1.114.3.75, 2006-08-15 13:09:39+02:00, mskold@mysql.com +34 -0
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

  sql/ha_ndbcluster.h@1.40.6.16, 2006-08-15 13:09:39+02:00, mskold@mysql.com +2 -0
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

ChangeSet@1.1616.2723.1, 2006-08-15 15:24:07+05:00, ramil@mysql.com +6 -0
  Fix for bug #20695: Charset introducer overrides charset definition for column.
    - if there are two character set definitions in the column declaration,
      we replace the first one with the second one as we store both in the LEX->charset
      slot. Add a separate slot to the LEX structure to store underscore charset.
    - convert default values to the column charset of STRING, VARSTRING fields 
      if necessary as well.

  mysql-test/r/ctype_recoding.result@1.20.1.6, 2006-08-15 15:24:03+05:00, ramil@mysql.com +11 -0
    Fix for bug #20695: Charset introducer overrides charset definition for column.
      - test result.

  mysql-test/t/ctype_recoding.test@1.21.1.1, 2006-08-15 15:24:03+05:00, ramil@mysql.com +12 -0
    Fix for bug #20695: Charset introducer overrides charset definition for column.
      - test case.

  sql/sql_lex.cc@1.97.21.4, 2006-08-15 15:24:03+05:00, ramil@mysql.com +3 -2
    Fix for bug #20695: Charset introducer overrides charset definition for column.
      - LEX->underscore_charset introduced to store UNDERSCORE_CHARSET

  sql/sql_lex.h@1.102.41.3, 2006-08-15 15:24:03+05:00, ramil@mysql.com +1 -1
    Fix for bug #20695: Charset introducer overrides charset definition for column.
      - LEX->underscore_charset introduced to store UNDERSCORE_CHARSET

  sql/sql_table.cc@1.157.2.151, 2006-08-15 15:24:03+05:00, ramil@mysql.com +34 -29
    Fix for bug #20695: Charset introducer overrides charset definition for column.
      - convert default values to the column charset of VARSTRING, STRING, ENUM, 
        SET fields if necessary.

  sql/sql_yacc.yy@1.203.1.196, 2006-08-15 15:24:03+05:00, ramil@mysql.com +2 -2
    Fix for bug #20695: Charset introducer overrides charset definition for column.
      - LEX->underscore_charset introduced to store UNDERSCORE_CHARSET

ChangeSet@1.2216.17.13, 2006-08-15 13:01:04+03:00, gkodinov@rakia.(none) +2 -0
  Bug #21302: Result not properly sorted when using an ORDER BY 
              on a second table in a join
  - undeterministic output of the test case removed.

  mysql-test/r/order_by.result@1.54, 2006-08-15 13:01:02+03:00, gkodinov@rakia.(none) +7 -7
    Bug #21302: Result not properly sorted when using an ORDER BY 
                on a second table in a join
    - undeterministic output of the test case removed.

  mysql-test/t/order_by.test@1.38, 2006-08-15 13:01:02+03:00, gkodinov@rakia.(none) +1 -1
    Bug #21302: Result not properly sorted when using an ORDER BY 
                on a second table in a join
    - undeterministic output of the test case removed.

ChangeSet@1.2216.27.1, 2006-08-15 01:54:14-07:00, acurtis@xiphis.org +2 -0
  fix windows build

  sql/field.cc@1.322, 2006-08-15 01:54:10-07:00, acurtis@xiphis.org +1 -1
    fix windows build

  sql/field.h@1.188, 2006-08-15 01:54:10-07:00, acurtis@xiphis.org +1 -1
    fix windows build

ChangeSet@1.2216.25.1, 2006-08-15 10:13:17+03:00, gkodinov@macbook.gmz +3 -0
  Bug #21159: Optimizer: wrong result after AND with different data types
  Disable const propagation for Item_hex_string.
  This must be done because Item_hex_string->val_int() is not
  the same as (Item_hex_string->val_str() in BINARY column)->val_int().
  We cannot simply disable the replacement in a particular context (
  e.g. <bin_col> = <int_col> AND <bin_col> = <hex_string>) since
  Items don't know the context they are in and there are functions like 
  IF (<hex_string>, 'yes', 'no').
  Note that this will disable some valid cases as well 
  (e.g. : <bin_col> = <hex_string> AND <bin_col2> = <bin_col>) but 
  there's no way to distinguish the valid cases without having the
  Item's parent say something like : Item->set_context(Item::STRING_RESULT)
  and have all the Items that contain other Items do that consistently.

  mysql-test/r/compare.result@1.11, 2006-08-15 10:13:11+03:00, gkodinov@macbook.gmz +7 -0
    Bug #21159: Optimizer: wrong result after AND with different data types
     - test case

  mysql-test/t/compare.test@1.10, 2006-08-15 10:13:11+03:00, gkodinov@macbook.gmz +9 -0
    Bug #21159: Optimizer: wrong result after AND with different data types
     - test case

  sql/sql_select.cc@1.439.1.1, 2006-08-15 10:13:12+03:00, gkodinov@macbook.gmz +16 -1
    Bug #21159: Optimizer: wrong result after AND with different data types
     - disable const propagation for Item_hex_string.

ChangeSet@1.2216.15.6, 2006-08-15 11:09:38+08:00, stewart@willster.(none) +1 -0
  BUG#20823 testBackup FailMaster failing
    
  few cases not handled properly (NF occurs).

  ndb/src/kernel/blocks/backup/Backup.cpp@1.35, 2006-08-15 11:09:35+08:00, stewart@willster.(none) +41 -23
    Don't write fragment info if we haven't retreived any fragment info yet
    (FailMaster test 2)
        
    Go directly onto closing files if the tabPtr is RNIL (as we're in recovery)

ChangeSet@1.2232.1.5, 2006-08-14 20:48:37+02:00, rburnett@production.mysql.com +1 -0
  My previous change of replacing the call to sprintf with some memcpy type routines was not correct.  This patch reverts that.
  
  mysql_client_test.c:
    reverting my previous change

  tests/mysql_client_test.c@1.199, 2006-08-14 20:46:28+02:00, rburnett@production.mysql.com +2 -3
    reverting my previous change

ChangeSet@1.2216.22.1, 2006-08-14 20:16:47+02:00, msvensson@neptunus.(none) +1 -0
  Bug#21327 OpenSSL-checking in configure
   - Change $d to $libs as suggested.
   - Thanks to Michael Prohm for the patch!

  config/ac-macros/openssl.m4@1.8, 2006-08-14 20:16:45+02:00, msvensson@neptunus.(none) +2 -2
    Replace $d with $libs as suggested in bug report.

ChangeSet@1.1616.2721.1, 2006-08-14 20:01:19+04:00, kroki@moonlight.intranet +2 -0
  BUG#9678: Client library hangs after network communication failure
  
  Socket timeouts in client library were used only on Windows.
  
  The solution is to use socket timeouts in client library on all
  systems were they are supported.
  
  No test case is provided because it is impossible to simulate network
  failure in current test suit.

  sql/net_serv.cc@1.63.1.13, 2006-08-14 20:01:17+04:00, kroki@moonlight.intranet +1 -1
    Retry indefinitely only if got EINTR.

  vio/viosocket.c@1.25.1.11, 2006-08-14 20:01:18+04:00, kroki@moonlight.intranet +22 -8
    Set socket timeouts on POSIX systems as well as on Windows.

ChangeSet@1.2205.1.22, 2006-08-14 18:19:29+03:00, gkodinov@macbook.gmz +3 -0
  Bug #21174: Index degrades sort performance and 
               optimizer does not honor IGNORE INDEX
   - Allow an index to be used for sorting the table 
     instead of filesort only if it is not disabled by
     IGNORE INDEX.

  mysql-test/r/group_by.result@1.70, 2006-08-14 18:19:22+03:00, gkodinov@macbook.gmz +9 -0
    Bug #21174: Index degrades sort performance and 
                 optimizer does not honor IGNORE INDEX
     - test case

  mysql-test/t/group_by.test@1.58, 2006-08-14 18:19:23+03:00, gkodinov@macbook.gmz +12 -0
    Bug #21174: Index degrades sort performance and 
                 optimizer does not honor IGNORE INDEX
     - test case

  sql/sql_select.cc@1.434.1.9, 2006-08-14 18:19:24+03:00, gkodinov@macbook.gmz +2 -0
    Bug #21174: Index degrades sort performance and 
                 optimizer does not honor IGNORE INDEX
     - Allow an index to be used for sorting the table 
       instead of filesort only if it is not disabled by
       IGNORE INDEX.

ChangeSet@1.2216.21.2, 2006-08-14 19:18:33+04:00, kostja@bodhi.local +2 -0
  Fix a test case (proper clean up).

  mysql-test/r/mysqldump.result@1.110, 2006-08-14 19:18:30+04:00, kostja@bodhi.local +2 -2
    Update results.

  mysql-test/t/mysqldump.test@1.100, 2006-08-14 19:18:30+04:00, kostja@bodhi.local +2 -2
    Fix a bug in the test case that left user mysqltest_1@localhost 
    around (this broke furhter tests).

ChangeSet@1.2216.20.1, 2006-08-14 15:45:48+03:00, gkodinov@macbook.gmz +4 -0
  Bug #21302: Result not properly sorted when using an ORDER BY on a second 
               table in a join
   The optimizer removes redundant columns in ORDER BY. It is considering 
  redundant every reference to const table column, e.g b in :
  create table t1 (a int, b int, primary key(a)); 
  select 1 from t1 order by b where a = 1
  
  But it must not remove references to const table columns if the 
  const table is an outer table because there still can be 2 values :
  the const value and NULL. e.g.:
  create table t1 (a int, b int, primary key(a));
  select t2.b c from t1 left join t1 t2 on (t1.a = t2.a and t2.a = 5) 
    order by c;

  mysql-test/r/join_outer.result@1.48.1.1, 2006-08-14 15:45:40+03:00, gkodinov@macbook.gmz +1 -1
    Bug #21302: Result not properly sorted when using an ORDER BY on a second 
                table in a join
     - don't remove columns of const tables in ORDER BY if the const table 
       is an outer table.

  mysql-test/r/order_by.result@1.51.1.1, 2006-08-14 15:45:41+03:00, gkodinov@macbook.gmz +37 -0
    Bug #21302: Result not properly sorted when using an ORDER BY on a second 
                table in a join
     - test case

  mysql-test/t/order_by.test@1.37, 2006-08-14 15:45:42+03:00, gkodinov@macbook.gmz +32 -0
    Bug #21302: Result not properly sorted when using an ORDER BY on a second 
                table in a join
     - test case

  sql/sql_select.cc@1.440, 2006-08-14 15:45:43+03:00, gkodinov@macbook.gmz +2 -1
    Bug #21302: Result not properly sorted when using an ORDER BY on a second 
                table in a join
     - don't remove columns of const tables in ORDER BY if the const table 
       is an outer table.

ChangeSet@1.1616.2716.2, 2006-08-14 17:05:02+05:00, svoj@may.pils.ru +3 -0
  BUG#18874 - Setting myisam_repair_threads > 1, index cardinality always 1
  Fixed by moving update_key_parts() down to be after write_index().

  myisam/sort.c@1.35.1.11, 2006-08-14 17:04:59+05:00, svoj@may.pils.ru +5 -7
    write_index() collects index statistic which is further used in
    update_key_parts(). Thus update_key_parts() must be called after
    write_index().

  mysql-test/r/repair.result@1.14.1.3, 2006-08-14 17:04:59+05:00, svoj@may.pils.ru +11 -0
    Test case for bug#18874.

  mysql-test/t/repair.test@1.12.1.3, 2006-08-14 17:04:59+05:00, svoj@may.pils.ru +11 -0
    Test case for bug#18874.

ChangeSet@1.2216.19.1, 2006-08-14 03:29:17-07:00, brian@zim.(none) +3 -0
  Fix for bug#20648 We introduce a new field method for knowing "real size", and we now in archive null unused bits of a row to null before writing. 

  sql/field.cc@1.321, 2006-08-14 03:29:13-07:00, brian@zim.(none) +5 -0
    data_length for field needs to be calculated directly.

  sql/field.h@1.187, 2006-08-14 03:29:13-07:00, brian@zim.(none) +6 -0
    The new method data_length() returns the "real" length of the field.

  sql/ha_archive.cc@1.71, 2006-08-14 03:29:13-07:00, brian@zim.(none) +22 -0
    Before a write_row() archive nulls space beyond the size of the row in varchars to make sure that compression only sees NULL. 

ChangeSet@1.1616.2144.184, 2006-08-14 12:59:54+05:00, ramil@mysql.com +2 -0
  Make the heap_btree test repeatable.

  mysql-test/r/heap_btree.result@1.13.2.2, 2006-08-14 12:59:51+05:00, ramil@mysql.com +7 -7
    Make the heap_btree test repeatable.
      - 'order by' added where we don't use the 'a' index.

  mysql-test/t/heap_btree.test@1.12.1.3, 2006-08-14 12:59:51+05:00, ramil@mysql.com +3 -3
    Make the heap_btree test repeatable.
      - 'order by' added where we don't use the 'a' index.

ChangeSet@1.1616.2144.183, 2006-08-14 10:54:24+05:00, ramil@mysql.com +1 -0
  Restore alphabetical order of the system variables.
  

  sql/set_var.cc@1.34.52.41, 2006-08-14 10:54:20+05:00, ramil@mysql.com +1 -1
    Restore alphabetical order of the system variables.
      - moved the have_merge_engine variable.

ChangeSet@1.1616.2720.1, 2006-08-11 17:09:19-06:00, tsmith@siva.hindu.god +4 -0
  Bug #20536: md5() with GROUP BY and UCS2 return different results on myisam/innodb
  
  Make the encryption functions MD5(), SHA1() and ENCRYPT() return binary results.
      
  Make MAKE_SET() and EXPORT_SET() use the correct character set for their default separator strings.

  mysql-test/r/ctype_ucs.result@1.11.1.20, 2006-08-11 17:09:17-06:00, tsmith@siva.hindu.god +43 -0
    Add tests for bug #20536.

  mysql-test/t/ctype_ucs.test@1.15.1.16, 2006-08-11 17:09:17-06:00, tsmith@siva.hindu.god +40 -1
    Add tests for bug #20536.
    
    Tests showing correct behavior for MD5(), SHA1(), MAKE_SET() and EXPORT_SET().
    
    Also, tests showing incorrect behavior, which will remain "Won't fix", for
    PASSWORD(), OLD_PASSWORD(), ENCRYPT() and QUOTE().

  sql/item_strfunc.cc@1.196.11.1, 2006-08-11 17:09:17-06:00, tsmith@siva.hindu.god +10 -4
    Make the encryption functions MD5(), SHA1() and ENCRYPT() return binary results.
    
    Make MAKE_SET() and EXPORT_SET() use the correct character set for their default separator strings.

  sql/item_strfunc.h@1.73.4.1, 2006-08-11 17:09:17-06:00, tsmith@siva.hindu.god +22 -4
    Make the encryption functions MD5(), SHA1() and ENCRYPT() return binary results.

ChangeSet@1.2216.18.1, 2006-08-11 15:31:06-04:00, cmiller@zippy.cornsilk.net +1 -0
  Bug#21224: mysql_upgrade uses possibly insecure temporary files
  
  We open for writing a known location, which is exploitable with a symlink
  attack.  Now, use the EXCLusive flag, so that the presence of anything at 
  that location causes a failure.  Try once to open safely, and if failure 
  then remove that location and try again to open safely.  If both fail, then
  raise an error.

  client/mysql_upgrade.c@1.3.2.1, 2006-08-11 15:31:04-04:00, cmiller@zippy.cornsilk.net +14 -2
    Open the file with the O_EXCL flag, so that a symlink attack would not work.
    
    If opening it fails, try removing something at that location, and try again.
    If the second time fails, then abort as previous.

ChangeSet@1.2216.17.8, 2006-08-11 14:41:07+05:00, svoj@may.pils.ru +2 -0
  Extended a test case for bug#7391.

  mysql-test/r/grant.result@1.52.3.2, 2006-08-11 14:41:04+05:00, svoj@may.pils.ru +1 -0
    Extended a test case for bug#7391.

  mysql-test/t/grant.test@1.41.2.2, 2006-08-11 14:41:04+05:00, svoj@may.pils.ru +2 -0
    Extended a test case for bug#7391.

ChangeSet@1.1616.2719.1, 2006-08-11 13:19:44+05:00, bar@mysql.com +4 -0
  mysqld --collation-server=xxx --character-set-server=yyy
  didn't work as expected: collation_server was set not to xxx,
  but to the default collation of character set "yyy".
      
  With different argument order it worked as expected:
  mysqld --character-set-server=yyy --collation-server=yyy 
      
  Fix:
  initializate default_collation_name to 0
  when processing --character-set-server
  only if --collation-server has not been specified
  in command line.

  mysql-test/r/ctype_ucs2_def.result@1.1.1.1, 2006-08-11 13:19:40+05:00, bar@mysql.com +3 -0
    Adding test cast

  mysql-test/t/ctype_ucs2_def-master.opt@1.1.1.1, 2006-08-11 13:19:40+05:00, bar@mysql.com +1 -1
    Adding test case

  mysql-test/t/ctype_ucs2_def.test@1.1.1.1, 2006-08-11 13:19:40+05:00, bar@mysql.com +5 -0
    Adding test case

  sql/mysqld.cc@1.356.98.28, 2006-08-11 13:19:40+05:00, bar@mysql.com +4 -2
    Don't clear default_collation_name when processing 
    --character-set-server if collation has already
    been specified using --collation-server
    

ChangeSet@1.1616.2144.181, 2006-08-11 13:14:26+05:00, bar@mysql.com +1 -0
  Bug#7192 Specify --with-collation doesn't work for connections?
  --with-collation worked only on the server side.
  Client side ignored this argument, so collation_connection
  was not properly set (remained latin1_swedish_ci).
  

  sql-common/client.c@1.46.1.45, 2006-08-11 13:14:24+05:00, bar@mysql.com +31 -2
    - Take into account MYSQL_DEFAULT_COLLATION_NAME if
    character set is not set using mysql_option(), to
    honor --with-collation argument to configure.
    - Use default collation for the character set when it's
    not set using mysql_option().
    

ChangeSet@1.2232.1.3, 2006-08-10 17:39:01-05:00, Reggie@xgeek. +1 -0
  Some small cleanups that will help get mysql_client_test passing on Windows

  tests/mysql_client_test.c@1.198, 2006-08-10 17:38:26-05:00, Reggie@xgeek. +7 -2
    set sql_mode to '' in a few places
    explicitly select myisam table type for fulltext
    use memcpy instead of strcpy since our src buffer is not zero terminated.

ChangeSet@1.1346.1.847, 2006-08-10 22:41:19+03:00, monty@mysql.com +8 -0
  Better bug fix for #14400 "Query joins wrong rows from table which is subject of "concurrent insert""
  The previous bug fix didn't work when using partial keys.
  Don't use GNUC min/max operations are they are depricated.
  Fixed valgrind warning

  BitKeeper/etc/ignore@1.107.1.61, 2006-08-10 22:41:12+03:00, monty@mysql.com +1 -2
    Added */.libs/*

  BitKeeper/etc/ignore@1.107.1.60, 2006-08-10 22:37:01+03:00, monty@mysql.com +1 -0
    added *.Plo

  BitKeeper/etc/ignore@1.107.1.59, 2006-08-10 22:35:50+03:00, monty@mysql.com +1 -0
    added *.Po

  BitKeeper/etc/ignore@1.107.1.58, 2006-08-10 22:35:42+03:00, monty@mysql.com +1 -0
    added .deps

  BitKeeper/etc/ignore@1.107.1.57, 2006-08-10 22:33:59+03:00, monty@mysql.com +1 -0
    added */.deps

  BitKeeper/etc/ignore@1.107.1.56, 2006-08-10 22:32:00+03:00, monty@mysql.com +1 -0
    added .deps

  include/my_global.h@1.34.1.41, 2006-08-10 22:41:14+03:00, monty@mysql.com +1 -4
    Don't use GNUC min/max operations are they are depricated

  myisam/mi_rkey.c@1.11.1.5, 2006-08-10 22:41:15+03:00, monty@mysql.com +30 -23
    Better bug fix for #14400 "Query joins wrong rows from table which is subject of "concurrent insert""
    The previous bug fix didn't work when using partial keys.

  myisam/mi_test_all.res@1.3.1.1, 2006-08-10 22:41:15+03:00, monty@mysql.com +42 -42
    Updated results to match mi_test_all.sh

  myisam/mi_test_all.sh@1.8, 2006-08-10 22:41:15+03:00, monty@mysql.com +2 -1
    Removed confusing warning

  mysql-test/r/myisam.result@1.10.1.22, 2006-08-10 22:41:16+03:00, monty@mysql.com +15 -0
    Added test case for #14400

  mysql-test/t/myisam.test@1.7.1.21, 2006-08-10 22:41:17+03:00, monty@mysql.com +17 -0
    Added test case for #14400

  sql/sql_select.cc@1.152.1.144, 2006-08-10 22:41:18+03:00, monty@mysql.com +12 -2
    Fixed valgrind warning (in field_string::val_int())

ChangeSet@1.2216.17.6, 2006-08-10 12:39:18-04:00, cmiller@zippy.cornsilk.net +6 -0
  Merge updates.

  BitKeeper/deleted/.del-bug20328.result~4fee68989442c2a3@1.2.1.1, 2006-08-10 12:38:10-04:00, cmiller@zippy.cornsilk.net +0 -0
    Delete: mysql-test/r/bug20328.result

  BitKeeper/deleted/.del-bug20328.test~c76d766fe3e1eb5@1.2.1.1, 2006-08-10 12:27:38-04:00, cmiller@zippy.cornsilk.net +0 -0
    Delete: mysql-test/t/bug20328.test

  mysql-test/r/mysql_client.result@1.4, 2006-08-10 10:48:30-04:00, cmiller@zippy.cornsilk.net +8 -4
    Merge update: Help options changed between versions.

  mysql-test/r/grant2.result@1.31, 2006-08-10 10:48:30-04:00, cmiller@zippy.cornsilk.net +2 -2
    Merge update:  Change between versions, it appears.

  mysql-test/r/heap_btree.result@1.22, 2006-08-10 10:48:30-04:00, cmiller@zippy.cornsilk.net +10 -10
    Merge update:  Add deterministic ordering of data, as the order is different 
    between versions.

  mysql-test/t/heap_btree.test@1.19, 2006-08-10 10:48:30-04:00, cmiller@zippy.cornsilk.net +6 -6
    Merge update:  Add deterministic ordering of data, as the order is different 
    between versions.

ChangeSet@1.2216.7.5, 2006-08-10 17:35:21+03:00, gkodinov@macbook.gmz +1 -0
  Fix for check_cpu to work correctly on MacOSX/Intel.

  BUILD/check-cpu@1.14, 2006-08-10 17:35:16+03:00, gkodinov@macbook.gmz +5 -1
    Fix for check_cpu to work correctly on MacOSX/Intel.

ChangeSet@1.1616.2718.1, 2006-08-10 16:45:02+03:00, gkodinov@macbook.gmz +6 -0
  Bug #16792 query with subselect, join, and group not returning proper values
   Treat queries with no FROM and aggregate functions as normal queries,
  so the aggregate function get correctly calculated as if there is 1 row. 
  This means that they will be considered to have one row, so COUNT(*) will return
  1 instead of 0. Other aggregates will behave in compatible manner.

  mysql-test/r/func_gconcat.result@1.27.1.20, 2006-08-10 16:44:52+03:00, gkodinov@macbook.gmz +2 -2
    Bug #16792 query with subselect, join, and group not returning proper values
     - test case. Note how it improves the support for DUAL.

  mysql-test/r/func_group.result@1.22.7.2, 2006-08-10 16:44:53+03:00, gkodinov@macbook.gmz +20 -4
    Bug #16792 query with subselect, join, and group not returning proper values
     - test case. Note how it improves the support for DUAL.

  mysql-test/r/subselect.result@1.67.64.1, 2006-08-10 16:44:53+03:00, gkodinov@macbook.gmz +2 -2
    Bug #16792 query with subselect, join, and group not returning proper values
     - consequence of (SELECT MAX(<const>)) now returning <const> instead of 0

  mysql-test/t/func_group.test@1.24.3.1, 2006-08-10 16:44:54+03:00, gkodinov@macbook.gmz +14 -0
    Bug #16792 query with subselect, join, and group not returning proper values
     - test case.

  sql/opt_sum.cc@1.33.6.2, 2006-08-10 16:44:55+03:00, gkodinov@macbook.gmz +2 -2
    Bug #16792 query with subselect, join, and group not returning proper values
     - cannot do the optimization if the index is already opened by (say) UPDATE
       as it invloves opening reading and closing the index.

  sql/sql_select.cc@1.216.126.14, 2006-08-10 16:44:55+03:00, gkodinov@macbook.gmz +15 -5
    Bug #16792 query with subselect, join, and group not returning proper values
     - Treat queries with no FROM and aggregate functions as normal queries,
    so the aggregate function get correctly calculated as if there is 1 row. 

ChangeSet@1.1616.2717.1, 2006-08-10 15:37:24+02:00, tnurnberg@salvation.intern.azundris.com +3 -0
  Bug#19844: time_format in Union truncates values
  
  time_format() claimed %H and %k would return at most two digits
  (hours 0-23), but this coincided neither with actual behaviour
  nor with docs.  this is not visible in simple queries; forcing
  a temp-table is probably the easiest way to see this.  adjusted
  the return-length appropriately; the alternative would be to
  adjust the docs to say that behaviour for > 99 hours is undefined.
  ---
  Bug#19844: time_format in Union truncates values
  
  time_format() claimed %H and %k would return at most two digits
  (hours 0-23), but this coincided neither with actual behaviour
  nor with docs.  this is not visible in simple queries; forcing
  a temp-table is probably the easiest way to see this.  adjusted
  the return-length appropriately; the alternative would be to
  adjust the docs to say that behaviour for > 99 hours is undefined.

  mysql-test/r/func_time.result@1.23.6.1, 2006-08-10 15:37:22+02:00, tnurnberg@salvation.intern.azundris.com +21 -0
    Bug#19844: time_format in Union truncates values
    
    show time_format() handles %H and %k correctly four > 99 hours

  mysql-test/t/func_time.test@1.21.5.1, 2006-08-10 15:37:22+02:00, tnurnberg@salvation.intern.azundris.com +19 -1
    Bug#19844: time_format in Union truncates values
    
    show time_format() handles %H and %k correctly four > 99 hours

  sql/item_timefunc.cc@1.51.6.1, 2006-08-10 15:37:22+02:00, tnurnberg@salvation.intern.azundris.com +4 -2
    Bug#19844: time_format in Union truncates values
    
    unbreak promises we make about field-length of %H and %k in
    time_format() so they coincide with the actual range rather
    than just 0..23. the docs say we must operate outside that
    range, so we'd better do it right.
    ---
    Bug#19844: time_format in Union truncates values
    
    unbreak promises we make about field-length of %H and %k in
    time_format() so they coincide with the actual range rather
    than just 0..23. the docs say we must operate outside that
    range, so we'd better do it right.
    One digit values are padded to two digits with %H, "longer"
    values are handled correctly up to seven digits including
    any sign.
    (clarified comments as per jimw's suggestion.)

ChangeSet@1.1616.2144.180, 2006-08-10 15:06:22+05:00, ramil@mysql.com +3 -0
  Fix for bug #20709: Collation not used in group by on 4.1.    
  
  myisam/mi_uniue.c:mi_check_unique() should skip trailing spaces comparing 
  TEXT and VARTTEXT key segments.

  myisam/mi_unique.c@1.20.1.2, 2006-08-10 15:06:20+05:00, ramil@mysql.com +1 -1
    Fix for bug #20709: Collation not used in group by on 4.1.    
    
    myisam/mi_uniue.c:mi_check_unique() should skip trailing spaces comparing 
    TEXT and VARTTEXT key segments.
      
    Example: assume, we have a 'char(200) collate utf8_unicode_ci' field,
    there are two records with _utf8"0x65" and _utf8"0xC3A9" characters;
    these values are equal according
    to the utf8_unicode_ci collation, but two 600 byte length corresponding keys:  
    "0x65<0x20 repeats 599 times>" and "0xC3A9<0x20 repeats 598 times>" are not    
    equal if we count trailing spaces and it may cause inconsequent behavior.
    
    So, let's pass 1 as the skip_end_space parameter value to the mi_compare_text()
    function for proper TEXT and VARTTEXT key segments comparison.

  mysql-test/r/ctype_utf8.result@1.45.6.5, 2006-08-10 15:06:20+05:00, ramil@mysql.com +16 -0
    Fix for bug #20709: Collation not used in group by on 4.1.    
      - test results.

  mysql-test/t/ctype_utf8.test@1.57.6.5, 2006-08-10 15:06:20+05:00, ramil@mysql.com +14 -0
    Fix for bug #20709: Collation not used in group by on 4.1.    
      - test case.

ChangeSet@1.2234, 2006-08-10 14:50:54+05:00, holyfoot@mysql.com +2 -0
  bug #20910 (NOT NULL column reported as NULL in SHOW FIELDS)
  
  two test results changed after the patch

  mysql-test/r/grant.result@1.52.2.1, 2006-08-10 14:50:50+05:00, holyfoot@mysql.com +1 -1
    result fixed

  mysql-test/r/type_ranges.result@1.43, 2006-08-10 14:50:50+05:00, holyfoot@mysql.com +3 -3
    result fixed

ChangeSet@1.2216.17.5, 2006-08-10 01:02:31-04:00, cmiller@zippy.cornsilk.net +2 -0
  Removed Iggy's accidentally-added files.

  BitKeeper/deleted/.del-bug20328.result@1.1, 2006-08-10 01:02:29-04:00, cmiller@zippy.cornsilk.net +44 -0
    Removed Iggy's accidentally-added files.

  BitKeeper/deleted/.del-bug20328.result@1.0, 2006-08-10 01:02:29-04:00, cmiller@zippy.cornsilk.net +0 -0

  BitKeeper/deleted/.del-bug20328.test@1.1, 2006-08-10 01:02:30-04:00, cmiller@zippy.cornsilk.net +9 -0
    Removed Iggy's accidentally-added files.

  BitKeeper/deleted/.del-bug20328.test@1.0, 2006-08-10 01:02:30-04:00, cmiller@zippy.cornsilk.net +0 -0

ChangeSet@1.2216.13.9, 2006-08-10 03:46:46+02:00, tnurnberg@salvation.intern.azundris.com +1 -0
  Bug#17926: mysql.exe crashes when ctrl-c is pressed in windows
  
  SIGINT is handled in funny ways on windows, which could lead to problems when
  Control-C was pressed in the client during a long-running query.  Now Control-C
  during a query aborts that query (by sending KILL to the server on a second
  connexion), while Control-C outside of a running query terminates the client.

  client/mysql.cc@1.209.1.5, 2006-08-10 03:46:24+02:00, tnurnberg@salvation.intern.azundris.com +40 -2
    Bug#17926: mysql.exe crashes when ctrl-c is pressed in windows
    
    Rather than tear down the client right away, open a second connexion to server
    on SIGINT and send a KILL for the first connexion.  Only if we receive another
    SIGINT before the KILL goes through (or if no query was running in the first
    place) do we terminate the client.

ChangeSet@1.2196.34.10, 2006-08-09 17:41:35-07:00, pgalbraith@govinda.patg.net +1 -0
  autopush test - sorry for the commit messages, ignore

  sql/ha_federated.cc@1.68, 2006-08-09 17:41:33-07:00, pgalbraith@govinda.patg.net +1 -0
    autopush test - sorry for the commit messages, ignore

ChangeSet@1.1616.2144.179, 2006-08-09 13:41:08-04:00, cmiller@zippy.cornsilk.net +2 -0
  Removed iggy's accidentally checked-in test files.

  BitKeeper/deleted/.del-bug20328.result@1.3, 2006-08-09 13:38:35-04:00, cmiller@zippy.cornsilk.net +0 -0
    Delete: mysql-test/r/bug20328.result

  BitKeeper/deleted/.del-bug20328.test@1.3, 2006-08-09 13:38:28-04:00, cmiller@zippy.cornsilk.net +0 -0
    Delete: mysql-test/t/bug20328.test

ChangeSet@1.1616.2709.11, 2006-08-09 16:24:14+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - bug#21536
    Make sure updateNodeInfo is run on master also for temporary tables

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.14.1.24, 2006-08-09 16:24:13+02:00, jonas@perch.ndb.mysql.com +1 -0
    Run update nodeinfo also here to handle
      temprorary tables in some situations

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@1.10.1.8, 2006-08-09 16:24:13+02:00, jonas@perch.ndb.mysql.com +6 -1
    new error insert

  ndb/test/ndbapi/testSystemRestart.cpp@1.10, 2006-08-09 16:24:13+02:00, jonas@perch.ndb.mysql.com +47 -0
    test case

ChangeSet@1.1616.2716.1, 2006-08-09 14:28:39+05:00, svoj@may.pils.ru +1 -0
  BUG#20060 - mysqld option "--flush " doesn't work for update statement
  
  Problem described in this bug report affects MyISAM tables only.
  
  Running mysqld --flush instructs mysqld to sync all changes to disk
  after each SQL statement. It worked well for INSERT and DELETE
  statements, but it did sync for UPDATE only in case if there was
  index change (change of colum that has an index). If no updated column
  has an index, data wasn't synced to disk.
  
  This fix makes UPDATE statement to sync data to disk even if there is
  no index change (that is only data change) and mysqld is run with
  --flush option.

  myisam/mi_update.c@1.15.1.2, 2006-08-09 14:28:36+05:00, svoj@may.pils.ru +11 -1
    Every myisam function that updates myisam table must end with
    call to _mi_writeinfo(). If operation (second param of
    _mi_writeinfo()) is not 0 it sets share->changed to 1, that is
    flags that data has changed. If operation is 0, this function
    equals to no-op in this case.
    
    mi_update() must always pass !0 value as operation, since even if
    there is no index change there could be data change.

ChangeSet@1.2216.15.5, 2006-08-09 15:39:32+08:00, stewart@willster.(none) +1 -0
  remove undeeded printing of newline.

  ndb/src/ndbapi/ClusterMgr.cpp@1.28, 2006-08-09 15:39:30+08:00, stewart@willster.(none) +0 -1
    remove extra 'ndbout << endl'

ChangeSet@1.2216.15.4, 2006-08-09 15:03:55+08:00, stewart@willster.(none) +6 -0
  BUG#13985
  
  fixups after review by jonas

  ndb/src/mgmclient/CommandInterpreter.cpp@1.63, 2006-08-09 15:03:52+08:00, stewart@willster.(none) +1 -0
    Guard the print mutex when running SHOW

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.104, 2006-08-09 15:03:52+08:00, stewart@willster.(none) +4 -24
    replace global_flag_send_heartbeat_now with forceHB()/updateStatus()
    
    don't use bitmask as parameter to forceHB to reflect reality of what the
    function does.
    
    remove get_connected_ndb_nodes() as it is no longer used

  ndb/src/mgmsrv/MgmtSrvr.hpp@1.48, 2006-08-09 15:03:52+08:00, stewart@willster.(none) +1 -2
    remove unused get_connected_ndb_nodes()
    
    update updateStatus prototype

  ndb/src/mgmsrv/Services.cpp@1.68, 2006-08-09 15:03:52+08:00, stewart@willster.(none) +1 -3
    use new prototype for updateStatus() - doesn't accept NodeBitmask

  ndb/src/ndbapi/ClusterMgr.cpp@1.27, 2006-08-09 15:03:52+08:00, stewart@willster.(none) +19 -10
    remove global_flag_send_heartbeat_now, replace with forceHB.
    
    compute bitmask of nodes to send HB to in forceHB

  ndb/src/ndbapi/ClusterMgr.hpp@1.11, 2006-08-09 15:03:52+08:00, stewart@willster.(none) +1 -1
    update prototype for forceHB, don't give the illusion that NodeBitmask means much.

ChangeSet@1.2216.17.2, 2006-08-09 06:46:06+04:00, evgen@sunlight.local +1 -0
  sql_view.cc:
    After merge fix

  sql/sql_view.cc@1.89.1.6, 2006-08-09 06:45:49+04:00, evgen@sunlight.local +1 -13
    After merge fix

ChangeSet@1.2205.15.1, 2006-08-09 00:05:42+04:00, evgen@sunlight.local +6 -0
  sql_base.cc, unireg.h, sql_lex.h, table.cc, sql_view.h, sql_view.cc:
    Correct memory leak fix

  sql/sql_base.cc@1.345.1.1, 2006-08-09 00:05:03+04:00, evgen@sunlight.local +31 -13
    Correct memory leak fix

  sql/sql_lex.h@1.222.1.2, 2006-08-09 00:04:28+04:00, evgen@sunlight.local +1 -1
    Correct memory leak fix

  sql/sql_view.cc@1.89.6.1, 2006-08-09 00:04:04+04:00, evgen@sunlight.local +8 -3
    Correct memory leak fix

  sql/sql_view.h@1.12, 2006-08-09 00:00:08+04:00, evgen@sunlight.local +2 -1
    Correct memory leak fix

  sql/table.cc@1.227.1.3, 2006-08-08 23:59:47+04:00, evgen@sunlight.local +2 -0
    Correct memory leak fix

  sql/unireg.h@1.45, 2006-08-08 23:59:26+04:00, evgen@sunlight.local +2 -1
    Correct memory leak fix

ChangeSet@1.2232, 2006-08-08 14:40:07+05:00, gluh@mysql.com +4 -0
  Bug#16172 DECIMAL data type processed incorrectly
  issue an error in case of DECIMAL(M,N) if N > M

  mysql-test/r/type_newdecimal.result@1.41, 2006-08-08 14:40:03+05:00, gluh@mysql.com +5 -1
    Bug#16172 DECIMAL data type processed incorrectly
    result fix & test case
    

  mysql-test/t/type_newdecimal.test@1.38, 2006-08-08 14:40:04+05:00, gluh@mysql.com +6 -2
    Bug#16172 DECIMAL data type processed incorrectly
    test fix

  sql/item_create.cc@1.61, 2006-08-08 14:40:04+05:00, gluh@mysql.com +8 -1
    Bug#16172 DECIMAL data type processed incorrectly
    issue an error in case of DECIMAL(M,N) if N > M

  sql/sql_yacc.yy@1.480, 2006-08-08 14:40:04+05:00, gluh@mysql.com +4 -0
    Bug#16172 DECIMAL data type processed incorrectly
    issue an error in case of DECIMAL(M,N) if N > M

ChangeSet@1.2230.1.1, 2006-08-08 13:34:27+05:00, holyfoot@mysql.com +3 -0
  bug #20910 (NOT NULL reported as NULL for TIMESTAMP)
  
  we intentionally reported that for TIMESTAMPS, which isn't right

  mysql-test/r/type_timestamp.result@1.30, 2006-08-08 13:34:23+05:00, holyfoot@mysql.com +24 -9
    result fixed

  mysql-test/t/type_timestamp.test@1.28, 2006-08-08 13:34:23+05:00, holyfoot@mysql.com +11 -0
    testcase added

  sql/sql_show.cc@1.328, 2006-08-08 13:34:23+05:00, holyfoot@mysql.com +1 -3
    remove the check for TIMESTAMP type -
    all types will report 'NO' if they're defined as NOT NULL

ChangeSet@1.2231, 2006-08-08 12:50:05+05:00, gluh@mysql.com +1 -0
  result fix

  mysql-test/r/information_schema_db.result@1.9, 2006-08-08 12:50:00+05:00, gluh@mysql.com +1 -0
    result fix

ChangeSet@1.1616.2709.10, 2006-08-08 07:59:52+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21213
    Make sure totSendlenAi is set in case of ACC_ABORTCONF and activeCreate == true
    (only needed when >2 replica)

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.39.1.26, 2006-08-08 07:59:51+02:00, jonas@perch.ndb.mysql.com +1 -0
    Make sure totSendlenAi is set in case of ACC_ABORTCONF and activeCreate == true

ChangeSet@1.2216.13.8, 2006-08-07 19:21:43+02:00, msvensson@neptunus.(none) +1 -0
  Remove extra whitespace

  tests/mysql_client_test.c@1.195.1.6, 2006-08-07 19:21:41+02:00, msvensson@neptunus.(none) +3 -3
    Remove extra whitespace

ChangeSet@1.2216.13.7, 2006-08-07 17:26:02+02:00, msvensson@neptunus.(none) +1 -0
  Add some more code to analyze why the fgets fails.

  tests/mysql_client_test.c@1.195.1.5, 2006-08-07 17:26:00+02:00, msvensson@neptunus.(none) +12 -3
    Add some more code to analyze why the fgets fails.

ChangeSet@1.2196.34.9, 2006-08-07 19:35:02+05:00, svoj@may.pils.ru +1 -0
  After merge fix.

  mysql-test/r/ps_7ndb.result@1.42.1.1, 2006-08-07 19:34:57+05:00, svoj@may.pils.ru +1 -1
    After merge fix.

ChangeSet@1.2216.13.6, 2006-08-07 14:02:57+02:00, msvensson@neptunus.(none) +1 -0
  Add printouts in test case for bug17667

  tests/mysql_client_test.c@1.195.1.4, 2006-08-07 14:02:55+02:00, msvensson@neptunus.(none) +4 -0
    Add printout describing what master.log is to be opened.
    Add printout about statements that are found in the log.

ChangeSet@1.2216.16.2, 2006-08-07 11:29:41+02:00, msvensson@neptunus.(none) +1 -0
  Change the 'sleep' into an explicit FLUSH LOGS command

  tests/mysql_client_test.c@1.195.1.3, 2006-08-07 11:29:39+02:00, msvensson@neptunus.(none) +3 -1
    Change the 'sleep' into an explicit FLUSH LOGS command

ChangeSet@1.2216.16.1, 2006-08-07 10:16:37+02:00, msvensson@neptunus.(none) +1 -0
  fflush(NULL) before abort so that all pending writes are performed

  tests/mysql_client_test.c@1.195.1.2, 2006-08-07 10:16:36+02:00, msvensson@neptunus.(none) +1 -1
    fflush(NULL) before abort so that all pending writes are performed

ChangeSet@1.1616.2709.9, 2006-08-07 09:41:39+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#18475
    Fix error message on copyfragref

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@1.10.1.7, 2006-08-07 09:41:38+02:00, jonas@perch.ndb.mysql.com +4 -5
    Fix error message

ChangeSet@1.2225.2.1, 2006-08-07 11:56:22+05:00, holyfoot@mysql.com +1 -0
  information_schema_db.test fixed

  mysql-test/t/information_schema_db.test@1.6, 2006-08-07 11:55:26+05:00, holyfoot@mysql.com +1 -0
    user dropped

ChangeSet@1.1616.2702.10, 2006-08-07 07:35:28+02:00, tnurnberg@salvation.intern.azundris.com +3 -0
  Bug #20987: str_to_date doesn't accept user variable for specification
  
  str_to_date() would sometimes render NULL if %D was used as rule other than last.
  since this was due to two pointers getting mixed up in the server, this behaviour
  seemed somewhat non-deterministic at SQL level.

  mysql-test/r/func_time.result@1.23.1.18, 2006-08-07 07:35:19+02:00, tnurnberg@salvation.intern.azundris.com +34 -0
    Bug #20987: str_to_date doesn't accept user variable for specification
    
    show we can do the usual str_to_date() conversions without triggering the bug.

  mysql-test/t/func_time.test@1.21.1.15, 2006-08-07 07:35:19+02:00, tnurnberg@salvation.intern.azundris.com +31 -1
    Bug #20987: str_to_date doesn't accept user variable for specification
    
    show we can do the usual str_to_date() conversions without triggering the bug.

  sql/item_timefunc.cc@1.51.1.55, 2006-08-07 07:35:19+02:00, tnurnberg@salvation.intern.azundris.com +1 -1
    Bug #20987: str_to_date doesn't accept user variable for specification
    
    str_to_date() used a wrong pointer in %D conversions which could lead to the
    input being cut off after the token matching %D; if the rule required further
    tokens, the conversion would fail and render NULL.

ChangeSet@1.2216.15.2, 2006-08-07 07:41:49+04:00, evgen@sunlight.local +1 -0
  sql_view.cc:
    Memory leak fix

  sql/sql_view.cc@1.89.5.2, 2006-08-07 07:41:17+04:00, evgen@sunlight.local +3 -0
    Memory leak fix

ChangeSet@1.2216.13.4, 2006-08-07 04:13:05+02:00, tnurnberg@mysql.com +1 -0
  grant.result:
    manual merge

  mysql-test/r/grant.result@1.55, 2006-08-07 02:09:27+02:00, tnurnberg@mysql.com +2 -2
    manual merge

ChangeSet@1.2216.13.2, 2006-08-06 23:56:51+02:00, msvensson@neptunus.(none) +1 -0
  Flush stderr before calling abort()

  tests/mysql_client_test.c@1.195.1.1, 2006-08-06 23:56:49+02:00, msvensson@neptunus.(none) +1 -0
    Flush stderr before calling abort()

ChangeSet@1.2205.11.2, 2006-08-07 00:06:03+04:00, evgen@sunlight.local +1 -0
  sql_view.cc:
    Memory leak fix

  sql/sql_view.cc@1.89.4.1, 2006-08-07 00:05:42+04:00, evgen@sunlight.local +13 -3
    Memory leak fix

ChangeSet@1.2216.12.1, 2006-08-06 20:58:30+02:00, msvensson@neptunus.(none) +1 -0
  Send output from mysql_client_test to var/log/mysql_client_test.log

  mysql-test/t/mysql_client_test.test@1.19, 2006-08-06 20:58:28+02:00, msvensson@neptunus.(none) +2 -2
    Send output from mysql_client_test to var/log/mysql_client_test.log

ChangeSet@1.2229, 2006-08-05 18:58:38-05:00, Reggie@xgeek. +1 -0
  please don't call methods that should always execute inside assert()

  tests/mysql_client_test.c@1.197, 2006-08-05 18:58:07-05:00, Reggie@xgeek. +12 -6
    fixed lines that are executing methods that should always execute inside assert()

ChangeSet@1.2228, 2006-08-05 23:15:23+02:00, rburnett@production.mysql.com +1 -0
  mysql_client_test.c:
    Moving call that processes select results out of the assert

  tests/mysql_client_test.c@1.196, 2006-08-05 23:15:07+02:00, rburnett@production.mysql.com +3 -1
    Moving call that processes select results out of the assert

ChangeSet@1.2216.3.16, 2006-08-05 13:41:22+02:00, hartmut@mysql.com +1 -0
    relying on loop counter variables being local to the loop body if 
    declared in the 'for' statement is not portable, some compilers
    still don't implement this ANSI C++ specification (Bug #14995)

  server-tools/instance-manager/listener.cc@1.25, 2006-08-05 13:41:07+02:00, hartmut@mysql.com +4 -4
      relying on loop counter variables being local to the loop body if 
      declared in the 'for' statement is not portable, some compilers
      still don't implement this ANSI C++ specification (Bug #14995)

ChangeSet@1.2225.1.1, 2006-08-04 21:18:58+02:00, rburnett@production.mysql.com +1 -0
  lowercase_fs_off fails on windows because lower_case_file_system is not being
  set properly.  This patch should fix that.
  
  mysqld.cc:
    Call test_if_case_insensitive in all cases so lower_case_file_system always gets set

  sql/mysqld.cc@1.563.1.1, 2006-08-04 21:17:15+02:00, rburnett@production.mysql.com +2 -3
    Call test_if_case_insensitive in all cases so lower_case_file_system always gets set

ChangeSet@1.2216.1.21, 2006-08-04 10:30:57+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21129
    add missing function to mgmapi

  ndb/src/mgmapi/ndb_logevent.cpp@1.9, 2006-08-04 10:30:55+02:00, jonas@perch.ndb.mysql.com +7 -0
    add missing function

ChangeSet@1.1616.2709.8, 2006-08-04 09:43:23+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21400
    Fix docs for NdbOpertation::sub_reg

  ndb/include/ndbapi/NdbOperation.hpp@1.18.1.2, 2006-08-04 09:43:22+02:00, jonas@perch.ndb.mysql.com +1 -1
    Fix docs for sub_reg

ChangeSet@1.1616.2709.7, 2006-08-04 08:41:32+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#20296 (recommit in 4.1)
     Make sure that tupkeyErrorLab is run if interpretedUpdate(fail), so that entry is not inserted into index.
       Yeilding crash on following dml on tupel
  

  ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.11.1.2, 2006-08-04 08:41:31+02:00, jonas@perch.ndb.mysql.com +6 -4
    Make sure that tupkeyErrorLab is run if interpretedUpdate(fail), so that entry is not inserted into index.
          Yeilding crash on following dml on tupe
    

ChangeSet@1.2216.11.2, 2006-08-04 01:41:21+04:00, kostja@bodhi.local +1 -0
  Add my_memmem.c to mysys.dsp (needed by mysql_client_test)

  VC++Files/mysys/mysys.dsp@1.31, 2006-08-04 01:41:18+04:00, kostja@bodhi.local +4 -0
    Add my_memmem.c to mysys.dsp (needed by mysql_client_test)

ChangeSet@1.2216.11.1, 2006-08-04 00:00:48+04:00, kostja@bodhi.local +2 -0
  Fix a bug in the .dsp file. Ignore a symlink.

  BitKeeper/etc/ignore@1.228, 2006-08-04 00:00:43+04:00, kostja@bodhi.local +1 -0
    Added ndb/src/common/util/testBitmask.cpp to the ignore list

  VC++Files/sql/mysqld.dsp@1.45, 2006-08-04 00:00:43+04:00, kostja@bodhi.local +1 -1
    Fix a bug in the .dsp file.

ChangeSet@1.2216.3.15, 2006-08-03 16:00:15-04:00, iggy@rolltop.ignatz42.dyndns.org +1 -0
  Bug #20968: incorrect DBUG_ENTER string in mysqld.cc network_init(void) function

  sql/mysqld.cc@1.565, 2006-08-03 16:00:12-04:00, iggy@rolltop.ignatz42.dyndns.org +1 -1
    Corrected debug message.

ChangeSet@1.1616.2711.2, 2006-08-03 19:20:30+03:00, gkodinov@macbook.gmz +4 -0
  Bug #21180: Subselect with index for both WHERE and ORDER BY produces empty result
   Reseting subqueries with "quick" access methods was incomplete.
   Partially backported the correct reseting of QUICK_SELECTs from 5.x.

  mysql-test/r/subselect.result@1.67.1.114, 2006-08-03 19:20:21+03:00, gkodinov@macbook.gmz +29 -0
    Bug #21180: Subselect with index for both WHERE and ORDER BY produces empty result
     - test case

  mysql-test/t/subselect.test@1.58.1.100, 2006-08-03 19:20:22+03:00, gkodinov@macbook.gmz +26 -0
    Bug #21180: Subselect with index for both WHERE and ORDER BY produces empty result
     - test case

  sql/opt_range.cc@1.98.2.50, 2006-08-03 19:20:23+03:00, gkodinov@macbook.gmz +13 -1
    Bug #21180: Subselect with index for both WHERE and ORDER BY produces empty result
     - partially backported the correct reseting of QUICK_SELECTs from 5.x.

  sql/opt_range.h@1.28.1.13, 2006-08-03 19:20:23+03:00, gkodinov@macbook.gmz +2 -2
    Bug #21180: Subselect with index for both WHERE and ORDER BY produces empty result
     - partially backported the correct reseting of QUICK_SELECTs from 5.x.

ChangeSet@1.2216.9.1, 2006-08-03 17:29:35+02:00, msvensson@neptunus.(none) +1 -0
  Bug#20190 Unixware 7.13 port and make test errors
     - Thanks to cerber for the patch!

  server-tools/instance-manager/portability.h@1.9, 2006-08-03 17:29:30+02:00, msvensson@neptunus.(none) +5 -1
    Define SHUT_RDWR also on Unixware 7

ChangeSet@1.2216.3.12, 2006-08-03 16:47:24+02:00, msvensson@neptunus.(none) +2 -0
  Make test case for bug#21215repeateble by calling "reset master"

  mysql-test/r/mysqldump.result@1.109, 2006-08-03 16:47:21+02:00, msvensson@neptunus.(none) +2 -1
    Make test case for bug#21215repeateble by calling "reset master"

  mysql-test/t/mysqldump.test@1.99, 2006-08-03 16:47:21+02:00, msvensson@neptunus.(none) +3 -0
    Make test case for bug#21215repeateble by calling "reset master"

ChangeSet@1.2216.3.11, 2006-08-03 15:48:28+02:00, msvensson@neptunus.(none) +1 -0
  Update result after merge, since the function Item::tmp_table_field_from_field_type() 
  now takes mbmaxlen into account when calculating max_length of new field. 

  mysql-test/r/union.result@1.85, 2006-08-03 15:48:26+02:00, msvensson@neptunus.(none) +1 -1
    Update result after merge, since the function Item::tmp_table_field_from_field_type() 
    now takes mbmaxlen into account when calculating max_length of new field. 

ChangeSet@1.2216.1.18, 2006-08-03 15:38:04+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21384
    merge 4.1->5.0 (variable rename)

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.96, 2006-08-03 15:38:02+02:00, jonas@perch.ndb.mysql.com +1 -1
    merge #21384 4.1->5.0
      variable rename

ChangeSet@1.2216.8.1, 2006-08-03 14:58:13+02:00, tnurnberg@mysql.com +2 -0
  Bug#20214: Incorrect error when user calls SHOW CREATE VIEW on non privileged view
  
  "A SELECT privilege on a view is required for SHOW CREATE VIEW and it will stay
  that way because of compatibility reasons." (see #20136)
  
  a test case to illustrate how the ACLs work in this case (and ensure they will continue
  to do so in the future)

  mysql-test/r/grant.result@1.52.1.1, 2006-08-03 14:57:59+02:00, tnurnberg@mysql.com +75 -0
    Bug#20214: Incorrect error when user calls SHOW CREATE VIEW on non privileged view
    
    a test case to illustrate how the ACLs work in this case (and ensure they will continue
    to do so in the future)

  mysql-test/t/grant.test@1.41.1.1, 2006-08-03 14:57:59+02:00, tnurnberg@mysql.com +123 -0
    Bug#20214: Incorrect error when user calls SHOW CREATE VIEW on non privileged view
    
    a test case to illustrate how the ACLs work in this case (and ensure they will continue
    to do so in the future)

ChangeSet@1.2216.1.17, 2006-08-03 14:46:11+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#20892
    Correction of bug#19852 (that also revealed another bug)
    Do grow noOfPagesToGrow with more than was actually allocated

  ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp@1.3, 2006-08-03 14:46:09+02:00, jonas@perch.ndb.mysql.com +2 -2
    Dont grow "noOfPagesToGrow" with more than was actually allocated
      (as it will then grow indefinitly)

ChangeSet@1.1616.2709.6, 2006-08-03 14:01:37+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#20892
    Fix bug in tup buddy allocator, which made it make invalid access to cfreepagelist[16] (which is not defined)

  ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp@1.6, 2006-08-03 14:01:35+02:00, jonas@perch.ndb.mysql.com +17 -13
    loop from firstListToCheck -1 (as firstListToCheck has already been checked), when looking for less than requested pages
    add if-statement for firtListToCheck == 0

ChangeSet@1.1616.2715.2, 2006-08-03 12:16:24+02:00, msvensson@neptunus.(none) +1 -0
  Bug#21419 test case lowercase_fs_off fails on Windows
   - Backport patch from 5.0

  sql/mysqld.cc@1.356.98.27, 2006-08-03 12:16:20+02:00, msvensson@neptunus.(none) +5 -0
    Add else case to set "lower_case_file_system" also when lower_case_table_names are 1

ChangeSet@1.2216.5.9, 2006-08-03 12:09:22+02:00, msvensson@neptunus.(none) +2 -0
  Remove double error printout in mysqldump

  client/mysqldump.c@1.235.1.2, 2006-08-03 12:09:20+02:00, msvensson@neptunus.(none) +0 -2
    Remove double error printout, mysql_query_with_error_report will do that. And set the exit code for us.

  mysql-test/r/mysqldump.result@1.108, 2006-08-03 12:09:20+02:00, msvensson@neptunus.(none) +1 -1
    Update test result after merge

ChangeSet@1.1616.2713.1, 2006-08-03 14:03:08+05:00, svoj@may.pils.ru +3 -0
  BUG#7391 - Cross-database multi-table UPDATE uses active database
             privileges
  
  This problem is 4.1 specific. It doesn't affect 4.0 and was fixed
  in 5.x before.
  
  Having any mysql user who is allowed to issue multi table update
  statement and any column/table grants, allows this user to update
  any table on a server (mysql grant tables are not exception).
  
  check_grant() accepts number of tables (in table list) to be checked
  in 5-th param. While checking grants for multi table update, number
  of tables must be 1. It must never be 0 (actually we have
  DBUG_ASSERT(number > 0) in 5.x in grant_check() function).

  mysql-test/r/grant.result@1.21.1.21, 2006-08-03 14:03:05+05:00, svoj@may.pils.ru +5 -4
    Addition to test case for bug#7391:
    - Added grant statement to trigger this problem in 4.1.
    - Fixed error messages.

  mysql-test/t/grant.test@1.17.1.18, 2006-08-03 14:03:05+05:00, svoj@may.pils.ru +6 -4
    Addition to test case for bug#7391:
    - Added grant statement to trigger this problem in 4.1.
    - Fixed error messages.

  sql/sql_update.cc@1.83.2.73, 2006-08-03 14:03:05+05:00, svoj@may.pils.ru +1 -1
    check_grant() accepts number of tables (in table list) to be checked
    in 5-th param. For this particular check number of tables must be 1.
    It must never be 0 (actually we have DBUG_ASSERT(number > 0) in 5.x
    in grant_check() function).

ChangeSet@1.2216.3.8, 2006-08-03 09:48:42+02:00, msvensson@neptunus.(none) +1 -0
  Removing disabling of lowercase_fs_off

  mysql-test/t/disabled.def@1.33, 2006-08-03 09:48:40+02:00, msvensson@neptunus.(none) +0 -1
    Removing disabling of lowercase_fs_off

ChangeSet@1.2196.22.28, 2006-08-02 22:18:49-07:00, malff@weblab.(none) +7 -0
  Bug#8153 (Stored procedure with subquery and continue handler, wrong result)
  
  Before this fix,
  - a runtime error in a statement in a stored procedure with no error handlers
  was properly detected (as expected)
  - a runtime error in a statement with an error handler inherited from a non
  local runtime context (i.e., proc a with a handler, calling proc b) was
  properly detected (as expected)
  - a runtime error in a statement with a *local* error handler was executed
  as follows :
  a) the statement would succeed, regardless of the error condition, (bug)
  b) the error handler would be called (as expected).
  
  The root cause is that functions like my_messqge_sql would "forget" to set
  the thread flag thd->net.report_error to 1, because of the check involving
  sp_rcontext::found_handler_here().
  Failure to set this flag would cause, later in the call stack,
  in Item_func::fix_fields() at line 190, the code to return FALSE and consider
  that executing the statement was successful.
  
  With this fix :
  - error handling code, that was duplicated in different places in the code,
  is now implemented in sp_rcontext::handle_error(),
  - handle_error() correctly sets thd->net.report_error when a handler is
  present, regardless of the handler location (local, or in the call stack).
  
  A test case, bug8153_subselect, has been written to demonstrate the change
  of behavior before and after the fix.
  
  Another test case, bug8153_function_a, as also been writen.
  This test has the same behavior before and after the fix.
  This test has been written to demonstrate that the previous expected
  result of procedure bug18787, was incorrect, since select no_such_function()
  should fail and therefore not produce a result.
  
  The incorrect result for bug18787 has the same root cause as Bug#8153,
  and the expected result has been adjusted.

  mysql-test/r/sp.result@1.202.1.3, 2006-08-02 21:45:42-07:00, malff@weblab.(none) +60 -2
    Bug#8153, added test cases, fixed expected result of bug18787.

  mysql-test/t/sp.test@1.192.1.1, 2006-08-02 21:44:48-07:00, malff@weblab.(none) +62 -0
    Bug#8153, added test cases.

  sql/mysqld.cc@1.560.2.1, 2006-08-02 21:36:06-07:00, malff@weblab.(none) +1 -3
    Bug#8153, use sp_rcontext::handle_error() to handle errors.

  sql/protocol.cc@1.115, 2006-08-02 21:39:59-07:00, malff@weblab.(none) +7 -8
    Bug#8153, use sp_rcontext::handle_error() to handle errors.

  sql/sp_rcontext.cc@1.43, 2006-08-02 21:43:00-07:00, malff@weblab.(none) +59 -0
    Bug#8153, created helper sp_rcontext::handle_error() to handle errors.

  sql/sp_rcontext.h@1.33, 2006-08-02 21:41:51-07:00, malff@weblab.(none) +6 -0
    Bug#8153, created helper sp_rcontext::handle_error() to handle errors.

  sql/sql_error.cc@1.38, 2006-08-02 21:38:45-07:00, malff@weblab.(none) +1 -7
    Bug#8153, use sp_rcontext::handle_error() to handle errors.

ChangeSet@1.2216.5.7, 2006-08-02 22:21:12+04:00, kostja@bodhi.local +1 -0
  Disable a failing test case (filed a p1 bug)

  mysql-test/t/disabled.def@1.32, 2006-08-02 22:21:08+04:00, kostja@bodhi.local +1 -0
    Disable a failing test case (filed a p1 bug)

ChangeSet@1.1616.2707.3, 2006-08-02 13:06:59-04:00, cmiller@zippy.cornsilk.net +3 -0
  Bug#9719: DELETE with WHERE on HEAP table just deletes first row of matched
  set.
  
  (Ramil's patch, recreated.)

  heap/hp_delete.c@1.12.1.2, 2006-08-02 13:06:58-04:00, cmiller@zippy.cornsilk.net +3 -0
    Reset info->lastkey_len for further heap_rnext/heap_rprev calls.

  mysql-test/r/heap_btree.result@1.13.2.1, 2006-08-02 13:06:58-04:00, cmiller@zippy.cornsilk.net +35 -0
    Test for bug #9719: DELETE with WHERE on HEAP table just deletes first 
    row of matched set.

  mysql-test/t/heap_btree.test@1.12.1.2, 2006-08-02 13:06:58-04:00, cmiller@zippy.cornsilk.net +19 -1
    Test for bug #9719: DELETE with WHERE on HEAP table just deletes first 
    row of matched set.

ChangeSet@1.2216.5.5, 2006-08-02 19:39:47+04:00, kostja@bodhi.local +1 -0
  A post-merge fix.

  mysql-test/r/ps.result@1.71, 2006-08-02 19:39:43+04:00, kostja@bodhi.local +14 -71
    A post-merge fix.

ChangeSet@1.2196.70.1, 2006-08-02 17:15:50+05:00, svoj@may.pils.ru +16 -0
  BUG#14770 - LOAD DATA INFILE doesn't respect default values for
              columns
  Fixed confusing warning.
  
  Quoting INSERT section of the manual:
  ----
  Inserting NULL into a column that has been declared NOT NULL. For
  multiple-row INSERT statements or INSERT INTO ... SELECT statements, the
  column is set to the implicit default value for the column data type. This
  is 0 for numeric types, the empty string ('') for string types, and the
  "zero" value for date and time types. INSERT INTO ... SELECT statements are
  handled the same way as multiple-row inserts because the server does not
  examine the result set from the SELECT to see whether it returns a single
  row. (For a single-row INSERT, no warning occurs when NULL is inserted into
  a NOT NULL column. Instead, the statement fails with an error.)
  ----
  This is also true for LOAD DATA INFILE. For INSERT user can specify
  DEFAULT keyword as a value to set column default. There is no similiar
  feature available for LOAD DATA INFILE.

  mysql-test/r/auto_increment.result@1.39, 2006-08-02 17:15:46+05:00, svoj@may.pils.ru +2 -2
    Fixed confusing warning.

  mysql-test/r/create.result@1.118.1.1, 2006-08-02 17:15:46+05:00, svoj@may.pils.ru +1 -1
    Fixed confusing warning.

  mysql-test/r/insert.result@1.25, 2006-08-02 17:15:46+05:00, svoj@may.pils.ru +1 -1
    Fixed confusing warning.

  mysql-test/r/insert_select.result@1.38.1.1, 2006-08-02 17:15:46+05:00, svoj@may.pils.ru +2 -2
    Fixed confusing warning.

  mysql-test/r/key.result@1.35, 2006-08-02 17:15:46+05:00, svoj@may.pils.ru +2 -2
    Fixed confusing warning.

  mysql-test/r/null.result@1.35, 2006-08-02 17:15:46+05:00, svoj@may.pils.ru +9 -9
    Fixed confusing warning.

  mysql-test/r/null_key.result@1.36, 2006-08-02 17:15:47+05:00, svoj@may.pils.ru +1 -1
    Fixed confusing warning.

  mysql-test/r/ps_2myisam.result@1.40.1.1, 2006-08-02 17:15:47+05:00, svoj@may.pils.ru +1 -1
    Fixed confusing warning.

  mysql-test/r/ps_3innodb.result@1.43.1.1, 2006-08-02 17:15:47+05:00, svoj@may.pils.ru +1 -1
    Fixed confusing warning.

  mysql-test/r/ps_4heap.result@1.39.1.1, 2006-08-02 17:15:47+05:00, svoj@may.pils.ru +1 -1
    Fixed confusing warning.

  mysql-test/r/ps_5merge.result@1.40.1.1, 2006-08-02 17:15:47+05:00, svoj@may.pils.ru +2 -2
    Fixed confusing warning.

  mysql-test/r/ps_6bdb.result@1.42.1.1, 2006-08-02 17:15:47+05:00, svoj@may.pils.ru +1 -1
    Fixed confusing warning.

  mysql-test/r/strict.result@1.27.1.1, 2006-08-02 17:15:47+05:00, svoj@may.pils.ru +9 -9
    Fixed confusing warning.

  mysql-test/r/view.result@1.162.1.1, 2006-08-02 17:15:47+05:00, svoj@may.pils.ru +1 -1
    Fixed confusing warning.

  mysql-test/r/warnings.result@1.35.2.1, 2006-08-02 17:15:47+05:00, svoj@may.pils.ru +4 -4
    Fixed confusing warning.

  sql/share/errmsg.txt@1.64.2.1, 2006-08-02 17:15:47+05:00, svoj@may.pils.ru +2 -2
    Fixed confusing warning.

ChangeSet@1.2216.6.1, 2006-08-02 13:25:13+04:00, kostja@bodhi.local +1 -0
  Fix a compilation failiure on QNX

  sql/udf_example.c@1.29, 2006-08-02 13:25:11+04:00, kostja@bodhi.local +1 -1
    Declare tmp_error at the beginning of the block (this is C now)

ChangeSet@1.2216.5.2, 2006-08-02 10:00:28+02:00, georg@lmy002.wdf.sap.corp +2 -0
  Bug #21396: Wrong error number generated for a missing table

  BitKeeper/etc/collapsed@1.1, 2006-08-02 08:59:47+02:00, georg@lmy002.wdf.sap.corp +1 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-5.0/BitKeeper/etc/collapsed

  BitKeeper/etc/collapsed@1.0, 2006-08-02 08:59:46+02:00, georg@lmy002.wdf.sap.corp +0 -0

  mysys/my_open.c@1.26, 2006-08-02 10:00:23+02:00, georg@lmy002.wdf.sap.corp +2 -2
    Win64 bit fix: Replacing 32-bit value (0xFFFFFFFF) by a generic error constant.

ChangeSet@1.1616.2709.5, 2006-08-02 09:08:21+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    Make possible to build both debug/release from compile-ndb-autotest

  BUILD/compile-ndb-autotest@1.2, 2006-08-02 09:08:20+02:00, jonas@perch.ndb.mysql.com +12 -2
    Make possible to build both debug/release from compile-ndb-autotest

ChangeSet@1.2216.3.3, 2006-08-02 08:46:58+02:00, msvensson@neptunus.(none) +2 -0
  Disable test case for for bug 21042

  mysql-test/r/mysql.result@1.11.1.2, 2006-08-02 08:46:56+02:00, msvensson@neptunus.(none) +0 -1
    Disable test case for for bug 21042

  mysql-test/t/mysql.test@1.11.1.2, 2006-08-02 08:46:56+02:00, msvensson@neptunus.(none) +2 -0
    Disable test case for for bug 21042

ChangeSet@1.2196.44.6, 2006-08-02 11:26:08+09:30, grog@eucla.lemis.com +3 -0
  BUG#13926: --order-by-primary fails if PKEY contains quote character.
  Quote PKEY.

  client/mysqldump.c@1.234.3.2, 2006-08-02 11:12:42+09:30, grog@eucla.lemis.com +12 -4
    Fix for BUG#13926: --order-by-primary fails if PKEY contains quote character.
    Quote PKEY.

  mysql-test/r/mysqldump.result@1.103.2.1, 2006-08-02 11:12:07+09:30, grog@eucla.lemis.com +71 -0
    Test results for BUG#13926: --order-by-primary fails if PKEY contains quote character

  mysql-test/t/mysqldump.test@1.96.2.1, 2006-08-02 11:11:25+09:30, grog@eucla.lemis.com +20 -0
    Test for BUG#13926: --order-by-primary fails if PKEY contains quote character

ChangeSet@1.2196.44.5, 2006-08-02 10:48:47+09:30, grog@eucla.lemis.com +1 -0
  mysqldump.c:
    Tidy up style: no space before = or +=.

  client/mysqldump.c@1.234.3.1, 2006-08-02 10:47:59+09:30, grog@eucla.lemis.com +47 -47
    Tidy up style: no space before = or +=.

ChangeSet@1.2216.5.1, 2006-08-02 02:21:36+02:00, tsmith@maint1.mysql.com +1 -0
  .del-sp.test.orig:
    Delete: mysql-test/t/sp.test.orig

  BitKeeper/deleted/.del-sp.test.orig@1.2, 2006-08-01 22:41:11+02:00, tsmith@maint1.mysql.com +0 -0
    Delete: mysql-test/t/sp.test.orig

ChangeSet@1.2216.4.2, 2006-08-02 00:04:58+02:00, kent@mysql.com +1 -0
  mysql.sln:
    Use separate ID for mysqlimport and mysql_upgrade

  VC++Files/mysql.sln@1.12, 2006-08-02 00:04:10+02:00, kent@mysql.com +28 -1
    Use separate ID for mysqlimport and mysql_upgrade

ChangeSet@1.2216.4.1, 2006-08-01 21:59:58+02:00, tsmith@maint1.mysql.com +3 -0
  Applied innodb-5.0-ss677 snapshot.
  
  Fixes:
  - bug #19834: Using cursors when running in READ-COMMITTED can cause InnoDB to crash
  - bug #21112: InnoDB slow with > 100,000 .ibd files
  - bug #21113: Duplicate printout in SHOW INNODB STATUS

  innobase/fil/fil0fil.c@1.65, 2006-08-01 21:37:59+02:00, tsmith@maint1.mysql.com +9 -6
    Applied innodb-5.0-ss677 snapshot.
      Make the tablespace cache hash size 100 or 1000 times bigger. Fixes bug #21112.

  innobase/ibuf/ibuf0ibuf.c@1.44, 2006-08-01 21:39:14+02:00, tsmith@maint1.mysql.com +2 -14
    Applied innodb-5.0-ss677 snapshot.
      ibuf_print(): Don't print redundant information. Fixes bug #21113.

  sql/ha_innodb.cc@1.297, 2006-08-01 21:39:38+02:00, tsmith@maint1.mysql.com +9 -17
    Applied innodb-5.0-ss677 snapshot.
      ha_innobase::start_stmt(): patch from Heikki:
      Do not call read_view_close_for_mysql().  (Bug #19834)

ChangeSet@1.2196.64.11, 2006-08-01 20:20:46+02:00, msvensson@shellback.(none) +6 -0
  Import latest version of yaSSL

  extra/yassl/COPYING@1.1, 2006-03-29 01:56:33+02:00, msvensson@shellback.(none) +340 -0
    Import patch yassl.diff

  extra/yassl/COPYING@1.0, 2006-03-29 01:56:33+02:00, msvensson@shellback.(none) +0 -0

  extra/yassl/include/yassl_imp.hpp@1.5, 2006-07-20 01:32:17+02:00, msvensson@shellback.(none) +1 -0
    Import patch yassl.diff

  extra/yassl/src/yassl_imp.cpp@1.10, 2006-07-20 01:32:17+02:00, msvensson@shellback.(none) +5 -1
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp@1.21, 2006-07-20 01:32:17+02:00, msvensson@shellback.(none) +3 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/asn.hpp@1.7.1.1, 2006-08-01 20:17:26+02:00, msvensson@shellback.(none) +4 -4
    Import patch yassl.diff

  extra/yassl/taocrypt/src/asn.cpp@1.8.1.1, 2006-08-01 20:17:26+02:00, msvensson@shellback.(none) +1 -1
    Import patch yassl.diff

ChangeSet@1.2196.34.7, 2006-08-01 09:36:34-07:00, acurtis@xiphis.org +1 -0
  Bug#15669
    "Test case 'csv' produces incorrect result on OpenBSD"
    mmapped pages were not being invalidated when writes occurred to the
    file vi a fd i/o operation. 
    Force explicit invalidation and not rely on implicit invalidation.

  sql/examples/ha_tina.cc@1.22.1.1, 2006-08-01 09:36:30-07:00, acurtis@xiphis.org +56 -8
    Bug#15669
      Make sure to invalidate in memory pages when the file has been 
      altered by fd i/o.
      This is important to some operating systems, such as OpenBSD.

ChangeSet@1.2123.1.12, 2006-08-01 17:03:17+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - fix error message

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.49.2.2, 2006-08-01 17:03:16+02:00, jonas@perch.ndb.mysql.com +2 -1
    Fix printout

ChangeSet@1.1616.2548.14, 2006-08-01 16:55:41+02:00, jonas@perch.ndb.mysql.com +5 -0
  ndb - bug#21384
    handle error in TCKEYREQ during TCINDXREQ better

  ndb/src/kernel/blocks/ERROR_codes.txt@1.8.2.1, 2006-08-01 16:55:40+02:00, jonas@perch.ndb.mysql.com +2 -1
    new error code

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp@1.18.1.7, 2006-08-01 16:55:40+02:00, jonas@perch.ndb.mysql.com +2 -2
    Add 3 values to isIndexOp

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.42.1.26, 2006-08-01 16:55:40+02:00, jonas@perch.ndb.mysql.com +131 -28
    handle error in TCKEYREQ during TCINDXREQ

  ndb/test/ndbapi/testIndex.cpp@1.12.1.2, 2006-08-01 16:55:40+02:00, jonas@perch.ndb.mysql.com +52 -0
    Add testcase

  ndb/test/run-test/daily-basic-tests.txt@1.13.3.1, 2006-08-01 16:55:40+02:00, jonas@perch.ndb.mysql.com +4 -0
    Add testcase

ChangeSet@1.2196.69.1, 2006-08-01 15:21:09+02:00, msvensson@neptunus.(none) +1 -0
  Add missing $

  mysql-test/mysql-test-run.pl@1.107, 2006-08-01 15:21:08+02:00, msvensson@neptunus.(none) +1 -1
    Add missing $

ChangeSet@1.1616.2708.2, 2006-08-01 15:18:21+05:00, holyfoot@mysql.com +1 -0
  bug #13717 embedded library dumps warnings on STDERR directly
  
  Here i just disabled STDERR warnings in embedded server
  Later we should get more defined about logs in the embedded server

  sql/log.cc@1.108.1.57, 2006-08-01 15:18:18+05:00, holyfoot@mysql.com +7 -0
    Log messages muted in embedded server

ChangeSet@1.2196.64.8, 2006-08-01 11:35:37+02:00, msvensson@neptunus.(none) +1 -0
  Bug#21367 IM tests do not recognize "win2003-amd64" as Windows
   - Disable Instance manager on Windows

  mysql-test/mysql-test-run.pl@1.106, 2006-08-01 11:35:35+02:00, msvensson@neptunus.(none) +7 -0
    Disable Instance manager on Windows.

ChangeSet@1.2196.64.7, 2006-08-01 11:29:10+02:00, msvensson@neptunus.(none) +2 -0
  Change error code to test for "unknown error" with to 10000

  mysql-test/r/perror.result@1.4, 2006-08-01 11:29:08+02:00, msvensson@neptunus.(none) +1 -1
    Change error code to test for "unknown error" with to 10000

  mysql-test/t/perror.test@1.5, 2006-08-01 11:29:08+02:00, msvensson@neptunus.(none) +3 -2
    Change error code to test for "unknown error" with to 10000

ChangeSet@1.2205.14.1, 2006-08-01 11:05:54+03:00, gkodinov@macbook.gmz +3 -0
  Bug #20103: Escaping with backslash does not work
   - make the client to respect the server-side 
     no_backslash_escapes option and disable the 
     special meaning of backslash also at client side.

  mysql-test/r/mysql_client.result@1.1.1.1, 2006-08-01 11:05:48+03:00, gkodinov@macbook.gmz +4 -0
    Bug #20103: Escaping with backslash does not work
     - test case

  mysql-test/t/mysql_client.test@1.1.1.1, 2006-08-01 11:05:48+03:00, gkodinov@macbook.gmz +11 -0
    Bug #20103: Escaping with backslash does not work
     - test case

  client/mysql.cc@1.208.2.2, 2006-08-01 11:05:47+03:00, gkodinov@macbook.gmz +2 -1
    Bug #20103: Escaping with backslash does not work
     - make the client to respect the server-side 
       no_backslash_escapes option and disable the 
       special meaning of backslash also at client side.

ChangeSet@1.2205.1.18, 2006-07-31 23:05:54+04:00, evgen@moonbone.local +3 -0
  select.result, func_group.result, sql_select.cc:
    After merge fix

  mysql-test/r/func_group.result@1.46.1.8, 2006-07-31 22:09:00+04:00, evgen@moonbone.local +0 -138
    After merge fix

  mysql-test/r/select.result@1.137, 2006-07-31 22:08:32+04:00, evgen@moonbone.local +49 -49
    After merge fix

  sql/sql_select.cc@1.434.1.8, 2006-07-31 22:09:25+04:00, evgen@moonbone.local +2 -1
    After merge fix

ChangeSet@1.2196.67.1, 2006-07-31 12:01:43-07:00, malff@weblab.(none) +3 -0
  Bug#21269 (DEFINER-clause is allowed for UDF-functions)
  
  The problem was that the grammar allows to create a function with an optional
  definer clause, and define it as a UDF with the SONAME keyword.
  Such combination should be reported as an error.
  
  The solution is to not change the grammar itself, and to introduce a
  specific check in the yacc actions in 'create_function_tail' for UDF,
  that now reports ER_WRONG_USAGE when using both DEFINER and SONAME.

  mysql-test/r/udf.result@1.5.1.1, 2006-07-31 12:01:42-07:00, malff@weblab.(none) +6 -0
    Added tests for Bug#21269 (DEFINER-clause is allowed for UDF-functions)

  mysql-test/t/udf.test@1.5.2.1, 2006-07-31 12:01:42-07:00, malff@weblab.(none) +12 -0
    Added tests for Bug#21269 (DEFINER-clause is allowed for UDF-functions)

  sql/sql_yacc.yy@1.474.2.3, 2006-07-31 12:01:42-07:00, malff@weblab.(none) +11 -0
    Creating a UDF function with a DEFINER clause is now a syntax error.

ChangeSet@1.2205.13.1, 2006-07-31 20:56:06+03:00, gkodinov@macbook.gmz +3 -0
  Bug #11551: Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLE
   
  made DROP VIEW to continue on error and report an aggregated error 
   at its end. This makes it similar to DROP TABLE.

  mysql-test/r/view.result@1.167.1.1, 2006-07-31 20:56:00+03:00, gkodinov@macbook.gmz +20 -1
    Bug #11551: Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLE
     - test case
     - changed error message

  mysql-test/t/view.test@1.152.1.1, 2006-07-31 20:56:01+03:00, gkodinov@macbook.gmz +21 -0
    Bug #11551: Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLE
     - test case

  sql/sql_view.cc@1.89.3.1, 2006-07-31 20:56:01+03:00, gkodinov@macbook.gmz +38 -13
    Bug #11551: Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLE
     - made DROP VIEW to continue on error and report an aggregated error

ChangeSet@1.2205.11.1, 2006-07-31 17:33:37+03:00, gkodinov@macbook.gmz +6 -0
  Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
    When executing ALTER TABLE all the attributes of the view were overwritten.
    This is contrary to the user's expectations.
    So some of the view attributes are preserved now : namely security and 
    algorithm. This means that if they are not specified in ALTER VIEW
    their values are preserved from CREATE VIEW instead of being defaulted.

  mysql-test/r/view.result@1.166.1.1, 2006-07-31 17:33:29+03:00, gkodinov@macbook.gmz +11 -0
    Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
     - test suite

  mysql-test/t/view.test@1.151.1.1, 2006-07-31 17:33:30+03:00, gkodinov@macbook.gmz +13 -0
    Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
     - test suite

  sql/sql_lex.h@1.222.1.1, 2006-07-31 17:33:30+03:00, gkodinov@macbook.gmz +1 -1
    Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
     - must make create_view_suid a tristate : on/off/unspecified

  sql/sql_view.cc@1.89.2.1, 2006-07-31 17:33:31+03:00, gkodinov@macbook.gmz +56 -0
    Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
     - open the view to get it's attributes and put then as defaults 
       for ALTER VIEW

  sql/sql_yacc.yy@1.474.1.2, 2006-07-31 17:33:31+03:00, gkodinov@macbook.gmz +3 -3
    Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
     - must make create_view_suid a tristate : on/off/unspecified

  sql/table.h@1.129.2.1, 2006-07-31 17:33:32+03:00, gkodinov@macbook.gmz +4 -0
    Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
     - must make create_view_suid a tristate : on/off/unspecified

ChangeSet@1.2196.64.5, 2006-07-31 14:22:32+02:00, msvensson@neptunus.(none) +3 -0
  Bug#21042 mysql client segfaults on importing a mysqldump export
   - Use strmake, that will both protect the buffer and make sure it's terminated by a zero
   - Add test case

  client/mysql.cc@1.208.1.3, 2006-07-31 14:22:30+02:00, msvensson@neptunus.(none) +1 -1
    Use strmake instead of strxnmov as that function will make sure the string is terminated by 0

  mysql-test/r/mysql.result@1.10.1.2, 2006-07-31 14:22:30+02:00, msvensson@neptunus.(none) +1 -0
    Update test result

  mysql-test/t/mysql.test@1.10.1.2, 2006-07-31 14:22:30+02:00, msvensson@neptunus.(none) +6 -0
    Add test case

ChangeSet@1.2196.64.3, 2006-07-31 13:11:21+02:00, msvensson@neptunus.(none) +4 -0
  perror returns 2 if it does not understand the option --ndb
  Move that perror test to ndb_basic so it's only run when there is support for --ndb

  mysql-test/r/ndb_basic.result@1.35, 2006-07-31 13:11:19+02:00, msvensson@neptunus.(none) +1 -0
    Move test of "perror --ndb" to this file

  mysql-test/r/perror.result@1.3, 2006-07-31 13:11:19+02:00, msvensson@neptunus.(none) +0 -1
    Move test of "perror --ndb" to ndb_basic

  mysql-test/t/ndb_basic.test@1.36, 2006-07-31 13:11:19+02:00, msvensson@neptunus.(none) +10 -0
    Move test of "perror --ndb" to this file

  mysql-test/t/perror.test@1.4, 2006-07-31 13:11:19+02:00, msvensson@neptunus.(none) +0 -5
    Move test of "perror --ndb" to ndb_basic

ChangeSet@1.2196.64.2, 2006-07-31 12:47:56+02:00, msvensson@neptunus.(none) +1 -0
  Fix lowercase_fs_off problem on windows. This test should not be run if lower_case_filesystem=OFF. 
  By default lowercase_table_names are 1 on windows, and that makes the initialization of lower_case_filesystem variable to be skipped.
  Add an else bracnh that does the initialization.

  sql/mysqld.cc@1.560.1.1, 2006-07-31 12:47:53+02:00, msvensson@neptunus.(none) +5 -0
    Intialize the "lowercase_filesystem" variable also when "lowercase_table_names" is 1

ChangeSet@1.2221, 2006-07-31 12:47:01+05:00, bar@mysql.com +3 -0
  N'xxx' and _utf8'xxx' are not equivalent
  Problem: Unescaping of '\' characters didn't work when processing N'xxx'.
  Fix: using get_text() instead of get_token() when scanning nationa strings.

  mysql-test/r/ctype_utf8.result@1.93, 2006-07-31 12:46:56+05:00, bar@mysql.com +12 -0
    Adding test case

  mysql-test/t/ctype_utf8.test@1.86, 2006-07-31 12:46:56+05:00, bar@mysql.com +11 -0
    Adding test case

  sql/sql_lex.cc@1.190.1.3, 2006-07-31 12:46:56+05:00, bar@mysql.com +9 -12
    Fixing to process national strings using get_tex(),
    i.e. the same way with usual strings, to make
    unescaping work.

ChangeSet@1.1616.2705.1, 2006-07-30 19:30:20+02:00, msvensson@shellback.(none) +1 -0
  BUG#21217 "mysqltest" client is inconsistent when to log a line number
   - Init start_lineno to 0

  client/mysqltest.c@1.92.21.1, 2006-07-30 19:30:17+02:00, msvensson@shellback.(none) +4 -2
    Init start_lineno to 0 and set it back to zero before comparing result file.

ChangeSet@1.2183.28.10, 2006-07-30 06:19:30+02:00, ingo@chilla.local +1 -0
  Bug#20719 - Reading dynamic records with write buffer could fail
  After merge fix

  myisam/mi_dynrec.c@1.39.1.4, 2006-07-30 06:19:27+02:00, ingo@chilla.local +0 -3
    Bug#20719 - Reading dynamic records with write buffer could fail
    After merge fix

ChangeSet@1.1616.2674.4, 2006-07-29 21:58:50+02:00, ingo@chilla.local +1 -0
  Bug#20719 - Reading dynamic records with write buffer could fail
  After merge fix

  myisam/mi_dynrec.c@1.36.2.2, 2006-07-29 21:58:48+02:00, ingo@chilla.local +3 -0
    Bug#20719 - Reading dynamic records with write buffer could fail
    After merge fix

ChangeSet@1.1346.1.846, 2006-07-29 17:24:48+02:00, kent@mysql.com +1 -0
  configure.in:
    Corrected typo

  configure.in@1.191.1.147, 2006-07-29 17:23:58+02:00, kent@mysql.com +1 -1
    Corrected typo

ChangeSet@1.2216.1.8, 2006-07-29 13:50:08+04:00, kroki@moonlight.intranet +2 -0
  Fix after manual merge.

  mysys/my_bitmap.c@1.34, 2006-07-29 13:50:05+04:00, kroki@moonlight.intranet +1 -1
    Fix after manual merge.

  tests/mysql_client_test.c@1.194, 2006-07-29 13:50:05+04:00, kroki@moonlight.intranet +44 -0
    Fix after manual merge: add test for bug#21206.

ChangeSet@1.2196.65.2, 2006-07-28 20:51:17-07:00, igreenhoe@anubis.greendragongames.com +3 -0
  Fix for bug #16226 (timestamp_diff truncation issue when requesting
  difference between timestamp in values of months and quarters.)
  
  Problem:  when requesting timestamp diff in months or quarters, it
  would only examine the date (and not the time) for the comparison.
  
  Solution:  increased precision of comparison.

  mysql-test/r/func_time.result@1.61.1.1, 2006-07-28 20:51:14-07:00, igreenhoe@anubis.greendragongames.com +72 -0
    Additional test results

  mysql-test/t/func_time.test@1.49.1.1, 2006-07-28 20:51:14-07:00, igreenhoe@anubis.greendragongames.com +31 -0
    Additional tests

  sql/item_timefunc.cc@1.119.1.1, 2006-07-28 20:51:14-07:00, igreenhoe@anubis.greendragongames.com +15 -0
    Fix for timestamp diff issue.  Added microsecond precision when
    comparing months or quarters; previously only examined date for
    these comparisons.

ChangeSet@1.2216.1.6, 2006-07-29 04:41:50+02:00, kent@mysql.com +3 -0
  udf_example.c, udf.test, Makefile.am:
    Converted "udf_example.cc" to C, avoids C++ runtime lib dependency (bug#21336)

  mysql-test/t/udf.test@1.5.1.1, 2006-07-29 03:43:46+02:00, kent@mysql.com +1 -1
    "udf_example.cc" converted to C, avoids C++ runtime lib dependency (bug#21336)

  sql/Makefile.am@1.119, 2006-07-29 03:43:45+02:00, kent@mysql.com +2 -2
    "udf_example.cc" converted to C, avoids C++ runtime lib dependency (bug#21336)

  sql/udf_example.c@1.28, 2006-07-29 04:37:31+02:00, kent@mysql.com +70 -50
    Changes to be strict ansi, except long long

  sql/udf_example.c@1.27, 2006-07-29 03:51:22+02:00, kent@mysql.com +5 -1
    Added error handling to new malloc() call

  sql/udf_example.c@1.26, 2006-07-29 03:45:25+02:00, kent@mysql.com +16 -17
    "udf_example.cc" converted to C, avoids C++ runtime lib dependency (bug#21336)

  sql/udf_example.c@1.25, 2006-07-29 03:44:02+02:00, kent@mysql.com +0 -0
    Rename: sql/udf_example.cc -> sql/udf_example.c

ChangeSet@1.1346.1.845, 2006-07-28 23:12:40+02:00, kent@mysql.com +2 -0
  Makefile.am, configure.in:
    Man page for mysqld command move to section 8 (bug#21220)

  configure.in@1.191.1.146, 2006-07-28 23:10:45+02:00, kent@mysql.com +4 -0
    Man page for mysqld command move to section 8 (bug#21220)

  man/Makefile.am@1.9.1.2, 2006-07-28 23:10:45+02:00, kent@mysql.com +2 -1
    Man page for mysqld command move to section 8 (bug#21220)

ChangeSet@1.1346.1.844, 2006-07-28 23:06:49+02:00, kent@mysql.com +1 -0
  make_binary_distribution.sh:
    Man page for "mysqld" command move to section 8 (bug#21220)

  scripts/make_binary_distribution.sh@1.49.1.15, 2006-07-28 23:05:44+02:00, kent@mysql.com +2 -2
    Man page for "mysqld" command move to section 8 (bug#21220)

ChangeSet@1.1346.1.843, 2006-07-28 22:57:57+02:00, kent@mysql.com +1 -0
  mysql.spec.sh:
    Man page for "mysqld" command move to section 8 (bug#21220)

  support-files/mysql.spec.sh@1.61.1.37, 2006-07-28 22:57:10+02:00, kent@mysql.com +1 -1
    Man page for "mysqld" command move to section 8 (bug#21220)

ChangeSet@1.2212.1.1, 2006-07-28 21:26:46+02:00, kent@mysql.com +3 -0
  sql_select.cc:
    Renamed variable, to avoid name clash with macro "rem_size"
    on AIX 5.3 and "/usr/include/sys/xmem.h" (bug#17648)
  asn.cpp, asn.hpp:
    Avoid name clash with NAME_MAX

  extra/yassl/taocrypt/include/asn.hpp@1.8, 2006-07-27 14:22:26+02:00, kent@mysql.com +4 -4
    Avoid name clash with NAME_MAX

  extra/yassl/taocrypt/src/asn.cpp@1.9, 2006-07-27 14:22:25+02:00, kent@mysql.com +1 -1
    Avoid name clash with NAME_MAX

  sql/sql_select.cc@1.435, 2006-07-19 18:45:23+02:00, kent@mysql.com +4 -4
    Renamed variable, to avoid name clash with macro "rem_size"
    on AIX 5.3 and "/usr/include/sys/xmem.h" (bug#17648)

ChangeSet@1.2196.66.1, 2006-07-28 15:06:23+04:00, kroki@moonlight.intranet +4 -0
  Bug#16581: deadlock: server and client both read from connection in
             'conc_sys' test
  
  Concurrent execution of SELECT involing at least two INFORMATION_SCHEMA
  tables, DROP DATABASE statement and DROP TABLE statement could have
  resulted in stalled connection for this SELECT statement.
  
  The problem was that for the first query of a join there was a race
  between select from I_S.TABLES and DROP DATABASE, and the error (no
  such database) was prepared to be send to the client, but the join
  processing was continued.  On second query to I_S.COLUMNS there was a
  race with DROP TABLE, but this error (no such table) was downgraded to
  warning, and thd->net.report_error was reset.  And so neither result
  nor error was sent to the client.
  
  The solution is to stop join processing once it is clear we are going
  to report a error, and also to downgrade to warnings file system errors
  like 'no such database' (unless we are in the 'SHOW' command), because
  I_S is designed not to use locks and the query to I_S should not abort
  if something is dropped in the middle.
  
  No test case is provided since this bug is a result of a race, and is
  timing dependant.  But we test that plain SHOW TABLES and SHOW COLUMNS
  give a error if there is no such database or a table respectively.

  mysql-test/r/show_check.result@1.78, 2006-07-28 15:06:20+04:00, kroki@moonlight.intranet +4 -0
    Add result for the test that SHOW TABLES and SHOW COLUMNS give a error
    if there is no such database or a table respectively.

  mysql-test/t/show_check.test@1.58, 2006-07-28 15:06:20+04:00, kroki@moonlight.intranet +11 -0
    Add test case that SHOW TABLES and SHOW COLUMNS give a error
    if there is no such database or a table respectively.

  sql/mysql_priv.h@1.398.3.1, 2006-07-28 15:06:21+04:00, kroki@moonlight.intranet +0 -2
    Remove prototype of mysql_find_files(), which is made static under
    find_files() name.

  sql/sql_show.cc@1.323.3.1, 2006-07-28 15:06:21+04:00, kroki@moonlight.intranet +66 -15
    Rename mysql_find_files() to find_files() and make it static.
    Return FIND_FILES_OK for success, FIND_FILES_OOM for out of memory,
    and FIND_FILES_DIR for directory reading error.
    Downgrade error to warning in get_all_tables() if it is a
    FIND_FILES_DIR error, and we are not in the 'SHOW' command.
    Once 'result' is set to 1 in get_schema_tables_result(), there's no
    need in continuing iterations, as we are about to return a error.

ChangeSet@1.2183.36.4, 2006-07-28 05:34:59+04:00, aivanov@mysql.com +2 -0
  Removing temporary changes.

  extra/yassl/src/ssl.cpp@1.16.1.2, 2006-07-28 05:34:56+04:00, aivanov@mysql.com +1 -1
    Removing temporary changes.

  mysql-test/t/rpl_openssl.test@1.17, 2006-07-28 05:34:56+04:00, aivanov@mysql.com +1 -1
    Removing temporary changes.

ChangeSet@1.2183.36.3, 2006-07-28 03:32:39+04:00, aivanov@mysql.com +2 -0
  Temporary changes just to check some points (will be restored).

  extra/yassl/src/ssl.cpp@1.16.1.1, 2006-07-28 03:32:36+04:00, aivanov@mysql.com +1 -1
    Temporary changes just to check some points (will be restored).

  mysql-test/t/rpl_openssl.test@1.16, 2006-07-28 03:32:36+04:00, aivanov@mysql.com +1 -1
    Temporary changes just to check some points (will be restored).

ChangeSet@1.2196.22.25, 2006-07-28 02:49:18+04:00, anozdrin@booka. +12 -0
  Fix for BUG#20438: CREATE statements for views, stored routines and triggers
  can be not replicable.
  
  Now CREATE statements for writing in the binlog are created as follows:
    - the beginning of the statement is re-created;
    - the rest of the statement is copied from the original query.
  
  The problem appears when there is a version-specific comment (produced by
  mysqldump), started in the re-created part of the statement and closed in the
  copied part -- there is closing comment-parenthesis, but there is no opening
  one.
  
  The proper fix could be to re-create original statement, but we can not
  implement it in 5.0. So, for 5.0 the fix is just to cut closing
  comment-parenthesis. This technique is also used for SHOW CREATE PROCEDURE
  statement (so we are able to reuse existing code).

  mysql-test/r/rpl_sp.result@1.18, 2006-07-28 02:49:11+04:00, anozdrin@booka. +44 -0
    Updated result file.

  mysql-test/r/rpl_trigger.result@1.9, 2006-07-28 02:49:11+04:00, anozdrin@booka. +47 -0
    Updated result file.

  mysql-test/r/rpl_view.result@1.5, 2006-07-28 02:49:11+04:00, anozdrin@booka. +37 -0
    Updated result file.

  mysql-test/t/rpl_sp.test@1.13, 2006-07-28 02:49:11+04:00, anozdrin@booka. +80 -0
    Added test case for BUG#20438.

  mysql-test/t/rpl_trigger.test@1.8, 2006-07-28 02:49:11+04:00, anozdrin@booka. +92 -0
    Added test case for BUG#20438.

  mysql-test/t/rpl_view.test@1.4, 2006-07-28 02:49:11+04:00, anozdrin@booka. +84 -0
    Added test case for BUG#20438.

  sql/sp.cc@1.113.1.2, 2006-07-28 02:49:11+04:00, anozdrin@booka. +4 -1
    Trim comments at the end.

  sql/sp_head.cc@1.221, 2006-07-28 02:49:11+04:00, anozdrin@booka. +1 -4
    Moved this code to the separate function to be re-used.

  sql/sql_lex.cc@1.193, 2006-07-28 02:49:12+04:00, anozdrin@booka. +24 -0
    Added a new function.

  sql/sql_lex.h@1.223, 2006-07-28 02:49:12+04:00, anozdrin@booka. +1 -1
    Added a new function.

  sql/sql_trigger.cc@1.54, 2006-07-28 02:49:12+04:00, anozdrin@booka. +4 -1
    Trim comments at the end.

  sql/sql_view.cc@1.89.1.1, 2006-07-28 02:49:12+04:00, anozdrin@booka. +4 -2
    Trim comments at the end.

ChangeSet@1.2196.22.24, 2006-07-27 17:57:43+04:00, anozdrin@booka. +11 -0
  Fix for BUG#16211: Stored function return type for strings is ignored.
  Fix for BUG#16676: Database CHARSET not used for stored procedures
  
  The problem in BUG#16211 is that CHARSET-clause of the return type for
  stored functions is just ignored.
  
  The problem in BUG#16676 is that if character set is not explicitly
  specified for sp-variable, the server character set is used instead
  of the database one.
  
  The fix has two parts:
  
    - always store CHARSET-clause of the return type along with the
      type definition in mysql.proc.returns column. "Always" means that
      CHARSET-clause is appended even if it has not been explicitly
      specified in CREATE FUNCTION statement (this affects BUG#16211 only).
  
      Storing CHARSET-clause if it is not specified is essential to avoid
      changing character set if the database character set is altered in
      the future.
  
      NOTE: this change is not backward compatible with the previous releases.
  
    - use database default character set if CHARSET-clause is not explicitly
      specified (this affects both BUG#16211 and BUG#16676).
  
      NOTE: this also breaks backward compatibility.

  mysql-test/r/mysqldump.result@1.100.3.1, 2006-07-27 17:57:38+04:00, anozdrin@booka. +1 -1
    Updated result file.

  mysql-test/r/sp.result@1.202.1.2, 2006-07-27 17:57:39+04:00, anozdrin@booka. +153 -0
    Updated result file.

  mysql-test/t/sp.test@1.192, 2006-07-27 17:57:39+04:00, anozdrin@booka. +158 -0
    Provided test cases for BUG#16211, BUG#16676.

  sql/mysql_priv.h@1.398.2.1, 2006-07-27 17:57:39+04:00, anozdrin@booka. +3 -0
    Added two convenient functions for work with databases.

  sql/sp.cc@1.113.1.1, 2006-07-27 17:57:39+04:00, anozdrin@booka. +12 -0
    1. Add CHARSET-clause to CREATE-statement if it has been explicitly specified.
    2. Polishing -- provided some comments.

  sql/sp_head.cc@1.220, 2006-07-27 17:57:39+04:00, anozdrin@booka. +35 -18
    Use database charset as default charset of sp-variable.

  sql/sp_head.h@1.87, 2006-07-27 17:57:39+04:00, anozdrin@booka. +5 -1
    Move init_sp_name() out of init_strings().

  sql/sql_db.cc@1.131, 2006-07-27 17:57:39+04:00, anozdrin@booka. +84 -10
    Two new functions created:
      - load_db_opt_by_name();
      - check_db_dir_existence();

  sql/sql_show.cc@1.323.2.1, 2006-07-27 17:57:39+04:00, anozdrin@booka. +10 -30
    Eliminate duplicated code by using
    check_db_dir_existence() and load_db_opt_by_name()

  sql/sql_table.cc@1.320, 2006-07-27 17:57:39+04:00, anozdrin@booka. +3 -4
    Eliminate duplicated code by using
    check_db_dir_existence() and load_db_opt_by_name()

  sql/sql_yacc.yy@1.474.2.2, 2006-07-27 17:57:39+04:00, anozdrin@booka. +8 -5
    Call sp_head::init_sp_name() to initialize stored routine name.

ChangeSet@1.2196.22.23, 2006-07-27 15:19:13+04:00, anozdrin@booka. +1 -0
  Don't complain in the error log about IM shutdown unless
  BUG#20761 is fixed.

  mysql-test/mysql-test-run.pl@1.103.1.2, 2006-07-27 15:19:11+04:00, anozdrin@booka. +15 -8
    Don't complain in the error log about IM shutdown unless
    BUG#20761 is fixed.

ChangeSet@1.2216.2.3, 2006-07-27 14:43:28+04:00, kroki@moonlight.intranet +1 -0
  Revert the change after null-merge.

  mysys/my_bitmap.c@1.32, 2006-07-27 14:43:25+04:00, kroki@moonlight.intranet +2 -2
    Revert the change forced during null-merge.

ChangeSet@1.2196.63.1, 2006-07-27 12:28:49+02:00, msvensson@neptunus.(none) +1 -0
  Bug#21042 mysql client segfaults on importing a mysqldump export
   - Use strxnmov to protect the "buff" variable from overrun

  client/mysql.cc@1.208.1.2, 2006-07-27 12:28:45+02:00, msvensson@neptunus.(none) +1 -1
    Use strxnmov to protect the "buff" variable from overrun

ChangeSet@1.1616.2695.4, 2006-07-26 16:33:26-06:00, tsmith@siva.hindu.god +2 -0
  Bug #20402: DROP USER failure logged as ERROR rather than WARNING
  
  slave.cc, sql_acl.cc:
  - remove sql_print_error() for events that are not server errors

  sql/slave.cc@1.188.1.92, 2006-07-26 16:30:09-06:00, tsmith@siva.hindu.god +1 -1
    Bug #20402: DROP USER failure logged as ERROR rather than WARNING
    remove sql_print_error() for events that are not server errors

  sql/sql_acl.cc@1.74.1.103, 2006-07-26 16:30:09-06:00, tsmith@siva.hindu.god +0 -15
    Bug #20402: DROP USER failure logged as ERROR rather than WARNING
    remove sql_print_error() for events that are not server errors

ChangeSet@1.2205.9.1, 2006-07-26 21:36:03+04:00, evgen@moonbone.local +4 -0
  item_func.h, item_func.cc, sql_select.cc, item.h:
    Post review changes for bug#19862.

  sql/item.h@1.205, 2006-07-26 21:35:46+04:00, evgen@moonbone.local +1 -1
    Post review changes for bug#19862.

  sql/item_func.cc@1.293.2.2, 2006-07-26 21:35:45+04:00, evgen@moonbone.local +2 -2
    Post review changes for bug#19862.

  sql/item_func.h@1.141.3.2, 2006-07-26 21:35:42+04:00, evgen@moonbone.local +4 -1
    Post review changes for bug#19862.

  sql/sql_select.cc@1.434.5.1, 2006-07-26 21:32:33+04:00, evgen@moonbone.local +1 -4
    Post review changes for bug#19862.

ChangeSet@1.1616.2703.1, 2006-07-26 19:19:30+03:00, gkodinov@macbook.gmz +3 -0
  * Bug #20792: Incorrect results from aggregate subquery
  When processing aggregate functions all tables values are reset
  to NULLs at the end of each group. 
  When doing that if there are no rows found for a group
  the const tables must not be reset as they are not recalculated 
  by do_select()/sub_select() for each group.

  mysql-test/r/subselect2.result@1.5.1.4, 2006-07-26 19:19:23+03:00, gkodinov@macbook.gmz +12 -0
    * Bug #20792: Incorrect results from aggregate subquery
     - test suite for the bug. This is dependent on InnoDB despite
       the fact that the bug and the fix are not InnoDB specific.
       This is because of the table flag HA_NOT_EXACT_COUNT.
       When this flag is off (as in MyISAM) both t2 and t3 become of
       join type 'system' as they are estimated to have 1 record and
       and this statistics can be trusted (according to the absence of
       HA_NOT_EXACT_COUNT).

  mysql-test/t/subselect2.test@1.7, 2006-07-26 19:19:23+03:00, gkodinov@macbook.gmz +18 -0
    * Bug #20792: Incorrect results from aggregate subquery
     - test suite for the bug

  sql/sql_select.cc@1.216.131.1, 2006-07-26 19:19:24+03:00, gkodinov@macbook.gmz +8 -2
    * Bug #20792: Incorrect results from aggregate subquery
     - when clearing results if there are not rows found for group
       the const tables must not be reset as they are not recalculated
       for each group.

ChangeSet@1.2205.1.15, 2006-07-26 18:18:34+03:00, gkodinov@macbook.gmz +1 -0
  Bug #21019: First result of SELECT COUNT(*) different than consecutive runs
    Correct merge

  mysql-test/r/select.result@1.135, 2006-07-26 18:18:28+03:00, gkodinov@macbook.gmz +26 -26
    Bug #21019: First result of SELECT COUNT(*) different than consecutive runs
      Correct merge

ChangeSet@1.2196.1.44, 2006-07-26 16:00:11+02:00, msvensson@neptunus.(none) +1 -0
  Bug#16576 Patch to compile on GNU/Hurd (ps check in configure)
   - Thanks to Christian Hammers for the patch

  configure.in@1.395, 2006-07-26 16:00:09+02:00, msvensson@neptunus.(none) +1 -1
    The configure check on how to run ps to get mysqld's $PID does not
    work on the Hurd, as the PPID is prepended with a - for login shells,
    thus making grep look for -bash, which it complains as an invalid
    argument.  Filtering out '-' from the ps output makes this work fine. 

ChangeSet@1.2196.62.1, 2006-07-26 15:43:03+02:00, msvensson@neptunus.(none) +1 -0
  Bug#21222 Patch to support GNU/kFreeBSD build
   - Thanks to Christian Hammers for the patch!

  include/my_global.h@1.122, 2006-07-26 15:43:00+02:00, msvensson@neptunus.(none) +1 -1
    Define __GNU_SOURCE to 1 also when __GLIBC__ is defined

ChangeSet@1.2196.61.1, 2006-07-26 15:27:53+02:00, msvensson@neptunus.(none) +1 -0
  Bug#16574 Patch to compile on GNU/Hurd (PATH_MAX limit not existing)
   - Define MAX_PATH if not already defined by system header files.
   - Thanks to Christian for the report and patch!

  ndb/include/ndb_global.h.in@1.10, 2006-07-26 15:27:51+02:00, msvensson@neptunus.(none) +0 -4
    PATH_MAX is defined in ndb_global.h for "sco", remove the conditional define for sco
    so it thakes effect as soon as MAX_PATH is not available

ChangeSet@1.1616.2702.1, 2006-07-26 16:23:07+04:00, kroki@moonlight.intranet +2 -0
  BUG#21206: memory corruption when too many cursors are opened at once
  
  Too many cursors (more than 1024) could lead to memory corruption.
  This affects both, stored routines and C API cursors, and the
  threshold is per-server, not per-connection.  Similarly, the
  corruption could happen when the server was under heavy load
  (executing more than 1024 simultaneous complex queries), and this is
  the reason why this bug is fixed in 4.1, which doesn't support
  cursors.
  
  The corruption was caused by a bug in the temporary tables code, when
  an attempt to create a table could lead to a write beyond allocated
  space.  Note, that only internal tables were affected (the tables
  created internally by the server to resolve the query), not tables
  created with CREATE TEMPORARY TABLE.  Another pre-condition for the
  bug is TRUE value of --temp-pool startup option, which, however, is a
  default.
  
  The cause of a bug was that random memory was overwritten in
  bitmap_set_next() due to out-of-bound memory access.

  mysys/my_bitmap.c@1.17.1.5, 2006-07-26 16:23:05+04:00, kroki@moonlight.intranet +1 -1
    Local 'bitmap_size' is measured in bytes, no need to multiply it by 8.

  sql/sql_select.cc@1.216.130.1, 2006-07-26 16:23:05+04:00, kroki@moonlight.intranet +8 -4
    Clear the temp_pool_slot bit only if we have set it previously.

ChangeSet@1.2196.59.3, 2006-07-26 14:21:40+02:00, msvensson@neptunus.(none) +2 -0
  Update test result for perror

  mysql-test/r/perror.result@1.2, 2006-07-26 14:21:38+02:00, msvensson@neptunus.(none) +2 -3
    Add error result for 1186
    Remove the result for the others

  mysql-test/t/perror.test@1.3, 2006-07-26 14:21:38+02:00, msvensson@neptunus.(none) +5 -4
    As it's only just interesting to see that perror doesn't crash(and as result varies across platforms), send result to /dev/null

ChangeSet@1.2196.59.2, 2006-07-26 14:09:20+02:00, msvensson@neptunus.(none) +3 -0
  Bug#16561 Unknown ERROR msg "ERROR 1186 (HY000): Binlog closed" by perror
   - Since error 1186 is not found among NDB error codes, the message retuned should indicate that.

  extra/perror.c@1.45, 2006-07-26 14:09:18+02:00, msvensson@neptunus.(none) +15 -12
    Move the !found out one level

  mysql-test/t/perror.test@1.2, 2006-07-26 14:09:18+02:00, msvensson@neptunus.(none) +11 -0
    Add test case for bug#16561

  ndb/src/kernel/error/ndbd_exit_codes.c@1.12, 2006-07-26 14:09:18+02:00, msvensson@neptunus.(none) +1 -1
    Check not only for zero size string but also classification "unknown error" when looking for an error mesage for an error code 

ChangeSet@1.2196.1.42, 2006-07-26 14:02:24+02:00, msvensson@neptunus.(none) +3 -0
  Bug#19890 mysqltest: "query" command is broken
   - Allow "query" to be used as a prefix for focing a command to be sent to server
   - Add testcases

  client/mysqltest.c@1.238, 2006-07-26 14:02:21+02:00, msvensson@neptunus.(none) +8 -0
    To force something being sent as a query to the mysqld one can
    use the prefix "query". Remove "query" from string before executing.

  mysql-test/r/mysqltest.result@1.35, 2006-07-26 14:02:21+02:00, msvensson@neptunus.(none) +6 -0
    Add test case for "query" command

  mysql-test/t/mysqltest.test@1.44, 2006-07-26 14:02:21+02:00, msvensson@neptunus.(none) +15 -0
    Add test case for "query" command

ChangeSet@1.1616.2701.1, 2006-07-26 13:32:28+03:00, gkodinov@macbook.gmz +3 -0
  Bug #21019: First result of SELECT COUNT(*) different than consecutive runs
   When optimizing conditions like 'a = <some_val> OR a IS NULL' so that they're
   united into a single condition on the key and checked together the server must 
   check which value is the NULL value in a correct way : not only using ->is_null 
   but also check if the expression doesn't depend on any tables referenced in the 
   current statement. 
   This additional check must be performed because that optimization takes place 
   before the actual execution of the statement, so if the field was initialized 
   to NULL from a previous statement the optimization would be applied incorrectly.

  mysql-test/r/select.result@1.34.10.1, 2006-07-26 13:32:20+03:00, gkodinov@macbook.gmz +26 -0
    Bug #21019: First result of SELECT COUNT(*) different than consecutive runs
     - test case

  mysql-test/t/select.test@1.28.8.1, 2006-07-26 13:32:21+03:00, gkodinov@macbook.gmz +15 -0
    Bug #21019: First result of SELECT COUNT(*) different than consecutive runs
     - test case. 
       Note that ALTER TABLE is important here : it happens to
       leave the Field instance for t1.b set to NULL, witch is vital for
       demonstrating the problem fixed by this changeset.

  sql/sql_select.cc@1.216.129.1, 2006-07-26 13:32:22+03:00, gkodinov@macbook.gmz +5 -2
    Bug #21019: First result of SELECT COUNT(*) different than consecutive runs
     - check whether a value is null taking into account its table dependency.

ChangeSet@1.1616.2700.1, 2006-07-26 11:08:15+02:00, msvensson@neptunus.(none) +1 -0
  Bug#21218 Test "mysqlbinlog" fails to execute another program on Windows
   - Modify test case to workaround the test tool problem
   - (Null merge into 5.0)

  mysql-test/t/mysqlbinlog.test@1.8.2.1, 2006-07-26 11:08:13+02:00, msvensson@neptunus.(none) +4 -2
    Send the ouput from "mysqlbinlog" to a file and then read execute it with "mysql"
    This is a workaround for a windows bug in the test tools in mysql-4.1, which makes
    it impossible to use "|" to send the output from one program directly to the other.
    This has been fixed in mysql-5.0. 

ChangeSet@1.2183.36.2, 2006-07-26 08:26:07+04:00, aivanov@mysql.com +3 -0
  Applied innodb-5.0-ss660 snapshot.

  innobase/btr/btr0cur.c@1.56, 2006-07-26 08:25:57+04:00, aivanov@mysql.com +2 -1
    Applied innodb-5.0-ss660 snapshot.
     btr_cur_search_to_nth_level(): Reacquire btr_search_latch after
     inserting to the insert buffer. This was noticed while analyzing
     Bug#19081 but this shold not fix this bug since according to
     Heikki, btr_search_latch is not reserved during an insert.

  innobase/ibuf/ibuf0ibuf.c@1.43, 2006-07-26 08:25:57+04:00, aivanov@mysql.com +6 -9
    Applied innodb-5.0-ss660 snapshot.
     ibuf_fixed_addr_page(): Add parameter space. As the insert buffer
     B-tree is only located in the system tablespace (space 0),
     IBUF_TREE_ROOT_PAGE_NO is only special in space 0.

  innobase/include/sync0rw.ic@1.11, 2006-07-26 08:25:57+04:00, aivanov@mysql.com +1 -1
    Applied innodb-5.0-ss660 snapshot.
     rw_lock_s_unlock_func(): Change a debug assertion to a
     production assertion in order to track down Bug#19081.

ChangeSet@1.1616.2682.2, 2006-07-26 07:47:29+04:00, aivanov@mysql.com +1 -0
  Applied innodb-4.1-ss32 snapshot.

  innobase/ibuf/ibuf0ibuf.c@1.32.1.1, 2006-07-26 07:47:09+04:00, aivanov@mysql.com +6 -9
    Applied innodb-4.1-ss32 snapshot.
     ibuf_fixed_addr_page(): Add parameter space. As the insert
     buffer B-tree is only located in the system tablespace
     (space 0), IBUF_TREE_ROOT_PAGE_NO is only special in space 0.

ChangeSet@1.2196.34.5, 2006-07-25 18:38:09-04:00, pgalbraith@buffy.netfrastructure.com +3 -0
  BUG #15133 "unique index with nullable value not accepted in federated table"
  
  Added HA_NULL_IN_KEY to table flags to allow for nullable unique indexes
  and added test to verify
  
  ha_federated.h:
    BUG #15133 "unique index with nullable value not accepted in federated table"
    added HA_NULL_IN_KEY to table flags to allow for nullable unique indexes
  federated.test:
    BUG #15133 "unique index with nullable value not accepted in federated table"
    New test to show that nullable unique indexes work
  federated.result:
    BUG #15133 "unique index with nullable value not accepted in federated table"
    New results for new test

  mysql-test/r/federated.result@1.37, 2006-07-25 18:03:46-04:00, pgalbraith@buffy.netfrastructure.com +27 -0
    BUG #15133 "unique index with nullable value not accepted in federated table"
    New results for new test

  mysql-test/t/federated.test@1.33, 2006-07-25 18:03:24-04:00, pgalbraith@buffy.netfrastructure.com +45 -0
    BUG #15133 "unique index with nullable value not accepted in federated table"
    New test to show that nullable unique indexes work

  sql/ha_federated.h@1.27, 2006-07-25 16:40:18-04:00, pgalbraith@buffy.netfrastructure.com +3 -1
    BUG #15133 "unique index with nullable value not accepted in federated table"
    added HA_NULL_IN_KEY to table flags to allow for nullable unique indexes

ChangeSet@1.1616.2699.1, 2006-07-26 01:11:19+03:00, timour@lamia.home +5 -0
  Fix for BUG#20954: avg(keyval) retuns 0.38 but max(keyval) returns an empty set
  
  The problem was in that opt_sum_query() replaced MIN/MAX functions
  with the corresponding constant found in a key, but due to imprecise
  representation of float numbers, when evaluating the where clause,
  this comparison failed.
  
  When MIN/MAX optimization detects that all tables can be removed,
  also remove all conjuncts in a where clause that refer to these
  tables. As a result of this fix, these conditions are not evaluated
  twice, and in the case of float number comparisons we do not discard
  result rows due to imprecise float representation.
  
  As a side-effect this fix also corrects an unnoticed problem in
  bug 12882.

  mysql-test/r/func_group.result@1.22.7.1, 2006-07-26 01:11:17+03:00, timour@lamia.home +2 -0
    BUG#20954 - test result adjustment.
    Adjusted the test result of bug 12882 which was not preperly fixed.
    The current patch corrects the problem that was fully corrected by the
    patch for 12882.
    
    The problem was that opt_sum_query() indicated that the optimizer may
    remove all tables because all MIN/MAX/COUNT functions are constants,
    but this lead to an empty result instead of NULL because the WHERE
    clause was still evaluated.
    
    The current fix removes all conjuncts in the where clause that
    reference the removed tables, and thus corrects the problem.

  mysql-test/r/select.result@1.34.3.39, 2006-07-26 01:11:17+03:00, timour@lamia.home +49 -0
    BUG#20954 - added test

  mysql-test/r/subselect.result@1.67.63.1, 2006-07-26 01:11:17+03:00, timour@lamia.home +1 -1
    BUG#20954 - test result adjustment.
    
    The fix removes those conditions in a where clause that refer to
    tables optimized away by MIN/MAX optimization (opt_sum_query()).

  mysql-test/t/select.test@1.28.4.14, 2006-07-26 01:11:17+03:00, timour@lamia.home +30 -0
    BUG#20954 - added test

  sql/sql_select.cc@1.216.126.10, 2006-07-26 01:11:18+03:00, timour@lamia.home +18 -0
    Fix for BUG#20954: avg(keyval) retuns 0.38 but max(keyval) returns an empty set
    
    When MIN/MAX optimization detects that all tables can be removed,
    also remove all conjuncts in a where clause that refer to these
    tables. As a result of this fix, these conditions are not evaluated
    twice, and in the case of float number comparisons we do not discard
    result rows due to imprecise float representation.
    
    As a side-effect this fix also corrects an unnoticed problem in
    bug 12882.

ChangeSet@1.2205.7.1, 2006-07-26 00:31:29+04:00, evgen@moonbone.local +8 -0
  Fixed bug#19862: Sort with filesort by function evaluates function twice
  
  When there is no index defined filesort is used to sort the result of a
  query. If there is a function in the select list and the result set should be
  ordered by it's value then this function will be evaluated twice. First time to
  get the value of the sort key and second time to send its value to a user.
  This happens because filesort when sorts a table remembers only values of its
  fields but not values of functions.
  All functions are affected. But taking into account that SP and UDF functions
  can be both expensive and non-deterministic a temporary table should be used 
  to store their results and then sort it to avoid twice SP evaluation and to 
  get a correct result.
  
  If an expression referenced in an ORDER clause contains a SP or UDF 
  function, force the use of a temporary table.
  
  A new Item_processor function called func_type_checker_processor is added
  to check whether the expression contains a function of a particular type.

  mysql-test/r/sp.result@1.204, 2006-07-26 00:31:10+04:00, evgen@moonbone.local +19 -0
    Added test case for bug#19862: Sort with filesort by function evaluates function twice

  mysql-test/r/udf.result@1.6, 2006-07-26 00:31:10+04:00, evgen@moonbone.local +6 -0
    Added test case for bug#19862: Sort with filesort by function evaluates function twice

  mysql-test/t/sp.test@1.190.2.1, 2006-07-26 00:31:09+04:00, evgen@moonbone.local +18 -0
    Added test case for bug#19862: Sort with filesort by function evaluates function twice

  mysql-test/t/udf.test@1.6, 2006-07-26 00:31:07+04:00, evgen@moonbone.local +7 -0
    Added test case for bug#19862: Sort with filesort by function evaluates function twice

  sql/item.h@1.204, 2006-07-26 00:31:13+04:00, evgen@moonbone.local +1 -0
    Fixed bug#19862: Sort with filesort by function evaluates function twice
    A new Item_processor function called func_type_checker_processor is added
    to check whether the expression contains a function of a particular type.

  sql/item_func.cc@1.293.2.1, 2006-07-26 00:31:13+04:00, evgen@moonbone.local +7 -0
    Fixed bug#19862: Sort with filesort by function evaluates function twice
    A new Item_processor function called func_type_checker_processor is added
    to check whether the expression contains a function of a particular type.

  sql/item_func.h@1.141.2.1, 2006-07-26 00:31:12+04:00, evgen@moonbone.local +3 -1
    Fixed bug#19862: Sort with filesort by function evaluates function twice
    A new Item_processor function called func_type_checker_processor is added
    to check whether the expression contains a function of a particular type.

  sql/sql_select.cc@1.434.3.1, 2006-07-26 00:31:11+04:00, evgen@moonbone.local +20 -0
    Fixed bug#19862: Sort with filesort by function evaluates function twice
    If an expression referenced in an ORDER clause contains a SP or UDF
    function, force the use of a temporary table.

ChangeSet@1.2205.6.2, 2006-07-25 18:42:49+03:00, gkodinov@macbook.gmz +4 -0
  Bug #21086: server crashes when VIEW defined with a SELECT with COLLATE clause is called
    When executing INSERT over a view with calculated columns it was assuming all
    elements of the fields collection are actually Item_field instances.
    This may not be true when inserting into a view and that view has columns that are 
    such expressions that allow updating (like setting a collation for example).
    Corrected to access field information through the filed_for_view_update() function and 
    retrieve correctly the field info even for "update-friendly" non-Item_field items.

  mysql-test/r/view.result@1.167, 2006-07-25 18:42:40+03:00, gkodinov@macbook.gmz +13 -0
    Bug #21086: server crashes when VIEW defined with a SELECT with COLLATE clause is called
     - test suite

  mysql-test/t/view.test@1.152, 2006-07-25 18:42:41+03:00, gkodinov@macbook.gmz +19 -0
    Bug #21086: server crashes when VIEW defined with a SELECT with COLLATE clause is called
     - test suite

  sql/item_strfunc.h@1.112, 2006-07-25 18:42:42+03:00, gkodinov@macbook.gmz +1 -1
    Bug #21086: server crashes when VIEW defined with a SELECT with COLLATE clause is called
     - obvious typo fixed

  sql/sql_base.cc@1.346, 2006-07-25 18:42:42+03:00, gkodinov@macbook.gmz +7 -2
    Bug #21086: server crashes when VIEW defined with a SELECT with COLLATE clause is called
     - must access field information through the filed_for_view_update() function to retrieve
       correctly the field info even for "update-friendly" non-Item_field items.

ChangeSet@1.1616.2698.1, 2006-07-25 18:02:42+05:00, holyfoot@mysql.com +1 -0
  Bug #15440 (handler.test hangs in embedded mode)
  
  the old problem - mysqltest can't handle multiple connections in the
  embedded server properly. So i disabled the test for the embedded mode
  until mysqltest is fixed

  mysql-test/t/handler.test@1.21.1.5, 2006-07-25 18:02:39+05:00, holyfoot@mysql.com +1 -0
    test temporarily disabled in embedded server

ChangeSet@1.1616.2144.176, 2006-07-25 17:27:53+05:00, bar@mysql.com +3 -0
  Bug#19741 segfault with cp1250 charset + like + primary key + 64bit os
  LIKE craashed with a pattern having letters in the range 128..255
  (e.g. A WITH ACUTE or C WITH CARON) because of wrong cast from
  signed char to unsigned int.

  mysql-test/r/ctype_cp1250_ch.result@1.5, 2006-07-25 17:27:49+05:00, bar@mysql.com +8 -0
    Adding test case

  mysql-test/t/ctype_cp1250_ch.test@1.5, 2006-07-25 17:27:49+05:00, bar@mysql.com +10 -0
    Adding test case

  strings/ctype-win1250ch.c@1.42.1.6, 2006-07-25 17:27:49+05:00, bar@mysql.com +2 -2
    Fixing wrong cast from "signed char" -> "uint" to
    "signed char" -> "unsigned char" -> uint, to properly
    handle bytes 128..255.

ChangeSet@1.2218, 2006-07-25 17:23:25+05:00, gluh@mysql.com +6 -0
  Bug#20543 select on information_schema strange warnings, view, different schemas/users
  The fix is: if user has privileges to view fields and user has any
  (insert,select,delete,update) privileges on underlying view 
  then 'show fields' and select from I_S.COLUMNS table are sucsessful.

  mysql-test/r/information_schema_db.result@1.8, 2006-07-25 17:23:20+05:00, gluh@mysql.com +46 -0
    Bug#20543 select on information_schema strange warnings, view, different schemas/users
    test result

  mysql-test/t/information_schema_db.test@1.5, 2006-07-25 17:23:20+05:00, gluh@mysql.com +56 -0
    Bug#20543 select on information_schema strange warnings, view, different schemas/users
    test case

  sql/sql_acl.cc@1.199.1.1, 2006-07-25 17:23:20+05:00, gluh@mysql.com +15 -0
    Bug#20543 select on information_schema strange warnings, view, different schemas/users
    checked that user has privileges on underlying view and if it's true
    set allowed_show to true for top view.

  sql/sql_show.cc@1.323.1.1, 2006-07-25 17:23:21+05:00, gluh@mysql.com +7 -20
    Bug#20543 select on information_schema strange warnings, view, different schemas/users
    removed unnecessary rights check.'tables->allowed_show' check is used instead

  sql/sql_view.cc@1.90, 2006-07-25 17:23:21+05:00, gluh@mysql.com +2 -1
    Bug#20543 select on information_schema strange warnings, view, different schemas/users
    skip the check of SHOW_VIEW_ACL privilege on underlying view. It is done later during
    execution of find_field_in_table_ref function.

  sql/table.h@1.129.1.2, 2006-07-25 17:23:21+05:00, gluh@mysql.com +1 -0
    Bug#20543 select on information_schema strange warnings, view, different schemas/users
    'allowed_show' is set during rights check for view. If true then user has privileges 
    for 'show create view', etc
    

ChangeSet@1.2196.60.1, 2006-07-25 11:45:10+03:00, gkodinov@macbook.gmz +4 -0
  Bug#16712: group_concat returns odd srting insead of intended result
    when calculating GROUP_CONCAT all blob fields are transformed
    to varchar when making the temp table.
    However a varchar has at max 2 bytes for length. 
    This fix makes the conversion only for blobs whose max length 
    is below that limit. 
    Otherwise blob field is created by make_string_field() call.

  mysql-test/r/func_gconcat.result@1.59, 2006-07-25 11:44:58+03:00, gkodinov@macbook.gmz +13 -0
    Bug#16712: group_concat returns odd srting insead of intended result
      * testsuite for the bug

  mysql-test/t/func_gconcat.test@1.45, 2006-07-25 11:44:59+03:00, gkodinov@macbook.gmz +14 -0
    Bug#16712: group_concat returns odd srting insead of intended result
      * testsuite for the bug

  sql/item_sum.cc@1.176.1.1, 2006-07-25 11:45:00+03:00, gkodinov@macbook.gmz +7 -1
    Bug#16712: group_concat returns odd srting insead of intended result
      * force blob->varchar conversion for small enough blobs only

  sql/sql_select.cc@1.428.2.1, 2006-07-25 11:45:01+03:00, gkodinov@macbook.gmz +12 -2
    Bug#16712: group_concat returns odd srting insead of intended result
      * force blob->varchar conversion for small enough blobs only

ChangeSet@1.2205.1.10, 2006-07-24 19:05:46-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #21231: wrong results for a simple query with a
  a non-correlated single-row subquery over information schema.
  
  The function get_all_tables filling all information schema
  tables reset lex->sql_command to SQLCOM_SHOW_FIELDS. After
  this the function could evaluate partial conditions related to
  some columns. If these conditions contained a subquery over
  information schema it led to a wrong evaluation and a wrong 
  result set.
  This bug was already fixed in 5.1.
  This patch follows the way how it was done in 5.1 where
  the value of lex->sql_command is set to SQLCOM_SHOW_FIELDS
  in get_all_tables only for the calls of the function 
  open_normal_and_derived_tables and is restored after these
  calls.

  mysql-test/r/information_schema.result@1.113, 2006-07-24 19:05:43-07:00, igor@olga.mysql.com +8 -0
    Added a test case for bug #21231.

  mysql-test/t/information_schema.test@1.85, 2006-07-24 19:05:44-07:00, igor@olga.mysql.com +10 -0
    Added a test case for bug #21231.

  sql/sql_show.cc@1.325, 2006-07-24 19:05:44-07:00, igor@olga.mysql.com +10 -6
    Fixed bug #21231: wrong results for a simple query with a
    a non-correlated single-row subquery over information schema.
    
    The function get_all_tables filling all information schema
    tables reset lex->sql_command to SQLCOM_SHOW_FIELDS. After
    this the function could evaluate partial conditions related to
    some columns. If these conditions contained a subquery over
    information schema it led to a wrong evaluation and a wrong 
    result set.
    This bug was already fixed in 5.1.
    This patch follows the way how it was done in 5.1 where
    the value of lex->sql_command is set to SQLCOM_SHOW_FIELDS
    in get_all_tables only for the calls of the function 
    open_normal_and_derived_tables and is restored after these
    calls.

ChangeSet@1.2206.4.1, 2006-07-24 16:45:26-07:00, jimw@rama.(none) +3 -0
  Bug #10668: CREATE USER does not enforce username length limit
  
    This appears to have just been an oversight -- CREATE USER was not enforcing
    the existing username limitations.

  mysql-test/r/grant.result@1.53, 2006-07-24 16:45:23-07:00, jimw@rama.(none) +3 -0
    Add new results

  mysql-test/t/grant.test@1.42, 2006-07-24 16:45:23-07:00, jimw@rama.(none) +6 -0
    Add new regression test

  sql/sql_acl.cc@1.200, 2006-07-24 16:45:23-07:00, jimw@rama.(none) +10 -1
    Enforce the user and host name limits in mysql_create_user().

ChangeSet@1.2206.3.1, 2006-07-24 13:31:20-07:00, jimw@rama.(none) +3 -0
  Bug #16502: mysqlcheck gets confused with views
  
    Make mysqlcheck skip over views when processing all of the tables in a
    database.

  client/mysqlcheck.c@1.57, 2006-07-24 13:31:18-07:00, jimw@rama.(none) +12 -4
    Use SHOW TABLE STATUS to get table list, and skip over things that don't
    have an engine (like a VIEW).

  mysql-test/r/mysqlcheck.result@1.2, 2006-07-24 13:31:18-07:00, jimw@rama.(none) +7 -0
    Add new results

  mysql-test/t/mysqlcheck.test@1.2, 2006-07-24 13:31:18-07:00, jimw@rama.(none) +14 -0
    Add new regression test

ChangeSet@1.2196.1.41, 2006-07-24 19:01:54+02:00, msvensson@neptunus.(none) +2 -0
  Bug #19265  	describe command does not work from mysql prompt
   - Add test case

  mysql-test/r/mysql.result@1.10.1.1, 2006-07-24 19:01:52+02:00, msvensson@neptunus.(none) +10 -0
    Update test result

  mysql-test/t/mysql.test@1.10.1.1, 2006-07-24 19:01:52+02:00, msvensson@neptunus.(none) +9 -0
    Add test for mysql using DESC command

ChangeSet@1.1616.2144.174, 2006-07-24 18:12:57+02:00, msvensson@neptunus.(none) +1 -0
  Bug#21218 Test "mysqlbinlog" fails to execute another program on Windows
   - Send confusing output to /dev/null

  mysql-test/t/mysqlbinlog.test@1.8.1.14, 2006-07-24 18:12:55+02:00, msvensson@neptunus.(none) +6 -5
    Send confusing error messages to /dev/null so they don't appear in erro log if test case fails

ChangeSet@1.2196.59.1, 2006-07-24 18:05:00+02:00, msvensson@neptunus.(none) +5 -0
  Bug#20145 perror segfault when call it with error nr
    - Add test case(execute perror)
    - Check if strerror has returned NULL and set msg to "Unknown Error" in that case
    - Thanks to Steven Xie for pointing out how to fix. 

  extra/perror.c@1.44, 2006-07-24 18:04:58+02:00, msvensson@neptunus.(none) +4 -1
    strerror might return NULL on Solaris 2.8

  mysql-test/mysql-test-run.pl@1.105, 2006-07-24 18:04:58+02:00, msvensson@neptunus.(none) +8 -0
    Add possibility to execute perror from test case 

  mysql-test/r/have_perror.require@1.1, 2006-07-24 18:04:58+02:00, msvensson@neptunus.(none) +2 -0
    New BitKeeper file ``mysql-test/r/have_perror.require''

  mysql-test/r/have_perror.require@1.0, 2006-07-24 18:04:58+02:00, msvensson@neptunus.(none) +0 -0

  mysql-test/r/perror.result@1.1, 2006-07-24 18:04:58+02:00, msvensson@neptunus.(none) +3 -0
    New BitKeeper file ``mysql-test/r/perror.result''

  mysql-test/r/perror.result@1.0, 2006-07-24 18:04:58+02:00, msvensson@neptunus.(none) +0 -0

  mysql-test/t/perror.test@1.1, 2006-07-24 18:04:58+02:00, msvensson@neptunus.(none) +11 -0
    New BitKeeper file ``mysql-test/t/perror.test''

  mysql-test/t/perror.test@1.0, 2006-07-24 18:04:58+02:00, msvensson@neptunus.(none) +0 -0

ChangeSet@1.1616.2696.1, 2006-07-24 14:31:37+02:00, msvensson@neptunus.(none) +2 -0
  Bug#21125 mysqldump: Problem with non-standard table names
   - The mysql-test/std_data/bug15328.cnf file was not copied to install or dist dir.

  mysql-test/Makefile.am@1.39.1.15, 2006-07-24 14:31:36+02:00, msvensson@neptunus.(none) +2 -0
    Add std_data/*.cnf files to dist_hook and install-data-local

  scripts/make_win_src_distribution.sh@1.27.2.12, 2006-07-24 14:31:36+02:00, msvensson@neptunus.(none) +1 -1
    Copy *.cnf files as well.

ChangeSet@1.2196.58.1, 2006-07-24 15:10:50+04:00, kroki@moonlight.intranet +2 -0
  BUG#14702: misleading error message when syntax error in
             CREATE PROCEDURE
  
  The bug was fixed already.  This changeset adds a test case.

  mysql-test/r/sp-error.result@1.107, 2006-07-24 15:10:47+04:00, kroki@moonlight.intranet +13 -0
    Add result for bug#14702: misleading error message when syntax error
    in CREATE PROCEDURE.

  mysql-test/t/sp-error.test@1.107, 2006-07-24 15:10:47+04:00, kroki@moonlight.intranet +22 -0
    Add test case for bug#14702: misleading error message when syntax error
    in CREATE PROCEDURE.

ChangeSet@1.2196.57.6, 2006-07-24 13:10:24+02:00, msvensson@neptunus.(none) +3 -0
  Bug#21215  mysqldump creating incomplete backups without warning
   - Add call to 'safe_exit' function when db query fails.

  client/mysqldump.c@1.234.2.6, 2006-07-24 13:10:22+02:00, msvensson@neptunus.(none) +1 -0
    Add a call to 'safe_exit' to remember the error code and exit unless --force was give.n

  mysql-test/r/mysqldump.result@1.103.1.1, 2006-07-24 13:10:22+02:00, msvensson@neptunus.(none) +16 -0
    Add test result

  mysql-test/t/mysqldump.test@1.96.1.1, 2006-07-24 13:10:22+02:00, msvensson@neptunus.(none) +40 -0
    Add test case

ChangeSet@1.2196.22.21, 2006-07-24 14:56:53+04:00, kostja@bodhi.local +9 -0
  A fix and a test case for Bug#15752 "Lost connection to MySQL server 
  when calling a SP from C API"
  
  The bug was caused by lack of checks for misuse in mysql_real_query. 
  A stored procedure always returns at least one result, which is the 
  status of execution of the procedure itself.
  This result, or so-called OK packet, is similar to a result
  returned by INSERT/UPDATE/CREATE operations: it contains the overall
  status of execution, the number of affected rows and the number of
  warnings. The client test program attached to the bug did not read this 
  result and ivnoked the next query. In turn, libmysql had no check for 
  such scenario and mysql_real_query was simply trying to send that query 
  without reading the pending response, thus messing up the communication
  protocol.
  
  The fix is to return an error from mysql_real_query when it's called
  prior to retrieval of all pending results.

  client/mysqlbinlog.cc@1.128, 2006-07-24 14:56:50+04:00, kostja@bodhi.local +2 -1
    net_safe_read -> cli_safe_read

  include/mysql.h@1.158.1.1, 2006-07-24 14:56:50+04:00, kostja@bodhi.local +0 -1
    Remove a private function from the public header.

  include/mysql_com.h@1.104, 2006-07-24 14:56:50+04:00, kostja@bodhi.local +0 -1
    Remove a define that is never used.

  include/sql_common.h@1.14.1.2, 2006-07-24 14:56:50+04:00, kostja@bodhi.local +1 -1
    Add a declaration for cli_safe_read - a function that reads one packet
    from the server.

  libmysql/libmysql.c@1.244.1.1, 2006-07-24 14:56:50+04:00, kostja@bodhi.local +9 -7
    net_safe_read -> cli_safe_read
    Return CR_COMMANDS_OUT_OF_SYNC on attempt to execute a statement
    using a connection which has pending result sets.

  sql-common/client.c@1.93.1.1, 2006-07-24 14:56:50+04:00, kostja@bodhi.local +40 -29
    Actual fix for Bug#15752: if the server has pending result sets for
    the client, return CR_COMMANDS_OUT_OF_SYNC on attempt to execute
    another query. Similarly to the behaviour of mysql_use_result(),
    multiple result sets block the connection and must be fetched
    before it can be used for another query.
    This uncovered an error in the protocol: the server doesn't drop
    SERVER_MORE_RESULTS_EXISTS status flag upon an error, so in case of
    a multi-query like SELECT 1; SELECT syntax_error; SELECT 2; 
    the client has no way to know that the server won't ever come to 
    execution of the third query and won't return any result sets for it.
    For now, fix it in cli_safe_read, as a proper fix requires extension
    of the client-server protocol.

  sql/protocol.cc@1.114, 2006-07-24 14:56:50+04:00, kostja@bodhi.local +1 -1
    Remove a name that is never used.

  sql/slave.cc@1.274, 2006-07-24 14:56:50+04:00, kostja@bodhi.local +1 -1
    net_safe_read -> cli_safe_read

  tests/mysql_client_test.c@1.189.1.1, 2006-07-24 14:56:50+04:00, kostja@bodhi.local +96 -2
    Make 'query' a local variable to avoid name clash.
    Add a test case for Bug#15752 "Lost connection to MySQL server when
    calling an SP from C API"

ChangeSet@1.2196.57.5, 2006-07-24 12:48:02+02:00, msvensson@neptunus.(none) +1 -0
  Don't close connection to mysql before 'safe_exit', that is done in 'safe_exit' if it decides to exit.

  client/mysqldump.c@1.234.2.5, 2006-07-24 12:48:01+02:00, msvensson@neptunus.(none) +0 -2
    Don't close connection to mysql before 'safe_exit', that is done in 'safe_exit' if it decides to exit.

ChangeSet@1.2196.57.4, 2006-07-24 12:43:35+02:00, msvensson@neptunus.(none) +1 -0
  Remove double printout of mysqldump in error message

  client/mysqldump.c@1.234.2.4, 2006-07-24 12:43:33+02:00, msvensson@neptunus.(none) +2 -3
    Remove double printout of mysqldump in error message

ChangeSet@1.2196.57.3, 2006-07-24 12:00:44+02:00, msvensson@neptunus.(none) +1 -0
  Replace sock -> mysql

  client/mysqldump.c@1.234.2.3, 2006-07-24 12:00:42+02:00, msvensson@neptunus.(none) +92 -91
    Replace sock -> mysql

ChangeSet@1.2196.57.2, 2006-07-24 11:56:01+02:00, msvensson@neptunus.(none) +1 -0
  Change tFlag and dFlag into human readable format
   tFlag => opt_no_create_info
   dFlag => opt_no_data

  client/mysqldump.c@1.234.2.2, 2006-07-24 11:55:59+02:00, msvensson@neptunus.(none) +14 -12
    Change tFlag and dFlag into human readable format
     tFlag => opt_no_create_info
     dFlag => opt_no_data

ChangeSet@1.2196.57.1, 2006-07-24 11:51:52+02:00, msvensson@neptunus.(none) +1 -0
  Add function verbose_msg

  client/mysqldump.c@1.234.2.1, 2006-07-24 11:51:44+02:00, msvensson@neptunus.(none) +48 -46
    Add function verbose_msg and use it from all places where messages are printed if --verbose are turned on

ChangeSet@1.2196.1.38, 2006-07-24 10:56:33+02:00, msvensson@neptunus.(none) +2 -0
  Bug#10877 mysqldump should use consistent last line
   - Add printout in write_footer to tell that mysqldump has completed.
     Ex: -- Dump completed 2006-07-24  8:55:05

  client/Makefile.am@1.56, 2006-07-24 10:56:31+02:00, msvensson@neptunus.(none) +3 -1
    Build mysqldump with mf_getdate.c

  client/mysqldump.c@1.234.1.1, 2006-07-24 10:56:31+02:00, msvensson@neptunus.(none) +7 -0
    Add printout in write_footer that will print info that mysqldump has completed

ChangeSet@1.1346.1.842, 2006-07-24 10:55:26+02:00, kent@mysql.com +3 -0
  mwasmnlm, mwccnlm, mwldnlm:
    Filter out strange control characters, messes up logs

  netware/BUILD/mwasmnlm@1.3.1.1, 2006-07-24 10:55:09+02:00, kent@mysql.com +4 -1
    Filter out strange control characters, messes up logs

  netware/BUILD/mwccnlm@1.3.1.1, 2006-07-24 10:55:09+02:00, kent@mysql.com +4 -1
    Filter out strange control characters, messes up logs

  netware/BUILD/mwldnlm@1.3.1.1, 2006-07-24 10:55:09+02:00, kent@mysql.com +4 -1
    Filter out strange control characters, messes up logs

ChangeSet@1.2196.54.1, 2006-07-23 15:25:30+05:00, ramil@mysql.com +3 -0
  Fix for bug #8143: A date with value 0 is treated as a NULL value

  mysql-test/r/delete.result@1.24, 2006-07-23 15:25:12+05:00, ramil@mysql.com +10 -0
    Fix for bug #8143: A date with value 0 is treated as a NULL value
      - test result

  mysql-test/t/delete.test@1.22, 2006-07-23 15:25:12+05:00, ramil@mysql.com +11 -0
    Fix for bug #8143: A date with value 0 is treated as a NULL value
      - test case

  sql/sql_delete.cc@1.177, 2006-07-23 15:25:12+05:00, ramil@mysql.com +8 -0
    Fix for bug #8143: A date with value 0 is treated as a NULL value
      - during SELECT queries processing we convert 'date[time]_field is null' 
        conditions into 'date[time]_field = 0000-00-00[ 00:00:00]' for not null 
        DATE and DATETIME fields. To be consistent, we have to do the same for DELETE
        queries. So we should call remove_eq_conds() in the mysql_delete() as well.
        Also it may simplify and speed up DELETE queries execution.

ChangeSet@1.2205.5.1, 2006-07-22 12:44:54-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #18925: wrong results for queries with
  subqueries on information schema that use MIN/MAX aggregation.
  
  Execution of some correlated subqueries may set the value
  of null_row to 1 for tables used in the subquery.
  If the the subquery is on information schema it causes
  rejection of any row for the following executions of
  the subquery in the case when an optimization filtering
  by some condition is applied.
  
  The fix restores the value of the null_row flag for 
  each execution of a subquery on information schema.

  mysql-test/r/information_schema.result@1.112, 2006-07-22 12:44:51-07:00, igor@olga.mysql.com +62 -0
    Added a test case for bug #18925.

  mysql-test/t/information_schema.test@1.84, 2006-07-22 12:44:51-07:00, igor@olga.mysql.com +33 -0
    Added a test case for bug #18925.

  sql/sql_show.cc@1.324, 2006-07-22 12:44:51-07:00, igor@olga.mysql.com +1 -0
    Fixed bug #18925.
    Execution of some correlated subqueries may set the value
    of null_row to 1 for tables used in the subquery.
    If the the subquery is on information schema it causes
    rejection of any row for the following execitions of
    the subquery in the case when an optimization filtering
    by some condition is applied.
    
    The fix restores the value of the null_row flag for 
    each execution of a subquery on information schema.

ChangeSet@1.2205.3.4, 2006-07-22 16:18:28+04:00, sergefp@mysql.com +2 -0
  Post-merge fixes

  sql/item_subselect.cc@1.129, 2006-07-22 16:18:26+04:00, sergefp@mysql.com +1 -1
    Post-merge fixes

  sql/mysql_priv.h@1.398.1.2, 2006-07-22 16:18:26+04:00, sergefp@mysql.com +2 -0
    Post-merge fixes

ChangeSet@1.2206.2.1, 2006-07-21 20:29:25-07:00, jimw@rama.(none) +3 -0
  Bug #19147: mysqlshow INFORMATION_SCHEMA does not work
  
    When a wildcard database name is given the mysqlshow, but that wildcard
    matches one database *exactly* (it contains the wildcard character), we
    list the contents of that database instead of just listing the database
    name as matching the wildcard. Probably the most common instance of users
    encountering this behavior would be with "mysqlshow information_schema".

  client/mysqlshow.c@1.49, 2006-07-21 20:29:23-07:00, jimw@rama.(none) +25 -2
    Add special handling for listing a single database that has a name that
    looked like it contained wildcards. In this case, we just go ahead and list
    the contents of the database, since there is a very high probability that is
    what the user really wanted to do. (For example, 'mysqlshow INFORMATION_SCHEMA'
    will show the I_S tables instead of just the I_S database.)

  mysql-test/r/mysqlshow.result@1.4, 2006-07-21 20:29:23-07:00, jimw@rama.(none) +49 -0
    Add new results

  mysql-test/t/mysqlshow.test@1.5, 2006-07-21 20:29:23-07:00, jimw@rama.(none) +9 -0
    Add new regression test

ChangeSet@1.2205.4.2, 2006-07-22 05:52:37+04:00, evgen@moonbone.local +1 -0
  field.h:
    Fixed typo.

  sql/field.h@1.183.1.2, 2006-07-22 05:52:17+04:00, evgen@moonbone.local +1 -1
    Fixed typo.

ChangeSet@1.1616.2685.8, 2006-07-22 02:36:17+04:00, sergefp@mysql.com +2 -0
  Add missing "DROP TABLE" clause

  mysql-test/r/subselect.result@1.67.1.112, 2006-07-22 02:36:15+04:00, sergefp@mysql.com +1 -0
    Add missing "DROP TABLE" clause

  mysql-test/t/subselect.test@1.58.1.99, 2006-07-22 02:36:15+04:00, sergefp@mysql.com +1 -0
    Add missing "DROP TABLE" clause

ChangeSet@1.2149.19.1, 2006-07-22 02:08:00+04:00, evgen@moonbone.local +8 -0
  Fixed bug#12185: Data type aggregation may produce wrong result
  
  The Item::tmp_table_field_from_field_type() function creates Field_datetime
  object instead of Field_timestamp object for timestamp field thus always
  changing data type is a tmp table is used.
  
  The Field_blob object constructor which is used in the 
  Item::tmp_table_field_from_field_type() is always setting packlength field of
  newly created blob to 4. This leads to changing fields data type for example
  from the blob to the longblob if a temporary table is used.
  
  The Item::make_string_field() function always converts Field_string objects 
  to Field_varstring objects. This leads to changing data type from the 
  char/binary to varchar/varbinary.
  
  Added appropriate Field_timestamp object constructor for using in the 
  Item::tmp_table_field_from_field_type() function.
  
  Added Field_blob object constructor which sets pack length according to
  max_length argument.
  
  The Item::tmp_table_field_from_field_type() function now creates
  Field_timestamp object for a timestamp field.
  
  The Item_type_holder::display_length() now returns correct NULL length NULL
  length. 
  
  The Item::make_string_field() function now doesn't change Field_string to
  Field_varstring in the case of Item_type_holder. 
  
  The Item::tmp_table_field_from_field_type() function now uses the Field_blob
  constructor which sets packlength according to max_length.

  mysql-test/r/create.result@1.115.2.1, 2006-07-21 23:28:55+04:00, evgen@moonbone.local +1 -1
    Corrected the test case after fixing bug#12185

  mysql-test/r/innodb.result@1.162, 2006-07-21 23:28:22+04:00, evgen@moonbone.local +2 -2
    Corrected test case after fix for bug#12185

  mysql-test/r/union.result@1.81.1.1, 2006-07-21 23:28:11+04:00, evgen@moonbone.local +23 -8
    Added test case for bug#12185: Data type aggregation may produce wrong result
     Corrected test case after fix for bug#12185

  mysql-test/t/innodb.test@1.132.1.1, 2006-07-21 23:28:00+04:00, evgen@moonbone.local +1 -1
    Corrected test case after fix for bug#12185

  mysql-test/t/union.test@1.94.1.1, 2006-07-21 23:27:50+04:00, evgen@moonbone.local +10 -2
    Added test case for bug#12185: Data type aggregation may produce wrong result
    Corrected test case after fix for bug#12185

  sql/field.cc@1.307.2.1, 2006-07-21 23:28:58+04:00, evgen@moonbone.local +18 -0
    Fixed bug#12185: Data type aggregation may produce wrong result
    Added appropriate Field_timestamp object constructor for using in the 
    Item::tmp_table_field_from_field_type() function.

  sql/field.h@1.180.1.1, 2006-07-21 23:28:57+04:00, evgen@moonbone.local +17 -0
    Fixed bug#12185: Data type aggregation may produce wrong result
    Added Field_blob object constructor which sets packlength according to
    max_length argument.

  sql/item.cc@1.224.3.1, 2006-07-21 23:28:57+04:00, evgen@moonbone.local +10 -3
    Fixed bug#12185: Data type aggregation may produce wrong result
    The Item::make_string_field() function now doesn't change Field_string to
    Field_varstring in the case of Item_type_holder.
    The Item::tmp_table_field_from_field_type() function now creates
    Field_timestamp object for a timestamp field.
    The Item::tmp_table_field_from_field_type() function now uses the Field_blob
    constructor which sets packlength according to max_length.
    The Item_type_holder::display_length() now returns correct NULL length NULL
    length.

ChangeSet@1.2206.1.1, 2006-07-21 13:28:42-07:00, jimw@rama.(none) +3 -0
  Bug #16881: password() and union select
  
    This was only demonstrated by the use of PASSWORD(), it was not related to
    that function at all. The calculation of the size of a field in the results
    of a UNION did not take into account the possible growth of a string field
    when being converted to the aggregated character set.

  mysql-test/r/union.result@1.83, 2006-07-21 13:28:38-07:00, jimw@rama.(none) +5 -0
    Add new results

  mysql-test/t/union.test@1.96, 2006-07-21 13:28:38-07:00, jimw@rama.(none) +7 -0
    Add new regression test

  sql/item.cc@1.229, 2006-07-21 13:28:38-07:00, jimw@rama.(none) +12 -4
    Fix calculation of max_length when figuring out the type of a column in
    a UNION. It needs to take into account any expansion of field size due to
    charset conversions.

ChangeSet@1.2205.2.1, 2006-07-21 20:44:35+03:00, gkodinov@macbook.mshome.net +3 -0
  Bug #20466: a view is mixing data when there's a trigger on the table
    When making a place to store field values at the start of each group
    the real item (not the reference) must be used when deciding which column
    to copy.

  mysql-test/r/group_by.result@1.69, 2006-07-21 20:44:27+03:00, gkodinov@macbook.mshome.net +25 -0
    Bug #20466: a view is mixing data when there's a trigger on the table
     - test suite for the bug

  mysql-test/t/group_by.test@1.57, 2006-07-21 20:44:28+03:00, gkodinov@macbook.mshome.net +23 -0
    Bug #20466: a view is mixing data when there's a trigger on the table
     - test suite for the bug

  sql/sql_select.cc@1.434.2.1, 2006-07-21 20:44:29+03:00, gkodinov@macbook.mshome.net +9 -7
    Bug #20466: a view is mixing data when there's a trigger on the table
     - deal correctly with references

ChangeSet@1.2203.1.1, 2006-07-21 17:59:52+03:00, gkodinov@macbook.gmz +3 -0
  Bug #20868: Client connection is broken on SQL query error
   An aggregate function reference was resolved incorrectly and
  caused a crash in count_field_types.
   Must use real_item() to get to the real Item instance through
  the reference

  mysql-test/r/func_group.result@1.46.1.6, 2006-07-21 17:59:45+03:00, gkodinov@macbook.gmz +11 -0
    Bug #20868: Client connection is broken on SQL query error
     * test case for the bug

  mysql-test/t/func_group.test@1.45.1.4, 2006-07-21 17:59:45+03:00, gkodinov@macbook.gmz +15 -0
    Bug #20868: Client connection is broken on SQL query error
     * test case for the bug

  sql/sql_select.cc@1.434.1.1, 2006-07-21 17:59:46+03:00, gkodinov@macbook.gmz +1 -1
    Bug #20868: Client connection is broken on SQL query error
     * correctly resolve aggregate function references.

ChangeSet@1.2196.51.1, 2006-07-21 17:02:04+05:00, holyfoot@mysql.com +1 -0
  bug #20950 (mysql_upgrade looks for 'mysqlcheck' not for 'mysqlcheck.exe'
  on Windows.
  
  Code added to look for different names on Windows

  client/mysql_upgrade.c@1.3.1.1, 2006-07-21 17:02:01+05:00, holyfoot@mysql.com +11 -2
    added conditionally-compiled part to look for different names of tools
    on Windows

ChangeSet@1.1346.878.1, 2006-07-21 12:22:41+02:00, ingo@chilla.local +1 -0
  Bug#20719 - Reading dynamic records with write buffer could fail
  
  Fixed a possible problem with reading of dynamic records
  when a write cache is active. The cache must be flushed
  whenever a part of the file in the write cache is to be 
  read.
  
  Added a read optimization to _mi_read_dynamic_record().
  
  No test case. This was a hypothetical but existing problem.

  myisam/mi_dynrec.c@1.33.1.2, 2006-07-21 12:22:39+02:00, ingo@chilla.local +129 -28
    Bug#20719 - Reading dynamic records with write buffer could fail
    
    Fixed a possible problem with reading of dynamic records
    when a write cache is active. The cache must be flushed
    whenever a part of the file in the write cache is to be 
    read. This must be done before the read of the header
    and before the read of the rest block.
    
    Renamed the 'flag' and 'skipp_deleted_blocks' variables.
    
    Added a read optimization to _mi_read_dynamic_record()
    that was present in _mi_read_rnd_dynamic_record() already.
    After _mi_get_block_info() we have some bytes of the record
    in the header buffer already. No need to read them again.

ChangeSet@1.2196.50.1, 2006-07-21 11:59:46+03:00, timour@lamia.home +3 -0
  Fix for BUG#21007.
  
  The problem was that store_top_level_join_columns() incorrectly assumed
  that the left/right neighbor of a nested join table reference can be only
  at the same level in the join tree.
  
  The fix checks if the current nested join table reference has no immediate
  left/right neighbor, and if so chooses the left/right neighbors of the
  nearest upper level, where these references are != NULL.

  mysql-test/r/group_min_max.result@1.25, 2006-07-21 11:59:45+03:00, timour@lamia.home +43 -0
    Test for BUG#21007.

  mysql-test/t/group_min_max.test@1.23, 2006-07-21 11:59:45+03:00, timour@lamia.home +48 -0
    Test for BUG#21007.

  sql/sql_base.cc@1.345, 2006-07-21 11:59:45+03:00, timour@lamia.home +25 -13
    After computing and materializing the columns of all NATURAL joins in a FROM clause,
    the procedure store_top_level_join_columns() has to change the current natural join
    into a leaf table reference for name resolution. For this it needs to make the left
    neighbor point to the natural join table reference, and the natural join itself point
    to its left neighbor.
    
    This fix correctly determines the left/right neighbors of a table reference, even if
    the neghbors are at higher levels in the nested join tree. The rule is that if a table
    reference has no immediate left/right neighbors, we recursively pick the left/right
    neighbor of the level(s) above.

ChangeSet@1.1616.2685.7, 2006-07-21 03:04:04+04:00, sergefp@mysql.com +8 -0
  BUG#20975: Incorrect query result for NOT (subquery):
    Add implementations of Item_func_{nop,not}_all::neg_transformer

  mysql-test/r/subselect.result@1.67.1.111, 2006-07-21 03:04:02+04:00, sergefp@mysql.com +26 -0
    BUG#20975: testcase

  mysql-test/t/subselect.test@1.58.1.98, 2006-07-21 03:04:02+04:00, sergefp@mysql.com +16 -0
    BUG#20975: testcase

  sql/item_cmpfunc.cc@1.111.23.10, 2006-07-21 03:04:02+04:00, sergefp@mysql.com +22 -0
    BUG#20975: Incorrect query result for NOT (subquery):
      Add implementations of Item_func_{nop,not}_all::neg_transformer

  sql/item_cmpfunc.h@1.73.1.44, 2006-07-21 03:04:02+04:00, sergefp@mysql.com +2 -0
    BUG#20975: Incorrect query result for NOT (subquery):
      Add implementations of Item_func_{nop,not}_all::neg_transformer

  sql/item_subselect.cc@1.60.1.82, 2006-07-21 03:04:02+04:00, sergefp@mysql.com +3 -3
    BUG#20975: Incorrect query result for NOT (subquery):
      Add implementations of Item_func_{nop,not}_all::neg_transformer

  sql/item_subselect.h@1.52.1.11, 2006-07-21 03:04:02+04:00, sergefp@mysql.com +4 -5
    BUG#20975: Incorrect query result for NOT (subquery):
      Add implementations of Item_func_{nop,not}_all::neg_transformer

  sql/mysql_priv.h@1.186.105.1, 2006-07-21 03:04:02+04:00, sergefp@mysql.com +2 -1
    Make chooser_compare_func_creator visible in item.h

  sql/sql_parse.cc@1.271.126.1, 2006-07-21 03:04:02+04:00, sergefp@mysql.com +1 -1
    BUG#20975: Incorrect query result for NOT (subquery):
      Add implementations of Item_func_{nop,not}_all::neg_transformer

ChangeSet@1.2211, 2006-07-20 13:41:00-06:00, tsmith@siva.hindu.god +3 -0
  Finish the merge of the patch for bug #15195 from 4.1 -> 5.0
  - Adapt it to work with the handlerton class

  sql/handler.cc@1.214.1.2, 2006-07-20 13:40:57-06:00, tsmith@siva.hindu.god +3 -1
    Only create new MERGE handler if merge engine is enabled

  sql/mysql_priv.h@1.400, 2006-07-20 13:40:57-06:00, tsmith@siva.hindu.god +4 -1
    Use the myisammrg_hton.state field for the have_merge_db option

  sql/mysqld.cc@1.562, 2006-07-20 13:40:57-06:00, tsmith@siva.hindu.god +5 -0
    Handle the OPT_MERGE (--skip-merge) option case

ChangeSet@1.2196.48.1, 2006-07-20 17:30:44+02:00, msvensson@neptunus.(none) +1 -0
  Bug#15690 mysqlimport tries to set options the server doesn't understand
   - "set @@character_set_database" should be ignored by servers prior to 4.1.1

  client/mysqlimport.c@1.60, 2006-07-20 17:30:42+02:00, msvensson@neptunus.(none) +1 -1
    Enclose "set @@character_set_databse=x" with comments that makes it be ignored by servers prior to 4.1.1

ChangeSet@1.2196.22.19, 2006-07-20 13:24:12+04:00, anozdrin@booka.site +12 -0
  Fix for BUG#20716: SHOW INSTANCES statement causes races in IM tests.
    
  Fix for the bug in mysql-test-run.pl which prevents other tests succeed
  after IM-test failure.
    
  The idea of the fix of BUG#20716 is to:
    1. Check each SHOW INSTANCES statement, add necessary "sleep" instruction before;
    2. Move all environment checkings into the one file and include it everywhere.

  mysql-test/include/im_check_env.inc@1.1, 2006-07-20 13:24:11+04:00, anozdrin@booka.site +27 -0
    A new file to be included in each IM-test.
    The statements in the file ensure that starting
    conditions (environment) are as expected.

  mysql-test/include/im_check_env.inc@1.0, 2006-07-20 13:24:11+04:00, anozdrin@booka.site +0 -0

  mysql-test/mysql-test-run.pl@1.103.1.1, 2006-07-20 13:24:10+04:00, anozdrin@booka.site +22 -0
    Fix bug in mysql-test-run.pl -- kill leftovers if some
    guarded mysqld-instance is still alive after IM shutdown.

  mysql-test/r/im_daemon_life_cycle.result@1.4, 2006-07-20 13:24:10+04:00, anozdrin@booka.site +3 -0
    Updated result file.

  mysql-test/r/im_life_cycle.result@1.6.1.1, 2006-07-20 13:24:10+04:00, anozdrin@booka.site +3 -8
    Updated result file.

  mysql-test/r/im_options_set.result@1.5, 2006-07-20 13:24:11+04:00, anozdrin@booka.site +5 -2
    Updated result file.

  mysql-test/r/im_options_unset.result@1.5, 2006-07-20 13:24:11+04:00, anozdrin@booka.site +5 -2
    Updated result file.

  mysql-test/r/im_utils.result@1.4, 2006-07-20 13:24:11+04:00, anozdrin@booka.site +3 -0
    Updated result file.

  mysql-test/t/im_daemon_life_cycle.imtest@1.3, 2006-07-20 13:24:11+04:00, anozdrin@booka.site +1 -15
    Include im_check_env.inc for the checking of environment.

  mysql-test/t/im_life_cycle.imtest@1.5.1.1, 2006-07-20 13:24:11+04:00, anozdrin@booka.site +21 -45
    Include im_check_env.inc for the checking of environment.

  mysql-test/t/im_options_set.imtest@1.3, 2006-07-20 13:24:11+04:00, anozdrin@booka.site +1 -26
    Include im_check_env.inc for the checking of environment.

  mysql-test/t/im_options_unset.imtest@1.3, 2006-07-20 13:24:11+04:00, anozdrin@booka.site +1 -26
    Include im_check_env.inc for the checking of environment.

  mysql-test/t/im_utils.imtest@1.3, 2006-07-20 13:24:11+04:00, anozdrin@booka.site +6 -25
    Include im_check_env.inc for the checking of environment.

ChangeSet@1.2205.1.2, 2006-07-19 16:42:19-07:00, igor@olga.mysql.com +4 -0
  Added a test case with views for bug #17526.

  mysql-test/r/func_str.result@1.116.1.2, 2006-07-19 16:42:17-07:00, igor@olga.mysql.com +5 -5
    Adjusted results for the test case of bug 17526.

  mysql-test/r/view.result@1.166, 2006-07-19 16:42:17-07:00, igor@olga.mysql.com +33 -0
    Added a test case with views for bug #17526.

  mysql-test/t/view.test@1.151, 2006-07-19 16:42:17-07:00, igor@olga.mysql.com +24 -0
    Added a test case with views for bug #17526.

  sql/item_strfunc.cc@1.273.1.3, 2006-07-19 16:42:17-07:00, igor@olga.mysql.com +1 -1
    Post-merge modification

ChangeSet@1.1616.2695.3, 2006-07-19 17:39:53-04:00, iggy@rolltop.ignatz42.dyndns.org +2 -0
  Manual merge required.

  mysql-test/r/mysql_client.result@1.2, 2006-07-19 17:39:51-04:00, iggy@rolltop.ignatz42.dyndns.org +44 -0
    manual merge

  mysql-test/t/mysql_client.test@1.2, 2006-07-19 17:39:51-04:00, iggy@rolltop.ignatz42.dyndns.org +6 -0
    manual merge

ChangeSet@1.1616.2685.6, 2006-07-19 12:36:55-07:00, igor@olga.mysql.com +4 -0
  Fixed bug #17526: incorrect print method
  for class Item_func_trim. 
  For 4.1 it caused wrong output for EXPLAIN EXTENDED commands
  if expressions with the TRIM function of two arguments were used.
  For 5.0 it caused an error message when trying to select
  from a view with the TRIM function of two arguments.
  This unexpected error message was due to the fact that the
  print method for the class Item_func_trim was inherited from
  the class Item_func. Yet the TRIM function does not take a list
  of its arguments. Rather it takes the arguments in the form:
    [{BOTH | LEADING | TRAILING} [remstr] FROM] str) |
    [remstr FROM] str

  mysql-test/r/func_str.result@1.70.1.33, 2006-07-19 12:36:54-07:00, igor@olga.mysql.com +28 -0
    Added a test case for bug #17526: uncorrect print method
    for class Item_func_trim.

  mysql-test/t/func_str.test@1.64.1.21, 2006-07-19 12:36:54-07:00, igor@olga.mysql.com +15 -0
    Added a test case for bug #17526: incorrect print method
    for class Item_func_trim.

  sql/item_strfunc.cc@1.196.10.1, 2006-07-19 12:36:54-07:00, igor@olga.mysql.com +17 -0
    Fixed bug #17526: incorrect print method
    for class Item_func_trim.
        
    Added an implementation for the virtual function print
    in the class Item_func_trim.
    The implementation takes into account the fact the TRIM
    function takes the arguments in the following forms:
      [{BOTH | LEADING | TRAILING} [remstr] FROM] str) |
      [remstr FROM] str

  sql/item_strfunc.h@1.73.2.18, 2006-07-19 12:36:54-07:00, igor@olga.mysql.com +4 -0
    Fixed bug #17526: incorrect print method
    for class Item_func_trim.
        
    Added an implementation for the virtual function print
    in the class Item_func_trim.
    Declared a virtual method to return the mode of the TRIM 
    function: LEADING, TRAILING or BOTH.
    Added implementations of this method for Item_func_trim and
    its descendants Item_func_ltrim and Item_func_rtrim.

ChangeSet@1.2196.1.34, 2006-07-19 14:33:56-04:00, cmiller@zippy.cornsilk.net +1 -0
  Bug #14448: delimiter in 'prompt'
  
  "I want to have the current delimiter in the prompt so that I can know at 
  a glance which is set."
  
  Add a 'l' format specifier that represents the current statement delimiter.

  client/mysql.cc@1.208.1.1, 2006-07-19 14:33:54-04:00, cmiller@zippy.cornsilk.net +3 -0
    Add a 'l' prompt format specifier, which becomes the current delimiter
    string in the prompt.

ChangeSet@1.2208, 2006-07-19 16:50:55+02:00, tnurnberg@salvation.intern.azundris.com +1 -0
  manual merge, part 2/2

  mysql-test/r/mysqldump.result@1.105, 2006-07-19 16:50:52+02:00, tnurnberg@salvation.intern.azundris.com +0 -1
    manual mergies, part 2/2

ChangeSet@1.1616.2694.3, 2006-07-19 15:55:04+02:00, msvensson@neptunus.(none) +2 -0
  Bug #21135 Crash in test "func_time"
   - backport patch from 5.0
   - "table" can be NULL in temporary fields used for type conversion
  TAG: mysql-4.1.21

  sql/field.cc@1.197.13.2, 2006-07-19 15:55:03+02:00, msvensson@neptunus.(none) +23 -23
    table can be NULL in temporary fields used for type conversion.
    Store value in field as if db_low_byte_first was set.

  sql/field.h@1.120.1.12, 2006-07-19 15:55:03+02:00, msvensson@neptunus.(none) +1 -1
    table can be NULL in temporary fields used for type conversion.
    Store value in field as if db_low_byte_first was set.

ChangeSet@1.2196.34.4, 2006-07-18 18:41:36-07:00, patg@govinda.patg.net +3 -0
  "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
  
  Post merge changes.

  mysql-test/r/federated.result@1.36, 2006-07-18 18:41:34-07:00, patg@govinda.patg.net +0 -1
    "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
    
    Post merge changes.

  mysql-test/t/federated.test@1.32, 2006-07-18 18:41:34-07:00, patg@govinda.patg.net +0 -1
    "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
    
    Post merge changes.

  sql/ha_federated.cc@1.67, 2006-07-18 18:41:34-07:00, patg@govinda.patg.net +5 -2
    "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
    
    Post merge changes.

ChangeSet@1.1616.2144.170, 2006-07-19 02:46:48+02:00, kent@mysql.com +1 -0
  mysql.spec.sh:
    Added new "mysql_explain_log" man page
    Added missing install of "myisam_ftdump" man page
    Added missing install of "mysqlman" man page

  support-files/mysql.spec.sh@1.83.1.39, 2006-07-19 02:23:53+02:00, kent@mysql.com +3 -0
    Added new "mysql_explain_log" man page
    Added missing install of "myisam_ftdump" man page
    Added missing install of "mysqlman" man page

ChangeSet@1.2196.46.1, 2006-07-18 16:04:18-07:00, jimw@rama.(none) +11 -0
  Bug #19498: Inconsistent support for DEFAULT in TEXT columns
  
    When a default of '' was specified for TEXT/BLOB columns, the specification
    was silently ignored. This is presumably to be nice to applications (or
    people) who generate their column definitions in a not-very-clever fashion.
  
    For clarity, doing this now results in a warning, or an error in strict
    mode.

  mysql-test/r/federated.result@1.33.1.1, 2006-07-18 16:04:15-07:00, jimw@rama.(none) +4 -0
    Update results

  mysql-test/r/fulltext_distinct.result@1.6, 2006-07-18 16:04:15-07:00, jimw@rama.(none) +2 -0
    Update results

  mysql-test/r/fulltext_update.result@1.5, 2006-07-18 16:04:15-07:00, jimw@rama.(none) +2 -0
    Update results

  mysql-test/r/gis-rtree.result@1.18, 2006-07-18 16:04:15-07:00, jimw@rama.(none) +6 -0
    Update results

  mysql-test/r/gis.result@1.32.1.2, 2006-07-18 16:04:15-07:00, jimw@rama.(none) +2 -0
    Update results

  mysql-test/r/join_outer.result@1.49, 2006-07-18 16:04:15-07:00, jimw@rama.(none) +2 -0
    Update results

  mysql-test/r/order_by.result@1.52, 2006-07-18 16:04:15-07:00, jimw@rama.(none) +2 -0
    Update results

  mysql-test/r/type_blob.result@1.51, 2006-07-18 16:04:15-07:00, jimw@rama.(none) +20 -0
    Add new results

  mysql-test/r/type_ranges.result@1.39.1.1, 2006-07-18 16:04:15-07:00, jimw@rama.(none) +3 -0
    Update results

  mysql-test/t/type_blob.test@1.32, 2006-07-18 16:04:15-07:00, jimw@rama.(none) +15 -0
    Add new test

  sql/field.cc@1.314.1.1, 2006-07-18 16:04:15-07:00, jimw@rama.(none) +19 -2
    Issue a warning when setting '' as the default on a BLOB/TEXT column,
    and make it an error in strict mode. Also, clarify comments about when
    NO_DEFAULT_VALUE_FLAG is set.

ChangeSet@1.2196.45.2, 2006-07-18 16:43:39+05:00, holyfoot@mysql.com +5 -0
  merging

  libmysql/libmysql.c@1.246, 2006-07-18 16:43:35+05:00, holyfoot@mysql.com +3 -2
    merging

  libmysqld/lib_sql.cc@1.113, 2006-07-18 16:43:35+05:00, holyfoot@mysql.com +0 -14
    merging

  libmysqld/libmysqld.c@1.71, 2006-07-18 16:43:35+05:00, holyfoot@mysql.com +1 -2
    merging

  sql/sql_parse.cc@1.560.1.2, 2006-07-18 16:43:35+05:00, holyfoot@mysql.com +1 -0
    merging

  tests/mysql_client_test.c@1.191, 2006-07-18 16:43:35+05:00, holyfoot@mysql.com +1 -1
    merging

ChangeSet@1.1616.2144.168, 2006-07-18 15:53:12+05:00, bar@mysql.com +2 -0
  Backporting Kostja's changes made for 5.0 into 4.1.
  Please use "ul" when merging this changeset to 5.0.

  sql/item_timefunc.cc@1.51.1.54, 2006-07-18 15:53:06+05:00, bar@mysql.com +3 -2
    Fix a valgrind warning in type_date test.

  sql/sql_locale.cc@1.1.2.1, 2006-07-18 15:53:07+05:00, bar@mysql.com +109 -109
    Fix a Windows build failure:  "false" -> FALSE

ChangeSet@1.2196.1.32, 2006-07-18 12:41:41+02:00, msvensson@neptunus.(none) +2 -0
  Bug#18539 uncompress(d) is null: impossible?
   - Add a check that length of field to uncompress is longer than 4 bytes.
     This can be dones as the length of uncompressed data is written as 
     first four bytes of field and thus it can't be valid compressed data.

  mysql-test/r/func_compress.result@1.19, 2006-07-18 12:41:38+02:00, msvensson@neptunus.(none) +5 -5
    Update test results

  sql/item_strfunc.cc@1.276, 2006-07-18 12:41:38+02:00, msvensson@neptunus.(none) +10 -0
    Is size of field is less than or equal to 4 bytes, indicate data is uncompressable/corrupt.

ChangeSet@1.2196.43.1, 2006-07-17 16:45:04-07:00, patg@govinda.patg.net +3 -0
  "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
  
  Removed logic in ha_federated::write_row, which checks field query ids in the
  loop which builds the query to run on the remote server.

  mysql-test/r/federated.result@1.26.5.1, 2006-07-17 16:45:00-07:00, patg@govinda.patg.net +38 -0
    "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
    
    
    New test results for test that verifies that one can insert to rows using 
    "insert into... select * from..", delete 
    them by id, then immediately insert them in the same way they were originally 
    inserted.

  mysql-test/t/federated.test@1.22.5.1, 2006-07-17 16:45:00-07:00, patg@govinda.patg.net +57 -0
    "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
    
    
    New test that verifies that one can insert to rows using 
    "insert into... select * from..", delete 
    them by id, then immediately insert them in the same way they were originally 
    inserted.

  sql/ha_federated.cc@1.60.1.3, 2006-07-17 16:45:00-07:00, patg@govinda.patg.net +24 -67
    "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
    
    Removed the logic in ha_federated::write_row which checked the query id of 
    each field and compared it to the thread query id.
    
    Each field has a query id, and the problem used to be that if I did an insert
    no fields specified, the field value would contain the last inserted value 
    for that field. The way to work around this was to see if the query id for 
    that field was the same as the current query id or of the rest of the field 
    query ids. If it wasn't, that told me the query didn't have the field value 
    specified.
    
    Somewhere from when I wrote that code to now the problem went away, and there
    was no longer the need for this logic. 
    
    Also removed the bool "has_fields", which needs not exist and using 
    table->s->fields is sufficient.
    

ChangeSet@1.2203, 2006-07-17 15:28:24-07:00, igor@rurik.mysql.com +1 -0
  Post-merge fix.

  mysql-test/r/subselect.result@1.150, 2006-07-17 15:28:16-07:00, igor@rurik.mysql.com +1 -0
    Post-merge fix.

ChangeSet@1.1616.2694.2, 2006-07-17 20:40:41+02:00, joerg@trift2. +12 -0
  Changes to make "sql/sql_locale.cc" compile + link on Windows:
  1) When initializing a boolean variable, do not use string representations '"false"' and '"true"' 
      but rather the boolean values 'false' and 'true'.
  2) Add the module to the various Windows description files.

  VC++Files/libmysqld/libmysqld.dsp@1.12.1.12, 2006-07-17 20:40:39+02:00, joerg@trift2. +4 -0
    Add "sql/sql_locale.cpp" with similar settings as the other files.

  VC++Files/libmysqld/libmysqld.vcproj@1.1.1.2, 2006-07-17 20:40:39+02:00, joerg@trift2. +36 -0
    Add "sql/sql_locale.cpp" with similar settings as the other files.

  VC++Files/libmysqld/libmysqld_ia64.dsp@1.2.1.1, 2006-07-17 20:40:39+02:00, joerg@trift2. +4 -0
    Add "sql/sql_locale.cpp" with similar settings as the other files.

  VC++Files/mysqldemb/mysqldemb.dsp@1.11.1.1, 2006-07-17 20:40:39+02:00, joerg@trift2. +4 -0
    Add "sql/sql_locale.cpp" with similar settings as the other files.

  VC++Files/mysqldemb/mysqldemb.vcproj@1.3, 2006-07-17 20:40:39+02:00, joerg@trift2. +36 -0
    Add "sql/sql_locale.cpp" with similar settings as the other files.

  VC++Files/mysqldemb/mysqldemb_ia64.dsp@1.2, 2006-07-17 20:40:39+02:00, joerg@trift2. +4 -0
    Add "sql/sql_locale.cpp" with similar settings as the other files.

  VC++Files/sql/mysqld.dsp@1.17.1.19, 2006-07-17 20:40:39+02:00, joerg@trift2. +4 -0
    Add "sql/sql_locale.cpp" with similar settings as the other files.

  VC++Files/sql/mysqld.vcproj@1.1.1.2, 2006-07-17 20:40:39+02:00, joerg@trift2. +76 -0
    Add "sql/sql_locale.cpp" with similar settings as the other files.

  VC++Files/sql/mysqld_ia64.dsp@1.2.1.1, 2006-07-17 20:40:39+02:00, joerg@trift2. +4 -0
    Add "sql/sql_locale.cpp" with similar settings as the other files.

  VC++Files/sql/mysqldmax.dsp@1.5.1.1, 2006-07-17 20:40:39+02:00, joerg@trift2. +16 -0
    Add "sql/sql_locale.cpp" with similar settings as the other files.

  VC++Files/sql/mysqldmax_ia64.dsp@1.3, 2006-07-17 20:40:39+02:00, joerg@trift2. +25 -0
    Add "sql/sql_locale.cpp" with similar settings as the other files.

  sql/sql_locale.cc@1.1.1.1, 2006-07-17 20:40:39+02:00, joerg@trift2. +109 -109
    When initializing a boolean variable, do not use stringrepresentations '"false"' and '"true"' 
    but rather the boolean values 'false' and 'true'.

ChangeSet@1.1616.2694.1, 2006-07-17 19:38:46+02:00, joerg@trift2. +1 -0
  strings/strtod.c  :  Ensure the definition of "EOVERFLOW" is available.
  In 5.0, this is already solved, so that is a null-merge ("ul").

  strings/strtod.c@1.15.1.3, 2006-07-17 19:38:44+02:00, joerg@trift2. +1 -1
    This file needs the definition of "EOVERFLOW",
    which is on some platforms (Windows, OpenBSD) provided only by "my_base.h".
    As this in turn includes "my_global.h", the include file name can be changed.

ChangeSet@1.2196.40.4, 2006-07-17 16:12:42+04:00, evgen@moonbone.local +2 -0
  select.result, select.test:
    Test case for bug#10977 altered to make it work in both plain and ps-protocol modes.

  mysql-test/r/select.result@1.133, 2006-07-17 16:11:50+04:00, evgen@moonbone.local +4 -3
    Test case for bug#10977 altered to make it work in both plain and ps-protocol modes.

  mysql-test/t/select.test@1.109, 2006-07-17 16:11:22+04:00, evgen@moonbone.local +2 -1
    Test case for bug#10977 altered to make it work in both plain and ps-protocol modes.

ChangeSet@1.2196.41.1, 2006-07-17 14:48:40+04:00, kroki@moonlight.intranet +3 -0
  Bug#21013: Performance Degrades when importing data that uses Trigger
             and Stored Procedure
  
  The essence of the bug was that for every re-execution of stored
  routine or prepared statement new items for character set conversions
  were created, thus increasing the number of items and the time of their
  processing, and creating memory leak.
  
  No test case is provided since current test suite can't cover such type
  of bugs.

  mysql-test/r/sp.result@1.202.1.1, 2006-07-17 14:48:38+04:00, kroki@moonlight.intranet +12 -0
    Add result for bug#21013: Performance Degrades when importing data
    that uses Trigger and Stored Procedure.

  mysql-test/t/sp.test@1.191, 2006-07-17 14:48:38+04:00, kroki@moonlight.intranet +27 -0
    Add test case for bug#21013: Performance Degrades when importing data
    that uses Trigger and Stored Procedure.

  sql/item.cc@1.227.1.1, 2006-07-17 14:48:38+04:00, kroki@moonlight.intranet +3 -2
    Switch arena only when in statement prepare mode.  Subsequent executions
    will use cached item tree.

ChangeSet@1.2196.40.3, 2006-07-17 14:22:21+04:00, evgen@moonbone.local +2 -0
  mysql.test, mysql.result:
    Corrected the test case after fixing bug#10977

  mysql-test/r/mysql.result@1.11, 2006-07-17 14:21:46+04:00, evgen@moonbone.local +4 -4
    Corrected the test case after fixing bug#10977

  mysql-test/t/mysql.test@1.11, 2006-07-17 14:21:29+04:00, evgen@moonbone.local +4 -4
    Corrected the test case after fixing bug#10977

ChangeSet@1.2164.5.2, 2006-07-17 10:50:20+02:00, msvensson@shellback.(none) +93 -0
  Import yaSSL version 1.3.7
   - Fix for "bug#16755 Please find a SSL library that is FLOSS-Exception / LGPL copyrighted"

  extra/yassl/FLOSS-EXCEPTIONS@1.1, 2006-07-12 21:15:01+02:00, msvensson@shellback.(none) +120 -0
    Import patch yassl.diff

  extra/yassl/FLOSS-EXCEPTIONS@1.0, 2006-07-12 21:15:01+02:00, msvensson@shellback.(none) +0 -0

  extra/yassl/README@1.5, 2006-06-28 03:36:47+02:00, msvensson@shellback.(none) +11 -1
    Import patch yassl.diff

  extra/yassl/include/buffer.hpp@1.5, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/include/cert_wrapper.hpp@1.3, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/include/crypto_wrapper.hpp@1.4, 2006-07-12 22:54:55+02:00, msvensson@shellback.(none) +7 -1
    Import patch yassl.diff

  extra/yassl/include/factory.hpp@1.4, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/include/handshake.hpp@1.2, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +5 -1
    Import patch yassl.diff

  extra/yassl/include/lock.hpp@1.3, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/include/log.hpp@1.3, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/ssl.h@1.15, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +12 -0
    Import patch yassl.diff

  extra/yassl/include/socket_wrapper.hpp@1.7, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/include/timer.hpp@1.2, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/include/yassl_error.hpp@1.5, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/include/yassl_imp.hpp@1.4, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +6 -2
    Import patch yassl.diff

  extra/yassl/include/yassl_int.hpp@1.12, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +8 -2
    Import patch yassl.diff

  extra/yassl/include/yassl_types.hpp@1.13, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/mySTL/algorithm.hpp@1.2, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/mySTL/helpers.hpp@1.12, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/mySTL/list.hpp@1.8, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/mySTL/memory.hpp@1.4, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/mySTL/pair.hpp@1.2, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/mySTL/stdexcept.hpp@1.6, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/mySTL/vector.hpp@1.7, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/src/buffer.cpp@1.7, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/src/cert_wrapper.cpp@1.8, 2006-07-12 22:54:55+02:00, msvensson@shellback.(none) +6 -1
    Import patch yassl.diff

  extra/yassl/src/crypto_wrapper.cpp@1.8, 2006-07-12 22:54:55+02:00, msvensson@shellback.(none) +7 -12
    Import patch yassl.diff

  extra/yassl/src/handshake.cpp@1.10.1.1, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +14 -6
    Import patch yassl.diff

  extra/yassl/src/lock.cpp@1.5, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/src/log.cpp@1.6, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/src/socket_wrapper.cpp@1.10.1.1, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +15 -2
    Import patch yassl.diff

  extra/yassl/src/ssl.cpp@1.17, 2006-07-12 22:54:55+02:00, msvensson@shellback.(none) +40 -10
    Import patch yassl.diff

  extra/yassl/src/template_instnt.cpp@1.11, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/src/timer.cpp@1.8, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/src/yassl.cpp@1.2, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/src/yassl_error.cpp@1.7, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/src/yassl_imp.cpp@1.9, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +17 -5
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp@1.20, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +39 -4
    Import patch yassl.diff

  extra/yassl/taocrypt/include/aes.hpp@1.4, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/algebra.hpp@1.4, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/arc4.hpp@1.3, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/asn.hpp@1.7, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/block.hpp@1.8, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/blowfish.hpp@1.2, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/coding.hpp@1.2, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/des.hpp@1.4, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/dh.hpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/dsa.hpp@1.2, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/error.hpp@1.4, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/file.hpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/hash.hpp@1.6, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/hmac.hpp@1.5, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/integer.hpp@1.10, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/kernelc.hpp@1.2, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/md2.hpp@1.2, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/md4.hpp@1.2, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/md5.hpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/misc.hpp@1.13, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/modarith.hpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/modes.hpp@1.7, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/pwdbased.hpp@1.2, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/random.hpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/ripemd.hpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/rsa.hpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/runtime.hpp@1.14.1.1, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +7 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/sha.hpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/twofish.hpp@1.2, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/type_traits.hpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/types.hpp@1.10, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/aes.cpp@1.4, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/aestables.cpp@1.5, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/algebra.cpp@1.10, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/arc4.cpp@1.5, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/asn.cpp@1.8, 2006-07-12 22:54:55+02:00, msvensson@shellback.(none) +5 -10
    Import patch yassl.diff

  extra/yassl/taocrypt/src/bftables.cpp@1.2, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/blowfish.cpp@1.2, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/coding.cpp@1.5, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/des.cpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/dh.cpp@1.7, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/dsa.cpp@1.6, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/file.cpp@1.4, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/hash.cpp@1.4, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/integer.cpp@1.24, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/md2.cpp@1.2, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/md4.cpp@1.2, 2006-07-12 21:15:04+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/md5.cpp@1.4, 2006-07-12 21:15:04+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/misc.cpp@1.14, 2006-07-12 21:15:04+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/random.cpp@1.9, 2006-07-12 21:15:04+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/ripemd.cpp@1.4, 2006-07-12 21:15:04+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/rsa.cpp@1.8, 2006-07-12 21:15:04+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/sha.cpp@1.4, 2006-07-12 21:15:04+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/template_instnt.cpp@1.11, 2006-07-12 21:15:04+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/tftables.cpp@1.2, 2006-07-12 21:15:04+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/twofish.cpp@1.2, 2006-07-12 21:15:04+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

ChangeSet@1.2196.40.2, 2006-07-16 01:18:08+04:00, evgen@moonbone.local +1 -0
  errmsg.txt:
    Fixed bug#10977: No warning issued if a column name is truncated
    New warning message is added.

  sql/share/errmsg.txt@1.64.1.2, 2006-07-16 01:17:57+04:00, evgen@moonbone.local +2 -0
    Fixed bug#10977: No warning issued if a column name is truncated
    New warning message is added.

ChangeSet@1.2196.40.1, 2006-07-16 00:45:38+04:00, evgen@moonbone.local +4 -0
  Fixed bug#10977: No warning issued if a column name is truncated
  
  When an alias is set to a column leading spaces are removed from the alias.
  But when this is done on aliases set by user this can lead to confusion.
  
  Now Item::set_name() method issues the warning if leading spaces were removed
  from an alias set by user.
  
  New warning message is added.

  mysql-test/r/select.result@1.132, 2006-07-16 00:44:24+04:00, evgen@moonbone.local +5 -0
    Added test case for bug#10977:No warning issued if a column name is truncated.

  mysql-test/t/select.test@1.108, 2006-07-16 00:44:22+04:00, evgen@moonbone.local +5 -0
    Added test case for bug#10977:No warning issued if a column name is truncated.

  sql/item.cc@1.228, 2006-07-16 00:45:02+04:00, evgen@moonbone.local +6 -0
    Fixed bug#10977: No warning issued if a column name is truncated
    Now Item::set_name() method issues the warning if leading spaces were removed
    from an alias set by user.

  sql/sql_yacc.yy@1.474.1.1, 2006-07-16 00:44:43+04:00, evgen@moonbone.local +2 -2
    Fixed bug#10977: No warning issued if a column name is truncated
    The is_autogenerated_name flag is set before set_name() method call.

ChangeSet@1.2200, 2006-07-15 00:28:21-07:00, igor@rurik.mysql.com +3 -0
  Fixed bug #20869.
  The bug caused a crash of the server if a subquery with
  ORDER BY DESC used the range access method.
  The bug happened because the method QUICK_SELECT_DESC::reset
  was not reworked after MRR interface had been introduced.

  mysql-test/r/subselect.result@1.147.1.1, 2006-07-15 00:28:13-07:00, igor@rurik.mysql.com +36 -0
    Added a test case for bug #20869.

  mysql-test/t/subselect.test@1.120.1.1, 2006-07-15 00:28:13-07:00, igor@rurik.mysql.com +38 -0
    Added a test case for bug #20869.

  sql/opt_range.h@1.59, 2006-07-15 00:28:13-07:00, igor@rurik.mysql.com +1 -1
    Fixed bug #20869.
    The bug caused a crash of the server if a subquery with
    ORDER BY DESC used the range access method.
    The bug happened because the method QUICK_SELECT_DESC::reset
    was not reworked after MRR interface had been introduced.
    

ChangeSet@1.2196.36.7, 2006-07-14 19:28:58-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #20519.
  The bug was due to a loss happened during a refactoring made
  on May 30 2005 that modified the function JOIN::reinit.
  As a result of it for any subquery the value of offset_limit_cnt
  was not restored for the following executions. Yet the first 
  execution of the subquery made it equal to 0.
  The fix restores this value in the function JOIN::reinit.  

  mysql-test/r/subselect.result@1.148, 2006-07-14 19:28:56-07:00, igor@olga.mysql.com +45 -0
    Added a test case fir bug #20519.

  mysql-test/t/subselect.test@1.121, 2006-07-14 19:28:56-07:00, igor@olga.mysql.com +40 -0
    Added a test case fir bug #20519.

  sql/sql_select.cc@1.434, 2006-07-14 19:28:56-07:00, igor@olga.mysql.com +5 -0
    Fixed bug #20519.
    The bug was due to a loss happened during a refactoring made
    on May 30 2005 that modified the function JOIN::reinit.
    As a result of it for any subquery the value of offset_limit_cnt
    was not restored for the following executions. Yet the first 
    execution of the subquery made it equal to 0.
    The fix restores this value in the function JOIN::reinit.  

ChangeSet@1.1616.2144.166, 2006-07-15 00:24:35+02:00, kent@mysql.com +1 -0
  mysql.spec.sh:
    Command "ndb_mgm" is an optional tool, and should only be in "ndb-tools" package (bug#21058)

  support-files/mysql.spec.sh@1.83.1.38, 2006-07-15 00:24:14+02:00, kent@mysql.com +0 -1
    Command "ndb_mgm" is an optional tool, and should only be in "ndb-tools" package (bug#21058)

ChangeSet@1.2196.1.29, 2006-07-14 13:30:23-07:00, igreenhoe@anubis.greendragongames.com +1 -0
  4.1 -> 5.0 merge

  mysql-test/r/mysqldump.result@1.103, 2006-07-14 13:30:19-07:00, igreenhoe@anubis.greendragongames.com +2 -3
    4.1 -> 5.0 merge

ChangeSet@1.1616.2693.1, 2006-07-14 15:22:16-04:00, iggy@rolltop.ignatz42.dyndns.org +2 -0
  Bug #20721: mysql_install_db first line is blank.
  
  Minor script changes for uniformity.

  scripts/fill_func_tables.sh@1.2.2.1, 2006-07-14 15:22:14-04:00, iggy@rolltop.ignatz42.dyndns.org +8 -3
    Switched to standard !@PERL@ usage.  Added Copyright and more specific original author information.

  scripts/mysql_install_db.sh@1.37.1.37, 2006-07-14 15:22:14-04:00, iggy@rolltop.ignatz42.dyndns.org +0 -1
    Removed leading empty line.

ChangeSet@1.1616.2144.165, 2006-07-14 17:55:34+02:00, joerg@trift2. +1 -0
  Increment the version number to 4.1.22, as 4.1.21 is cloned.

  configure.in@1.201.64.10, 2006-07-14 17:55:31+02:00, joerg@trift2. +2 -2
    Increment the version number to 4.1.22, as 4.1.21 is cloned.

ChangeSet@1.2196.39.2, 2006-07-14 05:56:30-07:00, igreenhoe@anubis.greendragongames.com +5 -0
  4.1 -> 5.0 merge fixes

  mysql-test/r/mysqldump-max.result@1.4, 2006-07-14 05:56:26-07:00, igreenhoe@anubis.greendragongames.com +0 -12
    4.1 -> 5.0 merge fixes

  mysql-test/r/mysqldump.result@1.100.1.2, 2006-07-14 05:56:26-07:00, igreenhoe@anubis.greendragongames.com +0 -1
    4.1 -> 5.0 merge fixes

  mysql-test/r/ps.result@1.67.1.2, 2006-07-14 05:56:26-07:00, igreenhoe@anubis.greendragongames.com +14 -14
    4.1 -> 5.0 merge fixes

  sql/sql_lex.cc@1.190.1.2, 2006-07-14 05:56:26-07:00, igreenhoe@anubis.greendragongames.com +0 -1
    4.1 -> 5.0 merge fixes

  sql/table.cc@1.227.1.2, 2006-07-14 05:56:26-07:00, igreenhoe@anubis.greendragongames.com +0 -1
    4.1 -> 5.0 merge fixes

ChangeSet@1.1616.2692.1, 2006-07-14 16:26:58+05:00, ramil@mysql.com +7 -0
  --{skip-}merge option added which allows the user to disable merge engine and
  to avoid the potential security problem.
  (see bug #15195: Security Breach with MERGE table)

  mysql-test/r/warnings.result@1.27.1.5, 2006-07-14 16:26:50+05:00, ramil@mysql.com +7 -0
    --{skip-}merge option added which allows the user to disable merge engine and
    to avoid the potential security problem.
    (see bug #15195: Security Breach with MERGE table)

  mysql-test/t/warnings-master.opt@1.3, 2006-07-14 16:26:51+05:00, ramil@mysql.com +1 -1
    --{skip-}merge option added which allows the user to disable merge engine and
    to avoid the potential security problem.
    (see bug #15195: Security Breach with MERGE table)

  mysql-test/t/warnings.test@1.17.1.5, 2006-07-14 16:26:51+05:00, ramil@mysql.com +4 -0
    --{skip-}merge option added which allows the user to disable merge engine and
    to avoid the potential security problem.
    (see bug #15195: Security Breach with MERGE table)

  sql/handler.cc@1.103.19.16, 2006-07-14 16:26:51+05:00, ramil@mysql.com +2 -2
    --{skip-}merge option added which allows the user to disable merge engine and
    to avoid the potential security problem.
    (see bug #15195: Security Breach with MERGE table)

  sql/mysql_priv.h@1.186.91.52, 2006-07-14 16:26:51+05:00, ramil@mysql.com +1 -1
    --{skip-}merge option added which allows the user to disable merge engine and
    to avoid the potential security problem.
    (see bug #15195: Security Breach with MERGE table)

  sql/mysqld.cc@1.356.98.26, 2006-07-14 16:26:51+05:00, ramil@mysql.com +10 -2
    --{skip-}merge option added which allows the user to disable merge engine and
    to avoid the potential security problem.
    (see bug #15195: Security Breach with MERGE table)

  sql/set_var.cc@1.34.66.2, 2006-07-14 16:26:52+05:00, ramil@mysql.com +1 -0
    --{skip-}merge option added which allows the user to disable merge engine and
    to avoid the potential security problem.
    (see bug #15195: Security Breach with MERGE table)

ChangeSet@1.2196.36.6, 2006-07-14 12:09:36+03:00, gkodinov@macbook.gmz +1 -0
  fix for a compatibility build problem on MacOSX intel. 
  Discussed with Kent.

  ndb/test/ndbapi/Makefile.am@1.27, 2006-07-14 12:09:30+03:00, gkodinov@macbook.gmz +4 -0
    Fix for a compatibility build problem on MacOSX Intel.

ChangeSet@1.2196.36.4, 2006-07-13 22:00:20-07:00, igor@olga.mysql.com +1 -0
  Correction for test tesults after pushing the fix for bug 19714.

  mysql-test/r/ps_7ndb.result@1.44, 2006-07-13 22:00:19-07:00, igor@olga.mysql.com +2 -2
    Correction for test results after pushing the fix for bug 19714.

ChangeSet@1.2196.36.3, 2006-07-13 20:48:26-07:00, igor@olga.mysql.com +16 -0
  Fixed bug #19714.
  DESCRIBE returned the type BIGINT for a column of a view if the column
  was specified by an expression over values of the type INT.
      
  E.g. for the view defined as follows:
    CREATE VIEW v1 SELECT COALESCE(f1,f2) FROM t1
  DESCRIBE returned type BIGINT for the only column of the view if f1,f2 are
  columns of the INT type.
  At the same time DESCRIBE returned type INT for the only column of the table
  defined by the statement:
    CREATE TABLE t2 SELECT COALESCE(f1,f2) FROM t1.
      
  This inconsistency was removed by the patch.
  
  Now the code chooses between INT/BIGINT depending on the
  precision of the aggregated column type.
   
  Thus both DESCRIBE commands above returns type INT for v1 and t2.
   

  mysql-test/r/analyse.result@1.26, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +12 -12
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/bigint.result@1.33, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +1 -1
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/create.result@1.119, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +2 -2
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/olap.result@1.33, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +2 -2
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/ps_2myisam.result@1.41, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +2 -2
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/ps_3innodb.result@1.44, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +2 -2
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/ps_4heap.result@1.40, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +2 -2
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/ps_5merge.result@1.41, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +4 -4
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/ps_6bdb.result@1.43, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +2 -2
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/ps_7ndb.result@1.43, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +2 -2
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/sp.result@1.203, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +1 -1
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/subselect.result@1.147, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +6 -6
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/type_ranges.result@1.40, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +2 -2
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/view.result@1.165, 2006-07-13 20:48:24-07:00, igor@olga.mysql.com +11 -0
    Added a test case for bug #19714.

  mysql-test/t/view.test@1.150, 2006-07-13 20:48:24-07:00, igor@olga.mysql.com +13 -0
    Added a test case for bug #19714.

  sql/sql_select.cc@1.432, 2006-07-13 20:48:24-07:00, igor@olga.mysql.com +7 -2
    Fixed bug #19714.
    DESCRIBE returned the type BIGINT for a column of a view if the column
    was specified by an expression over values of the type INT.
        
    E.g. for the view defined as follows:
      CREATE VIEW v1 SELECT COALESCE(f1,f2) FROM t1
    DESCRIBE returned type BIGINT for the only column of the view if f1,f2 are
    columns of the INT type.
    At the same time DESCRIBE returned type INT for the only column of the table
    defined by the statement:
      CREATE TABLE t2 SELECT COALESCE(f1,f2) FROM t1.
        
    This inconsistency was removed by the patch.
    
    Now the code chooses between INT/BIGINT depending on the
    precision of the aggregated column type.
     
    Thus both DESCRIBE commands above returns type INT for v1 and t2.
     

ChangeSet@1.2196.38.1, 2006-07-14 01:25:13+02:00, tnurnberg@mysql.com +3 -0
  Bug#21014: Segmentation fault of mysqldump on view
  
  mysqldump did not select the correct database before trying to dump
  views from it. this resulted in an empty result set, which in turn
  startled mysql-dump into a core-dump.  this only happened for views,
  not for tables, and was only visible with multiple databases that
  weren't by sheer luck in the order mysqldump required, anyway. this
  fixes by selecting the correct database before dumping views; it also
  catches the empty set-condition if it should occur for other reasons.

  client/mysqldump.c@1.233, 2006-07-14 01:25:06+02:00, tnurnberg@mysql.com +9 -2
    Bug#21014: Segmentation fault of mysqldump on view
    
    failsafe: if "select ... from information_schema.views" returns an
    empty set, don't deref NULL; throw an error instead.
    
    fix: select the correct database not only before dumping tables, but
    before dumping views, as well.

  mysql-test/r/mysqldump.result@1.101, 2006-07-14 01:25:06+02:00, tnurnberg@mysql.com +61 -0
    Bug#21014: Segmentation fault of mysqldump on view
    
    show that mysqldump selects the correct database before trying to dump
    views from it.

  mysql-test/t/mysqldump.test@1.96, 2006-07-14 01:25:06+02:00, tnurnberg@mysql.com +18 -0
    Bug#21014: Segmentation fault of mysqldump on view
    
    show that mysqldump selects the correct database before trying to dump
    views from it.

ChangeSet@1.2191.36.3, 2006-07-13 10:48:34-04:00, iggy@rolltop.ignatz42.dyndns.org +1 -0
  Bug #19779: mysql_explain_log documentation is outdated.

  scripts/mysql_explain_log.sh@1.4, 2006-07-13 10:48:31-04:00, iggy@rolltop.ignatz42.dyndns.org +13 -11
    Changed explain_log.pl to mysql_explain_log.  Added usage information for printerror. Minor cleanup.

ChangeSet@1.2191.39.1, 2006-07-13 17:12:31+04:00, kroki@moonlight.intranet +8 -0
  Bug#18630: Arguments of suid routine calculated in wrong security
             context.
  
  Routine arguments were evaluated in the security context of the routine
  itself, not in the caller's context.
  
  The bug is fixed the following way:
  
    - Item_func_sp::find_and_check_access() has been split into two
      functions: Item_func_sp::find_and_check_access() itself only
      finds the function and check that the caller have EXECUTE privilege
      on it.  New function set_routine_security_ctx() changes security
      context for SUID routines and checks that definer have EXECUTE
      privilege too.
  
    - new function sp_head::execute_trigger() is called from
      Table_triggers_list::process_triggers() instead of
      sp_head::execute_function(), and is effectively just as the
      sp_head::execute_function() is, with all non-trigger related code
      removed, and added trigger-specific security context switch.
  
    - call to Item_func_sp::find_and_check_access() stays outside
      of sp_head::execute_function(), and there is a code in
      sql_parse.cc before the call to sp_head::execute_procedure() that
      checks that the caller have EXECUTE privilege, but both
      sp_head::execute_function() and sp_head::execute_procedure() call
      set_routine_security_ctx() after evaluating their parameters,
      and restore the context after the body is executed.

  mysql-test/r/sp-security.result@1.31, 2006-07-13 17:12:27+04:00, kroki@moonlight.intranet +52 -0
    Add test case for bug#18630: Arguments of suid routine calculated
    in wrong security context.

  mysql-test/t/sp-security.test@1.34, 2006-07-13 17:12:27+04:00, kroki@moonlight.intranet +77 -1
    Add result for bug#18630: Arguments of suid routine calculated
    in wrong security context.

  sql/item_func.cc@1.291.1.1, 2006-07-13 17:12:27+04:00, kroki@moonlight.intranet +28 -56
    Do not change security context before executing the function, as it
    will be changed after argument evaluation.
    Do not change security context in Item_func_sp::find_and_check_access().

  sql/item_func.h@1.140.1.1, 2006-07-13 17:12:28+04:00, kroki@moonlight.intranet +1 -2
    Change prototype for Item_func_sp::find_and_check_access().

  sql/sp_head.cc@1.219, 2006-07-13 17:12:28+04:00, kroki@moonlight.intranet +186 -4
    Add set_routine_security_ctx() function.
    Add sp_head::execute_trigger() method.
    Change security context in sp_head::execute_trigger(), and in
    sp_head::execute_function() and sp_head::execute_procedure()
    after argument evaluation.
    Move pop_all_cursors() call to sp_head::execute().

  sql/sp_head.h@1.86, 2006-07-13 17:12:28+04:00, kroki@moonlight.intranet +8 -0
    Add declaration for sp_head::execute_trigger() and
    set_routine_security_ctx().

  sql/sql_parse.cc@1.556.5.1, 2006-07-13 17:12:28+04:00, kroki@moonlight.intranet +1 -17
    Do not change security context before executing the procedure, as it
    will be changed after argument evaluation.

  sql/sql_trigger.cc@1.49.5.1, 2006-07-13 17:12:28+04:00, kroki@moonlight.intranet +3 -32
    Call new sp_head::execute_trigger() instead of
    sp_head::execute_function(), which is responsible to switch
    security context.

ChangeSet@1.1616.2691.1, 2006-07-13 00:31:47-07:00, igreenhoe@anubis.greendragongames.com +1 -0
  Fix for Bug #19364 "mysql --help gives old informations".
  
  Old option ordering in the help was confusing to some users.  Changed
  ordering of deprecated options to be consistent, and added mention to
  entry for options with a "--no-option" variant mentioning the
  "--disable-option" variant.

  client/mysql.cc@1.121.18.1, 2006-07-13 00:31:43-07:00, igreenhoe@anubis.greendragongames.com +10 -12
    Rearranged options for clarity.  Deprecated "--no-X" options now
    follow the "--X" option, and all of the "--X" options that have a
    "--no-X" variant now mention the "--disable-X" variant.

ChangeSet@1.1616.2686.2, 2006-07-13 09:04:06+02:00, tnurnberg@mysql.com +3 -0
  Bug#20432: mysql client interprets commands in comments
  
  do not look for client-specific commands while inside a multi-line comment.
  we will allow multi-comments pretty much anywhere within SQL-statements,
  but client-specific commands (help, use, print, ...) must be the first token
  in the input.

  mysql-test/r/mysql_client.result@1.1, 2006-07-13 09:04:04+02:00, tnurnberg@mysql.com +4 -0
    Bug#20432: mysql client interprets commands in comments
    test client-side parsing of comments and client-specific commands

  mysql-test/r/mysql_client.result@1.0, 2006-07-13 09:04:04+02:00, tnurnberg@mysql.com +0 -0

  mysql-test/t/mysql_client.test@1.1, 2006-07-13 09:04:04+02:00, tnurnberg@mysql.com +29 -0
    Bug#20432: mysql client interprets commands in comments
    test client-side parsing of comments and client-specific commands

  mysql-test/t/mysql_client.test@1.0, 2006-07-13 09:04:04+02:00, tnurnberg@mysql.com +0 -0

  client/mysql.cc@1.121.17.1, 2006-07-13 09:04:04+02:00, tnurnberg@mysql.com +1 -1
    Bug#20432: mysql client interprets commands in comments

ChangeSet@1.2196.34.1, 2006-07-12 16:33:29-07:00, jimw@rama.(none) +5 -0
  Bug #17608: String literals lost during INSERT query on FEDERATED table
  
    The Federated storage engine used Field methods that had arbitrary limits on
    the amount of data they could process, which caused problems with data
    over that limit (4K). By removing those Field methods and just using
    features of the String class, we can avoid this problem.

  mysql-test/r/federated.result@1.34, 2006-07-12 16:33:26-07:00, jimw@rama.(none) +13 -0
    Add new results

  mysql-test/t/federated.test@1.30, 2006-07-12 16:33:26-07:00, jimw@rama.(none) +18 -0
    Add new regression test

  sql/field.cc@1.315, 2006-07-12 16:33:26-07:00, jimw@rama.(none) +0 -98
    Remove unnecessary methods

  sql/field.h@1.184, 2006-07-12 16:33:26-07:00, jimw@rama.(none) +0 -2
    Remove unnecessary methods

  sql/ha_federated.cc@1.65, 2006-07-12 16:33:26-07:00, jimw@rama.(none) +21 -33
    Remove use of quote_data, use String::print() to get escaping of strings,
    and don't bother with needs_quotes, just always quote values.

ChangeSet@1.2196.32.3, 2006-07-12 13:22:38-07:00, jimw@rama.(none) +3 -0
  Bug #17903: cast to char results in binary
  
    The character set was not being properly initialized in CAST() with
    a type like "CHAR(2) BINARY", which resulted in incorrect results or
    even a crash.

  mysql-test/r/cast.result@1.46, 2006-07-12 13:22:35-07:00, jimw@rama.(none) +11 -0
    Add new results

  mysql-test/t/cast.test@1.32, 2006-07-12 13:22:36-07:00, jimw@rama.(none) +13 -1
    Add new regression test

  sql/sql_yacc.yy@1.475, 2006-07-12 13:22:36-07:00, jimw@rama.(none) +1 -1
    Make sure Lex->charset is set to NULL when nothing follows BINARY
    in type declaration.

ChangeSet@1.2196.33.1, 2006-07-12 12:30:22-07:00, jimw@rama.(none) +4 -0
  Bug #12673: Instance Manager: allows to stop the instance many times
  
    The instance manager was not actually checking whether an instance
    was actually running before trying to stop it. Now it checks first.

  mysql-test/r/im_life_cycle.result@1.7, 2006-07-12 12:30:19-07:00, jimw@rama.(none) +3 -0
    Add new results

  mysql-test/t/im_life_cycle.imtest@1.6, 2006-07-12 12:30:19-07:00, jimw@rama.(none) +8 -0
    Add new regression test

  server-tools/instance-manager/instance.cc@1.33, 2006-07-12 12:30:20-07:00, jimw@rama.(none) +23 -22
    Fix Instance::stop() to report ER_INSTANCE_IS_NOT_STARTED when that is
    the case. Also removed unnecessary goto.

  server-tools/instance-manager/messages.cc@1.6, 2006-07-12 12:30:20-07:00, jimw@rama.(none) +3 -3
    Fix messages with missing spaces

ChangeSet@1.2196.32.2, 2006-07-12 19:19:43+04:00, kostja@bodhi.local +1 -0
  Fix a valgrind warning in type_date test.

  sql/item_timefunc.cc@1.119, 2006-07-12 19:19:41+04:00, kostja@bodhi.local +3 -2
    Fix a valgrind warning in type_date test.	

ChangeSet@1.1616.2690.1, 2006-07-12 10:26:19-04:00, cmiller@calliope.local +1 -0
  Bug#18470: Compile Failure: strings.s fails make with unknown pseudo-ops
  
  The bug is thqt we use some nonstandard assembly codes in our strings
  source, and some assemblers don't know what to do with them:  Specifically,
  Sun's Solaris assembler and Apple's Darwin assembler balk at them.
  
  This patch, rather than trying to test for properties of the assembler, 
  which Autoconf doesn't have any decent facilites for, instead tries to
  compile the code in question and disables assembly if it fails.
  
  There's still the problem of unportable assembly, but I'll leave that 
  to someone who feels like rewriting and debugging it.

  configure.in@1.201.68.1, 2006-07-12 10:26:11-04:00, cmiller@calliope.local +1 -1
    Actually try to compile the code in question, since a test for the CPU
    type is insufficient to determine whether our code will compile.

ChangeSet@1.1616.2689.2, 2006-07-12 10:57:38+03:00, gkodinov@macbook.gmz +3 -0
  Bug #17212 results not sorted correctly by ORDER BY when using index
    * don't use join cache when the incoming data set is already ordered
      for ORDER BY
      This choice must be made because join cache will effectively
      reverse the join order and the results will be sorted by the index
      of the table that uses join cache.

  mysql-test/r/innodb_mysql.result@1.3.1.1, 2006-07-12 10:57:30+03:00, gkodinov@macbook.gmz +29 -0
    Bug #17212 results not sorted correctly by ORDER BY when using index
      * Test suite for the bug

  mysql-test/t/innodb_mysql.test@1.3.1.1, 2006-07-12 10:57:31+03:00, gkodinov@macbook.gmz +33 -0
    Bug #17212 results not sorted correctly by ORDER BY when using index
      * Test suite for the bug

  sql/sql_select.cc@1.216.126.9, 2006-07-12 10:57:32+03:00, gkodinov@macbook.gmz +19 -1
    Bug #17212 results not sorted correctly by ORDER BY when using index
      * don't use join cache when the incoming data set is already sorted

ChangeSet@1.2196.31.1, 2006-07-12 11:38:11+05:00, ramil@mysql.com +5 -0
  Fix for bug #19370: DateTime datatype in MySQL has two bugs in it

  mysql-test/r/date_formats.result@1.21.1.1, 2006-07-12 11:38:06+05:00, ramil@mysql.com +3 -1
    Fix for bug #19370: DateTime datatype in MySQL has two bugs in it
      - results adjusted

  mysql-test/r/strict.result@1.28, 2006-07-12 11:38:06+05:00, ramil@mysql.com +14 -6
    Fix for bug #19370: DateTime datatype in MySQL has two bugs in it
      - results adjusted

  mysql-test/r/type_datetime.result@1.31, 2006-07-12 11:38:06+05:00, ramil@mysql.com +3 -1
    Fix for bug #19370: DateTime datatype in MySQL has two bugs in it
      - results adjusted

  mysql-test/t/strict.test@1.22, 2006-07-12 11:38:06+05:00, ramil@mysql.com +16 -2
    Fix for bug #19370: DateTime datatype in MySQL has two bugs in it
      - tests adjusted

  sql-common/my_time.c@1.20, 2006-07-12 11:38:06+05:00, ramil@mysql.com +3 -1
    Fix for bug #19370: DateTime datatype in MySQL has two bugs in it
      - Regardless of the title of the bug the only real bug is that it
        doesn't make sense to have only some invalid parts in a date.
        E.g. a valid day among invalid years or months is totally ambiguous 
        and we should refuse to guess what it means.
    
        To fix it, we add a check that both the year is zero and either day
        or month are zero (year and (day or month)), and if they are then  we
        reject such dates. Doing so should adequately fix the reported problem.

ChangeSet@1.2191.38.1, 2006-07-11 17:28:50-07:00, jimw@rama.(none) +5 -0
  Bug #17766: The server accepts to create MERGE tables which cannot work
  
   Changed the error reporting (and a crash) when inserting data into a
   MERGE table that has no underlying tables or no INSERT_METHOD specified
   by reporting that it is read-only.

  include/my_base.h@1.77.1.1, 2006-07-11 17:28:48-07:00, jimw@rama.(none) +2 -1
    Add new handler error

  mysql-test/r/merge.result@1.48.1.1, 2006-07-11 17:28:48-07:00, jimw@rama.(none) +12 -0
    Update results

  mysql-test/t/merge.test@1.41.1.1, 2006-07-11 17:28:48-07:00, jimw@rama.(none) +16 -1
    Add new regression test

  sql/ha_myisammrg.cc@1.77.1.1, 2006-07-11 17:28:48-07:00, jimw@rama.(none) +4 -0
    When trying to insert into a MERGE table with no underlying tables
    or no INSERT_METHOD, report that it is read-only.

  sql/handler.cc@1.212.2.1, 2006-07-11 17:28:48-07:00, jimw@rama.(none) +4 -0
    Handle new error message

ChangeSet@1.1616.2688.1, 2006-07-12 01:52:18+04:00, evgen@moonbone.local +3 -0
  Fixed bug#18503: Queries with a quantified subquery returning empty set
  may return a wrong result.
  
  An Item_sum_hybrid object has the was_values flag which indicates whether any
  values were added to the sum function. By default it is set to true and reset
  to false on any no_rows_in_result() call. This method is called only in
  return_zero_rows() function. An ALL/ANY subquery can be optimized by MIN/MAX
  optimization. The was_values flag is used to indicate whether the subquery
  has returned at least one row. This bug occurs because return_zero_rows() is
  called only when we know that the select will return zero rows before
  starting any scans but often such information is not known.
  In the reported case the return_zero_rows() function is not called and
  the was_values flag is not reset to false and yet the subquery return no rows
  Item_func_not_all and Item_func_nop_all functions return a wrong
  comparison result.
  
  The end_send_group() function now calls no_rows_in_result() for each item
  in the fields_list if there is no rows were found for the (sub)query.

  mysql-test/r/subselect.result@1.67.62.1, 2006-07-12 01:41:19+04:00, evgen@moonbone.local +15 -0
    Added test case for bug#18503: Queries with a quantified subquery returning empty set may return a wrong result.
    

  mysql-test/t/subselect.test@1.58.45.1, 2006-07-12 01:41:01+04:00, evgen@moonbone.local +14 -0
    Added test case for bug#18503: Queries with a quantified subquery returning empty set may return a wrong result.

  sql/sql_select.cc@1.216.128.1, 2006-07-12 01:41:22+04:00, evgen@moonbone.local +5 -0
    Fixed bug#18503: Queries with a quantified subquery returning empty set may return a wrong result.
    
    The end_send_group() function now calls no_rows_in_result() for each item
    in the fields_list if there is no matching rows were found.

ChangeSet@1.2196.30.1, 2006-07-11 12:42:03-07:00, jimw@rama.(none) +1 -0
  Bug #17485: mysql client crashes when connecting to the Instance Manager
  
    Using \U or \u in a prompt with the mysql command-line client could
    crash when connecting to the instance manager, since it does not return
    information about the user when asked by the client. This is fixed by
    having the client use what it knowns about the user (or giving up and
    saying "(unknown)").

  client/mysql.cc@1.205.1.2, 2006-07-11 12:42:01-07:00, jimw@rama.(none) +4 -2
    init_username() may not retrieve a username (such as from the instance
    manager), in which case we fall back to what was specified on the command
    line (or .cnf file) or finally (unknown).

ChangeSet@1.2196.22.15, 2006-07-11 23:39:51+04:00, kostja@bodhi.local +6 -0
  Post-merge fixes for Bug#19399 "Stored Procedures 'Lost Connection' 
  when dropping/creating tables"

  mysql-test/r/ps.result@1.69, 2006-07-11 23:39:48+04:00, kostja@bodhi.local +141 -126
    A post-merge fix.

  mysql-test/t/ps.test@1.67, 2006-07-11 23:39:48+04:00, kostja@bodhi.local +13 -15
    A post-merge fix: all 5.0 tests should go after 4.1 tests.

  sql/sql_lex.cc@1.192, 2006-07-11 23:39:48+04:00, kostja@bodhi.local +1 -1
    auxilliary -> auxiliary

  sql/sql_prepare.cc@1.180, 2006-07-11 23:39:48+04:00, kostja@bodhi.local +2 -2
    auxilliary -> auxiliary

  sql/table.cc@1.229, 2006-07-11 23:39:48+04:00, kostja@bodhi.local +15 -2
    Update st_table_list::reinit_before_use in 5.0 to include 5.0-specific
    cleanups.

  sql/table.h@1.131, 2006-07-11 23:39:48+04:00, kostja@bodhi.local +1 -1
    st_table_list::reinit_before_use is public.

ChangeSet@1.1616.2686.1, 2006-07-11 13:06:29-04:00, cmiller@zippy.(none) +3 -0
  Bug#20729: Bad date_format() call makes mysql server crash
      
  The problem is that the author used the wrong function to send a warning to the 
  user about truncation of data.  push_warning() takes a constant string and 
  push_warning_printf() takes a format and variable arguments to fill it.
  
  Since the string we were complaining about contains percent characters, the 
  printf() code interprets the "%Y" et c. that the user sends.  That's wrong, and
  often causes a crash, especially if the date mentions seconds, "%s".
  
  A alternate fix would be to use  push_warning_printf(..., "%s", warn_buff) .

  mysql-test/r/date_formats.result@1.15.2.1, 2006-07-11 13:06:28-04:00, cmiller@zippy.(none) +6 -0
    Test that an invalid date doesn't crash the server.  We should get a warning back 
    instead of a dead socket.

  mysql-test/t/date_formats.test@1.11.2.1, 2006-07-11 13:06:28-04:00, cmiller@zippy.(none) +7 -1
    Test that an invalid date doesn't crash the server.  We should get a warning back 
    instead of a dead socket.

  sql/time.cc@1.49.1.4, 2006-07-11 13:06:28-04:00, cmiller@zippy.(none) +1 -1
    Don't try to use warn_buf as the start of a varible arguement list to send 
    to a warning-formatted my_vsnprintf() .

ChangeSet@1.1616.2564.8, 2006-07-11 17:07:23+02:00, pekka@orca.ndb.mysql.com +1 -0
  ndb - (4.1) trivial fix to error.log (wday=0 was printed as "x")

  ndb/src/kernel/error/TimeModule.cpp@1.3, 2006-07-11 17:06:09+02:00, pekka@orca.ndb.mysql.com +1 -1
    0=Sunday

ChangeSet@1.2196.29.1, 2006-07-11 15:54:52+04:00, petr@mysql.com +3 -0
  Fix Bug#15205 "Select from CSV table without the datafile causes crash"

  mysql-test/r/csv.result@1.5, 2006-07-11 15:54:22+04:00, petr@mysql.com +10 -0
    update result file

  mysql-test/t/csv.test@1.6, 2006-07-11 15:54:22+04:00, petr@mysql.com +24 -0
    add a test for the bug

  sql/examples/ha_tina.cc@1.23, 2006-07-11 15:54:22+04:00, petr@mysql.com +8 -5
    move open() call before my_hash_insert, so that we don't insert invalid
    share to the hash. To avoid other possible problems also add
    hash_delete(), so that the share is removed from hash before it is freed.

ChangeSet@1.2196.28.2, 2006-07-11 12:34:43+02:00, joerg@trift2. +1 -0
  Raise the version number.

  configure.in@1.392.1.9, 2006-07-11 12:34:40+02:00, joerg@trift2. +2 -2
    Raise the version number.

ChangeSet@1.2196.23.7, 2006-07-10 19:50:40-07:00, jimw@rama.(none) +3 -0
  Bug #18539: uncompress(d) is null: impossible?
  
    The UNCOMPRESS() function was not marked as maybe_null, even though
    it returns NULL on invalid data. This confused the optimizer.

  mysql-test/r/func_compress.result@1.18, 2006-07-10 19:50:39-07:00, jimw@rama.(none) +28 -0
    Add new results

  mysql-test/t/func_compress.test@1.14, 2006-07-10 19:50:39-07:00, jimw@rama.(none) +14 -0
    Add new regression test

  sql/item_strfunc.h@1.108.2.1, 2006-07-10 19:50:39-07:00, jimw@rama.(none) +1 -1
    Set maybe_null within Item_func_uncompress::fix_length_and_dec()

ChangeSet@1.2196.22.11, 2006-07-11 01:46:44+04:00, kostja@bodhi.local +1 -0
  Fix yet another Windows build failure: "true" -> TRUE

  sql/sql_locale.cc@1.3, 2006-07-11 01:46:42+04:00, kostja@bodhi.local +14 -14
    "true" -> TRUE

ChangeSet@1.2191.36.1, 2006-07-10 16:38:03-04:00, cmiller@zippy.(none) +2 -0
  A patch to Bug#17667 didn't take into consideration that the vardir, which contains
  the server's binlog file, might be set to a different directory.  This adds a new
  "vardir" parameter, which takes the name of the directory as a value, so that the 
  test_bug17667() test can find the binlog.  

  mysql-test/mysql-test-run.pl@1.102.1.1, 2006-07-10 16:38:01-04:00, cmiller@zippy.(none) +1 -0
    Add the "vardir" to the options passed to "mysql_test_client", so we know 
    where to find the binlog file.

  tests/mysql_client_test.c@1.187.2.1, 2006-07-10 16:38:01-04:00, cmiller@zippy.(none) +13 -3
    Receive a new option, "vardir".
    
    Use the vardir option to find the binlog file in test_bug17667() .

ChangeSet@1.1616.2684.1, 2006-07-11 00:34:37+04:00, evgen@moonbone.local +3 -0
  Fixed bug#16302: Quantified subquery without any tables gives wrong results
  
  The ALL/ANY subqueries are the subject of MIN/MAX optimization. The matter
  of this optimization is to embed MIN() or MAX() function into the subquery
  in order to get only one row by which we can tell whether the expression
  with ALL/ANY subquery is true or false.
  But when it is applied to a subquery like 'select a_constant' the reported bug
  occurs. As no tables are specified in the subquery the do_select() function 
  isn't called for the optimized subquery and thus no values have been added 
  to a MIN()/MAX() function and it returns NULL instead of a_constant.
  This leads to a wrong query result.
  
  For the subquery like 'select a_constant' there is no reason to apply
  MIN/MAX optimization because the subquery anyway will return at most one row.
  Thus the Item_maxmin_subselect class is more appropriate for handling such
  subqueries.
  
  The Item_in_subselect::single_value_transformer() function now checks
  whether tables are specified for the subquery. If no then this subselect is
  handled like a UNION using an Item_maxmin_subselect object.

  mysql-test/r/subselect.result@1.67.1.109, 2006-07-11 00:21:47+04:00, evgen@moonbone.local +18 -0
    Added test case for bug#16302: Quantified subquery without any tables gives wrong results

  mysql-test/t/subselect.test@1.58.1.96, 2006-07-11 00:21:29+04:00, evgen@moonbone.local +10 -0
    Added test case for bug#16302: Quantified subquery without any tables gives wrong results

  sql/item_subselect.cc@1.60.1.81, 2006-07-11 00:22:03+04:00, evgen@moonbone.local +2 -1
    Fixed bug#16302: Quantified subquery without any tables gives wrong results
     
    The Item_in_subselect::single_value_transformer() function now checks
    whether tables are specified for the subquery. If no then this subselect is
    handled like a UNION using an Item_maxmin_subselect object.

ChangeSet@1.2196.22.10, 2006-07-10 23:58:36+04:00, kostja@bodhi.local +1 -0
  Fix a Windows build failure. 

  sql/sql_locale.cc@1.2, 2006-07-10 23:58:34+04:00, kostja@bodhi.local +95 -95
    Fix Windows compilation failure "cannot convert from 'const char [6]' 
    to 'const BOOL'" and an apparent bug (use of "FALSE" instead of FALSE
    for initialization of is_ascii member of MY_LOCALE)

ChangeSet@1.2196.7.7, 2006-07-10 17:45:09+03:00, gkodinov@macbook.gmz +2 -0
  more 4.1->5.0 merge fixes for bug#14553

  mysql-test/r/rpl_insert_id.result@1.14.1.2, 2006-07-10 17:45:00+03:00, gkodinov@macbook.gmz +1 -1
    more merge fixes for bug#14553

  mysql-test/t/rpl_insert_id.test@1.16.1.2, 2006-07-10 17:45:01+03:00, gkodinov@macbook.gmz +0 -1
    more merge fixes for bug#14553

ChangeSet@1.1616.2683.1, 2006-07-10 16:27:03+03:00, gkodinov@mysql.com +7 -0
  BUG#14553: NULL in WHERE resets LAST_INSERT_ID
  
  To make MySQL compatible with some ODBC applications, you can find
  the AUTO_INCREMENT value for the last inserted row with the following query:
   SELECT * FROM tbl_name WHERE auto_col IS NULL.
  This is done with a special code that replaces 'auto_col IS NULL' with
  'auto_col = LAST_INSERT_ID'.
  However this also resets the LAST_INSERT_ID to 0 as it uses it for a flag
  so as to ensure that only the first SELECT ... WHERE auto_col IS NULL
  after an INSERT has this special behaviour.
  In order to avoid resetting the LAST_INSERT_ID a special flag is introduced
  in the THD class. This flag is used to restrict the second and subsequent
  SELECTs instead of LAST_INSERT_ID.

  mysql-test/r/odbc.result@1.8.1.1, 2006-07-10 16:27:01+03:00, gkodinov@mysql.com +11 -0
    test suite for the bug

  mysql-test/r/rpl_insert_id.result@1.10.1.2, 2006-07-10 16:27:01+03:00, gkodinov@mysql.com +14 -0
    test for the fix in replication

  mysql-test/t/odbc.test@1.7, 2006-07-10 16:27:01+03:00, gkodinov@mysql.com +10 -0
    test suite for the bug

  mysql-test/t/rpl_insert_id.test@1.9.1.3, 2006-07-10 16:27:01+03:00, gkodinov@mysql.com +19 -1
    test for the fix in replication

  sql/sql_class.cc@1.105.37.2, 2006-07-10 16:27:01+03:00, gkodinov@mysql.com +1 -0
    initialize the flag

  sql/sql_class.h@1.146.56.1, 2006-07-10 16:27:01+03:00, gkodinov@mysql.com +3 -0
    flag's declaration and set code when setting the last_insert_id

  sql/sql_select.cc@1.216.127.1, 2006-07-10 16:27:01+03:00, gkodinov@mysql.com +2 -2
    the special flag is used instead of last_insert_id

ChangeSet@1.2196.22.9, 2006-07-10 16:22:42+04:00, kostja@bodhi.local +2 -0
  Fix test results to be vardir-independent.

  mysql-test/r/myisam.result@1.79, 2006-07-10 16:22:39+04:00, kostja@bodhi.local +0 -8
    Fix test results.

  mysql-test/t/myisam.test@1.61, 2006-07-10 16:22:39+04:00, kostja@bodhi.local +4 -0
    In 5.0 show create table also outputs data directory.
    For the test for Bug#8706 it's MYSQLTEST_VARDIR, and there is no way
    to replace it with anything else in test output.

ChangeSet@1.2167.1.4, 2006-07-10 13:59:13+02:00, pekka@orca.ndb.mysql.com +6 -0
  ndb - bug#18781: close a tiny window (re-commit, try to by-pass merge jam)

  ndb/src/kernel/blocks/dbdict/DictLock.txt@1.3, 2006-07-10 13:57:54+02:00, pekka@orca.ndb.mysql.com +8 -4
    wait until SL_STARTED before sending DICT_UNLOCK_ORD

  ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.12, 2006-07-10 13:57:54+02:00, pekka@orca.ndb.mysql.com +3 -0
    wait until SL_STARTED before sending DICT_UNLOCK_ORD

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.51.1.1, 2006-07-10 13:57:55+02:00, pekka@orca.ndb.mysql.com +22 -18
    wait until SL_STARTED before sending DICT_UNLOCK_ORD

  ndb/src/kernel/vm/SimulatedBlock.cpp@1.25, 2006-07-10 13:57:55+02:00, pekka@orca.ndb.mysql.com +9 -0
    wait until SL_STARTED before sending DICT_UNLOCK_ORD

  ndb/src/kernel/vm/SimulatedBlock.hpp@1.18, 2006-07-10 13:57:55+02:00, pekka@orca.ndb.mysql.com +1 -0
    wait until SL_STARTED before sending DICT_UNLOCK_ORD

  ndb/test/run-test/daily-basic-tests.txt@1.38.1.1, 2006-07-10 13:57:55+02:00, pekka@orca.ndb.mysql.com +4 -0
    wait until SL_STARTED before sending DICT_UNLOCK_ORD

ChangeSet@1.2167.1.3, 2006-07-10 13:44:15+02:00, pekka@orca.ndb.mysql.com +5 -0
  ndb - bug#18781 : 5.0 : add NODE_START_REP from 5.1 (re-commit, try to by-pass merge jam)

  ndb/include/kernel/GlobalSignalNumbers.h@1.11.1.1, 2006-07-10 13:42:38+02:00, pekka@orca.ndb.mysql.com +1 -0
    5.0 : add NODE_START_REP from 5.1

  ndb/src/common/debugger/signaldata/SignalNames.cpp@1.7.1.1, 2006-07-10 13:42:38+02:00, pekka@orca.ndb.mysql.com +2 -0
    5.0 : add NODE_START_REP from 5.1

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@1.28.1.1, 2006-07-10 13:42:38+02:00, pekka@orca.ndb.mysql.com +7 -0
    5.0 : add NODE_START_REP from 5.1

  ndb/src/kernel/vm/SimulatedBlock.cpp@1.24, 2006-07-10 13:42:38+02:00, pekka@orca.ndb.mysql.com +6 -0
    5.0 : add NODE_START_REP from 5.1

  ndb/src/kernel/vm/SimulatedBlock.hpp@1.17, 2006-07-10 13:42:38+02:00, pekka@orca.ndb.mysql.com +1 -0
    5.0 : add NODE_START_REP from 5.1

ChangeSet@1.2196.22.8, 2006-07-10 14:53:49+04:00, kostja@bodhi.local +1 -0
  A post-merge fix (Bug#8706 "temporary table with data directory option 
  fails"

  mysql-test/t/myisam.test@1.60, 2006-07-10 14:53:47+04:00, kostja@bodhi.local +2 -2
    Fix myisam.test to work with non-default mysqltest var directory.

ChangeSet@1.2196.22.7, 2006-07-10 14:30:17+04:00, kostja@bodhi.local +4 -0
  Add sql_locale.cpp to our windows build scripts.

  VC++Files/libmysqld/libmysqld.dsp@1.31, 2006-07-10 14:30:14+04:00, kostja@bodhi.local +4 -0
    Add sql_locale.cpp

  VC++Files/libmysqld/libmysqld.vcproj@1.5, 2006-07-10 14:30:14+04:00, kostja@bodhi.local +36 -0
    Add sql_locale.cpp

  VC++Files/sql/mysqld.dsp@1.41.1.1, 2006-07-10 14:30:14+04:00, kostja@bodhi.local +4 -0
    Add sql_locale.cpp

  VC++Files/sql/mysqld.vcproj@1.8, 2006-07-10 14:30:14+04:00, kostja@bodhi.local +75 -0
    Add sql_locale.cpp

ChangeSet@1.2196.26.1, 2006-07-10 12:13:45+02:00, pekka@orca.ndb.mysql.com +1 -0
  ndb - bug#20847: non-debug compile fix (repeat since cannot merge 4.1->5.0)

  ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.16, 2006-07-10 12:12:42+02:00, pekka@orca.ndb.mysql.com +4 -0
    non-debug compile fix

ChangeSet@1.1616.2672.5, 2006-07-10 12:05:51+02:00, pekka@orca.ndb.mysql.com +1 -0
  ndb - bug#20847: non-debug compile fix

  ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.7.1.3, 2006-07-10 12:04:48+02:00, pekka@orca.ndb.mysql.com +4 -0
    non-debug compile fix

ChangeSet@1.2196.25.2, 2006-07-10 12:03:44+02:00, joerg@trift2. +1 -0
  support-files/mysql.spec.sh  :    Fix a typing error.

  support-files/mysql.spec.sh@1.148, 2006-07-10 12:03:41+02:00, joerg@trift2. +6 -2
    Fix a typing error in the "make" target for the Perl script to run the tests.

ChangeSet@1.2196.24.1, 2006-07-10 11:09:32+02:00, pekka@orca.ndb.mysql.com +1 -0
  mysql-test/Makefile.am: fix cp of mode 444 files (re-commit)

  mysql-test/Makefile.am@1.69.1.1, 2006-07-10 11:07:38+02:00, pekka@orca.ndb.mysql.com +5 -5
    fix cp of mode 444 files

ChangeSet@1.1616.2682.1, 2006-07-10 00:26:26+03:00, aelkin@dsl-hkigw8-feb1fb00-100.dhcp.inet.fi +1 -0
  BUG#20919 temp tables closing fails when binlog is off
  closing temp tables through end_thread
  had a flaw in binlog-off branch of close_temporary_tables where
  next table to close was reset via table->next
   for (table= thd->temporary_tables; table; table= table->next)
  which was wrong since the current table instance got destoyed at
  	close_temporary(table, 1);
  
  The fix adapts binlog-on branch method to engage the loop's internal 'next' variable which holds table->next prior table's destoying.
  

  sql/sql_base.cc@1.145.1.127, 2006-07-10 00:26:24+03:00, aelkin@dsl-hkigw8-feb1fb00-100.dhcp.inet.fi +5 -3
    no-binlog branch is fixed: scanning across temporary_tables must be careful to save next table since the current is being destroyed inside of close_temporary. 
    binlog-is-open case is ok.

ChangeSet@1.2196.22.6, 2006-07-09 13:03:51+04:00, kostja@bodhi.local +3 -0
  Fix compiler warnings in sql_udf.h: ISO C++ forbids casting
  between pointer to function and pointer to object.

  sql/item_func.cc@1.293, 2006-07-09 13:03:45+04:00, kostja@bodhi.local +2 -5
    Use typedef names instead of hard-coded types for udf init/deinit
    functions.

  sql/sql_udf.cc@1.56.1.2, 2006-07-09 13:03:45+04:00, kostja@bodhi.local +5 -5
    Use typedef names for udf function types.

  sql/sql_udf.h@1.15, 2006-07-09 13:03:46+04:00, kostja@bodhi.local +18 -13
    Fix compiler warnings in sql_udf.h: ISO C++ forbids casting
    between pointer to function and pointer to object.

ChangeSet@1.2196.22.4, 2006-07-08 04:07:43+04:00, kostja@bodhi.local +1 -0
  A post-merge fix.

  sql/set_var.h@1.78, 2006-07-08 04:07:39+04:00, kostja@bodhi.local +1 -1
    A post-merge fix.

ChangeSet@1.1346.1.839, 2006-07-07 16:47:57-04:00, cmiller@zippy.(none) +1 -0
  Add a more reliable "getconf" test for Linuxthreads.  The later trees should already
  have a better test (and so this should be null-merged there).
  
  ALSO!  Make it so that it accepts NPTL as a valid _equivalent_ implementation.

  configure.in@1.191.1.145, 2006-07-07 16:47:56-04:00, cmiller@zippy.(none) +15 -6
    Add a more reliable "getconf" test for Linuxthreads.  The later trees should already
    have a better test (and so this should be null-merged there).
    
    ALSO!  Make it so that it accepts NPTL as a valid _equivalent_ implementation.

ChangeSet@1.2196.22.2, 2006-07-08 00:03:43+04:00, kostja@bodhi.local +2 -0
  Cleanups: ignore more files.

  BitKeeper/etc/ignore@1.226, 2006-07-08 00:03:41+04:00, kostja@bodhi.local +7 -0
    Modify ignore list to work with BitKeeper 4

  mysql-test/t/mysqldump.test@1.95, 2006-07-08 00:03:41+04:00, kostja@bodhi.local +3 -4
    Fix the test for Bug#18462 to use MYSQLTEST_VARDIR instead of mysql-test/
    directory for temporary files. 

ChangeSet@1.2191.35.1, 2006-07-07 21:24:54+04:00, kroki@mysql.com +3 -0
  Bug#19207: Final parenthesis omitted for CREATE INDEX in Stored Procedure
  
  Wrong criteria was used to distinguish the case when there was no
  lookahead performed in the parser.  Bug affected only statements
  ending in one-character token without any optional tail, like CREATE
  INDEX and CALL.

  mysql-test/r/sp-code.result@1.7, 2006-07-07 21:24:52+04:00, kroki@mysql.com +9 -2
    Add result for bug#19207: Final parenthesis omitted for CREATE INDEX
    in Stored Procedure

  mysql-test/t/sp-code.test@1.5, 2006-07-07 21:24:52+04:00, kroki@mysql.com +22 -0
    Add test case for bug#19207: Final parenthesis omitted for CREATE INDEX
    in Stored Procedure

  sql/sql_yacc.yy@1.472.2.1, 2006-07-07 21:24:52+04:00, kroki@mysql.com +12 -4
    Use (yychar == YYEMPTY) as the criteria of whether lookahead was not
    performed.

ChangeSet@1.2196.7.5, 2006-07-07 17:27:11+03:00, gkodinov@mysql.com +1 -0
  Bug #20569 Garbage in DECIMAL results from some mathematical functions
   * portability fix: moved the macro call after the C declaration

  strings/decimal.c@1.70, 2006-07-07 17:27:03+03:00, gkodinov@mysql.com +1 -1
    Bug #20569 Garbage in DECIMAL results from some mathematical functions
     * moved the macro call after the C declaration

ChangeSet@1.1616.2548.13, 2006-07-07 16:01:35+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#20904
    Reset logpartstate if file_change_problem after writeing of zero page is done

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.39.1.25, 2006-07-07 16:01:30+02:00, jonas@perch.ndb.mysql.com +14 -0
    ndb - bug#20904
      Reset logpartstate if file_change_problem after writeing of zero page is done

ChangeSet@1.2196.19.2, 2006-07-07 17:06:30+05:00, bar@myoffice.izhnet.ru +3 -0
  func_str.result, func_str.test:
    Adding test case.
  item_strfunc.cc:
    bug#11728 string function LEFT, strange undocumented behaviour
    Fixing LEFT and RIGHT return NULL if the second
    argument is NULL.

  mysql-test/r/func_str.result@1.115.1.1, 2006-07-07 17:05:34+05:00, bar@myoffice.izhnet.ru +3 -0
    Adding test case.

  mysql-test/t/func_str.test@1.89.1.1, 2006-07-07 17:05:30+05:00, bar@myoffice.izhnet.ru +5 -0
    Adding test case.

  sql/item_strfunc.cc@1.272.1.1, 2006-07-07 17:04:31+05:00, bar@myoffice.izhnet.ru +2 -2
    bug#11728 string function LEFT, strange undocumented behaviour
    Fixing LEFT and RIGHT return NULL if the second
    argument is NULL.

ChangeSet@1.2133.7.5, 2006-07-07 20:10:15+10:00, stewart@willster.(none) +5 -0
  BUG#13985: Cluster: ndb_mgm "status" command can return incorrect data node status
  
  - only force HB to data nodes
  - flag for if we broadcast condition on receipt of HB

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.96.3.2, 2006-07-07 20:10:12+10:00, stewart@willster.(none) +19 -0
    Add get_connected_ndb_nodes to check status for connected data nodes only

  ndb/src/mgmsrv/MgmtSrvr.hpp@1.41.2.2, 2006-07-07 20:10:12+10:00, stewart@willster.(none) +1 -0
    add prototype for get_connected_ndb_nodes

  ndb/src/mgmsrv/Services.cpp@1.61.4.2, 2006-07-07 20:10:12+10:00, stewart@willster.(none) +1 -1
    only force HB to NDBD nodes

  ndb/src/ndbapi/ClusterMgr.cpp@1.26, 2006-07-07 20:10:12+10:00, stewart@willster.(none) +14 -5
    flag to control if we send the condition

  ndb/src/ndbapi/ClusterMgr.hpp@1.10, 2006-07-07 20:10:12+10:00, stewart@willster.(none) +1 -0
    flag for if we broadcast condition on receipt of hb

ChangeSet@1.1616.2672.3, 2006-07-07 10:57:22+02:00, pekka@mysql.com +6 -0
  ndb - bug#20847 : DbtupTabDesMan: add merge with left buddies

  ndb/src/kernel/blocks/ERROR_codes.txt@1.8.1.10, 2006-07-07 10:55:55+02:00, pekka@mysql.com +3 -1
    DbtupTabDesMan: add merge with left buddies

  ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.16.1.5, 2006-07-07 10:55:56+02:00, pekka@mysql.com +6 -3
    DbtupTabDesMan: add merge with left buddies

  ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.7.1.2, 2006-07-07 10:55:57+02:00, pekka@mysql.com +7 -0
    DbtupTabDesMan: add merge with left buddies

  ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp@1.4, 2006-07-07 10:55:57+02:00, pekka@mysql.com +136 -30
    DbtupTabDesMan: add merge with left buddies

  ndb/test/ndbapi/testDict.cpp@1.18.1.1, 2006-07-07 10:55:58+02:00, pekka@mysql.com +101 -0
    DbtupTabDesMan: add merge with left buddies

  ndb/test/run-test/daily-basic-tests.txt@1.13.2.13, 2006-07-07 10:55:58+02:00, pekka@mysql.com +4 -0
    DbtupTabDesMan: add merge with left buddies

ChangeSet@1.2133.7.4, 2006-07-07 18:39:38+10:00, stewart@willster.(none) +2 -0
  BUG#13985 Cluster: ndb_mgm "status" command can return incorrect data node status
  
  use existing transporter mutex

  ndb/src/ndbapi/ClusterMgr.cpp@1.25, 2006-07-07 18:39:36+10:00, stewart@willster.(none) +11 -14
    just use the transporter facade mutex.
    
    parallel 'show' will get woken up at the same time

  ndb/src/ndbapi/ClusterMgr.hpp@1.9, 2006-07-07 18:39:36+10:00, stewart@willster.(none) +0 -1
    remove wait for heartbeat mutex

ChangeSet@1.2133.7.3, 2006-07-07 17:39:11+10:00, stewart@willster.(none) +1 -0
  BUG#13985 ndb_mgm "status" command can return incorrect data node status
  
  better support parallel show commands, hold mutex when touching waitForHBFromNodes

  ndb/src/ndbapi/ClusterMgr.cpp@1.24, 2006-07-07 17:39:04+10:00, stewart@willster.(none) +6 -5
    correctly serialize ::forceHB calls and hold mutex for whole time updating
    waitForHBFromNodes

ChangeSet@1.2191.34.1, 2006-07-06 23:49:09+02:00, knielsen@ymer.(none) +2 -0
  BUG#19951: Race conditions in test wait_timeout.
  
  Fix random failures in test 'wait_timeout' that depend on exact timing.
  
  1. Force a reconnect initially if necessary, as otherwise slow startup
  might have caused a connection timeout before the test can even start.
  
  2. Explicitly disconnect the first connection to remove confusion about
  which connection aborts from timeout, causing test failure.

  mysql-test/r/wait_timeout.result@1.3, 2006-07-06 23:49:05+02:00, knielsen@ymer.(none) +4 -0
    Fix two races in test.

  mysql-test/t/wait_timeout.test@1.7, 2006-07-06 23:49:05+02:00, knielsen@ymer.(none) +9 -3
    Fix two races in test.

ChangeSet@1.2196.7.4, 2006-07-06 14:41:01-07:00, igor@olga.mysql.com +2 -0
  Added a test case with views for bug 18243 (see also func_str.test).

  mysql-test/r/view.result@1.164, 2006-07-06 14:40:58-07:00, igor@olga.mysql.com +13 -0
    Added a test case with views for bug 18243 (see also func_str.test).

  mysql-test/t/view.test@1.149, 2006-07-06 14:40:58-07:00, igor@olga.mysql.com +16 -0
    Added a test case with views for bug 18243 (see also func_str.test).

ChangeSet@1.1616.2681.1, 2006-07-06 23:59:04+04:00, konstantin@bodhi.netgear +6 -0
  A fix and a test case for Bug#19399 "res 'Lost Connection' when 
  dropping/creating tables".
  
  The bug could lead to a crash when multi-delete statements were
  prepared and used with temporary tables.
  
  The bug was caused by lack of clean-up of multi-delete tables before
  re-execution of a prepared statement. In a statement like
  DELETE t1 FROM t1, t2 WHERE ... the first table list (t1) is
  moved to lex->auxilliary_table_list and excluded from lex->query_tables
  or select_lex->tables. Thus it was unaccessible to reinit_stmt_before_use
  and not cleaned up before re-execution of a prepared statement. 

  mysql-test/r/ps.result@1.31.1.19, 2006-07-06 23:59:01+04:00, konstantin@bodhi.netgear +14 -0
    Updated test results (Bug#19399)

  mysql-test/t/ps.test@1.27.1.24, 2006-07-06 23:59:01+04:00, konstantin@bodhi.netgear +25 -0
    A test case for Bug#19399 "Stored Procedures 'Lost Connection' when 
    dropping/creating tables": test that multi-delete
    tables are cleaned up properly before re-execution.

  sql/sql_lex.cc@1.97.21.3, 2006-07-06 23:59:01+04:00, konstantin@bodhi.netgear +1 -0
    Always initialize auxilliary_table_list when we initialize the lex:
    this way we don't have to check that lex->sql_command equals to
    SQLCOM_DELETE_MULTI whenever we need to access auxilliary_table_list.
    In particular, in reinit_stmt_before_use we can simply check that
    auxilliary_table_list is not NULL and clean it up if the check returns
    a true value.

  sql/sql_prepare.cc@1.34.36.3, 2006-07-06 23:59:01+04:00, konstantin@bodhi.netgear +13 -7
    Move the one table clean-up functionality to a method of st_table_list.
    Clean up auxiliary_table_list if it's not empty.

  sql/table.cc@1.111.5.1, 2006-07-06 23:59:01+04:00, konstantin@bodhi.netgear +17 -0
    Implement st_table_list::reinit_before_use().

  sql/table.h@1.55.6.8, 2006-07-06 23:59:01+04:00, konstantin@bodhi.netgear +5 -0
    Declare st_table_list::reinit_before_use().

ChangeSet@1.1616.2678.1, 2006-07-06 11:11:49-07:00, igor@olga.mysql.com +4 -0
  Fixed bug #18243.
  The implementation of the method Item_func_reverse::val_str
  for the REVERSE function modified the argument of the function.
  This led to wrong results for expressions that contained
  REVERSE(ref) if ref occurred somewhere else in the expressions.

  mysql-test/r/func_str.result@1.70.1.32, 2006-07-06 11:11:46-07:00, igor@olga.mysql.com +15 -0
    Added a test case for bug #18243.

  mysql-test/t/func_str.test@1.64.1.20, 2006-07-06 11:11:46-07:00, igor@olga.mysql.com +17 -0
    Added a test case for bug #18243.

  sql/item_strfunc.cc@1.196.6.13, 2006-07-06 11:11:46-07:00, igor@olga.mysql.com +21 -18
    Fixed bug #18243.
    The implementation of the method Item_func_reverse::val_str
    for the REVERSE function modified the argument of the function.
    This led to wrong results for expressions that contained
    REVERSE(ref) if ref occurred somewhere else in the expressions.
    
    The implementation of Item_func_reverse::val_str has been changed
    to make the argument intact.

  sql/item_strfunc.h@1.73.2.17, 2006-07-06 11:11:46-07:00, igor@olga.mysql.com +1 -0
    Fixed bug #18243.
    Added tmp_value to the Item_func_reverse class to store
    the result of the function. It erroneously replaced the 
    argument before this fix.

ChangeSet@1.2183.33.4, 2006-07-06 18:50:44+02:00, tomas@poseidon.ndb.mysql.com +5 -0
  Bug #20820 auto inc table not handled correctly when restored from cluster backup

  mysql-test/include/ndb_default_cluster.inc@1.2, 2006-07-06 18:50:32+02:00, tomas@poseidon.ndb.mysql.com +1 -1
    Bug #20820 auto inc table not handled correctly when restored from cluster backup

  mysql-test/r/ndb_default_cluster.require@1.2, 2006-07-06 18:50:32+02:00, tomas@poseidon.ndb.mysql.com +1 -1
    Bug #20820 auto inc table not handled correctly when restored from cluster backup

  mysql-test/r/ndb_restore.result@1.5, 2006-07-06 18:50:32+02:00, tomas@poseidon.ndb.mysql.com +17 -7
    Bug #20820 auto inc table not handled correctly when restored from cluster backup

  mysql-test/t/ndb_restore.test@1.10, 2006-07-06 18:50:32+02:00, tomas@poseidon.ndb.mysql.com +17 -6
    Bug #20820 auto inc table not handled correctly when restored from cluster backup

  ndb/tools/restore/consumer_restore.cpp@1.25, 2006-07-06 18:50:32+02:00, tomas@poseidon.ndb.mysql.com +29 -11
    Bug #20820 auto inc table not handled correctly when restored from cluster backup

ChangeSet@1.2123.1.10, 2006-07-06 15:51:35+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#20860
    Better error message when failing to read either of 2 DIH schema files

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.49.2.1, 2006-07-06 15:51:32+02:00, jonas@perch.ndb.mysql.com +14 -5
    Better error message when failing to read either of 2 DIH schema files

ChangeSet@1.1616.2661.3, 2006-07-06 15:18:00+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  backport of ndb DictCache fix
  - don't invalidate tables that are in state RETRIEVING

  ndb/src/ndbapi/DictCache.cpp@1.11.1.4, 2006-07-06 15:17:53+02:00, tomas@poseidon.ndb.mysql.com +8 -5
    backport of ndb DictCache fix
    - don't invalidate tables that are in state RETRIEVING

ChangeSet@1.2183.34.1, 2006-07-06 14:37:09+02:00, guilhem@mysql.com +3 -0
  Fix for BUG#20524 "auto_increment_* not observed when inserting
  a too large value": the bug was that if MySQL generated a value for an
  auto_increment column, based on auto_increment_* variables, and this value
  was bigger than the column's max possible value, then that max possible
  value was inserted (after issuing a warning). But this didn't honour
  auto_increment_* variables (and so could cause conflicts in a master-master
  replication where one master is supposed to generated only even numbers,
  and the other only odd numbers), so now we "round down" this max possible
  value to honour auto_increment_* variables, before inserting it.

  mysql-test/r/rpl_auto_increment.result@1.5, 2006-07-06 14:37:00+02:00, guilhem@mysql.com +44 -0
    result update. Before the fix, the result was that master inserted 127 in t1
    (which didn't honour auto_increment_* variables!),
    instead of failing with "duplicate key 125" like now.

  mysql-test/t/rpl_auto_increment.test@1.3, 2006-07-06 14:37:00+02:00, guilhem@mysql.com +39 -1
    Test for BUG#20524 "auto_increment_* not observed when inserting
    a too large value".
    We also check the pathological case (table t2) where it's impossible to
    "round down".
    The fixer of BUG#20573 will be able to use table t2 for testing his fix.

  sql/handler.cc@1.212.1.1, 2006-07-06 14:37:00+02:00, guilhem@mysql.com +51 -2
    If handler::update_auto_increment() generates a value larger than the field's
    max possible value, we used to simply insert this max possible value
    (after pushing a warning). Now we "round down" this max possible value to
    honour auto_increment_* variables (if at all possible), before trying the
    insertion.

ChangeSet@1.2196.13.1, 2006-07-06 13:18:05+03:00, gkodinov@mysql.com +3 -0
  Bug #20569 Garbage in DECIMAL results from some mathematical functions
    Adding decimal "digits" in multiplication resulted in signed overflow and
  producing wrong results.
  
    Fixed by using large enough buffers and intermediary result types :
  dec2 (currently longlong) to hold result of adding decimal "digits" 
  (currently int32). 

  mysql-test/r/select.result@1.131, 2006-07-06 13:17:50+03:00, gkodinov@mysql.com +3 -0
    Bug #20569 Garbage in DECIMAL results from some mathematical functions
      * test suite for the bug

  mysql-test/t/select.test@1.107, 2006-07-06 13:17:51+03:00, gkodinov@mysql.com +5 -0
    Bug #20569 Garbage in DECIMAL results from some mathematical functions
      * test suite for the bug

  strings/decimal.c@1.69, 2006-07-06 13:17:51+03:00, gkodinov@mysql.com +10 -3
    Bug #20569 Garbage in DECIMAL results from some mathematical functions
      * fixed the overflow in adding decimal "digits"

ChangeSet@1.2123.1.9, 2006-07-06 09:38:18+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - revert bug fix for bug#20442

  ndb/src/ndbapi/NdbScanOperation.cpp@1.69.1.3, 2006-07-06 09:38:15+02:00, jonas@perch.ndb.mysql.com +0 -60
    ndb - revert bug fix for bug#20442

ChangeSet@1.1616.2673.3, 2006-07-05 17:18:59-07:00, acurtis@xiphis.org +3 -0
  Bug#8706
    "temporary table with data directory option fails"
    myisam should not use user-specified table name when creating
    temporary tables and use generated connection specific real name.
    Test included.

  myisam/mi_create.c@1.37.5.1, 2006-07-05 17:18:56-07:00, acurtis@xiphis.org +29 -7
    Bug#8706
      When creating a temporary table with directory override, ensure that
      the real filename is using the hidden temporary name otherwise
      multiple clients cannot have same named temporary tables without
      conflict.

  mysql-test/r/myisam.result@1.45.1.17, 2006-07-05 17:18:56-07:00, acurtis@xiphis.org +21 -0
    Bug#8706
      Test for bug

  mysql-test/t/myisam.test@1.33.1.15, 2006-07-05 17:18:56-07:00, acurtis@xiphis.org +31 -0
    Bug#8706
      Test for bug

ChangeSet@1.2183.33.2, 2006-07-05 20:24:12+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  ndbd: added missing jamEntry();

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@1.31.1.3, 2006-07-05 20:24:00+02:00, tomas@poseidon.ndb.mysql.com +2 -0
    ndbd: added missing jamEntry();

ChangeSet@1.2183.33.1, 2006-07-05 20:20:39+02:00, tomas@poseidon.ndb.mysql.com +3 -0
  Bug #20419 ndbd --nowait-nodes=<id_of_running_node> fails
  - updated error message to more correctly reflect the issue

  ndb/include/mgmapi/ndbd_exit_codes.h@1.10, 2006-07-05 20:20:31+02:00, tomas@poseidon.ndb.mysql.com +1 -0
    Bug #20419 ndbd --nowait-nodes=<id_of_running_node> fails
    - updated error message to more correctly reflect the issue

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@1.31.1.2, 2006-07-05 20:20:31+02:00, tomas@poseidon.ndb.mysql.com +7 -9
    Bug #20419 ndbd --nowait-nodes=<id_of_running_node> fails
    - updated error message to more correctly reflect the issue

  ndb/src/kernel/error/ndbd_exit_codes.c@1.11, 2006-07-05 20:20:31+02:00, tomas@poseidon.ndb.mysql.com +2 -0
    Bug #20419 ndbd --nowait-nodes=<id_of_running_node> fails
    - updated error message to more correctly reflect the issue

ChangeSet@1.2183.30.7, 2006-07-05 20:17:04+02:00, joerg@mysql.com +1 -0
  Extend the Perl script running the test suite to produce a "Logging:" line (like the shell script does).

  mysql-test/mysql-test-run.pl@1.101.1.1, 2006-07-05 20:16:58+02:00, joerg@mysql.com +5 -0
    Now that the RPM spec files use the Perl script to run the tests, we also need the "Logging:"
    line in its output, because otherwise we lack the information how the test suite was run.
    Add the line.

ChangeSet@1.2183.30.6, 2006-07-05 16:26:08+02:00, tomas@poseidon.ndb.mysql.com +26 -0
  Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
  - remove some event code to get rid of some bugs

  ndb/include/Makefile.am@1.18, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -1
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/include/kernel/GlobalSignalNumbers.h@1.10.1.3, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +6 -2
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/include/ndbapi/Ndb.hpp@1.47, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -47
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/include/ndbapi/NdbApi.hpp@1.9, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -1
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/include/ndbapi/NdbDictionary.hpp@1.56, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -186
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/common/debugger/signaldata/SignalDataPrint.cpp@1.12, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -6
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/common/debugger/signaldata/SignalNames.cpp@1.6.1.1, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -19
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.61.1.2, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -2211
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/kernel/blocks/dbdict/Dbdict.hpp@1.16.1.2, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -261
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.49.1.2, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -9
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@1.29, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -3
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@1.31.1.1, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -1
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/kernel/blocks/suma/Suma.cpp@1.22, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +1 -2244
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/kernel/blocks/suma/Suma.hpp@1.6, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -186
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/kernel/blocks/suma/SumaInit.cpp@1.8, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -52
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/ndbapi/Makefile.am@1.15, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -2
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/ndbapi/Ndb.cpp@1.60, 2006-07-05 16:26:01+02:00, tomas@poseidon.ndb.mysql.com +0 -46
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/ndbapi/NdbDictionary.cpp@1.39, 2006-07-05 16:26:01+02:00, tomas@poseidon.ndb.mysql.com +0 -148
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.95, 2006-07-05 16:26:01+02:00, tomas@poseidon.ndb.mysql.com +0 -735
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/ndbapi/NdbDictionaryImpl.hpp@1.40, 2006-07-05 16:26:01+02:00, tomas@poseidon.ndb.mysql.com +0 -92
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/ndbapi/Ndberr.cpp@1.12, 2006-07-05 16:26:01+02:00, tomas@poseidon.ndb.mysql.com +0 -8
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/ndbapi/Ndbif.cpp@1.33, 2006-07-05 16:26:01+02:00, tomas@poseidon.ndb.mysql.com +0 -18
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/ndbapi/Ndbinit.cpp@1.36, 2006-07-05 16:26:01+02:00, tomas@poseidon.ndb.mysql.com +0 -16
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/test/include/HugoTransactions.hpp@1.8, 2006-07-05 16:26:01+02:00, tomas@poseidon.ndb.mysql.com +0 -3
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/test/ndbapi/Makefile.am@1.26, 2006-07-05 16:26:01+02:00, tomas@poseidon.ndb.mysql.com +2 -4
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/test/src/HugoTransactions.cpp@1.25, 2006-07-05 16:26:01+02:00, tomas@poseidon.ndb.mysql.com +0 -279
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

ChangeSet@1.2183.32.5, 2006-07-05 16:23:18+02:00, ingo@mysql.com +3 -0
  After merge fix

  mysql-test/r/gis.result@1.30.1.2, 2006-07-05 16:23:12+02:00, ingo@mysql.com +10 -9
    After merge fix

  mysql-test/r/key.result@1.28.1.2, 2006-07-05 16:23:13+02:00, ingo@mysql.com +2 -2
    After merge fix

  mysql-test/t/gis.test@1.25.1.2, 2006-07-05 16:23:13+02:00, ingo@mysql.com +7 -5
    After merge fix

ChangeSet@1.2164.16.1, 2006-07-05 14:41:35+02:00, guilhem@mysql.com +5 -0
  Fix for BUG#20188 "REPLACE or ON DUPLICATE KEY UPDATE in
  auto_increment breaks binlog":
  if slave's table had a higher auto_increment counter than master's (even
  though all rows of the two tables were identical), then in some cases,
  REPLACE and INSERT ON DUPLICATE KEY UPDATE failed to replicate
  statement-based (it inserted different values on slave from on master).
  write_record() contained a "thd->next_insert_id=0" to force an adjustment
  of thd->next_insert_id after the update or replacement. But it is this
  assigment introduced indeterminism of the statement on the slave, thus
  the bug. For ON DUPLICATE, we replace that assignment by a call to
  handler::adjust_next_insert_id_after_explicit_value() which is deterministic
  (does not depend on slave table's autoinc counter). For REPLACE, this
  assignment can simply be removed (as REPLACE can't insert a number larger
  than thd->next_insert_id).
  We also move a too early restore_auto_increment() down to when we really know
  that we can restore the value.

  mysql-test/r/rpl_insert_id.result@1.15, 2006-07-05 14:40:58+02:00, guilhem@mysql.com +65 -0
    result update, without the bugfix, slave's "3 350" were "4 350".

  mysql-test/t/rpl_insert_id.test@1.17, 2006-07-05 14:40:58+02:00, guilhem@mysql.com +63 -0
    test for BUG#20188 "REPLACE or ON DUPLICATE KEY UPDATE in
    auto_increment breaks binlog".
    There is, in this order:
    - a test of the bug for the case of REPLACE
    - a test of basic ON DUPLICATE KEY UPDATE functionality which was not
    tested before
    - a test of the bug for the case of ON DUPLICATE KEY UPDATE

  sql/handler.cc@1.213, 2006-07-05 14:40:58+02:00, guilhem@mysql.com +21 -11
    the adjustment of next_insert_id if inserting a big explicit value, is
    moved to a separate method to be used elsewhere.

  sql/handler.h@1.170.1.1, 2006-07-05 14:40:58+02:00, guilhem@mysql.com +1 -0
    see handler.cc

  sql/sql_insert.cc@1.190.3.1, 2006-07-05 14:40:58+02:00, guilhem@mysql.com +7 -13
    restore_auto_increment() means "I know I won't use this autogenerated
    autoincrement value, you are free to reuse it for next row". But we were
    calling restore_auto_increment() in the case of REPLACE: if write_row() fails
    inserting the row, we don't know that we won't use the value, as we are going to
    try again by doing internally an UPDATE of the existing row, or a DELETE
    of the existing row and then an INSERT. So I move restore_auto_increment()
    further down, when we know for sure we failed all possibilities for the row.
    Additionally, in case of REPLACE, we don't need to reset THD::next_insert_id:
    the value of thd->next_insert_id will be suitable for the next row.
    In case of ON DUPLICATE KEY UPDATE, resetting thd->next_insert_id is also
    wrong (breaks statement-based binlog), but cannot simply be removed, as
    thd->next_insert_id must be adjusted if the explicit value exceeds it.
    We now do the adjustment by calling
    handler::adjust_next_insert_id_after_explicit_value() (which, contrary to
    thd->next_insert_id=0, does not depend on the slave table's autoinc counter,
    and so is deterministic).

ChangeSet@1.2196.5.3, 2006-07-04 23:46:15+04:00, konstantin@mysql.com +8 -0
  A fix and a test case for Bug#17843 "Certain stored procedures fail to 
  run at startup"
  
  The server returned an error when trying to execute init-file with a 
  stored procedure that could return multiple result sets to the client. 
  A stored procedure can return multiple result sets if it contains 
  PREPARE, SELECT, SHOW and similar statements.
     
  The fix is to set client_capabilites|=CLIENT_MULTI_RESULTS in
  sql_parse.cc:handle_bootstrap(). There is no "client" really, so 
  nothing is ever sent. This makes init-file feature behave consistently: 
  the prepared statements that can be called directly in the init-file 
  can be used in a stored procedure too.
  
  Re-committed the patch originally submitted by Per-Erik after review.

  mysql-test/Makefile.am@1.70, 2006-07-04 23:46:10+04:00, konstantin@mysql.com +5 -5
    Fix re-make without make clean.

  mysql-test/r/init_connect.result@1.5, 2006-07-04 23:46:10+04:00, konstantin@mysql.com +114 -0
    Updated results (a test case for Bug#17843)

  mysql-test/r/init_file.result@1.2, 2006-07-04 23:46:10+04:00, konstantin@mysql.com +15 -0
    Updated results (a test case for Bug#17843)

  mysql-test/std_data/init_file.dat@1.6, 2006-07-04 23:46:10+04:00, konstantin@mysql.com +28 -0
    Add test coverage for new features added in 5.0. Note, that what can 
    be done in init_file is very limited as it does not support any other
    delimiter except ';' -- only "one liners" and no multiple statement 
    procedures. Also, this is executed with a dummy user "boot@", which 
    calls for the use of DEFINER clause.

  mysql-test/t/init_connect.test@1.7, 2006-07-04 23:46:11+04:00, konstantin@mysql.com +202 -1
    Add test coverage for new features added in 5.0.

  mysql-test/t/init_file.test@1.8, 2006-07-04 23:46:11+04:00, konstantin@mysql.com +12 -2
    Add test coverage for new features added in 5.0 --
    stored routines, views, triggers. The actual tests are in 
    std_data/init_file.dat, here we just check the results and clean up.

  sql/sql_class.cc@1.237, 2006-07-04 23:46:11+04:00, konstantin@mysql.com +1 -0
    Initialize Security_context::priv_host to an empty string:
    when executing an init-file, sql_parse.cc:get_default_definer()
    will use this for the value of the definer if it's not set in the query.

  sql/sql_parse.cc@1.556.2.5, 2006-07-04 23:46:11+04:00, konstantin@mysql.com +6 -0
    Set CLIENT_MULTI_RESULTS in handle_bootstrap(), to make prepared
    statements work in stored procedures called from init-file.

ChangeSet@1.2196.9.1, 2006-07-04 16:54:07+02:00, jonas@mc01.ndb.mysql.com +1 -0
  ndb - ps_7ndb as discovered by pb
    fix race in scan close

  ndb/src/ndbapi/NdbScanOperation.cpp@1.74, 2006-07-04 16:51:26+02:00, jonas@mc01.ndb.mysql.com +4 -1
    Fix race in scan close

ChangeSet@1.1616.2672.2, 2006-07-04 15:11:11+02:00, pekka@clam.ndb.mysql.com +1 -0
  ndb - bug#20847 fix (4.1)

  ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp@1.3, 2006-07-04 15:09:39+02:00, pekka@clam.ndb.mysql.com +3 -2
    DROP did not do merge with right buddies

ChangeSet@1.1616.2673.1, 2006-07-04 17:40:40+05:00, bar@mysql.com +13 -0
  WL#2928 Date Translation NRE
  
  (implemented by by Josh Chamas)

  BitKeeper/etc/ignore@1.153.1.82, 2006-07-04 17:40:16+05:00, bar@mysql.com +1 -0
    Added libmysqld/sql_locale.cc to the ignore list

  libmysqld/Makefile.am@1.29.1.33, 2006-07-04 17:40:15+05:00, bar@mysql.com +1 -1
    Adding new source file

  mysql-test/r/date_formats.result@1.15.1.6, 2006-07-04 17:40:15+05:00, bar@mysql.com +16 -0
    Adding test case

  mysql-test/t/date_formats.test@1.11.1.7, 2006-07-04 17:40:15+05:00, bar@mysql.com +14 -0
    Adding test case

  sql/Makefile.am@1.77.1.39, 2006-07-04 17:40:15+05:00, bar@mysql.com +1 -1
    Adding new source file

  sql/item_timefunc.cc@1.51.1.53, 2006-07-04 17:40:16+05:00, bar@mysql.com +38 -28
    Using current locale data, instead of hard coded English names.

  sql/mysql_priv.h@1.186.91.51, 2006-07-04 17:40:16+05:00, bar@mysql.com +18 -0
    Adding new type MY_LOCALE, and declaring new global variables.

  sql/set_var.cc@1.34.66.1, 2006-07-04 17:40:16+05:00, bar@mysql.com +43 -0
    Adding "lc_time_names" system variable.

  sql/set_var.h@1.54.1.7, 2006-07-04 17:40:16+05:00, bar@mysql.com +21 -0
    Adding "lc_time_names" system variable.

  sql/sql_cache.cc@1.46.12.12, 2006-07-04 17:40:16+05:00, bar@mysql.com +2 -0
    Adding lc_time_names as a query cache flag.

  sql/sql_class.cc@1.105.1.102, 2006-07-04 17:40:16+05:00, bar@mysql.com +1 -0
    Setting default locale to en_US

  sql/sql_class.h@1.146.52.14, 2006-07-04 17:40:16+05:00, bar@mysql.com +3 -0
    Adding locale variable into system_variables.

  sql/sql_locale.cc@1.1, 2006-07-04 17:40:16+05:00, bar@mysql.com +1607 -0
    Adding new file with locale data for various languages

  sql/sql_locale.cc@1.0, 2006-07-04 17:40:16+05:00, bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.lc/sql/sql_locale.cc

ChangeSet@1.1616.2672.1, 2006-07-04 13:51:35+02:00, pekka@clam.ndb.mysql.com +1 -0
  pekka - checkout:get (4.1)

  BitKeeper/etc/config@1.10.1.8, 2006-07-04 13:50:36+02:00, pekka@clam.ndb.mysql.com +1 -0
    checkout:get

ChangeSet@1.1616.2671.1, 2006-07-04 13:28:30+04:00, sergefp@mysql.com +1 -0
  Better comments for void Item::top_level_item()

  sql/item.h@1.56.1.139, 2006-07-04 13:28:25+04:00, sergefp@mysql.com +9 -2
    Better comments for void Item::top_level_item()

ChangeSet@1.2196.6.1, 2006-07-04 12:10:12+03:00, gkodinov@mysql.com +3 -0
  Bug #16110: insert permitted into view col w/o default value
  
  When compiling INSERT statements the check whether columns are provided values
  depends on the flag whether a field is used in that query (Field::query_id).
  However the check for updatability of VIEW columns (check_view_insertability())
  was calling fix_fields() and thus setting the Field::query_id even for the 
  view fields that are not referenced in the current INSERT statement.
  So the correct check for columns without default values 
  ( check_that_all_fields_are_given_values() ) is assuming that all the VIEW
  columns were mentioned in the INSERT field list and was issuing no 
  warnings or errors.
  Fixed check_view_insertability() to turn off the flag whether or not to set
  Field::query_id (THREAD::set_query_id) before calling fix fields and restore
  it when it's done.

  mysql-test/r/view.result@1.161.1.1, 2006-07-04 12:09:56+03:00, gkodinov@mysql.com +15 -1
    Bug #16110: insert permitted into view col w/o default value
      * test case

  mysql-test/t/view.test@1.148, 2006-07-04 12:09:56+03:00, gkodinov@mysql.com +19 -1
    Bug #16110: insert permitted into view col w/o default value
      * test case

  sql/sql_insert.cc@1.192.3.1, 2006-07-04 12:09:56+03:00, gkodinov@mysql.com +14 -1
    Bug #16110: insert permitted into view col w/o default value
      * avoid setting the "field used" flag for fields when checking view columns 
        for updatability.
      * a missing DBUG_RETURN added.

ChangeSet@1.2191.33.1, 2006-07-04 12:56:53+05:00, holyfoot@deer.(none) +4 -0
  bug #14807 (GeomFromText() should return MYSQL_TYPE_GEOMETRY)
  
  we didn't have code creating GEOMETRY-type fields from Items (expression results)
  So i added this code

  mysql-test/r/gis.result@1.33, 2006-07-04 12:53:38+05:00, holyfoot@mysql.com +7 -2
    test result fixed

  mysql-test/t/gis.test@1.28, 2006-07-04 12:53:46+05:00, holyfoot@mysql.com +7 -1
    testcase added

  sql/item_geofunc.cc@1.27, 2006-07-04 12:53:50+05:00, holyfoot@mysql.com +28 -0
    Item_geometry_func::tmp_table_field implemented

  sql/item_geofunc.h@1.12, 2006-07-04 12:53:54+05:00, holyfoot@mysql.com +5 -0
    tmp_table_field() and get_geometry_type() declared

ChangeSet@1.2196.5.2, 2006-07-04 02:07:41+04:00, konstantin@mysql.com +2 -0
  auxilliary -> auxiliary

  sql/sql_delete.cc@1.174.1.1, 2006-07-04 02:07:38+04:00, konstantin@mysql.com +1 -1
    auxilliary -> auxiliary

  sql/sql_lex.h@1.222, 2006-07-04 02:07:38+04:00, konstantin@mysql.com +1 -1
    auxilliary -> auxiliary

ChangeSet@1.2196.5.1, 2006-07-04 01:13:04+04:00, konstantin@mysql.com +1 -0
  auxilliary -> auxiliary

  sql/sql_parse.cc@1.556.2.4, 2006-07-04 01:13:00+04:00, konstantin@mysql.com +4 -4
    auxilliary -> auxiliary

ChangeSet@1.2183.31.2, 2006-07-04 01:07:49+04:00, aivanov@mysql.com +1 -0
  BUG#19209 "Test 'rpl_openssl' hangs on Windows"
   Disabling 'rpl_openssl'.

  mysql-test/t/rpl_openssl.test@1.15, 2006-07-04 01:07:38+04:00, aivanov@mysql.com +1 -1
    Disabling 'rpl_openssl'.

ChangeSet@1.2183.31.1, 2006-07-03 23:28:19+04:00, aivanov@mysql.com +1 -0
  BUG#19209 "Test 'rpl_openssl' hangs on Windows"
   Enabling rpl_openssl.test for Windows to check that
   currently it still hangs (because I can't reproduce
   this on my machine).

  mysql-test/t/rpl_openssl.test@1.14, 2006-07-03 23:28:01+04:00, aivanov@mysql.com +1 -1
    Enabling rpl_openssl.test for Windows

ChangeSet@1.1616.2670.5, 2006-07-03 14:54:09+05:00, holyfoot@deer.(none) +2 -0
  bug 20317 (test fails in embedded for different number of threads is
  running)
  
  I decided to make ps_1general test independent from actual number of
  threads running

  mysql-test/r/ps_1general.result@1.1.1.23, 2006-07-03 14:49:46+05:00, holyfoot@mysql.com +1 -1
    result fixed

  mysql-test/t/ps_1general.test@1.3.1.13, 2006-07-03 14:49:46+05:00, holyfoot@mysql.com +1 -0
    as i think we don't really care about the number of threads running
    i just replace the number with '#'

ChangeSet@1.2191.21.4, 2006-07-03 14:22:39+05:00, holyfoot@deer.(none) +1 -0
  bug #19452 (mysql_upgrade reads [client] section but doesn't handle [host] option

  client/mysql_upgrade.c@1.4, 2006-07-03 14:15:14+05:00, holyfoot@mysql.com +1 -1
    "client" group removed from the 'readlist'

ChangeSet@1.2133.7.2, 2006-07-03 15:37:57+10:00, stewart@mysql.com +5 -0
  BUG#13985 ndb_mgm "status" command can return incorrect data node status
  
  Second half of the fix for this bug.
  
  This patch forces a heartbeat to be sent and will wait (a little while)
  for replies. This way we can get
  
  > all status
  X starting
  Y started
  X started
  >
  
  which is okay as the new status comes after the old status, always.
  There is the slimmest of opportunities to get output like above where only half
  the cluster appears started.
  
  This is about the best we can do with a command line interactive program.

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.96.3.1, 2006-07-03 15:37:51+10:00, stewart@mysql.com +6 -0
    Add updateStatus method to MgmtSrvr.
    
    Used to force an update of node status for the nodes.

  ndb/src/mgmsrv/MgmtSrvr.hpp@1.41.2.1, 2006-07-03 15:37:51+10:00, stewart@mysql.com +2 -0
    add prototype for updateStatus(NodeBitmask) method

  ndb/src/mgmsrv/Services.cpp@1.61.4.1, 2006-07-03 15:37:51+10:00, stewart@mysql.com +3 -0
    When status is queried, force an update of the status in the mgm server. (i.e. send heartbeats)

  ndb/src/ndbapi/ClusterMgr.cpp@1.23, 2006-07-03 15:37:51+10:00, stewart@mysql.com +67 -4
    new DEBUG_REG define for debugging registration and HB code.
    
    Add ClusterMgr::forceHB(NodeBitmask) which sends a HB signal to each node in
    the bitmask and then waits for a REGCONF from them.
    Will only wait for a total of 1 second, not blocking an end client for too long.
    
    On receipt of HB, clear the nodeId in the waiting for bitmask and signal any
    waiting threads.

  ndb/src/ndbapi/ClusterMgr.hpp@1.8, 2006-07-03 15:37:51+10:00, stewart@mysql.com +8 -2
    Add ::forceHB(NodeBitmask) and associated variables

ChangeSet@1.2164.15.1, 2006-07-02 14:35:45+04:00, kroki@mysql.com +7 -0
  Bug#20570: CURRENT_USER() in a VIEW with SQL SECURITY DEFINER returns
             invoker name
  
  The bug was fixed similar to how context switch is handled in
  Item_func_sp::execute_impl(): we store pointer to current
  Name_resolution_context in Item_func_current_user class, and use
  its Security_context in Item_func_current_user::fix_fields().

  mysql-test/r/view_grant.result@1.15.2.1, 2006-07-02 14:35:38+04:00, kroki@mysql.com +53 -0
    Add result for bug#20570.

  mysql-test/t/view_grant.test@1.13.2.1, 2006-07-02 14:35:38+04:00, kroki@mysql.com +62 -0
    Add test case for bug#20570.

  sql/item_create.cc@1.60, 2006-07-02 14:35:39+04:00, kroki@mysql.com +0 -6
    Remove create_func_current_user(), as it is not used for automatic
    function creation.

  sql/item_create.h@1.44, 2006-07-02 14:35:39+04:00, kroki@mysql.com +0 -1
    Remove prototype for create_func_current_user().

  sql/item_strfunc.cc@1.266.2.1, 2006-07-02 14:35:39+04:00, kroki@mysql.com +37 -28
    Add implementations for Item_func_user::init(),
    Item_func_user::fix_fields() and
    Item_func_current_user::fix_fields() methods.  The latter uses
    Security_context from current Name_resolution_context, if one is
    defined.

  sql/item_strfunc.h@1.106.1.1, 2006-07-02 14:35:39+04:00, kroki@mysql.com +27 -8
    Move implementation of CURRENT_USER() out of Item_func_user to
    to new Item_func_current_user class.  For both classes calculate
    user name in fix_fields() method.
    For Item_func_current_user add context field to store
    Name_resolution_context in effect.

  sql/sql_yacc.yy@1.469.2.1, 2006-07-02 14:35:39+04:00, kroki@mysql.com +5 -2
    Pass current Name_resolution_context to Item_func_current_user.

ChangeSet@1.2191.31.1, 2006-07-02 01:51:10+04:00, dlenev@mysql.com +18 -0
  Fix for bug#18437 "Wrong values inserted with a before update trigger on
  NDB table".
  
  SQL-layer was not marking fields which were used in triggers as such. As
  result these fields were not always properly retrieved/stored by handler
  layer. So one might got wrong values or lost changes in triggers for NDB,
  Federated and possibly InnoDB tables.
  This fix solves the problem by marking fields used in triggers
  appropriately.
  
  Also this patch contains the following cleanup of ha_ndbcluster code:
  
  We no longer rely on reading LEX::sql_command value in handler in order
  to determine if we can enable optimization which allows us to handle REPLACE
  statement in more efficient way by doing replaces directly in write_row()
  method without reporting error to SQL-layer.
  Instead we rely on SQL-layer informing us whether this optimization
  applicable by calling handler::extra() method with
  HA_EXTRA_WRITE_CAN_REPLACE flag.
  As result we no longer apply this optimzation in cases when it should not
  be used (e.g. if we have on delete triggers on table) and use in some
  additional cases when it is applicable (e.g. for LOAD DATA REPLACE).
  
  Finally this patch includes fix for bug#20728 "REPLACE does not work
  correctly for NDB table with PK and unique index".
    
  This was yet another problem which was caused by improper field mark-up.
  During row replacement fields which weren't explicity used in REPLACE
  statement were not marked as fields to be saved (updated) so they have
  retained values from old row version. The fix is to mark all table
  fields as set for REPLACE statement. Note that in 5.1 we already solve
  this problem by notifying handler that it should save values from all
  fields only in case when real replacement happens.

  include/my_base.h@1.78, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +10 -1
    Added HA_EXTRA_WRITE_CAN_REPLACE, HA_EXTRA_WRITE_CANNOT_REPLACE - new
    parameters for ha_extra() method. We use them to inform handler that
    write_row() which tries to insert new row into the table and encounters
    some already existing row with same primary/unique key can replace old
    row with new row instead of reporting error.

  mysql-test/r/federated.result@1.26.4.1, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +28 -0
    Additional test for bug#18437 "Wrong values inserted with a before update
    trigger on NDB table".

  mysql-test/r/ndb_replace.result@1.6, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +46 -1
    Added test for bug #20728 "REPLACE does not work correctly for NDB table
    with PK and unique index". Updated wrong results from older test.

  mysql-test/r/ndb_trigger.result@1.1, 2006-07-02 01:51:02+04:00, dlenev@mysql.com +119 -0
    Added test for bug#18437 "Wrong values inserted with a before update trigger
    on NDB table".

  mysql-test/r/ndb_trigger.result@1.0, 2006-07-02 01:51:02+04:00, dlenev@mysql.com +0 -0
    BitKeeper file /home/dlenev/mysql-5.0-bg18437-3/mysql-test/r/ndb_trigger.result

  mysql-test/t/federated.test@1.22.4.1, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +42 -0
    Additional test for bug#18437 "Wrong values inserted with a before update
    trigger on NDB table".

  mysql-test/t/ndb_replace.test@1.7, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +37 -0
    Added test for bug #20728 "REPLACE does not work correctly for NDB table
    with PK and unique index".

  mysql-test/t/ndb_trigger.test@1.1, 2006-07-02 01:51:02+04:00, dlenev@mysql.com +92 -0
    Added test for bug#18437 "Wrong values inserted with a before update trigger
    on NDB table".

  mysql-test/t/ndb_trigger.test@1.0, 2006-07-02 01:51:02+04:00, dlenev@mysql.com +0 -0
    BitKeeper file /home/dlenev/mysql-5.0-bg18437-3/mysql-test/t/ndb_trigger.test

  sql/ha_ndbcluster.cc@1.262.1.1, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +15 -12
    We no longer rely on reading LEX::sql_command value in handler in order
    to determine if we can enable optimization which allows us to handle REPLACE
    statement in more efficient way by doing replaces directly in write_row()
    method without reporting error to SQL-layer.
    Instead we rely on SQL-layer informing us whether this optimization
    applicable by calling handler::extra() method with
    HA_EXTRA_WRITE_CAN_REPLACE flag.
    As result we no longer apply this optimization in cases when it should not
    be used (e.g. if we have on delete triggers on table) and use in some
    additional cases when it is applicable (e.g. for LOAD DATA REPLACE).

  sql/item.cc@1.224.2.1, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +7 -2
    Item_trigger_field::setup_field():
      Added comment explaining why we don't set Field::query_id in this method.

  sql/mysql_priv.h@1.394.1.1, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +3 -3
    mysql_alter_table() function no longer takes handle_duplicates argument.
    Added declaration of mark_fields_used_by_triggers_for_insert_stmt() function.

  sql/sql_delete.cc@1.175, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +6 -0
    Mark fields which are used by ON DELETE triggers so handler will retrieve
    values for these fields.

  sql/sql_insert.cc@1.192.2.1, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +76 -1
    Explicitly inform handler that we are doing REPLACE (using ha_extra() method)
    in cases when it can promote insert operation done by write_row() to replace.
    Also when we do REPLACE we want to store values for all columns so we should
    inform handler about it.
    Finally we should mark fields used by ON UPDATE/ON DELETE triggers as such
    so handler can properly retrieve/restore values in these fields during
    execution of REPLACE and INSERT ... ON DUPLICATE KEY UPDATE statements.

  sql/sql_load.cc@1.96, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +10 -0
    Explicitly inform handler that we are doing LOAD DATA REPLACE (using
    ha_extra() method) in cases when it can promote insert operation done by
    write_row() to replace.
    Also when we do replace we want to save (replace) values for all columns
    so we should inform handler about it.
    Finally to properly execute LOAD DATA for table with triggers we should
    mark fields used by ON INSERT triggers as such so handler can properly
    store values for these fields.

  sql/sql_parse.cc@1.553.3.1, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +3 -4
    mysql_alter_table() function no longer takes handle_duplicates argument.

  sql/sql_table.cc@1.313.2.1, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +6 -13
    Got rid of handle_duplicates argument in mysql_alter_table() and
    copy_data_between_tables() functions. These functions were always
    called with handle_duplicates == DUP_ERROR and thus contained dead
    (and probably incorrect) code.

  sql/sql_trigger.cc@1.49.4.1, 2006-07-02 01:51:02+04:00, dlenev@mysql.com +42 -2
    Added Table_triggers_list::mark_fields_used() method which is used to mark
    fields read/set by triggers as such so handlers will be able properly
    retrieve/store values in these fields.

  sql/sql_trigger.h@1.20, 2006-07-02 01:51:02+04:00, dlenev@mysql.com +8 -0
    Table_triggers_list:
      Added mark_fields_used() method which is used to mark fields read/set by
      triggers as such so handlers will be able properly retrieve/store values
      in these fields. To implement this method added 'trigger_fields' member
      which is array of lists linking items for all fields used in triggers
      grouped by event and action time.

  sql/sql_update.cc@1.190.1.1, 2006-07-02 01:51:02+04:00, dlenev@mysql.com +6 -0
    Mark fields which are used by ON UPDATE triggers so handler will retrieve
    and save values for these fields.

ChangeSet@1.1346.1.838, 2006-07-01 14:31:52-04:00, cmiller@zippy.(none) +4 -0
  Bug#19006: 4.0 valgrind problems (in test func_str)
  
  On exactly-sized Strings, the String::c_ptr() function peeked beyond the
  end of the buffer, possibly into unititialized space to see whether the 
  buffer was NUL-terminated.
  
  In a place that did peek improperly, we now use a c_ptr_safe() function, 
  which doesn't peek where it shouldn't.

  client/sql_string.h@1.6.1.1, 2006-07-01 14:31:45-04:00, cmiller@zippy.(none) +8 -0
    Back-port String::c_ptr_safe().

  sql/item_func.h@1.39.1.28, 2006-07-01 14:31:45-04:00, cmiller@zippy.(none) +4 -1
    Describe side-effect behavior.

  sql/item_strfunc.cc@1.36.1.52, 2006-07-01 14:31:45-04:00, cmiller@zippy.(none) +2 -2
    Use the "_safe" version of c_ptr to avoid looking for a terminating 
    NUL character outside the initialized memory area.  Valgrind hates it 
    when one does that, and it theoretically could lead to a SEGV.

  sql/sql_string.h@1.13.1.1, 2006-07-01 14:31:45-04:00, cmiller@zippy.(none) +8 -0
    Back-port String::c_ptr_safe().

ChangeSet@1.2196.3.4, 2006-07-01 09:28:41+04:00, sergefp@mysql.com +2 -0
  Post-merge fix

  mysql-test/r/range.result@1.46, 2006-07-01 09:28:34+04:00, sergefp@mysql.com +0 -1
    Post-merge fix

  mysql-test/t/range.test@1.39, 2006-07-01 09:28:34+04:00, sergefp@mysql.com +0 -1
    Post-merge fix

ChangeSet@1.2191.25.5, 2006-07-01 00:33:47+04:00, konstantin@mysql.com +1 -0
  Remove an unused variable.

  sql/item.h@1.200.2.1, 2006-07-01 00:33:44+04:00, konstantin@mysql.com +0 -7
    Remove an unused variable.

ChangeSet@1.2191.25.4, 2006-07-01 00:14:28+04:00, konstantin@mysql.com +3 -0
  Remove a couple of unused/barely used names.

  sql/sql_lex.cc@1.190, 2006-07-01 00:14:24+04:00, konstantin@mysql.com +0 -4
    Remove an unused thread key.

  sql/sql_lex.h@1.221, 2006-07-01 00:14:24+04:00, konstantin@mysql.com +0 -3
    Remove an unused thread key, current_lex.

  sql/sql_parse.cc@1.556.4.1, 2006-07-01 00:14:24+04:00, konstantin@mysql.com +3 -3
    Remove an unused thread key, current_lex macro.

ChangeSet@1.2196.3.2, 2006-06-30 20:07:33+03:00, monty@mysql.com +4 -0
  After merge fixes

  BitKeeper/etc/ignore@1.225, 2006-06-30 20:03:48+03:00, monty@mysql.com +1 -0
    added scripts/mysql_upgrade_shell

  BitKeeper/etc/ignore@1.224, 2006-06-30 20:02:07+03:00, monty@mysql.com +1 -0
    added mysql-test/r/*.log

  include/my_handler.h@1.11, 2006-06-30 20:07:22+03:00, monty@mysql.com +0 -1
    my_handler.h should not include my_global.h

  mysql-test/r/key.result@1.32, 2006-06-30 20:07:22+03:00, monty@mysql.com +2 -2
    Update results after merge

  sql/ha_ndbcluster.cc@1.267.1.2, 2006-06-30 20:07:22+03:00, monty@mysql.com +1 -1
    After merge fixes

ChangeSet@1.1616.2663.3, 2006-06-30 18:29:27+03:00, monty@mysql.com +3 -0
  Reverted wrong bug fix (Bug#11228)

  mysql-test/r/key.result@1.18.1.9, 2006-06-30 18:29:25+03:00, monty@mysql.com +9 -1
    Fixed result after removing wrong bug fix

  mysql-test/t/key.test@1.14.1.10, 2006-06-30 18:29:25+03:00, monty@mysql.com +1 -0
    Added SHOW CREATE TABLE, which is the proper way to check for table definitions

  sql/table.cc@1.111.4.4, 2006-06-30 18:29:25+03:00, monty@mysql.com +21 -0
    Reverted wrong bug fix.
    The intention with the original code was to show that MySQL treats the first
    given unique key as a primary key. Clients can use the marked primary key as a
    real primary key to validate row changes in case of conflicting updates.  The
    ODBC driver (and other drivers) may also use this fact to optimize/check
    updates and handle conflicts.  The marked key also shows what some engines, like InnoDB or NDB,
    will use as it's internal primary key.
    
    For checking if someone has declared a true PRIMARY KEY, one should use 'SHOW CREATE TABLE'
    
    
    

ChangeSet@1.2191.25.3, 2006-06-30 18:14:22+04:00, kroki@mysql.com +3 -0
  Bug#17226: Variable set in cursor on first iteration is assigned
             second iterations value
  
  During assignment to the BLOB variable in routine body the value
  wasn't copied.

  mysql-test/r/sp-vars.result@1.3, 2006-06-30 18:14:16+04:00, kroki@mysql.com +15 -0
    Add result for bug#17226.

  mysql-test/t/sp-vars.test@1.3, 2006-06-30 18:14:16+04:00, kroki@mysql.com +36 -0
    Add test case for bug#17226.

  sql/field_conv.cc@1.56, 2006-06-30 18:14:16+04:00, kroki@mysql.com +8 -3
    Honor copy_blobs flag.

ChangeSet@1.1616.2647.14, 2006-06-30 16:48:18+05:00, bar@mysql.com +1 -0
  Bug#7192 Specify --with-collation doesn't work for connections?
  --with-collation worked only on the server side.
  Client side ignored this argument, so collation_connection
  was not properly set (remained latin1_swedish_ci).

  sql-common/client.c@1.46.7.2, 2006-06-30 16:48:13+05:00, bar@mysql.com +31 -2
    - Take into account MYSQL_DEFAULT_COLLATION_NAME if
    character set is not set using mysql_option(), to
    honor --with-collation argument to configure.
    - Use default collation for the character set when it's
    not set using mysql_option().

ChangeSet@1.2196.1.9, 2006-06-30 11:10:38+02:00, knielsen@mysql.com +1 -0
  Fix Windows build problem following previous push.

  strings/strtod.c@1.20, 2006-06-30 11:10:34+02:00, knielsen@mysql.com +2 -1
    Fix Windows build problem, EOVERFLOW is defined in my_base.h on Windows.

ChangeSet@1.1616.2665.1, 2006-06-30 12:52:05+04:00, kroki@mysql.com +2 -0
  bug #20152: mysql_stmt_execute() overwrites parameter buffers
  
  When using a parameter bind MYSQL_TYPE_DATE in a prepared statement,
  the time part of the MYSQL_TIME buffer was written to zero in
  mysql_stmt_execute(). The param_store_date() function in libmysql.c
  worked directly on the provided buffer.
  Changed to use a copy of the buffer.

  libmysql/libmysql.c@1.156.25.1, 2006-06-30 12:51:59+04:00, kroki@mysql.com +3 -4
    fix for bug #20152

  tests/mysql_client_test.c@1.51.1.117, 2006-06-30 12:52:00+04:00, kroki@mysql.com +53 -0
    added test for bug#20152

ChangeSet@1.1616.2548.12, 2006-06-30 09:41:41+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#20774
    crash if system restart with more than 4096 fragments
    solution: continueb enable expand check loop

  ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.21.1.10, 2006-06-30 09:41:39+02:00, jonas@perch.ndb.mysql.com +1 -0
    continueb enable expand check loop

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.39.1.24, 2006-06-30 09:41:40+02:00, jonas@perch.ndb.mysql.com +41 -13
    continueb enable expand check loop

ChangeSet@1.1616.2664.1, 2006-06-30 09:05:12+04:00, sergefp@mysql.com +3 -0
  BUG#16168: Wrong results from range optimizer, "Use_count: Wrong count for key ..." warnings:
   - Added comments.
   - Make SEL_ARG::clone() set SEL_ARG::elements in the created copy.

  mysql-test/r/range.result@1.19.3.7, 2006-06-30 09:05:08+04:00, sergefp@mysql.com +22 -0
    BUG#16168: Testcase

  mysql-test/t/range.test@1.12.2.10, 2006-06-30 09:05:08+04:00, sergefp@mysql.com +26 -0
    BUG#16168: Testcase

  sql/opt_range.cc@1.98.10.1, 2006-06-30 09:05:09+04:00, sergefp@mysql.com +179 -4
    BUG#16168: Wrong results from range optimizer, "Use_count: Wrong count for key ..." warnings:
     - Added comments.
     - Make SEL_ARG::clone() set SEL_ARG::elements in the created copy.

ChangeSet@1.2196.1.7, 2006-06-30 00:10:41-04:00, elliot@mysql.com +1 -0
  Fixing windows build.

  strings/strtod.c@1.19, 2006-06-30 00:10:38-04:00, elliot@mysql.com +2 -2
    Reverting previous change to include files (angle brackets instead of
    quotes) that broke windows build

ChangeSet@1.1616.2663.2, 2006-06-30 04:10:27+03:00, monty@mysql.com +4 -0
  Don't read ~/.my.cnf in mysqldump.test

  heap/hp_test1.c@1.16, 2006-06-30 04:10:24+03:00, monty@mysql.com +1 -1
    Changed type from last commit

  mysql-test/mysql-test-run.sh@1.208.1.60, 2006-06-30 04:10:24+03:00, monty@mysql.com +7 -13
    Fixed problem with running with --gdb and two masters
    Don't disable ndb becasue we run gdb

  mysql-test/t/mysqldump.test@1.19.1.26, 2006-06-30 04:10:24+03:00, monty@mysql.com +1 -1
    Don't read ~/.my.cnf

  sql/ha_ndbcluster.cc@1.114.3.73, 2006-06-30 04:10:24+03:00, monty@mysql.com +4 -2
    Portability fix

ChangeSet@1.1616.2663.1, 2006-06-30 02:25:35+03:00, monty@mysql.com +5 -0
  Fixed include file usage
  hp_test2 now works again
  Fixed wrong cast, which caused problems with gcc 4.0 and floats in prepared statements (Bug #19694)

  heap/hp_test1.c@1.15, 2006-06-30 02:25:33+03:00, monty@mysql.com +2 -1
    Portability fix

  heap/hp_test2.c@1.22, 2006-06-30 02:25:33+03:00, monty@mysql.com +1 -0
    Added max_table_size (fixes that hp_test2 works again)

  include/my_global.h@1.47.1.57, 2006-06-30 02:25:33+03:00, monty@mysql.com +2 -2
    Fixed wrong cast, which caused problems with gcc 4.0 (Bug #19694)

  mysys/my_handler.c@1.16.1.6, 2006-06-30 02:25:33+03:00, monty@mysql.com +1 -0
    Added missing include file

  strings/strtod.c@1.15.1.2, 2006-06-30 02:25:33+03:00, monty@mysql.com +2 -2
    Fixed include files

ChangeSet@1.1616.2660.2, 2006-06-29 17:06:28-04:00, iggy@mysql.com +3 -0
  Bug#20328 mysql client: dumb about trailing spaces on help command.

  mysql-test/r/mysql_client.result@1.1, 2006-06-29 17:06:25-04:00, iggy@mysql.com +44 -0
    Test trailing spaces on the help command.

  mysql-test/r/mysql_client.result@1.0, 2006-06-29 17:06:25-04:00, iggy@mysql.com +0 -0
    BitKeeper file /mnt/storeage/mysql-4.1_bug20328/mysql-test/r/mysql_client.result

  mysql-test/t/mysql_client.test@1.1, 2006-06-29 17:06:25-04:00, iggy@mysql.com +9 -0
    Result trailing spaces on the help command.

  mysql-test/t/mysql_client.test@1.0, 2006-06-29 17:06:25-04:00, iggy@mysql.com +0 -0
    BitKeeper file /mnt/storeage/mysql-4.1_bug20328/mysql-test/t/mysql_client.test

  client/mysql.cc@1.121.16.1, 2006-06-29 17:06:25-04:00, iggy@mysql.com +14 -3
    Remove trailing spaces from help arguments in com_server_help. 
    Disregard trailing spaces from command in com_help.

ChangeSet@1.2191.28.1, 2006-06-30 00:21:55+04:00, kroki@mysql.com +4 -0
  Bug#20230: routine_definition is not null
  
  SHOW CREATE PROCEDURE and SHOW CREATE FUNCTION are fixed as well as
  INFORMATION_SCHEMA.ROUTINES.ROUTINE_NAME.

  mysql-test/r/information_schema.result@1.111, 2006-06-30 00:21:48+04:00, kroki@mysql.com +44 -8
    Add result for bug#20230.

  mysql-test/t/information_schema.test@1.83, 2006-06-30 00:21:48+04:00, kroki@mysql.com +36 -0
    Add test case for bug#20230.

  sql/sp_head.cc@1.218, 2006-06-30 00:21:49+04:00, kroki@mysql.com +14 -4
    Return NULL for routine definition if the user doesn't have enough
    privilege to see it.

  sql/sql_show.cc@1.320.1.1, 2006-06-30 00:21:49+04:00, kroki@mysql.com +2 -1
    Make INFORMATION_SCHEMA.ROUTINES.ROUTINE_NAME NULL-able.  Return
    NULL if the user doesn't have enough privilege to see routine
    definition.

ChangeSet@1.2191.26.1, 2006-06-29 16:38:14+02:00, joerg@mysql.com +1 -0
  Increment the version number.

  configure.in@1.392.5.1, 2006-06-29 16:38:08+02:00, joerg@mysql.com +2 -2
    Increment the version number.

ChangeSet@1.1616.2548.11, 2006-06-29 16:20:18+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - autotest
    Fix testNodeRestart -n DuringLCP and others (add stopTest() at end of test :-))

  ndb/test/ndbapi/testNodeRestart.cpp@1.8.1.15, 2006-06-29 16:20:16+02:00, jonas@perch.ndb.mysql.com +1 -0
    Fix testNodeRestart -n DuringLCP and others

ChangeSet@1.2191.21.3, 2006-06-29 18:39:34+05:00, gluh@eagle.intranet.mysql.r18.ru +9 -0
  Fix for bug#13934 Silent truncation of table comments
  Table comment: issue a warning(error in traditional mode) if length of comment > 60 symbols
  Column comment: issue a warning(error in traditional mode) if length of comment > 255 symbols
  Table 'comment' is changed from char* to LEX_STRING

  mysql-test/r/strict.result@1.27, 2006-06-29 18:39:27+05:00, gluh@mysql.com +46 -0
    test case

  mysql-test/t/strict.test@1.21, 2006-06-29 18:39:27+05:00, gluh@mysql.com +39 -0
    test case

  sql/handler.h@1.172, 2006-06-29 18:39:27+05:00, gluh@mysql.com +2 -1
    Table 'comment' is changed from char* to LEX_STRING

  sql/sql_show.cc@1.322, 2006-06-29 18:39:28+05:00, gluh@mysql.com +8 -5
    Table 'comment' is changed from char* to LEX_STRING

  sql/sql_table.cc@1.317, 2006-06-29 18:39:28+05:00, gluh@mysql.com +5 -2
    Table 'comment' is changed from char* to LEX_STRING

  sql/sql_yacc.yy@1.471.1.2, 2006-06-29 18:39:28+05:00, gluh@mysql.com +1 -1
    Table 'comment' is changed from char* to LEX_STRING

  sql/table.cc@1.224, 2006-06-29 18:39:28+05:00, gluh@mysql.com +3 -1
    Table 'comment' is changed from char* to LEX_STRING

  sql/table.h@1.129, 2006-06-29 18:39:28+05:00, gluh@mysql.com +1 -1
    Table 'comment' is changed from char* to LEX_STRING

  sql/unireg.cc@1.75, 2006-06-29 18:39:28+05:00, gluh@mysql.com +45 -4
    Fix for bug#13934 Silent truncation of table comments
    Table comment: issue a warning(error in traditional mode) if length of comment > 60 symbols
    Column comment: issue a warning(error in traditional mode) if length of comment > 255 symbols

ChangeSet@1.2191.14.11, 2006-06-29 14:03:53+02:00, ingo@mysql.com +2 -0
  Fixed yet another forgotten port number replacement.

  mysql-test/r/federated.result@1.31, 2006-06-29 14:03:37+02:00, ingo@mysql.com +1 -1
    Fixed yet another forgotten port number replacement.

  mysql-test/t/federated.test@1.27, 2006-06-29 14:03:37+02:00, ingo@mysql.com +1 -0
    Fixed yet another forgotten port number replacement.

ChangeSet@1.2191.21.2, 2006-06-29 16:52:46+05:00, gluh@eagle.intranet.mysql.r18.ru +4 -0
  Bug#19671 mysql_list_fields returns incorrect table name for VIEWs
  After view onening real view db name and table name are placed
  into table_list->view_db & table_list->view_name.
  Item_field class does not handle these names properly during 
  intialization of Send_field.
  The fix is to use new class 'Item_ident_for_show' 
  which sets correct view db name and table name for Send_field.

  sql/item.cc@1.225, 2006-06-29 16:52:40+05:00, gluh@mysql.com +12 -1
    Bug#19671 mysql_list_fields returns incorrect table name for VIEWs
    new Item_ident_for_show class which correctly sets view db and table names
    for Send_field.

  sql/item.h@1.201, 2006-06-29 16:52:40+05:00, gluh@mysql.com +22 -0
    Bug#19671 mysql_list_fields returns incorrect table name for VIEWs
    new Item_ident_for_show class which correctly sets view db and table names
    for Send_field.

  sql/sql_show.cc@1.321, 2006-06-29 16:52:40+05:00, gluh@mysql.com +8 -1
    Bug#19671 mysql_list_fields returns incorrect table name for VIEWs
    new Item_ident_for_show is used for views

  tests/mysql_client_test.c@1.188, 2006-06-29 16:52:40+05:00, gluh@mysql.com +34 -0
    Bug#19671 mysql_list_fields returns incorrect table name for VIEWs
    test case

ChangeSet@1.2191.21.1, 2006-06-29 15:50:44+05:00, gluh@eagle.intranet.mysql.r18.ru +6 -0
  Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context 
  user name is calculated on function execution stage instead of parse stage

  mysql-test/r/sp_notembedded.result@1.4, 2006-06-29 15:49:10+05:00, gluh@mysql.com +14 -0
    Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context
    test case

  mysql-test/t/sp_notembedded.test@1.5, 2006-06-29 15:49:10+05:00, gluh@mysql.com +20 -0
    Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context
    test case

  sql/mysql_priv.h@1.396, 2006-06-29 15:49:10+05:00, gluh@mysql.com +1 -0
    Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context
    new get_current_user(THD *thd, LEX_USER *user) function

  sql/sql_acl.cc@1.196.1.1, 2006-06-29 15:49:10+05:00, gluh@mysql.com +57 -16
    Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context
    user name is calculated using get_current_user() function

  sql/sql_parse.cc@1.556.1.1, 2006-06-29 15:49:10+05:00, gluh@mysql.com +48 -6
    Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context
    new get_current_user() function
    user name is calculated using get_current_user() function

  sql/sql_yacc.yy@1.471.1.1, 2006-06-29 15:49:11+05:00, gluh@mysql.com +9 -31
    Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context
    empty LEX_USER struct for CURRENT USER, 
    user name is calculated on function execution stage

ChangeSet@1.2191.1.19, 2006-06-29 13:45:43+04:00, kroki@mysql.com +1 -0
  Replace all numeric error code with symbolic names in trigger.test.

  mysql-test/t/trigger.test@1.49, 2006-06-29 13:45:37+04:00, kroki@mysql.com +42 -42
    Replace all numeric error code with symbolic names.
    Left are --error 1 for system error, and --error 1100.  The
    symbolic constant for the latter is ER_TABLE_NOT_LOCKED, but using
    it triggers a bug in test driver due to name prefix collision with
    1099 ER_TABLE_NOT_LOCKED_FOR_WRITE.  This bug is fixed in 5.1.

ChangeSet@1.2191.19.1, 2006-06-29 10:35:16+02:00, knielsen@mysql.com +2 -0
  Fix test files to work with non-standard ports (MTR_BUILD_THREAD).

  mysql-test/r/federated.result@1.26.1.3, 2006-06-29 10:35:06+02:00, knielsen@mysql.com +2 -2
    Use --replace_result to make test work on non-standard ports.

  mysql-test/t/federated.test@1.22.1.3, 2006-06-29 10:35:02+02:00, knielsen@mysql.com +2 -0
    Use --replace_result to make test work on non-standard ports.

ChangeSet@1.2191.18.1, 2006-06-29 10:03:26+02:00, knielsen@mysql.com +2 -0
  Fix test files to work with non-standard ports (MTR_BUILD_THREAD).

  mysql-test/r/federated.result@1.26.2.1, 2006-06-29 10:02:49+02:00, knielsen@mysql.com +4 -4
    Use --replace_result to make test work on non-standard ports.

  mysql-test/t/federated.test@1.22.2.1, 2006-06-29 10:02:43+02:00, knielsen@mysql.com +4 -0
    Use --replace_result to make test work on non-standard ports.

ChangeSet@1.2183.29.1, 2006-06-28 23:50:50+04:00, kroki@mysql.com +3 -0
  Bug#10946: Confusing error messeges in the case of duplicate trigger definition
  
  It was hard to distinguish case, when one was unable to create trigger
  on the table because trigger with same action time and event already
  existed for this table, from the case, when one tried to create trigger
  with name which was already occupied by some other trigger, since in
  both these cases we emitted ER_TRG_ALREADY_EXISTS error and message.
  Now we emit ER_NOT_SUPPORTED_YET error with appropriate additional
  message in the first case. There is no sense in introducing separate
  error for this situation since we plan to get rid of this limitation
  eventually.

  mysql-test/r/trigger.result@1.41.1.1, 2006-06-28 23:50:41+04:00, kroki@mysql.com +1 -1
    Update result for new error message.

  mysql-test/t/trigger.test@1.46.1.1, 2006-06-28 23:50:41+04:00, kroki@mysql.com +1 -1
    Update test for new error code.

  sql/sql_trigger.cc@1.49.3.1, 2006-06-28 23:50:41+04:00, kroki@mysql.com +3 -1
    If there is already a trigger with the same activation time, report an
    "Unsupported yet" error.

ChangeSet@1.2191.7.2, 2006-06-28 12:11:52-07:00, jimw@mysql.com +1 -0
  Optimize stack usage of ha_federated::update_row().

  sql/ha_federated.cc@1.62, 2006-06-28 12:11:48-07:00, jimw@mysql.com +13 -20
    We only need one string buffer for fields in ::update_row()

ChangeSet@1.1346.876.1, 2006-06-28 18:55:30+02:00, ingo@mysql.com +2 -0
  Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert"
  
  It was possible that fetching a record by an exact key value 
  (including the record pointer) could return a record with a 
  different key value. This happened only if a concurrent insert 
  added a record with the searched key value after the fetching 
  statement locked the table for read.
  
  The search succeded on the key value, but the record was
  rejected as it was past the file length that was remembered
  at start of the fetching statement. With other words it was 
  rejected as being a concurrently inserted record.
  
  The action to recover from this problem was to fetch the 
  record that is pointed at by the next key of the index. 
  This was repeated until a record below the file length was 
  found.
  
  I do now avoid this loop if an exact match was searched. 
  If this match is beyond the file length, it is now treated 
  as "key not found". There cannot be another key with the 
  same record pointer.

  myisam/mi_rkey.c@1.11.1.4, 2006-06-28 18:55:18+02:00, ingo@mysql.com +14 -2
    Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert"
    Added a check for exact key match before searching for
    the next key that was not concurrently inserted. If an
    exact key match finds a concurrently inserted row, this
    must be treated as "key not found".

  sql/sql_class.cc@1.71.1.43, 2006-06-28 18:55:18+02:00, ingo@mysql.com +3 -3
    Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert"
    Fixed some DBUG_ENTER strings.

ChangeSet@1.1616.2659.1, 2006-06-28 16:07:39+02:00, ingo@mysql.com +1 -0
  Bug#19835 - Binary copy of corrupted tables crash the server when issuing a query
  
  A corrupt table with dynamic record format can crash the 
  server when trying to select from it.
          
  I fixed the crash that resulted from the particular type 
  of corruption that has been reported for this bug.
  
  No test case. To test it, one needs a table with a very special
  corruption. The bug report contains a file with such a table.

  myisam/mi_dynrec.c@1.36.1.2, 2006-06-28 16:06:59+02:00, ingo@mysql.com +3 -0
    Bug#19835 - Binary copy of corrupted tables crash the server when issuing a query
    Added a protection against corrupted records. A dynamic 
    record header with invalid 'next' pointer could trigger 
    the assert in _mi_get_block_info(). Now I avoid this by 
    reporting a corruption error.

ChangeSet@1.1616.2658.1, 2006-06-28 16:28:29+03:00, gkodinov@mysql.com +5 -0
  gcc 4.1 linux warning fixes backported from 5.0.

  sql/item_cmpfunc.h@1.73.1.43, 2006-06-28 16:28:25+03:00, gkodinov@mysql.com +14 -0
    gcc 4.1 linux warning fixes backported from 5.0

  sql/opt_range.cc@1.98.2.48, 2006-06-28 16:28:25+03:00, gkodinov@mysql.com +2 -2
    gcc 4.1 linux warning fixes.

  sql/spatial.h@1.12.1.4, 2006-06-28 16:28:25+03:00, gkodinov@mysql.com +4 -0
    gcc 4.1 linux warning fixes backported from 5.0

  sql/sql_select.h@1.60.1.21, 2006-06-28 16:28:25+03:00, gkodinov@mysql.com +1 -1
    gcc 4.1 linux warning fixes.

  sql/sql_update.cc@1.83.2.72, 2006-06-28 16:28:25+03:00, gkodinov@mysql.com +1 -1
    gcc 4.1 linux warning fixes.

ChangeSet@1.2196.1.2, 2006-06-28 15:53:54+03:00, gkodinov@mysql.com +2 -0
  4.1->5.0 merge for bug #16458

  mysql-test/r/distinct.result@1.46, 2006-06-28 15:53:48+03:00, gkodinov@mysql.com +1 -1
    4.1->5.0 merge for bug #16458
     * 5.0 is better in detecting duplicate columns 

  sql/sql_select.cc@1.427, 2006-06-28 15:53:48+03:00, gkodinov@mysql.com +7 -3
    4.1->5.0 merge for bug #16458
     * Should not do the optimization if using index for group by
     * chnaged structures in 5.0

ChangeSet@1.1616.2657.1, 2006-06-28 14:27:37+02:00, ingo@mysql.com +6 -0
  Bug#17877 - Corrupted spatial index
  
  CHECK TABLE could complain about a fully intact spatial index.
  A wrong comparison operator was used for table checking. 
  The result was that it checked for non-matching spatial keys. 
  This succeeded if at least two different keys were present, 
  but failed if only the matching key was present.
  
  I fixed the key comparison.

  myisam/mi_check.c@1.105.1.53, 2006-06-28 14:27:33+02:00, ingo@mysql.com +3 -2
    Bug#17877 - Corrupted spatial index
    Fixed the comparison operator for checking a spatial index.
    Using MBR_EQUAL | MBR_DATA to compare for equality and
    include the data pointer in the comparison. The latter
    finds the index entry that points to the current record.
    This is necessary for non-unique indexes.
    
    The old operator, SEARCH_SAME, is unknown to the rtree
    search functions and handled like MBR_DISJOINT.

  myisam/mi_key.c@1.32.1.6, 2006-06-28 14:27:33+02:00, ingo@mysql.com +1 -1
    Bug#17877 - Corrupted spatial index
    Added a missing DBUG_RETURN.

  myisam/rt_index.c@1.17, 2006-06-28 14:27:33+02:00, ingo@mysql.com +5 -3
    Bug#17877 - Corrupted spatial index
    Included the data pointer in the copy of the search key.
    This is necessary for searching the index entry that points
    to a specific record if the search_flag contains MBR_DATA.

  myisam/rt_mbr.c@1.10, 2006-06-28 14:27:33+02:00, ingo@mysql.com +5 -1
    Bug#17877 - Corrupted spatial index
    Extended the RT_CMP() macro with an assert for an 
    unexpected comparison operator.

  mysql-test/r/gis-rtree.result@1.8.1.5, 2006-06-28 14:27:33+02:00, ingo@mysql.com +40 -0
    Bug#17877 - Corrupted spatial index
    The test result.

  mysql-test/t/gis-rtree.test@1.9.1.4, 2006-06-28 14:27:33+02:00, ingo@mysql.com +44 -0
    Bug#17877 - Corrupted spatial index
    The test case.

ChangeSet@1.1616.2635.3, 2006-06-28 21:52:24+10:00, stewart@mysql.com +1 -0
  BUG#19894 Data nodes fail during loading data if NoOfFragmentLogFiles=1
  
  change default minimum to 3
  
  bug is *very* timing dependent, unable to reproduce here, but theoretically possible.

  ndb/src/mgmsrv/ConfigInfo.cpp@1.50.5.1, 2006-06-28 21:52:20+10:00, stewart@mysql.com +1 -1
    change minimum NoOfFragmentLogFiles to 3

ChangeSet@1.2123.1.6, 2006-06-28 11:27:37+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#20442
    force close of scan (of outstanding scan_frag)

  ndb/src/ndbapi/NdbScanOperation.cpp@1.69.1.2, 2006-06-28 11:27:35+02:00, jonas@perch.ndb.mysql.com +60 -0
    Force close of scan in when not doing committed read scan

ChangeSet@1.1616.2650.8, 2006-06-27 20:10:49-04:00, iggy@mysql.com +3 -0
  Bug#16180 Setting SQL_LOG_OFF without SUPER privilege is silently ignored

  mysql-test/r/grant2.result@1.8.8.2, 2006-06-27 20:10:46-04:00, iggy@mysql.com +10 -0
    Added results for bug#16180

  mysql-test/t/grant2.test@1.7.1.10, 2006-06-27 20:10:46-04:00, iggy@mysql.com +17 -0
    Added test for bug# 16180

  sql/set_var.cc@1.34.52.38, 2006-06-27 20:10:46-04:00, iggy@mysql.com +2 -1
    Verify user has appropiate rights before setting the sql_log_off system variable.

ChangeSet@1.1616.2651.2, 2006-06-27 18:07:23-04:00, iggy@mysql.com +2 -0
  Bug#19298 mysqld_safe still uses obsolete --skip-locking parameter

  configure.in@1.201.64.8, 2006-06-27 18:07:19-04:00, iggy@mysql.com +4 -4
    Replaced skip-locking with newer skip-external-locking option.  Removed extra quotes.

  scripts/mysqld_safe-watch.sh@1.6, 2006-06-27 18:07:20-04:00, iggy@mysql.com +2 -2
    Replaced skip-locking with newer skip-external-locking option.

ChangeSet@1.1616.2650.7, 2006-06-27 22:22:43+05:00, svoj@may.pils.ru +2 -0
  BUG#1662 - ALTER TABLE LIKE ignores DATA/INDEX DIRECTPORY
  Produce a warning if DATA/INDEX DIRECTORY is specified in
  ALTER TABLE statement.
  
  Ignoring of these options is documented in the symbolic links
  section of the manual.

  mysql-test/r/symlink.result@1.11.1.10, 2006-06-27 22:22:34+05:00, svoj@may.pils.ru +6 -0
    Modified test result according to fix for BUG#1662.

  sql/sql_parse.cc@1.271.1.212, 2006-06-27 22:22:34+05:00, svoj@may.pils.ru +6 -0
    Produce a warning if DATA/INDEX DIRECTORY is specified in
    ALTER TABLE statement.

ChangeSet@1.1616.2650.6, 2006-06-27 19:33:59+04:00, kroki@mysql.com +5 -0
  Dec. 31st, 9999 is still a valid date, only starting with Jan 1st 10000 things become invalid (Bug #12356)

  mysql-test/r/func_sapdb.result@1.2.1.8, 2006-06-27 19:33:53+04:00, kroki@mysql.com +6 -0
    test cases for date range edge cases added

  mysql-test/r/func_time.result@1.23.4.4, 2006-06-27 19:33:53+04:00, kroki@mysql.com +6 -0
    test cases for date range edge cases added

  mysql-test/t/func_sapdb.test@1.2.1.7, 2006-06-27 19:33:53+04:00, kroki@mysql.com +2 -0
    test cases for date range edge cases added

  mysql-test/t/func_time.test@1.21.3.4, 2006-06-27 19:33:53+04:00, kroki@mysql.com +6 -0
    test cases for date range edge cases added

  sql/item_timefunc.cc@1.51.1.52, 2006-06-27 19:33:53+04:00, kroki@mysql.com +6 -5
    Dec. 31st, 9999 is still a valid date, only starting with Jan 1st 10000 things become invalid (Bug #12356)

ChangeSet@1.1616.2653.1, 2006-06-27 17:40:19+03:00, gkodinov@mysql.com +3 -0
  Bug #16458: Simple SELECT FOR UPDATE causes "Result Set not updatable" error
  'SELECT DISTINCT a,b FROM t1' should not use temp table if there is unique 
  index (or primary key) on a.
  There are a number of other similar cases that can be calculated without the
  use of a temp table : multi-part unique indexes, primary keys or using GROUP BY 
  instead of DISTINCT.
  When a GROUP BY/DISTINCT clause contains all key parts of a unique
  index, then it is guaranteed that the fields of the clause will be
  unique, therefore we can optimize away GROUP BY/DISTINCT altogether.
  This optimization has two effects:
  * there is no need to create a temporary table to compute the
     GROUP/DISTINCT operation (or the temporary table will be smaller if only GROUP 
     is removed and DISTINCT stays or if DISTINCT is removed and GROUP BY stays)
  * this causes the statement in effect to become updatable in Connector/Java
  because the result set columns will be direct reference to the primary key of 
  the table (instead to the temporary table that it currently references). 
  
  Implemented a check that will optimize away GROUP BY/DISTINCT for queries like 
  the above.
  Currently it will work only for single non-constant table in the FROM clause.

  mysql-test/r/distinct.result@1.27.1.6, 2006-06-27 17:40:15+03:00, gkodinov@mysql.com +51 -0
    Bug #16458: Simple SELECT FOR UPDATE causes "Result Set not updatable" error
      - test case

  mysql-test/t/distinct.test@1.14.1.4, 2006-06-27 17:40:15+03:00, gkodinov@mysql.com +28 -0
    Bug #16458: Simple SELECT FOR UPDATE causes "Result Set not updatable" error
      - test case

  sql/sql_select.cc@1.216.126.6, 2006-06-27 17:40:15+03:00, gkodinov@mysql.com +168 -0
    Bug #16458: Simple SELECT FOR UPDATE causes "Result Set not updatable" error
      - disable GROUP BY if contains the fields of a unique index.

ChangeSet@1.2123.1.5, 2006-06-27 11:41:00+02:00, jonas@perch.ndb.mysql.com +5 -0
  ndb - bug#20252
    allow user to specify scan batch size in readTuples

  ndb/include/ndbapi/NdbIndexScanOperation.hpp@1.18.1.1, 2006-06-27 11:40:57+02:00, jonas@perch.ndb.mysql.com +4 -2
    Allow user to specify batch size

  ndb/include/ndbapi/NdbScanOperation.hpp@1.33.1.1, 2006-06-27 11:40:57+02:00, jonas@perch.ndb.mysql.com +3 -1
    Allow user to specify batch size

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.86.1.1, 2006-06-27 11:40:57+02:00, jonas@perch.ndb.mysql.com +4 -4
    Fix so that last row works even if batch is complete

  ndb/src/ndbapi/NdbReceiver.cpp@1.16, 2006-06-27 11:40:57+02:00, jonas@perch.ndb.mysql.com +9 -1
    Allow user yo specify batch size

  ndb/src/ndbapi/NdbScanOperation.cpp@1.69.1.1, 2006-06-27 11:40:57+02:00, jonas@perch.ndb.mysql.com +15 -8
    Allow user to specify batchsize

ChangeSet@1.1616.2652.1, 2006-06-27 11:26:41+02:00, ingo@mysql.com +2 -0
  Bug#11824 - internal /tmp/*.{MYD,MYI} files remain, causing subsequent queries to fail
  
  Very complex select statements can create temporary tables
  that are too big to be represented as a MyISAM table.
  
  This was not checked at table creation time, but only at
  open time. The result was an attempt to delete the 
  "impossible" table.
  
  But if the server is built --with-raid, MyISAM tries to 
  open the table before deleting the files. It needs to find 
  out if the table uses the raid support and how many raid 
  chunks there are. This is done with an open "for repair",
  which will almost always succeed.
  
  But in this case we have an "impossible" table. The open
  failed. Hence the files were not deleted. Also the error
  message was a bit unspecific.
  
  I turned an open error in this situation into the assumption 
  of having no raid support on the table. Thus the normal data 
  file is tried to be deleted. This may however leave existing 
  raid chunks behind.
  
  I also added a check in mi_create() to prevent the creation
  of an "impossible" table. A more decriptive error message is
  given in this case.
  
  No test case. The required select statement is way too
  large for the test suite. I added a test script to the
  bug report.

  myisam/mi_create.c@1.37.1.11, 2006-06-27 11:26:29+02:00, ingo@mysql.com +17 -0
    Bug#11824 - internal /tmp/*.{MYD,MYI} files remain, causing subsequent queries to fail
    Added a check to mi_create() that the table description
    header of the index file does not exceed 64KB. The header
    has only 16 bits to encode its length.

  myisam/mi_delete_table.c@1.10, 2006-06-27 11:26:29+02:00, ingo@mysql.com +18 -6
    Bug#11824 - internal /tmp/*.{MYD,MYI} files remain, causing subsequent queries to fail
    Interpret error in table open as not having a raid
    configuration on the tbale. Thus try to delete the
    normal data file, but leave behind raid chunks if 
    they exist.

ChangeSet@1.2191.7.1, 2006-06-26 16:59:52-07:00, jimw@mysql.com +3 -0
  Bug #16494: Updates that set a column to NULL fail sometimes
  
   When building the UPDATE query to send to the remote server, the
   federated storage engine built the query incorrectly if it was updating
   a field to be NULL.
  
   Thanks to Bjrn Steinbrink for an initial patch for the problem.

  mysql-test/r/federated.result@1.27, 2006-06-26 16:59:49-07:00, jimw@mysql.com +16 -0
    Add new results

  mysql-test/t/federated.test@1.23, 2006-06-26 16:59:49-07:00, jimw@mysql.com +17 -0
    Add new regression test

  sql/ha_federated.cc@1.61, 2006-06-26 16:59:49-07:00, jimw@mysql.com +7 -10
    Fix logic of how fields are added to SET and WHERE clauses of an
    UPDATE statement. Fields that were NULL were being handled incorrectly.
    Also reorganizes the code a little bit so the update of the two
    clauses is consistent.

ChangeSet@1.2122.42.1, 2006-06-26 20:57:18+02:00, ingo@mysql.com +6 -0
  Bug#16218 - Crash on insert delayed
  Bug#17294 - INSERT DELAYED puting an \n before data
  Bug#16611 - INSERT DELAYED corrupts data
  Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
  Combined as Bug#16218.
  
  INSERT DELAYED crashed in 5.0 on a table with a varchar that 
  could be NULL and was created pre-5.0 (Bugs 16218 and 13707).
  INSERT DELAYED corrupted data in 5.0 on a table with varchar 
  fields that was created pre-5.0 (Bugs 17294 and 16611).
  
  In case of INSERT DELAYED the open table is copied from the
  delayed insert thread to be able to create a record for the 
  queue. When copying the fields, a method was used that did 
  convert old varchar to new varchar fields and did not set up 
  some pointers into the record buffer of the table.
  
  The field conversion was guilty for the misinterpretation of 
  the record contents by the delayed insert thread. The wrong
  pointer setup was guilty for the crashes.
  
  For Bug 13707 (Server crash with INSERT DELAYED on MyISAM table)
  I fixed the above mentioned method to set up one of the pointers.
  For Bug 16218 I set up the other pointers too.
  
  But when looking at the corruptions I got aware that converting
  the field type was totally wrong for INSERT DELAYED. The copied
  table is used to create a record that is to be sent to the
  delayed insert thread. Of course it can interpret the record
  correctly only if all field types are the same in both table
  objects.
  
  So I revoked the fix for Bug 13707 and changed the new_field() 
  method so that it can suppress conversions.
  
  No test case as this is a migration problem. One needs to
  create a table with 4.x and use it with 5.x. I added two
  test scripts to the bug report.

  sql/field.cc@1.304.1.1, 2006-06-26 20:57:12+02:00, ingo@mysql.com +13 -18
    Bug#16218 - Crash on insert delayed
    Bug#17294 - INSERT DELAYED puting an \n before data
    Bug#16611 - INSERT DELAYED corrupts data
    Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
    Combined as Bug#16218.
    
    Added parameter 'keep_type' to Field::new_field().
    
    Undid the change from Bug 13707 (Server crash with INSERT 
    DELAYED on MyISAM table).
    I solved all four bugs in sql/sql_insert.cc by making exact
    duplicates of the fields. The new_field() method converts
    certain field types, which is wrong for INSERT DELAYED.

  sql/field.h@1.177.1.1, 2006-06-26 20:57:12+02:00, ingo@mysql.com +4 -3
    Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
    Combined as Bug#16218.
    
    Added parameter 'keep_type' to Field::new_field().

  sql/sql_insert.cc@1.187.1.1, 2006-06-26 20:57:12+02:00, ingo@mysql.com +67 -12
    Bug#16218 - Crash on insert delayed
    Bug#17294 - INSERT DELAYED puting an \n before data
    Bug#16611 - INSERT DELAYED corrupts data
    Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
    Combined as Bug#16218.
    
    Added comments. Made small style fixes.
    Used the new parameter 'keep_type' of Field::new_field()
    to avoid field type conversion. The table copy must have
    exactly the same types of fields as the original table.
    Otherwise the record contents created by the foreground 
    thread could be misinterpreted by the delayed insert thread.

  sql/sql_select.cc@1.413.2.1, 2006-06-26 20:57:12+02:00, ingo@mysql.com +3 -2
    Bug#16218 - Crash on insert delayed
    Bug#17294 - INSERT DELAYED puting an \n before data
    Bug#16611 - INSERT DELAYED corrupts data
    Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
    Combined as Bug#16218.
    
    Added parameter 'keep_type' to Field::new_field().
    
    Undid the change from Bug 13707 (Server crash with INSERT 
    DELAYED on MyISAM table).
    I solved all four bugs in sql/sql_insert.cc by making exact
    duplicates of the fields. The new_field() method converts
    certain field types, which is wrong for INSERT DELAYED.

  sql/sql_trigger.cc@1.50, 2006-06-26 20:57:13+02:00, ingo@mysql.com +2 -1
    Bug#16218 - Crash on insert delayed
    Bug#17294 - INSERT DELAYED puting an \n before data
    Bug#16611 - INSERT DELAYED corrupts data
    Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
    Combined as Bug#16218.
    
    Added parameter 'keep_type' to Field::new_field().
    
    Undid the change from Bug 13707 (Server crash with INSERT 
    DELAYED on MyISAM table).
    I solved all four bugs in sql/sql_insert.cc by making exact
    duplicates of the fields. The new_field() method converts
    certain field types, which is wrong for INSERT DELAYED.

  sql/table.cc@1.218.3.1, 2006-06-26 20:57:13+02:00, ingo@mysql.com +2 -1
    Bug#16218 - Crash on insert delayed
    Bug#17294 - INSERT DELAYED puting an \n before data
    Bug#16611 - INSERT DELAYED corrupts data
    Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
    Combined as Bug#16218.
    
    Added parameter 'keep_type' to Field::new_field().
    
    Undid the change from Bug 13707 (Server crash with INSERT 
    DELAYED on MyISAM table).
    I solved all four bugs in sql/sql_insert.cc by making exact
    duplicates of the fields. The new_field() method converts
    certain field types, which is wrong for INSERT DELAYED.

ChangeSet@1.2172.1.1, 2006-06-26 23:31:10+10:00, stewart@mysql.com +1 -0
  BUG#11459 ndb status variables not updated
  
  change names of some undocumented ndb status variables to better reflect what
  their values mean

  sql/ha_ndbcluster.cc@1.258.2.1, 2006-06-26 23:31:02+10:00, stewart@mysql.com +2 -2
    rename some status variables to better reflect what they show.

ChangeSet@1.1616.2548.10, 2006-06-26 12:16:39+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#20683
    part 1 - make sure return code is propagated from request tracker

  ndb/src/kernel/vm/RequestTracker.hpp@1.2, 2006-06-26 12:16:37+02:00, jonas@perch.ndb.mysql.com +2 -2
    propagate return value

  ndb/src/kernel/vm/SafeCounter.hpp@1.1.1.1, 2006-06-26 12:16:37+02:00, jonas@perch.ndb.mysql.com +14 -8
    make sure object is not initialized in case of seize() failure, to make sure destructor doesnt assert

ChangeSet@1.2197, 2006-06-23 18:21:34-07:00, igor@rurik.mysql.com +6 -0
  Fixed some dsp files.
  Fixed make_win_src_distribution.sh to return back dsp files
  for yassl.

  VC++Files/client/mysqldump.dsp@1.15, 2006-06-23 18:21:26-07:00, igor@rurik.mysql.com +4 -0
    my_user.c was missing.

  VC++Files/client/mysqldump_ia64.dsp@1.4, 2006-06-23 18:21:26-07:00, igor@rurik.mysql.com +4 -0
    my_user.c was missing.

  VC++Files/sql/mysqld.dsp@1.42, 2006-06-23 18:21:26-07:00, igor@rurik.mysql.com +4 -0
    my_user.c was missing.

  VC++Files/sql/mysqld_ia64.dsp@1.3, 2006-06-23 18:21:26-07:00, igor@rurik.mysql.com +4 -0
    my_user.c was missing.

  extra/yassl/yassl.dsp@1.3, 2006-06-23 18:21:26-07:00, igor@rurik.mysql.com +4 -4
    Added the YASSL_PREFIX flag.

  scripts/make_win_src_distribution.sh@1.48, 2006-06-23 18:21:26-07:00, igor@rurik.mysql.com +1 -1
    Returned back dsp files from yassl.

ChangeSet@1.1616.2647.7, 2006-06-22 20:39:46-07:00, igor@rurik.mysql.com +2 -0
  Added a test case for bug #18359.
  This was another manifestation of the problems fixed in the
  patch for bug 16674.
  Wrong calculation of length of the search prefix in the pattern
  string led here to a wrong result set for a query in 4.1. 
  The bug could be demonstrated for any multi-byte character set. 

  mysql-test/r/ctype_utf8.result@1.45.6.4, 2006-06-22 20:39:40-07:00, igor@rurik.mysql.com +56 -0
    Added a test case for bug #18359.

  mysql-test/t/ctype_utf8.test@1.57.6.4, 2006-06-22 20:39:40-07:00, igor@rurik.mysql.com +31 -0
    Added a test case for bug #18359.

ChangeSet@1.1616.2647.6, 2006-06-22 15:50:15-07:00, igor@rurik.mysql.com +3 -0
  Fixed bug #20076.
  Server crashed in some cases when a query required a MIN/MAX
  agrregation for a 'ucs2' field. 
  In these cases  the aggregation caused calls of the function
  update_tmptable_sum_func that indirectly invoked 
  the method Item_sum_hybrid::min_max_update_str_field() 
  containing a call to strip_sp for a ucs2 character set.
  The latter led directly to the crash as it used my_isspace
  undefined for the ucs2 character set.
  Actually the call of strip_sp is not needed at all in this
  situation and has been removed by the fix.

  mysql-test/r/ctype_ucs.result@1.11.1.19, 2006-06-22 15:50:11-07:00, igor@rurik.mysql.com +7 -0
    Added a test case for bug #20076.

  mysql-test/t/ctype_ucs.test@1.15.1.15, 2006-06-22 15:50:11-07:00, igor@rurik.mysql.com +12 -0
    Added a test case for bug #20076.

  sql/item_sum.cc@1.89.1.59, 2006-06-22 15:50:11-07:00, igor@rurik.mysql.com +0 -1
    Fixed bug #20076.
    Server crashed in some cases when a query required a MIN/MAX
    agrregation for a 'ucs2' field. 
    In these cases  the aggregation caused calls of the function
    update_tmptable_sum_func that indirectly invoked 
    the method Item_sum_hybrid::min_max_update_str_field() 
    containing a call to strip_sp for a ucs2 character set.
    The latter led directly to the crash as it used my_isspace
    undefined for the ucs2 character set.
    Actually the call of strip_sp is not needed at all in this
    situation and has been removed by the fix.

ChangeSet@1.1616.2548.9, 2006-06-22 12:03:28+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#19164
    set max value on ports

  ndb/src/mgmsrv/ConfigInfo.cpp@1.50.2.13, 2006-06-22 12:03:26+02:00, jonas@perch.ndb.mysql.com +7 -6
    set max vlue on ports

ChangeSet@1.2194, 2006-06-22 00:08:32-07:00, igor@rurik.mysql.com +1 -0
  Post-merge fix.

  strings/ctype-mb.c@1.49, 2006-06-22 00:08:26-07:00, igor@rurik.mysql.com +1 -6
    Post-merge fix.

ChangeSet@1.1616.2647.5, 2006-06-21 22:39:48-07:00, igor@rurik.mysql.com +2 -0
  Modified the test case for bug 16674 to have the same
  execution plans in 4.1 and 5.0.

  mysql-test/r/ctype_utf8.result@1.45.6.3, 2006-06-21 22:39:43-07:00, igor@rurik.mysql.com +10 -4
    Modified the test case for bug 16674 to have the same
    execution plans in 4.1 and 5.0. 

  mysql-test/t/ctype_utf8.test@1.57.6.3, 2006-06-21 22:39:43-07:00, igor@rurik.mysql.com +2 -0
    Modified the test case for bug 16674 to have the same
    execution plans in 4.1 and 5.0.

ChangeSet@1.1616.2548.8, 2006-06-21 14:00:26+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#20197
    also close scan which are in "delivered" state, as it's impossible to release locks afterwards
  
    backport from 5.1

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.42.1.25, 2006-06-21 14:00:24+02:00, jonas@perch.ndb.mysql.com +12 -0
    ndb - bug#20197
      also close scan which are in "delivered" state, as it's impossible to release locks afterwards

ChangeSet@1.1616.2593.4, 2006-06-21 09:20:55+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb autotest -
    add BUILD/compile-ndb-autotest to simplify building autotest on different mysql versions

  BUILD/compile-ndb-autotest@1.1, 2006-06-21 09:20:52+02:00, jonas@perch.ndb.mysql.com +9 -0
    New BitKeeper file ``BUILD/compile-ndb-autotest''

  BUILD/compile-ndb-autotest@1.0, 2006-06-21 09:20:52+02:00, jonas@perch.ndb.mysql.com +0 -0
    BitKeeper file /home/jonas/src/41-jonas/BUILD/compile-ndb-autotest

ChangeSet@1.1616.2144.159, 2006-06-21 00:12:23-07:00, igreenhoe@mysql.com +2 -0
  Fix for bug #15977 (switch ordering of DISABLE KEYS/LOCK TABLE in mysqldump)

  client/mysqldump.c@1.143.13.5, 2006-06-21 00:12:17-07:00, igreenhoe@mysql.com +13 -10
    Fix for bug #15977 (switch ordering of DISABLE KEYS/LOCK TABLE in mysqldump)

  mysql-test/r/mysqldump.result@1.9.1.45, 2006-06-21 00:12:18-07:00, igreenhoe@mysql.com +34 -52
    Fix for bug #15977 (switch ordering of DISABLE KEYS/LOCK TABLE in mysqldump)

ChangeSet@1.1616.2645.1, 2006-06-20 19:57:21-07:00, igor@rurik.mysql.com +3 -0
  Fixed bug #16674.
  The length of the prefix of the pattern string in the LIKE predicate that 
  determined the index range to be scanned was calculated incorrectly for
  multi-byte character sets. 
  As a result of this in 4. 1 the the scanned range was wider then necessary
  if the prefix contained not only one-byte characters.  
  In 5.0 additionally it caused missing some rows from the result set.

  mysql-test/r/ctype_utf8.result@1.45.6.1, 2006-06-20 19:57:17-07:00, igor@rurik.mysql.com +67 -0
    Added test cases for bug #16674.

  mysql-test/t/ctype_utf8.test@1.57.6.1, 2006-06-20 19:57:17-07:00, igor@rurik.mysql.com +55 -0
    Added test cases for bug #16674.

  strings/ctype-mb.c@1.34.1.8, 2006-06-20 19:57:17-07:00, igor@rurik.mysql.com +16 -9
    Fixed bug #16674.
    The length of the prefix of the pattern string in the LIKE predicate that 
    determined the index range to be scanned was calculated incorrectly for
    multi-byte character sets. 
    As a result of this in 4. 1 the the scanned range was wider then necessary
    if the prefix contained not only one-byte characters.  
    In 5.0 additionally it caused missing some rows from the result set.
        
    The function my_like_range_mb was fixed to calculate the length of
    the prefix in a pattern string correctly in all cases.

ChangeSet@1.2167.14.1, 2006-06-20 17:06:35+05:00, holyfoot@deer.(none) +1 -0
  bug #19672 (paths in embedded server are trucated in error messages)
  
  It fact, filenames are truncated in normal server as well, just we
  get bigger filenames in embedded server tests, but that can potentially
  get some problems in both cases.
  I modified file-related error messages to allow longer filenames

  sql/share/errmsg.txt@1.65, 2006-06-20 17:01:59+05:00, holyfoot@mysql.com +13 -13
    error messages fixed to keep longer filenames uncut

ChangeSet@1.2122.41.1, 2006-06-09 19:35:54+02:00, msvensson@neptunus.(none) +6 -0
  Bug #7498 User variable SET saves SIGNED BIGINT as UNSIGNED BIGINT
  - Add unsigned flag to user_var_entry, used when 'type' is INT_RESULT
  - Propagate unsigned flag from the query executed by Item_single_row_subselect

  mysql-test/r/user_var.result@1.39, 2006-06-09 19:35:50+02:00, msvensson@neptunus.(none) +36 -0
    Update test results

  mysql-test/t/user_var.test@1.34, 2006-06-09 19:35:50+02:00, msvensson@neptunus.(none) +31 -0
    Add test case

  sql/item_func.cc@1.284.1.1, 2006-06-09 19:35:50+02:00, msvensson@neptunus.(none) +17 -7
    Add unsigned_flag to user_var_entry. Used when 'type' is INT_RESULT
    Pass unsigned_flag to 'update_hash' if type is INT_RESULT

  sql/item_func.h@1.138.1.1, 2006-06-09 19:35:50+02:00, msvensson@neptunus.(none) +2 -4
    Removed unused variable save_buff
    Add parameter unsigned_arg to 'update_hash'

  sql/item_subselect.cc@1.123.1.1, 2006-06-09 19:35:50+02:00, msvensson@neptunus.(none) +1 -0
    Propagate unsigned_flag to Item_singlerow_subselect from the items in the select to the cached items.

  sql/sql_class.h@1.289, 2006-06-09 19:35:50+02:00, msvensson@neptunus.(none) +1 -0
    Add unsigned_flag to user_var_entry. Used when 'type' is INT_RESULT

ChangeSet@1.2149.10.1, 2006-06-07 14:07:11+02:00, msvensson@neptunus.(none) +1 -0
  Bug#20159 Inconsistant generation of generic error messages
   - Use hardcoded error message instead of ER_GET_ERRNO 

  sql/sql_udf.cc@1.57, 2006-06-07 14:07:06+02:00, msvensson@neptunus.(none) +1 -1
    Use hardcoded error message "Got unknown error: %d" instead of system error message "Got error %d from storage engine" as the "storage engine" has nothing to do with this.

ChangeSet@1.1616.2609.2, 2006-06-02 22:33:22+05:00, holyfoot@deer.(none) +2 -0
  bug #19983 (mysql_client_test_embedded fails)

  libmysqld/lib_sql.cc@1.75.8.1, 2006-06-02 22:32:37+05:00, holyfoot@mysql.com +6 -2
    field length counting fixed

  tests/mysql_client_test.c@1.51.31.1, 2006-06-02 22:32:37+05:00, holyfoot@mysql.com +2 -0
    this test is not for embedded server as it tests kill command

ChangeSet@1.1616.2624.1, 2006-06-01 17:06:42+05:00, holyfoot@deer.(none) +8 -0
  bug #16017 (memory leaks in embedded server)
  
  There actually was 3 different problems -
  hash_user_connections wasn't cleaned
  one strdupped database name wasn't freed
  and stmt->mem_root wasn't cleaned as it was
  replased with mysql->field_alloc for result
  For the last one - i made the library using stmt's
  fields to store result if it's the case.

  include/mysql.h@1.135.1.8, 2006-06-01 17:05:55+05:00, holyfoot@mysql.com +14 -3
    statement pointer added to the advanced_command to be checked in
    embedded server

  include/sql_common.h@1.15, 2006-06-01 17:05:55+05:00, holyfoot@mysql.com +2 -1
    stmt added to the cli_advanced_command interface

  libmysql/libmysql.c@1.156.1.147, 2006-06-01 17:05:55+05:00, holyfoot@mysql.com +7 -6
    stmt pointer now sent to advanced_command

  libmysqld/embedded_priv.h@1.12.1.1, 2006-06-01 17:05:55+05:00, holyfoot@mysql.com +3 -3
    it's enough to send database name to check_embedded_connection

  libmysqld/lib_sql.cc@1.75.1.51, 2006-06-01 17:05:55+05:00, holyfoot@mysql.com +31 -22
    Now we store result directly in the MYSQL_STMT structure to
    avoid extra copying

  libmysqld/libmysqld.c@1.64.1.2, 2006-06-01 17:05:55+05:00, holyfoot@mysql.com +3 -6
    it's enough to only send database pointer to check_embedded_connection

  sql-common/client.c@1.46.1.43, 2006-06-01 17:05:55+05:00, holyfoot@mysql.com +2 -1
    stmt fake attribute added to cli_advanced_command

  sql/sql_parse.cc@1.271.124.1, 2006-06-01 17:05:55+05:00, holyfoot@mysql.com +12 -6
    hash_user_connections isn't used if no access checks compiled

ChangeSet@1.2139.2.4, 2006-05-24 16:10:25+05:00, bar@mysql.com +1 -0
  bug#10979 USE does not refresh db privilege changes if the same db is used in command.
  The problem happened because "mysql" didn't send mysql_select_db() if 
  the current active database was specified in USE.
  Now it always send mysql_select_db().
  Rebuilding of completion hash is skipped in the same db is used
  (for performance purposes).

  client/mysql.cc@1.206, 2006-05-24 16:10:16+05:00, bar@mysql.com +38 -19
    bug#10979 USE does not refresh db privilege changes if the same db is used in command.
    The problem happened because "mysql" didn't send mysql_select_db() if 
    the current active database was specified in USE.
    Now it always send mysql_select_db().
    Rebuilding of completion hash is skipped in the same db is used
    (for performance purposes).

ChangeSet@1.2133.7.1, 2006-05-23 18:16:26+10:00, stewart@mysql.com +1 -0
  BUG#13985 Cluster: ndb_mgm "status" command can return incorrect data node status
  
  partial fix for this bug. more info on what the other half of the fix involves
  is in the bug report.

  ndb/src/mgmclient/CommandInterpreter.cpp@1.57.1.2, 2006-05-23 18:16:20+10:00, stewart@mysql.com +24 -4
    partial fix for bug13985
    
    hold a mutex around printing out events
    hold the mutex also around printing out put of 'status' commands.
    
    this means we don't get
    1 started
    2 started
    2 starting
    
    output.
    
    we'll instead get the event before/after the entire status output.
    Due to the nature of the event arriving before status being updated,
    we'll pretty much always see started AFTER starting.

ChangeSet@1.1616.2604.1, 2006-05-17 17:00:30+05:00, ramil@mysql.com +3 -0
  Fix for #16327: invalid TIMESTAMP values retrieved

  mysql-test/r/func_time.result@1.23.1.16, 2006-05-17 17:00:25+05:00, ramil@mysql.com +7 -0
    Fix for #16327: invalid TIMESTAMP values retrieved
      - test result

  mysql-test/t/func_time.test@1.21.1.13, 2006-05-17 17:00:25+05:00, ramil@mysql.com +10 -0
    Fix for #16327: invalid TIMESTAMP values retrieved
      - test case

  sql/field.cc@1.197.1.33, 2006-05-17 17:00:25+05:00, ramil@mysql.com +1 -1
    Fix for #16327: invalid TIMESTAMP values retrieved
      - let 1969 as well

ChangeSet@1.1616.2582.1, 2006-05-04 11:55:09+05:00, bar@mysql.com +5 -0
  Bugs#17647: Trouble with "create database"
  
  Problem:
  if a user was granted privileges on database "d1",
  it also was able to act on "D1" (i.e. in upper case),
  even on Unix with case sensitive file system.
  
  Fix:
  Initialize grant hash to use binary comparison
  if lower_case_file_system is not set (on most unixes),
  and case insensitive comparison otherwise (Windows, MacOSX).

  mysql-test/include/have_case_sensitive_file_system.inc@1.1, 2006-05-04 11:55:03+05:00, bar@mysql.com +4 -0
    New BitKeeper file ``mysql-test/include/have_case_sensitive_file_system.inc''
    Backporting from 5.1
    

  mysql-test/include/have_case_sensitive_file_system.inc@1.0, 2006-05-04 11:55:03+05:00, bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b17647/mysql-test/include/have_case_sensitive_file_system.inc

  mysql-test/r/case_sensitive_file_system.require@1.1, 2006-05-04 11:55:03+05:00, bar@mysql.com +2 -0
    New BitKeeper file ``mysql-test/r/case_sensitive_file_system.require''
    Backporting from 5.1
    

  mysql-test/r/case_sensitive_file_system.require@1.0, 2006-05-04 11:55:03+05:00, bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b17647/mysql-test/r/case_sensitive_file_system.require

  mysql-test/r/lowercase_fs_off.result@1.1, 2006-05-04 11:55:03+05:00, bar@mysql.com +11 -0
    Adding test case
    

  mysql-test/r/lowercase_fs_off.result@1.0, 2006-05-04 11:55:03+05:00, bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b17647/mysql-test/r/lowercase_fs_off.result

  mysql-test/t/lowercase_fs_off.test@1.1, 2006-05-04 11:55:04+05:00, bar@mysql.com +27 -0
    Adding test case
    

  mysql-test/t/lowercase_fs_off.test@1.0, 2006-05-04 11:55:04+05:00, bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b17647/mysql-test/t/lowercase_fs_off.test

  sql/sql_acl.cc@1.74.31.1, 2006-05-04 11:55:03+05:00, bar@mysql.com +3 -1
    Initialize hash to use binary comparison with case sensitive FS.

ChangeSet@1.1616.2554.1, 2006-04-20 15:09:01+05:00, bar@mysql.com +3 -0
  Bug#9509: Optimizer: wrong result after AND with latin1_german2_ci comparisons
  
  Fixing part2 of this problem: AND didn't work well 
  with utf8_czech_ci and utf8_lithianian_ci in some cases.
  
  The problem was because when during condition optimization
  field was replaced with a constant, the constant's collation
  and collation derivation was used later for comparison instead
  of the field collation and derivation, which led to non-equal
  new condition in some cases.
  
  This patch copies collation and derivation from the field being removed
  to the new constant, which makes comparison work using the same collation
  with the one which would be used if no condition optimization were done.
  
  In other words:
  
    where s1 < 'K' and s1 = 'Y';
  
  was rewritten to:
  
    where 'Y' < 'K' and s1 = 'Y';
  
  Now it's rewritten to:
  
    where 'Y' collate collation_of_s1 < 'K' and s1 = 'Y'
  
    (using derivation of s1)
  
  
  Note, the first problem of this bug (with latin1_german2_ci) was fixed
  earlier in 5.0 tree, in a separate changeset.

  mysql-test/r/ctype_utf8.result@1.45.1.25, 2006-04-20 15:08:56+05:00, bar@mysql.com +31 -0
    Adding test case

  mysql-test/t/ctype_utf8.test@1.57.1.15, 2006-04-20 15:08:56+05:00, bar@mysql.com +18 -0
    Adding test case

  sql/sql_select.cc@1.216.125.3, 2006-04-20 15:08:56+05:00, bar@mysql.com +4 -0
    Set proper collation of the new item

ChangeSet@1.2084.1.80, 2006-04-17 19:57:50-07:00, igreenhoe@mysql.com +1 -0
  Fix for bug #17353.

  scripts/mysqld_safe.sh@1.82, 2006-04-17 19:57:45-07:00, igreenhoe@mysql.com +7 -4
    Moved core file changing command outside of root-user only conditional

ChangeSet@1.2084.104.1, 2006-04-17 19:43:19-07:00, igreenhoe@mysql.com +1 -0
  Fix for bug #18979, bad RE in mysql-test-run.pl

  mysql-test/lib/mtr_cases.pl@1.18, 2006-04-17 19:43:02-07:00, igreenhoe@mysql.com +1 -1
    Fixed the RE so that backtracking will not occur.

ChangeSet@1.1616.2547.1, 2006-04-17 12:33:45+05:00, bar@mysql.com +1 -0
  Bug#17939: Wrong table format when using UTF8 strings
  
  Lines with column names consisting of national letters
  were wrongly formatted in "mysql --table" results:
  
  mysql> SELECT 'xxx xxx xxx' as 'xxx xxx xxx';
  +-------------------+
  | xxx xxx xxx |
  +-------------------+
  | xxx xxx xxx       |
  +-------------------+
  1 row in set (0.00 sec)
  
  It happened because in UTF-8 (and other multibyte charsets)
  the number of display cells is not always equal to the number
  of bytes of the string.
  
  Data lines (unlike column name lines) were formatted correctly,
  because data lines were displayed taking in account number of
  display cells. This patch takes in account number of cells when
  displaying column names, the same way like displaying data lines does.
  
  Note: The patch is going to be applied to 4.1.
  Test case will be added after merge to 5.0,
  into "mysql.test", which appeared in 5.0.
  
  mysql.cc:
    Adding column name allignment using numcells(),
    the same to data alignment, which was implemented earlier.
  

  client/mysql.cc@1.121.1.98, 2006-04-17 12:14:15+05:00, bar@mysql.com +7 -2
    Adding column name allignment, the same to
    data alignment, which was implemented earlier.

ChangeSet@1.1960.22.1, 2005-11-22 18:29:46+04:00, ramil@mysql.com +4 -0
  Fix for bug #10966: Variance functions return wrong data type.

  mysql-test/r/func_group.result@1.47, 2005-11-22 18:29:36+04:00, ramil@mysql.com +14 -0
    Fix for bug #10966: Variance functions return wrong data type.

  mysql-test/t/func_group.test@1.46, 2005-11-22 18:29:36+04:00, ramil@mysql.com +11 -0
    Fix for bug #10966: Variance functions return wrong data type.

  sql/item_sum.cc@1.166.2.1, 2005-11-22 18:29:36+04:00, ramil@mysql.com +0 -3
    Fix for bug #10966: Variance functions return wrong data type.
    Always return Field_double if no grouping.

  sql/item_sum.h@1.94.1.1, 2005-11-22 18:29:36+04:00, ramil@mysql.com +1 -1
    Fix for bug #10966: Variance functions return wrong data type.

