ChangeSet
  1.2222 06/07/04 12:30:08 joerg@mysql.com +1 -0
  When building RPMs, use the Perl script to run the tests, to automatically check SSL.

  support-files/mysql.spec.sh
    1.146 06/07/04 12:30:02 joerg@mysql.com +7 -2
    Use the Perl script to run the tests, because it will automatically check
    whether the server is configured with SSL.
    (The shell script needs an explicit flag, and we cannot pass that though "make".)

ChangeSet
  1.2183.28.5 06/07/04 11:43:06 tomas@poseidon.ndb.mysql.com +3 -0
  Bug #20784 Uninitialized memory in update on table with PK not on first column
  - partial backport of code from 5.1, do cot compare_record for engines that do not read all columns during update

  sql/sql_update.cc
    1.191 06/07/04 11:42:52 tomas@poseidon.ndb.mysql.com +22 -3
    Bug #20784 Uninitialized memory in update on table with PK not on first column
    - partial backport of code from 5.1, do cot compare_record for engines that do not read all columns during update

  sql/handler.h
    1.172 06/07/04 11:42:52 tomas@poseidon.ndb.mysql.com +1 -0
    Bug #20784 Uninitialized memory in update on table with PK not on first column
    - partial backport of code from 5.1, do cot compare_record for engines that do not read all columns during update

  sql/ha_ndbcluster.cc
    1.261.2.6 06/07/04 11:42:52 tomas@poseidon.ndb.mysql.com +2 -1
    Bug #20784 Uninitialized memory in update on table with PK not on first column
    - partial backport of code from 5.1, do cot compare_record for engines that do not read all columns during update

ChangeSet
  1.2220 06/07/03 21:41:15 tnurnberg@mysql.com +1 -0
  Bug#20783: Valgrind uninitialised warning in test case ctype_uca
    
  Two functions have different ideas of what a string should look like;
  one of them reads memory it assumes the other one may have written.
  And "if you assume ..."
    
  We now use a more defensive variety of the assuming function, this fixes
  a warning thrown by the valgrind tool.

  sql/item_cmpfunc.cc
    1.212 06/07/03 21:41:09 tnurnberg@mysql.com +1 -1
    c_ptr() makes incorrect assumptions about the string we get from
    out of args[0]->val_str(&tmp); c_str_safe() is more defensive.

ChangeSet
  1.2219 06/07/03 20:08:38 kent@mysql.com +1 -0
  client.c:
    Define 'mysql_get_ssl_cipher' even if no SSL built in, it is referenced in libmysql.def

  sql-common/client.c
    1.92 06/07/03 19:30:21 kent@mysql.com +7 -0
    Define 'mysql_get_ssl_cipher' even if no SSL built in, it is referenced in libmysql.def

ChangeSet
  1.2215.1.2 06/07/03 16:44:17 kent@suse9-x86.mysql.com +3 -0
  mwldnlm, mwccnlm, mwasmnlm:
    Use Perl for filtering, do more filtering

  netware/BUILD/mwldnlm
    1.6 06/07/03 16:44:03 kent@suse9-x86.mysql.com +4 -1
    Use Perl for filtering, do more filtering

  netware/BUILD/mwccnlm
    1.6 06/07/03 16:44:03 kent@suse9-x86.mysql.com +4 -1
    Use Perl for filtering, do more filtering

  netware/BUILD/mwasmnlm
    1.6 06/07/03 16:44:03 kent@suse9-x86.mysql.com +4 -1
    Use Perl for filtering, do more filtering

ChangeSet
  1.2215.1.1 06/07/03 10:56:19 kent@suse9-x86.mysql.com +4 -0
  Makefile.am:
    Avoid duplicate symbol errors on Netware
  mwldnlm, mwccnlm, mwasmnlm:
    Filter garbage characters from output

  tests/Makefile.am
    1.26 06/07/03 10:55:58 kent@suse9-x86.mysql.com +6 -0
    Avoid duplicate symbol errors on Netware

  netware/BUILD/mwldnlm
    1.5 06/07/03 10:51:00 kent@suse9-x86.mysql.com +1 -1
    Filter garbage characters from output

  netware/BUILD/mwccnlm
    1.5 06/07/03 10:51:00 kent@suse9-x86.mysql.com +1 -1
    Filter garbage characters from output

  netware/BUILD/mwasmnlm
    1.5 06/07/03 10:51:00 kent@suse9-x86.mysql.com +1 -1
    Filter garbage characters from output

ChangeSet
  1.2217 06/07/01 23:52:19 kent@mysql.com +1 -0
  mysqld.vcproj:
    Don't define __NT__ for 'Max' target

  VC++Files/sql/mysqld.vcproj
    1.7 06/07/01 23:51:35 kent@mysql.com +2 -2
    Don't define __NT__ for 'Max' target

ChangeSet
  1.2216 06/07/01 15:11:59 kent@mysql.com +1 -0
  my_sys.h:
    Added missing parameter type change for _my_strdup_with_length()

  include/my_sys.h
    1.183 06/07/01 15:10:52 kent@mysql.com +1 -1
    Added missing parameter type change for _my_strdup_with_length()

ChangeSet
  1.2215 06/06/30 19:37:11 joerg@mysql.com +3 -0
  Manual transfer of the following changeset into the 5.0.23 release clone:
     1.2525 06/06/30 18:29:27 monty@mysql.com +3 -0
     Reverted wrong bug fix (Bug#11228)

  sql/table.cc
    1.224 06/06/30 19:37:05 joerg@mysql.com +21 -0
    Manual transfer of the following fix into the 5.0.23 release clone:
       1.135 06/06/30 18:29:25 monty@mysql.com +21 -0
       Reverted wrong bug fix.   ...

  mysql-test/t/key.test
    1.26 06/06/30 19:37:05 joerg@mysql.com +1 -0
    Manual transfer of the following fix into the 5.0.23 release clone:
       1.24 06/06/30 18:29:25 monty@mysql.com +1 -0
       Added SHOW CREATE TABLE, which is the proper way to check for table definitions

  mysql-test/r/key.result
    1.31 06/06/30 19:37:05 joerg@mysql.com +9 -1
    Manual transfer of the following fix into the 5.0.23 release clone:
       1.27 06/06/30 18:29:25 monty@mysql.com +9 -1
       Fixed result after removing wrong bug fix

ChangeSet
  1.1616.2637.2 06/06/30 16:25:07 tomas@poseidon.ndb.mysql.com +1 -0
  adopted ndb handler code for tables without primary key and with unique index
  - added missing retrieval of hidden primary key

  sql/ha_ndbcluster.cc
    1.114.3.73 06/06/30 16:25:03 tomas@poseidon.ndb.mysql.com +6 -0
    adopted ndb handler code for tables without primary key and with unique index
    - added missing retrieval of hidden primary key

ChangeSet
  1.2210.1.1 06/06/30 09:26:36 knielsen@mysql.com +7 -0
  BUG#20769: Dangling pointer in ctype_recoding test case.
  
  In some functions dealing with strings and character sets, the wrong
  pointers were saved for restoration in THD::rollback_item_tree_changes().
  This could potentially cause random corruption or crashes.
  
  Fixed by passing the original Item ** locations, not local stack copies.
  
  Also remove unnecessary use of default arguments.

  sql/item_sum.cc
    1.176 06/06/30 09:26:32 knielsen@mysql.com +1 -1
    Remove use of default argument.

  sql/item_strfunc.cc
    1.272 06/06/30 09:26:32 knielsen@mysql.com +17 -33
    Pass original Item **'s to agg_arg_charsets(), not local copies, to ensure
    proper restoration in THD::rollback_item_tree_changes().

  sql/item_func.h
    1.141 06/06/30 09:26:32 knielsen@mysql.com +5 -5
    Function agg_item_charsets() now handles non-consequtive Item *'s.

  sql/item_func.cc
    1.292 06/06/30 09:26:32 knielsen@mysql.com +6 -5
    Remove use of default argument.

  sql/item_cmpfunc.cc
    1.211 06/06/30 09:26:32 knielsen@mysql.com +10 -10
    Remove use of default argument.

  sql/item.h
    1.201 06/06/30 09:26:32 knielsen@mysql.com +3 -4
    Remove use of default argument.

  sql/item.cc
    1.225 06/06/30 09:26:32 knielsen@mysql.com +29 -17
    Function agg_item_charsets() now handles non-consequtive Item *'s.

ChangeSet
  1.2213 06/06/30 02:49:28 kent@mysql.com +3 -0
  mysql.spec.sh:
    Disable old RPM strip
  my_global.h:
    Fixed wrong cast, which caused problems with gcc 4.0 and
    floats in prepared statements (Bug #19694)
  mysqlmanager.vcproj:
    Place output files in common release/debug directory

  support-files/mysql.spec.sh
    1.145 06/06/30 02:49:09 kent@mysql.com +17 -0
    Disable old RPM strip

  include/my_global.h
    1.120 06/06/30 01:25:05 kent@mysql.com +2 -2
    Fixed wrong cast, which caused problems with gcc 4.0 and
    floats in prepared statements (Bug #19694)

ChangeSet
  1.2183.28.3 06/06/29 22:11:29 tomas@poseidon.ndb.mysql.com +1 -0
  corrected merge error

  sql/ha_ndbcluster.cc
    1.261.2.4 06/06/29 22:11:22 tomas@poseidon.ndb.mysql.com +3 -0
    corrected merge error

ChangeSet
  1.1616.2637.1 06/06/29 20:55:21 tomas@poseidon.ndb.mysql.com +1 -0
  Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error

  sql/ha_ndbcluster.cc
    1.114.3.72 06/06/29 20:55:14 tomas@poseidon.ndb.mysql.com +59 -24
    Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error

  server-tools/instance-manager/mysqlmanager.vcproj
    1.6 06/06/29 20:20:56 kent@mysql.com +2 -2
    Place output files in common release/debug directory

ChangeSet
  1.2212 06/06/29 17:00:48 joerg@mysql.com +2 -0
  Test "federated" failed because the log contains fixed port numbers.
  Re-apply a patch by Knielsen in the 5.0.23 build clone: Replace port number by "SLAVE_PORT".

  mysql-test/t/federated.test
    1.25 06/06/29 17:00:42 joerg@mysql.com +2 -0
    Re-apply a patch by Knielsen in the 5.0.23 build clone: Replace port number by "SLAVE_PORT".

  mysql-test/r/federated.result
    1.29 06/06/29 17:00:42 joerg@mysql.com +2 -2
    Re-apply a patch by Knielsen in the 5.0.23 build clone: Replace port number by "SLAVE_PORT".

ChangeSet
  1.2210 06/06/29 16:31:08 konstantin@mysql.com +1 -0
  A post-merge fix.

  mysql-test/r/information_schema.result
    1.110 06/06/29 16:31:05 konstantin@mysql.com +9 -9
    A post-merge fix.

ChangeSet
  1.2183.28.1 06/06/29 13:01:54 tomas@poseidon.ndb.mysql.com +1 -0
  fixed too small requestInfo in signal
  + adopted signal to be as close as possible to 5.1...

  ndb/include/kernel/signaldata/LqhFrag.hpp
    1.4 06/06/29 13:01:46 tomas@poseidon.ndb.mysql.com +22 -22
    fixed too small requestInfo in signal
    + adopted signal to be as close as possible to 5.1...

ChangeSet
  1.2205.1.8 06/06/29 11:39:07 jonas@perch.ndb.mysql.com +1 -0
  ndb - build
    Fix compile error for forte

  ndb/src/kernel/blocks/dbdict/Dbdict.hpp
    1.20 06/06/29 11:39:04 jonas@perch.ndb.mysql.com +5 -0
    Fix compile error for forte

ChangeSet
  1.2208 06/06/28 23:47:45 konstantin@mysql.com +5 -0
  A fix for Bug#19022 "Memory bug when switching db during trigger execution". 
  No test case as the bug is in an existing test case (rpl_trigger.test
  when it is run under valgrind).
  The warning was caused by memory corruption in replication slave: thd->db
  was pointing at a stack address that was previously used by 
  sp_head::execute()::old_db. This happened because mysql_change_db
  behaved differently in replication slave and did not make a copy of the 
  argument to assign to thd->db. 
  The solution is to always free the old value of thd->db and allocate a new
  copy, regardless whether we're running in a replication slave or not.

  sql/sql_db.cc
    1.130 06/06/28 23:47:38 konstantin@mysql.com +74 -85
    Always make a deep copy of the argument in mysql_change_db, even 
    if running in a replication slave. This is necessary because 
    sp_use_new_db (stored procedures) assumes that mysql_change_db always makes
    a deep copy of the argument, and thus passes a pointer to stack into it.
    This assumption was true for all cases except the replication slave thread.

  sql/sql_class.h
    1.292 06/06/28 23:47:38 konstantin@mysql.com +13 -11
    Fix set_db to always free the old db, even if the argument is NULL.
    Add a comment.

  sql/slave.h
    1.95 06/06/28 23:47:38 konstantin@mysql.com +0 -1
    Remove an unneeded declaration.

  sql/slave.cc
    1.273 06/06/28 23:47:38 konstantin@mysql.com +0 -18
    Move rewrite_db to log_event.cc

  sql/log_event.cc
    1.208 06/06/28 23:47:38 konstantin@mysql.com +25 -7
    Move rewrite_db to log_event.cc, the only place where it is used.

ChangeSet
  1.2205.1.7 06/06/28 12:18:21 patg@govinda.patg.net +3 -0
  BUG #19773
  
  Pushbuild fixes to result file, test, and header file for federated.

  sql/ha_federated.h
    1.26 06/06/28 12:18:14 patg@govinda.patg.net +2 -2
    BUG #19773
    
    HPUX and Windows failed with variable named row and *row in method declaration

  mysql-test/t/federated.test
    1.24 06/06/28 12:18:14 patg@govinda.patg.net +2 -0
    BUG #19773
    
    Pushbuild fixes Test was missing --replace_result

  mysql-test/r/federated.result
    1.28 06/06/28 12:18:14 patg@govinda.patg.net +2 -2
    BUG #19773
    
    Pushbuild fixes - result file had hard-coded port

ChangeSet
  1.2183.26.8 06/06/28 15:15:49 knielsen@mysql.com +1 -0
  BUG#20739.
  In the Windows build files, the "Max nt" configuration for some reason
  had the mysql_client_test project disabled. Enable it.

  VC++Files/mysql.sln
    1.11 06/06/28 15:15:44 knielsen@mysql.com +1 -0
    The "Max nt" configuration for some reason had the mysql_client_test
    project disabled. Enable it.

ChangeSet
  1.2183.26.7 06/06/28 15:07:41 lars@mysql.com +1 -0
  Disabled test case for Windows (BUG#20753)

  mysql-test/t/rpl_openssl.test
    1.13 06/06/28 15:07:28 lars@mysql.com +4 -0
    Disabled test case for Windows (BUG#20753)

ChangeSet
  1.2183.26.6 06/06/28 14:25:17 knielsen@mysql.com +2 -0
  BUG#20739
  Improved definition of mysys configuration for -nt builds.

  VC++Files/mysys/mysys.vcproj
    1.7 06/06/28 14:25:13 knielsen@mysql.com +15 -15
    Use the name 'nt' instead of 'Release' for configuration.
    Use separate output files for NT and non-NT configurations.

  VC++Files/mysql.sln
    1.10 06/06/28 14:25:13 knielsen@mysql.com +8 -8
    Use the name 'nt' instead of 'Release' for configuration.

ChangeSet
  1.2198.1.2 06/06/28 12:40:17 tnurnberg@mysql.com +3 -0
  Bug#19857: When a user with CREATE ROUTINE priv creates a routine it results in NULL p/w
    
  sp_grant_privileges(), the function that GRANTs EXECUTE + ALTER privs on a SP,
  did so creating a user-entry with not password; mysql_routine_grant() would then
  write that "change" to the user-table.

  sql/sql_acl.cc
    1.197 06/06/28 12:40:07 tnurnberg@mysql.com +44 -15
    get password from ACLs, convert to correct format, and use it when
    forcing GRANTS for SPs

  mysql-test/t/sp-security.test
    1.33 06/06/28 12:40:07 tnurnberg@mysql.com +46 -0
    prove that creating a stored procedure will not destroy the creator's password

  mysql-test/r/sp-security.result
    1.30 06/06/28 12:40:07 tnurnberg@mysql.com +31 -0
    prove that creating a stored procedure will not destroy the creator's password

ChangeSet
  1.2183.26.5 06/06/28 10:35:47 knielsen@mysql.com +3 -0
  BUG#20739: __NT__ not probably defined for mysys project.
  
  Make sure for the mysys project that __NT__ is defined in *nt solution
  configurations (but not in other configurations).

ChangeSet
  1.2183.26.4 06/06/28 14:30:13 aivanov@mysql.com +1 -0
  Adding __NT__ to Max Win32 configuration.

  VC++Files/sql/mysqld.vcproj
    1.6 06/06/28 14:30:09 aivanov@mysql.com +1 -1
    Adding __NT__ to Max Win32 configuration.

  mysql-test/mysql-test-run.pl
    1.102 06/06/28 10:35:43 knielsen@mysql.com +2 -1
    Also allow testing a "Max nt" build.

  VC++Files/mysys/mysys.vcproj
    1.6 06/06/28 10:35:43 knielsen@mysql.com +102 -2
    Add configurations with __NT__ defined.

  VC++Files/mysql.sln
    1.9 06/06/28 10:35:43 knielsen@mysql.com +10 -10
    Define __NT__ in mysys for *nt configurations.

ChangeSet
  1.2130.4.5 06/06/27 23:49:48 patg@govinda.patg.net +4 -0
  BUG #19773
    
  Final-review fixes per Monty, pre-push. OK'd for 
  push. Please see each file's comments.
  

  sql/ha_federated.h
    1.25 06/06/27 23:49:43 patg@govinda.patg.net +12 -4
     BUG #19773
        
        Fixed "SET " to " SET " to make sure built statements are built with 
        "UPDATE `t1` SET .." instead of "UPDATE `t1`SET"
        

  sql/ha_federated.cc
    1.60.1.1 06/06/27 23:49:43 patg@govinda.patg.net +225 -190
    BUG #19773 
        
    Post-review changes, per Monty. 3rd patch, OK'd for push.
    - Added index_read_idx_with_result_set, which uses the result set passed to it
    - Hash by entire connection scheme
    - Protected store_result result set for table scan by adding a method result set
      to index_read_idx and index_read which is passed to index_read_with_result, which
      in turn iterates over the single record via read_next.
      This is a change from having two result sets in the first two patches. 
      This keeps the code clean and avoids the need for yet another result set.
    - Rewrote ::position and ::rnd_pos to store position - if primary key use 
      primary key, if not, use record buffer.
    - Rewrote get_share to store hash with connect string vs. table name
    - delete_row added subtration of "records" by affected->rows
    - Added read_next to handle what rnd_next used to do (converting raw record
       to query and vice versa)
    - Removed many DBUG_PRINT lines
    - Removed memset initialisation since subsequent loop accomplishes
    - Removed un-necessary mysql_free_result lines
    

  mysql-test/t/federated.test
    1.23 06/06/27 23:49:43 patg@govinda.patg.net +51 -0
    BUG #19773
        
    Test multi table update and delete. Added drop table to end of previous test.

  mysql-test/r/federated.result
    1.27 06/06/27 23:49:43 patg@govinda.patg.net +88 -0
    BUG #19773
        
    Results for multi-table deletes, updates

ChangeSet
  1.2183.19.2 06/06/28 10:21:01 aivanov@mysql.com +4 -0
  Fixing BUG#17719 "Delete of binlog files fails on Windows"
   and BUG#19208 "Test 'rpl000017' hangs on Windows".
   Both bugs are caused by attempting to delete an opened
   file and to create immediatedly a new one with the same
   name. On Windows it can be supported only on NT-platforms
   (by using FILE_SHARE_DELETE mode and with renaming the
   file before deletion). Because deleting not-closed files
   is not supported on all platforms (e.g. Win 98|ME) this
   is to be considered harmful and should be eliminated by
   a "code redesign".

  sql/log.cc
    1.188.1.1 06/06/28 10:20:56 aivanov@mysql.com +2 -2
    MYSQL_LOG::reset_logs(): Deleting usually not
     closed binlog files.

  mysys/my_delete.c
    1.6 06/06/28 10:20:56 aivanov@mysql.com +51 -0
    Adding nt_share_delete() function implementing
     a (possibly) not closed file deletion on Windows NT.

  include/my_sys.h
    1.180.1.1 06/06/28 10:20:56 aivanov@mysql.com +8 -0
    Adding my_delete_allow_opened to be invoked to delete
     a (possibly) not closed file on Windows NT-platforms.

  VC++Files/mysys/mysys.vcproj
    1.5 06/06/28 10:20:56 aivanov@mysql.com +5 -5
    To be sure that __NT__ is defined for Win configurations.
     Temporary, to be changed in more appropriate way.

ChangeSet
  1.2198.4.1 06/06/27 17:16:02 jimw@mysql.com +4 -0
  Bug #18005: Creating a trigger on mysql.event leads to server crash on scheduler startup
  Bug #18361: Triggers on mysql.user table cause server crash
  
   Because they do not work, we do not allow creating triggers on tables
   within the 'mysql' schema.
  
   (They may be made to work and re-enabled at some later date, but not
   in 5.0 or 5.1.)

  sql/sql_trigger.cc
    1.49.1.1 06/06/27 17:15:59 jimw@mysql.com +9 -0
    Disallow creating triggers on tables in the 'mysql' schema

  sql/share/errmsg.txt
    1.65 06/06/27 17:15:59 jimw@mysql.com +2 -0
    Add new error message

  mysql-test/t/trigger.test
    1.47 06/06/27 17:15:59 jimw@mysql.com +23 -1
    Add new regression test for creating triggers on system schema

  mysql-test/r/trigger.result
    1.42 06/06/27 17:15:59 jimw@mysql.com +12 -0
    Add new results

ChangeSet
  1.2193.1.2 06/06/27 20:18:03 joerg@mysql.com +1 -0
  Revert all previous attempts to call "mysql_upgrade" during RPM upgrade.
  This finishes bug#18516, as far as "generic RPMs" are concerned.

  support-files/mysql.spec.sh
    1.143 06/06/27 20:17:58 joerg@mysql.com +7 -19
    Revert all previous attempts to call "mysql_upgrade" during RPM upgrade,
    there are some more aspects which need to be solved before this is possible.
    For now, just ensure the binary "mysql_upgrade" is delivered and installed.
    This finishes bug#18516, as far as "generic RPMs" are concerned.

ChangeSet
  1.2204.1.1 06/06/27 21:28:32 kroki@mysql.com +19 -0
  Bug#17203: "sql_no_cache sql_cache" in views created from prepared statement
  
  The problem was that we restored SQL_CACHE, SQL_NO_CACHE flags in SELECT
  statement from internal structures based on value set later at runtime, not
  the original value set by the user.
  
  The solution is to remember that original value.

  sql/sql_yacc.yy
    1.472 06/06/27 21:28:25 kroki@mysql.com +14 -2
    Make effect of SQL_CACHE and SQL_NO_CACHE mutually exclusive.  Ignore
    SQL_CACHE if SQL_NO_CACHE was used.  Remember what was set by the user.
    Reset SELECT_LEX::sql_cache together with SELECT_LEX::options.

  sql/sql_select.cc
    1.426 06/06/27 21:28:25 kroki@mysql.com +13 -4
    Output SQL_CACHE and SQL_NO_CACHE depending on stored original user setting.

  sql/sql_lex.h
    1.220 06/06/27 21:28:25 kroki@mysql.com +8 -0
    Add SELECT_LEX::sql_cache field to store original user setting.

  sql/sql_lex.cc
    1.189 06/06/27 21:28:25 kroki@mysql.com +3 -0
    Reset SELECT_LEX::sql_cache together with SELECT_LEX::options.

  mysql-test/t/show_check.test
    1.57 06/06/27 21:28:25 kroki@mysql.com +72 -0
    Add test case for bug#17203.

  mysql-test/r/view.result
    1.162 06/06/27 21:28:25 kroki@mysql.com +7 -7
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/variables.result
    1.84.1.1 06/06/27 21:28:25 kroki@mysql.com +3 -3
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/type_blob.result
    1.50 06/06/27 21:28:25 kroki@mysql.com +1 -1
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/subselect.result
    1.145 06/06/27 21:28:24 kroki@mysql.com +4 -4
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/show_check.result
    1.77 06/06/27 21:28:24 kroki@mysql.com +60 -0
    Add result for bug#17203.

  mysql-test/r/rpl_master_pos_wait.result
    1.7 06/06/27 21:28:24 kroki@mysql.com +1 -1
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/rpl_get_lock.result
    1.14 06/06/27 21:28:24 kroki@mysql.com +1 -1
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/query_cache.result
    1.72 06/06/27 21:28:24 kroki@mysql.com +1 -1
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/information_schema.result
    1.107.1.1 06/06/27 21:28:24 kroki@mysql.com +6 -6
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/func_time.result
    1.57 06/06/27 21:28:24 kroki@mysql.com +1 -1
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/func_system.result
    1.23 06/06/27 21:28:24 kroki@mysql.com +1 -1
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/func_math.result
    1.35 06/06/27 21:28:24 kroki@mysql.com +1 -1
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/func_compress.result
    1.17 06/06/27 21:28:24 kroki@mysql.com +2 -2
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/auto_increment.result
    1.38 06/06/27 21:28:24 kroki@mysql.com +1 -1
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

ChangeSet
  1.1346.875.1 06/06/27 18:17:53 joerg@mysql.com +1 -0
  Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216).

  support-files/mysql.spec.sh
    1.61.1.36 06/06/27 18:17:51 joerg@mysql.com +5 -1
    Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216).

ChangeSet
  1.2205 06/06/27 17:34:14 konstantin@mysql.com +2 -0
  Fix yet another place that used uint32 instead of uint.

  sql/slave.h
    1.94 06/06/27 17:34:08 konstantin@mysql.com +1 -1
    Fix yet another place that used uint32 instead of uint.

  sql/slave.cc
    1.272 06/06/27 17:34:08 konstantin@mysql.com +1 -1
    Fix yet another place that used uint32 instead of uint.

ChangeSet
  1.2196.1.4 06/06/27 17:00:24 holyfoot@deer.(none) +2 -0
  merging fix

  mysql-test/t/gis.test
    1.27 06/06/27 16:58:55 holyfoot@mysql.com +2 -0
    merging fix

  mysql-test/r/gis.result
    1.32 06/06/27 16:58:55 holyfoot@mysql.com +1 -0
    merging fix

ChangeSet
  1.2204 06/06/27 15:39:43 konstantin@mysql.com +1 -0
  Fix yet another place with an obsolete explicit cast to byte *.

  sql/set_var.h
    1.76 06/06/27 15:39:39 konstantin@mysql.com +1 -1
    Fix yet another place with an obsolete explicit cast to byte *

ChangeSet
  1.2203 06/06/27 14:56:24 konstantin@mysql.com +10 -0
  Fix compilation failures on Windows caused by the patch for Bug#17199.
  Fix a minor issue with Bug#16206 (bdb.test failed if the tree is compiled 
  without blackhole).

  sql/table.h
    1.128 06/06/27 14:56:13 konstantin@mysql.com +2 -1
    Change the type of db_length to uint from uint32: LEX_STRING uses uint for 
    length, we need a small and consistent set of types to store length to 
    minimize cast and compile failures.

  sql/sql_class.h
    1.291 06/06/27 14:56:13 konstantin@mysql.com +1 -1
    Change db_length type to uint from uint32 (see also table.h)

  sql/set_var.cc
    1.155.1.1 06/06/27 14:56:13 konstantin@mysql.com +1 -1
    my_strdup_with_length: const byte * -> const char *

  sql/log_event.cc
    1.207 06/06/27 14:56:13 konstantin@mysql.com +2 -2
    my_strdup_with_length: const byte * -> const char *

  sql/ha_federated.cc
    1.61 06/06/27 14:56:13 konstantin@mysql.com +1 -2
    my_strdup_with_length: const byte * -> const char *

  mysys/safemalloc.c
    1.25 06/06/27 14:56:13 konstantin@mysql.com +1 -1
    my_strdup_with_length: const byte * -> const char *

  mysys/my_malloc.c
    1.10 06/06/27 14:56:13 konstantin@mysql.com +1 -1
    my_strdup_with_length: const byte * -> const char *

  mysql-test/t/bdb.test
    1.53 06/06/27 14:56:13 konstantin@mysql.com +1 -1
    Remove dependency on an optional engine.

  mysql-test/r/bdb.result
    1.51 06/06/27 14:56:13 konstantin@mysql.com +2 -2
    Remove dependency on an optional engine (updated test results).

  include/my_sys.h
    1.181 06/06/27 14:56:13 konstantin@mysql.com +1 -1
    Change declaration of my_strdup_with_length to accept const char *,
    not const byte *: in 5 places out of 6 where this function is used,
    it's being passed char *, not byte *

ChangeSet
  1.2183.20.3 06/06/27 11:26:00 tomas@poseidon.ndb.mysql.com +3 -0
  Bug #19852 Restoring backup made from cluster with full data memory fails
  - correction of previous patch

  sql/ha_ndbcluster.cc
    1.261.2.2 06/06/27 11:25:54 tomas@poseidon.ndb.mysql.com +0 -1
    Bug #19852 Restoring backup made from cluster with full data memory fails
    - correction of previous patch

  ndb/include/kernel/signaldata/DictTabInfo.hpp
    1.20 06/06/27 11:25:54 tomas@poseidon.ndb.mysql.com +1 -1
    Bug #19852 Restoring backup made from cluster with full data memory fails
    - correction of previous patch

  ndb/include/kernel/GlobalSignalNumbers.h
    1.10.1.2 06/06/27 11:25:54 tomas@poseidon.ndb.mysql.com +2 -2
    Bug #19852 Restoring backup made from cluster with full data memory fails
    - correction of previous patch

ChangeSet
  1.2183.20.2 06/06/27 10:02:58 tomas@poseidon.ndb.mysql.com +32 -0
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - make sure to allocate just enough pages in the fragments by using the actual
    row count from the backup, to avoid over allocation of pages to fragments, and
    thus avoid the bug

  sql/ha_ndbcluster.cc
    1.261.2.1 06/06/27 10:02:33 tomas@poseidon.ndb.mysql.com +8 -2
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - set min and max rows according to sql definition

  ndb/tools/restore/consumer_restore.cpp
    1.24 06/06/27 10:02:32 tomas@poseidon.ndb.mysql.com +10 -0
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - set min in restore to the actual row count (this is the actual bug fix)

  ndb/tools/restore/Restore.hpp
    1.20 06/06/27 10:02:32 tomas@poseidon.ndb.mysql.com +15 -0
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - add retrieval of fragment info

  ndb/tools/restore/Restore.cpp
    1.27 06/06/27 10:02:32 tomas@poseidon.ndb.mysql.com +57 -1
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - add retrieval of fragment info

  ndb/src/ndbapi/NdbDictionaryImpl.hpp
    1.39 06/06/27 10:02:32 tomas@poseidon.ndb.mysql.com +3 -0
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - min and max rows in dict

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.94 06/06/27 10:02:32 tomas@poseidon.ndb.mysql.com +21 -1
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - min and max rows in dict

  ndb/src/ndbapi/NdbDictionary.cpp
    1.38 06/06/27 10:02:32 tomas@poseidon.ndb.mysql.com +24 -0
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - min and max rows in dict

  ndb/src/mgmsrv/MgmtSrvr.hpp
    1.46 06/06/27 10:02:31 tomas@poseidon.ndb.mysql.com +2 -2
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - 32 -> 64 bits on bytes and records

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.102 06/06/27 10:02:30 tomas@poseidon.ndb.mysql.com +8 -2
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - 32 -> 64 bits on bytes and records

  ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp
    1.2 06/06/27 10:02:30 tomas@poseidon.ndb.mysql.com +4 -2
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - grow page allocation starting from 2 irrespective of first page allocation

  ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
    1.14 06/06/27 10:02:30 tomas@poseidon.ndb.mysql.com +51 -32
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - added min and max rows to frag req
    - move memory allocation to fragment to after adding of attributes to get correct headsize
    - allocate pages to fragments according to min rows setting

  ndb/src/kernel/blocks/dbtup/Dbtup.hpp
    1.26 06/06/27 10:02:30 tomas@poseidon.ndb.mysql.com +4 -1
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - added min and max rows to frag req

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.88 06/06/27 10:02:29 tomas@poseidon.ndb.mysql.com +59 -35
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - added min and max rows to frag req

  ndb/src/kernel/blocks/dblqh/Dblqh.hpp
    1.38 06/06/27 10:02:28 tomas@poseidon.ndb.mysql.com +7 -3
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - added min and max rows to frag req

  ndb/src/kernel/blocks/dbdict/Dbdict.hpp
    1.16.1.1 06/06/27 10:02:28 tomas@poseidon.ndb.mysql.com +4 -0
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - added max and min rows to dict table object

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.61.1.1 06/06/27 10:02:28 tomas@poseidon.ndb.mysql.com +29 -3
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - added max and min rows to dict table object

  ndb/src/kernel/blocks/backup/BackupInit.cpp
    1.16 06/06/27 10:02:28 tomas@poseidon.ndb.mysql.com +3 -0
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - new signal fragment complete to all participants

  ndb/src/kernel/blocks/backup/BackupFormat.hpp
    1.2 06/06/27 10:02:28 tomas@poseidon.ndb.mysql.com +16 -1
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - new section in backup with per fragment info in ctl file
    - 32 -> 64 bit on bytes and records

  ndb/src/kernel/blocks/backup/Backup.hpp
    1.13 06/06/27 10:02:28 tomas@poseidon.ndb.mysql.com +10 -5
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - new section in backup with per fragment info in ctl file
    - 32 -> 64 bit on bytes and records

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.34 06/06/27 10:02:27 tomas@poseidon.ndb.mysql.com +138 -25
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - new section in backup with per fragment info in ctl file
    - 32 -> 64 bit on bytes and records

  ndb/src/common/debugger/signaldata/LqhFrag.cpp
    1.2 06/06/27 10:02:27 tomas@poseidon.ndb.mysql.com +4 -2
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - added min and max rows to frag req

  ndb/src/common/debugger/signaldata/DictTabInfo.cpp
    1.7 06/06/27 10:02:27 tomas@poseidon.ndb.mysql.com +8 -0
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - added min and max rows to dict tab info

  ndb/src/common/debugger/signaldata/BackupSignalData.cpp
    1.2 06/06/27 10:02:27 tomas@poseidon.ndb.mysql.com +3 -3
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - 32 -> 64 bit on bytes and records

  ndb/src/common/debugger/signaldata/BackupImpl.cpp
    1.4 06/06/27 10:02:26 tomas@poseidon.ndb.mysql.com +4 -2
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - 32 -> 64 bit on bytes and records

  ndb/include/ndbapi/NdbDictionary.hpp
    1.55 06/06/27 10:02:26 tomas@poseidon.ndb.mysql.com +14 -0
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - added get/set of min max rows

  ndb/include/kernel/signaldata/TupFrag.hpp
    1.9 06/06/27 10:02:25 tomas@poseidon.ndb.mysql.com +13 -2
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - added min and max rows to add frag req

  ndb/include/kernel/signaldata/LqhFrag.hpp
    1.3 06/06/27 10:02:25 tomas@poseidon.ndb.mysql.com +15 -10
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - added min and max rows to add frag req

  ndb/include/kernel/signaldata/DictTabInfo.hpp
    1.19 06/06/27 10:02:24 tomas@poseidon.ndb.mysql.com +11 -0
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - add min and max rows to dict tab info

  ndb/include/kernel/signaldata/BackupSignalData.hpp
    1.5 06/06/27 10:02:24 tomas@poseidon.ndb.mysql.com +5 -3
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - 32 -> 64 bit on bytes and records

  ndb/include/kernel/signaldata/BackupImpl.hpp
    1.5 06/06/27 10:02:24 tomas@poseidon.ndb.mysql.com +19 -3
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - 32 -> 64 bit on bytes and records
    - new signal fragment complete to all participants

  ndb/include/kernel/signaldata/BackupContinueB.hpp
    1.2 06/06/27 10:02:24 tomas@poseidon.ndb.mysql.com +2 -1
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - time slica writing of fragment info to ctl file

  ndb/include/kernel/GlobalSignalNumbers.h
    1.10.1.1 06/06/27 10:02:24 tomas@poseidon.ndb.mysql.com +2 -2
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - distribute fragment complete to all participants to update row count

ChangeSet
  1.1346.1.837 06/06/26 23:44:17 kent@mysql.com +2 -0
  make_sharedlib_distribution.sh:
    For compatibility, don't use {..,..} in pattern matching
  make_binary_distribution.sh:
    Added .dylib and .sl as shared library extensions

  scripts/make_sharedlib_distribution.sh
    1.2.1.1 06/06/26 23:43:50 kent@mysql.com +4 -2
    For compatibility, don't use {..,..} in pattern matching

  scripts/make_binary_distribution.sh
    1.49.1.14 06/06/26 23:42:36 kent@mysql.com +14 -4
    Added .dylib and .sl as shared library extensions

ChangeSet
  1.2164.13.1 06/06/27 00:47:52 konstantin@mysql.com +25 -0
   A fix and a test case for
   Bug#19022 "Memory bug when switching db during trigger execution"
   Bug#17199 "Problem when view calls function from another database."
   Bug#18444 "Fully qualified stored function names don't work correctly in
              SELECT statements"
  
   Documentation note: this patch introduces a change in behaviour of prepared
   statements.
  
   This patch adds a few new invariants with regard to how THD::db should
   be used. These invariants should be preserved in future:
  
    - one should never refer to THD::db by pointer and always make a deep copy
      (strmake, strdup)
    - one should never compare two databases by pointer, but use strncmp or
      my_strncasecmp
    - TABLE_LIST object table->db should be always initialized in the parser or
      by creator of the object.
  
      For prepared statements it means that if the current database is changed
      after a statement is prepared, the database that was current at prepare
      remains active. This also means that you can not prepare a statement that
      implicitly refers to the current database if the latter is not set.
      This is not documented, and therefore needs documentation. This is NOT a
      change in behavior for almost all SQL statements except:
       - ALTER TABLE t1 RENAME t2 
       - OPTIMIZE TABLE t1
       - ANALYZE TABLE t1
       - TRUNCATE TABLE t1 --
       until this patch t1 or t2 could be evaluated at the first execution of
       prepared statement. 
  
       CURRENT_DATABASE() still works OK and is evaluated at every execution
       of prepared statement.
  
       Note, that in stored routines this is not an issue as the default
       database is the database of the stored procedure and "use" statement
       is prohibited in stored routines.
  
    This patch makes obsolete the use of check_db_used (it was never used in the
    old code too) and all other places that check for table->db and assign it
    from THD::db if it's NULL, except the parser.
  
   How this patch was created: THD::{db,db_length} were replaced with a
   LEX_STRING, THD::db. All the places that refer to THD::{db,db_length} were
   manually checked and:
    - if the place uses thd->db by pointer, it was fixed to make a deep copy
    - if a place compared two db pointers, it was fixed to compare them by value
      (via strcmp/my_strcasecmp, whatever was approproate)
   Then this intermediate patch was used to write a smaller patch that does the
   same thing but without a rename.
  
   TODO in 5.1:
     - remove check_db_used
     - deploy THD::set_db in mysql_change_db
  
   See also comments to individual files.

  sql/tztime.cc
    1.32 06/06/27 00:47:48 konstantin@mysql.com +3 -3
    - be nice, never copy thd->db by pointer.

  sql/sql_yacc.yy
    1.469.1.1 06/06/27 00:47:47 konstantin@mysql.com +42 -5
    - make sure that we always copy table->db or name->db or ident->db or
      select_lex->db from thd->db if the former is not set. If thd->db
      is not set but is accessed, return an error.

  sql/sql_view.cc
    1.89 06/06/27 00:47:47 konstantin@mysql.com +4 -5
    - replace a check with an assert (view->db)

  sql/sql_udf.cc
    1.57 06/06/27 00:47:47 konstantin@mysql.com +3 -3
    - use thd->set_db instead of direct modification of to thd->db

  sql/sql_trigger.cc
    1.50 06/06/27 00:47:47 konstantin@mysql.com +3 -6
    While we are at it, replace direct access to thd->db with a method.
    Should simplify future conversion of THD::db to LEX_STRING.

  sql/sql_table.cc
    1.312.1.1 06/06/27 00:47:47 konstantin@mysql.com +2 -1
    - replace a check with an assert (table_ident->db)

  sql/sql_parse.cc
    1.546.2.2 06/06/27 00:47:47 konstantin@mysql.com +90 -120
    - implement the invariant described in the changeset comment.
    - remove juggling with lex->sphead in SQLCOM_CREATE_PROCEDURE:
      now db_load_routine uses its own LEX object and doesn't damage the main
      LEX.
    - add DBUG_ASSERT(0) to unused "check_db_used"

  sql/sql_lex.h
    1.217.1.1 06/06/27 00:47:47 konstantin@mysql.com +5 -0
    - add a comment

  sql/sql_insert.cc
    1.190.2.1 06/06/27 00:47:47 konstantin@mysql.com +7 -8
    - replace checks with asserts: table_list->db must be always set in the parser.

  sql/sql_db.cc
    1.127.1.1 06/06/27 00:47:47 konstantin@mysql.com +3 -8
    While we are at it, replace direct access to thd->db with a method.
    Should simplify future conversion of THD::db to LEX_STRING.

  sql/sql_class.h
    1.288.1.1 06/06/27 00:47:47 konstantin@mysql.com +42 -1
    - introduce 3 THD  methods to work with THD::db:
      .set_db to assign the current database
      .reset_db to reset the current database (temporarily) or set it to NULL
      .opt_copy_db_to - to deep-copy thd->db to a pointer if it's not NULL

  sql/sp_head.h
    1.85 06/06/27 00:47:47 konstantin@mysql.com +0 -10
    - remove unneded methods and members

  sql/sp_head.cc
    1.214.2.1 06/06/27 00:47:47 konstantin@mysql.com +18 -48
    - drop sp_name_current_db_new - a creator of sp_name class that was used
    when sp_name was created for an identifier without an explicitly initialized
    database. Now we pass thd->db to constructor of sp_name right in the 
    parser.
    - rewrite sp_head::init_strings: name->m_db is always set now
    - use the new variant of sp_use_new_db
    - we don't need to update thd->db with SP MEM_ROOT pointer anymore when
    parsing a stored procedure, as noone will refer to it (yes!)

  sql/sp.h
    1.34 06/06/27 00:47:47 konstantin@mysql.com +7 -7
    Add a new declaration for sp_use_new_db (uses LEX_STRINGs) and a comment.

  sql/sp.cc
    1.113 06/06/27 00:47:47 konstantin@mysql.com +67 -42
    Rewrite sp_use_new_db: this is a cleanup that I needed in order to understand
    this function and ensure that it has no bugs.

  sql/slave.h
    1.93 06/06/27 00:47:47 konstantin@mysql.com +0 -4
    Remove a declaration for a method that is used only in one module.

  sql/slave.cc
    1.269.1.1 06/06/27 00:47:47 konstantin@mysql.com +9 -7
    While we are at it, replace direct access to thd->db with a method.
    Should simplify future conversion of THD::db to LEX_STRING.

  sql/log_event.cc
    1.204.1.1 06/06/27 00:47:47 konstantin@mysql.com +11 -9
    While we are at it, replace direct access to thd->db with a method.
    Should simplify future conversion of THD::db to LEX_STRING.

  sql/item_strfunc.cc
    1.266.1.1 06/06/27 00:47:47 konstantin@mysql.com +2 -2
    Touch the code that reads thd->db (cleanup).

  mysql-test/t/sp.test
    1.188.1.1 06/06/27 00:47:47 konstantin@mysql.com +46 -0
    Add a test case for Bug#17199 "Problem when view calls function from another
    database." and Bug#18444 "Fully qualified stored function names don't work
    correctly in SELECT statements". Test a complementary problem.

  mysql-test/t/ps.test
    1.65 06/06/27 00:47:47 konstantin@mysql.com +118 -0
    Add test coverage for prepared statements and current database. In scope of
    work on Bug#17199 "Problem when view calls function from another database."

  mysql-test/t/create.test
    1.77.1.1 06/06/27 00:47:47 konstantin@mysql.com +1 -1
    Update the id of the returned error.

  mysql-test/r/sp.result
    1.200.1.1 06/06/27 00:47:47 konstantin@mysql.com +46 -0
    Update test results (Bug#17199 et al)

  mysql-test/r/ps.result
    1.67 06/06/27 00:47:47 konstantin@mysql.com +105 -0
    Update test results (Bug#17199 et al)

  mysql-test/r/create.result
    1.115.1.1 06/06/27 00:47:47 konstantin@mysql.com +1 -1
    Modify the result file: a database can never be NULL.

ChangeSet
  1.2183.27.1 06/06/26 19:14:35 ingo@mysql.com +10 -0
  Bug#16986 - Deadlock condition with MyISAM tables
  
  Addendum fixes after changing the condition variable
  for the global read lock.
  
  The stress test suite revealed some deadlocks. Some were
  related to the new condition variable (COND_global_read_lock)
  and some were general problems with the global read lock.
  
  It is now necessary to signal COND_global_read_lock whenever 
  COND_refresh is signalled.
  
  We need to wait for the release of a global read lock if one 
  is set before every operation that requires a write lock.
  But we must not wait if we have locked tables by LOCK TABLES.
  After setting a global read lock a thread waits until all
  write locks are released.

  sql/sql_table.cc
    1.313.1.1 06/06/26 19:14:29 ingo@mysql.com +3 -6
    Bug#16986 - Deadlock condition with MyISAM tables
    Addendum fixes after changing the condition variable
    for the global read lock.
    Removed global read lock handling from inside of 
    CREATE TABLE. It is handled on a higher level now.
    Signal COND_global_read_lock whenever COND_refresh
    is signalled by using the new function broadcast_refresh().

  sql/sql_parse.cc
    1.550.3.1 06/06/26 19:14:29 ingo@mysql.com +83 -19
    Bug#16986 - Deadlock condition with MyISAM tables
    Addendum fixes after changing the condition variable
    for the global read lock.
    Wait for the release of a global read lock if one is set
    before every operation that requires a write lock.
    But don't wait if locked tables exist already.

  sql/sql_insert.cc
    1.193 06/06/26 19:14:29 ingo@mysql.com +2 -24
    Bug#16986 - Deadlock condition with MyISAM tables
    Addendum fixes after changing the condition variable
    for the global read lock.
    Removed global read lock handling from inside of 
    INSERT DELAYED. It is handled on a higher level now.

  sql/sql_handler.cc
    1.83 06/06/26 19:14:29 ingo@mysql.com +6 -5
    Bug#16986 - Deadlock condition with MyISAM tables
    Addendum fixes after changing the condition variable
    for the global read lock.
    Signal COND_global_read_lock whenever COND_refresh
    is signalled by using the new function broadcast_refresh().

  sql/sql_base.cc
    1.341.1.1 06/06/26 19:14:29 ingo@mysql.com +7 -7
    Bug#16986 - Deadlock condition with MyISAM tables
    Addendum fixes after changing the condition variable
    for the global read lock.
    Signal COND_global_read_lock whenever COND_refresh
    is signalled by using the new function broadcast_refresh().

  sql/mysql_priv.h
    1.393.1.1 06/06/26 19:14:29 ingo@mysql.com +1 -0
    Bug#16986 - Deadlock condition with MyISAM tables
    Addendum fixes after changing the condition variable
    for the global read lock.
    Added a declaration for a new function that signals 
    COND_global_read_lock whenever COND_refresh is signalled.

  sql/lock.cc
    1.89 06/06/26 19:14:29 ingo@mysql.com +39 -5
    Bug#16986 - Deadlock condition with MyISAM tables
    Addendum fixes after changing the condition variable
    for the global read lock.
    Signal COND_global_read_lock whenever COND_refresh
    is signalled by using the new function broadcast_refresh().
    Added the definition of a new function that signals 
    COND_global_read_lock whenever COND_refresh is signalled.

  mysys/thr_lock.c
    1.50 06/06/26 19:14:29 ingo@mysql.com +2 -0
    Bug#16986 - Deadlock condition with MyISAM tables
    Addendum fixes after changing the condition variable
    for the global read lock.
    Added a protection against an infinite loop that occurs
    with the test case for Bug #20662.

  mysql-test/t/lock_multi.test
    1.17 06/06/26 19:14:29 ingo@mysql.com +50 -0
    Bug#16986 - Deadlock condition with MyISAM tables
    Addendum fixes after changing the condition variable
    for the global read lock.
    Added tests for possible deadlocks that did not occur
    with the stress test suite.

  mysql-test/r/lock_multi.result
    1.19 06/06/26 19:14:29 ingo@mysql.com +15 -0
    Bug#16986 - Deadlock condition with MyISAM tables
    Addendum fixes after changing the condition variable
    for the global read lock.
    Added test results.

ChangeSet
  1.2183.26.1 06/06/24 13:11:09 knielsen@mysql.com +1 -0
  Fix race condition in test case wait_timeout.
  
  Sometimes the helper connection (that is watching for the main connection
  to time out) would itself time out first, causing the test to fail.

  mysql-test/t/wait_timeout.test
    1.6 06/06/24 13:11:06 knielsen@mysql.com +1 -0
    Increase connection timeout in connection wait_con so we will not loose
    the connection that is watching for the real wait_timeout to trigger.

ChangeSet
  1.2183.25.1 06/06/23 12:15:39 iggy@mysql.com +2 -0
  Bug#20616: drop_temp_table test fails on Windows platform

  sql/table.cc
    1.221.1.1 06/06/23 12:15:34 iggy@mysql.com +0 -8
    Removed the check for FN_DEVCHAR is done at this level because it prevents Windows from creating any table with FN_DEVCHAR in the name.

  sql/sql_table.cc
    1.314 06/06/23 12:15:34 iggy@mysql.com +16 -1
    Check for FN_DEVCHAR in the table name just before file creation. This allows for temporary tables to contain FN_DEVCHAR in the name.

ChangeSet
  1.2195 06/06/23 19:36:54 evgen@moonbone.local +1 -0
  key.result:
    After merge fix

  mysql-test/r/key.result
    1.30 06/06/23 19:36:08 evgen@moonbone.local +2 -2
    After merge fix

ChangeSet
  1.2183.24.1 06/06/23 11:21:57 elliot@mysql.com +1 -0
  BUG#20528 Added missing parenthesis to DBUG_PRINT statement

  mysys/my_lib.c
    1.25 06/06/23 11:21:54 elliot@mysql.com +1 -1
    BUG#20528 Added missing parenthesis to DBUG_PRINT statement

ChangeSet
  1.2183.1.9 06/06/23 18:00:49 bar@mysql.com +4 -0
  Bug#15276: MySQL ignores collation-server
      Problem:
      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.
  

  sql/mysqld.cc
    1.555.1.1 06/06/23 18:00:39 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
    

  mysql-test/t/ctype_ucs2_def.test
    1.2 06/06/23 18:00:38 bar@mysql.com +5 -0
    Adding test case

  mysql-test/t/ctype_ucs2_def-master.opt
    1.2 06/06/23 18:00:38 bar@mysql.com +1 -1
    Specifying variables in reverse order, to cover the bug.

  mysql-test/r/ctype_ucs2_def.result
    1.2 06/06/23 18:00:38 bar@mysql.com +3 -0
    Adding test case

ChangeSet
  1.2125.5.1 06/06/23 14:50:02 knielsen@mysql.com +2 -0
  BUG#20622: Fix one-byte buffer overrun in IM directory string handling.
  
  The problem was a call to convert_dirname() with a destination buffer
  that did not have room for the trailing slash added by that function.
  This could cause the instance manager to crash in some cases.

  server-tools/instance-manager/instance_options.cc
    1.31 06/06/23 14:49:58 knielsen@mysql.com +7 -2
    Fix buffer overrun.

  mysys/mf_dirname.c
    1.13 06/06/23 14:49:58 knielsen@mysql.com +3 -1
    Clarify in comments that convert_dirname destination must be larger than
    source to accomodate a trailing slash.

ChangeSet
  1.2183.6.6 06/06/23 12:17:11 joerg@mysql.com +1 -0
  The binary "mysql_upgrade" must be included in the distribution. (bug#18516 + 19353)

  scripts/make_binary_distribution.sh
    1.109 06/06/23 12:17:05 joerg@mysql.com +1 -1
    The binary "mysql_upgrade" must be included in the distribution.

ChangeSet
  1.1616.2144.163 06/06/23 13:19:30 bar@mysql.com +3 -0
  Bug#11228: DESC shows arbitrary column as "PRI"
    An UNIQUE KEY consisting of NOT NULL columns
    was displayed as PRIMARY KEY in "DESC t1".
    According to the code, that was intentional
    behaviour for some reasons unknown to me.
    This code was written before bitkeeper time,
    so I cannot check who and why made this.
    After discussing on dev-public, a decision
    was made to remove this code

  sql/table.cc
    1.111.4.3 06/06/23 13:19:24 bar@mysql.com +0 -21
    Removing old wrong code

  mysql-test/t/key.test
    1.14.1.9 06/06/23 13:19:24 bar@mysql.com +11 -0
    Adding test case.

  mysql-test/r/key.result
    1.18.1.8 06/06/23 13:19:24 bar@mysql.com +10 -0
    Adding test case.

ChangeSet
  1.1616.2144.162 06/06/23 00:37:31 kent@mysql.com +1 -0
  mysql.spec.sh:
    Disable the simplistic auto dependency scan for test/bench (bug#20078)

ChangeSet
  1.2183.15.11 06/06/23 00:32:43 tnurnberg@mysql.com +1 -0
  Bug#20588: mysqldump.test may fail, depending on system-wide configuration
  
  mysqldump.test calls my_print_defaults in a way that includes the systemwide
  my.cnf, so the results will be beyond our control and depend on whatever the
  user has in their my.cnf, namely the [mysqldump] section.
  
  call my_print_defaults with --config-file rather than --defaults-extra-file
  to prevent inclusion of system-wide defaults and use our config-file only.

  mysql-test/t/mysqldump.test
    1.92 06/06/23 00:32:36 tnurnberg@mysql.com +1 -1
    call my_print_defaults with our setup only, do not include the systemwide
    my.cnf as that would make the results unpredictable.

ChangeSet
  1.2183.22.1 06/06/22 20:50:38 tnurnberg@mysql.com +4 -0
  #19409: Test 'func_timestamp' fails on Windows x64
  - The setting of "ENV{'TZ'}" doesn't affect the timezone
    used by MySQL Server on Windows.
  - Explicitly set timezone in test cases before doing UTC/localtime
    conversions so tests produce deterministic results

  mysql-test/t/type_timestamp.test
    1.27 06/06/22 20:50:25 tnurnberg@mysql.com +6 -0
    Specifically set timezone to make tests that do localtime/UTC conversions deterministic

  mysql-test/t/func_timestamp.test
    1.6 06/06/22 20:50:25 tnurnberg@mysql.com +6 -0
    Specifically set timezone to make tests that do localtime/UTC conversions deterministic

  mysql-test/r/type_timestamp.result
    1.29 06/06/22 20:50:25 tnurnberg@mysql.com +2 -0
    Update test results

  mysql-test/r/func_timestamp.result
    1.4 06/06/22 20:50:25 tnurnberg@mysql.com +2 -0
    Update test results

ChangeSet
  1.2183.15.9 06/06/22 20:23:22 tnurnberg@mysql.com +2 -0
  Bug#19408 Test 'func_time' fails on Windows x64
  - The setting of "ENV{'TZ'}" doesn't affect the timezone
    used by MySQL Server on Windows.
  - Explicitly set timezone to "+03:00" in test case before
    doing the calculatiosn to check that there is three hours
    difference between utc and local time.
  (Magnus' fix)

  mysql-test/t/func_time.test
    1.46 06/06/22 20:23:16 tnurnberg@mysql.com +7 -0
    Set timezone to GMT-3, to make it possible to use "interval 3 hour"

  mysql-test/r/func_time.result
    1.56 06/06/22 20:23:16 tnurnberg@mysql.com +2 -0
    Update test results

ChangeSet
  1.1616.2635.1 06/06/22 22:11:27 holyfoot@deer.(none) +3 -0
  bug #10166 (Signed byte values cause data to be padded)
  
  The AsBinary function returns VARCHAR data type with binary collation.
  It can cause problem for clients that treat that kind of data as
  different from BLOB type.
  So now AsBinary returns BLOB.

  sql/item_geofunc.h
    1.8.1.2 06/06/22 22:10:40 holyfoot@mysql.com +2 -0
    Now we return MYSQL_TYPE_BLOB for asBinary function

  mysql-test/t/gis.test
    1.17.1.3 06/06/22 22:10:40 holyfoot@mysql.com +7 -0
    test case added

  mysql-test/r/gis.result
    1.15.1.7 06/06/22 22:10:40 holyfoot@mysql.com +10 -0
    result fixed

ChangeSet
  1.2183.13.2 06/06/22 19:29:48 konstantin@mysql.com +3 -0
  A fix and a test case for Bug#15217 "Using a SP cursor on a table created
   with PREPARE fails with weird error".
  More generally, re-executing a stored procedure with a complex SP cursor query
  could lead to a crash.
  
  The cause of the problem was that SP cursor queries were not optimized 
  properly at first execution: their parse tree belongs to sp_instr_cpush,
  not sp_instr_copen, and thus the tree was tagged "EXECUTED" when the
  cursor was declared, not when it was opened. This led to loss of optimization
  transformations performed at first execution, as sp_instr_copen saw that the
  query is already "EXECUTED" and therefore either not ran first-execution 
  related blocks or wrongly rolled back the transformations caused by 
  first-execution code.
  The fix is to update the state of the parsed tree only when the tree is
  executed, as opposed to when the instruction containing the tree is executed.
  Assignment if i->state is moved to reset_lex_and_exec_core.

  sql/sp_head.cc
    1.214.1.1 06/06/22 19:29:45 konstantin@mysql.com +3 -1
    Move assignment of stmt_arena->state to reset_lex_and_exec_core

  mysql-test/t/sp.test
    1.189 06/06/22 19:29:45 konstantin@mysql.com +27 -0
    Add a test case for Bug#15217

  mysql-test/r/sp.result
    1.201 06/06/22 19:29:44 konstantin@mysql.com +21 -0
    Test results fixed (Bug#15217)

ChangeSet
  1.2164.12.1 06/06/22 19:15:03 kroki@mysql.com +1 -0
  Bug#15811: extremely long time for mysql client to execute long INSERT
  
  The problem was in redundant calls to strlen() in string functions,
  where we may then return after checking only the small number of characters.
  
  No test case is provided since it's a performance fix.

  strings/ctype-mb.c
    1.48 06/06/22 19:14:57 kroki@mysql.com +12 -8
    Do not use strlen() where arbitrary horizon of at least
    CHARSET_INFO::mbmaxlen character is sufficient.

ChangeSet
  1.2167.14.2 06/06/22 19:40:59 bar@mysql.com +2 -0
  Additional test for Bugs#20392: INSERT_ID session variable has weird value
  sys_var_insert_id returned LAST_INSERT_ID instead of INSERT_ID,
  as Guilhem suggested.

  mysql-test/t/variables.test
    1.62 06/06/22 19:40:50 bar@mysql.com +6 -0
    Additional test

  mysql-test/r/variables.result
    1.86 06/06/22 19:40:49 bar@mysql.com +10 -0
    Additional test

ChangeSet
  1.2167.14.1 06/06/22 19:10:11 bar@mysql.com +3 -0
  Bugs#20392: INSERT_ID session variable has weird value
  sys_var_insert_id returned LAST_INSERT_ID instead of INSERT_ID.

  sql/set_var.cc
    1.156 06/06/22 19:10:00 bar@mysql.com +1 -1
    Fixed that sys_var_insert_id returned last_indert_id instead of insert_id.

  mysql-test/t/variables.test
    1.61 06/06/22 19:10:00 bar@mysql.com +10 -0
    Adding test case

  mysql-test/r/variables.result
    1.85 06/06/22 19:10:00 bar@mysql.com +12 -0
    Adding test case

ChangeSet
  1.2183.6.5 06/06/22 14:28:05 joerg@mysql.com +3 -0
  Improved fix for bug#18516 (also 19353):
  1) Rename the old shell tool "mysql_upgrade", to avoid a name collision.
  2) Improve the spec file, to explicitly use a temporary socket.

  support-files/mysql.spec.sh
    1.141 06/06/22 14:27:53 joerg@mysql.com +18 -4
    The previous version was incomplete, as it did not cover the case
    where the DBA had configured a non-default socket file.
    Solve that by creating and explicitly providing a temporary directory
    for the socket just for the duration of "mysql_upgrade", which also
    can be better protected than the default socket.

  scripts/Makefile.am
    1.51 06/06/22 14:27:53 joerg@mysql.com +3 -3
    The old shell script "mysql_upgrade" must be renamed, 
    so that its name does not collide with the new binary.

  scripts/mysql_upgrade_shell.sh
    1.4 06/06/22 14:13:00 joerg@mysql.com +0 -0
    Rename: scripts/mysql_upgrade.sh -> scripts/mysql_upgrade_shell.sh

ChangeSet
  1.2130.4.4 06/06/21 20:27:52 acurtis@xiphis.org +1 -0
  traditional grep does not have -q option

  config/ac-macros/compiler_flag.m4
    1.4 06/06/21 20:27:48 acurtis@xiphis.org +1 -1
    traditional grep does not have -q option

ChangeSet
  1.1616.2634.2 06/06/22 00:29:04 evgen@moonbone.local +3 -0
  Fixed bug #14896.
  This bug in Field_string::cmp resulted in a wrong comparison 
  with keys in partial indexes over multi-byte character fields.
  Given field a is declared as a varchar(16) collate utf8_unicode_ci
  INDEX(a(4)) gives us an example of such an index.
    
  Wrong key comparisons could lead to wrong result sets if 
  the selected query execution plan used a range scan by 
  a partial index over a utf8 character field.
  This also caused wrong results in many other cases.

  sql/field.cc
    1.197.12.1 06/06/22 00:12:40 evgen@moonbone.local +7 -13
    Fixed bug #14896.
    This bug in Field_string::cmp resulted in a wrong comparison 
    with keys in partial indexes over multi-byte character fields.
    Given field a is declared as a varchar(16) collate utf8_unicode_ci
    INDEX(a(4)) gives us an example of such an index.
         
    Wrong key comparisons could lead to wrong result sets if 
    the selected query execution plan used a range scan by 
    a partial index over a utf8 character field.
    This also caused wrong results in many other cases.  

  mysql-test/r/ctype_utf8.result
    1.45.5.1 06/06/22 00:12:27 evgen@moonbone.local +40 -0
    Added test cases for bug #14896.

  mysql-test/t/ctype_utf8.test
    1.57.5.1 06/06/22 00:11:55 evgen@moonbone.local +26 -0
    Added test cases for bug #14896.

ChangeSet
  1.2183.14.2 06/06/21 18:35:19 jani@ua141d10.elisa.omakaista.fi +3 -0
  Cleanup to patch for Bug#18246, "compilation error with tcp_wrapper"

  sql/mysqld.cc
    1.557 06/06/21 18:35:14 jani@ua141d10.elisa.omakaista.fi +3 -10
    Include this block from my_libwra.h now.
    Moved two variables out of the otherwise
    same block.

  mysys/my_libwrap.c
    1.2 06/06/21 18:35:14 jani@ua141d10.elisa.omakaista.fi +9 -6
    Added comment and .c file now takes needed includes from
    the corresponding .h file.

  include/my_libwrap.h
    1.2 06/06/21 18:35:14 jani@ua141d10.elisa.omakaista.fi +9 -0
    Changed includes to the header file.

ChangeSet
  1.1616.2634.1 06/06/21 16:41:07 tomas@poseidon.ndb.mysql.com +1 -0
  added missing MYSQLTEST_VARDIR declaration

  mysql-test/mysql-test-run.sh
    1.208.1.59 06/06/21 16:41:03 tomas@poseidon.ndb.mysql.com +2 -1
    added missing MYSQLTEST_VARDIR declaration

ChangeSet
  1.1616.2633.1 06/06/21 17:30:59 svoj@may.pils.ru +3 -0
  BUG#20357 - Got error 124 from storage engine using MIN and MAX
              functions in queries
  
  Using MAX()/MIN() on table with disabled indexes (by ALTER TABLE)
  results in error 124 (wrong index) from storage engine.
  
  The problem was that optimizer use disabled index to optimize
  MAX()/MIN(). Normally it must skip disabled index and perform
  table scan.
  
  This patch skips disabled indexes for min/max optimization.

  sql/opt_sum.cc
    1.33.5.1 06/06/21 17:30:55 svoj@may.pils.ru +6 -0
    Skip disabled/ignored indexes for min/max optimization.

  mysql-test/t/myisam.test
    1.33.4.1 06/06/21 17:30:55 svoj@may.pils.ru +12 -0
    Test case for BUG#20357.

  mysql-test/r/myisam.result
    1.45.2.1 06/06/21 17:30:54 svoj@may.pils.ru +13 -0
    Test case for BUG#20357.

ChangeSet
  1.2183.18.1 06/06/21 12:52:59 knielsen@mysql.com +1 -0
  BUG#20578
  Backport Valgrind suppression from mysql-5.1:
  
  D 1.4 05/11/23 22:44:54+02:00 monty@mysql.com 5 4 12/0/154
  P mysql-test/valgrind.supp
  C Remove warning that may happens becasue threads dies in different order

  mysql-test/valgrind.supp
    1.6 06/06/21 12:52:50 knielsen@mysql.com +12 -0
    Add suppression for Valgrind warning.

ChangeSet
  1.2189 06/06/21 13:01:00 gkodinov@mysql.com +2 -0
  manual merge

  mysql-test/t/view_grant.test
    1.15 06/06/21 13:00:56 gkodinov@mysql.com +20 -21
    merged

  mysql-test/r/view_grant.result
    1.17 06/06/21 13:00:56 gkodinov@mysql.com +12 -12
    merged

ChangeSet
  1.2149.2.21 06/06/21 12:12:46 gkodinov@mysql.com +5 -0
  Bug #20482: failure on Create join view with sources views/tables in different 
              schemas
  The function check_one_table_access() called to check access to tables in 
  SELECT/INSERT/UPDATE was doing additional checks/modifications that don't hold
  in the context of setup_tables_and_check_access().
  That's why the check_one_table() was split into two : the functionality needed by
  setup_tables_and_check_access() into check_single_table_access() and the rest of 
  the functionality stays in check_one_table_access() that is made to call the new
  check_single_table_access() function.

  sql/sql_parse.cc
    1.546.1.2 06/06/21 12:12:40 gkodinov@mysql.com +31 -9
    Bug #20482: failure on Create join view with sources views/tables in different 
                schemas
    - check_one_table_access() split into two : check_single_table_access() to 
      actually check access to the table(ro) and check_one_table_access() that calls
      check_single_table_access() and checks also the tables belonging to sub selects
      or implicitly opened tables.
      

  sql/sql_base.cc
    1.338.1.2 06/06/21 12:12:40 gkodinov@mysql.com +1 -1
    Bug #20482: failure on Create join view with sources views/tables in different 
                schemas
    - the new sub-function called

  sql/mysql_priv.h
    1.394 06/06/21 12:12:40 gkodinov@mysql.com +2 -0
    Bug #20482: failure on Create join view with sources views/tables in different 
                schemas
    - check_one_table_access split into 2

  mysql-test/t/view_grant.test
    1.13.1.1 06/06/21 12:12:40 gkodinov@mysql.com +21 -0
    Bug #20482: failure on Create join view with sources views/tables in different 
                schemas
    - test suite for the bug

  mysql-test/r/view_grant.result
    1.15.1.1 06/06/21 12:12:40 gkodinov@mysql.com +12 -0
    Bug #20482: failure on Create join view with sources views/tables in different 
                schemas
    - test suite for the bug

ChangeSet
  1.2167.13.1 06/06/21 09:36:50 mskold@mysql.com +4 -0
  Fix for Bug #19906  REPLACE doesn't update TEXT fields correctly

  mysql-test/t/ndb_replace.test
    1.6 06/06/21 09:36:01 mskold@mysql.com +28 -2
    Fix for Bug #19906  REPLACE doesn't update TEXT fields correctly

  mysql-test/r/ndb_replace.result
    1.5 06/06/21 09:36:01 mskold@mysql.com +22 -1
    Fix for Bug #19906  REPLACE doesn't update TEXT fields correctly

  sql/ha_ndbcluster.h
    1.98 06/06/21 09:36:00 mskold@mysql.com +2 -1
    Fix for Bug #19906  REPLACE doesn't update TEXT fields correctly

  sql/ha_ndbcluster.cc
    1.256.2.1 06/06/21 09:36:00 mskold@mysql.com +8 -2
    Fix for Bug #19906  REPLACE doesn't update TEXT fields correctly

ChangeSet
  1.2183.14.1 06/06/21 02:23:18 jani@ua141d10.elisa.omakaista.fi +5 -0
  Fix for Bug#18246 "compilation error with tcp_wrapper"

  sql/mysqld.cc
    1.556 06/06/21 02:23:10 jani@ua141d10.elisa.omakaista.fi +3 -3
    Fix for Bug#18246 "compilation error with tcp_wrapper"
    
    Added wrapper functions.

  mysys/Makefile.am
    1.70 06/06/21 02:23:10 jani@ua141d10.elisa.omakaista.fi +1 -1
    Fix for Bug#18246 "compilation error with tcp_wrapper"

  include/Makefile.am
    1.57 06/06/21 02:23:09 jani@ua141d10.elisa.omakaista.fi +1 -1
    Fix for Bug#18246 "compilation error with tcp_wrapper"

  include/my_libwrap.h
    1.1 06/06/21 02:21:26 jani@ua141d10.elisa.omakaista.fi +19 -0

  include/my_libwrap.h
    1.0 06/06/21 02:21:26 jani@ua141d10.elisa.omakaista.fi +0 -0
    BitKeeper file /home/my/bk/mysql-5.0/include/my_libwrap.h

  mysys/my_libwrap.c
    1.1 06/06/21 02:21:20 jani@ua141d10.elisa.omakaista.fi +39 -0

  mysys/my_libwrap.c
    1.0 06/06/21 02:21:20 jani@ua141d10.elisa.omakaista.fi +0 -0
    BitKeeper file /home/my/bk/mysql-5.0/mysys/my_libwrap.c

ChangeSet
  1.2186 06/06/21 02:21:10 sergefp@mysql.com +1 -0
  Remove deadcode in select_dumpvar::send_data()

  sql/sql_class.cc
    1.236 06/06/21 02:21:07 sergefp@mysql.com +2 -7
    Remove deadcode in select_dumpvar::send_data()

ChangeSet
  1.2183.13.1 06/06/21 01:50:20 dlenev@mysql.com +3 -0
  Fix for bug#19634 "Re-execution of multi-delete which involve trigger/stored
  function crashes server".
  
  Attempts to execute prepared multi-delete statement which involved trigger or
  stored function caused server crashes (the same happened for such statements
  included in stored procedures in cases when one tried to execute them more
  than once).
  
  The problem was caused by yet another incorrect usage of check_table_access()
  routine (the latter assumes that table list which it gets as argument
  corresponds to value LEX::query_tables_own_last). We solve this problem by
  juggling with LEX::query_tables_own_last value when we call
  check_table_access() for LEX::auxilliary_table_list (better solution is too
  intrusive and should be done in 5.1).

  sql/sql_parse.cc
    1.550.1.1 06/06/21 01:50:16 dlenev@mysql.com +36 -4
    To call safely check_table_access() for LEX::auxilliary_table_list we have
    to juggle with LEX::query_tables_own_last value.

  mysql-test/t/sp-prelocking.test
    1.5 06/06/21 01:50:16 dlenev@mysql.com +31 -0
    Added test for bug#19634 "Re-execution of multi-delete which involve trigger/
    stored function crashes server".

  mysql-test/r/sp-prelocking.result
    1.5 06/06/21 01:50:15 dlenev@mysql.com +18 -0
    Added test for bug#19634 "Re-execution of multi-delete which involve trigger/
    stored function crashes server".

ChangeSet
  1.2183.5.8 06/06/21 01:14:53 evgen@moonbone.local +5 -0
  field.cc, field.h:
    Additional fix for #16377 for bigendian platforms
  sql_select.cc, select.result, select.test:
    After merge fix

  sql/field.cc
    1.311 06/06/21 01:06:52 evgen@moonbone.local +22 -22
    Additional fix for #16377 for bigendian platforms

  sql/field.h
    1.182 06/06/21 01:05:31 evgen@moonbone.local +1 -1
    Additional fix for #16377 for bigendian platforms

  sql/sql_select.cc
    1.422.1.2 06/06/21 01:04:55 evgen@moonbone.local +1 -1
    After merge fix

  mysql-test/r/select.result
    1.130 06/06/21 01:04:31 evgen@moonbone.local +6 -6
    After merge fix

  mysql-test/t/select.test
    1.106 06/06/21 01:04:14 evgen@moonbone.local +1 -1
    After merge fix

ChangeSet
  1.2183.6.4 06/06/20 22:40:46 joerg@mysql.com +2 -0
  Fix for bug#18516 (also #19353, reported for 5.1):
  In addition to include "mysql_upgrade" in a RPM, it should also be called
  when the RPM is upgraded.

  support-files/mysql.spec.sh
    1.140 06/06/20 22:40:40 joerg@mysql.com +15 -1
    Call "mysql_upgrade" during an RPM upgrade.
    
    "mysql_upgrade" needs a server to run, as it issues SQL commands.
    (This had been neglected previously.)
    It also needs to connect as "root", but in an RPM upgrade the password is unknown.
    To allow this, the server is started "--skip-grant-tables".
    Normally, this would open big security holes, so it is also started "--skip-networking",
    and access to the socket is limited to "mysql" + "root" by temporarily setting mode 700.

  support-files/mysql.server.sh
    1.51 06/06/20 22:40:40 joerg@mysql.com +14 -4
    Support getting additional arguments, which need to be passed on to the server.
    This works only if the server is started through "mysqld_safe", as the IM will not pass such arguments.
    So if the IM would be used, additional arguments cause the start to fail (voluntarily).
    
    This feature is needed so that tools like RPM can start the server in an "isolated" way,
    see the patch to the RPM spec file (also in this changeset) to call "mysql_upgrade".

ChangeSet
  1.1616.2627.4 06/06/20 23:05:55 evgen@moonbone.local +3 -0
  select.result:
    Added test case for bug#18759 Incorrect string to numeric conversion.  
  select.test:
    Added test case for bug#18759 Incorrect string to numeric conversion.
  item_cmpfunc.cc:
    Cleanup after fix for bug#18360 removal

  mysql-test/r/select.result
    1.34.3.38 06/06/20 23:05:00 evgen@moonbone.local +6 -0
    Added test case for bug#18759 Incorrect string to numeric conversion.  

  mysql-test/t/select.test
    1.28.4.13 06/06/20 23:03:49 evgen@moonbone.local +19 -0
    Added test case for bug#18759 Incorrect string to numeric conversion.

  sql/item_cmpfunc.cc
    1.111.23.9 06/06/20 23:03:16 evgen@moonbone.local +2 -1
    Cleanup after fix for bug#18360 removal

ChangeSet
  1.2183.11.1 06/06/20 20:46:45 mats@mysql.com +1 -0
  Bug#19437 (Connection refused by server: "2002 Can't connect... /master.sock"):
  Clearing active VIO before calling mysql_close() in the slave I/O
  thread. 

  sql/slave.cc
    1.270 06/06/20 20:46:39 mats@mysql.com +20 -0
    Clearing active VIO before calling mysql_close() in the slave I/O thread.

ChangeSet
  1.2183.9.1 06/06/20 13:43:13 elliot@mysql.com +3 -0
  Applying patch from SergeyV
  Fixes bug#17264, for alter table on win32 for successfull operation completion
  it is used TL_WRITE(=10) lock instead of TL_WRITE_ALLOW_READ(=6), however here
  in innodb handler TL_WRTIE is lifted to TL_WRITE_ALLOW_WRITE, which causes
  race condition when several clients do alter table simultaneously.

  sql/ha_innodb.cc
    1.296 06/06/20 13:43:10 elliot@mysql.com +11 -0
    Applying patch from SergeyV
    Fixes bug#17264, for alter table on win32 for successfull operation completion
    it is used TL_WRITE(=10) lock instead of TL_WRITE_ALLOW_READ(=6), however here
    in innodb handler TL_WRTIE is lifted to TL_WRITE_ALLOW_WRITE, which causes
    race condition when several clients do alter table simultaneously.

  mysql-test/t/lock_multi.test
    1.16 06/06/20 13:43:10 elliot@mysql.com +26 -0
    Test case for bug#17264

  mysql-test/r/lock_multi.result
    1.18 06/06/20 13:43:10 elliot@mysql.com +6 -0
    Test case for bug#17264.

ChangeSet
  1.2125.4.1 06/06/20 19:13:46 tomas@poseidon.ndb.mysql.com +5 -0
  Bug #17297 Fix error messages

  ndb/src/ndbapi/ndberror.c
    1.43.2.1 06/06/20 19:13:39 tomas@poseidon.ndb.mysql.com +1 -0
    Bug #17297 Fix error messages

  ndb/src/kernel/error/ndbd_exit_codes.c
    1.10 06/06/20 19:13:39 tomas@poseidon.ndb.mysql.com +4 -3
    Bug #17297 Fix error messages

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.87 06/06/20 19:13:39 tomas@poseidon.ndb.mysql.com +2 -1
    Bug #17297 Fix error messages

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.48.1.1 06/06/20 19:13:39 tomas@poseidon.ndb.mysql.com +1 -1
    Bug #17297 Fix error messages

  ndb/src/common/transporter/TransporterRegistry.cpp
    1.61 06/06/20 19:13:39 tomas@poseidon.ndb.mysql.com +1 -1
    Bug #17297 Fix error messages

ChangeSet
  1.2183.5.3 06/06/20 15:40:10 evgen@moonbone.local +1 -0
  item_cmpfunc.cc:
    After merge fix

  sql/item_cmpfunc.cc
    1.209 06/06/20 15:39:40 evgen@moonbone.local +4 -0
    After merge fix

ChangeSet
  1.2183.5.2 06/06/20 15:35:54 evgen@moonbone.local +1 -0
  func_time.result:
    After merge fix

  mysql-test/r/func_time.result
    1.54 06/06/20 15:35:27 evgen@moonbone.local +2 -2
    After merge fix

ChangeSet
  1.2185 06/06/20 11:28:59 gkodinov@mysql.com +1 -0
  wrong merge of bug9676 from 4.1 to 5.0 corrected

  sql/sql_select.cc
    1.424 06/06/20 11:28:54 gkodinov@mysql.com +1 -1
    wrong merge of bug9676 from 4.1 to 5.0 corrected

ChangeSet
  1.2092.2.5 06/06/20 17:29:02 stewart@mysql.com +1 -0
  BUG#20333 valgrind: mgmd event reporting dep on uninit value

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.96.2.1 06/06/20 17:28:58 stewart@mysql.com +1 -1
    user correct pointer

ChangeSet
  1.2183.7.1 06/06/19 22:19:05 iggy@mysql.com +1 -0
  Bug#19407 Test 'func_regexp' fails on Windows x64

  regex/regexec.c
    1.8 06/06/19 22:19:00 iggy@mysql.com +1 -1
    The Win64 pre-processor evaluates state1 at the end of the chain at replace-time not at definition-time.  This causes states1 to be defined as char *.

ChangeSet
  1.1616.2631.1 06/06/20 00:50:09 evgen@moonbone.local +3 -0
  item_cmpfunc.cc, func_in.result, func_in.test:
    Reverted fix for bug#18360

  sql/item_cmpfunc.cc
    1.111.23.8 06/06/20 00:36:48 evgen@moonbone.local +8 -20
    Reverted fix for bug#18360

  mysql-test/r/func_in.result
    1.12.1.6 06/06/20 00:34:36 evgen@moonbone.local +0 -21
    Reverted fix for bug#18360

  mysql-test/t/func_in.test
    1.14.1.4 06/06/20 00:33:17 evgen@moonbone.local +0 -12
    Reverted fix for bug#18360

  support-files/mysql.spec.sh
    1.83.1.36 06/06/19 21:36:57 kent@mysql.com +1 -0
    Disable the simplistic auto dependency scan for test/bench (bug#20078)

ChangeSet
  1.1616.2630.1 06/06/19 22:11:01 holyfoot@deer.(none) +5 -0
  bug #20318 (ctype_ucs2_def test fails with embedded)
  there was two problems about charsets in embedded server
  1. mysys/charset.c - defined there default_charset_info variable is
  modified by both server and client code (particularly when
  --default-charset option is handled)
  In embedded server we get two codelines modifying one variable.
  I created separate default_client_charset_info for client code
  
  2. mysql->charset and mysql->options.charset initialization isn't
  properly done for embedded server - necessary calls added

  sql/sql_parse.cc
    1.271.124.1 06/06/19 22:10:15 holyfoot@mysql.com +32 -27
    thread client charset initialization moved to thd_init_client_charset
    to avoid code duplication

  sql-common/client.c
    1.46.1.43 06/06/19 22:10:15 holyfoot@mysql.com +48 -36
    charset initialization moved to mysql_init_character_set to
    be used in embedded server

  libmysqld/libmysqld.c
    1.64.1.2 06/06/19 22:10:15 holyfoot@mysql.com +3 -45
    check_embedded_connection moved to client.c to avoid code duplication

  libmysqld/lib_sql.cc
    1.75.1.51 06/06/19 22:10:15 holyfoot@mysql.com +7 -0
    thd_init_client_charset calls added

  include/sql_common.h
    1.15 06/06/19 22:10:15 holyfoot@mysql.com +1 -0
    client charset info default declared

ChangeSet
  1.2183.4.1 06/06/19 17:34:12 gkodinov@mysql.com +3 -0
  Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list error
  
  There was an incomplete reset of the name resolution context, that caused 
  INSERT ... SELECT ... JOIN statements to resolve not by joint row type calculated
  for the join.
  Removed the redundant re-initialization of the context, because 
  mysql_insert_select_prepare() now correctly saves/restores the context.

  sql/sql_parse.cc
    1.551 06/06/19 17:34:06 gkodinov@mysql.com +0 -9
    Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list error
    
    - remove an incomplete reset of the context because the mentioned function
    correctly saves/restores the context.

  mysql-test/t/insert_select.test
    1.28.1.1 06/06/19 17:34:06 gkodinov@mysql.com +9 -0
    Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list error
    
    - testsuite for the bug

  mysql-test/r/insert_select.result
    1.35.1.1 06/06/19 17:34:06 gkodinov@mysql.com +5 -0
    Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list error
    
    - testsuite for the bug

ChangeSet
  1.2183.1.3 06/06/19 17:50:52 svoj@may.pils.ru +1 -0
  Addition to fix for
  BUG#18036 - update of table joined to self reports table as crashed
  
  Set exclude_from_table_unique_test value back to FALSE. It is needed for
  further check in multi_update::prepare whether to use record cache.

  sql/sql_update.cc
    1.190 06/06/19 17:50:46 svoj@may.pils.ru +6 -1
    Set exclude_from_table_unique_test value back to FALSE. It is needed for
    further check in multi_update::prepare whether to use record cache.

ChangeSet
  1.2125.3.3 06/06/19 13:23:13 lars@mysql.com +2 -0
  BUG#17201 Changed to other database (BUG#20531 hinders usage of 'test' database)

  mysql-test/t/mysqldump.test
    1.88.1.1 06/06/19 13:23:02 lars@mysql.com +5 -4
    Changed to other database (BUG#20531 hinders usage of 'test' database)

  mysql-test/r/mysqldump.result
    1.96.1.1 06/06/19 13:23:02 lars@mysql.com +7 -6
    Changed to other database (BUG#20531 hinders usage of 'test' database)

ChangeSet
  1.1616.2629.1 06/06/19 13:22:42 gkodinov@mysql.com +3 -0
  * Bug #9676: INSERT INTO x SELECT .. FROM x LIMIT 1; slows down with big
                tables
  Currently in INSERT ... SELECT ... LIMIT ... the compiler uses a 
  temporary table to store the results of SELECT ... LIMIT .. and then
  uses that table as a source for INSERT. The problem is that in some cases
  it actually skips the LIMIT clause in doing that and materializes the 
  whole SELECT result set regardless of the LIMIT.
  This fix is limiting the process of filling up the temp table with only 
  that much rows that will be actually used by propagating the LIMIT value.

  sql/sql_select.cc
    1.216.125.7 06/06/19 13:22:38 gkodinov@mysql.com +8 -4
    * Bug #9676: INSERT INTO x SELECT .. FROM x LIMIT 1; slows down with big
                  tables
    - pass through the real LIMIT number if the temp table is created for
      buffering results.
    - set the counter for all the cases when the temp table is not used for
      grouping

  mysql-test/t/insert_select.test
    1.14.1.10 06/06/19 13:22:38 gkodinov@mysql.com +13 -0
    * Bug #9676: INSERT INTO x SELECT .. FROM x LIMIT 1; slows down with big
                  tables
    - a test demonstrating the code path

  mysql-test/r/insert_select.result
    1.16.1.14 06/06/19 13:22:38 gkodinov@mysql.com +4 -0
    * Bug #9676: INSERT INTO x SELECT .. FROM x LIMIT 1; slows down with big
                  tables
    - a test demonstrating the code path

ChangeSet
  1.2164.11.4 06/06/19 14:16:10 anozdrin@mysql.com +3 -0
  The second fix for BUG#19391: IM fails to start after two executions.

  server-tools/instance-manager/manager.cc
    1.34 06/06/19 14:16:06 anozdrin@mysql.com +31 -12
    Make initialization of alarm infrustructure before starting Guardian
    thread, because Guardian uses thr_alarm().

  server-tools/instance-manager/instance_map.cc
    1.27 06/06/19 14:16:06 anozdrin@mysql.com +1 -1
    Added TODO comment.

  server-tools/instance-manager/guardian.cc
    1.22 06/06/19 14:16:05 anozdrin@mysql.com +0 -3
    Removed erroneous unlock() in Guardian_thread::init():
    instance_map is unlocked in the caller.

ChangeSet
  1.2164.11.3 06/06/19 14:15:26 anozdrin@mysql.com +2 -0
  Small fix for test suite:
    - fix for IM stopping routine;
    - polishing.

  mysql-test/mysql-test-run.pl
    1.96.1.1 06/06/19 14:15:22 anozdrin@mysql.com +48 -6
    1. Fix stopping of IM running as a daemon -- after death of the main IM
    process, we should wait for the IM angel to die.
    2. Polishing -- be more verbose in debug mode.

  mysql-test/lib/mtr_process.pl
    1.33 06/06/19 14:15:22 anozdrin@mysql.com +13 -4
    Polishing: make mtr_kill_process() more verbose in debug mode.

ChangeSet
  1.2164.11.2 06/06/19 14:13:34 anozdrin@mysql.com +11 -0
  Fix of test suite in scope of fixing BUG#18023: IM: instance
  can be started several times; monitor interval must be > 2sec

  mysql-test/t/wait_for_process.sh
    1.1 06/06/19 14:13:30 anozdrin@mysql.com +66 -0
    A new helper script, intended to be used instead of dummy "sleep"
    when waiting for some process to start or stop.

  mysql-test/t/im_utils-im.opt
    1.1 06/06/19 14:13:30 anozdrin@mysql.com +1 -0
    Set monitoring interval to 1 second in order to:
      - be consistent with 5.1;
      - speed up tests;

  mysql-test/t/wait_for_process.sh
    1.0 06/06/19 14:13:30 anozdrin@mysql.com +0 -0
    BitKeeper file /home/alik/MySQL/devel/5.0-rt-bug18023/mysql-test/t/wait_for_process.sh

  mysql-test/t/im_utils-im.opt
    1.0 06/06/19 14:13:30 anozdrin@mysql.com +0 -0
    BitKeeper file /home/alik/MySQL/devel/5.0-rt-bug18023/mysql-test/t/im_utils-im.opt

  mysql-test/t/im_life_cycle-im.opt
    1.1 06/06/19 14:13:29 anozdrin@mysql.com +1 -0
    Set monitoring interval to 1 second in order to:
      - be consistent with 5.1;
      - speed up tests;

  mysql-test/t/kill_n_check.sh
    1.3 06/06/19 14:13:29 anozdrin@mysql.com +79 -30
    1. Make timeout configurable by command-line argument;
    2. Change algorithm of waiting for process to restart to be
       more robust.

  mysql-test/t/im_utils.imtest
    1.2 06/06/19 14:13:29 anozdrin@mysql.com +13 -3
    1. Use wait_for_start.sh script to minimize chance of race condition.
    2. Polishing.

  mysql-test/t/im_life_cycle.imtest
    1.5 06/06/19 14:13:29 anozdrin@mysql.com +98 -44
    1. Use wait_for_start.sh and wait_for_stop.sh scripts to
       minimize chance of race condition;
    2. Remove some statements, because there is no way now to
       stabilize their output.
    3. Polishing;

  mysql-test/t/im_life_cycle-im.opt
    1.0 06/06/19 14:13:29 anozdrin@mysql.com +0 -0
    BitKeeper file /home/alik/MySQL/devel/5.0-rt-bug18023/mysql-test/t/im_life_cycle-im.opt

  mysql-test/t/im_daemon_life_cycle.imtest
    1.2 06/06/19 14:13:29 anozdrin@mysql.com +17 -1
    1. Use wait_for_start.sh script to minimize chance of race condition.
    2. Polishing.

  mysql-test/t/im_daemon_life_cycle-im.opt
    1.3 06/06/19 14:13:29 anozdrin@mysql.com +1 -0
    Set monitoring interval to 1 second in order to:
      - be consistent with 5.1;
      - speed up tests;

  mysql-test/r/im_utils.result
    1.3 06/06/19 14:13:28 anozdrin@mysql.com +3 -0
    Updated result file.

  mysql-test/r/im_life_cycle.result
    1.6 06/06/19 14:13:28 anozdrin@mysql.com +41 -35
    Updated result file.

  mysql-test/r/im_daemon_life_cycle.result
    1.3 06/06/19 14:13:28 anozdrin@mysql.com +1 -0
    Updated result file.

ChangeSet
  1.1616.2626.1 06/06/19 14:05:14 svoj@may.pils.ru +3 -0
  BUG#18036 - update of table joined to self reports table as crashed
  Certain updates of table joined to self results in unexpected
  behavior.
  
  The problem was that record cache was mistakenly enabled for
  self-joined table updates. Normally record cache must be disabled
  for such updates.
  
  Fixed wrong condition in code that determines whether to use
  record cache for self-joined table updates.
  
  Only MyISAM tables were affected.

  sql/sql_update.cc
    1.83.2.71 06/06/19 14:05:10 svoj@may.pils.ru +1 -1
    Fixed wrong condition in code that determines whether to use
    record cache for self-joined table updates.

  mysql-test/t/myisam.test
    1.33.1.13 06/06/19 14:05:10 svoj@may.pils.ru +9 -0
    Test case for BUG#18036.

  mysql-test/r/myisam.result
    1.45.1.15 06/06/19 14:05:09 svoj@may.pils.ru +8 -0
    Test case for BUG#18036.

ChangeSet
  1.1616.2144.155 06/06/19 13:03:29 ramil@mysql.com +2 -0
  Fix for bug #20496: func_time.test failure                                      

  mysql-test/t/func_time.test
    1.21.1.15 06/06/19 13:03:24 ramil@mysql.com +4 -2
    Fix for bug #20496: func_time.test failure                                      
      - floating point calculations removed.                                                  

  mysql-test/r/func_time.result
    1.23.1.18 06/06/19 13:03:24 ramil@mysql.com +10 -3
    Fix for bug #20496: func_time.test failure                                      
      - floating point calculations removed.                                                  

ChangeSet
  1.1616.2144.153 06/06/17 15:37:23 kent@mysql.com +2 -0
  Makefile.am:
    Avoid error message trying 'windoze-dsp' in obsolete directory
  compile-dist:
    Avoid error message for target 'distclean' and no Makefile

  ndb/Makefile.am
    1.12.1.1 06/06/17 15:33:11 kent@mysql.com +2 -1
    Avoid error message trying 'windoze-dsp' in obsolete directory

  BUILD/compile-dist
    1.6 06/06/17 15:21:57 kent@mysql.com +1 -1
    Avoid error message for target 'distclean' and no Makefile

ChangeSet
  1.2167.6.2 06/06/17 13:00:17 pekka@clam.ndb.mysql.com +2 -0
  ndb - bug#19285 minor fixes

  ndb/src/ndbapi/ndberror.c
    1.43.1.3 06/06/17 12:59:23 pekka@clam.ndb.mysql.com +1 -1
    bug#19285 minor fixes

  ndb/src/ndbapi/NdbBlob.cpp
    1.29 06/06/17 12:59:23 pekka@clam.ndb.mysql.com +1 -1
    bug#19285 minor fixes

ChangeSet
  1.1616.2144.152 06/06/17 11:33:34 kent@mysql.com +1 -0
  make_win_src_distribution.sh:
    Make output less verbose
    Make temporary directory name unique
    Remove temporary directory on interrupt

  scripts/make_win_src_distribution.sh
    1.27.2.11 06/06/17 11:32:20 kent@mysql.com +6 -11
    Make output less verbose
    Make temporary directory name unique
    Remove temporary directory on interrupt

ChangeSet
  1.2178 06/06/17 10:44:52 kent@mysql.com +1 -0
  make_win_src_distribution.sh:
    Don't try copy non existing extra/{sql_state,mysqld_error}.h

  scripts/make_win_src_distribution.sh
    1.46 06/06/17 10:42:48 kent@mysql.com +0 -2
    Don't try copy non existing extra/{sql_state,mysqld_error}.h

ChangeSet
  1.1616.2144.151 06/06/17 03:04:43 kent@mysql.com +1 -0
  make_win_src_distribution.sh:
    Include "sql_yacc.yy" for completeness (bug#20387)

  scripts/make_win_src_distribution.sh
    1.27.2.10 06/06/17 03:00:42 kent@mysql.com +33 -16
    Include "sql_yacc.yy" for completeness (bug#20387)
    Improved error handling
    Don't list all files packed with tar/zip unless debugging

ChangeSet
  1.2167.11.3 06/06/17 02:52:14 evgen@moonbone.local +1 -0
  select.result:
    After merge fix

ChangeSet
  1.2175 06/06/17 00:30:02 kent@mysql.com +3 -0
  configure.in, net_serv.cc, compile-netware-END:
    Changes for Netware

  netware/BUILD/compile-netware-END
    1.8 06/06/17 00:24:35 kent@mysql.com +0 -5
    After correcting "configure.in" to edit make files correctly,
    removed obsolete "sed" of "extra/Makefile.am" for Netware

  configure.in
    1.394 06/06/17 00:23:25 kent@mysql.com +3 -3
    Call of "comp_err" has moved, changed code for Netware that
    edits make files to reflect this

  sql/net_serv.cc
    1.89 06/06/17 00:20:03 kent@mysql.com +4 -0
    Netware needs <sys/select.h>

  mysql-test/r/select.result
    1.127 06/06/17 01:58:57 evgen@moonbone.local +10 -0
    After merge fix

ChangeSet
  1.1616.2144.150 06/06/16 22:29:52 kent@mysql.com +2 -0
  .del-mysql_install.def~8da659e7c0f7e571:
    Delete: netware/mysql_install.def
  Makefile.am:
    Removed obsolete "mysql_install.def"

  BitKeeper/deleted/.del-mysql_install.def~8da659e7c0f7e571
    1.3.1.1 06/06/16 22:27:15 kent@mysql.com +0 -0
    Delete: netware/mysql_install.def

  netware/Makefile.am
    1.7.1.8 06/06/16 22:26:13 kent@mysql.com +2 -2
    Removed obsolete "mysql_install.def"

ChangeSet
  1.1616.2610.4 06/06/16 23:46:37 evgen@moonbone.local +2 -0
  item_strfunc.cc:
    Fix for bug#16716 for --ps-protocol mode.
  item_cmpfunc.cc:
    Fix for a memory allocation/freeing problem in agg_cmp_type() after fix
  for bug#16377. Few language corrections.

  sql/item_strfunc.cc
    1.196.6.11 06/06/16 23:42:46 evgen@moonbone.local +2 -1
    Fix for bug#16716 for --ps-protocol mode.

  sql/item_cmpfunc.cc
    1.111.23.7 06/06/16 23:41:19 evgen@moonbone.local +11 -21
    Fix for a memory allocation/freeing problem in agg_cmp_type(). Few language corrections.

ChangeSet
  1.2164.11.1 06/06/16 20:21:25 dlenev@mysql.com +5 -0
  Fix for bug#13479 "REPLACE activates UPDATE trigger, not the DELETE and
  INSERT triggers".
  
  In cases when REPLACE was internally executed via update and table had
  on update (on delete) triggers defined we exposed the fact that such
  optimization used by callng on update (not calling on delete) triggers.
  Such behavior contradicts our documentation which describes REPLACE as
  INSERT with optional DELETE.
  
  This fix just disables this optimization for tables with on delete triggers.
  The optimization is still applied for tables which have on update but have
  no on delete triggers, we just don't invoke on update triggers in this case
  and thus don't expose information about optimization to user.
  
  Also added test coverage for values returned by ROW_COUNT() function (and
  thus for values returned by mysql_affected_rows()) for various forms of
  INSERT.

  sql/sql_insert.cc
    1.190.1.1 06/06/16 20:21:21 dlenev@mysql.com +20 -23
    write_record():
      We should not expose that internally we sometimes execute REPLACE
      via UPDATE instead of documented INSERT + DELETE pair. So we should not
      use this optimization for tables with on delete triggers. OTOH it is ok
      to use it for tables which have on update but have no on delete triggers,
      we just should not invoke on update triggers in this case.

  mysql-test/t/trigger.test
    1.46 06/06/16 20:21:21 dlenev@mysql.com +17 -23
    Adjusted test after fixing bug#13479 "REPLACE activates UPDATE trigger, not
    the DELETE and INSERT triggers".

  mysql-test/t/insert.test
    1.23 06/06/16 20:21:21 dlenev@mysql.com +23 -0
    Added test for values returned by ROW_COUNT() function (and thus for values
    returned by mysql_affected_rows()) for various forms of INSERT. We didn't
    have coverage for this before and since this fix touches related code it is
    better to add it now.

  mysql-test/r/trigger.result
    1.41 06/06/16 20:21:21 dlenev@mysql.com +10 -22
    Adjusted test after fixing bug#13479 "REPLACE activates UPDATE trigger, not
    the DELETE and INSERT triggers".

  mysql-test/r/insert.result
    1.24 06/06/16 20:21:21 dlenev@mysql.com +26 -0
    Added test for values returned by ROW_COUNT() function (and thus for values
    returned by mysql_affected_rows()) for various forms of INSERT. We didn't
    have coverage for this before and since this fix touches related code it is
    better to add it now.

ChangeSet
  1.2167.10.1 06/06/16 15:56:08 msvensson@neptunus.(none) +1 -0
  Set default valgrind options to "-v --show-reachable=yes" and make it possible to override that with --valgrind-options 

  mysql-test/mysql-test-run.pl
    1.97.1.1 06/06/16 15:56:03 msvensson@neptunus.(none) +26 -24
    Make --valgrind-all a synonym for --valgrind.
    Set "-v --show-reachable=yes" as our default valgrind options. 
    Make --valgrind-options override the default options
    Update usage.
    Turn on valgrinding also when user specified --valgrind-path or --valgrind-options without --valgrind

ChangeSet
  1.2167.4.9 06/06/16 14:05:58 ramil@mysql.com +5 -0
  after-merge fixes.

  sql/sql_class.h
    1.289 06/06/16 14:05:45 ramil@mysql.com +2 -1
    after-merge fix.

  sql/sql_class.cc
    1.235 06/06/16 14:05:44 ramil@mysql.com +4 -0
    after-merge fix.

  sql/item_func.cc
    1.289 06/06/16 14:05:44 ramil@mysql.com +1 -1
    after-merge fix.

  sql/ha_archive.cc
    1.69 06/06/16 14:05:44 ramil@mysql.com +1 -1
    after-merge fix.

  mysql-test/r/rpl_log.result
    1.65 06/06/16 14:05:44 ramil@mysql.com +5 -5
    after-merge fix.

ChangeSet
  1.2084.133.2 06/06/16 09:49:18 serg@serg.mylan +3 -0
  Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index
  Don't rely on table->null_row when no index is used - it may be a multi-table search

  sql/item_func.cc
    1.276.4.1 06/06/16 09:48:54 serg@serg.mylan +1 -1
    Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index
    Don't rely on table->null_row when no index is used - it may be a multi-table search

  mysql-test/t/fulltext_left_join.test
    1.13 06/06/16 09:48:54 serg@serg.mylan +14 -1
    Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index
    Don't rely on table->null_row when no index is used - it may be a multi-table search

  mysql-test/r/fulltext_left_join.result
    1.13 06/06/16 09:48:54 serg@serg.mylan +17 -0
    Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index
    Don't rely on table->null_row when no index is used - it may be a multi-table search

ChangeSet
  1.2149.2.20 06/06/15 20:29:05 igor@rurik.mysql.com +1 -0
  Post_merges fixes.

  mysql-test/r/func_group.result
    1.51 06/06/15 20:28:59 igor@rurik.mysql.com +0 -2
    Post_merges fixes.

ChangeSet
  1.2167.9.1 06/06/15 22:02:26 knielsen@mysql.com +1 -0
  BUG#19940: Add Valgrind suppression for false alarm report.

  mysql-test/valgrind.supp
    1.5 06/06/15 22:02:16 knielsen@mysql.com +15 -0
    BUG#19940: Add Valgrind suppression for false alarm report.

ChangeSet
  1.2149.17.1 06/06/15 22:09:58 evgen@moonbone.local +3 -0
  Fixed bug#18175: The nest_level counter wasn't decremented for union parts which
  resulted in a wrong error message.
  
  The nest_level counter indicates the depth of nesting for a subselect. It is
  needed to properly resolve aggregate functions in nested subselects. Obviously 
  it shouldn't be incremented for UNION parts because they have the same level of
  nesting. This counter was incremented by 1 in the mysql_new_select() function
  for any new select and wasn't decremented for UNION parts. This resulted in
  wrongly reported error messages.
  
  Now the nest_level counter is decremented by 1 for any union part.

  sql/sql_yacc.yy
    1.470 06/06/15 22:09:05 evgen@moonbone.local +2 -0
    Fixed bug#18175: The nest_level counter wasn't decremented for union parts which
    resulted in a wrong error message.
    Now the nest_level counter is decremented by 1 for any union part.

  mysql-test/r/union.result
    1.82 06/06/15 22:08:55 evgen@moonbone.local +45 -0
    Added test case for the bug#18175: The nest_level counter wasn't decremented for union parts which
    resulted in a wrong error message.
    

  mysql-test/t/union.test
    1.95 06/06/15 22:08:40 evgen@moonbone.local +48 -0
    Added test case for the bug#18175: The nest_level counter wasn't decremented for union parts which
    resulted in a wrong error message.
    

ChangeSet
  1.1616.2607.6 06/06/15 16:39:18 evgen@moonbone.local +2 -0
  item_cmpfunc.h, cast.result:
    Post fix for bug#16377

  sql/item_cmpfunc.h
    1.73.1.42 06/06/15 16:38:50 evgen@moonbone.local +5 -10
    Post fix for bug#16377

  mysql-test/r/cast.result
    1.20.1.7 06/06/15 16:38:27 evgen@moonbone.local +1 -1
    Post fix for bug#16377

ChangeSet
  1.2167.4.7 06/06/15 16:24:02 gluh@eagle.intranet.mysql.r18.ru +3 -0
  Fix for bug#19667 group by a decimal expression yields wrong result

  sql/item_buff.cc
    1.19 06/06/15 16:23:56 gluh@mysql.com +1 -1
    Fix for bug#19667 group by a decimal expression yields wrong result

  mysql-test/t/type_newdecimal.test
    1.37 06/06/15 16:23:56 gluh@mysql.com +9 -0
    Fix for bug#19667 group by a decimal expression yields wrong result
     test case

  mysql-test/r/type_newdecimal.result
    1.40 06/06/15 16:23:56 gluh@mysql.com +11 -0
    Fix for bug#19667 group by a decimal expression yields wrong result
     test case

ChangeSet
  1.2122.31.8 06/06/15 11:55:53 lars@mysql.com +2 -0
  BUG#17201: Removed version number from test case output

  mysql-test/t/mysqldump.test
    1.88 06/06/15 11:55:43 lars@mysql.com +1 -1
    Remove comments in mysqldump output

  mysql-test/r/mysqldump.result
    1.96 06/06/15 11:55:42 lars@mysql.com +0 -28
    Remove comments in mysqldump output

ChangeSet
  1.2122.30.6 06/06/15 13:38:32 svoj@may.pils.ru +1 -0
  Fixed windows compilation failure introduced by fix for BUG#12982.

  include/my_global.h
    1.117.1.2 06/06/15 13:38:26 svoj@may.pils.ru +1 -1
    Remove cast to ssize_t, since there is no ssize_t type on Windows.

ChangeSet
  1.2149.13.5 06/06/15 01:48:41 evgen@moonbone.local +6 -0
  Many files:
    After merge fix

  sql/field.cc
    1.307.1.2 06/06/15 01:48:01 evgen@moonbone.local +32 -50
    After merge fix

  sql/item_cmpfunc.cc
    1.206 06/06/15 01:47:16 evgen@moonbone.local +4 -4
    After merge fix

  sql/item_cmpfunc.h
    1.126 06/06/15 01:46:59 evgen@moonbone.local +5 -10
    After merge fix

  mysql-test/r/cast.result
    1.44 06/06/15 01:46:41 evgen@moonbone.local +1 -1
    After merge fix

  mysql-test/r/func_concat.result
    1.11 06/06/15 01:46:27 evgen@moonbone.local +7 -7
    After merge fix

  mysql-test/r/func_time.result
    1.50.1.2 06/06/15 01:46:09 evgen@moonbone.local +3 -1
    After merge fix

ChangeSet
  1.2167.4.5 06/06/14 21:30:49 msvensson@neptunus.(none) +2 -0
  Bug#19191 Repeated crashes on OpenBSD for ssl test cases
   - Import patch from yaSSL

  extra/yassl/src/socket_wrapper.cpp
    1.11 06/06/14 19:19:37 msvensson@neptunus.(none)[msvensson] +11 -2
    Import patch yassl.diff

  extra/yassl/src/handshake.cpp
    1.11 06/06/14 19:19:37 msvensson@neptunus.(none)[msvensson] +4 -4
    Import patch yassl.diff

ChangeSet
  1.1616.2623.2 06/06/14 20:22:03 tomas@poseidon.ndb.mysql.com +1 -0
  Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL
  - correction of backport error

  sql/ha_ndbcluster.cc
    1.114.18.4 06/06/14 20:21:59 tomas@poseidon.ndb.mysql.com +1 -1
    Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL
    - correction of backport error

ChangeSet
  1.2164.10.1 06/06/14 14:18:42 cmiller@zippy.(none) +1 -0
  Bug#19262: internal function create_typelib() uses DBUG_ENTER() but not DBUG_RETURN
  
  Trivial replacement of return with DBUG_RETURN.

  sql/sp_head.cc
    1.215 06/06/14 14:18:36 cmiller@zippy.(none) +2 -2
    Trivial replacement of return with DBUG_RETURN

ChangeSet
  1.1616.2623.1 06/06/14 20:16:32 tomas@poseidon.ndb.mysql.com +3 -0
  Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL
  - make sure to disable bulk insert when check for duplicate key is needed

  mysql-test/t/ndb_loaddatalocal.test
    1.1 06/06/14 20:16:28 tomas@poseidon.ndb.mysql.com +70 -0
    New BitKeeper file ``mysql-test/t/ndb_loaddatalocal.test''

  mysql-test/t/ndb_loaddatalocal.test
    1.0 06/06/14 20:16:28 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-4.1/mysql-test/t/ndb_loaddatalocal.test

  mysql-test/r/ndb_loaddatalocal.result
    1.1 06/06/14 20:16:27 tomas@poseidon.ndb.mysql.com +46 -0
    New BitKeeper file ``mysql-test/r/ndb_loaddatalocal.result''

  sql/ha_ndbcluster.cc
    1.114.18.3 06/06/14 20:16:27 tomas@poseidon.ndb.mysql.com +18 -0
    Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL
    - make sure to disable bulk insert when check for duplicate key is needed

  mysql-test/r/ndb_loaddatalocal.result
    1.0 06/06/14 20:16:27 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-4.1/mysql-test/r/ndb_loaddatalocal.result

ChangeSet
  1.1616.2622.1 06/06/14 21:06:02 sergefp@mysql.com +1 -0
  Better comments in KEY_PART_INFO struct

  sql/structs.h
    1.36.1.7 06/06/14 21:05:59 sergefp@mysql.com +7 -1
    Better comments in KEY_PART_INFO struct

ChangeSet
  1.1616.2593.9 06/06/14 16:54:54 joerg@mysql.com +1 -0
  support-files/mysql.server.sh  :  Fix the startup sequence.  bug#18810 + bug#20118

  support-files/mysql.server.sh
    1.34.2.6 06/06/14 16:54:50 joerg@mysql.com +1 -0
    Ensure that some necessary / useful system services have been started already,
    when the MySQL server is started. 
    This fixes bug#18810 and bug#20118

ChangeSet
  1.2149.15.1 06/06/14 15:57:23 gkodinov@mysql.com +3 -0
  Bug #18895: BIT values cause joins to fail
  
  The Field::eq() considered instances of Field_bit that differ only in 
  bit_ptr/bit_ofs equal. This caused equality conditions optimization 
  (build_equal_items_for_cond()) to make bad field substitutions that result
  in wrong predicates. 
  Field_bit requires an overloaded eq() function that checks the bit_ptr/bit_ofs
  in addition to Field::eq().

  sql/field.h
    1.181 06/06/14 15:57:17 gkodinov@mysql.com +8 -1
    Bug #18895: BIT values cause joins to fail
    
    - eq() method overloaded for Field_bit

  mysql-test/t/select.test
    1.101.1.3 06/06/14 15:57:17 gkodinov@mysql.com +26 -0
    Bug #18895: BIT values cause joins to fail
    
    - test case

  mysql-test/r/select.result
    1.123.1.4 06/06/14 15:57:17 gkodinov@mysql.com +20 -0
    Bug #18895: BIT values cause joins to fail
    
    - test case

ChangeSet
  1.2167.6.1 06/06/14 13:58:51 pekka@clam.ndb.mysql.com +6 -0
  ndb - bug#19285 : document and check what blob ops are allowed

  ndb/src/ndbapi/NdbBlob.cpp
    1.28 06/06/14 13:37:54 pekka@clam.ndb.mysql.com +44 -12
    upgrade LM_CommittedRead to LM_Read
    check if write allowed (new error 4275)
    dont invalidate blob state on error (just general principle)

  ndb/include/ndbapi/NdbBlob.hpp
    1.18 06/06/14 13:37:54 pekka@clam.ndb.mysql.com +38 -12
    upgrade LM_CommittedRead to LM_Read
    check if write allowed (new error 4275)
    dont invalidate blob state on error (just general principle)

  ndb/include/ndbapi/NdbScanOperation.hpp
    1.36 06/06/14 13:33:56 pekka@clam.ndb.mysql.com +1 -1
    fix comment

  ndb/test/ndbapi/testBlobs.cpp
    1.30 06/06/14 13:33:24 pekka@clam.ndb.mysql.com +90 -41
    test lock upgrade, test 4275 errors

  ndb/src/ndbapi/NdbBlobImpl.hpp
    1.2 06/06/14 13:32:13 pekka@clam.ndb.mysql.com +4 -2
    distinguish blob method errors: 4265-wrong state 4275-wrong op type/lockmode
    fix 4269 -> 4270

  ndb/src/ndbapi/ndberror.c
    1.43.1.2 06/06/14 13:30:33 pekka@clam.ndb.mysql.com +3 -2
    distinguish blob method errors: 4265-wrong state 4275-wrong op type/lockmode

ChangeSet
  1.1616.2593.8 06/06/14 12:54:28 tomas@poseidon.ndb.mysql.com +1 -0
   Bug #18595 repeated create, insert, drop can cause MySQL table definition cache to
  corrupt
    - add infinite retry on drop table temporary error

  sql/ha_ndbcluster.cc
    1.114.18.2 06/06/14 12:54:22 tomas@poseidon.ndb.mysql.com +27 -7
     Bug #18595 repeated create, insert, drop can cause MySQL table definition cache to
    corrupt
      - add infinite retry on drop table temporary error

ChangeSet
  1.1616.2611.8 06/06/13 22:38:00 igor@rurik.mysql.com +3 -0
  Post-review corrections of the fix for bug #18206.

  sql/opt_sum.cc
    1.33.2.10 06/06/13 22:37:56 igor@rurik.mysql.com +4 -2
    Post-review corrections of the fix for bug #18206.

  mysql-test/t/func_group.test
    1.24.1.10 06/06/13 22:37:56 igor@rurik.mysql.com +9 -0
    Added another test case for bug #18206.

  mysql-test/r/func_group.result
    1.22.5.12 06/06/13 22:37:56 igor@rurik.mysql.com +13 -0
    Added another test case for bug #18206.

ChangeSet
  1.1616.2620.1 06/06/13 19:57:50 igor@rurik.mysql.com +3 -0
  Fixed bug #14896.
  This bug in Field_string::cmp resulted in a wrong comparison 
  with keys in partial indexes over multi-byte character fields.
  Given field a is declared as 
    a varchar(16) collate utf8_unicode_ci
  INDEX(a(4)) gives us an example of such an index.
  
  Wrong key comparisons could lead to wrong result sets if 
  the selected query execution plan used a range scan by 
  a partial index over a utf8 character field.
  This also caused wrong results in many other cases.

  sql/field.cc
    1.197.11.1 06/06/13 19:57:46 igor@rurik.mysql.com +7 -13
    Fixed bug #14896.
    This bug in Field_string::cmp resulted in a wrong comparison 
    with keys in partial indexes over multi-byte character fields.
    Given field a is declared as 
      a varchar(16) collate utf8_unicode_ci
    INDEX(a(4)) gives us an example of such an index.
    
    Wrong key comparisons could lead to wrong result sets if 
    the selected query execution plan used a range scan by 
    a partial index over a utf8 character field.
    This also caused wrong results in many other cases.  
     

  mysql-test/t/ctype_utf8.test
    1.57.1.15 06/06/13 19:57:46 igor@rurik.mysql.com +26 -0
    Added test cases for bug #14896.

  mysql-test/r/ctype_utf8.result
    1.45.1.25 06/06/13 19:57:46 igor@rurik.mysql.com +40 -0
    Added test cases for bug #14896.

ChangeSet
  1.2167.4.2 06/06/14 00:38:34 pekka@clam.ndb.mysql.com +2 -0
  ndb - bug#20406 multi-platform testing - not FIX

  mysql-test/t/ndb_condition_pushdown.test
    1.18 06/06/14 00:35:40 pekka@clam.ndb.mysql.com +22 -0
    ndb - bug#20406 multi-platform testing - not FIX

  mysql-test/r/ndb_condition_pushdown.result
    1.20 06/06/14 00:35:40 pekka@clam.ndb.mysql.com +24 -0
    ndb - bug#20406 multi-platform testing - not FIX

ChangeSet
  1.2149.12.2 06/06/13 18:18:32 gkodinov@mysql.com +3 -0
  Bug #20195: INSERT DELAYED with auto_increment is assigned wrong values
  
  The INSERT DELAYED should not maintain its own private auto-increment
  counter, because this is assuming that other threads cannot insert
  into the table while the INSERT DELAYED thread is inserting, which is
  a wrong assumption.
  
  So the start of processing of a batch of INSERT rows in the 
  INSERT DELAYED thread must be treated as a start of a new statement
  and cached next_insert_id must be cleared.

  sql/sql_insert.cc
    1.191 06/06/13 18:18:28 gkodinov@mysql.com +8 -0
    Reset auto-increment cacheing before processing
    the next batch of inserts in the handler thread

  mysql-test/t/delayed.test
    1.13 06/06/13 18:18:27 gkodinov@mysql.com +49 -0
    test suite for the bug

  mysql-test/r/delayed.result
    1.11 06/06/13 18:18:27 gkodinov@mysql.com +30 -0
    test suite for the bug

ChangeSet
  1.1616.2619.1 06/06/13 19:09:24 evgen@moonbone.local +9 -0
  Fixed bug#16377: result of DATE/TIME functions were compared as strings which
  can lead to a wrong result.
  
  All date/time functions has the STRING result type thus their results are
  compared as strings. The string date representation allows a user to skip 
  some of leading zeros. This can lead to wrong comparison result if a date/time 
  function result is compared to such a string constant.
  
  The idea behind this bug fix is to compare results of date/time functions
  and data/time constants as ints, because that date/time representation is 
  more exact. To achieve this the agg_cmp_type() is changed to take in the
  account that a date/time field or an date/time item should be compared 
  as ints.
  
  This bug fix is partially back ported from 5.0.
  
  The agg_cmp_type() function now accepts THD as one of parameters. 
  In addition, it now checks if a date/time field/function is present in the
  list. If so, it tries to coerce all constants to INT to make date/time
  comparison return correct result. The field for the constant coercion is
  taken from the Item_field or constructed from the Item_func. In latter case
  the constructed field will be freed after conversion of all constant items.
  Otherwise the result is same as before - aggregated with help of the
  item_cmp_type() function.
  
  From the Item_func_between::fix_length_and_dec() function removed the part
  which was converting date/time constants to int if possible. Now this is 
  done by the agg_cmp_type() function.
  
  The new function result_as_longlong() is added to the Item class. 
  It indicates that the item is a date/time item and result of it can be
  compared as int. Such items are date/time fields/functions.
  
  Correct val_int() methods are implemented for classes Item_date_typecast, 
  Item_func_makedate, Item_time_typecast, Item_datetime_typecast. All these
  classes are derived from Item_str_func and Item_str_func::val_int() converts
  its string value to int without regard to the date/time type of these items.
  
  Arg_comparator::set_compare_func() and Arg_comparator::set_cmp_func()
  functions are changed to substitute result type of an item with the INT_RESULT
  if the item is a date/time item and another item is a constant. This is done
  to get a correct result of comparisons like date_time_function() = string_constant.

  mysql-test/r/func_time.result
    1.23.4.1 06/06/13 19:08:21 evgen@moonbone.local +41 -0
    Added test case fot bug#16377: result of DATE/TIME functions were compared as strings which
    can lead to a wrong result.

  mysql-test/t/func_time.test
    1.21.3.1 06/06/13 19:08:10 evgen@moonbone.local +20 -0
    Added test case fot bug#16377: result of DATE/TIME functions were compared as strings which
    can lead to a wrong result.

  sql/item.h
    1.56.1.138 06/06/13 19:07:53 evgen@moonbone.local +16 -0
    The new function result_as_longlong() is added to the Item class. 
    It indicates that the item is a date/time item and result of it can be
    compared as int. Such items are date/time fields/functions.

  sql/item_cmpfunc.cc
    1.111.23.6 06/06/13 19:04:46 evgen@moonbone.local +122 -32
    Fixed bug#16377: result of DATE/TIME functions were compared as strings which
    can lead to a wrong result.
    The agg_cmp_type() function now accepts THD as one of parameters. 
    In addition, it now checks if a date/time field/function is present in the
    list. If so, it tries to coerce all constants to INT to make date/time
    comparison return correct result. The field for the constant coercion is
    taken from the Item_field or constructed from the Item_func. In latter case
    the constructed field will be freed after conversion of all constant items.
    Otherwise the result is same as before - aggregated with help of the
    item_cmp_type() function.

  sql/field.cc
    1.197.1.33 06/06/13 18:26:08 evgen@moonbone.local +11 -5
    Fixed bug#16377: result of DATE/TIME functions were compared as strings which
    can lead to a wrong result.
    Field::set_warning(), Field::set_datetime_warning() now use current_thd to get thd if table isn't set.

  sql/item_cmpfunc.h
    1.73.1.41 06/06/13 18:24:34 evgen@moonbone.local +10 -4
    Fixed bug#16377: result of DATE/TIME functions were compared as strings which
    can lead to a wrong result.
    Arg_comparator::set_compare_func() and Arg_comparator::set_cmp_func()
    functions are changed to substitute result type of an item with the INT_RESULT
    if the item is a date/time item and another item is a constant.

  sql/item_timefunc.cc
    1.51.5.1 06/06/13 18:24:14 evgen@moonbone.local +60 -0
    Fixed bug#16377: result of DATE/TIME functions were compared as strings which
    can lead to a wrong result.Correct val_int() methods are implemented for classes Item_date_typecast, 
    Item_func_makedate, Item_time_typecast, Item_datetime_typecast.

  sql/item_timefunc.h
    1.42.2.1 06/06/13 18:23:53 evgen@moonbone.local +12 -0
    Fixed bug#16377: result of DATE/TIME functions were compared as strings which
    can lead to a wrong result.
    The result_as_longlong() function is set to return TRUE for these classes:
    Item_date, Item_date_func, Item_func_curtime, Item_func_sec_to_time,
    Item_date_typecast, Item_time_typecast, Item_datetime_typecast,
    Item_func_makedate.

  mysql-test/r/cast.result
    1.20.1.6 06/06/13 18:23:26 evgen@moonbone.local +1 -1
    Fixed wrong test case result after bug fix#16377.

ChangeSet
  1.2167.2.7 06/06/13 17:23:43 holyfoot@deer.(none) +2 -0
  bug #16832 (ALGORITHM missed in VIEW's information schema)

  sql/sql_show.cc
    1.320 06/06/13 17:22:23 holyfoot@mysql.com +34 -6
    /*ALGORITHM=XXX*/ added to the 'query' column in view's information schema

  mysql-test/r/information_schema.result
    1.108 06/06/13 17:22:23 holyfoot@mysql.com +9 -9
    test result fixed

ChangeSet
  1.1346.1.836 06/06/13 16:01:54 ramil@mysql.com +4 -0
  Fix for bug #12728: Very strange behaviour of ELT

  sql/item_strfunc.h
    1.15.1.12 06/06/13 16:01:50 ramil@mysql.com +1 -0
    Fix for bug #12728: Very strange behaviour of ELT
      - Item_func_elt::eq() introduced: check 'item' member as well
        (to distinguish for instance elt(1, 'a', 'b') and elt(2, 'a', 'b')

  sql/item_strfunc.cc
    1.36.1.51 06/06/13 16:01:50 ramil@mysql.com +11 -0
    Fix for bug #12728: Very strange behaviour of ELT
      - Item_func_elt::eq() introduced: check 'item' member as well
        (to distinguish for instance elt(1, 'a', 'b') and elt(2, 'a', 'b')

  mysql-test/t/func_str.test
    1.15.2.20 06/06/13 16:01:50 ramil@mysql.com +8 -0
    Fix for bug #12728: Very strange behaviour of ELT
      - test result

  mysql-test/r/func_str.result
    1.16.2.19 06/06/13 16:01:50 ramil@mysql.com +7 -0
    Fix for bug #12728: Very strange behaviour of ELT
      - test case

ChangeSet
  1.2167.3.6 06/06/12 18:15:08 gkodinov@mysql.com +3 -0
  Bug #20363: Create view on just created view is now denied
  
  There was a wrong determination of the DB name (witch is 
  not always the one in TABLE_LIST because derived tables
  may be calculated using temp tables that have their db name
  set to "").
  The fix determines the database name according to the type 
  of table reference, and calls the function check_access() 
  with the correct db name so the correct set of grants is found.

  sql/sql_parse.cc
    1.549 06/06/12 18:15:03 gkodinov@mysql.com +8 -1
    correct determination of the db name.

  mysql-test/t/view_grant.test
    1.14 06/06/12 18:15:03 gkodinov@mysql.com +39 -0
    testsuite for the bug

  mysql-test/r/view_grant.result
    1.16 06/06/12 18:15:03 gkodinov@mysql.com +29 -0
    testsuite for the bug

ChangeSet
  1.2167.2.5 06/06/12 15:05:42 mskold@mysql.com +2 -0
  Added order by

ChangeSet
  1.1616.2144.145 06/06/12 14:53:15 mskold@mysql.com +2 -0
  Added order by

  mysql-test/t/ndb_lock.test
    1.11 06/06/12 15:05:07 mskold@mysql.com +2 -2
    Added order by

  mysql-test/r/ndb_lock.result
    1.9 06/06/12 15:05:07 mskold@mysql.com +4 -4
    Added order by

ChangeSet
  1.2161.2.1 06/06/12 08:54:45 cmiller@zippy.(none) +5 -0
  Bug #16206: Superfluous COMMIT event in binlog when updating BDB in autocommit 
  	mode
  
  This is a modification of serg's and guilhem's suggestion in the bug report,
  in that it also causes the transaction log to be written to disc.

  sql/log_event.h
    1.124 06/06/12 08:54:40 cmiller@zippy.(none) +21 -0
    Add a new subclass of Query_log_event that doesn't write itself to the log, for
    cases where we only want to flush out the transaction and not also write about
    this event.

  sql/log_event.cc
    1.205 06/06/12 08:54:40 cmiller@zippy.(none) +27 -0
    Add a new subclass of Query_log_event that doesn't write itself to the log, for
    cases where we only want to flush out the transaction and not also write about
    this event.

  sql/log.cc
    1.189 06/06/12 08:54:40 cmiller@zippy.(none) +17 -5
    Create a log-committing event that itself won't be written to the log when 
    we're in autocommit mode.

  mysql-test/t/bdb.test
    1.52 06/06/12 08:54:40 cmiller@zippy.(none) +35 -0
    Add test

  mysql-test/r/bdb.result
    1.50 06/06/12 08:54:40 cmiller@zippy.(none) +34 -0
    Add result.

  mysql-test/t/ndb_lock.test
    1.9.1.1 06/06/12 14:52:40 mskold@mysql.com +2 -2
    Added order by

  mysql-test/r/ndb_lock.result
    1.7.1.1 06/06/12 14:52:40 mskold@mysql.com +4 -4
    Added order by

ChangeSet
  1.1616.2593.7 06/06/12 13:06:56 tomas@poseidon.ndb.mysql.com +2 -0
  Bug #20336 CLUSTERLOG commands have no effect
  - always calculate max log level on node start
  - send event subscribe uncond

  ndb/src/mgmsrv/Services.cpp
    1.31.1.11 06/06/12 13:06:52 tomas@poseidon.ndb.mysql.com +6 -7
    Bug #20336 CLUSTERLOG commands have no effect
    - always send log level update
    

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.51.1.25 06/06/12 13:06:52 tomas@poseidon.ndb.mysql.com +34 -25
    Bug #20336 CLUSTERLOG commands have no effect
    - always calculate max log level on node start
    - send event subscribe uncond

ChangeSet
  1.2164.1.10 06/06/12 10:40:56 mskold@mysql.com +2 -0
   Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Skipped lock check for full table scan due to bug #20390 SELECT FOR UPDATE does not release locks of untouched rows in full table scans

  mysql-test/r/ndb_lock.result
    1.8 06/06/12 10:40:32 mskold@mysql.com +0 -6
     Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Skipped lock check for full table scan due to bug #20390 SELECT FOR UPDATE does not release locks of untouched rows in full table scans

  mysql-test/t/ndb_lock.test
    1.10 06/06/12 10:40:31 mskold@mysql.com +4 -2
     Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Skipped lock check for full table scan due to bug #20390 SELECT FOR UPDATE does not release locks of untouched rows in full table scans

ChangeSet
  1.2164.1.9 06/06/12 10:22:32 mskold@mysql.com +1 -0
   Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Added missing parameter for readTuples in index scan

  sql/ha_ndbcluster.cc
    1.255 06/06/12 10:22:06 mskold@mysql.com +1 -1
     Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Added missing parameter for readTuples in index scan

ChangeSet
  1.2164.1.7 06/06/12 09:37:19 mskold@mysql.com +4 -0
  Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Adapted to 5.0 code changes

  sql/ha_ndbcluster.cc
    1.253 06/06/12 09:37:05 mskold@mysql.com +81 -10
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Adapted to 5.0 code changes

  ndb/src/ndbapi/NdbScanOperation.cpp
    1.71 06/06/12 09:37:05 mskold@mysql.com +1 -1
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Adapted to 5.0 code changes

  ndb/include/ndbapi/NdbScanOperation.hpp
    1.35 06/06/12 09:37:05 mskold@mysql.com +30 -2
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Adapted to 5.0 code changes

  ndb/include/ndbapi/NdbIndexScanOperation.hpp
    1.20 06/06/12 09:37:05 mskold@mysql.com +5 -2
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Adapted to 5.0 code changes

ChangeSet
  1.1616.2614.4 06/06/12 09:28:27 mskold@mysql.com +2 -0
  Added lock test on index scan

  mysql-test/t/ndb_lock.test
    1.9 06/06/12 09:28:13 mskold@mysql.com +39 -4
    Added lock test on index scan

  mysql-test/r/ndb_lock.result
    1.7 06/06/12 09:28:13 mskold@mysql.com +51 -24
    Added lock test on index scan

ChangeSet
  1.1616.2614.3 06/06/12 09:27:04 mskold@mysql.com +1 -0
  Moved back comment to  correct method

  sql/ha_ndbcluster.cc
    1.114.3.68 06/06/12 09:26:16 mskold@mysql.com +12 -5
    Moved back comment to  correct method

ChangeSet
  1.2167.1.2 06/06/11 20:46:47 pekka@clam.ndb.mysql.com +8 -0
  ndb - bug#18781 (5.0) handle rolling upgrade, minor fixes, logging, docs

  ndb/test/ndbapi/testDict.cpp
    1.25 06/06/11 20:44:12 pekka@clam.ndb.mysql.com +42 -25
    more DICT LOCK related testing

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.20 06/06/11 20:44:12 pekka@clam.ndb.mysql.com +4 -2
    more DICT LOCK related testing

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.51 06/06/11 20:43:23 pekka@clam.ndb.mysql.com +45 -1
    DICT LOCK rolling upgrade from version < 5.0.23

  ndb/include/ndb_version.h.in
    1.4 06/06/11 20:39:13 pekka@clam.ndb.mysql.com +2 -0
    DICT LOCK appeared in 5.0.23

  ndb/include/kernel/signaldata/DictLock.hpp
    1.3 06/06/11 20:37:39 pekka@clam.ndb.mysql.com +3 -1
    2 more REFs

  ndb/src/kernel/blocks/dbdict/Dbdict.hpp
    1.18 06/06/11 20:36:37 pekka@clam.ndb.mysql.com +3 -2
    call removeStaleDictLocks at right place, comment why it works
    more checks, better logging

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.63 06/06/11 20:36:37 pekka@clam.ndb.mysql.com +85 -16
    call removeStaleDictLocks at right place, comment why it works
    more checks, better logging

  ndb/src/kernel/blocks/dbdict/DictLock.txt
    1.2 06/06/11 20:33:58 pekka@clam.ndb.mysql.com +94 -0
    NR signals

  ndb/src/kernel/blocks/dbdict/DictLock.txt
    1.1 06/06/11 17:43:03 pekka@clam.ndb.mysql.com +0 -0

  ndb/src/kernel/blocks/dbdict/DictLock.txt
    1.0 06/06/11 17:43:03 pekka@clam.ndb.mysql.com +0 -0
    BitKeeper file /space/pekka/ndb/version/my50-bug18781/ndb/src/kernel/blocks/dbdict/DictLock.txt

ChangeSet
  1.2167.3.4 06/06/09 19:29:39 igor@rurik.mysql.com +1 -0
  Post-merge fixes

  mysql-test/r/sysdate_is_now.result
    1.2 06/06/09 19:29:32 igor@rurik.mysql.com +1 -1
    Post-merge fixes

ChangeSet
  1.1616.2600.3 06/06/08 19:55:22 joerg@mysql.com +1 -0
  mysql-test/mysql-test-run.pl  :  Output the usage error if one is given. (Found when fixing bug#20303)

  mysql-test/mysql-test-run.pl
    1.8.11.2 06/06/08 19:55:18 joerg@mysql.com +7 -0
    Found when fixing bug#20303: The "usage()" function ignored the message it was given,
    so we got no real indication about the problem. Print it if one is given.

ChangeSet
  1.2139.3.1 06/06/08 13:25:28 cmiller@zippy.(none) +3 -0
  Bug#19904: UDF: not initialized *is_null per row
  
  The is_null value was initialized once and thereafter only set to indicate
  NULL, and never unset to indicate not-NULL.
  
  Now set is_null to false, in addition to only setting it to true when the value 
  in question is null.

  sql/sql_udf.h
    1.14 06/06/08 13:25:23 cmiller@zippy.(none) +2 -0
    Initialize is_null to false before trying to use it, so that historical NULLs
    don't affect our operation.

  mysql-test/t/udf.test
    1.5 06/06/08 13:25:23 cmiller@zippy.(none) +12 -0
    Add test.

  mysql-test/r/udf.result
    1.5 06/06/08 13:25:22 cmiller@zippy.(none) +18 -0
    Add result.

ChangeSet
  1.1616.2593.6 06/06/08 17:26:56 tomas@poseidon.ndb.mysql.com +4 -0
  Bug #20336 CLUSTERLOG commands have no effect

  ndb/src/mgmsrv/Services.cpp
    1.31.1.10 06/06/08 17:26:51 tomas@poseidon.ndb.mysql.com +7 -5
    Bug #20336 CLUSTERLOG commands have no effect
    - make sure to compute max every time for log level

  ndb/src/mgmsrv/MgmtSrvr.hpp
    1.22.1.12 06/06/08 17:26:51 tomas@poseidon.ndb.mysql.com +0 -2
    Bug #20336 CLUSTERLOG commands have no effect

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.51.1.24 06/06/08 17:26:51 tomas@poseidon.ndb.mysql.com +28 -27
    Bug #20336 CLUSTERLOG commands have no effect
    - make sure to actually send the update to ndb nodes, and wait for the reply

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
    1.15.1.6 06/06/08 17:26:51 tomas@poseidon.ndb.mysql.com +3 -2
    Bug #20336 CLUSTERLOG commands have no effect
    - with signal sender the clock issuing the command and the revceiver of the events are not the same

ChangeSet
  1.2167.1.1 06/06/08 16:16:07 pekka@clam.ndb.mysql.com +19 -0
  ndb - bug#18781 lock DICT during node restart

  ndb/src/ndbapi/ndberror.c
    1.44 06/06/08 16:13:09 pekka@clam.ndb.mysql.com +1 -0
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.50 06/06/08 16:13:09 pekka@clam.ndb.mysql.com +128 -5
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
    1.11 06/06/08 16:13:08 pekka@clam.ndb.mysql.com +6 -0
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/src/kernel/blocks/dbdih/Dbdih.hpp
    1.11 06/06/08 16:13:08 pekka@clam.ndb.mysql.com +28 -0
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/src/kernel/blocks/dbdict/Dbdict.hpp
    1.17 06/06/08 16:13:08 pekka@clam.ndb.mysql.com +96 -1
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.62 06/06/08 16:13:08 pekka@clam.ndb.mysql.com +244 -1
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.19 06/06/08 16:13:08 pekka@clam.ndb.mysql.com +3 -1
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/src/common/debugger/signaldata/SignalNames.cpp
    1.7 06/06/08 16:13:08 pekka@clam.ndb.mysql.com +6 -0
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/include/kernel/signaldata/DropTable.hpp
    1.4 06/06/08 16:13:08 pekka@clam.ndb.mysql.com +1 -0
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/include/kernel/signaldata/DictLock.hpp
    1.2 06/06/08 16:13:08 pekka@clam.ndb.mysql.com +76 -0
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/include/kernel/signaldata/CreateTable.hpp
    1.4 06/06/08 16:13:08 pekka@clam.ndb.mysql.com +1 -0
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/include/kernel/signaldata/AlterTable.hpp
    1.5 06/06/08 16:13:08 pekka@clam.ndb.mysql.com +1 -0
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/include/kernel/GlobalSignalNumbers.h
    1.11 06/06/08 16:13:08 pekka@clam.ndb.mysql.com +6 -4
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.32 06/06/08 16:12:47 pekka@clam.ndb.mysql.com +2 -2
    spelling

ChangeSet
  1.1616.2614.2 06/06/08 16:12:38 mskold@mysql.com +10 -0
  Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

  sql/ha_ndbcluster.h
    1.40.6.15 06/06/08 16:12:09 mskold@mysql.com +2 -0
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

  sql/ha_ndbcluster.cc
    1.114.3.67 06/06/08 16:12:08 mskold@mysql.com +70 -11
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

  ndb/src/ndbapi/ndberror.c
    1.20.2.9 06/06/08 16:12:08 mskold@mysql.com +1 -1
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

  ndb/src/ndbapi/NdbScanOperation.cpp
    1.41.5.1 06/06/08 16:12:08 mskold@mysql.com +21 -9
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

  ndb/src/ndbapi/NdbResultSet.cpp
    1.7.2.1 06/06/08 16:12:08 mskold@mysql.com +11 -0
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

  ndb/include/ndbapi/NdbScanOperation.hpp
    1.17.1.4 06/06/08 16:12:08 mskold@mysql.com +4 -2
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

  ndb/include/ndbapi/NdbResultSet.hpp
    1.5.1.1 06/06/08 16:12:08 mskold@mysql.com +21 -0
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

  ndb/include/ndbapi/NdbIndexScanOperation.hpp
    1.7.1.2 06/06/08 16:12:08 mskold@mysql.com +4 -3
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

  mysql-test/t/ndb_lock.test
    1.8 06/06/08 16:12:08 mskold@mysql.com +76 -0
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

  mysql-test/r/ndb_lock.result
    1.6 06/06/08 16:12:07 mskold@mysql.com +59 -0
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

  ndb/src/common/debugger/SignalLoggerManager.cpp
    1.9 06/06/08 16:11:10 pekka@clam.ndb.mysql.com +1 -1
    block no fix

  ndb/src/kernel/vm/pc.hpp
    1.10 06/06/08 16:08:33 pekka@clam.ndb.mysql.com +2 -0
    ERROR_INSERTED_CLEAR(x) test and clear if set

  ndb/src/kernel/vm/DLFifoList.hpp
    1.4 06/06/08 16:07:46 pekka@clam.ndb.mysql.com +14 -0
    add hasPrev

  ndb/test/ndbapi/testDict.cpp
    1.24 06/06/08 16:07:16 pekka@clam.ndb.mysql.com +304 -0
    test NF/NR + dict ops

  ndb/src/kernel/main.cpp
    1.61 06/06/08 16:06:44 pekka@clam.ndb.mysql.com +4 -0
    signal log from start (#if 0-ed)

  ndb/include/kernel/signaldata/DictLock.hpp
    1.1 06/06/08 15:21:00 pekka@clam.ndb.mysql.com +0 -0

  ndb/include/kernel/signaldata/DictLock.hpp
    1.0 06/06/08 15:21:00 pekka@clam.ndb.mysql.com +0 -0
    BitKeeper file /space/pekka/ndb/version/my50-bug18781/ndb/include/kernel/signaldata/DictLock.hpp

ChangeSet
  1.1616.2600.2 06/06/08 14:52:33 joerg@mysql.com +1 -0
  mysql-test/mysql-test-run.pl  :    A fix for bug#20303 "mysql-test-run.pl: Does not recognize -- argument"

  mysql-test/mysql-test-run.pl
    1.8.11.1 06/06/08 14:52:29 joerg@mysql.com +6 -0
    A fix for bug#20303 "mysql-test-run.pl: Does not recognize -- argument":
    Due to the use of 'pass_through' in option processing this lone '--' will remain
    as an argument, it must be ignored explicitly.

ChangeSet
  1.2149.11.1 06/06/08 13:34:03 gkodinov@mysql.com +3 -0
  Bug #15355: Common natural join column not resolved in prepared statement nested 
    query
  Problem:
  There was a wrong context assigned to the columns that were added in insert_fields()
  when expanding a '*'. When this is done in a prepared statement it causes 
  fix_fields() to fail to find the table that these columns reference.
  Actually the right context is set in setup_natural_join_row_types() called at the 
  end of setup_tables(). However when executed in a context of a prepared statement
  setup_tables() resets the context, but setup_natural_join_row_types() was not
  setting it to the correct value assuming it has already done so.
  
  Solution:
  The top-most, left-most NATURAL/USING join must be set as a 
  first_name_resolution_table in context even when operating on prepared statements.

  sql/sql_base.cc
    1.338.1.1 06/06/08 13:33:58 gkodinov@mysql.com +11 -11
    The context must be set even when executed as prepared statement.

  mysql-test/t/join.test
    1.32 06/06/08 13:33:57 gkodinov@mysql.com +25 -0
    testsuite for the bug

  mysql-test/r/join.result
    1.38 06/06/08 13:33:57 gkodinov@mysql.com +20 -0
    testsuite for the bug

ChangeSet
  1.2092.2.4 06/06/08 02:31:58 stewart@mysql.com +1 -0
  BUG#19318 valgrind: memory leak in ndb_mgmd
  
  fix based on review

  ndb/src/mgmsrv/ConfigInfo.cpp
    1.74 06/06/08 02:31:53 stewart@mysql.com +1 -1
    move delete to more appropriate places inside loop.

ChangeSet
  1.2122.30.5 06/06/07 19:44:43 svoj@may.pils.ru +2 -0
  BUG#12982 - LOAD DATA fails without any error for big files with big
              read buffer
  Setting read buffer to values greater than SSIZE_MAX results in
  unexpected behavior.
  
  According to read(2) manual:
  If count is greater than SSIZE_MAX, the result is unspecified.
  
  Set upper limit for read_buffer_size and read_rnd_buffer_size to
  SSIZE_MAX.

  sql/mysqld.cc
    1.546.3.1 06/06/07 19:44:38 svoj@may.pils.ru +4 -3
    Set upper limit for read_buffer_size and read_rnd_buffer_size to
    SSIZE_MAX.

  include/my_global.h
    1.117.1.1 06/06/07 19:44:37 svoj@may.pils.ru +3 -0
    Define SSIZE_MAX if not defined.

ChangeSet
  1.2164.8.1 06/06/07 14:46:10 msvensson@neptunus.(none) +1 -0
  Import from yaSSL to fix bild problems on AIX(already fixed but was lost during last import)

  extra/yassl/taocrypt/include/runtime.hpp
    1.15 06/06/07 14:39:30 msvensson@neptunus.(none)[msvensson] +3 -0
    Import patch yassl.diff

ChangeSet
  1.2149.10.1 06/06/07 16:17:56 evgen@moonbone.local +3 -0
  Fixed bug#19789: REPLACE was allowed for a VIEW with CHECK OPTION enabled.
  
  The st_lex::which_check_option_applicable() function controls for which 
  statements WITH CHECK OPTION clause should be taken into account. REPLACE and
  REPLACE_SELECT wasn't in the list which results in allowing REPLACE to insert
  wrong rows in a such view.
  
  The st_lex::which_check_option_applicable() now includes REPLACE and 
  REPLACE_SELECT in the list of statements for which WITH CHECK OPTION clause is
  applicable.

  sql/sql_lex.h
    1.216.1.1 06/06/07 16:17:16 evgen@moonbone.local +2 -0
    Fixed bug#19789: REPLACE was allowed for a VIEW with CHECK OPTION enabled.
    The st_lex::which_check_option_applicable() now includes REPLACE and 
    REPLACE_SELECT in the list of statements for which WITH CHECK OPTION clause is
    applicable.

  mysql-test/r/replace.result
    1.10 06/06/07 16:16:55 evgen@moonbone.local +6 -0
    Added test case for bug#19789: REPLACE was allowed for a VIEW with CHECK OPTION enabled.

  mysql-test/t/replace.test
    1.13 06/06/07 16:16:29 evgen@moonbone.local +10 -0
    Added test case for bug#19789: REPLACE was allowed for a VIEW with CHECK OPTION enabled.

ChangeSet
  1.1616.2617.1 06/06/07 14:01:10 ramil@mysql.com +5 -0
  Fix for bug #6880: LAST_INSERT_ID() within a statement

  sql/item_func.cc
    1.124.42.10 06/06/07 14:01:05 ramil@mysql.com +4 -3
    Fix for bug #6880: LAST_INSERT_ID() within a statement
      - return the first thd->last_insert_id set (within a query)

  mysql-test/t/rpl_log.test
    1.20.1.5 06/06/07 14:01:05 ramil@mysql.com +14 -0
    Fix for bug #6880: LAST_INSERT_ID() within a statement
      - test case

  mysql-test/t/auto_increment.test
    1.22.1.3 06/06/07 14:01:05 ramil@mysql.com +17 -0
    Fix for bug #6880: LAST_INSERT_ID() within a statement
      - test case

  mysql-test/r/rpl_log.result
    1.50.1.5 06/06/07 14:01:05 ramil@mysql.com +17 -0
    Fix for bug #6880: LAST_INSERT_ID() within a statement
      - test result

  mysql-test/r/auto_increment.result
    1.29.1.4 06/06/07 14:01:05 ramil@mysql.com +22 -0
    Fix for bug #6880: LAST_INSERT_ID() within a statement
      - test result

ChangeSet
  1.2084.61.7 06/06/07 16:20:57 stewart@mysql.com +3 -0
  BUG#18966 CHange in stop/shutdown behaviour
  
  Fixes based on review by Tomas

  ndb/src/mgmsrv/Services.hpp
    1.19 06/06/07 16:20:46 stewart@mysql.com +1 -3
    Only 1 version of stopAll

  ndb/src/mgmsrv/Services.cpp
    1.64 06/06/07 16:20:46 stewart@mysql.com +14 -22
    Only have 1 version of 'stop all' with reply being dependent on if the optional
    stop parameter is supplied.

  ndb/src/mgmapi/mgmapi.cpp
    1.58.3.2 06/06/07 16:20:46 stewart@mysql.com +21 -9
    Return immediately if ndb_mgm_get_version fails.
    correctly use new protocol for versions > 5.1

ChangeSet
  1.2149.9.1 06/06/07 01:10:23 evgen@moonbone.local +3 -0
  Fixed bug#15962: CONCAT() in UNION may lead to a data trucation.
  
  To calculate its max_length the CONCAT() function is simply sums max_lengths
  of its arguments but when the collation of an argument differs from the 
  collation of the CONCAT() max_length will be wrong. This may lead to a data
  truncation when a tmp table is used, in UNIONS for example.
  
  The Item_func_concat::fix_length_and_dec() function now recalculates the 
  max_length of an argument when the mbmaxlen of the argument differs from the
  mbmaxlen of the CONCAT().

  sql/item_strfunc.cc
    1.267 06/06/07 01:07:31 evgen@moonbone.local +8 -1
    Fixed bug#15962: CONCAT() in UNION may lead to a data trucation.
    The Item_func_concat::fix_length_and_dec() function now recalculates the 
    max_length of an argument when the mbmaxlen of the argument differs from the
    mbmaxlen of the CONCAT().

  mysql-test/r/func_concat.result
    1.9 06/06/07 01:06:30 evgen@moonbone.local +7 -0
    Added test case for bug#15962:CONCAT() in UNION may lead to a data trucation.

  mysql-test/t/func_concat.test
    1.11 06/06/07 01:05:49 evgen@moonbone.local +8 -0
    Added test case for bug#15962:CONCAT() in UNION may lead to a data trucation.

ChangeSet
  1.2122.11.5 06/06/06 23:37:42 aivanov@mysql.com +3 -0
  Applied innodb-5.0-ss609 snapshot.
   Fixed BUG#19727 "InnoDB crashed server and crashed tables
   are not recoverable".

  mysql-test/t/innodb.test
    1.133 06/06/06 23:37:38 aivanov@mysql.com +13 -0
    Applied innodb-5.0-ss609 snapshot.
     Add the big fat warning notice also to the bottom of
     innodb.test so that it will require more talent to
     ignore the change of policy.

  innobase/row/row0sel.c
    1.107 06/06/06 23:37:38 aivanov@mysql.com +2 -1
    Applied innodb-5.0-ss609 snapshot.
     row_sel_try_search_shortcut(): Do not return SEL_FOUND when
     the record was not found. This bug was introduced in
     InnoDB 5.0.3, but luckily it should nerver manifest itself,
     given that existing InnoDB SQL code never makes use of
     consistent reads.

  innobase/row/row0mysql.c
    1.121 06/06/06 23:37:38 aivanov@mysql.com +10 -10
    Applied innodb-5.0-ss609 snapshot.
     Move trx_commit_for_mysql(trx) calls before calls to
     row_mysql_unlock_data_dictionary(trx).

ChangeSet
  1.1616.2592.2 06/06/06 23:05:10 aivanov@mysql.com +1 -0
  Applied innodb-4.1-ss31 snapshot.
   Fixed BUG#19727 "InnoDB crashed server and crashed tables
   are not recoverable".

  innobase/row/row0mysql.c
    1.79.1.16 06/06/06 23:05:07 aivanov@mysql.com +10 -10
    Applied innodb-4.1-ss31 snapshot.
     Move trx_commit_for_mysql(trx) calls before calls to
     row_mysql_unlock_data_dictionary(trx).

ChangeSet
  1.1616.2144.139 06/06/06 09:59:45 igor@rurik.mysql.com +3 -0
  Fixed some problems for Windows build

  client/mysqldump.c
    1.143.13.4 06/06/06 09:59:41 igor@rurik.mysql.com +2 -1
    VS compiler does not accept variable declarations within blocks.
    Such a behaviour complies with the Standard C.

  VC++Files/client/mysql_ia64.dsp
    1.3 06/06/06 09:59:41 igor@rurik.mysql.com +4 -0
    Fixed omission of mysys\my_conio.c.

  VC++Files/client/mysql.dsp
    1.13.1.2 06/06/06 09:59:41 igor@rurik.mysql.com +4 -0
    Fixed omission of mysys\my_conio.c.

ChangeSet
  1.2164.2.6 06/06/06 12:57:50 gluh@eagle.intranet.mysql.r18.ru +2 -0
  Bug#18035 Information Schema: Output is not Sorted
  added 'order by' to avoid result order difference

  mysql-test/t/information_schema.test
    1.82 06/06/06 12:57:44 gluh@mysql.com +20 -16
    Bug#18035 Information Schema: Output is not Sorted
    added 'order by' to avoid result order difference

  mysql-test/r/information_schema.result
    1.107 06/06/06 12:57:44 gluh@mysql.com +20 -16
    Bug#18035 Information Schema: Output is not Sorted
    added 'order by' to avoid result order difference

ChangeSet
  1.2164.2.5 06/06/06 12:51:04 gluh@eagle.intranet.mysql.r18.ru +3 -0
  Bug#19599 duplication of information_schema column value in a CONCAT expr with user var
  mark result string using String::mark_as_const()
  which prevents CONCAT from reusing it as a buffer
  for concatenation result.

  sql/item_strfunc.h
    1.107 06/06/06 12:50:58 gluh@mysql.com +1 -0
    Bug#19599 duplication of information_schema column value in a CONCAT expr with user var
    mark result string using String::mark_as_const()
    which prevents CONCAT from reusing it as a buffer
    for concatenation result.

  mysql-test/t/information_schema.test
    1.81 06/06/06 12:50:58 gluh@mysql.com +10 -0
    Bug#19599 duplication of information_schema column value in a CONCAT expr with user var
    test case

  mysql-test/r/information_schema.result
    1.106 06/06/06 12:50:58 gluh@mysql.com +9 -0
    Bug#19599 duplication of information_schema column value in a CONCAT expr with user var
    test case

ChangeSet
  1.2164.2.4 06/06/06 11:25:31 gluh@eagle.intranet.mysql.r18.ru +3 -0
  Bug#17661 information_schema.SCHEMATA returns uppercase with lower_case_table_names = 1
  fix: return db name for I_S.TABLES(and others) in original letter case.
  if mysql starts with lower_case_table_names=1 | 2 then original db name is converted
  to lower case(for I_S tables). It happens when we perform add_table_to_list. 
  to avoid this we make a copy of original db name and use the copy hereafter.

  sql/sql_show.cc
    1.319 06/06/06 11:25:25 gluh@mysql.com +5 -3
    Bug#17661 information_schema.SCHEMATA returns uppercase with lower_case_table_names = 1
    fix: return db name for I_S.TABLES(and others) in original letter case.
    if mysql starts with lower_case_table_names=1 | 2 then original db name is converted
    to lower case(for I_S tables). It happens when we perform add_table_to_list. 
    to avoid this we make a copy of original db name and use the copy hereafter.

  mysql-test/t/lowercase_table2.test
    1.14 06/06/06 11:25:25 gluh@mysql.com +11 -0
    Bug#17661 information_schema.SCHEMATA returns uppercase with lower_case_table_names = 1
    test case

  mysql-test/r/lowercase_table2.result
    1.18 06/06/06 11:25:25 gluh@mysql.com +9 -0
    Bug#17661 information_schema.SCHEMATA returns uppercase with lower_case_table_names = 1
    test case

ChangeSet
  1.2164.6.1 06/06/05 13:37:06 reggie@big_geek. +1 -0
  Bug #18275  	invalid file descriptor causes crash on windows
  

  mysys/my_init.c
    1.46 06/06/05 13:37:00 reggie@big_geek. +23 -1
    Added invalid parameter handler so that routines such as lseek would return -1 instead of ASSERT.

ChangeSet
  1.2164.5.1 06/06/05 15:41:29 msvensson@shellback.(none) +4 -0
  Import patch for yassl 1.35
   - Better check of required buffer size when processing incoming record headers

  extra/yassl/include/openssl/pkcs12.h
    1.1 06/06/01 01:15:39 msvensson@shellback.(none)[msvensson] +5 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/engine.h
    1.1 06/06/01 01:37:16 msvensson@shellback.(none)[msvensson] +5 -0
    Import patch yassl.diff

  extra/yassl/src/handshake.cpp
    1.10 06/06/01 22:57:37 msvensson@shellback.(none)[msvensson] +24 -6
    Import patch yassl.diff

  extra/yassl/include/openssl/pkcs12.h
    1.0 06/06/01 01:15:39 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/include/openssl/pkcs12.h

  extra/yassl/include/openssl/engine.h
    1.0 06/06/01 01:37:16 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/include/openssl/engine.h

  extra/yassl/README
    1.4 06/06/02 00:36:01 msvensson@shellback.(none)[msvensson] +13 -3
    Import patch yassl.diff

ChangeSet
  1.2122.40.2 06/06/04 21:27:41 anjuta@arthur.local +4 -0
  BUG#19479: mysqldump creates invalid dump
  Moved the test case to separate non-windows specific file.

  mysql-test/t/create_not_windows.test
    1.1 06/06/04 21:27:37 anjuta@arthur.local +20 -0
    #19479: mysqldump creates invalid dump
    Moved the non-windows specific test case from create.test.

  mysql-test/r/create_not_windows.result
    1.1 06/06/04 21:27:37 anjuta@arthur.local +14 -0
    #19479: mysqldump creates invalid dump
    Moved the non-windows specific test case from create.test.

  mysql-test/t/create_not_windows.test
    1.0 06/06/04 21:27:37 anjuta@arthur.local +0 -0
    BitKeeper file /home/my/mysql-5.0-clean/mysql-test/t/create_not_windows.test

  mysql-test/r/create_not_windows.result
    1.0 06/06/04 21:27:37 anjuta@arthur.local +0 -0
    BitKeeper file /home/my/mysql-5.0-clean/mysql-test/r/create_not_windows.result

  mysql-test/t/create.test
    1.79 06/06/04 21:27:36 anjuta@arthur.local +0 -15
    Moved non-windows specific test case to create_not_windows.test.

  mysql-test/r/create.result
    1.117 06/06/04 21:27:36 anjuta@arthur.local +0 -14
    Moved non-windows specific test case to create_not_windows.test.

ChangeSet
  1.1616.2611.5 06/06/02 19:15:32 igor@rurik.mysql.com +1 -0
  Cleanup for the fix of bug 18206.

  sql/opt_sum.cc
    1.33.2.9 06/06/02 19:15:28 igor@rurik.mysql.com +0 -4
    Cleanup 

ChangeSet
  1.1616.2615.1 06/06/02 14:14:57 igor@rurik.mysql.com +5 -0
  Fixed bug #18206.
  The bug report revealed two problems related to min/max optimization:
  1. If the length of a constant key used in a SARGable condition for
  for the MIN/MAX fields is greater than the length of the field an 
  unwanted warning on key truncation is issued;
  2. If MIN/MAX optimization is applied to a partial index, like INDEX(b(4))
  than can lead to returning a wrong result set.

  sql/sql_select.h
    1.60.1.20 06/06/02 14:14:52 igor@rurik.mysql.com +1 -1
    Fixed bug #18206.
    Added a parameter for the function store_val_in_field allowing to
    control setting warnings about data truncation in the function.

  sql/sql_select.cc
    1.216.125.6 06/06/02 14:14:52 igor@rurik.mysql.com +3 -3
    Fixed bug #18206.
    Added a parameter for the function store_val_in_field allowing to
    control setting warnings about data truncation in the function.

  sql/opt_sum.cc
    1.33.2.8 06/06/02 14:14:52 igor@rurik.mysql.com +14 -3
    Fixed bug #18206.
    Suppressed the warning about data truncation when store_val_in_field
    was used to store keys for the field used in MIN/MAX optimization.
    Blocked MIN/MAX optimization for partial keys, such as in INDEX(b(4)).

  mysql-test/t/func_group.test
    1.24.1.9 06/06/02 14:14:52 igor@rurik.mysql.com +19 -0
    Added test cases for bug #18206.

  mysql-test/r/func_group.result
    1.22.5.11 06/06/02 14:14:52 igor@rurik.mysql.com +24 -0
    Added test cases for bug #18206.

ChangeSet
  1.2164.2.1 06/06/02 22:03:39 anjuta@arthur.local +2 -0
  BUG#19363: mysql --no_pager makes core dump.
  The problem was missing break; operator.

  client/mysql.cc
    1.206 06/06/02 22:03:35 anjuta@arthur.local +1 -0
    Fixed bug #19363: mysql --no_pager makes core dump. 
    There was break; missing in the case statement.

  BitKeeper/etc/ignore
    1.220.1.1 06/06/02 22:03:35 anjuta@arthur.local +1 -0
    Added client/#mysql.cc# to the ignore list

ChangeSet
  1.2149.2.14 06/06/02 18:02:22 gkodinov@mysql.com +2 -0
  Removed duplicate tests from select.test

  mysql-test/t/select.test
    1.101.1.2 06/06/02 18:02:17 gkodinov@mysql.com +0 -94
    Removed duplicate tests from select.test

  mysql-test/r/select.result
    1.123.1.3 06/06/02 18:02:17 gkodinov@mysql.com +0 -101
    Removed duplicate tests from select.test

ChangeSet
  1.2149.2.13 06/06/02 17:22:21 gkodinov@mysql.com +1 -0
  bad merge fixed for b4981.

  mysql-test/r/select.result
    1.123.1.2 06/06/02 17:22:15 gkodinov@mysql.com +14 -14
    bad merge fixed for b4981.

ChangeSet
  1.1616.2611.3 06/06/02 12:04:03 gkodinov@mysql.com +3 -0
  Bug #4981: 4.x and 5.x produce non-optimal execution path, 
          3.23 regression test failure
  
  The member SEL_ARG::min_flag was not initialized, 
  due to which the condition for no GEOM_FLAG in function 
  key_or did not choose "Range checked for each record" as 
  the correct access method.

  sql/opt_range.cc
    1.98.2.47 06/06/02 12:03:59 gkodinov@mysql.com +1 -1
    All of the class members initialized

  mysql-test/t/select.test
    1.28.7.1 06/06/02 12:03:59 gkodinov@mysql.com +14 -0
    testcase for 'Range checked' access method

  mysql-test/r/select.result
    1.34.9.1 06/06/02 12:03:59 gkodinov@mysql.com +14 -0
    testcase for 'Range checked' access method

ChangeSet
  1.2164.1.5 06/06/02 09:40:34 mskold@mysql.com +1 -0
  Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table

  sql/ha_ndbcluster.cc
    1.251 06/06/02 09:40:05 mskold@mysql.com +1 -1
    Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table

ChangeSet
  1.1616.2614.1 06/06/02 07:26:45 mskold@mysql.com +4 -0
  Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table

  sql/handler.h
    1.89.19.12 06/06/02 07:25:57 mskold@mysql.com +1 -2
    Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table

  sql/ha_ndbcluster.cc
    1.114.3.66 06/06/02 07:25:57 mskold@mysql.com +6 -0
    Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table

  mysql-test/t/ndb_truncate.test
    1.4 06/06/02 07:25:57 mskold@mysql.com +14 -9
    Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table

  mysql-test/r/ndb_truncate.result
    1.2 06/06/02 07:25:57 mskold@mysql.com +16 -7
    Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table

ChangeSet
  1.2164.1.3 06/06/01 16:51:19 igor@rurik.mysql.com +2 -0
  Post-merge fixes

  mysql-test/r/ssl_compress.result
    1.3 06/06/01 16:51:06 igor@rurik.mysql.com +2 -2
    Post-merge fixes

  mysql-test/r/ssl.result
    1.3 06/06/01 16:51:06 igor@rurik.mysql.com +2 -2
    Post-merge fixes

ChangeSet
  1.2165 06/06/01 18:08:57 svoj@may.pils.ru +1 -0
  BUG#19192 - CHECK TABLE EXTENDED / REPAIR TABLE show no errors.
              ALTER TABLE crashes
  Executing fast alter table (one that doesn't need to copy data)
  on tables created by mysql versions prior to 4.0.25 could result
  in posterior server crash when accessing these tables.
  
  There was a bug prior to mysql-4.0.25. Number of null fields was
  calculated incorrectly. As a result frm and data files gets out of
  sync after fast alter table. There is no way to determine by which
  mysql version (in 4.0 and 4.1 branches) table was created, thus we
  disable fast alter table for all tables created by mysql versions
  prior to 5.0 branch.
  See BUG#6236.

  sql/sql_table.cc
    1.313 06/06/01 18:08:51 svoj@may.pils.ru +9 -0
    There was a bug prior to mysql-4.0.25. Number of null fields was
    calculated incorrectly. As a result frm and data files gets out of
    sync after fast alter table. There is no way to determine by which
    mysql version (in 4.0 and 4.1 branches) table was created, thus we
    disable fast alter table for all tables created by mysql versions
    prior to 5.0 branch.
    See BUG#6236.

ChangeSet
  1.2160.1.1 06/06/01 12:32:35 msvensson@shellback.(none) +1 -0
  Add define YASSL_PREFIX when compiling yassl

  extra/yassl/yassl.vcproj
    1.2 06/06/01 12:32:30 msvensson@shellback.(none) +2 -2
    Add define YASSL_PREFIX when compiling yassl

ChangeSet
  1.2122.40.1 06/06/01 12:34:44 anjuta@arthur.local +7 -0
  Fixed Bug#19479:mysqldump creates invalid dump.
  Only check for FN_DEVCHAR in filenames if FN_DEVCHAR is defined.
  This allows to use table names with ":" on non windows platforms.
  On Windows platform get an error if you use table name that contains FN_DEVCHAR

  sql/table.cc
    1.218.2.1 06/06/01 12:34:38 anjuta@arthur.local +8 -0
    Only check for FN_DEVCHAR in filenames if FN_DEVCHAR is defined.
    This allows to use table names with ":" on non windows platforms.
    On Windows platform get an error if you use table name that contains FN_DEVCHAR

  mysys/mf_fn_ext.c
    1.8 06/06/01 12:34:38 anjuta@arthur.local +3 -3
    Added checking of BASKSLASH_MBTAIL as dirname_part depends on it.
    Fixed cast and indentation.

  mysql-test/t/create.test
    1.78 06/06/01 12:34:38 anjuta@arthur.local +15 -0
    Added testcase for Bug#19479:mysqldump creates invalid dump

  BitKeeper/etc/ignore
    1.221 06/06/01 12:34:38 anjuta@arthur.local +2 -0
    Added sql/share/iso639-2.txt sql/share/fixerrmsg.pl to the ignore list

  mysql-test/r/create.result
    1.116 06/06/01 12:34:37 anjuta@arthur.local +14 -0
    Added testcase for Bug#19479:mysqldump creates invalid dump

  include/my_global.h
    1.118 06/06/01 12:34:37 anjuta@arthur.local +0 -1
    Moved FN_DEVCHAR to config-win.h

  include/config-win.h
    1.81 06/06/01 12:34:37 anjuta@arthur.local +1 -0
    Moved FN_DEVCHAR to config-win.h

ChangeSet
  1.1616.2537.8 06/06/01 08:24:05 jonas@perch.ndb.mysql.com +5 -0
  ndb - bug#20185
    Dont be too aggressive in Dbtc::nodeFailCheckTransaction
    let it timeout by 1, so that it does not assert that it has waited too long
    old impl. set timeotu value to 0, making timeout = (ctcTimer - 0) which could be quite big.

  ndb/test/run-test/daily-basic-tests.txt
    1.13.2.12 06/06/01 08:24:03 jonas@perch.ndb.mysql.com +4 -0
    autotest

  ndb/test/ndbapi/testNodeRestart.cpp
    1.8.1.14 06/06/01 08:24:03 jonas@perch.ndb.mysql.com +56 -0
    testcase

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.42.1.24 06/06/01 08:24:02 jonas@perch.ndb.mysql.com +5 -3
    Dont set api con timer to 0, as this might trigger asserion in timeoutfound lab if state == PREPARE_TO_COMMIT

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.14.1.23 06/06/01 08:24:02 jonas@perch.ndb.mysql.com +24 -0
    2 new error inserts
    7030 - delay in GCP_PREPARE until checkLocalNodefailComplete is true
    7031 - delay in GCP_PREPARE and die

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.8.1.9 06/06/01 08:24:02 jonas@perch.ndb.mysql.com +3 -0
    error codes

ChangeSet
  1.2153.2.4 06/05/31 22:55:45 igor@rurik.mysql.com +8 -0
  Post-merge fixes

  sql/sql_base.cc
    1.340 06/05/31 22:55:39 igor@rurik.mysql.com +2 -1
    Post-merge fixes

  mysql-test/t/view.test
    1.147 06/05/31 22:55:39 igor@rurik.mysql.com +1 -1
    Post-merge fixes

  mysql-test/r/view.result
    1.161 06/05/31 22:55:39 igor@rurik.mysql.com +1 -1
    Post-merge fixes

  mysql-test/r/select.result
    1.125 06/05/31 22:55:39 igor@rurik.mysql.com +12 -2
    Post-merge fixes

  mysql-test/r/preload.result
    1.11 06/05/31 22:55:39 igor@rurik.mysql.com +1 -1
    Post-merge fixes

  mysql-test/r/key_cache.result
    1.19 06/05/31 22:55:39 igor@rurik.mysql.com +1 -1
    Post-merge fixes

  mysql-test/r/compress.result
    1.4 06/05/31 22:55:39 igor@rurik.mysql.com +2 -2
    Post-merge fixes

  mysql-test/include/common-tests.inc
    1.2 06/05/31 22:55:39 igor@rurik.mysql.com +2 -2
    Post-merge fixes

ChangeSet
  1.2153.2.3 06/05/31 18:12:13 igor@rurik.mysql.com +1 -0
  Manual merge

  mysql-test/r/select.result
    1.124 06/05/31 18:12:08 igor@rurik.mysql.com +2 -12
    Manual merge

ChangeSet
  1.2160 06/05/31 23:36:50 msvensson@shellback.(none) +5 -0
  Import patch from yaSSL
   - avoid allocating memory for each call to 'EVP_md5' and 
     'EVP_des_ede3_cbc' which were not released until server was stopped
   - Those functions are used from the SQL function 'des_encrypt' and
     'des_decrypt'.

  extra/yassl/src/yassl_int.cpp
    1.19 06/05/31 22:30:10 msvensson@shellback.(none)[msvensson] +0 -34
    Import patch yassl.diff

  extra/yassl/src/template_instnt.cpp
    1.10 06/05/31 22:30:10 msvensson@shellback.(none)[msvensson] +0 -1
    Import patch yassl.diff

  extra/yassl/src/ssl.cpp
    1.16 06/05/31 22:30:10 msvensson@shellback.(none)[msvensson] +21 -12
    Import patch yassl.diff

  extra/yassl/include/yassl_int.hpp
    1.11 06/05/31 22:30:09 msvensson@shellback.(none)[msvensson] +0 -19
    Import patch yassl.diff

  extra/yassl/include/openssl/ssl.h
    1.14 06/05/31 22:30:10 msvensson@shellback.(none)[msvensson] +2 -4
    Import patch yassl.diff

ChangeSet
  1.2159 06/05/31 23:06:56 msvensson@shellback.(none) +2 -0
  Add define YASLSL_PREFIX

  extra/yassl/testsuite/Makefile.am
    1.3 06/05/31 23:06:51 msvensson@shellback.(none) +1 -1
    Add defined YASSL_PREFIX when building yassl/testsuite

  extra/yassl/src/Makefile.am
    1.10 06/05/31 23:06:51 msvensson@shellback.(none) +1 -1
    Add defined YASSL_PREFIX when building yassl/src

ChangeSet
  1.2158 06/05/31 22:21:40 msvensson@shellback.(none) +1 -0
  Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of prefix_*.h files

  include/violite.h
    1.47 06/05/31 22:21:35 msvensson@shellback.(none) +1 -0
    Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of prefix_*.h files

ChangeSet
  1.2157 06/05/31 22:19:17 msvensson@shellback.(none) +2 -0
  Import from yaSSL

  extra/yassl/include/openssl/ssl.h
    1.13 06/05/31 22:14:47 msvensson@shellback.(none)[msvensson] +3 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/crypto.h
    1.3 06/05/31 22:14:47 msvensson@shellback.(none)[msvensson] +2 -0
    Import patch yassl.diff

ChangeSet
  1.2153.2.1 06/05/31 19:49:38 aelkin@dl145k.mysql.com +1 -0
  Bug#14157: utf8 encoding in binlog without set character_set_client
  
  adapting to pushbuild's custom to switch from default pathes. The name for
  var directory must be set with MYSQLTEST_VARDIR.

  mysql-test/t/mysqlbinlog.test
    1.30 06/05/31 19:49:32 aelkin@dl145k.mysql.com +1 -1
    correction of log path since pushbuild uses non-default options.

ChangeSet
  1.2155 06/05/31 16:28:03 msvensson@shellback.(none) +1 -0
  Bug#20022 mysql-test-run can't be run with secure connections turned on for all testcases
   - Part 1, fixes rpl- and federated-tests where connection is made to 127.0.0.1

  client/mysqltest.c
    1.237 06/05/31 16:27:57 msvensson@shellback.(none) +3 -0
    Turn on ssl_verify_server_cert only if host is "localhost"

ChangeSet
  1.2139.2.4 06/05/31 16:19:06 msvensson@shellback.(none) +15 -0
  Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_init
   - Include prefix files that renames all public functions in yaSSLs
     OpenSSL API to ya<function_name>. They will otherwise conflict
     with OpenSSL functions if loaded by an application that uses OpenSSL
     as well as libmysqlclient with yaSSL support.

  extra/yassl/include/openssl/prefix_ssl.h
    1.1 06/05/31 16:19:01 msvensson@shellback.(none) +152 -0
    Add prefix file for ssl.h

  extra/yassl/include/openssl/prefix_crypto.h
    1.1 06/05/31 16:19:01 msvensson@shellback.(none) +1 -0
    Add prefix file for crypto.h

  extra/yassl/include/openssl/prefix_ssl.h
    1.0 06/05/31 16:19:01 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug19575/my50-bug19575/extra/yassl/include/openssl/prefix_ssl.h

  extra/yassl/include/openssl/prefix_crypto.h
    1.0 06/05/31 16:19:01 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug19575/my50-bug19575/extra/yassl/include/openssl/prefix_crypto.h

  extra/yassl/include/openssl/generate_prefix_files.pl
    1.1 06/05/31 16:19:00 msvensson@shellback.(none) +45 -0
    Add utility script to parse the header files to generate the prefix_* files that renames yaSSL SSL_* functions

  vio/Makefile.am
    1.18 06/05/31 16:19:00 msvensson@shellback.(none) +1 -1
    Remove yassl_includes

  tools/Makefile.am
    1.23 06/05/31 16:19:00 msvensson@shellback.(none) +1 -1
    Add link with yaSSL libs

  sql/Makefile.am
    1.117 06/05/31 16:19:00 msvensson@shellback.(none) +1 -1
    Remove yassl_includes

  server-tools/instance-manager/Makefile.am
    1.32 06/05/31 16:19:00 msvensson@shellback.(none) +1 -1
    Remove yassl_includes

  libmysqld/examples/Makefile.am
    1.33 06/05/31 16:19:00 msvensson@shellback.(none) +1 -1
    Remove yassl_includes

  libmysqld/Makefile.am
    1.68 06/05/31 16:19:00 msvensson@shellback.(none) +2 -2
    Remove yassl_includes
    And one suspicious line

  libmysql_r/Makefile.am
    1.26 06/05/31 16:19:00 msvensson@shellback.(none) +1 -1
    Remove yassl_includes

  libmysql/Makefile.am
    1.50 06/05/31 16:19:00 msvensson@shellback.(none) +1 -1
    Remove yassl_includes

  extra/yassl/include/openssl/ssl.h
    1.10.1.1 06/05/31 16:19:00 msvensson@shellback.(none) +1 -0
    Add include file "prefix_crypto.h" to rename SSL_* functions to yaSSL_*

  extra/yassl/include/openssl/generate_prefix_files.pl
    1.0 06/05/31 16:19:00 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug19575/my50-bug19575/extra/yassl/include/openssl/generate_prefix_files.pl

  extra/yassl/include/openssl/crypto.h
    1.2 06/05/31 16:19:00 msvensson@shellback.(none) +2 -0
    Add include file "prefix_crypto.h" to rename SSL_* functions to yaSSL_*

  config/ac-macros/yassl.m4
    1.15 06/05/31 16:19:00 msvensson@shellback.(none) +0 -2
    Remove yassl_includes as they are the same as "normal" include

  client/Makefile.am
    1.55 06/05/31 16:19:00 msvensson@shellback.(none) +2 -2
    Remove $yassl_includes
    ...and one "suspicious line"

ChangeSet
  1.1616.2144.136 06/05/31 15:07:11 mskold@mysql.com +2 -0
  Removed dead code that had been commented out

  ndb/src/ndbapi/NdbDictionaryImpl.hpp
    1.18.1.5 06/05/31 15:06:54 mskold@mysql.com +0 -1
    Removed dead code that had been commented out

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.38.1.18 06/05/31 15:06:54 mskold@mysql.com +1 -1
    Removed dead code that had been commented out

ChangeSet
  1.2149.4.6 06/05/31 14:27:31 tnurnberg@mysql.com +1 -0
  Bug#18235: assertion/crash when windows mysqld is ended with ctrl-c
  
  Two threads both try a shutdown sequence which creates a race to the
  de-init/free of certain resources.
  
  This exists in similar form in the client as 17926: "mysql.exe crashes
  when ctrl-c is pressed in windows."

  sql/mysqld.cc
    1.554 06/05/31 14:27:23 tnurnberg@mysql.com +5 -1
    We have three potential ways of hitting the iceberg:
    - unireg_end()   has basic de-init
    - unireg_abort() has extended de-init
    - main() has a de-init sequence similar to unireg_abort()
    
    In the Windows version of the server, Control-C is handled
    in a different thread from the one main() is in.  The main
    loop is told to end, then unireg_abort() is called.  Its
    de-init and that of main() will then race each other for
    mutex- and cond-var-destroys, free(), and finally exit().
    
    This patch introduces a special case for Windows that will eliminate
    the race by ending the signal-handler via unireg_end() instead if
    SIGINT is signalled.  This seems the least intrusive fix that still
    fixes user-visible behaviour.

ChangeSet
  1.2122.39.1 06/05/31 13:36:28 tnurnberg@mysql.com +3 -0
  Bug#18462: mysqldump does not dump view structures correctly
  
  (The above problem only occurs with -T -- create a separate file for
  each table / view.) This ChangeSet results in correct output of view-
  information while omitting the information for the view's stand-in
  table. The rationale is that with -T, the user is likely interested
  in transferring part of a database, not the db in its entirety (that
  would be difficult as replay order is obscure, the files being named
  for the table/view they contain rather than getting a sequence number).

  mysql-test/t/mysqldump.test
    1.85.3.1 06/05/31 13:36:20 tnurnberg@mysql.com +21 -0
    prove mysqldump -T (each item gets its own file) dumps views correctly

  mysql-test/r/mysqldump.result
    1.93.3.1 06/05/31 13:36:20 tnurnberg@mysql.com +19 -0
    prove mysqldump -T (each item gets its own file) dumps views correctly

  client/mysqldump.c
    1.226.3.1 06/05/31 13:36:19 tnurnberg@mysql.com +3 -0
    Added missing fclose(). Before, a view's stand-in table would get
    dumped in get_table_structure(), and the file would remain open.
    get_view_structure() would re-open the same file and write to it,
    resulting in garbage.  The way we handle it now, the table-struct
    gets closed, then the opening of the view-struct (same name)
    overwrites it. (The SQL for the view drop-if-exists the table,
    anyway.) If this were not desired and we wanted SQL for the views
    that contains the create for the stand-in table, we'd hand a mode
    to open_sql_file_for_table(), which would feature O_APPEND in
    get_view_structure(), but not in get_table_structure().

ChangeSet
  1.2153.1.2 06/05/31 12:51:21 aelkin@dl145k.mysql.com +2 -0
  BUG#14157: utf8 encoding in binlog without set character_set_client
  
  missed table to drop after merge from 4.1 

  mysql-test/t/mysqlbinlog.test
    1.29 06/05/31 12:51:15 aelkin@dl145k.mysql.com +1 -1
    manual merge post-fix

  mysql-test/r/mysqlbinlog.result
    1.24 06/05/31 12:51:15 aelkin@dl145k.mysql.com +5 -1
    result changed

ChangeSet
  1.2122.38.1 06/05/31 10:22:44 ingo@mysql.com +5 -0
  Bug#19604 - CHECK TABLE with concurrent INSERT can reset auto_increment
  
  CHECK TABLE did temporarily clear the auto_increment value.
  It runs with a read lock, allowing other readers and
  conurrent INSERTs. The latter could grab the wrong value
  in this moment.
  
  CHECK TABLE does no longer modify the auto_increment value.
  Not even for a short moment.

  myisam/myisamdef.h
    1.84 06/05/31 10:22:39 ingo@mysql.com +1 -1
    Bug#19604 - CHECK TABLE with concurrent INSERT can reset auto_increment
    Changed update_auto_increment() to retrieve_auto_increment()
    to reflect that it does not change the auto_increment by
    itself any more. This must now be done externally if needed.

  myisam/mi_write.c
    1.57 06/05/31 10:22:39 ingo@mysql.com +2 -1
    Bug#19604 - CHECK TABLE with concurrent INSERT can reset auto_increment
    Added explicit update of info->s->state.auto_increment
    after the change from update_auto_increment() to
    retrieve_auto_increment().

  myisam/mi_update.c
    1.21 06/05/31 10:22:39 ingo@mysql.com +2 -1
    Bug#19604 - CHECK TABLE with concurrent INSERT can reset auto_increment
    Added explicit update of info->s->state.auto_increment
    after the change from update_auto_increment() to
    retrieve_auto_increment().

  myisam/mi_key.c
    1.50 06/05/31 10:22:39 ingo@mysql.com +6 -8
    Bug#19604 - CHECK TABLE with concurrent INSERT can reset auto_increment
    Changed update_auto_increment() to retrieve_auto_increment()
    to reflect that it does not change the auto_increment by
    itself any more. This must now be done externally if needed.

  myisam/mi_check.c
    1.143 06/05/31 10:22:39 ingo@mysql.com +16 -18
    Bug#19604 - CHECK TABLE with concurrent INSERT can reset auto_increment
    In chk_key() and update_auto_increment_key() in the repair_only
    case, do not touch info->s->state.auto_increment. Especially
    chk_key() can be called from CHECK TABLE with a read lock.
    Concurrent inserts could grab a temporarily changed value.
    Added minor style fixes.

ChangeSet
  1.2130.4.2 06/05/31 00:07:58 acurtis@xiphis.org +3 -0
  Bug#12096
    "Add line for non-executable stack in .s files"
    Fix so that configure will use "--noexecstack" for assembler if gcc supports
    option and compiled C doesn't need executable stack.

  strings/Makefile.am
    1.50 06/05/31 00:07:54 acurtis@xiphis.org +0 -6
    Bug#12096
      Automake knows how to handle assembler

  configure.in
    1.389.1.1 06/05/31 00:07:54 acurtis@xiphis.org +4 -0
    Bug#12096
      Add macro to check if "--noexecstack" should be used when compiling assembler

  config/ac-macros/compiler_flag.m4
    1.3 06/05/31 00:07:54 acurtis@xiphis.org +22 -0
    Bug#12096
      Add macro to check if "--noexecstack" should be used when compiling assembler

ChangeSet
  1.2122.30.3 06/05/30 17:10:53 acurtis@xiphis.org +3 -0
  Bug#19648
    "Merge table does not work with bit types"
     MERGE should have HA_CAN_BIT_FIELD feature bit set or else table row is
     formatted incorrectly.

  sql/ha_myisammrg.h
    1.41 06/05/30 17:10:50 acurtis@xiphis.org +2 -1
    Bug#19648
      Must have HA_CAN_BIT_FIELD for BIT type support

  mysql-test/t/merge.test
    1.41 06/05/30 17:10:50 acurtis@xiphis.org +9 -0
    Bug#19648
      Test for fix

  mysql-test/r/merge.result
    1.48 06/05/30 17:10:50 acurtis@xiphis.org +6 -0
    Bug#19648
      Test for fix

ChangeSet
  1.2149.2.11 06/05/30 23:05:34 evgen@moonbone.local +3 -0
  item_cmpfunc.cc, func_in.result, multi_update.result:
    After merge fix

  sql/item_cmpfunc.cc
    1.204 06/05/30 23:05:05 evgen@moonbone.local +23 -0
    After merge fix

  mysql-test/r/func_in.result
    1.27 06/05/30 23:04:46 evgen@moonbone.local +8 -0
    After merge fix

  mysql-test/r/multi_update.result
    1.44 06/05/30 23:04:34 evgen@moonbone.local +1 -0
    After merge fix

ChangeSet
  1.2122.35.2 06/05/30 14:49:05 tnurnberg@mysql.com +3 -0
  Bug#17371: Unable to dump a schema with invalid views
  
  'show create' works even on views that are short of a base-table (this
  throw a warning though, like you would expect). Unfortunately, this is
  not what mysqldump uses; it creates stand-in tables and hence requests
  'show fields' on the view which fails with missing base-tables.  The
  --force option prevents the dump from stopping at this point; furthermore
  this patch dumps a comment showing create for the offending view for
  better diagnostics. This solution was confirmed by submitter as solving
  their/clients' problem. Problem might become non-issue once mysqldump no
  longer creates stand-in tables.

  mysql-test/t/mysqldump.test
    1.85.2.1 06/05/30 14:48:59 tnurnberg@mysql.com +13 -0
    add test for #17371 - be defensive. if we can't do a full dump on a view
    (incl. 'show fields' for a stand-in table), at least create a comment with
    the 'show create' info when --force is given.

  mysql-test/r/mysqldump.result
    1.93.2.1 06/05/30 14:48:59 tnurnberg@mysql.com +9 -0
    add test for #17371 - be defensive. if we can't do a full dump on a view
    (incl. 'show fields' for a stand-in table), at least create a comment with
    the 'show create' info when --force is given.

  client/mysqldump.c
    1.226.2.1 06/05/30 14:48:59 tnurnberg@mysql.com +20 -1
    Dump a comment showing create for a view if we can't show fields for it for
    better diagnostics.

ChangeSet
  1.1616.2608.3 06/05/30 00:08:58 igor@rurik.mysql.com +33 -0
  Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
  refers to a column name.

  sql/sql_base.cc
    1.145.1.126 06/05/30 00:08:51 igor@rurik.mysql.com +1 -1
    Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
    refers to a column name.

  sql/share/ukrainian/errmsg.txt
    1.27.22.2 06/05/30 00:08:51 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/swedish/errmsg.txt
    1.64.23.2 06/05/30 00:08:51 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/spanish/errmsg.txt
    1.64.25.2 06/05/30 00:08:51 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/slovak/errmsg.txt
    1.64.23.2 06/05/30 00:08:51 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/serbian/errmsg.txt
    1.18.19.2 06/05/30 00:08:51 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/russian/errmsg.txt
    1.61.22.2 06/05/30 00:08:51 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/romanian/errmsg.txt
    1.62.24.2 06/05/30 00:08:50 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/portuguese/errmsg.txt
    1.64.24.2 06/05/30 00:08:50 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/polish/errmsg.txt
    1.63.22.2 06/05/30 00:08:50 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/norwegian/errmsg.txt
    1.63.23.2 06/05/30 00:08:50 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/norwegian-ny/errmsg.txt
    1.63.23.2 06/05/30 00:08:50 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/korean/errmsg.txt
    1.63.22.2 06/05/30 00:08:50 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/japanese/errmsg.txt
    1.63.22.2 06/05/30 00:08:50 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/japanese-sjis/errmsg.txt
    1.1.3.2 06/05/30 00:08:50 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.\

  sql/share/italian/errmsg.txt
    1.70.23.2 06/05/30 00:08:50 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/hungarian/errmsg.txt
    1.65.22.2 06/05/30 00:08:50 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/greek/errmsg.txt
    1.64.22.2 06/05/30 00:08:50 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.\

  sql/share/german/errmsg.txt
    1.64.23.2 06/05/30 00:08:50 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/french/errmsg.txt
    1.63.23.2 06/05/30 00:08:50 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/estonian/errmsg.txt
    1.64.22.2 06/05/30 00:08:50 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/english/errmsg.txt
    1.70.32.2 06/05/30 00:08:50 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/dutch/errmsg.txt
    1.66.23.2 06/05/30 00:08:50 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/danish/errmsg.txt
    1.62.23.2 06/05/30 00:08:50 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/czech/errmsg.txt
    1.64.23.2 06/05/30 00:08:50 igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  mysql-test/t/select.test
    1.28.4.11 06/05/30 00:08:50 igor@rurik.mysql.com +4 -4
    Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
    refers to a column name.
    Added a new test case.

  mysql-test/t/explain.test
    1.8.1.2 06/05/30 00:08:50 igor@rurik.mysql.com +2 -2
    Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
    refers to a column name.

  mysql-test/r/select.result
    1.34.3.36 06/05/30 00:08:50 igor@rurik.mysql.com +4 -4
    Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
    refers to a column name.
    Added a new test case.

  mysql-test/r/preload.result
    1.7.1.2 06/05/30 00:08:50 igor@rurik.mysql.com +1 -1
    Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
    refers to a column name.

  mysql-test/r/key_cache.result
    1.13.1.4 06/05/30 00:08:50 igor@rurik.mysql.com +1 -1
    Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
    refers to a column name.

  mysql-test/r/explain.result
    1.15.1.2 06/05/30 00:08:49 igor@rurik.mysql.com +2 -2
    Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
    refers to a column name.

  include/sql_state.h
    1.8.1.6 06/05/30 00:08:49 igor@rurik.mysql.com +0 -1
    Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
    refers to a column name.

  include/mysqld_error.h
    1.61.1.48 06/05/30 00:08:49 igor@rurik.mysql.com +1 -1
    Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
    refers to a column name.

ChangeSet
  1.2149.6.2 06/05/30 10:45:23 gluh@eagle.intranet.mysql.r18.ru +6 -0
  Bug#17204 "second CALL to procedure crashes Server"
  Bug#18282 "INFORMATION_SCHEMA.TABLES provides inconsistent info about invalid views"
  This bug caused crashes or resulted in wrong data being returned
  when one tried to obtain information from I_S tables about views
  using stored functions.
  
  It was caused by the fact that we were using LEX representing
  statement which were doing select from I_S tables as active LEX
  when contents of I_S table were built. So state of this LEX both
  affected and was affected by open_tables() calls which happened
  during this process. This resulted in wrong behavior and in
  violations of some of invariants which caused crashes.
  
  This fix tries to solve this problem by properly saving/resetting
  and restoring part of LEX which affects and is affected by the
  process of opening tables and views in get_all_tables() routine.
  To simplify things we separated this part of LEX in a new class
  and made LEX its descendant.

  sql/sql_table.cc
    1.312 06/05/30 10:45:17 gluh@mysql.com +2 -0
    Now we clean-up LEX after opening table (view) in two stages.
    In the first stage we call LEX::cleanup_after_one_table_open()
    to clean-up selects lists and derived tables state. In the
    second stage which happens after close_thread_tables() is
    invoked we call Query_tables_list::reset_query_tables_list(FALSE)
    to rollback changes in Query_tables_list.

  sql/sql_show.cc
    1.318 06/05/30 10:45:16 gluh@mysql.com +9 -8
    Now in get_all_tables() routine we properly save/reset and
    restore part of LEX (statement table list and information
    about routines used) which affects and is affected by the
    process of opening tables and views.

  sql/sql_lex.h
    1.217 06/05/30 10:45:16 gluh@mysql.com +92 -59
    To simplify saving/resetting and restoring part of LEX which
    affects and is affected by the process of opening tables and
    views we moved it to new class Query_tables_list and made LEX
    descendant of this class. Also introduced two LEX methods 
    which can be used to save and reset or to restore this state.

  sql/sql_lex.cc
    1.183.1.1 06/05/30 10:45:16 gluh@mysql.com +90 -18
    To simplify saving/resetting and restoring part of LEX which
    affects and is affected by the process of opening tables and
    views we moved it to new class Query_tables_list and made LEX
    descendant of this class. Also introduced two LEX methods 
    which can be used to save and reset or to restore this state.

  mysql-test/t/information_schema_db.test
    1.4 06/05/30 10:45:16 gluh@mysql.com +59 -1
    test case

  mysql-test/r/information_schema_db.result
    1.7 06/05/30 10:45:16 gluh@mysql.com +56 -1
    test case

ChangeSet
  1.1616.2612.1 06/05/30 00:36:48 evgen@moonbone.local +3 -0
  Fixed bug#18360: Incorrect type coercion in IN() results in false comparison
  
  The IN() function uses agg_cmp_type() to aggregate all types of its arguments
  to find out some common type for comparisons. In this particular case the 
  char() and the int was aggregated to double because char() can contain values
  like '1.5'. But all strings which do not start from a digit are converted to
  0. thus 'a' and 'z' become equal. 
  This behaviour is reasonable when all function arguments are constants. But 
  when there is a field or an expression this can lead to false comparisons. In
  this case it makes more sense to coerce constants to the type of the field
  argument.
  
  The agg_cmp_type() function now aggregates types of constant and non-constant
  items separately. If some non-constant items will be found then their
  aggregated type will be returned. Thus after the aggregation constants will be
  coerced to the aggregated type. 

  sql/item_cmpfunc.cc
    1.111.23.5 06/05/30 00:35:04 evgen@moonbone.local +35 -2
    Fixed bug#18360: Incorrect type coercion in IN() results in false comparison.
    The agg_cmp_type() function now aggregates types of constant and non-constant
    items separately. If some non-constant items will be found then their
    aggregated type will be returned. Thus after the aggregation constants will
    be coerced to the aggregated type.

  mysql-test/r/func_in.result
    1.12.1.5 06/05/30 00:34:50 evgen@moonbone.local +21 -0
    Added test case for bug#18360: Incorrect type coercion in IN() results in false comparison.

  mysql-test/t/func_in.test
    1.14.1.3 06/05/30 00:34:42 evgen@moonbone.local +12 -0
    Added test case for bug#18360: Incorrect type coercion in IN() results in false comparison.

ChangeSet
  1.1616.2144.133 06/05/29 20:09:22 kent@mysql.com +1 -0
  make_win_src_distribution.sh:
    Convert to DOS EOL if dsp/dsw is in package

  scripts/make_win_src_distribution.sh
    1.27.2.9 06/05/29 20:08:36 kent@mysql.com +1 -0
    Convert to DOS EOL if dsp/dsw is in package

ChangeSet
  1.2125.1.3 06/05/29 16:27:45 msvensson@shellback.(none) +4 -0
  Add missing drop table

  mysql-test/t/ps.test
    1.64 06/05/29 16:27:39 msvensson@shellback.(none) +1 -1
    Add missing drop table

  mysql-test/t/analyze.test
    1.10 06/05/29 16:27:39 msvensson@shellback.(none) +1 -0
    Add missing drop table

  mysql-test/r/ps.result
    1.66 06/05/29 16:27:39 msvensson@shellback.(none) +1 -0
    Add missing drop table

  mysql-test/r/analyze.result
    1.7 06/05/29 16:27:03 msvensson@shellback.(none) +1 -0
    Add missing drop table

ChangeSet
  1.2144.1.3 06/05/29 17:30:30 anozdrin@mysql.com +1 -0
  Fix for BUG#18023: IM: instance can be started several times;
  monitor interval must be > 2sec.

  server-tools/instance-manager/guardian.cc
    1.21 06/05/29 17:30:27 anozdrin@mysql.com +14 -8
    Start instance only if it is really crashed.

ChangeSet
  1.2144.1.2 06/05/29 17:26:52 anozdrin@mysql.com +1 -0
  Fix for BUG#19391: IM fails to start after two executions

  server-tools/instance-manager/manager.cc
    1.33 06/05/29 17:26:50 anozdrin@mysql.com +24 -22
    Start Listener-thread after all initialization.

ChangeSet
  1.2122.30.2 06/05/29 15:26:23 ingo@mysql.com +3 -0
  Bug#19815 - CREATE/RENAME/DROP DATABASE can deadlock on a global read lock
  
  The order of acquiring LOCK_mysql_create_db
  and wait_if_global_read_lock() was wrong. It could happen
  that a thread held LOCK_mysql_create_db while waiting for
  the global read lock to be released. The thread with the
  global read lock could try to administrate a database too.
  It would first try to lock LOCK_mysql_create_db and hang...
  
  The check if the current thread has the global read lock
  is done in wait_if_global_read_lock(), which could not be
  reached because of the hang in LOCK_mysql_create_db.
  
  Now I exchanged the order of acquiring LOCK_mysql_create_db
  and wait_if_global_read_lock(). This makes 
  wait_if_global_read_lock() fail with an error message for
  the thread with the global read lock. No deadlock happens.

  sql/sql_db.cc
    1.128 06/05/29 15:26:18 ingo@mysql.com +46 -14
    Bug#19815 - CREATE/RENAME/DROP DATABASE can deadlock on a global read lock
    Exchanged the order of acquiring LOCK_mysql_create_db
    and wait_if_global_read_lock().

  mysql-test/t/lock_multi.test
    1.13.1.1 06/05/29 15:26:18 ingo@mysql.com +35 -0
    Bug#19815 - CREATE/RENAME/DROP DATABASE can deadlock on a global read lock
    The test case

  mysql-test/r/lock_multi.result
    1.15.1.1 06/05/29 15:26:18 ingo@mysql.com +8 -0
    Bug#19815 - CREATE/RENAME/DROP DATABASE can deadlock on a global read lock
    The test result

ChangeSet
  1.2141.2.3 06/05/29 15:05:31 msvensson@neptunus.(none) +3 -0
  Update after merge to 5.0

  sql/sql_acl.cc
    1.193.2.2 06/05/29 15:05:25 msvensson@neptunus.(none) +5 -1
    Add check if host is NULL
    Add check if grant_name->host.hostname is null

  mysql-test/t/grant.test
    1.39.1.2 06/05/29 15:05:25 msvensson@neptunus.(none) +1 -1
    Add "use test"

  mysql-test/r/grant.result
    1.50.1.2 06/05/29 15:05:25 msvensson@neptunus.(none) +19 -18
    Reorder test result

ChangeSet
  1.2133.4.3 06/05/29 15:01:04 msvensson@shellback.(none) +1 -0
  Add new file md4.cpp to VC++ project file

  extra/yassl/taocrypt/taocrypt.vcproj
    1.2 06/05/29 15:00:59 msvensson@shellback.(none) +24 -0
    Add new file md4.cpp to VC++ project file

ChangeSet
  1.2133.4.2 06/05/29 14:49:51 msvensson@shellback.(none) +6 -0
  Import from yaSSL 

  extra/yassl/taocrypt/src/misc.cpp
    1.13 06/05/29 13:42:21 msvensson@shellback.(none)[msvensson] +13 -0
    Import patch yassl.diff

ChangeSet
  1.2144.1.1 06/05/29 14:45:20 kroki@mysql.com +1 -0
  Avoid race between master and slave.

  mysql-test/t/rpl_insert_id.test
    1.16 06/05/29 14:45:15 kroki@mysql.com +2 -0
    Avoid race between master and slave.

ChangeSet
  1.2149.3.1 06/05/29 12:32:08 ramil@mysql.com +1 -0
  after merge fix.
  

  client/mysqldump.c
    1.226.1.3 06/05/29 12:31:59 ramil@mysql.com +2 -1
    after merge fix.
      - 'lengths' declaration moved to the beginning of the block.

ChangeSet
  1.2149.2.5 06/05/29 09:26:31 msvensson@neptunus.(none) +1 -0
  Update result file after merge

  mysql-test/r/mysqldump.result
    1.93.1.4 06/05/29 09:26:27 msvensson@neptunus.(none) +1 -1
    Update result file after merge

ChangeSet
  1.2149.2.3 06/05/29 11:17:38 ramil@mysql.com +3 -0
  manual merge

  mysql-test/t/mysqldump.test
    1.85.1.2 06/05/29 11:17:29 ramil@mysql.com +13 -2
    manual merge

  mysql-test/r/mysqldump.result
    1.93.1.2 06/05/29 11:17:28 ramil@mysql.com +39 -1
    manual merge

  client/mysqldump.c
    1.226.1.2 06/05/29 11:17:28 ramil@mysql.com +24 -40
    manual merge

ChangeSet
  1.1616.2611.1 06/05/29 00:32:59 evgen@moonbone.local +3 -0
  Fixed bug#19225: unchecked error results in server crash
  
  In multi-table delete a table for delete can't be used for selecting in
  subselects. Appropriate error was raised but wasn't checked which leads to a
  crash at the execution phase.
  
  The mysql_execute_command() now checks for errors before executing select
  for multi-delete.

  sql/sql_parse.cc
    1.271.1.210 06/05/29 00:31:11 evgen@moonbone.local +2 -2
    Fixed bug#19225: unchecked error results in server crash
    The mysql_execute_command() now checks for errors before executing select for multi-delete.

  mysql-test/r/multi_update.result
    1.25.1.19 06/05/29 00:30:55 evgen@moonbone.local +5 -0
    Added test case for bug#19225: unchecked error results in server crash

  mysql-test/t/multi_update.test
    1.26.1.22 06/05/29 00:30:42 evgen@moonbone.local +8 -0
    Added test case for bug#19225: unchecked error results in server crash

ChangeSet
  1.1616.2610.1 06/05/28 22:01:38 evgen@moonbone.local +3 -0
  Fixed bug#15351: Wrong collation used for comparison of md5() and sha()
  argument can lead to a wrong result.
  
  md5() and sha() functions treat their arguments as case sensitive strings.
  But when they are compared their arguments were compared as a case
  insensitive strings which leads to two functions with different arguments
  and thus different results to being identical. This can lead to a wrong
  decision made in the range optimizer and thus lead to a wrong result set.
  
  Item_func_md5::fix_length_and_dec() and Item_func_sha::fix_length_and_dec()
  functions now set binary collation on their arguments.

  mysql-test/t/func_str.test
    1.64.1.18 06/05/28 21:59:00 evgen@moonbone.local +12 -0
    Added test case for the bug#15351: Wrong collation used for comparison of md5() and sha()
    argument can lead to a wrong result.

  mysql-test/r/func_str.result
    1.70.1.30 06/05/28 21:58:49 evgen@moonbone.local +15 -0
     Added test case for the bug#15351: Wrong collation used for comparison of md5() and sha()
    argument can lead to a wrong result.

  sql/item_strfunc.cc
    1.196.8.1 06/05/28 21:56:57 evgen@moonbone.local +18 -2
    Fixed bug#15351: Wrong collation used for comparison of md5() and sha()
    argument can lead to a wrong result.
    Item_func_md5::fix_length_and_dec() and Item_func_sha::fix_length_and_dec()
    functions now set binary collation on their arguments.

ChangeSet
  1.1616.2609.1 06/05/28 19:47:01 aelkin@mysql.com +1 -0
  BUG#14157: utf8 encoding in binlog without set character_set_client
  
  refining the test case to exclude problems with koi8r on some platforms.

  mysql-test/t/mysqlbinlog.test
    1.8.1.13 06/05/28 19:46:57 aelkin@mysql.com +2 -2
    replacing unavailble on some platforms koi8r with latin1 still to preserve the essence of the testcase:
    to generate utf8 names in binlog, despite client charset was different, and
    to digest this binlog.

ChangeSet
  1.1616.2608.1 06/05/27 23:57:33 igor@rurik.mysql.com +33 -0
  Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
  refers to a column name.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/sql_base.cc
    1.145.1.125 06/05/27 23:57:28 igor@rurik.mysql.com +1 -1
    Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
    refers to a column name.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/ukrainian/errmsg.txt
    1.27.22.1 06/05/27 23:57:28 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/swedish/errmsg.txt
    1.64.23.1 06/05/27 23:57:28 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/spanish/errmsg.txt
    1.64.25.1 06/05/27 23:57:28 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/slovak/errmsg.txt
    1.64.23.1 06/05/27 23:57:28 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/serbian/errmsg.txt
    1.18.19.1 06/05/27 23:57:27 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/russian/errmsg.txt
    1.61.22.1 06/05/27 23:57:27 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/romanian/errmsg.txt
    1.62.24.1 06/05/27 23:57:27 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/portuguese/errmsg.txt
    1.64.24.1 06/05/27 23:57:27 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/polish/errmsg.txt
    1.63.22.1 06/05/27 23:57:27 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/norwegian/errmsg.txt
    1.63.23.1 06/05/27 23:57:27 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/norwegian-ny/errmsg.txt
    1.63.23.1 06/05/27 23:57:27 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/korean/errmsg.txt
    1.63.22.1 06/05/27 23:57:27 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/japanese/errmsg.txt
    1.63.22.1 06/05/27 23:57:27 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/japanese-sjis/errmsg.txt
    1.1.3.1 06/05/27 23:57:27 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/italian/errmsg.txt
    1.70.23.1 06/05/27 23:57:27 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/hungarian/errmsg.txt
    1.65.22.1 06/05/27 23:57:27 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/greek/errmsg.txt
    1.64.22.1 06/05/27 23:57:27 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/german/errmsg.txt
    1.64.23.1 06/05/27 23:57:27 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/french/errmsg.txt
    1.63.23.1 06/05/27 23:57:27 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/estonian/errmsg.txt
    1.64.22.1 06/05/27 23:57:27 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/english/errmsg.txt
    1.70.32.1 06/05/27 23:57:27 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/dutch/errmsg.txt
    1.66.23.1 06/05/27 23:57:27 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/danish/errmsg.txt
    1.62.23.1 06/05/27 23:57:27 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/czech/errmsg.txt
    1.64.23.1 06/05/27 23:57:27 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  mysql-test/t/select.test
    1.28.4.10 06/05/27 23:57:27 igor@rurik.mysql.com +17 -2
    Added a test case for bug #17873.

  mysql-test/t/explain.test
    1.8.1.1 06/05/27 23:57:27 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  mysql-test/r/select.result
    1.34.3.35 06/05/27 23:57:27 igor@rurik.mysql.com +12 -2
    Added a test case for bug #17873.

  mysql-test/r/preload.result
    1.7.1.1 06/05/27 23:57:26 igor@rurik.mysql.com +1 -1
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  mysql-test/r/key_cache.result
    1.13.1.3 06/05/27 23:57:26 igor@rurik.mysql.com +1 -1
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  mysql-test/r/explain.result
    1.15.1.1 06/05/27 23:57:26 igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  include/sql_state.h
    1.8.1.5 06/05/27 23:57:26 igor@rurik.mysql.com +1 -0
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  include/mysqld_error.h
    1.61.1.47 06/05/27 23:57:26 igor@rurik.mysql.com +1 -0
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

ChangeSet
  1.2133.8.1 06/05/26 11:49:39 gkodinov@mysql.com +4 -0
  Bug #14875: Bad view DEFINER makes SHOW CREATE VIEW fail
  
  When reading a view definition from a .frm file it was
  throwing a SQL error if the DEFINER user is not defined.
  Changed it to a warning to match the (documented) case
  when a view with undefined DEFINER user is created.

  sql/table.cc
    1.218.1.1 06/05/26 11:49:34 gkodinov@mysql.com +12 -2
    Turned the error of undefined DEFINER user in reading 
    a view definition to a warning. 

  sql/sql_acl.cc
    1.194 06/05/26 11:49:34 gkodinov@mysql.com +2 -0
    Initialized the members to no privileges so even if
    the subsequent checks fail it will still initialize
    the security context.

  mysql-test/t/view_grant.test
    1.11.1.1 06/05/26 11:49:34 gkodinov@mysql.com +14 -0
    test case for the bug

  mysql-test/r/view_grant.result
    1.13.1.1 06/05/26 11:49:34 gkodinov@mysql.com +15 -0
    test case for the bug

ChangeSet
  1.2122.37.1 06/05/26 11:47:53 gkodinov@mysql.com +14 -0
  BUG#18681: View privileges are broken
  
  The check for view security was lacking several points :
  1. Check with the right set of permissions : for each table ref that
  participates in a view there were the right credentials to use in it's
  security_ctx member, but these weren't used for checking the credentials.
  This makes hard enforcing the SQL SECURITY DEFINER|INVOKER property
  consistently.
  2. Because of the above the security checking for views was just ruled out
  in explicit ways in several places.
  3. The security was checked only for the columns of the tables that are
  brought into the query from a view. So if there is no column reference
  outside of the view definition it was not detecting the lack of access to
  the tables in the view in SQL SECURITY INVOKER mode.
  
  The fix below tries to fix the above 3 points.

  sql/table.cc
    1.219 06/05/26 11:47:47 gkodinov@mysql.com +2 -1
    Mask table access to the view error as well.

  sql/sql_update.cc
    1.188 06/05/26 11:47:47 gkodinov@mysql.com +10 -7
    wrapper called

  sql/sql_select.cc
    1.416.1.1 06/05/26 11:47:47 gkodinov@mysql.com +4 -3
    wrapper called

  sql/sql_parse.cc
    1.546 06/05/26 11:47:46 gkodinov@mysql.com +31 -8
    wrapper called and artificial check stop removed

  sql/sql_load.cc
    1.95 06/05/26 11:47:46 gkodinov@mysql.com +5 -4
    wrapper called

  sql/sql_insert.cc
    1.188.1.1 06/05/26 11:47:46 gkodinov@mysql.com +5 -4
    wrapper called

  sql/sql_delete.cc
    1.174 06/05/26 11:47:46 gkodinov@mysql.com +10 -8
    wrapper called.

  sql/sql_base.cc
    1.336.1.1 06/05/26 11:47:46 gkodinov@mysql.com +52 -0
    a wrapper for setup_tables to check access to the tables

  sql/sql_acl.cc
    1.192.1.1 06/05/26 11:47:46 gkodinov@mysql.com +10 -5
    removed artificial security check stop and used the table ref's credentials.

  sql/mysql_priv.h
    1.389.1.1 06/05/26 11:47:46 gkodinov@mysql.com +7 -0
    A wrapper for setup_tables that also checks access to the tables

  mysql-test/t/view_grant.test
    1.12 06/05/26 11:47:46 gkodinov@mysql.com +81 -0
    Somewhat extended test case for the bug and similar queries.

  mysql-test/t/grant.test
    1.40 06/05/26 11:47:46 gkodinov@mysql.com +13 -2
    removed nondeterminism (unspecified order) in some test output

  mysql-test/r/view_grant.result
    1.14 06/05/26 11:47:46 gkodinov@mysql.com +70 -0
    Somewhat extended test case for the bug and similar queries.

  mysql-test/r/grant.result
    1.51 06/05/26 11:47:46 gkodinov@mysql.com +24 -10
    removed nondeterminism (unspecified order) in some test output

ChangeSet
  1.2122.31.6 06/05/26 11:00:35 grog@mysql.com +2 -0
  mysqldump.result:
    Get output from modified test (dropping t1).
  mysqldump.test:
    Drop t1 at end so that the next test doesn't trip over it.

  mysql-test/r/mysqldump.result
    1.95 06/05/26 10:35:53 grog@mysql.com +1 -0
    Get output from modified test (dropping t1).

  mysql-test/t/mysqldump.test
    1.87 06/05/26 10:35:28 grog@mysql.com +1 -0
    Drop t1 at end so that the next test doesn't trip over it.

ChangeSet
  1.1616.2607.1 06/05/26 01:24:14 evgen@moonbone.local +3 -0
  Fixed bug#16716: subselect in concat() may lead to a wrong result.
  
  The Item_func_concat::val_str() function tries to make as less re-allocations
  as possible. This results in appending strings returned by 2nd and next
  arguments to the string returned by 1st argument if the buffer for the first
  argument has enough free space. A constant subselect is evaluated only once 
  and its result is stored in an Item_cache_str. In the case when the first
  argument of the concat() function is such a subselect Item_cache_str returns
  the stored value and Item_func_concat::val_str() append values of other
  arguments to it. But for the next row the value in the Item_cache_str isn't
  restored because the subselect is a constant one and it isn't evaluated second
  time. This results in appending string values of 2nd and next arguments to the 
  result of the previous Item_func_concat::val_str() call.
  
  The Item_func_concat::val_str() function now checks whether the first argument 
  is a constant one and if so it doesn't append values of 2nd and next arguments
  to the string value returned by it.

  sql/item_strfunc.cc
    1.196.6.9 06/05/26 01:23:02 evgen@moonbone.local +4 -1
    Fixed bug#16716: subselect in concat() may lead to a wrong result.
    The Item_func_concat::val_str() function now checks whether the first argument 
    is a constant one and if so it doesn't append values of 2nd and next arguments
    to the string value returned by it.

  mysql-test/r/func_concat.result
    1.7.1.1 06/05/26 01:22:52 evgen@moonbone.local +7 -0
    Added test case for bug#16716: subselect in concat() may lead to a wrong result.

  mysql-test/t/func_concat.test
    1.6.1.3 06/05/26 01:22:03 evgen@moonbone.local +7 -0
    Added test case for bug#16716: subselect in concat() may lead to a wrong result.

ChangeSet
  1.2150 06/05/25 21:27:56 pekka@mysql.com +1 -0
  ndb - minor fix to unhandled error, already in 5.1  [ auto-incr ]

  sql/ha_ndbcluster.cc
    1.247.1.3 06/05/25 21:27:10 pekka@mysql.com +2 -1
    minor fix to unhandled error, already in 5.1

ChangeSet
  1.1616.2602.6 06/05/25 11:36:29 acurtis@xiphis.org +3 -0
  updated libtool/autoconf files

  ltmain.sh
    1.15.1.1 06/05/25 11:36:25 acurtis@xiphis.org +1372 -698
    updated libtool/autoconf files

  config.sub
    1.11.1.1 06/05/25 11:36:25 acurtis@xiphis.org +177 -51
    updated libtool/autoconf files

  config.guess
    1.10.1.1 06/05/25 11:36:25 acurtis@xiphis.org +386 -307
    updated libtool/autoconf files

ChangeSet
  1.2149 06/05/25 18:00:55 pekka@mysql.com +1 -0
  ndb - compile fix for Solaris 10 AMD64 -max GCC [ ulonglong != Uint64 ]

  sql/ha_ndbcluster.cc
    1.247.1.2 06/05/25 17:59:48 pekka@mysql.com +3 -1
    compile fix for Solaris 10 AMD64 -max GCC

ChangeSet
  1.2122.31.5 06/05/25 17:30:28 grog@mysql.com +3 -0
  BUG#17201: Improve handling of views.

  mysql-test/t/mysqldump.test
    1.86 06/05/25 17:30:23 grog@mysql.com +15 -0
    Add a new test (BUG#17201)

  mysql-test/r/mysqldump.result
    1.94 06/05/25 17:30:23 grog@mysql.com +85 -13
    We no longer have spurious text in the results.
    Add results for the final test (BUG#17201)

  client/mysqldump.c
    1.229 06/05/25 17:30:23 grog@mysql.com +29 -13
     Better view handling:
    
      Distinguish better between tables and views in the output.
      
      Add many comments about the distinctions between tables and views, and
      the tradeoffs that we make, notably that, since we don't maintain
      dependencies.
      
      get_table_structure: Clarify in the output that a view is first
      		       created as a workaround for the lack of
      		       dependencies.
      
      dump_table:  Return if we're trying to dump a view.
      
      dump_all_views_in_db: Don't call init_dumping.  It's already been done
                            in dump_all_tables_in_db.  This is the problem
                            reported in BUG#17201.
      
      Change the variable was_views to seen_views, and clarify the comment.
      The previous name was not overly "intuitive".

ChangeSet
  1.2138.2.1 06/05/25 10:39:18 gkodinov@mysql.com +4 -0
  Bug #19700: subselect returning BIGINT always returned it as SIGNED
    
  The unsigned flag in Item was not propagated through the single value subqueries.
  This caused the result to be treated as signed.

  sql/item_subselect.cc
    1.126 06/05/25 10:39:13 gkodinov@mysql.com +1 -0
    Preserved the unsigned flag in Item_subselect

  sql/item.h
    1.197.1.1 06/05/25 10:39:13 gkodinov@mysql.com +1 -0
    Preserved the unsigned flag in Item_subselect

  mysql-test/t/subselect.test
    1.119 06/05/25 10:39:13 gkodinov@mysql.com +22 -0
    Added testcases for bug #19700

  mysql-test/r/subselect.result
    1.144 06/05/25 10:39:13 gkodinov@mysql.com +21 -0
    Added testcases for bug #19700

  client/mysqldump.c
    1.228 06/05/25 16:53:04 grog@mysql.com +396 -396
    Remove tabs.

  client/mysqldump.c
    1.227 06/05/25 16:52:41 grog@mysql.com +32 -32
    Remove trailing white space.

ChangeSet
  1.2138.1.2 06/05/24 17:21:35 monty@mysql.com +8 -0
  More DBUG statements
  Replaced COND_refresh with COND_global_read_lock becasue of a bug in NTPL threads when using different mutexes as arguments to pthread_cond_wait()
  The original code caused a hang in FLUSH TABLES WITH READ LOCK in some circumstances because pthread_cond_broadcast() was not delivered to other threads.
  This fixes:
  Bug#16986: Deadlock condition with MyISAM tables
  Bug#20048: FLUSH TABLES WITH READ LOCK causes a deadlock

  sql/sql_base.cc
    1.337 06/05/24 17:21:32 monty@mysql.com +17 -1
    More DBUG statements
    Added a broadcast in remove_table_from_cache() to release any threads waiting in open

  sql/mysqld.cc
    1.549.1.1 06/05/24 17:21:32 monty@mysql.com +4 -4
    Added COND_global_read_lock

  sql/mysql_priv.h
    1.392 06/05/24 17:21:32 monty@mysql.com +1 -0
    Added COND_global_read_lock

  sql/lock.cc
    1.88 06/05/24 17:21:32 monty@mysql.com +25 -9
    Replaced COND_refresh with COND_global_read_lock becasue of a bug in NTPL threads when using different mutexes as arguments to pthread_cond_wait()
    The original code caused a hang in FLUSH TABLES WITH READ LOCK in some circumstances because pthread_cond_broadcast() was not delivered to other threads

  mysql-test/t/lock_multi.test
    1.14 06/05/24 17:21:32 monty@mysql.com +32 -0
    Test for bug in LOCK TABLE + optimize table

  mysql-test/t/flush.test
    1.20 06/05/24 17:21:32 monty@mysql.com +40 -0
    Added test case for deadlock with FLUSH TABLES WITH READ LOCK

  mysql-test/r/lock_multi.result
    1.16 06/05/24 17:21:32 monty@mysql.com +16 -0
    Test for bug in LOCK TABLE + optimize table

  mysql-test/r/flush.result
    1.14 06/05/24 17:21:32 monty@mysql.com +7 -0
    Added test case for deadlock with FLUSH TABLES WITH READ LOCK

ChangeSet
  1.2122.36.1 06/05/24 09:34:36 iggy@mysql.com +1 -0
  BUG#18669: Session COM_STATISTICS breaks mysqladmin status.
  
  Changed COM_STATISTICS to display the global status, instead of thead status, for slow queries and table opens.

  sql/sql_parse.cc
    1.542.1.2 06/05/24 09:34:32 iggy@mysql.com +6 -2
    Calculate and display the global statistics.

ChangeSet
  1.1616.2605.3 06/05/24 12:30:34 kent@mysql.com +1 -0
  configure.in:
    Update NDB version as well

  configure.in
    1.201.64.6 06/05/24 12:30:20 kent@mysql.com +1 -1
    Update NDB version as well

ChangeSet
  1.2143 06/05/24 12:28:34 kent@mysql.com +1 -0
  configure.in:
    Stepped up to 5.0.23

  configure.in
    1.390 06/05/24 12:28:04 kent@mysql.com +2 -2
    Stepped up to 5.0.23

ChangeSet
  1.1616.2605.2 06/05/24 12:20:17 kent@mysql.com +1 -0
  configure.in:
    Stepped up to 4.1.22

  configure.in
    1.201.64.5 06/05/24 12:20:08 kent@mysql.com +1 -1
    Stepped up to 4.1.22

ChangeSet
  1.2133.3.2 06/05/24 10:58:12 mskold@mysql.com +3 -0
  Bug #16997 Table rename that changes database does not rename indexes: merge

  ndb/src/ndbapi/NdbDictionaryImpl.hpp
    1.36 06/05/24 10:57:27 mskold@mysql.com +2 -1
    Bug #16997 Table rename that changes database does not rename indexes: merge

  ndb/src/ndbapi/NdbDictionary.cpp
    1.37 06/05/24 10:57:27 mskold@mysql.com +1 -1
    Bug #16997 Table rename that changes database does not rename indexes: merge

  ndb/include/ndbapi/NdbDictionary.hpp
    1.54 06/05/24 10:57:27 mskold@mysql.com +15 -14
    Bug #16997 Table rename that changes database does not rename indexes: merge

ChangeSet
  1.2138.1.1 06/05/24 11:56:59 monty@mysql.com +7 -0
  Remove dflt_field from field structure as this was only needed when createing temporary table and I found another soultion that doesn't increase the size of the field structure for all table instances. (Better fix for bug #19089)
  Fixed compiler warnings
  Fixed valgrind warning in Item_date_add_intervall::eq. (Recoding of bugfix #19490)

  sql/sql_select.cc
    1.420 06/05/24 11:56:55 monty@mysql.com +32 -22
    New default_field parameter to create_tmp_field()
    Use this in create_tmp_table() to set right default value for a field

  sql/sql_insert.cc
    1.189 06/05/24 11:56:55 monty@mysql.com +5 -4
    New default_field parameter to create_tmp_field()

  sql/mysql_priv.h
    1.391 06/05/24 11:56:55 monty@mysql.com +1 -0
    Added default fields to create_tmp_field

  sql/item_timefunc.cc
    1.111 06/05/24 11:56:55 monty@mysql.com +4 -32
    Fixed Item_date_add_intervall::eq
    The problem was that when we call 'eq' 'this' is not fixed, which means we can't call const_item() or a value function.
    I fixed this so that we check eq for all arguments and that the sign and type are identical.
    (The original code gave a 'accessing uninitialized data' in valgrind.

  sql/item.h
    1.198 06/05/24 11:56:55 monty@mysql.com +2 -0
    Removed compiler warnings

  sql/field.h
    1.180 06/05/24 11:56:55 monty@mysql.com +0 -6
    remove dflt_field from field structure (not needed)

  sql/field.cc
    1.307 06/05/24 11:56:55 monty@mysql.com +7 -8
    remove dflt_field from field structure (not needed)
    Simple cleanup of code that been copied elsewhere

ChangeSet
  1.2139.2.2 06/05/23 20:16:57 msvensson@neptunus.(none) +1 -0
  Bug#19938 Valgrind error (race) in handle_slave_sql()

  sql/slave.cc
    1.269 06/05/23 20:16:52 msvensson@neptunus.(none) +2 -0
    Read the value of rli->events_till_abort only in debug compile

ChangeSet
  1.1616.2603.1 06/05/23 19:36:06 serg@serg.mylan +4 -0
  don't let bugfix for bug#8303 break the bugfix for bug#8378
  revert the fix for bug#8303
  correct the test for bug#8378

  tests/mysql_client_test.c
    1.51.29.1 06/05/23 19:35:57 serg@serg.mylan +14 -7
    correct the test for bug#8378

  sql/sql_lex.cc
    1.97.22.1 06/05/23 19:35:57 serg@serg.mylan +5 -25
    revert the fix for bug#8303

  mysql-test/t/ctype_sjis.test
    1.10 06/05/23 19:35:57 serg@serg.mylan +1 -1
    updated

  mysql-test/r/ctype_sjis.result
    1.9 06/05/23 19:35:56 serg@serg.mylan +2 -2
    updated

ChangeSet
  1.2084.132.1 06/05/23 10:29:58 cmiller@zippy.(none) +1 -0
  Guilhelm suggested that the "load data infile" command should be flagged as
  not transaction-safe for stored procedures.  Related to Bug#11151.

  sql/sp_head.cc
    1.205.1.1 06/05/23 10:29:54 cmiller@zippy.(none) +1 -0
    Guilhelm suggested that the "load data infile" command should be flagged as
    not transaction-safe for stored procedures.

ChangeSet
  1.2133.7.6 06/05/23 16:20:03 msvensson@neptunus.(none) +1 -0
  Bug #19938  	Valgrind error (race) in handle_slave_sql()

  sql/slave.cc
    1.268 06/05/23 16:19:59 msvensson@neptunus.(none) +8 -1
    Read rli->events_till_abort to a temporary variable before unlocking the mutex

ChangeSet
  1.2133.7.5 06/05/23 16:14:48 msvensson@neptunus.(none) +1 -0
  Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060523082057|49143

  sql/slave.cc
    1.267 06/05/23 16:14:44 msvensson@neptunus.(none) +0 -0
    Exclude

ChangeSet
  1.2133.7.4 06/05/23 15:45:16 msvensson@neptunus.(none) +1 -0
  Make wait_timeout test not timing dependent

  mysql-test/t/wait_timeout.test
    1.5 06/05/23 15:45:12 msvensson@neptunus.(none) +64 -4
    Remove sleeps from wait_timeout in order to make it timing independent.
    Instead get the status variable "aborted_clients" in a seconds connection.

ChangeSet
  1.2139.1.1 06/05/23 16:43:01 gkodinov@mysql.com +4 -0
  Bug #18742: Test 'group_min_max' fails if "classic" configuration in 5.0
  
  Moved the InnoDB related tests to innodb_mysql

  mysql-test/t/innodb_mysql.test
    1.5 06/05/23 16:42:56 gkodinov@mysql.com +94 -0
    Moved innodb related tests out of group_min_max

  mysql-test/t/group_min_max.test
    1.22 06/05/23 16:42:56 gkodinov@mysql.com +1 -53
    Moved innodb related tests out of group_min_max

  mysql-test/r/innodb_mysql.result
    1.5 06/05/23 16:42:56 gkodinov@mysql.com +76 -0
    Moved innodb related tests out of group_min_max

  mysql-test/r/group_min_max.result
    1.24 06/05/23 16:42:56 gkodinov@mysql.com +1 -40
    Moved innodb related tests out of group_min_max

ChangeSet
  1.1981.69.1 06/05/23 11:35:14 msvensson@neptunus.(none) +4 -0
  Bug#16297 In memory grant tables not flushed when users's hostname is ""
   - In function 'handle_grant_struct' when searching the memory structures for an 
     entry to modify, convert all entries here host.hostname is NULL to "" and compare that 
     with the host passed in argument "user_from".
   - A user created with hostname "" is stored in "mysql.user" table as host="" but when loaded into 
     memory it'll be stored as host.hostname NULL. Specifiying "" as hostname means
     that "any host" can connect. Thus is's correct to turn on allow_all_hosts
     when such a user is found. 
   - Review and fix other places where host.hostname may be NULL.

  sql/sql_acl.cc
    1.184.5.1 06/05/23 11:35:09 msvensson@neptunus.(none) +58 -54
    Convert places where host.hostname is NULL to "" before using it.

  mysql-test/t/grant.test
    1.38.1.1 06/05/23 11:35:09 msvensson@neptunus.(none) +143 -1
    Add test cases for users with hostname ""
     - Test create, grant and drop as well as connecting as the user with hostname "".

  mysql-test/r/grant.result
    1.48.1.1 06/05/23 11:35:09 msvensson@neptunus.(none) +211 -1
    Add test cases for users with hostname ""

ChangeSet
  1.2133.7.3 06/05/23 10:52:53 msvensson@neptunus.(none) +2 -0
  Move the requirement for "not running as root" to information_schema_chmod

  mysql-test/t/information_schema_chmod.test
    1.2 06/05/23 10:52:46 msvensson@neptunus.(none) +3 -0
    Move the requirement for "not running as root" to information_schema_chmod

  mysql-test/t/information_schema.test
    1.78.1.1 06/05/23 10:52:46 msvensson@neptunus.(none) +0 -3
    Move the requirement for "not running as root" to information_schema_chmod

ChangeSet
  1.1616.2596.2 06/05/23 10:33:53 msvensson@neptunus.(none) +1 -0
  Add comment for 'kill_server' function

  sql/mysqld.cc
    1.356.98.25 06/05/23 10:33:50 msvensson@neptunus.(none) +14 -1
    Add comment for 'kill_server' function

ChangeSet
  1.2138 06/05/23 13:27:45 gluh@eagle.intranet.mysql.r18.ru +4 -0
  Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode
  transfer NO_DEFAULT_VALUE_FLAG flag to new field

  sql/sql_select.cc
    1.419 06/05/23 13:27:39 gluh@mysql.com +1 -0
    Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode
    transfer NO_DEFAULT_VALUE_FLAG flag to new field

  mysql-test/t/strict.test
    1.20 06/05/23 13:27:39 gluh@mysql.com +10 -0
    Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode
    test case

  mysql-test/r/type_ranges.result
    1.39 06/05/23 13:27:39 gluh@mysql.com +2 -2
    Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode
    result fix

  mysql-test/r/strict.result
    1.26 06/05/23 13:27:39 gluh@mysql.com +10 -0
    Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode
    test case

ChangeSet
  1.2137 06/05/23 12:45:25 gluh@eagle.intranet.mysql.r18.ru +3 -0
  Bug#16681 information_schema shows forbidden VIEW details
  show view definition to users that have the needed privilleges

  sql/sql_show.cc
    1.317 06/05/23 12:45:19 gluh@mysql.com +25 -3
    Bug#16681 information_schema shows forbidden VIEW details
    show view definition to users that have the needed privilleges

  mysql-test/t/information_schema.test
    1.79 06/05/23 12:45:19 gluh@mysql.com +19 -0
    Bug#16681 information_schema shows forbidden VIEW details
    test case

  mysql-test/r/information_schema.result
    1.105 06/05/23 12:45:19 gluh@mysql.com +13 -0
    Bug#16681 information_schema shows forbidden VIEW details
    test case

ChangeSet
  1.2084.61.6 06/05/23 16:24:26 stewart@mysql.com +7 -0
  BUG#18966 Change in stop/shutdown behaviour
  
  Improvements that were discussed with Tomas.
  
  Maintain protocol backwards/forwards compatibilty for client and server and support
  the commands from ndb_mgm 'as expected'

  ndb/src/mgmsrv/Services.hpp
    1.18 06/05/23 16:24:19 stewart@mysql.com +9 -3
    Add prototypes for restart, stop and stopall v1 and v2

  ndb/src/mgmsrv/Services.cpp
    1.63 06/05/23 16:24:19 stewart@mysql.com +70 -11
    Add restart node v2, stop v2, stop all v2 while maintaining protocol backwards
    compatibility.
    
    Unfortunately we can't add result lines due to protocol errors in clients :(
    Neither can we add extra things to the 'result: Ok' line due to the use of
    strcmp instead of strncmp.

  ndb/src/mgmsrv/MgmtSrvr.hpp
    1.43 06/05/23 16:24:19 stewart@mysql.com +2 -0
    add prototype for shutdownMGM

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.98 06/05/23 16:24:19 stewart@mysql.com +21 -0
    Add nice call for shutting down MGM servers (like shutdownDB)

  ndb/src/mgmclient/CommandInterpreter.cpp
    1.60 06/05/23 16:24:19 stewart@mysql.com +19 -56
    Simplify stop and restart code.
    
    Use the new ndb_mgm_(stop|restart)3 calls to find out if we need to disconnect.

  ndb/src/mgmapi/mgmapi.cpp
    1.58.3.1 06/05/23 16:24:19 stewart@mysql.com +174 -22
    Add cache of mgmd version to ndb_mgm_handle. Only filled out in functions that
    need to know the version of the mgmd we're talking to.
    Initialize these members in create handle.
    added ndb_mgm_get_version which asks the mgm server what version it is. This call
    has been supported since the dawn of time, no compatibility issues here.
    
    Add implementation of ndb_mgm_stop3
    Check what version of the protocol the server speaks, and speak it.
    Add compatibility for ndb_mgm_stop2
    
    Same for ndb_mgm_restart3.

  ndb/include/mgmapi/mgmapi.h
    1.47.1.1 06/05/23 16:24:18 stewart@mysql.com +57 -0
    Add ndb_mgm_stop3 mgmapi function.
     - This supports stopping all DB nodes, or all DB and MGM nodes.
     - It also returns to mgmapi program if it needs to disconnect to apply changes.
    
    Add ndb_mgm_restart3 mgmapi function.
     - Tells mgmapi program if it needs to disconnect to apply changes
    
    Add (internal) ndb_mgm_get_version
     - designed to be used to find out what protocol version we need to speak to the server.

ChangeSet
  1.2133.6.1 06/05/23 14:51:04 stewart@mysql.com +1 -0
  BUG#19932 mgmapi crash if disconnect in ndb_mgm_get_status
  
  correctly detect and report errors in talking to mgm server and memory allocation

  ndb/src/mgmapi/mgmapi.cpp
    1.58.2.1 06/05/23 14:50:59 stewart@mysql.com +24 -3
    correctly detect and return errors in ndb_mgm_get_status

ChangeSet
  1.2133.2.2 06/05/23 14:45:56 stewart@mysql.com +1 -0
  BUG#20016 error in mgm protocol parser error message incorrect
  
  fix display of mgm protocol parser error in mgmapi

  ndb/src/mgmapi/mgmapi.cpp
    1.58.1.3 06/05/23 14:45:51 stewart@mysql.com +3 -2
    fix display of mgm protocol parser error.

ChangeSet
  1.1616.2144.130 06/05/23 00:50:39 kent@mysql.com +1 -0
  make_sharedlib_distribution.sh:
    Solaris sh don't like {..} in file matching

  scripts/make_sharedlib_distribution.sh
    1.3 06/05/23 00:49:20 kent@mysql.com +4 -2
    Solaris sh don't like {..} in file matching

  extra/yassl/taocrypt/src/integer.cpp
    1.23 06/05/22 20:04:53 msvensson@shellback.(none)[msvensson] +4 -1
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp
    1.18 06/05/22 20:04:52 msvensson@shellback.(none)[msvensson] +8 -3
    Import patch yassl.diff

  extra/yassl/src/yassl_error.cpp
    1.6 06/05/22 20:12:03 msvensson@shellback.(none)[msvensson] +3 -0
    Import patch yassl.diff

  extra/yassl/mySTL/stdexcept.hpp
    1.5 06/03/29 01:56:39 msvensson@shellback.(none)[msvensson] +0 -2
    Import patch yassl.diff

  extra/yassl/include/yassl_error.hpp
    1.4 06/05/22 20:12:03 msvensson@shellback.(none)[msvensson] +2 -2
    Import patch yassl.diff

ChangeSet
  1.2130.3.3 06/05/22 17:15:49 knielsen@mysql.com +1 -0
  Fix BUILD/compile-pentium-gcov

  BUILD/compile-pentium-gcov
    1.14 06/05/22 17:15:45 knielsen@mysql.com +13 -2
    Add -max options for gcov, fix yassl and BDB builds, disable ccache which
    is incompatible with gcc profiling output.

ChangeSet
  1.2135 06/05/22 07:57:46 igor@rurik.mysql.com +4 -0
  Post-review fixes for bug #19089

  sql/sql_select.cc
    1.418 06/05/22 07:57:40 igor@rurik.mysql.com +3 -0
    Post-review fixes.

  sql/field.h
    1.179 06/05/22 07:57:40 igor@rurik.mysql.com +5 -0
    Post-review fixes.

  sql/field.cc
    1.306 06/05/22 07:57:40 igor@rurik.mysql.com +1 -2
    Post-review fixes.

  mysql-test/r/view.result
    1.160 06/05/22 07:57:40 igor@rurik.mysql.com +1 -1
    Post-review fixes.

ChangeSet
  1.2125.2.1 06/05/22 16:27:37 tomas@poseidon.ndb.mysql.com +1 -0
  ndb: corrected option handeling to give correct help in ndbd

  ndb/src/kernel/vm/Configuration.cpp
    1.47 06/05/22 16:27:22 tomas@poseidon.ndb.mysql.com +5 -3
    ndb: corrected option handeling to give correct help in ndbd

ChangeSet
  1.2133.4.1 06/05/22 15:49:57 msvensson@shellback.(none) +20 -0
  Import from yaSSL
  Fixes for HPUX etc. 
  Don't define exceptions operator new on hpux as the linker will look for the function

  extra/yassl/taocrypt/src/Makefile.am
    1.13 06/05/22 15:49:49 msvensson@shellback.(none) +1 -1
    Add md4.cpp to Makefile.am

  extra/yassl/mySTL/stdexcept.hpp
    1.4 06/05/22 15:49:49 msvensson@shellback.(none) +2 -0
    Don't define exceptions operator new on hpux as the linker will look for the function

  extra/yassl/testsuite/test.hpp
    1.5 06/05/22 12:03:23 msvensson@shellback.(none)[msvensson] +7 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/test/test.cpp
    1.3 06/05/16 00:17:55 msvensson@shellback.(none)[msvensson] +53 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/taocrypt.dsp
    1.4 06/05/16 00:17:55 msvensson@shellback.(none)[msvensson] +8 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/template_instnt.cpp
    1.10 06/04/26 18:28:18 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/src/md4.cpp
    1.1 06/05/16 00:17:55 msvensson@shellback.(none)[msvensson] +154 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/runtime.hpp
    1.14 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +0 -4
    Import patch yassl.diff

  extra/yassl/taocrypt/src/md4.cpp
    1.0 06/05/16 00:17:55 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/yassl_import/my50-yassl_import/extra/yassl/taocrypt/src/md4.cpp

  extra/yassl/taocrypt/include/md4.hpp
    1.1 06/05/16 00:17:55 msvensson@shellback.(none)[msvensson] +65 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/block.hpp
    1.7 06/05/22 11:10:25 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp
    1.17 06/05/22 11:12:59 msvensson@shellback.(none)[msvensson] +10 -10
    Import patch yassl.diff

  extra/yassl/src/yassl_error.cpp
    1.5 06/05/15 01:40:59 msvensson@shellback.(none)[msvensson] +6 -0
    Import patch yassl.diff

  extra/yassl/src/timer.cpp
    1.7 06/05/22 14:49:55 msvensson@shellback.(none)[msvensson] +7 -5
    Import patch yassl.diff

  extra/yassl/src/template_instnt.cpp
    1.9 06/04/28 01:10:59 msvensson@shellback.(none)[msvensson] +1 -0
    Import patch yassl.diff

  extra/yassl/src/ssl.cpp
    1.15 06/05/16 00:17:55 msvensson@shellback.(none)[msvensson] +11 -1
    Import patch yassl.diff

  extra/yassl/src/socket_wrapper.cpp
    1.10 06/05/15 01:40:59 msvensson@shellback.(none)[msvensson] +14 -4
    Import patch yassl.diff

  extra/yassl/src/handshake.cpp
    1.9 06/05/16 00:17:55 msvensson@shellback.(none)[msvensson] +13 -2
    Import patch yassl.diff

  extra/yassl/include/socket_wrapper.hpp
    1.6 06/05/15 01:40:59 msvensson@shellback.(none)[msvensson] +4 -2
    Import patch yassl.diff

  extra/yassl/include/openssl/ssl.h
    1.11 06/05/16 00:17:55 msvensson@shellback.(none)[msvensson] +2 -1
    Import patch yassl.diff

  extra/yassl/examples/echoserver/echoserver.cpp
    1.3 06/05/22 11:59:03 msvensson@shellback.(none)[msvensson] +2 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/include/md4.hpp
    1.0 06/05/16 00:17:55 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/yassl_import/my50-yassl_import/extra/yassl/taocrypt/include/md4.hpp

ChangeSet
  1.2133.1.3 06/05/22 16:10:53 gkodinov@mysql.com +4 -0
  Bug#18745: Test case 'func_group' fails if "classic" 5.0 configuration
  
  Moved the InnoDB related test from func_group.test to innodb_mysql.test

  mysql-test/t/innodb_mysql.test
    1.4 06/05/22 16:10:48 gkodinov@mysql.com +72 -0
    Moved a test to innodb_mysql

  mysql-test/t/func_group.test
    1.46 06/05/22 16:10:48 gkodinov@mysql.com +0 -71
    Moved a test to innodb_mysql

  mysql-test/r/innodb_mysql.result
    1.4 06/05/22 16:10:48 gkodinov@mysql.com +138 -0
    moved a test to innodb_mysql

  mysql-test/r/func_group.result
    1.48 06/05/22 16:10:48 gkodinov@mysql.com +0 -138
    Moved a test to innodb_mysql

ChangeSet
  1.2122.31.4 06/05/22 12:18:18 grog@mysql.com +2 -0
  rpl_auto_increment_11932.test, rpl_auto_increment_11932.result:
    Drop test1 table in master as well.

  mysql-test/t/rpl_auto_increment_11932.test
    1.3 06/05/22 12:17:51 grog@mysql.com +2 -0
    Drop test1 table in master as well.

  mysql-test/r/rpl_auto_increment_11932.result
    1.3 06/05/22 12:17:36 grog@mysql.com +1 -0
    Drop test1 table in master as well.

ChangeSet
  1.2092.14.2 06/05/22 10:08:13 grog@mysql.com +2 -0
  rpl_auto_increment_11932.result, rpl_auto_increment_11932.test:
    Update with correct table and database names.

  mysql-test/r/rpl_auto_increment_11932.result
    1.2 06/05/22 09:20:47 grog@mysql.com +16 -16
    Update with correct table and database names.

  mysql-test/t/rpl_auto_increment_11932.test
    1.2 06/05/22 09:20:33 grog@mysql.com +19 -17
    Update with correct table and database names.

ChangeSet
  1.2133.1.1 06/05/21 11:04:57 pekka@mysql.com +4 -0
  ndb - bug#19956 (occurs only in v5.0)

  ndb/src/ndbapi/NdbOperationSearch.cpp
    1.25 06/05/21 11:03:25 pekka@mysql.com +14 -0
    bug#19956 - check var* length bytes and zero rest of value if any blob attribute

  ndb/src/ndbapi/NdbDictionaryImpl.hpp
    1.34 06/05/21 11:03:25 pekka@mysql.com +25 -0
    bug#19956 - check var* length bytes and zero rest of value if any blob attribute

  mysql-test/t/ndb_blob.test
    1.18 06/05/21 11:01:16 pekka@mysql.com +56 -0
    bug#19956 : var* pk

  mysql-test/r/ndb_blob.result
    1.19 06/05/21 11:01:16 pekka@mysql.com +66 -0
    bug#19956 : var* pk

ChangeSet
  1.2122.34.1 06/05/20 18:54:43 igor@rurik.mysql.com +5 -0
  Fixed bug #19089.
  When a CREATE TABLE command created a table from a materialized
  view id does not inherit default values from the underlying table.
  Moreover the temporary table used for the view materialization
  does not inherit those default values.
  In the case when the underlying table contained ENUM fields it caused
  misleading error messages. In other cases the created table contained
  wrong default values.
  The code was modified to ensure inheritance of default values for
  materialized views.

  sql/sql_select.cc
    1.413.1.1 06/05/20 18:54:37 igor@rurik.mysql.com +32 -6
    Fixed bug #19089.
    When a CREATE TABLE command created a table from a materialized
    view id does not inherit default values from the underlying table.
    Moreover the temporary table used for the view materialization
    does not inherit those default values.
    The code was modified to ensure inheritance of default values for
    materialized views.

  sql/field.h
    1.178 06/05/20 18:54:36 igor@rurik.mysql.com +1 -0
    Fixed bug ##19089.
    Added field dflt_field to the class Field.
    This field is set for temp table fields that inherits
    default values of items from which they are created.

  sql/field.cc
    1.305 06/05/20 18:54:36 igor@rurik.mysql.com +1 -0
    Fixed bug ##19089.
    Added field dflt_field to the class Field.
    This field is set for temp table fields that inherits
    default values of items from which they are created.

  mysql-test/t/view.test
    1.142.1.1 06/05/20 18:54:36 igor@rurik.mysql.com +31 -0
    Added a test case for bug #19089.

  mysql-test/r/view.result
    1.154.1.1 06/05/20 18:54:36 igor@rurik.mysql.com +42 -0
    Added a test case for bug #19089.

ChangeSet
  1.1346.1.835 06/05/20 22:47:20 kent@mysql.com +1 -0
  mysql.spec.sh:
    Always compile position independent

  support-files/mysql.spec.sh
    1.61.1.35 06/05/20 22:46:00 kent@mysql.com +5 -0
    Always compile position independent

ChangeSet
  1.1616.2598.2 06/05/20 12:34:56 aelkin@mysql.com +1 -0
  #14157: utf8 encoding in binlog without set character_set_client
  
  fixing an issue with the test portability.

  mysql-test/t/mysqlbinlog.test
    1.8.1.12 06/05/20 12:34:52 aelkin@mysql.com +5 -3
    BUG#14157: utf8 encoding in binlog without set character_set_client
    
    fixing koi8r specific case to run on all platforms. client does not announce in cmd line any specific
    encoding but rather set it via `set names'.

ChangeSet
  1.2122.33.1 06/05/19 13:17:07 iggy@mysql.com +1 -0
  BUG#19322 Added help defintion for --skip-external locking to mysqld --help --verbose

  sql/mysqld.cc
    1.547.1.1 06/05/19 13:17:03 iggy@mysql.com +2 -1
    Added --skip-external-locking to the --external-locking help.

ChangeSet
  1.1616.2599.1 06/05/19 16:21:32 ramil@mysql.com +3 -0
  Fix for bug #18536: mysqldump does not maintain table orders as per --tables option

  mysql-test/t/mysqldump.test
    1.19.1.24 06/05/19 16:21:27 ramil@mysql.com +12 -1
    Fix for bug #18536: mysqldump does not maintain table orders as per --tables option
      - test case.

  mysql-test/r/mysqldump.result
    1.9.1.43 06/05/19 16:21:27 ramil@mysql.com +35 -1
    Fix for bug #18536: mysqldump does not maintain table orders as per --tables option
      - test result.

  client/mysqldump.c
    1.143.13.3 06/05/19 16:21:27 ramil@mysql.com +21 -33
    Fix for bug #18536: mysqldump does not maintain table orders as per --tables option
      - use list to store table names instead of hash.

ChangeSet
  1.1616.2596.1 06/05/19 13:07:24 msvensson@neptunus.(none) +2 -0
  Bug#15869  Cannot shutdown the server - it restarts
   - A segfault occured when the function 'kill_server' called 
     'my_sigset' with signal number 0. 'my_sigset' is a macro which
     uses 'sigaction' to install the signal handler with an invalid
     signal number will on most platforms return EINVAL but yields
     a segfauilt on IRIX 6.5
   - The server crash was detected by mysqld_safe and it was restarted although
     a shutdown was requested. 
   - Semantics of kill_server(0) is not known, leaving it intact

  sql/mysqld.cc
    1.356.98.24 06/05/19 13:07:20 msvensson@neptunus.(none) +2 -1
    Don't call my_sigset if signo is 0 

  include/my_pthread.h
    1.65.1.17 06/05/19 13:07:20 msvensson@neptunus.(none) +4 -2
    Check return value from sigaction with a DBUG_ASSERT
    Also DBUG_ASSERT if signal number 0 is passed

ChangeSet
  1.2123.1.1 06/05/19 09:59:34 jonas@perch.ndb.mysql.com +3 -0
  ndb - bug#19930
    Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"

  ndb/src/mgmsrv/Services.cpp
    1.61.1.4 06/05/19 09:59:31 jonas@perch.ndb.mysql.com +2 -0
    Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"

  ndb/src/common/util/SocketServer.cpp
    1.19 06/05/19 09:59:31 jonas@perch.ndb.mysql.com +35 -9
    Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"

  ndb/include/util/SocketServer.hpp
    1.9 06/05/19 09:59:31 jonas@perch.ndb.mysql.com +5 -3
    Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"

ChangeSet
  1.2130.2.2 06/05/18 10:34:01 jimw@mysql.com +3 -0
  Bug #13975: "same string" + 0 has 2 different results
  
    The 'decimals' member of Item_func was being improperly initialized,
    which resulted in improper results when handling large numeric values.

  sql/item_strfunc.h
    1.106 06/05/18 10:33:57 jimw@mysql.com +1 -1
    Remove unnecessary reset of decimals in Item_func_conv::fix_length_and_dec().

  mysql-test/t/func_str.test
    1.87 06/05/18 10:33:57 jimw@mysql.com +6 -0
    Add new regression test

  mysql-test/r/func_str.result
    1.113 06/05/18 10:33:57 jimw@mysql.com +6 -0
    Add test results

ChangeSet
  1.1616.2591.9 06/05/18 17:10:58 ramil@mysql.com +3 -0
  Fix for bug #15558: truncate doesn't clear table on archive storage engine tables.

  sql/examples/ha_archive.cc
    1.13.1.17 06/05/18 17:10:53 ramil@mysql.com +1 -1
    Fix for bug #15558: truncate doesn't clear table on archive storage engine tables.
      - return an error as we don't suport delete_all_rows.

  mysql-test/t/archive.test
    1.2.1.5 06/05/18 17:10:53 ramil@mysql.com +2 -0
    Fix for bug #15558: truncate doesn't clear table on archive storage engine tables.
      - adjusted test

  mysql-test/r/archive.result
    1.2.1.3 06/05/18 17:10:52 ramil@mysql.com +2 -0
    Fix for bug #15558: truncate doesn't clear table on archive storage engine tables.
      - adjusted result

ChangeSet
  1.2084.61.5 06/05/18 21:32:24 stewart@mysql.com +1 -0
  BUG#18966 Change in stop/shutdown behaviour
  
  Now need this fix to prevent crash of ndb_mgm on invalid mgm protocol.

  ndb/src/mgmclient/CommandInterpreter.cpp
    1.59 06/05/18 21:31:57 stewart@mysql.com +4 -4
    fix crash on invalid mgm protocol

ChangeSet
  1.2122.29.1 06/05/18 14:44:15 anozdrin@mysql.com +2 -0
  Test case for BUG#18037: Server crash when returning system
  variable in stored procedures.

  mysql-test/t/sp.test
    1.188 06/05/18 14:44:12 anozdrin@mysql.com +46 -0
    Test case for BUG#18037: Server crash when returning system
    variable in stored procedures.

  mysql-test/r/sp.result
    1.200 06/05/18 14:44:12 anozdrin@mysql.com +30 -0
    Test case for BUG#18037: Server crash when returning system
    variable in stored procedures.

ChangeSet
  1.2122.28.1 06/05/18 16:46:48 stewart@mysql.com +1 -0
  BUG#13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd
  
  A further reduction in CPU usage by ndb_mgmd with failed data nodes.

  ndb/src/common/util/socket_io.cpp
    1.8 06/05/18 16:46:40 stewart@mysql.com +39 -31
    Use a nonblocking socket to peek at the buffer to know how much to read for socket_readln.
    
    This saves us a lot of syscalls. By a lot, I've observed about halving the CPU
    usage of ndb_mgmd with 1 failed node on a 6 node cluster.

ChangeSet
  1.2122.13.21 06/05/17 20:48:48 igor@rurik.mysql.com +3 -0
  Fixed bug #19816.
  This bug was introduced when the patch resolving the
  performance problem 17164 was applied. As a result
  of that modification the not_null_tables attributes
  were calculated incorrectly for constant OR conditions.
  This triggered invalid conversion of outer joins into
  inner joins.

  sql/item_cmpfunc.cc
    1.200.1.1 06/05/17 20:48:38 igor@rurik.mysql.com +3 -1
    Fixed bug #19816.
    This bug was introduced when the patch resolving the
    performance problem 17164 was applied. As a result
    of that modification the not_null_tables attributes
    were calculated incorrectly for constant OR conditions.
    This triggered invalid conversion of outer joins into
    inner joins.

  mysql-test/t/join_outer.test
    1.37 06/05/17 20:48:37 igor@rurik.mysql.com +18 -0
    Added a test case for bug #19816.

  mysql-test/r/join_outer.result
    1.48 06/05/17 20:48:37 igor@rurik.mysql.com +37 -2
    Added a test case for bug #19816.

ChangeSet
  1.2122.27.1 06/05/18 00:55:28 evgen@moonbone.local +9 -0
  Fixed bug#19077: A nested materialized derived table is used before being populated.
  
  The convert_constant_item() function converts constant items to ints on
  prepare phase to optimize execution speed. In this case it tries to evaluate
  subselect which contains a derived table and is contained in a derived table. 
  All derived tables are filled only after all derived tables are prepared.
  So evaluation of subselect with derived table at the prepare phase will
  return a wrong result.
  
  A new flag with_subselect is added to the Item class. It indicates that
  expression which this item represents is a subselect or contains a subselect.
  It is set to 0 by default. It is set to 1 in the Item_subselect constructor
  for subselects.
  For Item_func and Item_cond derived classes it is set after fixing any argument
  in Item_func::fix_fields() and Item_cond::fix_fields accordingly.
  The convert_constant_item() function now doesn't convert a constant item
  if the with_subselect flag set in it. 

  sql/item.h
    1.197 06/05/18 00:53:32 evgen@moonbone.local +3 -0
    Fixed bug#19077: A nested materialized derived table is used before being populated.
    A new flag with_subselect is added to the Item class. It indicates that
    expression which this item represents is a subselect or contains a subselect.
    It is set to 0 by default.

  sql/item.cc
    1.222.1.1 06/05/18 00:52:54 evgen@moonbone.local +1 -0
    Fixed bug#19077: A nested materialized derived table is used before being populated.
    Set new with_subselect flag to default value - 0 in the Item constructor.

  sql/item_cmpfunc.cc
    1.201 06/05/18 00:52:19 evgen@moonbone.local +24 -5
    Fixed bug#19077: A nested materialized derived table is used before being populated.
    The convert_constant_item() function now doesn't convert a constant item
    with the with_subselect flag set.
    The Item_cond::fix_fields() sets new with_subselect flag from with_subselect flags of its arguments.

  sql/item_func.cc
    1.287 06/05/18 00:51:53 evgen@moonbone.local +1 -0
    Fixed bug#19077: A nested materialized derived table is used before being populated.
    
    The Item_func::fix_fields() sets new with_subselect flag from with_subselect flags of its arguments.

  sql/item_subselect.cc
    1.125 06/05/18 00:51:35 evgen@moonbone.local +1 -0
    Fixed bug#19077: A nested materialized derived table is used before being populated.
    The Item_subselect class constructor sets new with_subselect flag to 1.

  mysql-test/r/subselect.result
    1.143 06/05/18 00:51:16 evgen@moonbone.local +6 -0
    Added test case for bug#19077: A nested materialized derived table is used before being populated.

  mysql-test/r/view.result
    1.156.1.1 06/05/18 00:51:12 evgen@moonbone.local +9 -0
    Added test case for bug#19077: A nested materialized derived table is used before being populated.

  mysql-test/t/subselect.test
    1.118 06/05/18 00:50:57 evgen@moonbone.local +9 -0
    Added test case for bug#19077: A nested materialized derived table is used before being populated.

  mysql-test/t/view.test
    1.143.1.1 06/05/18 00:50:47 evgen@moonbone.local +11 -0
    Added test case for bug#19077: A nested materialized derived table is used before being populated.

ChangeSet
  1.2125.1.2 06/05/17 19:08:18 joerg@mysql.com +1 -0
  Include "config.h" (if it exists) in all yaSSL files via their "runtime.hpp".
  Fixes bug#19040 "yaSSL does not compile on AIX".

  extra/yassl/taocrypt/include/runtime.hpp
    1.13 06/05/17 19:08:12 joerg@mysql.com +4 -0
    Include "config.h" (if it exists) in all yaSSL files. This is needed to ensure the same 
    configure settings are used for yaSSL as for the other modules linked together.
    Example: the settings for "large file" on AIX.
    Fixes bug#19040 "yaSSL does not compile on AIX".

ChangeSet
  1.2122.2.5 06/05/17 12:40:10 pekka@mysql.com +6 -0
  ndb -  bug#14509 [related] re-do auto-incr error handling

  sql/ha_ndbcluster.cc
    1.245.1.2 06/05/17 12:30:57 pekka@mysql.com +21 -15
    make auto-incr methods return int 0/-1

  ndb/tools/restore/consumer_restore.cpp
    1.23 06/05/17 12:30:57 pekka@mysql.com +6 -3
    make auto-incr methods return int 0/-1

  ndb/test/ndbapi/testDict.cpp
    1.23 06/05/17 12:30:57 pekka@mysql.com +7 -3
    make auto-incr methods return int 0/-1

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.90 06/05/17 12:30:57 pekka@mysql.com +1 -1
    make auto-incr methods return int 0/-1

  ndb/src/ndbapi/Ndb.cpp
    1.59 06/05/17 12:30:57 pekka@mysql.com +90 -68
    make auto-incr methods return int 0/-1

  ndb/include/ndbapi/Ndb.hpp
    1.46 06/05/17 12:30:57 pekka@mysql.com +20 -15
    make auto-incr methods return int 0/-1

ChangeSet
  1.2122.13.20 06/05/16 22:19:44 igor@rurik.mysql.com +4 -0
  Fixed bug #19573.
  The select statement that specified a view could be
  slightly changed when the view was saved in a frm file.
  In particular references to an alias name in the HAVING
  clause could be substituted for the expression named by
  this alias.
  This could result in an error message for a query of
  the form SELECT * FROM <view>. Yet no such message
  appeared when executing the query specifying the view.

  sql/item.cc
    1.223 06/05/16 22:19:36 igor@rurik.mysql.com +10 -1
    Fixed bug #19573.
    The select statement that specified a view could be
    slightly changed when the view was saved in a frm file.
    In particular references to an alias name in the HAVING
    clause could be substituted for the expression named by
    this alias.
    This could result in an error message for a query of
    the form SELECT * FROM <view>. Yet no such message
    appeared when executing the query specifying the view.  

  mysql-test/t/view.test
    1.144 06/05/16 22:19:36 igor@rurik.mysql.com +28 -0
    Added a test case for bug #19573.

  mysql-test/r/view.result
    1.157 06/05/16 22:19:36 igor@rurik.mysql.com +25 -0
    Added a test case for bug #19573.

  mysql-test/r/having.result
    1.26 06/05/16 22:19:36 igor@rurik.mysql.com +1 -1
    Adjusted results after fixing bug #19573.

ChangeSet
  1.1616.2593.5 06/05/17 00:22:43 tomas@poseidon.ndb.mysql.com +2 -0
      ndb: added some missing error codes to mgmapi
      ndb: ndb_waiter disconnect/reconnect on get status error

  ndb/tools/waiter.cpp
    1.19.1.3 06/05/17 00:22:37 tomas@poseidon.ndb.mysql.com +6 -0
    ndb: ndb_waiter disconnect/reconnect on get status error

  ndb/src/mgmapi/mgmapi.cpp
    1.23.1.8 06/05/17 00:22:37 tomas@poseidon.ndb.mysql.com +3 -0
    ndb: added some missing error codes to mgmapi

ChangeSet
  1.2122.2.4 06/05/16 16:17:30 pekka@mysql.com +1 -0
  ndb - bug#14509 [related] fix a return value

  ndb/src/ndbapi/Ndb.cpp
    1.58 06/05/16 16:14:36 pekka@mysql.com +2 -2
    fix a return value

ChangeSet
  1.1616.2594.1 06/05/16 16:50:05 aelkin@mysql.com +1 -0
  BUG#14157: utf8 encoding in binlog without set character_set_client: e.g DROP temporary
  
  fixing encoding example because of table names can not be in koi8r 
  on some platforms.

  mysql-test/t/rpl_temporary.test
    1.13.1.7 06/05/16 16:47:38 aelkin@mysql.com +1 -1
    koi8r encoding to name tables is changed for latin1 for the former does not work
    on some platforms.
    The effect of the test remains: a test table is named to have multibyte utf8 representation,
    which is the essence of the bug.

ChangeSet
  1.2088.12.1 06/05/16 18:37:23 svoj@april.(none) +1 -0
  BUG#17001 - Table and server crash on ALTER TABLE
  
  frm and data files for tables created by earlier MySQL
  versions becomes out of sync after certain ALTER TABLE statements:
  - One that changes column default value;
  - One that changes table comment;
  - One that changes table password.
  
  As a result one can expirience either server crash or data corruption/loss.
  
  This fix ensures that running ALTER TABLE on tables created by earlier
  MySQL versions recreates data files.

  sql/sql_table.cc
    1.303.5.1 06/05/16 18:37:19 svoj@april.(none) +10 -2
    Ensure that running ALTER TABLE on tables created by earlier
    MySQL versions recreates data files.

ChangeSet
  1.2122.2.3 06/05/16 12:58:41 pekka@mysql.com +5 -0
  ndb - bug#14509 [related] setAutoIncrement: add error handling

  sql/ha_ndbcluster.cc
    1.245.1.1 06/05/16 12:44:11 pekka@mysql.com +5 -5
    setAutoIncrement: add error handling

  ndb/tools/restore/consumer_restore.cpp
    1.22 06/05/16 12:44:11 pekka@mysql.com +1 -1
    setAutoIncrement: add error handling

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.89 06/05/16 12:44:11 pekka@mysql.com +5 -8
    setAutoIncrement: add error handling

  ndb/src/ndbapi/Ndb.cpp
    1.57 06/05/16 12:44:11 pekka@mysql.com +19 -20
    setAutoIncrement: add error handling

  ndb/include/ndbapi/Ndb.hpp
    1.45 06/05/16 12:44:11 pekka@mysql.com +6 -6
    setAutoIncrement: add error handling

ChangeSet
  1.1616.2593.4 06/05/16 11:47:33 tomas@poseidon.ndb.mysql.com +2 -0
  Bug #18591 Repeated "show" and "all status" calls to ndb_mgm causes mgmd to crash
  - not having lock can cause "block number list" to become corrupt => crash
  - also may result in 2 threads receiving same block no => possble cause of
  Bug #13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd

  ndb/src/ndbapi/SignalSender.cpp
    1.2.1.3 06/05/16 11:47:26 tomas@poseidon.ndb.mysql.com +2 -0
    Bug #18591 Repeated "show" and "all status" calls to ndb_mgm causes mgmd to crash
    - not having lock can cause "block number list" to become corrupt => crash
    - also may result in 2 threads receiving same block no => possble cause of
    Bug #13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.51.1.23 06/05/16 11:47:26 tomas@poseidon.ndb.mysql.com +1 -0
    ndb: added missing lock of mutex

ChangeSet
  1.2122.22.2 06/05/16 13:39:03 sergefp@mysql.com +1 -0
  BUG#19618: post-review fixes: better comments

  sql/opt_range.cc
    1.212 06/05/16 13:38:56 sergefp@mysql.com +39 -21
    BUG#19618: post-review fixes: better comments

ChangeSet
  1.2122.26.2 06/05/16 10:01:07 lars@mysql.com +2 -0
  Test used a charset not available on many platforms

  mysql-test/t/mysqlbinlog.test
    1.27 06/05/16 10:00:52 lars@mysql.com +10 -5
    Test used a charset not available on many platforms

  mysql-test/r/mysqlbinlog.result
    1.23 06/05/16 10:00:52 lars@mysql.com +1 -5
    Test used a charset not available on many platforms

ChangeSet
  1.2122.26.1 06/05/16 09:26:57 lars@mysql.com +1 -0
  Fixed result file (rpl_temporary)

  mysql-test/r/rpl_temporary.result
    1.26 06/05/16 09:26:46 lars@mysql.com +12 -3
    Fixed result file

ChangeSet
  1.2122.23.2 06/05/15 20:29:50 tomas@poseidon.ndb.mysql.com +1 -0
  correction of merge

  sql/ha_ndbcluster.cc
    1.247 06/05/15 20:29:44 tomas@poseidon.ndb.mysql.com +1 -1
    correction of merge

ChangeSet
  1.2122.24.3 06/05/15 13:28:15 knielsen@mysql.com +5 -0
  After-merge fixes; some function signatures changed from Item * to Item **.

ChangeSet
  1.1616.2591.3 06/05/15 16:31:23 pekka@mysql.com +3 -0
  ndb - bug#19537: arithmetic conversion Uint64 reg to Uint32 attr

ChangeSet
  1.2084.131.1 06/05/15 18:07:18 knielsen@mysql.com +7 -0
  Fix two Valgrind memory leak warnings.

  sql/mysqld.cc
    1.540.4.1 06/05/15 18:07:14 knielsen@mysql.com +4 -0
    Add missing my_thread_end() call, seems to occasionally trigger a memory
    leak (not repeatable).

  mysys/my_init.c
    1.45 06/05/15 18:07:14 knielsen@mysql.com +3 -1
    Change my_end() to deallocate DBUG memory by default (can be disabled with
    MY_DONT_FREE_DBUG option).

  libmysql/libmysql.c
    1.241.1.1 06/05/15 18:07:14 knielsen@mysql.com +1 -1
    Do not deallocate DBUG during cleanup.

  include/my_sys.h
    1.178.1.1 06/05/15 18:07:13 knielsen@mysql.com +1 -0
    Change my_end() to deallocate DBUG memory by default (can be disabled with
    MY_DONT_FREE_DBUG option).

  include/my_dbug.h
    1.17 06/05/15 18:07:13 knielsen@mysql.com +3 -0
    Add a facility to deallocate the debug stack, to avoid memory leak warnings
    in Valgrind.

  dbug/dbug.c
    1.22 06/05/15 18:07:13 knielsen@mysql.com +68 -16
    Add a facility to deallocate the debug stack, to avoid memory leak warnings
    in Valgrind.

  client/mysqlbinlog.cc
    1.125 06/05/15 18:07:13 knielsen@mysql.com +4 -2
    Now my_end() deallocates DBUG by default, but that fails in mysqlbinlog
    because of global destructors that use DBUG.

ChangeSet
  1.1616.2593.2 06/05/15 17:16:21 tomas@poseidon.ndb.mysql.com +1 -0
  Bug #16875 , correction of previous patch

  mysql-test/r/ndb_autodiscover3.result
    1.2 06/05/15 17:16:18 tomas@poseidon.ndb.mysql.com +37 -1
    Bug #16875 , correction of previous patch

ChangeSet
  1.2122.21.4 06/05/15 18:05:23 aelkin@mysql.com +2 -0
  BUG#14157: utf8 encoding in binlog without set character_set_client: e.g DROP temporary
  
  specific to 5.0 version of the patch is motivated by the fact that a wrapper over 
  MYSQLLOG::write can not help in 5.0 where query's charset is embedded into event instance in the constructor.

  sql/sql_base.cc
    1.334.1.3 06/05/15 18:05:18 aelkin@mysql.com +4 -1
    No wrapper similar to 4.1's version is done since Query_log_event constructor
    takes care of encodings in 5.0 whereas log::write method does it in 4.1.
    We can introduce an additional constuctor for Query_log_event to pass desired
    (i.e system_character_info) charset different from THD's version.
    But I am delaying this while there are not more bugs similar to this one reported.

  sql/mysql_priv.h
    1.388 06/05/15 18:05:18 aelkin@mysql.com +0 -13
    this 4.1 specific code does not help in 5.0

  ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
    1.11.1.1 06/05/15 16:27:30 pekka@mysql.com +6 -0
    bug#19537: write_attr: perform arithmetic conversion Uint64 to Uint32

ChangeSet
  1.1616.2593.1 06/05/15 16:23:59 tomas@poseidon.ndb.mysql.com +11 -0
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
  - invalidate ndb dict cache on cluster disconnect (ClusterMgr.cpp)
  - add check for correct frm on external lock when table cache is found invalid

  mysql-test/t/ndb_autodiscover3.test
    1.1 06/05/15 16:23:55 tomas@poseidon.ndb.mysql.com +65 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  mysql-test/t/ndb_autodiscover3.test
    1.0 06/05/15 16:23:55 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-4.1/mysql-test/t/ndb_autodiscover3.test

  mysql-test/r/ndb_autodiscover3.result
    1.1 06/05/15 16:23:54 tomas@poseidon.ndb.mysql.com +9 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  sql/ha_ndbcluster.cc
    1.114.18.1 06/05/15 16:23:54 tomas@poseidon.ndb.mysql.com +16 -1
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  ndb/src/ndbapi/ndb_cluster_connection_impl.hpp
    1.1.1.1 06/05/15 16:23:54 tomas@poseidon.ndb.mysql.com +1 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  ndb/src/ndbapi/ndb_cluster_connection.cpp
    1.13.1.8 06/05/15 16:23:54 tomas@poseidon.ndb.mysql.com +6 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  ndb/src/ndbapi/TransporterFacade.hpp
    1.18.1.4 06/05/15 16:23:54 tomas@poseidon.ndb.mysql.com +6 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  ndb/src/ndbapi/DictCache.hpp
    1.6.1.3 06/05/15 16:23:54 tomas@poseidon.ndb.mysql.com +3 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  ndb/src/ndbapi/DictCache.cpp
    1.11.1.3 06/05/15 16:23:54 tomas@poseidon.ndb.mysql.com +36 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  ndb/src/ndbapi/ClusterMgr.hpp
    1.5.1.1 06/05/15 16:23:54 tomas@poseidon.ndb.mysql.com +1 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  ndb/src/ndbapi/ClusterMgr.cpp
    1.13.1.4 06/05/15 16:23:54 tomas@poseidon.ndb.mysql.com +5 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  ndb/include/ndbapi/ndb_cluster_connection.hpp
    1.4.1.5 06/05/15 16:23:54 tomas@poseidon.ndb.mysql.com +1 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  mysql-test/r/ndb_autodiscover3.result
    1.0 06/05/15 16:23:54 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-4.1/mysql-test/r/ndb_autodiscover3.result

  ndb/test/ndbapi/testInterpreter.cpp
    1.4 06/05/15 16:19:56 pekka@mysql.com +162 -40
    add test case Bug19537
    the bug fix also fixed IncValue64 for whatever reason..

ChangeSet
  1.2122.13.15 06/05/15 18:18:37 kroki@mysql.com +2 -0
  Remove 'const' that prevents Microsoft VC realize that
  Item_trigger_field::set_required_privilege(const bool rw) is an
  overloading of Settable_routine_parameter::set_required_privilege(bool rw).

  sql/item.h
    1.194.1.1 06/05/15 18:18:31 kroki@mysql.com +1 -1
    Remove 'const' that prevents Microsoft VC realize that
    Item_trigger_field::set_required_privilege(const bool rw) is an
    overloading of Settable_routine_parameter::set_required_privilege(bool rw).

  sql/item.cc
    1.220.1.1 06/05/15 18:18:30 kroki@mysql.com +1 -1
    Remove 'const' that prevents Microsoft VC realize that
    Item_trigger_field::set_required_privilege(const bool rw) is an
    overloading of Settable_routine_parameter::set_required_privilege(bool rw).

  ndb/test/ndbapi/Makefile.am
    1.14.2.4 06/05/15 16:15:44 pekka@mysql.com +3 -0
    enable testInterpreter

ChangeSet
  1.2122.11.2 06/05/15 18:02:21 aivanov@mysql.com +2 -0
  Applied innodb-5.0-ss547 snapshot.
   Fix BUG#19542 "InnoDB doesn't increase the Handler_read_prev counter".

  sql/ha_innodb.cc
    1.294 06/05/15 18:02:16 aivanov@mysql.com +3 -0
    Applied innodb-5.0-ss547 snapshot.
     Increment statistic counter in ha_innobase::index_prev().

  innobase/os/os0file.c
    1.114 06/05/15 18:02:16 aivanov@mysql.com +38 -25
    Applied innodb-5.0-ss547 snapshot.
     Check the page trailers also after writing to disk.
     This improves the chances of diagnosing Bug 18886.
     os_file_check_page_trailers(): New function for checking
     that two copies of the LSN stamped on the pages match.
     os_aio_simulated_handle(): Call os_file_check_page_trailers()
     before and after os_file_write().

ChangeSet
  1.1616.2592.1 06/05/15 17:25:37 aivanov@mysql.com +2 -0
  Applied innodb-4.1-ss29 snapshot.
   Fix BUG#19542 "InnoDB doesn't increase the Handler_read_prev counter.
   

  sql/ha_innodb.cc
    1.90.16.44 06/05/15 17:25:33 aivanov@mysql.com +2 -0
    Applied innodb-4.1-ss29 snapshot.
     Increment statistic counter in ha_innobase::index_prev().

  innobase/os/os0file.c
    1.87.1.18 06/05/15 17:25:33 aivanov@mysql.com +38 -25
    Applied innodb-4.1-ss29 snapshot.
     Check the page trailers also after writing to disk.
     This improves the chances of diagnosing Bug 18886.
     os_file_check_page_trailers(): New function for checking
     that two copies of the LSN stamped on the pages match.
     os_aio_simulated_handle(): Call os_file_check_page_trailers()
     before and after os_file_write().

ChangeSet
  1.2084.130.1 06/05/15 15:06:46 knielsen@mysql.com +1 -0
  Removed two duplicate/redundant suppressions.
  Added some suppressions needed for Valgrind on RHAS3 64-bit.

  mysql-test/valgrind.supp
    1.4 06/05/15 15:06:42 knielsen@mysql.com +161 -21
    Removed two duplicate/redundant suppressions.
    Added some suppressions needed for Valgrind on RHAS3 64-bit.

  sql/sp_head.cc
    1.213 06/05/15 13:28:10 knielsen@mysql.com +2 -2
    After-merge fixes.

  sql/item_func.h
    1.140 06/05/15 13:28:10 knielsen@mysql.com +1 -1
    After-merge fixes.

  sql/item_func.cc
    1.286 06/05/15 13:28:10 knielsen@mysql.com +3 -3
    After-merge fixes.

  sql/item.h
    1.195 06/05/15 13:28:10 knielsen@mysql.com +4 -4
    After-merge fixes.

  sql/item.cc
    1.221 06/05/15 13:28:10 knielsen@mysql.com +3 -3
    After-merge fixes.

ChangeSet
  1.2122.22.1 06/05/15 14:18:23 sergefp@mysql.com +3 -0
  BUG#19618: Crash for unsigned_col NOT IN (-1, ... ) 
  - When manually constructing a SEL_TREE for "t.key NOT IN(...)", take into account that 
    get_mm_parts may return a tree with type SEL_TREE::IMPOSSIBLE
  - Added missing OOM checks
  - Added comments

  sql/opt_range.cc
    1.211 06/05/15 14:18:17 sergefp@mysql.com +51 -18
    BUG#19618: Crash for unsigned_col NOT IN (-1, ... ) 
    - When manually constructing a SEL_TREE for "t.key NOT IN(...)", take into account that 
      get_mm_parts may return a tree with type SEL_TREE::IMPOSSIBLE
    - Added missing OOM checks
    - Added comments

  mysql-test/t/func_in.test
    1.20 06/05/15 14:18:17 sergefp@mysql.com +12 -0
    Testcase for BUG#19618

  mysql-test/r/func_in.result
    1.25 06/05/15 14:18:17 sergefp@mysql.com +17 -0
    Testcase for BUG#19618

ChangeSet
  1.2106.1.3 06/05/15 12:01:55 knielsen@mysql.com +5 -0
  BUG#18037: Fix stack corruption in THD::rollback_item_tree_changes().
    
  Stored procedure execution sometimes placed the address of auto variables
  in the list of Item changes to undo in THD::rollback_item_tree_changes().
  This could cause stack corruption.

  sql/sql_class.cc
    1.233 06/05/15 12:01:52 knielsen@mysql.com +1 -1
    Avoid storing address of auto variables in global rollback list, to
    prevent stack memory corruption.

  sql/sp_rcontext.h
    1.32 06/05/15 12:01:52 knielsen@mysql.com +4 -4
    Avoid storing address of auto variables in global rollback list, to
    prevent stack memory corruption.

  sql/sp_rcontext.cc
    1.42 06/05/15 12:01:52 knielsen@mysql.com +7 -6
    Avoid storing address of auto variables in global rollback list, to
    prevent stack memory corruption.

  sql/sp_head.h
    1.84 06/05/15 12:01:52 knielsen@mysql.com +1 -1
    Avoid storing address of auto variables in global rollback list, to
    prevent stack memory corruption.

  sql/sp_head.cc
    1.207.1.2 06/05/15 12:01:52 knielsen@mysql.com +15 -13
    Avoid storing address of auto variables in global rollback list, to
    prevent stack memory corruption.

ChangeSet
  1.2098.20.12 06/05/15 11:56:02 kroki@mysql.com +1 -0
  Fix possible race.  Use LOCK_grant on access to grant_version.

  sql/sql_acl.cc
    1.190.2.1 06/05/15 11:55:55 kroki@mysql.com +3 -2
    Use LOCK_grant on access to grant_version.

ChangeSet
  1.2122.21.2 06/05/14 20:31:42 aelkin@mysql.com +2 -0
  BUG#19188: incorrect temporary table name of DROP query in replication
  
  manual merge to account 5.0 specific names of TABLE class

  sql/sql_base.cc
    1.334.1.2 06/05/14 20:31:34 aelkin@mysql.com +13 -13
    manual merge: whitespaces and 5.0 TABLE's names

  sql/mysql_priv.h
    1.387 06/05/14 20:31:34 aelkin@mysql.com +1 -1
    manual merge: changing to 5.0's TABLE class names

ChangeSet
  1.1616.2591.1 06/05/14 20:09:09 aelkin@mysql.com +2 -0
  BUG#14157: utf8 encoding in binlog without set character_set_client
  
  fixing names length. Got an issue when merged to 5.0, decided to fix starting from 4.1

  mysql-test/t/rpl_temporary.test
    1.13.1.6 06/05/14 20:09:05 aelkin@mysql.com +1 -1
    fixing temp table name to fit to 64 bytes for 5.0

  mysql-test/t/mysqlbinlog.test
    1.8.1.11 06/05/14 20:09:05 aelkin@mysql.com +1 -1
    fixing temp table name to fit to 64 bytes for 5.0

ChangeSet
  1.1616.2144.127 06/05/14 21:49:33 holyfoot@deer.(none) +1 -0
  bug 15430 (init_connect test fails with the embedded server)
  mysqltest program should be really multithreaded to perform this
  test with the embedded server. So this test disabled until we
  redo mysqltest this way

  mysql-test/t/init_connect.test
    1.3.1.2 06/05/14 21:49:29 holyfoot@mysql.com +2 -0
    test can't work properly with the embedded server yet

ChangeSet
  1.1616.2144.126 06/05/14 21:43:22 holyfoot@deer.(none) +1 -0
  bug #15435 (wait_timeout.test fails with the embedded server)
  this test just can't work in the embedded server

  mysql-test/t/wait_timeout.test
    1.1.1.1 06/05/14 21:42:33 holyfoot@mysql.com +3 -0
    test can't work properly with the embedded server yet

ChangeSet
  1.2122.20.1 06/05/13 11:56:05 igor@rurik.mysql.com +3 -0
  Fixed bug #19396: a crash for a an outer join operation 
  over two views when using syntax with curly braces.
  Each outer join operation must be placed in a separate
  nest. This was not done when the syntax with curly braces
  was used. In some cases, in particular, for queries with outer
  join operation over views it could cause a crash.

  sql/sql_yacc.yy
    1.466.1.1 06/05/13 11:55:59 igor@rurik.mysql.com +4 -0
    Fixed bug #19396: a crash for a an outer join operation 
    over two views when using syntax with curly braces.
    Each outer join operation must be placed in a separate
    nest. This was not done when the syntax with curly braces
    was used. In some cases, in particular, for queries with outer
    join operation over views it could cause a crash.

  mysql-test/t/join_outer.test
    1.36 06/05/13 11:55:59 igor@rurik.mysql.com +26 -0
    Added a test case for bug #19396.

  mysql-test/r/join_outer.result
    1.47 06/05/13 11:55:58 igor@rurik.mysql.com +22 -0
    Added a test case for bug #19396.

ChangeSet
  1.1616.2144.125 06/05/13 12:14:20 aelkin@mysql.com +2 -0
  BUG#14157: utf8 encoding in binlog without set character_set_client
  fixing a path to find charset by $MYSQL client. I believe the fix is done what should be
  by default. 

  mysql-test/t/rpl_temporary.test
    1.13.1.5 06/05/13 12:14:17 aelkin@mysql.com +1 -1
    --character-sets-dir=../sql/share/charsets/

  mysql-test/t/mysqlbinlog.test
    1.8.1.10 06/05/13 12:14:17 aelkin@mysql.com +1 -1
    --character-sets-dir=../sql/share/charsets  is added otherwise client/.libs/lt-mysql
    searches in /usr/local/mysql ... A bug? 

ChangeSet
  1.2122.13.11 06/05/13 13:13:05 gluh@eagle.intranet.mysql.r18.ru +11 -0
  Bug#17048 CREATE TABLE ... SELECT truncate values
  remove initialization of unsigned_flag for Item_decimal

  sql/item.cc
    1.218.1.1 06/05/13 13:11:37 gluh@mysql.com +0 -6
    Bug#17048 CREATE TABLE ... SELECT truncate values
    remove initialization of unsigned_flag for Item_decimal

  mysql-test/r/type_newdecimal.result
    1.39 06/05/13 13:11:37 gluh@mysql.com +7 -7
    Bug#17048 CREATE TABLE ... SELECT truncate values
    result fix

  mysql-test/r/type_float.result
    1.46 06/05/13 13:11:37 gluh@mysql.com +4 -4
    Bug#17048 CREATE TABLE ... SELECT truncate values
    result fix

  mysql-test/r/ps_7ndb.result
    1.42 06/05/13 13:11:37 gluh@mysql.com +2 -2
    Bug#17048 CREATE TABLE ... SELECT truncate values
    result fix

  mysql-test/r/ps_6bdb.result
    1.42 06/05/13 13:11:37 gluh@mysql.com +2 -2
    Bug#17048 CREATE TABLE ... SELECT truncate values
    result fix

  mysql-test/r/ps_5merge.result
    1.40 06/05/13 13:11:36 gluh@mysql.com +4 -4
    Bug#17048 CREATE TABLE ... SELECT truncate values
    result fix

  mysql-test/r/ps_4heap.result
    1.39 06/05/13 13:11:36 gluh@mysql.com +2 -2
    Bug#17048 CREATE TABLE ... SELECT truncate values
    result fix

  mysql-test/r/ps_3innodb.result
    1.43 06/05/13 13:11:36 gluh@mysql.com +2 -2
    Bug#17048 CREATE TABLE ... SELECT truncate values
    result fix

  mysql-test/r/ps_2myisam.result
    1.40 06/05/13 13:11:36 gluh@mysql.com +2 -2
    Bug#17048 CREATE TABLE ... SELECT truncate values
    result fix

  mysql-test/r/metadata.result
    1.14 06/05/13 13:11:36 gluh@mysql.com +1 -1
    Bug#17048 CREATE TABLE ... SELECT truncate values
    result fix

  mysql-test/r/case.result
    1.26 06/05/13 13:11:36 gluh@mysql.com +4 -4
    Bug#17048 CREATE TABLE ... SELECT truncate values
    result fix

ChangeSet
  1.2122.19.1 06/05/12 18:24:38 igor@rurik.mysql.com +3 -0
  Fixed bug #19490. The bug that caused server crash manifested
  itself when executing queries referring to a view with GROUP BY
  an expression containing non-constant interval.
  It happened because Item_date_add_interval::eq neglected the
  fact that the method can be applied to an expression of the form
      date(col) + interval time_to_sec(col) second
  at the time when col could not be evaluated yet.
  An attempt to evaluate time_to_sec(col) in this method resulted
  in a crash.

  sql/item_timefunc.cc
    1.110 06/05/12 18:24:31 igor@rurik.mysql.com +7 -2
    Fixed bug #19490. The bug that caused server crash manifested
    itself when executing queries referring to a view with GROUP BY
    an expression containing non-constant interval.
    It happened because Item_date_add_interval::eq neglected the
    fact that the method can be applied to an expression of the form
        date(col) + interval time_to_sec(col) second
    at the time when col could not be evaluated yet.
    An attempt to evaluate time_to_sec(col) in this method resulted
    in a crash.
    The code of Item_date_add_interval::eq was corrected.

  mysql-test/t/view.test
    1.143 06/05/12 18:24:31 igor@rurik.mysql.com +16 -0
    Added a test case for bug #19490.

  mysql-test/r/view.result
    1.156 06/05/12 18:24:31 igor@rurik.mysql.com +11 -0
    Added a test case for bug #19490.

ChangeSet
  1.1616.2590.1 06/05/12 21:29:06 aelkin@mysql.com +4 -0
  BUG#19188: incorrect temporary table name of DROP query in replication
  
    A pattern to generate binlog for DROPped temp table in close_temporary_tables
    was buggy: could not deal with a grave-accent-in-name table.
  
    The fix exploits `append_identifier()' for quoting and duplicating accents.

  sql/sql_base.cc
    1.145.47.1 06/05/12 21:29:01 aelkin@mysql.com +69 -78
    Utilizing `append_identifier' to quote. `close_temporary_tables' once again recoded
    I hope to become much simplier than previously. No-binlog branch is separated completely the
    rest that adopts String's methods.

  sql/mysql_priv.h
    1.186.104.1 06/05/12 21:29:01 aelkin@mysql.com +12 -0
    bool is_user_table(TABLE * table) 
    is added to answer wheather temporary table was created explicitly.

  mysql-test/t/rpl_temporary.test
    1.13.2.1 06/05/12 21:29:00 aelkin@mysql.com +10 -5
    more correct internal table emulation; typo of @@session in bug#17263.

  mysql-test/r/rpl_temporary.result
    1.3.3.1 06/05/12 21:29:00 aelkin@mysql.com +8 -5
    results changed

ChangeSet
  1.2122.13.9 06/05/12 19:00:11 kent@mysql.com +49 -0
  Many files:
    Change mode to -rw-rw-r--

  strings/decimal.c
    1.68 06/05/12 18:58:54 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  sql/sql_array.h
    1.2 06/05/12 18:58:53 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysys/my_mmap.c
    1.8 06/05/12 18:58:53 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/xa.test
    1.7 06/05/12 18:58:53 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/sp_trans.test
    1.9 06/05/12 18:58:53 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/flush_read_lock_kill.test
    1.5 06/05/12 18:58:52 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/flush_read_lock_kill-master.opt
    1.3 06/05/12 18:58:52 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/binlog.test
    1.7 06/05/12 18:58:52 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/binlog-master.opt
    1.2 06/05/12 18:58:52 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/std_data/vchar.frm
    1.2 06/05/12 18:58:52 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/std_data/bug16266.000001
    1.2 06/05/12 18:58:51 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/xa.result
    1.5 06/05/12 18:58:51 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/view_query_cache.result
    1.5 06/05/12 18:58:51 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/view_grant.result
    1.13 06/05/12 18:58:51 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/user_limits.result
    1.7 06/05/12 18:58:50 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/type_newdecimal.result
    1.38 06/05/12 18:58:50 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/type_bit_innodb.result
    1.5 06/05/12 18:58:50 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/trigger-trans.result
    1.2 06/05/12 18:58:50 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/trigger-grant.result
    1.3.1.1 06/05/12 18:58:49 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/trigger-compat.result
    1.4 06/05/12 18:58:49 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/sum_distinct-big.result
    1.3 06/05/12 18:58:49 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/sp_trans.result
    1.9 06/05/12 18:58:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/sp-vars.result
    1.2 06/05/12 18:58:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/sp-dynamic.result
    1.5 06/05/12 18:58:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/sp-destruct.result
    1.5 06/05/12 18:58:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/sp-code.result
    1.6 06/05/12 18:58:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_view.result
    1.4 06/05/12 18:58:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_trigger.result
    1.8 06/05/12 18:58:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_ignore_revoke.result
    1.3 06/05/12 18:58:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ndb_gis.result
    1.4 06/05/12 18:58:46 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ndb_condition_pushdown.result
    1.19 06/05/12 18:58:46 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ndb_bitfield.result
    1.7 06/05/12 18:58:46 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/mysqldump-max.result
    1.3 06/05/12 18:58:45 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/mysql.result
    1.10 06/05/12 18:58:45 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/innodb_notembedded.result
    1.2 06/05/12 18:58:45 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/innodb_gis.result
    1.3 06/05/12 18:58:45 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/innodb-big.result
    1.2 06/05/12 18:58:44 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/im_utils.result
    1.2 06/05/12 18:58:44 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/im_options_unset.result
    1.1.1.1 06/05/12 18:58:44 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/im_options_set.result
    1.1.1.1 06/05/12 18:58:44 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/im_life_cycle.result
    1.5 06/05/12 18:58:43 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/im_daemon_life_cycle.result
    1.2 06/05/12 18:58:43 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/federated_bug_13118.result
    1.2 06/05/12 18:58:43 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/federated_archive.result
    1.4 06/05/12 18:58:43 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/compress.result
    1.3 06/05/12 18:58:42 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/binlog.result
    1.6 06/05/12 18:58:42 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/bdb_gis.result
    1.3 06/05/12 18:58:42 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/archive_gis.result
    1.3 06/05/12 18:58:42 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  include/decimal.h
    1.15 06/05/12 18:58:41 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

ChangeSet
  1.1616.2144.122 06/05/12 18:28:48 kent@mysql.com +52 -0
  Many files:
    Change mode to -rw-rw-r--
  Ereport.pl, Ecreate.pl, Ecompare.pl:
    Change mode to -rwxrwxr--

  zlib/Makefile.am
    1.3.1.3 06/05/12 18:26:49 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  sql/sql_bitmap.h
    1.7.2.1 06/05/12 18:26:49 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  scripts/mysql_prepare_privilege_tables_for_5.sql
    1.2 06/05/12 18:26:49 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysys/my_getsystime.c
    1.5 06/05/12 18:26:49 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysys/my_gethwaddr.c
    1.3 06/05/12 18:26:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysys/my_crc32.c
    1.3 06/05/12 18:26:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysys/mf_tempdir.c
    1.4 06/05/12 18:26:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/union-master.opt
    1.3 06/05/12 18:26:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/subselect2.test
    1.6 06/05/12 18:26:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/rpl_rewrite_db.test
    1.4.1.1 06/05/12 18:26:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/rpl_rewrite_db-slave.opt
    1.3 06/05/12 18:26:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/rpl_multi_query.test
    1.2.1.2 06/05/12 18:26:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/rpl_insert_ignore.test
    1.3 06/05/12 18:26:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/rpl_ddl.test
    1.2.1.3 06/05/12 18:26:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/mysqltest.test
    1.3.1.17 06/05/12 18:26:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/insert_update.test
    1.13.1.4 06/05/12 18:26:46 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/grant2.test
    1.7.1.9 06/05/12 18:26:46 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/gis-rtree.test
    1.9.1.3 06/05/12 18:26:46 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/fulltext2.test
    1.14 06/05/12 18:26:46 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/ctype_latin1.test
    1.9 06/05/12 18:26:45 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/std_data/master-bin.000001
    1.2 06/05/12 18:26:45 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/timezone_grant.result
    1.1.1.2 06/05/12 18:26:45 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_trunc_temp.result
    1.2 06/05/12 18:26:44 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_slave_status.result
    1.4.1.1 06/05/12 18:26:44 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_multi_update4.result
    1.2 06/05/12 18:26:44 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_multi_update3.result
    1.4.1.1 06/05/12 18:26:44 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_insert_select.result
    1.2 06/05/12 18:26:43 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_dual_pos_advance.result
    1.2 06/05/12 18:26:43 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_drop_db.result
    1.5 06/05/12 18:26:43 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_create_database.result
    1.2.1.1 06/05/12 18:26:43 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/query_cache_notembedded.result
    1.2.1.1 06/05/12 18:26:43 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/not_embedded_server.result
    1.1.1.1 06/05/12 18:26:42 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ndb_update.result
    1.2.1.2 06/05/12 18:26:42 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ndb_database.result
    1.2 06/05/12 18:26:42 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/insert_update.result
    1.9.7.1 06/05/12 18:26:41 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/grant2.result
    1.8.8.1 06/05/12 18:26:41 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/func_des_encrypt.result
    1.2 06/05/12 18:26:41 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/fulltext2.result
    1.9.3.1 06/05/12 18:26:41 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ctype_ucs_binlog.result
    1.1.1.1 06/05/12 18:26:41 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ctype_gb2312.result
    1.2 06/05/12 18:26:40 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ctype_euckr.result
    1.2 06/05/12 18:26:40 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ctype_cp932_binlog.result
    1.1.1.1 06/05/12 18:26:40 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ctype_cp1250_ch.result
    1.4 06/05/12 18:26:40 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/blackhole.result
    1.2.1.2 06/05/12 18:26:39 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/misc/kill_master.sh
    1.3 06/05/12 18:26:39 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/include/rpl_stmt_seq.inc
    1.3.1.1 06/05/12 18:26:39 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  myisammrg/myrg_rnext_same.c
    1.5 06/05/12 18:26:39 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  myisam/ftbench/README
    1.3 06/05/12 18:26:39 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  myisam/ftbench/Ereport.pl
    1.4 06/05/12 18:26:38 kent@mysql.com +0 -0
    Change mode to -rwxrwxr--

  myisam/ftbench/Ecreate.pl
    1.2 06/05/12 18:26:38 kent@mysql.com +0 -0
    Change mode to -rwxrwxr--

  myisam/ftbench/Ecompare.pl
    1.3 06/05/12 18:26:38 kent@mysql.com +0 -0
    Change mode to -rwxrwxr--

  bdb/dist/s_dir
    1.2 06/05/12 18:26:38 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

ChangeSet
  1.1346.1.834 06/05/12 17:51:37 kent@mysql.com +19 -0
  Many files:
    Change mode to -rw-rw-r--
  dbug_add_tags.pl:
    Change mode to -rwxrwxr--

  support-files/mysql-multi.server.sh
    1.4 06/05/12 17:50:49 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  sql/sql_handler.cc
    1.19.1.30 06/05/12 17:50:49 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  scripts/mysql_secure_installation.sh
    1.3 06/05/12 17:50:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/rpl_free_items.test
    1.1.1.2 06/05/12 17:50:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/rpl_free_items-slave.opt
    1.3 06/05/12 17:50:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/rpl_commit_after_flush.test
    1.1.1.2 06/05/12 17:50:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/repair.test
    1.1.1.5 06/05/12 17:50:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/mix_innodb_myisam_binlog-master.opt
    1.3 06/05/12 17:50:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/innodb_handler.test
    1.2.1.6 06/05/12 17:50:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/handler.test
    1.7.1.11 06/05/12 17:50:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/ctype_tis620.test
    1.2.1.2 06/05/12 17:50:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/create_select_tmp.test
    1.1.1.2 06/05/12 17:50:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/bulk_replace.test
    1.2.1.1 06/05/12 17:50:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/std_data/trunc_binlog.001
    1.1.1.1 06/05/12 17:50:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/std_data/master-bin.001
    1.2.1.1 06/05/12 17:50:46 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/repair.result
    1.4.1.1 06/05/12 17:50:46 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/innodb_handler.result
    1.2.1.5 06/05/12 17:50:46 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  myisammrg/myrg_range.c
    1.2.1.1 06/05/12 17:50:46 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  dbug/dbug_add_tags.pl
    1.3 06/05/12 17:50:45 kent@mysql.com +0 -0
    Change mode to -rwxrwxr--

ChangeSet
  1.2122.13.6 06/05/12 17:34:36 gluh@eagle.intranet.mysql.r18.ru +3 -0
  Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes
  replaced get_field(MEM_ROOT *mem, Field *field) with 
  get_field(MEM_ROOT *mem, Field *field, String *res).
  It allows to avoid strlen().

  sql/sql_show.cc
    1.316 06/05/12 17:34:30 gluh@mysql.com +12 -11
    Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes
    replaced get_field(MEM_ROOT *mem, Field *field) with 
    get_field(MEM_ROOT *mem, Field *field, String *res).
    It allows to avoid strlen().

  mysql-test/t/information_schema.test
    1.78 06/05/12 17:34:30 gluh@mysql.com +11 -0
    Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes
    test case

  mysql-test/r/information_schema.result
    1.104 06/05/12 17:34:30 gluh@mysql.com +9 -0
    Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes
    test case

ChangeSet
  1.2122.18.1 06/05/12 12:31:22 tnurnberg@mysql.com +1 -0
  merge fixies BUG#10418 4.1 -> 5.0

  mysql-test/r/outfile.result
    1.6 06/05/12 12:26:52 tnurnberg@mysql.com +11 -10
    merge fixies BUG#10418 4.1 -> 5.0

ChangeSet
  1.2122.16.1 06/05/12 15:09:25 gluh@eagle.intranet.mysql.r18.ru +4 -0
  Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH

  sql/sql_show.cc
    1.315 06/05/12 15:07:56 gluh@mysql.com +1 -1
    Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH

  mysql-test/t/information_schema.test
    1.77 06/05/12 15:07:56 gluh@mysql.com +9 -0
    Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH
    test case

  mysql-test/r/join.result
    1.37 06/05/12 15:07:56 gluh@mysql.com +2 -2
    Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH
    result fix

  mysql-test/r/information_schema.result
    1.103 06/05/12 15:07:56 gluh@mysql.com +8 -0
    Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH
    test case

ChangeSet
  1.2098.20.11 06/05/12 13:55:21 kroki@mysql.com +12 -0
  Bug#14635: Accept NEW.x as INOUT parameters to stored procedures
  from within triggers
  
  Add support for passing NEW.x as INOUT and OUT parameters to stored
  procedures.  Passing NEW.x as INOUT parameter requires SELECT and
  UPDATE privileges on that column, and passing it as OUT parameter
  requires only UPDATE privilege.

  sql/sql_yacc.yy
    1.468 06/05/12 13:55:14 kroki@mysql.com +11 -3
    Set read_only and want_privilege members in Item_trigger_field
    appropriately.  For NEW.x trigger variable used in left-hand-side
    of SET statement the latter is set to UPDATE_ACL, otherwise it is
    set to SELECT_ACL (but see Item_trigger_field::set_required_privilege(),
    where it may be updated to different value).

  sql/sp_head.cc
    1.210 06/05/12 13:55:14 kroki@mysql.com +17 -49
    Use Settable_routine_parameter interface for parameter update.

  sql/share/errmsg.txt
    1.61.1.5 06/05/12 13:55:14 kroki@mysql.com +1 -1
    Update english ER_SP_NOT_VAR_ARG message.

  sql/item_func.h
    1.137.1.1 06/05/12 13:55:14 kroki@mysql.com +11 -1
    Item_func_get_user_var implements Settable_routine_parameter interface.

  sql/item_func.cc
    1.282.3.2 06/05/12 13:55:14 kroki@mysql.com +12 -0
    Add implementations of set_value() method of Settable_routine_parameter
    interface.

  sql/item.h
    1.194 06/05/12 13:55:14 kroki@mysql.com +93 -8
    Add interface class Settable_routine_parameter and interface query
    method to Item class.  Item_splocal and Item_trigger_field implement
    this interface.
    
    For Item_trigger_field:
     - add read_only attribute and is_read_only() method.
     - remove access_type and add original_privilege and want_privilege
       instead.
     - add set_value() method.
     - add reset_privilege() method.

  sql/item.cc
    1.219 06/05/12 13:55:14 kroki@mysql.com +27 -2
    Add implementations of set_value() and set_required_privilege() methods
    of Settable_routine_parameter interface.
    
    Use Item_trigger_field::want_privilege instead of
    Item_trigger_field::access_type.
    
    Reset privileges on Item_trigger_field::cleanup().

  mysql-test/t/trigger.test
    1.45 06/05/12 13:55:14 kroki@mysql.com +74 -0
    Add test case for bug#14635.

  mysql-test/t/trigger-grant.test
    1.7 06/05/12 13:55:14 kroki@mysql.com +173 -0
    Add test case for bug#14635.

  mysql-test/r/trigger.result
    1.40 06/05/12 13:55:14 kroki@mysql.com +56 -0
    Add result for bug#14635.

  mysql-test/r/trigger-grant.result
    1.4 06/05/12 13:55:14 kroki@mysql.com +84 -0
    Add result for bug#14635.

  mysql-test/r/sp-error.result
    1.106 06/05/12 13:55:13 kroki@mysql.com +2 -2
    Update the result for new message.

ChangeSet
  1.2098.24.3 06/05/12 11:29:31 msvensson@neptunus.(none) +2 -0
  Bug#18818 configure: No longer finds OpenSSL on Mac OS X
     - Remove usage of $shrext_cmds variable
     - Test for libs using all known library file endings

  config/ac-macros/zlib.m4
    1.9 06/05/12 11:29:26 msvensson@neptunus.(none) +5 -4
    Remove the usage of $shrext_cmds. instead test for all the library file
    endings we currently know, that is .a .so .sl and .dylib

  config/ac-macros/openssl.m4
    1.7 06/05/12 11:29:26 msvensson@neptunus.(none) +6 -4
    Remove the usage of $shrext_cmds. instead test for all the library file
    endings we currently know, that is .a .so .sl and .dylib

ChangeSet
  1.1616.2589.1 06/05/12 11:18:06 msvensson@neptunus.(none) +1 -0
  Bug#18818 configure: No longer finds OpenSSL on Mac OS X
   - Remove usage of $shrext_cmds variable
   - Test for libs using all known library file endings

  acinclude.m4
    1.123.20.1 06/05/12 11:18:02 msvensson@neptunus.(none) +11 -9
    Remove the usage of $shrext_cmds. instead test for all the library file
    endings we currently know, that is .a .so .sl and .dylib

ChangeSet
  1.2122.14.2 06/05/12 11:00:34 msvensson@neptunus.(none) +1 -0
  Correct spelling errors

  include/sslopt-longopts.h
    1.11 06/05/12 11:00:30 msvensson@neptunus.(none) +1 -1
    Correct spelling errors

ChangeSet
  1.2122.14.1 06/05/12 09:13:37 msvensson@neptunus.(none) +2 -0
  Bug#19709 rpl_tmporary fails on powermacg5
   - Don't kill the active connection to the server, instead read 
     the connection id, switch connection and kill the first one from there.

  mysql-test/t/rpl_temporary.test
    1.19 06/05/12 09:13:29 msvensson@neptunus.(none) +12 -2
    Don't kill our own connection to the server as the result code differs depending 
    on platform.

  mysql-test/r/rpl_temporary.result
    1.24 06/05/12 09:13:29 msvensson@neptunus.(none) +0 -2
    Update test result

ChangeSet
  1.2122.13.1 06/05/11 19:47:00 igor@rurik.mysql.com +2 -0
  Added a test case for bug #18940:in 5.0 the optimizer chose
  a worse execution plan than in 4.1 for some queries.
  It happened due the fact that at some conditions the 
  optimizer always preferred range or full index scan access
  methods to lookup access methods even when the latter were much
  cheaper. 
  The problem was not observed in 4.1 for the reported query
  because the WHERE condition was not of a form that could
  cause the problem.
  Equality propagation introduced on 5.0 added an extra 
  predicate and changed the WHERE condition. The new condition
  provoked the optimizer to make a bad choice.
  
  The problem was fixed by the patch for bug 17379.

  mysql-test/t/select.test
    1.101 06/05/11 19:46:54 igor@rurik.mysql.com +21 -0
    Added a test case for bug #18940.
    The problem was fixed by the patch for bug 17379.

  mysql-test/r/select.result
    1.123 06/05/11 19:46:54 igor@rurik.mysql.com +19 -0
    Added a test case for bug #18940.
    The problem was fixed by the patch for bug 17379.

ChangeSet
  1.1346.1.833 06/05/11 19:48:57 kent@mysql.com +1 -0
  configure.in:
    Stepped up to 4.0.28

  configure.in
    1.191.1.144 06/05/11 19:48:23 kent@mysql.com +1 -1
    Stepped up to 4.0.28

ChangeSet
  1.2122.1.4 06/05/11 21:15:37 svoj@april.(none) +3 -0
  BUG#12873 - BTREE index on MEMORY table with multiple NULL values
              doesn't work properly
  
  Unique BTREE index on MEMORY table refuse multiple NULL values.
  
  Fixed search_flag to allow multiple null values inside unique key.

  mysql-test/t/heap_btree.test
    1.17 06/05/11 21:15:33 svoj@april.(none) +8 -0
    Testcase for BUG#12873.

  mysql-test/r/heap_btree.result
    1.20 06/05/11 21:15:33 svoj@april.(none) +3 -0
    Testcase for BUG#12873.

  heap/hp_write.c
    1.23 06/05/11 21:15:33 svoj@april.(none) +1 -1
    Fixed search_flag to allow multiple null values inside unique key.

ChangeSet
  1.2084.129.1 06/05/11 16:29:02 mats@mysql.com +2 -0
  Bug#15886 (Test: Timing issue in test "rpl_until"):
  Changed format for SHOW SLAVE STATUS to vertical output.

  mysql-test/t/rpl_until.test
    1.21.1.1 06/05/11 16:28:54 mats@mysql.com +4 -4
    Changed format for SHOW SLAVE STATUS to vertical output

  mysql-test/r/rpl_until.result
    1.24 06/05/11 16:28:54 mats@mysql.com +136 -12
    Result change

ChangeSet
  1.2122.12.1 06/05/11 15:30:54 gkodinov@mysql.com +5 -0
  BUG#7549: Missing error message for invalid view selection with subquery.
  
  When a view statement is compiled on CREATE VIEW time, most of the 
  optimizations should not be done. Finding the right optimization 
  for a subquery is one of them.
  Unfortunately the optimizer is resolving the column references of 
  the left expression of IN subqueries in the process of deciding 
  witch optimization to use (if needed). So there should be a 
  special case in Item_in_subselect::fix_fields() : check the 
  validity of the left expression of IN subqueries in CREATE VIEW 
  mode and then proceed as normal. 

  sql/item_subselect.h
    1.77 06/05/11 15:30:49 gkodinov@mysql.com +1 -0
    fix_fields overloaded so it can prepare left_expr

  sql/item_subselect.cc
    1.124 06/05/11 15:30:49 gkodinov@mysql.com +11 -0
    overloaded fix_fields to fix the left_expr in prepare_view_mode

  mysql-test/t/subselect.test
    1.117 06/05/11 15:30:49 gkodinov@mysql.com +15 -0
    test case

  mysql-test/r/view.result
    1.155 06/05/11 15:30:49 gkodinov@mysql.com +1 -1
    chnaged explain due to column being resolved

  mysql-test/r/subselect.result
    1.140.1.1 06/05/11 15:30:49 gkodinov@mysql.com +8 -0
    test case

ChangeSet
  1.1616.2560.2 06/05/11 14:13:14 msvensson@neptunus.(none) +6 -0
  Bug#15328 Segmentation fault occured if my.cnf is invalid for escape sequence
   - Check that length of value is longer than 1 before decrementing length by 2.
   - Backport from 5.0, make it possible to use my_print_defaults in tests

  mysql-test/std_data/bug15328.cnf
    1.1 06/05/11 14:13:11 msvensson@neptunus.(none) +2 -0
    New BitKeeper file ``mysql-test/std_data/bug15328.cnf''

  mysql-test/std_data/bug15328.cnf
    1.0 06/05/11 14:13:11 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug15328/my41-bug15328/mysql-test/std_data/bug15328.cnf

  mysys/default.c
    1.43.1.7 06/05/11 14:13:10 msvensson@neptunus.(none) +3 -1
    Check that length of value is longer than 1 before deciding to decrement its length by 2.

  mysql-test/t/mysqldump.test
    1.19.6.1 06/05/11 14:13:10 msvensson@neptunus.(none) +8 -0
    Test that my_print default don't segfault when encountering an option without closing "

  mysql-test/r/mysqldump.result
    1.9.8.1 06/05/11 14:13:10 msvensson@neptunus.(none) +1 -0
    Update result

  mysql-test/mysql-test-run.sh
    1.208.16.1 06/05/11 14:13:10 msvensson@neptunus.(none) +3 -1
    Backport from 5.0, make it possible to use my_print_defaults from tests

  mysql-test/mysql-test-run.pl
    1.8.10.3 06/05/11 14:13:10 msvensson@neptunus.(none) +8 -0
    Backport from 5.0, make it possible to use my_print_defaults from tests

ChangeSet
  1.2122.2.2 06/05/11 12:58:45 pekka@mysql.com +2 -0
  ndb - bug#14509 (5.0) part 2: create SYSTAB_0 row on first use

  ndb/src/ndbapi/Ndb.cpp
    1.56 06/05/11 12:48:53 pekka@mysql.com +26 -7
    create SYSTAB_0 row on first use (use writeTuple).
    fix check of interpreted program return code

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
    1.28 06/05/11 12:46:41 pekka@mysql.com +4 -6
    do not pre-create tupleid values (the values were obsolete too).
    they are created on first use.
    this is easy way to handle rolling upgrade when number of tables is increased

ChangeSet
  1.1616.2586.3 06/05/10 21:53:01 kent@mysql.com +1 -0
  mysql.spec.sh:
    Compile in all character sets in Max (bug#14918)

  support-files/mysql.spec.sh
    1.83.5.3 06/05/10 21:51:21 kent@mysql.com +8 -1
    Compile in all character sets in Max (bug#14918)

ChangeSet
  1.2098.20.10 06/05/10 23:16:30 anozdrin@mysql.com +4 -0
  Fix for BUG#18587: Function that accepts and returns TEXT
  garbles data if longer than 766 chars.
  
  The problem is that a stored routine returns BLOBs to the previous
  caller, BLOBs are shallow-copied (i.e. only pointers to the data are
  copied). The fix is to also copy data of BLOBs.

  sql/item_func.cc
    1.282.3.1 06/05/10 23:16:27 anozdrin@mysql.com +1 -0
    Request copying BLOBs for the result table.

  sql/field_conv.cc
    1.55 06/05/10 23:16:27 anozdrin@mysql.com +2 -1
    Do not jump to optimization if the field type is BLOB and
    the destination table requires copying of BLOBs.

  mysql-test/t/sp.test
    1.187 06/05/10 23:16:27 anozdrin@mysql.com +47 -0
    Added a test case for BUG#18587.

  mysql-test/r/sp.result
    1.199 06/05/10 23:16:27 anozdrin@mysql.com +31 -0
    Updated result file.

ChangeSet
  1.2116.1.1 06/05/10 21:50:04 svoj@april.(none) +3 -0
  BUG#18233 - Memory tables INDEX USING HASH (a,b) returns 1 row on
              SELECT WHERE a= AND b=
  
  Selecting data from memory table with varchar column and hash index over it
  returns only first row matched.
  
  Problem was that key length calculation for varchar columns didn't include
  number of bytes to store length.
  
  Fixed key length for varchar fields to include number of bytes to store length.

  mysql-test/t/heap.test
    1.35 06/05/10 21:50:00 svoj@april.(none) +12 -0
    Testcase for BUG#18233.

  mysql-test/r/heap.result
    1.49 06/05/10 21:50:00 svoj@april.(none) +13 -0
    Testcase for BUG#18233.

  heap/hp_create.c
    1.23 06/05/10 21:50:00 svoj@april.(none) +2 -0
    Fixed key length for varchar fields to include number of bytes to store length.

ChangeSet
  1.2098.20.9 06/05/10 18:53:28 anozdrin@mysql.com +1 -0
  Make it compilable on Windows.

  server-tools/instance-manager/options.cc
    1.32 06/05/10 18:53:25 anozdrin@mysql.com +2 -0
    Make it compilable on Windows.

ChangeSet
  1.2122.11.1 06/05/10 17:40:20 sergefp@mysql.com +6 -0
  BUG#17379 Wrong reuse of E(#rows(range)) as E(#rows(ref(const))):
  Re-work best_access_path() and find_best() to reuse E(#rows(range access)) as
  E(#rows(ref[_or_null](const) access) only when it is appropriate.
  [This is the final cumulative patch]

  sql/table.h
    1.127 06/05/10 17:40:15 sergefp@mysql.com +1 -0
    BUG#17379: Wrong reuse of E(#rows(range)) as E(#rows(ref(const))):
    Make range optimizer together with TABLE::quick_* also return TABLE::quick_n_ranges

  sql/sql_select.cc
    1.416 06/05/10 17:40:15 sergefp@mysql.com +112 -19
    BUG#17379: Wrong reuse of E(#rows(range)) as E(#rows(ref(const))):
    Re-work best_access_path() to reuse E(#rows(range access)) as
    E(#rows(ref[_or_null](const) access) only when it is appropriate.

  sql/opt_range.cc
    1.210 06/05/10 17:40:15 sergefp@mysql.com +9 -2
    BUG#17379: Wrong reuse of E(#rows(range)) as E(#rows(ref(const))):
    Make range optimizer together with TABLE::quick_* also return TABLE::quick_n_ranges

  mysql-test/t/select.test
    1.100 06/05/10 17:40:15 sergefp@mysql.com +13 -0
    BUG#17379: Testcase

  mysql-test/r/subselect.result
    1.141 06/05/10 17:40:15 sergefp@mysql.com +1 -1
    BUG#17379: Updated test results

  mysql-test/r/select.result
    1.122 06/05/10 17:40:15 sergefp@mysql.com +16 -0
    BUG#17379: Testcase

ChangeSet
  1.2098.26.2 06/05/10 14:34:03 anozdrin@mysql.com +2 -0
  Commit forgotten changes for BUG#14106.

  mysql-test/r/im_options_unset.result
    1.2 06/05/10 14:34:00 anozdrin@mysql.com +3 -3
    Fixed result file.

  mysql-test/r/im_options_set.result
    1.2 06/05/10 14:34:00 anozdrin@mysql.com +3 -3
    Fixed result file.

ChangeSet
  1.2098.20.6 06/05/10 14:12:32 dlenev@mysql.com +1 -0
  Follow-up for the patch for bugs #12472/#15137 "CREATE TABLE ... SELECT ...
  which explicitly or implicitly uses stored function gives 'Table not locked'
  error"
  
  Test case for these bugs crashed in --ps-protocol mode. The crash was caused
  by incorrect usage of check_grant() routine from create_table_precheck()
  routine. The former assumes that either number of tables to be inspected by
  it is limited explicitly (i.e. is is not UINT_MAX) or table list used and
  thd->lex->query_tables_own_last value correspond to each other.
  create_table_precheck() was not fulfilling this condition and crash happened.
  The fix simply sets number of tables to be inspected by check_grant() to 1.

  sql/sql_parse.cc
    1.544 06/05/10 14:12:25 dlenev@mysql.com +1 -1
    create_table_precheck():
      At the moment when create_table_precheck() is called TABLE_LIST element
      representing table to be created does not belong to global table list
      therefore we should limit number of tables to be inspected by check_grant()
      explicitly (as in this case table list passed to this function does not
      correspond to thd->lex->query_tables_own_last value).

ChangeSet
  1.2122.8.3 06/05/09 22:22:46 cmiller@zippy.(none) +3 -0
  Bug#19564:  mysql displays NULL instead of space
  
  Correct a bug (that I introduced, after using Oracle's database software for 
  too many years) where the length of the database-sent data is incorrectly 
  used to infer NULLness.

  mysql-test/t/mysql.test
    1.10 06/05/09 22:22:42 cmiller@zippy.(none) +8 -0
    Add test and version marker

  mysql-test/r/mysql.result
    1.9 06/05/09 22:22:42 cmiller@zippy.(none) +10 -2
    Add result and version marker, and correct previous result.

  client/mysql.cc
    1.203.1.1 06/05/09 22:22:42 cmiller@zippy.(none) +1 -1
    No longer use the length of the data to infer whether it is NULL or not.

ChangeSet
  1.2098.25.1 06/05/09 13:31:46 acurtis@xiphis.org +8 -0
  bug#10952
    "alter table from MyISAM to MERGE lost data without errors and warnings"
    Add new handlerton flag which prevent user from altering table storage
    engine to storage engines which would lose data. Both 'blackhole' and 
    'merge' are marked with the new flag.
    Tests included.

  sql/sql_table.cc
    1.303.2.2 06/05/09 13:31:42 acurtis@xiphis.org +3 -1
    Bug#10952
      If alter is changing engine, check if new engine allows creating table
      via ALTER statement.

  sql/handler.h
    1.167.1.3 06/05/09 13:31:42 acurtis@xiphis.org +1 -0
    Bug#10952
      new handlerton flag

  sql/ha_myisammrg.cc
    1.77 06/05/09 13:31:42 acurtis@xiphis.org +1 -1
    Bug#10952
      shouldn't be able to alter a table into a merge

  sql/ha_blackhole.cc
    1.22 06/05/09 13:31:42 acurtis@xiphis.org +1 -1
    Bug#10952
      shouldn't be able to alter a table into a blackhole

  mysql-test/t/merge.test
    1.40 06/05/09 13:31:42 acurtis@xiphis.org +12 -0
    test for bug#10952

  mysql-test/t/blackhole.test
    1.7 06/05/09 13:31:42 acurtis@xiphis.org +12 -0
    test for bug#10952

  mysql-test/r/merge.result
    1.47 06/05/09 13:31:42 acurtis@xiphis.org +8 -0
    test for bug#10952

  mysql-test/r/blackhole.result
    1.7 06/05/09 13:31:42 acurtis@xiphis.org +8 -0
    test for bug#10952

ChangeSet
  1.1616.2587.1 06/05/09 23:01:31 aelkin@mysql.com +8 -0
  BUG#14157: utf8 encoding in binlog without set character_set_client e.g DROP temporary
  
  Binlog lacks encoding info about DROPped temporary table.
  
  Idea of the fix is to switch temporary to system_charset_info when a temporary table
  is DROPped for binlog. Since that is the server, that automatically, but not the client, who generates the query
  the binlog should be updated on the server's encoding for the coming DROP.
  The `write_binlog_with_system_charset()' is introduced to replace similar problematic places in the code.

  sql/sql_base.cc
    1.145.1.123 06/05/09 23:01:28 aelkin@mysql.com +1 -1
    Idea of the fix is to switch temporary to system_charset_info when a temporary table
    is DROPped for binlog. Since that is the server, not the client, who generates the query
    the binlog should be updated on server's encoding for the coming DROP.

  sql/mysql_priv.h
    1.186.91.49 06/05/09 23:01:28 aelkin@mysql.com +7 -0
    `write_binlog_with_system_charset()' is added to be called when a binlog event
    is created "implicitly" like DROP temporary table is case of closing connection.

  mysql-test/t/rpl_temporary.test
    1.13.1.3 06/05/09 23:01:27 aelkin@mysql.com +12 -0
    Check slave digests binlog with DROP temporary tables created in koi8r.

  mysql-test/t/mysqlbinlog.test
    1.8.1.9 06/05/09 23:01:27 aelkin@mysql.com +10 -1
    Check roll-forward recovery from binlog where there are DROP temporary tables created
    in koi8r.

  mysql-test/r/rpl_temporary.result
    1.3.1.11 06/05/09 23:01:27 aelkin@mysql.com +4 -0
    results changed

  mysql-test/r/mysqlbinlog.result
    1.3.1.8 06/05/09 23:01:27 aelkin@mysql.com +6 -1
    results changed

  mysql-test/r/mix_innodb_myisam_binlog.result
    1.6.1.7 06/05/09 23:01:27 aelkin@mysql.com +3 -2
    results changed

  mysql-test/r/drop_temp_table.result
    1.4.1.7 06/05/09 23:01:27 aelkin@mysql.com +1 -0
    results changed

ChangeSet
  1.2098.24.1 06/05/09 18:13:01 gkodinov@mysql.com +5 -0
  BUG#18068: SELECT DISTINCT (with duplicates and covering index)
  
  When converting DISTINCT to GROUP BY where the columns are from the covering
  index and they are quoted twice in the SELECT list the optimizer is creating
  improper processing sequence. This is because of the fact that the columns
  of the covering index are not recognized as such and treated as non-index
  columns.
  
  Generally speaking duplicate columns can safely be removed from the GROUP
  BY/DISTINCT list because this will not add or remove new rows in the
  resulting set. Duplicates can be removed even if they are not consecutive
  (as is the case for ORDER BY, where the duplicate columns can be removed
  only if they are consecutive).
  
  So we can safely transform "SELECT DISTINCT a,a FROM ... ORDER BY a" to
  "SELECT a,a FROM ... GROUP BY a ORDER BY a" instead of 
  "SELECT a,a FROM .. GROUP BY a,a ORDER BY a". We can even transform 
  "SELECT DISTINCT a,b,a FROM ... ORDER BY a,b" to
  "SELECT a,b,a FROM ... GROUP BY a,b ORDER BY a,b".
  
  The fix to this bug consists of checking for duplicate columns in the SELECT
  list when constructing the GROUP BY list in transforming DISTINCT to GROUP
  BY and skipping the ones that are already in.

  sql/sql_select.cc
    1.408.1.1 06/05/09 18:12:55 gkodinov@mysql.com +11 -0
    duplicates check and removal

  mysql-test/t/group_min_max.test
    1.21 06/05/09 18:12:55 gkodinov@mysql.com +16 -0
    test case for the bug

  mysql-test/t/distinct.test
    1.23 06/05/09 18:12:55 gkodinov@mysql.com +16 -0
    test case for the bug without loose index scan

  mysql-test/r/group_min_max.result
    1.23 06/05/09 18:12:55 gkodinov@mysql.com +22 -0
    test case for the bug

  mysql-test/r/distinct.result
    1.44 06/05/09 18:12:55 gkodinov@mysql.com +12 -0
    test case for the bug without loose index scan

ChangeSet
  1.2084.128.1 06/05/09 16:39:11 dlenev@mysql.com +6 -0
  Fix for bugs#12472/#15137 'CREATE TABLE ... SELECT ... which explicitly
  or implicitly uses stored function gives "Table not locked" error'
  
  CREATE TABLE ... SELECT ... statement which was explicitly or implicitly
  (through view) using stored function gave "Table not locked" error.
  
  The actual bug resides in the current locking scheme of CREATE TABLE SELECT
  code, which first opens and locks tables of the SELECT statement itself,
  and then, having SELECT tables locked, creates the .FRM, opens the .FRM and
  acquires lock on it. This scheme opens a possibility for a deadlock, which
  was present and ignored since version 3.23 or earlier. This scheme also
  conflicts with the invariant of the prelocking algorithm -- no table can
  be open and locked while there are tables locked in prelocked mode.
  
  The patch makes an exception for this invariant when doing CREATE TABLE ...
  SELECT, thus extending the possibility of a deadlock to the prelocked mode.
  We can't supply a better fix in 5.0.

  sql/sql_table.cc
    1.303.3.1 06/05/09 16:39:06 dlenev@mysql.com +0 -99
    Moved create_table_from_items() routine into sql_insert.cc, since it was not
    used anywhere outside of this file and contains logic which is specific for
    CREATE TABLE ... SELECT statement.

  sql/sql_insert.cc
    1.185.1.1 06/05/09 16:39:06 dlenev@mysql.com +147 -0
    Moved create_table_from_items() from sql_table.cc to sql_insert.cc as it was
    not used outside of sql_insert.cc and contains code which is specific for
    CREATE TABLE ... SELECT.
    Also now when we are executing CREATE TABLE ... SELECT ... statement which
    SELECT part requires execution in prelocked mode we ignore set of locked
    tables in order to get access to the table we just have created.
    We probably don't want to do this if we are under real LOCK TABLES since
    it will widen window for deadlock too much.

  sql/sql_base.cc
    1.330.3.1 06/05/09 16:39:06 dlenev@mysql.com +4 -1
    open_table():
      Added flag which allows open table ignoring set of locked tables and
      prelocked mode.

  sql/mysql_priv.h
    1.380.4.1 06/05/09 16:39:06 dlenev@mysql.com +2 -7
    Added flag which can be passed to open_table() routine in order to ignore
    set of locked tables and prelocked mode.
    We don't need declaration of create_table_from_items() any longer as it was
    moved into sql_insert.cc and made static.

  mysql-test/t/sp.test
    1.181.2.1 06/05/09 16:39:06 dlenev@mysql.com +23 -0
    Added tests for bugs#12472/#15137 'CREATE TABLE ... SELECT ... which
    explicitly or implicitly uses stored function gives "Table not locked" error'

  mysql-test/r/sp.result
    1.193.2.1 06/05/09 16:39:06 dlenev@mysql.com +25 -0
    Added tests for bugs#12472/#15137 'CREATE TABLE ... SELECT ... which
    explicitly or implicitly uses stored function gives "Table not locked" error'

ChangeSet
  1.1616.2586.1 06/05/09 11:55:41 mskold@mysql.com +1 -0
  bug #19623  UniqueHashIndexes resource leak: allocate array pool based on MaxNoOfTables

  ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
    1.9.1.1 06/05/09 11:54:46 mskold@mysql.com +1 -1
    bug #19623  UniqueHashIndexes resource leak: allocate array pool based on MaxNoOfTables

ChangeSet
  1.2111.2.2 06/05/09 11:01:50 msvensson@neptunus.(none) +1 -0
  BUG#16803 "ln -s /dev/null .mysql_history" doesn't work!
   - Add a check to see if the .mysql_history file a symlink to /dev/null 
     and in such case, skip reading and writing to it. 
       

  client/mysql.cc
    1.204 06/05/09 11:01:46 msvensson@neptunus.(none) +9 -1
    Add check to detect if the "mysql_history" file is a symlink to /dev/null.
    In that case, don't create histfile variable.
    That will make read_history and write_history to be skipped.

ChangeSet
  1.2122.4.1 06/05/08 16:38:45 jimw@mysql.com +8 -0
  Bug #1039: tmpdir and datadir not available via @@ system variable syntax
  Bug #19606: ssl variables are not displayed in show variables
  Bug #19616: log_queries_not_using_indexes  is not listed in show variables
  
    Make basedir, datadir, tmpdir, log_queries_not_using_indexes, ssl_ca,
    ssl_capath, ssl_cert, ssl_cipher, and ssl_key all available both from
    SHOW VARIABLES and as @@variables.
  
    As a side-effect of this change, log_queries_not_using_indexes can
    be changed at runtime (but only globally, not per-connection).

  sql/set_var.h
    1.75 06/05/08 16:38:42 jimw@mysql.com +29 -0
    Add new sys_var_constr_str_ptr class, for when we have a system variable
    that is only set via the command-line that is a pointer to a string.

  sql/set_var.cc
    1.155 06/05/08 16:38:42 jimw@mysql.com +66 -3
    Handle basedir, datadir, tmpdir, log_queries_not_using_indexes, and
    various ssl settings so that they are accessible as server variables
    and listed in SHOW VARIABLES.

  sql/mysqld.cc
    1.544.2.1 06/05/08 16:38:41 jimw@mysql.com +2 -1
    Handle opt_log_queries_not_using_indexes as extern, and define
    SSL_VARS_NO_STATIC so they can be accessed outside of mysqld.cc

  sql/mysql_priv.h
    1.383.1.2 06/05/08 16:38:41 jimw@mysql.com +1 -0
    Add extern for opt_log_queries_not_using_indexes

  mysql-test/t/variables.test
    1.58.1.1 06/05/08 16:38:41 jimw@mysql.com +30 -0
    Add new regression tests

  mysql-test/r/variables.result
    1.82.1.1 06/05/08 16:38:41 jimw@mysql.com +28 -0
    Add new results

  include/sslopt-vars.h
    1.5.1.1 06/05/08 16:38:41 jimw@mysql.com +11 -6
    Allow define of SSL_VARS_NOT_STATIC to prevent variables from not being
    made static.

  include/sslopt-longopts.h
    1.9.1.1 06/05/08 16:38:41 jimw@mysql.com +6 -6
    Put options in alphabetical order

ChangeSet
  1.2122.3.2 06/05/09 00:11:54 kent@mysql.com +1 -0
  

  configure.in
    1.388 06/05/09 00:10:19 kent@mysql.com +2 -2

ChangeSet
  1.2098.8.18 06/05/08 17:14:06 msvensson@neptunus.(none) +8 -0
  Remove valgrind and compiler warnings
  Add function 'vio_end' that will cleanup resources allocated by vio and the components it uses.

  vio/viosslfactories.c
    1.26 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +1 -1
    Import patch warnings.patch

  vio/vio.c
    1.28 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +13 -0
    Import patch warnings.patch

  vio/test-sslserver.c
    1.11 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +2 -2
    Import patch warnings.patch

  vio/test-sslclient.c
    1.9 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +1 -1
    Import patch warnings.patch

  vio/test-ssl.c
    1.10 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +2 -2
    Import patch warnings.patch

  sql/mysqld.cc
    1.546 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +2 -0
    Import patch warnings.patch

  libmysql/libmysql.c
    1.242 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +1 -0
    Import patch warnings.patch

  include/violite.h
    1.46 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +4 -0
    Import patch warnings.patch

ChangeSet
  1.2122.2.1 06/05/08 15:19:17 pekka@mysql.com +8 -0
  ndb - bug#14509, part 1: move autoincr pre-fetch from Ndb to local dict cache

  ndb/src/ndbapi/Ndbinit.cpp
    1.35 06/05/08 15:16:52 pekka@mysql.com +0 -4
    bug#14509, part 1
    move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
    remove private methods get/read/setTupleId by table name or table id

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.88 06/05/08 15:16:52 pekka@mysql.com +0 -4
    bug#14509, part 1
    move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
    remove private methods get/read/setTupleId by table name or table id

  ndb/src/ndbapi/Ndb.cpp
    1.55 06/05/08 15:16:52 pekka@mysql.com +84 -67
    bug#14509, part 1
    move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
    remove private methods get/read/setTupleId by table name or table id

  ndb/src/ndbapi/DictCache.hpp
    1.10 06/05/08 15:16:52 pekka@mysql.com +5 -0
    bug#14509, part 1
    move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
    remove private methods get/read/setTupleId by table name or table id

  ndb/src/ndbapi/DictCache.cpp
    1.16 06/05/08 15:16:52 pekka@mysql.com +2 -0
    bug#14509, part 1
    move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
    remove private methods get/read/setTupleId by table name or table id

  ndb/include/ndbapi/Ndb.hpp
    1.44 06/05/08 15:16:52 pekka@mysql.com +7 -14
    bug#14509, part 1
    move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
    remove private methods get/read/setTupleId by table name or table id

  mysql-test/t/ndb_alter_table.test
    1.31 06/05/08 15:16:52 pekka@mysql.com +16 -1
    bug#14509, part 1
    move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
    remove private methods get/read/setTupleId by table name or table id

  mysql-test/r/ndb_alter_table.result
    1.33 06/05/08 15:16:52 pekka@mysql.com +22 -1
    bug#14509, part 1
    move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
    remove private methods get/read/setTupleId by table name or table id

ChangeSet
  1.2122.1.1 06/05/08 14:59:29 tnurnberg@mysql.com +3 -0
  Bug#19263: variables.test doesn't clean up after itself
  
  save global server variables before fiddling with them and restore them later

  mysql-test/t/variables.test
    1.59 06/05/08 14:59:25 tnurnberg@mysql.com +62 -0
    save and restore globals

  mysql-test/r/variables.result
    1.83 06/05/08 14:59:25 tnurnberg@mysql.com +54 -0
    save and restore globals

  BitKeeper/deleted/.del-variables-master.opt~8a6cb6459b54545
    1.8 06/05/08 14:53:28 tnurnberg@mysql.com +0 -0
    Delete: mysql-test/t/variables-master.opt

ChangeSet
  1.1616.2144.119 06/05/08 04:37:58 tnurnberg@mysql.com +5 -0
  Bug#10418: LOAD_FILE does not behave like in manual if file does not exist
  
  load_file() string-function should return NULL rather than throw an error if
  the file doesn't exist, as per the manual.

  sql/item_strfunc.cc
    1.196.6.8 06/05/08 03:39:19 tnurnberg@mysql.com +1 -1
    load_file() should return NULL as per the docs if file not found,
    rather than throw an error

  mysql-test/r/func_str.result
    1.70.1.29 06/05/08 03:38:08 tnurnberg@mysql.com +7 -0
    expect NULL rather than error if file given to load_file() doesn't exist

  mysql-test/r/outfile.result
    1.3.1.1 06/05/08 03:38:00 tnurnberg@mysql.com +11 -11
    expect NULL rather than error if file given to load_file() doesn't exist

  mysql-test/t/func_str.test
    1.64.1.17 06/05/08 03:37:13 tnurnberg@mysql.com +8 -1
    show that load_file() will return NULL rather than throw an error
    if file doesn't exist

  mysql-test/t/outfile.test
    1.11.1.1 06/05/08 03:36:18 tnurnberg@mysql.com +0 -1
    expect NULL rather than error if file given to load_file() doesn't exist

ChangeSet
  1.2120.1.2 06/05/07 16:14:43 igor@rurik.mysql.com +3 -0
  Post-merge fixes.

  sql/sql_prepare.cc
    1.178 06/05/07 16:14:38 igor@rurik.mysql.com +15 -12
    Post-merge fixes.

  sql/sql_lex.cc
    1.183 06/05/07 16:14:38 igor@rurik.mysql.com +1 -1
    Post-merge fixes.

  mysql-test/r/rpl_user_variables.result
    1.14.1.2 06/05/07 16:14:38 igor@rurik.mysql.com +30 -29
    Post-merge fixes.

ChangeSet
  1.2118.1.2 06/05/07 19:54:57 aelkin@mysql.com +1 -0
  Bug#19136: Crashing log-bin and uninitialized user variables in a derived table
  
  recalculating results

  mysql-test/r/rpl_user_variables.result
    1.16 06/05/07 19:54:51 aelkin@mysql.com +1 -0
    fixing results

ChangeSet
  1.2120 06/05/07 19:01:49 sergefp@mysql.com +1 -0
  BUG#16798: Merge into 5.0: s/used_tables()/!const_item()/, added comment about its effects.

  sql/sql_select.cc
    1.411 06/05/07 19:01:43 sergefp@mysql.com +14 -2
    BUG#16798: Merge into 5.0: s/used_tables()/!const_item()/, added comment about its effects.

ChangeSet
  1.2118.2.1 06/05/07 18:07:08 sergefp@mysql.com +1 -0
  Refactoring: Factor out common code from find_best() and best_access_path(): make 
  find_best() call best_access_path().

  sql/sql_select.cc
    1.409.2.1 06/05/07 18:07:01 sergefp@mysql.com +5 -338
    Refactoring: Factor out common code from find_best() and best_access_path(): make 
    find_best() call best_access_path().

ChangeSet
  1.1616.2144.117 06/05/06 23:48:13 igor@rurik.mysql.com +6 -0
  Fixed bug #14927.
  A query with a group by and having clauses could return a wrong
  result set if the having condition contained a constant conjunct 
  evaluated to FALSE.
  It happened because the pushdown condition for table with
  grouping columns lost its constant conjuncts.
  Pushdown conditions are always built by the function make_cond_for_table
  that ignores constant conjuncts. This is apparently not correct when
  constant false conjuncts are present.
  

  sql/sql_select.cc
    1.216.125.5 06/05/06 23:48:09 igor@rurik.mysql.com +19 -9
    Fixed bug #14927.
    Performed evaluation of constant expressions in having clauses.
    If the having condition contains a constant conjunct that is always false
    an empty result set is returned after the optimization phase.
    In this case the corresponding EXPLAIN command now returns 
    "Impossible HAVING" in the last column.
    

  sql/sql_prepare.cc
    1.34.36.2 06/05/06 23:48:09 igor@rurik.mysql.com +8 -2
    Fixed bug #14927.
    Added code to restore havinf conditions for execution in SP and PS.
    

  sql/sql_lex.h
    1.102.41.2 06/05/06 23:48:09 igor@rurik.mysql.com +1 -0
    Fixed bug #14927.
    Added a field to restore having condititions for execution in SP and PS.
    

  sql/sql_lex.cc
    1.97.21.1 06/05/06 23:48:09 igor@rurik.mysql.com +2 -0
    Fixed bug #14927.
    Initialized fields for having conditions in  st_select_lex::init_query().

  mysql-test/t/having.test
    1.11.2.1 06/05/06 23:48:09 igor@rurik.mysql.com +16 -0
    Added a test case for bug #14927.

  mysql-test/r/having.result
    1.10.2.1 06/05/06 23:48:09 igor@rurik.mysql.com +17 -0
    Added a test case for bug #14927.

ChangeSet
  1.1616.2582.1 06/05/06 18:24:41 kroki@mysql.com +2 -0
  Fix race condition in the test for bug#16501.

  mysql-test/t/func_misc.test
    1.11.1.4 06/05/06 18:24:37 kroki@mysql.com +3 -1
    Fix race condition in the test for bug#16501.

  mysql-test/r/func_misc.result
    1.16.1.3 06/05/06 18:24:37 kroki@mysql.com +2 -2
    Update the result.

ChangeSet
  1.2098.22.1 06/05/06 13:57:56 anozdrin@mysql.com +7 -0
  Partial fix for BUG#14106: IM: im_life_cycle and im_utils
  tests fail on FreeBSD.
  
  The patch contains of the following:
    - make Instance Manager, running in the daemon mode, dump
      the pid of angel-process in the special file;
    - default value of angel-pid-file-name is 'mysqlmanager.angel.pid';
    - if ordinary (IM) pid-file-name is specified in the configuration,
      angel-pid-file-name is updated according to the following
      rule: extension of the basename of pid-file-name is replaced by
      '.angel.pid.
      For example:
      - pid-file-name: /tmp/im.pid
        => angel-pid-file-name: /tmp/im.angel.pid
      - pid-file-name: /tmp/im.txt
        => angel-pid-file-name: /tmp/im.angel.pid
      - pid-file-name: /tmp/5.0/im
        => angel-pid-file-name: /tmp/5.0/im.angel.pid
    - add support for configuration option to customize angel
      pid file name;
    - fix test suite to use angel pid to kill Instance Manager
      by all means if something went wrong.
  
  Background
  ----------
  
  The problem is that on some OSes (FreeBSD for one) Instance
  Manager does not get SIGTERM, so can not shutdown gracefully.
  Test suite wasn't able to cope with it, so this leads to the
  mess in test results.
  
  The problem should be split into two:
    - fix signal handling;
    - fix test suite.
  
  This patch fixes test suite so that it will be able to kill
  uncooperative Instance Manager. In order to achieve this,
  test suite needs to know PID of IM Angel process.

  server-tools/instance-manager/options.h
    1.15 06/05/06 13:57:53 anozdrin@mysql.com +1 -0
    Added an option to allow to customize angel pid file name.

  server-tools/instance-manager/options.cc
    1.31 06/05/06 13:57:53 anozdrin@mysql.com +56 -1
    Added an option to allow to customize angel pid file name.

  server-tools/instance-manager/mysqlmanager.cc
    1.17 06/05/06 13:57:53 anozdrin@mysql.com +8 -0
    Dump PID of angel process into file.

  server-tools/instance-manager/manager.h
    1.5 06/05/06 13:57:53 anozdrin@mysql.com +2 -0
    Made create_pid_file() available for the whole project. 

  server-tools/instance-manager/manager.cc
    1.32 06/05/06 13:57:53 anozdrin@mysql.com +9 -4
    Made create_pid_file() available for the whole project.

  mysql-test/mysql-test-run.pl
    1.91.1.1 06/05/06 13:57:53 anozdrin@mysql.com +73 -13
    Changed procedure of stopping Instance Manager.
    1. Try to stop IM normally (by sending SIGTERM);
    2. If one of IM-related processes is still alive,
    kill them all by SIGKILL and complain in the log.

  mysql-test/lib/mtr_process.pl
    1.32 06/05/06 13:57:53 anozdrin@mysql.com +20 -0
    Added a function to send a signal to a process.

ChangeSet
  1.2098.20.4 06/05/06 13:51:35 dlenev@mysql.com +1 -0
  Fix for bug #17260 "Multiple invocations of triggers or stored functions
  hog memory".
  
  During each invocation of stored function or trigger some objects which
  lifetime is one function call (e.g. sp_rcontext) were allocated on
  arena/memroot of calling statement. This led to consumption of fixed amount
  of memory for each function/trigger invocation and so statements which
  involve lot of them were hogging memory. This in its return led to OOM
  crashes or freezes.
  
  This fix introduces new memroot and arena for objects which lifetime is
  whole duration of function call. So all memory consumed by such objects
  is freed at the end of function call.

  sql/sp_head.cc
    1.209 06/05/06 13:51:31 dlenev@mysql.com +87 -68
    sp_head::execute_function():
      Introduced new memroot and arena for objects which lifetime is whole
      duration of function call (e.g. sp_rcontext, sp_cursor). We can't
      use caller's arena/memroot for those objects because in this case 
      some fixed amount of memory will be consumed for each function/trigger
      invocation and so statements which involve lot of them will hog memory.
      Got rid of param_values array to avoid excessive juggling with arenas.

ChangeSet
  1.1616.2580.1 06/05/06 13:15:00 sergefp@mysql.com +3 -0
  BUG#16798: Inapplicable ref_or_null query plan and bad query result on random occasions 
  The bug was as follows: When merge_key_fields() encounters "t.key=X OR t.key=Y" it will 
  try to join them into ref_or_null access via "t.key=X OR NULL". In order to make this 
  inference it checks if Y<=>NULL, ignoring the fact that value of Y may be not yet known.
  
  The fix is that the check if Y<=>NULL is made only if value of Y is known (i.e. it is a
  constant).
  TODO: When merging to 5.0, replace used_tables() with const_item() everywhere in merge_key_fields().

  sql/sql_select.cc
    1.216.125.4 06/05/06 13:14:50 sergefp@mysql.com +2 -1
    BUG#16798: Inapplicable ref_or_null query plan and bad query result on random occasions 
    In merge_key_fields() don't call val->is_null() if the value of val is not known.

  mysql-test/t/innodb_mysql.test
    1.3 06/05/06 13:14:50 sergefp@mysql.com +55 -1
    Testcase for BUG16798

  mysql-test/r/innodb_mysql.result
    1.3 06/05/06 13:14:49 sergefp@mysql.com +56 -1
    Testcase for BUG16798

ChangeSet
  1.2116 06/05/06 11:25:59 kroki@mysql.com +3 -0
  Reapply fix for bug#16372 (Server crashes when test 'conc_sys' is running)
  after merge.
  
  Concurrent read and update of privilege structures (like simultaneous
  run of SHOW GRANTS and ADD USER) could result in server crash.
  
  Ensure that proper locking of ACL structures is done.
  
  No test case is provided because this bug can't be reproduced
  deterministically.

  sql/sql_parse.cc
    1.542.1.1 06/05/06 11:25:53 kroki@mysql.com +2 -2
    Use is_acl_user() instead of check_acl_user().

  sql/sql_acl.h
    1.50 06/05/06 11:25:53 kroki@mysql.com +0 -1
    Remove check_acl_user() declaration.

  sql/sql_acl.cc
    1.190.1.2 06/05/06 11:25:53 kroki@mysql.com +61 -47
    Ensure that access to ACL data is protected by acl_cache->lock mutex.
    Use system_charset_info for host names consistently.
    Remove check_acl_user().  Use find_acl_user() instead.

ChangeSet
  1.2098.20.3 06/05/06 09:41:24 kroki@mysql.com +1 -0
  Fix race condition of concurrent RENAME and SHOW TABLES which caused
  random test failures.

  mysql-test/t/rename.test
    1.12 06/05/06 09:41:07 kroki@mysql.com +7 -1
    Fix race condition and add cleanup code.

ChangeSet
  1.1616.2579.1 06/05/05 17:18:47 mskold@mysql.com +7 -0
  Bug#16997  Table rename that changes database does not rename indexes, recreate indexes in new database

  sql/ha_ndbcluster.cc
    1.114.3.64 06/05/05 17:18:37 mskold@mysql.com +40 -1
    Bug#16997  Table rename that changes database does not rename indexes, recreate indexes in new database

  ndb/src/ndbapi/NdbDictionaryImpl.hpp
    1.18.1.4 06/05/05 17:18:37 mskold@mysql.com +16 -6
    Bug#16997  Table rename that changes database does not rename indexes, recreate indexes in new database

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.38.1.17 06/05/05 17:18:37 mskold@mysql.com +5 -22
    Bug#16997  Table rename that changes database does not rename indexes, recreate indexes in new database

  ndb/src/ndbapi/NdbDictionary.cpp
    1.14.1.9 06/05/05 17:18:37 mskold@mysql.com +16 -0
    Bug#16997  Table rename that changes database does not rename indexes, recreate indexes in new database

  ndb/include/ndbapi/NdbDictionary.hpp
    1.11.1.12 06/05/05 17:18:37 mskold@mysql.com +20 -3
    Bug#16997  Table rename that changes database does not rename indexes, recreate indexes in new database

  mysql-test/t/ndb_rename.test
    1.1 06/05/05 17:15:34 mskold@mysql.com +32 -0

  mysql-test/r/ndb_rename.result
    1.1 06/05/05 17:15:34 mskold@mysql.com +14 -0

  mysql-test/t/ndb_rename.test
    1.0 06/05/05 17:15:34 mskold@mysql.com +0 -0
    BitKeeper file /home/marty/MySQL/mysql-4.1/mysql-test/t/ndb_rename.test

  mysql-test/r/ndb_rename.result
    1.0 06/05/05 17:15:34 mskold@mysql.com +0 -0
    BitKeeper file /home/marty/MySQL/mysql-4.1/mysql-test/r/ndb_rename.result

ChangeSet
  1.2098.17.8 06/05/05 10:35:12 msvensson@shellback.(none) +2 -0
  Import from yaSSL

  extra/yassl/testsuite/test.hpp
    1.1.1.2 06/05/05 10:32:04 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/include/openssl/ssl.h
    1.10 06/05/05 10:26:02 msvensson@shellback.(none)[msvensson] +8 -1
    Import patch yassl.diff

ChangeSet
  1.2098.17.7 06/05/05 10:33:04 msvensson@shellback.(none) +15 -0
  Import from yaSSL

ChangeSet
  1.1616.2577.4 06/05/05 11:21:21 aelkin@mysql.com +3 -0
  Bug#19136: Crashing log-bin and uninitialized user variables in a derived table
  
  The reason of the bug is in that `get_var_with_binlog' performs missed
  assingment of
  the variables as side-effect. Doing that it eventually calls
  `free_underlaid_joins' to pass as an argument `thd->lex->select_lex' of the lex
  which belongs to the user query, not 
  to one which is emulated i.e SET @var1:=NULL.
  
  
  `get_var_with_binlog' is refined to supply a temporary lex to sql_set_variables's stack.

  sql/item_func.cc
    1.124.46.1 06/05/05 11:21:18 aelkin@mysql.com +10 -0
    BUG#19136: Crashing log-bin and uninitialized user variables
    
    The reason of the bug is in that how `get_var_with_binlog' performs missed
    assingment of the variables: `free_underlaid_joins' gets as an argument `thd->lex->select_lex'
    which belongs to the user query, not to one which is emulated i.e SET @var1:=NULL.
    
    `get_var_with_binlog' is refined to supply a temporary lex to sql_set_variables's stack.
    

  mysql-test/t/rpl_user_variables.test
    1.4.1.4 06/05/05 11:21:17 aelkin@mysql.com +6 -0
    a problematic query to be binlogged is added

  mysql-test/r/rpl_user_variables.result
    1.5.1.6 06/05/05 11:21:17 aelkin@mysql.com +1 -0
    results changed

  extra/yassl/testsuite/testsuite.cpp
    1.3 06/05/04 22:23:39 msvensson@shellback.(none)[msvensson] +1 -0
    Import patch yassl.diff

  extra/yassl/testsuite/make.bat
    1.2 06/05/04 22:23:39 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/test/make.bat
    1.2 06/05/04 22:23:39 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/src/make.bat
    1.1.1.2 06/05/04 22:23:39 msvensson@shellback.(none)[msvensson] +0 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/benchmark/make.bat
    1.2 06/05/04 22:23:39 msvensson@shellback.(none)[msvensson] +2 -3
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp
    1.16 06/05/04 22:23:10 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/src/yassl_imp.cpp
    1.8 06/05/04 22:23:10 msvensson@shellback.(none)[msvensson] +3 -1
    Import patch yassl.diff

  extra/yassl/src/ssl.cpp
    1.12.1.1 06/05/03 19:20:53 msvensson@shellback.(none)[msvensson] +49 -45
    Import patch yassl.diff

  extra/yassl/src/make.bat
    1.2 06/05/04 22:23:10 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/include/yassl_types.hpp
    1.12 06/05/04 22:23:38 msvensson@shellback.(none)[msvensson] +0 -4
    Import patch yassl.diff

  extra/yassl/include/openssl/ssl.h
    1.9 06/05/04 22:23:38 msvensson@shellback.(none)[msvensson] +6 -0
    Import patch yassl.diff

  extra/yassl/examples/server/server.cpp
    1.2 06/05/04 22:23:38 msvensson@shellback.(none)[msvensson] +2 -0
    Import patch yassl.diff

  extra/yassl/examples/echoserver/echoserver.cpp
    1.2 06/05/04 22:23:38 msvensson@shellback.(none)[msvensson] +2 -0
    Import patch yassl.diff

  extra/yassl/examples/echoclient/echoclient.cpp
    1.2 06/05/04 22:23:38 msvensson@shellback.(none)[msvensson] +1 -0
    Import patch yassl.diff

  extra/yassl/examples/client/client.cpp
    1.3 06/05/04 22:23:38 msvensson@shellback.(none)[msvensson] +2 -0
    Import patch yassl.diff

ChangeSet
  1.2109.1.2 06/05/05 00:53:34 pekka@mysql.com +5 -0
  ndb - bug#17421, changes NDB API pushdown LIKE arg to plain char

  ndb/src/common/util/NdbSqlUtil.cpp
    1.31 06/05/05 00:52:29 pekka@mysql.com +13 -11
    bug#17421, changes NDB API pushdown LIKE arg to plain char

  ndb/include/util/NdbSqlUtil.hpp
    1.25 06/05/05 00:52:29 pekka@mysql.com +3 -6
    bug#17421, changes NDB API pushdown LIKE arg to plain char

  ndb/include/ndbapi/NdbOperation.hpp
    1.34 06/05/05 00:52:29 pekka@mysql.com +4 -0
    bug#17421, changes NDB API pushdown LIKE arg to plain char

  mysql-test/t/ndb_condition_pushdown.test
    1.17 06/05/05 00:52:29 pekka@mysql.com +37 -0
    bug#17421, changes NDB API pushdown LIKE arg to plain char

  mysql-test/r/ndb_condition_pushdown.result
    1.18 06/05/05 00:52:28 pekka@mysql.com +60 -0
    bug#17421, changes NDB API pushdown LIKE arg to plain char

ChangeSet
  1.2109.2.2 06/05/05 00:27:12 jani@ua141d10.elisa.omakaista.fi +1 -0
  Added more comments to the test cases.

  mysql-test/t/date_formats.test
    1.18 06/05/05 00:27:08 jani@ua141d10.elisa.omakaista.fi +8 -0
    Added more comments to the test cases.

ChangeSet
  1.2109.1.1 06/05/04 16:21:10 paul@polar.kitebird.com +1 -0
  .del-changelog-5.0.xml~f4c50926ccdd7434:
    Delete: Docs/changelog-5.0.xml

  BitKeeper/deleted/.del-changelog-5.0.xml~f4c50926ccdd7434
    1.2 06/05/04 16:21:01 paul@polar.kitebird.com +0 -0
    Delete: Docs/changelog-5.0.xml

ChangeSet
  1.1616.2569.9 06/05/04 16:16:18 paul@polar.kitebird.com +1 -0
  .del-changelog-4.1.xml~8aa496ebed09d868:
    Delete: Docs/changelog-4.1.xml

  BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868
    1.2 06/05/04 16:16:10 paul@polar.kitebird.com +0 -0
    Delete: Docs/changelog-4.1.xml

ChangeSet
  1.1346.1.831 06/05/04 16:14:19 paul@polar.kitebird.com +1 -0
  .del-changelog-4.0.xml~8f56ee8a913e848b:
    Delete: Docs/changelog-4.0.xml

  BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b
    1.3 06/05/04 16:14:05 paul@polar.kitebird.com +0 -0
    Delete: Docs/changelog-4.0.xml

ChangeSet
  1.2106.1.2 06/05/04 22:19:31 monty@mysql.com +4 -0
  Fixed wrong free in sql_view.cc
  mysql-test-run now fails in case of warnings

  sql/sql_view.cc
    1.88 06/05/04 22:19:28 monty@mysql.com +3 -2
    Fixed problem with unaligned memory (wrong free)

  sql/sql_lex.cc
    1.181 06/05/04 22:19:28 monty@mysql.com +5 -1
    Initalize st_lex properly

  mysql-test/mysql-test-run.sh
    1.304 06/05/04 22:19:28 monty@mysql.com +7 -5
    Fail if find warnings

  mysql-test/lib/mtr_report.pl
    1.22 06/05/04 22:19:28 monty@mysql.com +4 -2
    Fail if find warnings

ChangeSet
  1.2108 06/05/04 21:21:22 jani@ua141d10.elisa.omakaista.fi +1 -0
  Fixed a test case that got broken during merge.

  mysql-test/r/symlink.result
    1.23 06/05/04 21:21:17 jani@ua141d10.elisa.omakaista.fi +1 -1
    Fixed a test case that got broken during merge.

ChangeSet
  1.1616.2578.2 06/05/04 20:19:37 jani@ua141d10.elisa.omakaista.fi +3 -0
  Fixed Bug#11324:
  TIME_FORMAT using "%l:%i" returns 36:00 with 24:00:00 in TIME column

  sql/item_timefunc.cc
    1.51.4.2 06/05/04 20:19:33 jani@ua141d10.elisa.omakaista.fi +1 -1
    Fixed Bug#11324:
    TIME_FORMAT using "%l:%i" returns 36:00 with 24:00:00 in TIME column

  mysql-test/t/date_formats.test
    1.11.1.6 06/05/04 20:19:33 jani@ua141d10.elisa.omakaista.fi +11 -0
    Added test case for Bug#11324,
    "TIME_FORMAT using "%l:%i" returns 36:00 with 24:00:00 in TIME column"

  mysql-test/r/date_formats.result
    1.15.1.5 06/05/04 20:19:33 jani@ua141d10.elisa.omakaista.fi +18 -0
    Added test case for Bug#11324,
    "TIME_FORMAT using "%l:%i" returns 36:00 with 24:00:00 in TIME column"

ChangeSet
  1.1616.2578.1 06/05/04 19:31:10 jani@ua141d10.elisa.omakaista.fi +3 -0
  Fix for Bug#11326.

  sql/item_timefunc.cc
    1.51.4.1 06/05/04 19:31:06 jani@ua141d10.elisa.omakaista.fi +2 -1
    Fix for Bug#11326.

  mysql-test/t/date_formats.test
    1.11.1.5 06/05/04 19:31:06 jani@ua141d10.elisa.omakaista.fi +11 -0
    Added test cases for Bug#11326

  mysql-test/r/date_formats.result
    1.15.1.4 06/05/04 19:31:06 jani@ua141d10.elisa.omakaista.fi +18 -0
    Added test cases for Bug#11326

ChangeSet
  1.2098.8.16 06/05/04 17:47:25 msvensson@neptunus.(none) +4 -0
  Bug#18474 Unlistable directories yield no info from information_schema, part2
   - Move "chmod" part of information_schema test to separate file

  mysql-test/t/information_schema_chmod.test
    1.1 06/05/04 17:47:21 msvensson@neptunus.(none) +20 -0
    Move "chmod" part of information_schema test to separate file

  mysql-test/r/information_schema_chmod.result
    1.1 06/05/04 17:47:21 msvensson@neptunus.(none) +5 -0
    Move "chmod" part of information_schema test to separate file

  mysql-test/t/information_schema_chmod.test
    1.0 06/05/04 17:47:21 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-bug18474/mysql-test/t/information_schema_chmod.test

  mysql-test/t/information_schema.test
    1.76 06/05/04 17:47:21 msvensson@neptunus.(none) +0 -9
    Move "chmod" part of information_schema test to separate file

  mysql-test/r/information_schema_chmod.result
    1.0 06/05/04 17:47:21 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-bug18474/mysql-test/r/information_schema_chmod.result

  mysql-test/r/information_schema.result
    1.102 06/05/04 17:47:21 msvensson@neptunus.(none) +0 -5
    Move "chmod" part of information_schema test to separate file

ChangeSet
  1.2098.8.15 06/05/04 17:44:09 msvensson@neptunus.(none) +1 -0
  Move "check_running_as_root" to after var directory has been created

  mysql-test/mysql-test-run.pl
    1.89.1.7 06/05/04 17:44:04 msvensson@neptunus.(none) +1 -1
    Move "check_running_as_root" to after var directory has been created

ChangeSet
  1.2102.2.3 06/05/04 17:11:40 monty@mysql.com +1 -0
  Fixed an (unlikely) memory leak

  sql/sql_view.cc
    1.87 06/05/04 17:11:35 monty@mysql.com +1 -0
    Fixed an (unlikely) memory leak

ChangeSet
  1.2102.4.1 06/05/04 17:05:21 jani@ua141d10.elisa.omakaista.fi +2 -0
  Added test case for Bug#18712: Truncation problem. The test
  is only to make sure that this will not be fixed, as it is
  intended behaviour. Documentation will be improved accordingly.

  mysql-test/t/select.test
    1.99 06/05/04 17:05:16 jani@ua141d10.elisa.omakaista.fi +15 -0
    Added test case for Bug#18712: Truncation problem. The test
    is only to make sure that this will not be fixed, as it is
    intended behaviour. Documentation will be improved accordingly.

  mysql-test/r/select.result
    1.121 06/05/04 17:05:16 jani@ua141d10.elisa.omakaista.fi +21 -0
    Added test case for Bug#18712: Truncation problem. The test
    is only to make sure that this will not be fixed, as it is
    intended behaviour. Documentation will be improved accordingly.

ChangeSet
  1.2102.3.1 06/05/04 15:30:38 monty@mysql.com +4 -0
  Fixed memory leak in sql_parse.cc (lex_end() was not called)
  This caused sp-vars.test to fail

  sql/sp_head.h
    1.83 06/05/04 15:30:35 monty@mysql.com +3 -0
    Fixed memory leak in sql_parse.cc

  sql/sp_head.cc
    1.207.1.1 06/05/04 15:30:35 monty@mysql.com +4 -0
    Fixed memory leak in sql_parse.cc

  sql/sp.cc
    1.112 06/05/04 15:30:35 monty@mysql.com +1 -1
    Fixed memory leak in sql_parse.cc

  sql/item_func.h
    1.138 06/05/04 15:30:35 monty@mysql.com +1 -0
    Removed compiler warning

ChangeSet
  1.2102.2.1 06/05/04 15:52:09 svoj@april.(none) +1 -0
  Fixed heap_btree test failure on 64-bit boxes.

  mysql-test/t/heap_btree.test
    1.16 06/05/04 15:52:05 svoj@april.(none) +2 -0
    Fixed heap_btree test failure on 64-bit boxes.

ChangeSet
  1.1616.2575.1 06/05/04 15:34:20 ramil@mysql.com +1 -0
  Fix for bug #18351: mysqlbinlog does not set default charset?
  

  client/mysqlbinlog.cc
    1.84.4.2 06/05/04 15:34:13 ramil@mysql.com +17 -0
    Fix for bug #18351: mysqlbinlog does not set default charset?
      - --set-charset option added to allow one deal with old binlog files.
        It adds 'SET NAMES charset' to the output.

ChangeSet
  1.2098.8.14 06/05/04 10:30:08 msvensson@neptunus.(none) +2 -0
  Fix warnings

  vio/viosslfactories.c
    1.25 06/05/04 10:30:04 msvensson@neptunus.(none) +1 -1
    Remove warning about wrong cast

  vio/viossl.c
    1.34 06/05/04 10:30:04 msvensson@neptunus.(none) +31 -29
    Remove warnings about unused variables

ChangeSet
  1.2098.8.13 06/05/04 10:28:49 msvensson@neptunus.(none) +1 -0
  Put the "test_running_as_root.txt" file in the vardir to avoid that two mysql-test-run's running in parallel uses the same file

  mysql-test/mysql-test-run.pl
    1.89.1.6 06/05/04 10:28:45 msvensson@neptunus.(none) +1 -1
    Put the "test_running_as_root.txt" file in the vardir to avoid that two mysql-test-run's running in parallel uses the same file

ChangeSet
  1.1616.2569.6 06/05/04 09:58:03 holyfoot@deer.(none) +1 -0
  test result fixed

  mysql-test/r/mysqltest.result
    1.3.1.12 06/05/04 09:57:16 holyfoot@mysql.com +2 -2
    result fixed

ChangeSet
  1.2104 06/05/03 21:35:27 igor@rurik.mysql.com +1 -0
  Post-review changes.

  sql/sql_test.cc
    1.46 06/05/03 21:35:22 igor@rurik.mysql.com +2 -2
    Post-review changes.

ChangeSet
  1.1616.2574.2 06/05/04 03:12:51 tnurnberg@mysql.com +7 -0
  Bug#19025 4.1 mysqldump doesn't correctly dump "auto_increment = [int]"
  
  mysqldump / SHOW CREATE TABLE will show the NEXT available value for
  the PK, rather than the *first* one that was available (that named in
  the original CREATE TABLE ... AUTO_INCREMENT = ... statement).
  
  This should produce correct and robust behaviour for the obvious use
  cases -- when no data were inserted, then we'll produce a statement
  featuring the same value the original CREATE TABLE had; if we dump
  with values, INSERTing the values on the target machine should set the
  correct next_ID anyway (and if not, we'll still have our AUTO_INCREMENT =
  ... to do that). Lastly, just the CREATE statement (with no data) for
  a table that saw inserts would still result in a table that new values
  could safely be inserted to).
  
  There seems to be no robust way however to see whether the next_ID
  field is > 1 because it was set to something else with CREATE TABLE
  ... AUTO_INCREMENT = ..., or because there is an AUTO_INCREMENT column
  in  the table (but no initial value was set with AUTO_INCREMENT = ...)
  and then one or more rows were INSERTed, counting up next_ID. This
  means that in both cases, we'll generate an AUTO_INCREMENT =
  ... clause in SHOW CREATE TABLE / mysqldump.  As we also show info on,
  say, charsets even if the user did not explicitly give that info in
  their own CREATE TABLE, this shouldn't be an issue.
  
  As per above, the next_ID will be affected by any INSERTs that have
  taken place, though.  This /should/ result in correct and robust
  behaviour, but it may look non-intuitive to some users if they CREATE
  TABLE ... AUTO_INCREMENT = 1000 and later (after some INSERTs) have
  SHOW CREATE TABLE give them a different value (say, CREATE TABLE
  ... AUTO_INCREMENT = 1006), so the docs should possibly feature a
  caveat to that effect.
  
  It's not very intuitive the way it works now (with the fix), but it's
  *correct*.  We're not storing the original value anyway, if we wanted
  that, we'd have to change on-disk representation?
  
  If we do dump/load cycles with empty DBs, nothing will change.  This
  changeset includes an additional test case that proves that tables
  with rows will create the same next_ID for AUTO_INCREMENT = ... across
  dump/restore cycles.
  
  Confirmed by support as likely solution for client's problem.

  sql/sql_show.cc
    1.122.24.1 06/05/04 03:12:47 tnurnberg@mysql.com +18 -0
    Add AUTO_INCREMENT=... to output of SHOW CREATE TABLE if there is an
    AUTO_INCREMENT column, and NEXT_ID > 1 (the default).  We must not print
    the clause for engines that do not support this as it would break the
    import of dumps, but as of this writing, the test for whether
    AUTO_INCREMENT columns are allowed and wether AUTO_INCREMENT=...
    is supported is identical, !(file->table_flags() & HA_NO_AUTO_INCREMENT))
    Because of that, we do not explicitly test for the feature,
    but may extrapolate its existence from that of an AUTO_INCREMENT column.

  mysql-test/t/mysqldump.test
    1.19.1.23 06/05/04 03:12:47 tnurnberg@mysql.com +31 -1
    show that AUTO_INCREMENT=... will survive dump/restore cycles

  mysql-test/t/auto_increment.test
    1.22.1.2 06/05/04 03:12:47 tnurnberg@mysql.com +20 -1
    test for creation of AUTO_INCREMENT=... clause

  mysql-test/r/symlink.result
    1.11.1.9 06/05/04 03:12:47 tnurnberg@mysql.com +2 -2
    Add AUTO_INCREMENT=... clauses where appropriate

  mysql-test/r/mysqldump.result
    1.9.1.42 06/05/04 03:12:47 tnurnberg@mysql.com +38 -0
    show that AUTO_INCREMENT=... will survive dump/restore cycles

  mysql-test/r/gis-rtree.result
    1.8.1.4 06/05/04 03:12:47 tnurnberg@mysql.com +1 -1
    Add AUTO_INCREMENT=... clauses where appropriate

  mysql-test/r/auto_increment.result
    1.29.1.3 06/05/04 03:12:47 tnurnberg@mysql.com +24 -0
    test for creation of AUTO_INCREMENT=... clause

ChangeSet
  1.2098.16.3 06/05/04 00:32:34 aivanov@mysql.com +1 -0
  Applied innodb-5.0-ss521 snapshot.
   Fixed BUG#19366: "consistent_snapshot.test fails".

  innobase/include/dict0dict.ic
    1.13 06/05/04 00:32:29 aivanov@mysql.com +0 -2
    Applied innodb-5.0-ss521 snapshot.
     Remove too strict assertions from some dict_table_t
     accessor functions (bug #19366).

ChangeSet
  1.1616.2573.1 06/05/03 23:25:01 aivanov@mysql.com +1 -0
  Applied innodb-4.1-ss26 snapshot.
   Fixed BUG#19366: "consistent_snapshot.test fails".

  innobase/include/dict0dict.ic
    1.9.1.1 06/05/03 23:24:59 aivanov@mysql.com +0 -2
    Applied innodb-4.1-ss26 snapshot.
     Remove too strict assertions from some dict_table_t
     accessor functions (Bug#19366).

ChangeSet
  1.2098.8.12 06/05/03 20:04:57 msvensson@neptunus.(none) +1 -0
  Check if "../libtool" is available and use it only when it is.

  mysql-test/mysql-test-run.pl
    1.89.1.5 06/05/03 20:04:54 msvensson@neptunus.(none) +19 -12
    Check if "../libtool" is available and use it only when it is.

ChangeSet
  1.2098.19.3 06/05/03 17:55:30 msvensson@neptunus.(none) +1 -0
  Use "const char*" for variable found, forte complains "Cannot use const char* to initialize char*" otherwise

  extra/yassl/src/ssl.cpp
    1.13 06/05/03 17:55:25 msvensson@neptunus.(none) +1 -1
    Use "const char*" for variable found, forte complains "Cannot use const char* to initialize char*" otherwise

ChangeSet
  1.2098.19.2 06/05/03 16:59:02 msvensson@neptunus.(none) +1 -0
  Remove C++ comments
  Formatting

  sql-common/client.c
    1.90 06/05/03 16:58:57 msvensson@neptunus.(none) +5 -5
    Remove C++ comments
    Formatting

ChangeSet
  1.2098.20.1 06/05/03 18:02:43 kroki@mysql.com +4 -0
  Bug#15463: EXPLAIN SELECT..INTO hangs the client (QB, command line)
  
  There were two distict bugs: parse error was returned for valid
  statement and that error wasn't reported to the client.
  
  The fix ensures that EXPLAIN SELECT..INTO is accepted by parser and any
  other parse error will be reported to the client.

  sql/sql_yacc.yy
    1.467 06/05/03 18:02:37 kroki@mysql.com +15 -5
    If there is no lex->result in select_var_ident rule, then we have
    to be in DESCRIBE mode.

  sql/sql_parse.cc
    1.543 06/05/03 18:02:37 kroki@mysql.com +1 -0
    Assert that if parsing error has occured then apropriate error message
    has been pushed into error stack.

  mysql-test/t/explain.test
    1.9 06/05/03 18:02:36 kroki@mysql.com +9 -0
    Add test case for bug#15463.

  mysql-test/r/explain.result
    1.16 06/05/03 18:02:36 kroki@mysql.com +4 -0
    Add result for bug#15463.

ChangeSet
  1.2098.18.6 06/05/03 19:01:29 holyfoot@deer.(none) +2 -0
  merging fix

  mysql-test/t/sp_notembedded.test
    1.4 06/05/03 19:01:23 holyfoot@mysql.com +0 -1
    merging fix

  mysql-test/t/innodb.test
    1.132 06/05/03 19:01:23 holyfoot@mysql.com +0 -6
    merging fix

ChangeSet
  1.2098.19.1 06/05/03 15:53:59 msvensson@neptunus.(none) +1 -0
  Move "max-connect-retries" option to get alpabetichal order

  client/mysqltest.c
    1.235 06/05/03 15:53:55 msvensson@neptunus.(none) +4 -4
    Move "max-connect-retries" option to get alpabetichal order

ChangeSet
  1.2098.18.5 06/05/03 17:43:32 holyfoot@deer.(none) +1 -0
  merging fix

  sql/sql_table.cc
    1.306 06/05/03 17:42:05 holyfoot@mysql.com +1 -1
    merging fix

ChangeSet
  1.2098.8.9 06/05/03 14:10:22 msvensson@neptunus.(none) +1 -0
  Add an untrusted cacert used when testing

  mysql-test/std_data/untrusted-cacert.pem
    1.1 06/05/03 14:09:45 msvensson@neptunus.(none) +64 -0

  mysql-test/std_data/untrusted-cacert.pem
    1.0 06/05/03 14:09:45 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysql-5.0-maint/mysql-test/std_data/untrusted-cacert.pem

ChangeSet
  1.2098.8.8 06/05/03 14:09:08 msvensson@neptunus.(none) +2 -0
  Load CA certs before setting local certs.
  Make it possible to get the yaSSL error message printed in the DBUG log file.

  vio/viosslfactories.c
    1.24 06/05/03 14:09:03 msvensson@neptunus.(none) +11 -10
    Load the CA certs before loading the certs for this client or server.
    Improved comments.

  vio/viossl.c
    1.33 06/05/03 14:09:03 msvensson@neptunus.(none) +18 -8
    Add possibility to print out the error from yaSSL.

ChangeSet
  1.2098.8.7 06/05/03 14:06:34 msvensson@neptunus.(none) +2 -0
  Add tests for connecting to server with invalid and blank certs.

  mysql-test/t/openssl_1.test
    1.15 06/05/03 14:06:30 msvensson@neptunus.(none) +40 -2
    Add tests for connecting to server with invalid and blank certs.

  mysql-test/r/openssl_1.result
    1.14 06/05/03 14:06:30 msvensson@neptunus.(none) +9 -2
    Add tests for connecting to server with invalid and blank certs.

ChangeSet
  1.2098.8.6 06/05/03 14:04:54 msvensson@neptunus.(none) +1 -0
  Add support for specifyihng the number of reconnec retries oin the command line

  client/mysqltest.c
    1.234 06/05/03 14:04:50 msvensson@neptunus.(none) +19 -14
    Add support for specifyihng the number of reconnec retries oin the command line

ChangeSet
  1.2098.17.6 06/05/03 13:20:51 msvensson@shellback.(none) +5 -0
  Add original unmodified certs file

  extra/yassl/certs/dsa512.der
    1.2 06/05/03 13:20:46 msvensson@shellback.(none) +1 -1
    Add original unmodified file

  extra/yassl/certs/client-key.der
    1.2 06/05/03 13:20:46 msvensson@shellback.(none) +1 -1
    Add original unmodified file

  extra/yassl/certs/client-cert.der
    1.2 06/05/03 13:20:46 msvensson@shellback.(none) +1 -1
    Add original unmodified file

  extra/yassl/certs/dh1024.dat
    1.1 06/05/03 13:20:07 msvensson@shellback.(none) +8 -0

  extra/yassl/certs/dh1024.dat
    1.0 06/05/03 13:20:07 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/dh1024.dat

  BitKeeper/deleted/.del-dh1024.dat~eb7af7494ea8ec62
    1.2 06/05/03 13:15:41 msvensson@shellback.(none) +1 -2
    Delete: extra/yassl/certs/dh1024.dat

ChangeSet
  1.2098.17.5 06/05/03 13:11:04 msvensson@shellback.(none) +4 -0
  Add certs/ file

  extra/yassl/certs/dsa512.der
    1.1 06/05/03 13:10:56 msvensson@shellback.(none) +7 -0
    New BitKeeper file ``extra/yassl/certs/dsa512.der''

  extra/yassl/certs/dh1024.dat
    1.1 06/05/03 13:10:56 msvensson@shellback.(none) +2 -0
    New BitKeeper file ``extra/yassl/certs/dh1024.dat''

  extra/yassl/certs/dsa512.der
    1.0 06/05/03 13:10:56 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/dsa512.der

  extra/yassl/certs/dh1024.dat
    1.0 06/05/03 13:10:56 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/dh1024.dat

  extra/yassl/certs/client-key.der
    1.1 06/05/03 13:10:55 msvensson@shellback.(none) +9 -0
    New BitKeeper file ``extra/yassl/certs/client-key.der''

  extra/yassl/certs/client-cert.der
    1.1 06/05/03 13:10:55 msvensson@shellback.(none) +17 -0
    New BitKeeper file ``extra/yassl/certs/client-cert.der''

  extra/yassl/certs/client-key.der
    1.0 06/05/03 13:10:55 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/client-key.der

  extra/yassl/certs/client-cert.der
    1.0 06/05/03 13:10:55 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/client-cert.der

ChangeSet
  1.2098.17.4 06/05/03 13:08:24 msvensson@shellback.(none) +33 -0
  Update yaSSL to version 1.3.0

  extra/yassl/certs/taoCert.txt
    1.1 06/05/03 13:08:19 msvensson@shellback.(none) +50 -0
    New BitKeeper file ``extra/yassl/certs/taoCert.txt''

  extra/yassl/certs/server-key.pem
    1.1 06/05/03 13:08:19 msvensson@shellback.(none) +9 -0
    New BitKeeper file ``extra/yassl/certs/server-key.pem''

  extra/yassl/certs/taoCert.txt
    1.0 06/05/03 13:08:19 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/taoCert.txt

  extra/yassl/certs/server-key.pem
    1.0 06/05/03 13:08:19 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/server-key.pem

  extra/yassl/certs/server-cert.pem
    1.1 06/05/03 13:08:18 msvensson@shellback.(none) +38 -0
    New BitKeeper file ``extra/yassl/certs/server-cert.pem''

  extra/yassl/certs/dsa512.pem
    1.1 06/05/03 13:08:18 msvensson@shellback.(none) +8 -0
    New BitKeeper file ``extra/yassl/certs/dsa512.pem''

  extra/yassl/certs/server-cert.pem
    1.0 06/05/03 13:08:18 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/server-cert.pem

  extra/yassl/certs/dsa512.pem
    1.0 06/05/03 13:08:18 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/dsa512.pem

  extra/yassl/certs/dsa-cert.pem
    1.1 06/05/03 13:08:17 msvensson@shellback.(none) +68 -0
    New BitKeeper file ``extra/yassl/certs/dsa-cert.pem''

  extra/yassl/certs/dsa-cert.pem
    1.0 06/05/03 13:08:17 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/dsa-cert.pem

  extra/yassl/certs/client-key.pem
    1.1 06/05/03 13:08:15 msvensson@shellback.(none) +9 -0
    New BitKeeper file ``extra/yassl/certs/client-key.pem''

  extra/yassl/certs/client-key.pem
    1.0 06/05/03 13:08:15 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/client-key.pem

  extra/yassl/certs/client-cert.pem
    1.1 06/05/03 13:08:14 msvensson@shellback.(none) +52 -0
    New BitKeeper file ``extra/yassl/certs/client-cert.pem''

  extra/yassl/certs/client-cert.pem
    1.0 06/05/03 13:08:14 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/client-cert.pem

  extra/yassl/certs/ca-cert.pem
    1.1 06/05/03 13:08:11 msvensson@shellback.(none) +53 -0
    New BitKeeper file ``extra/yassl/certs/ca-cert.pem''

  extra/yassl/certs/ca-cert.pem
    1.0 06/05/03 13:08:11 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/ca-cert.pem

  extra/yassl/lib/dummy
    1.1 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +1 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/x509v3.h
    1.1 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +1 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/x509.h
    1.1 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +1 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/pem.h
    1.1 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +1 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/md4.h
    1.1 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +1 -0
    Import patch yassl.diff

  extra/yassl/testsuite/testsuite.dsp
    1.2 06/04/27 01:56:15 msvensson@shellback.(none)[msvensson] +2 -2
    Import patch yassl.diff

  extra/yassl/testsuite/testsuite.cpp
    1.2 06/04/28 01:10:59 msvensson@shellback.(none)[msvensson] +3 -3
    Import patch yassl.diff

  extra/yassl/testsuite/test.hpp
    1.1.1.1 06/04/24 23:55:04 msvensson@shellback.(none)[msvensson] +2 -2
    Import patch yassl.diff

  extra/yassl/taocrypt/taocrypt.dsp
    1.3 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +2 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/src/misc.cpp
    1.12 06/04/27 01:56:15 msvensson@shellback.(none)[msvensson] +9 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/make.bat
    1.1.1.1 06/04/24 21:55:44 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/src/integer.cpp
    1.22 06/05/02 22:59:39 msvensson@shellback.(none)[msvensson] +3 -3
    Import patch yassl.diff

  extra/yassl/taocrypt/src/asn.cpp
    1.5.1.1 06/04/27 01:56:15 msvensson@shellback.(none)[msvensson] +62 -12
    Import patch yassl.diff

  extra/yassl/taocrypt/include/asn.hpp
    1.4.1.1 06/04/27 01:56:15 msvensson@shellback.(none)[msvensson] +18 -7
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp
    1.15 06/04/28 01:10:59 msvensson@shellback.(none)[msvensson] +98 -5
    Import patch yassl.diff

  extra/yassl/src/template_instnt.cpp
    1.6.1.1 06/04/28 01:10:59 msvensson@shellback.(none)[msvensson] +5 -0
    Import patch yassl.diff

  extra/yassl/src/ssl.cpp
    1.12 06/04/28 01:10:59 msvensson@shellback.(none)[msvensson] +281 -9
    Import patch yassl.diff

  extra/yassl/src/cert_wrapper.cpp
    1.7 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +6 -3
    Import patch yassl.diff

  extra/yassl/mySTL/helpers.hpp
    1.9.1.1 06/04/24 21:55:44 msvensson@shellback.(none)[msvensson] +5 -0
    Import patch yassl.diff

  extra/yassl/lib/dummy
    1.0 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/lib/dummy

  extra/yassl/include/yassl_int.hpp
    1.10 06/05/03 12:24:48 msvensson@shellback.(none)[msvensson] +40 -1
    Import patch yassl.diff

  extra/yassl/include/openssl/x509v3.h
    1.0 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/include/openssl/x509v3.h

  extra/yassl/include/openssl/x509.h
    1.0 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/include/openssl/x509.h

  extra/yassl/include/openssl/ssl.h
    1.8 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +109 -3
    Import patch yassl.diff

  extra/yassl/include/openssl/pem.h
    1.0 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/include/openssl/pem.h

  extra/yassl/include/openssl/md5.h
    1.2 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +3 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/md4.h
    1.0 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/include/openssl/md4.h

  extra/yassl/include/openssl/err.h
    1.2 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/examples/client/client.cpp
    1.2 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +3 -3
    Import patch yassl.diff

  extra/yassl/README
    1.3 06/04/27 20:46:11 msvensson@shellback.(none)[msvensson] +34 -1
    Import patch yassl.diff

ChangeSet
  1.2098.8.4 06/05/03 12:05:04 msvensson@neptunus.(none) +1 -0
  Make cert's in std_data that we cpoy from SSL/ depend on the cert's in SSL/

  mysql-test/Makefile.am
    1.69 06/05/03 12:05:00 msvensson@neptunus.(none) +5 -5
    Make cert's in std_data that we cpoy from SSL/ depend on the cert's in SSL/

ChangeSet
  1.2098.17.3 06/05/03 11:53:16 msvensson@shellback.(none) +3 -0
  Remove client-req-pem and server-req.pem

  SSL/Makefile.am
    1.2 06/05/03 11:53:10 msvensson@shellback.(none) +2 -2
    Remove client-req-pem and server-req.pem

  BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8
    1.4 06/05/03 11:51:59 msvensson@shellback.(none) +0 -0
    Delete: SSL/client-req.pem

  BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4
    1.4 06/05/03 11:51:52 msvensson@shellback.(none) +0 -0
    Delete: SSL/server-req.pem

ChangeSet
  1.2098.17.2 06/05/03 11:50:45 msvensson@shellback.(none) +1 -0
  Update NOTES with information how we generate new keys

  SSL/NOTES
    1.3 06/05/03 11:50:40 msvensson@shellback.(none) +62 -0
    Update NOTES with information how we generate new keys

ChangeSet
  1.2098.17.1 06/05/03 11:31:23 msvensson@shellback.(none) +7 -0
  Generate new ca, client and server cert.
  Set CN in the server cert to localhost so that we can test --ssl-verify-server-cert

  SSL/server-req.pem
    1.3 06/05/03 11:31:18 msvensson@shellback.(none) +7 -10
    Generate new server cert since we have a new CA cert and set it's CN to localhost so that we can test --ssl-verify-server-cert

  SSL/server-key.pem
    1.5 06/05/03 11:31:18 msvensson@shellback.(none) +7 -13
    Generate new server cert since we have a new CA cert and set it's CN to localhost so that we can test --ssl-verify-server-cert

  SSL/server-cert.pem
    1.5.1.1 06/05/03 11:31:18 msvensson@shellback.(none) +32 -57
    Generate new server cert since we have a new CA cert and set it's CN to localhost so that we can test --ssl-verify-server-cert

  SSL/client-req.pem
    1.3 06/05/03 11:31:18 msvensson@shellback.(none) +7 -10
    Generate new client cert since we have a new CA cert

  SSL/client-key.pem
    1.5 06/05/03 11:31:18 msvensson@shellback.(none) +7 -13
    Generate new client cert since we have a new CA cert

  SSL/client-cert.pem
    1.6 06/05/03 11:31:17 msvensson@shellback.(none) +31 -56
    Generate new client cert since we have a new CA cert

  SSL/cacert.pem
    1.6 06/05/03 11:31:17 msvensson@shellback.(none) +15 -19
    Generate new CA cert to get the CA's private key

ChangeSet
  1.2092.14.1 06/05/03 16:28:11 grog@mysql.com +2 -0
  rpl_auto_increment_11932.result, rpl_auto_increment_11932.test:
    Test case for BUG#11932

  mysql-test/r/rpl_auto_increment_11932.result
    1.1 06/05/03 16:26:40 grog@mysql.com +46 -0

  mysql-test/t/rpl_auto_increment_11932.test
    1.1 06/05/03 16:26:39 grog@mysql.com +59 -0

  mysql-test/r/rpl_auto_increment_11932.result
    1.0 06/05/03 16:26:40 grog@mysql.com +0 -0
    BitKeeper file /home/MySQL/5.0-Bug-11932/mysql-test/r/rpl_auto_increment_11932.result

  mysql-test/t/rpl_auto_increment_11932.test
    1.0 06/05/03 16:26:39 grog@mysql.com +0 -0
    BitKeeper file /home/MySQL/5.0-Bug-11932/mysql-test/t/rpl_auto_increment_11932.test

ChangeSet
  1.2088.11.1 06/05/02 18:31:20 igor@rurik.mysql.com +5 -0
  Fixed bug #14292: performance degradation for a benchmark query.
  This performance degradation was due to the fact that some
  cost evaluation code added into 4.1 in the function find_best was
  not merged into the code of the function best_access_path added
  together with other code for greedy optimizer.
  Added a parameter to the function print_plan. The parameter contains
  accumulated cost for a given partial join.
   
  The patch does not include a special test case since this performance
  degradation is hard to reproduse with a simple example.
  
  TODO: make the function find_best use the function best_access_path
  in order to remove duplication of code which might result in incomplete
  merges in the future.

  sql/sql_test.cc
    1.45 06/05/02 18:31:14 igor@rurik.mysql.com +8 -6
    Fixed bug #14292: performance degradation for a benchmark query.
    Added a parameter to the function print_plan. The parameter contains
    accumulated cost for a given partial join.

  sql/sql_select.cc
    1.407.1.1 06/05/02 18:31:14 igor@rurik.mysql.com +61 -33
    Fixed bug #14292: performance degradation for a benchmark query.
    This performance degradation was due to the fact that some
    cost evaluation code added into 4.1 in the function find_best was
    not merged into the code of the function best_access_path added
    together with other code for greedy optimizer.

  sql/mysql_priv.h
    1.382.1.1 06/05/02 18:31:13 igor@rurik.mysql.com +2 -2
    Fixed bug #14292: performance degradation for a benchmark query.
    Added a parameter to the function print_plan. The parameter contains
    accumulated cost for a given partial join.

  mysql-test/r/subselect.result
    1.138.1.1 06/05/02 18:31:13 igor@rurik.mysql.com +3 -3
    Fixed bug #14292: performance degradation for a benchmark query.
    Adjusted test results.

  mysql-test/r/delete.result
    1.23 06/05/02 18:31:13 igor@rurik.mysql.com +2 -2
    Fixed bug #14292: performance degradation for a benchmark query.
    Adjusted test results.

ChangeSet
  1.2098.1.19 06/05/02 21:47:53 pekka@mysql.com +1 -0
  pekka:get - push push push

  BitKeeper/etc/config
    1.23 06/05/02 21:47:00 pekka@mysql.com +1 -0
    pekka:get

ChangeSet
  1.2098.16.1 06/05/02 13:42:35 cmiller@zippy.(none) +1 -0
  An update to as-yet unused new feature of snprintf, which was added to bring 
  our sprintf()-alike in sync with our fprintf()-alike features.

  strings/my_vsnprintf.c
    1.35 06/05/02 13:42:30 cmiller@zippy.(none) +5 -1
    Advance the destination pointer properly.
    
    Also, pay attention to the "n" in snprintf() -- never write too much.

ChangeSet
  1.1616.2571.1 06/05/02 18:00:44 ramil@mysql.com +4 -0
  Fix for bug #16546: DATETIME+0 not always coerced the same way

  sql/item_timefunc.h
    1.42.1.15 06/05/02 18:00:32 ramil@mysql.com +1 -0
    Fix for bug #16546: DATETIME+0 not always coerced the same way
      - set decimals to DATETIME_DEC

  sql/item_timefunc.cc
    1.51.3.1 06/05/02 18:00:32 ramil@mysql.com +3 -3
    Fix for bug #16546: DATETIME+0 not always coerced the same way
      - set decimals to DATETIME_DEC

  mysql-test/t/func_time.test
    1.21.2.1 06/05/02 18:00:32 ramil@mysql.com +8 -0
    Fix for bug #16546: DATETIME+0 not always coerced the same way
      - test case

  mysql-test/r/func_time.result
    1.23.3.1 06/05/02 18:00:32 ramil@mysql.com +8 -4
    Fix for bug #16546: DATETIME+0 not always coerced the same way
      - test case

ChangeSet
  1.2098.9.2 06/05/02 14:46:18 msvensson@neptunus.(none) +1 -0
  Use libtool --mode=execute when starting the mysqld as well.
  Add $exe_libtool to be used throughout the script

  mysql-test/mysql-test-run.pl
    1.89.1.4 06/05/02 14:46:13 msvensson@neptunus.(none) +16 -3
    Use libtool --mode=execute when starting the mysqld as well.
    Add $exe_libtool to be used throughout the script

ChangeSet
  1.1616.2569.3 06/05/02 14:33:55 pekka@mysql.com +7 -0
  ndb - bug#19201 (4.1), see comment in NdbBlob.cpp

  ndb/src/ndbapi/NdbBlob.cpp
    1.17.3.3 06/05/02 14:31:23 pekka@mysql.com +23 -1
    bug#19201

  ndb/include/ndbapi/NdbBlob.hpp
    1.8.1.3 06/05/02 14:31:23 pekka@mysql.com +1 -0
    bug#19201

  ndb/include/kernel/signaldata/TcKeyReq.hpp
    1.4.1.1 06/05/02 14:31:23 pekka@mysql.com +1 -0
    bug#19201

  mysql-test/t/ndb_blob.test
    1.14.1.2 06/05/02 14:31:23 pekka@mysql.com +22 -3
    bug#19201

  mysql-test/r/ndb_blob.result
    1.13.1.3 06/05/02 14:31:23 pekka@mysql.com +13 -5
    bug#19201

  ndb/tools/delete_all.cpp
    1.9.1.4 06/05/02 14:29:24 pekka@mysql.com +14 -17
    option --transactional (default remains truncate)

  ndb/test/ndbapi/testBlobs.cpp
    1.18.1.7 06/05/02 14:28:32 pekka@mysql.com +9 -14
    option -fac (fetch across commit)

ChangeSet
  1.2098.1.16 06/05/02 09:19:54 knielsen@mysql.com +5 -0
  Fix a bunch of non-Linux compile failures.

  tests/mysql_client_test.c
    1.183 06/05/02 09:19:50 knielsen@mysql.com +2 -1
    No declarations after statement in C code.

  tests/Makefile.am
    1.25 06/05/02 09:19:50 knielsen@mysql.com +1 -1
    -L must go before -l

  mysys/my_memmem.c
    1.2 06/05/02 09:19:50 knielsen@mysql.com +3 -2
    Fix illegal pointer arithmetics on void *.

  VC++Files/mysys/mysys.vcproj
    1.4 06/05/02 09:19:50 knielsen@mysql.com +43 -0
    Add new file missing in previous push.

  VC++Files/mysql.sln
    1.8 06/05/02 09:19:50 knielsen@mysql.com +1 -0
    mysql_client_test depends on mysys.

ChangeSet
  1.2098.14.1 06/05/02 08:59:49 holyfoot@deer.(none) +1 -0
  Win build fix

  client/mysql_upgrade.c
    1.3 06/05/02 08:59:44 holyfoot@mysql.com +1 -1
    Win build fix

ChangeSet
  1.2084.127.1 06/05/01 22:10:50 cmiller@zippy.(none) +9 -0
  SECURITY FIX
  
  Bug#17667: An attacker has the opportunity to bypass query logging.
  
  This adds a new, local-only printf format specifier to our *printf functions
  that allows us to print known-size buffers that must not be interpreted as 
  NUL-terminated "strings."
  
  It uses this format-specifier to print to the log, thus fixing this 
  problem.

  mysys/my_memmem.c
    1.1 06/05/01 22:10:44 cmiller@zippy.(none) +65 -0
    New BitKeeper file ``mysys/my_memmem.c''
    
    Implement memmem, a black-box work-alike of the GNU memmem(), which functions
    like strstr() but for arbitrary blocks of memory.

  mysql-test/t/mysql_client_test.opt
    1.1 06/05/01 22:10:44 cmiller@zippy.(none) +1 -0
    New BitKeeper file ``mysql-test/t/mysql_client_test.opt''
    
    Add '--log' server parameter.

  tests/mysql_client_test.c
    1.182 06/05/01 22:10:44 cmiller@zippy.(none) +66 -0
    Add a "%.1234b" and "%.*b" percent-code.  It takes a width, just like "%s", 
    but unlike the string-indicator, it requires the width and doesn't stop printing
    at NUL characters.

  tests/Makefile.am
    1.24 06/05/01 22:10:44 cmiller@zippy.(none) +1 -1
    We may need some of our local functions.

  strings/my_vsnprintf.c
    1.34 06/05/01 22:10:44 cmiller@zippy.(none) +8 -1
    Add a "%.1234b" and "%.*b" percent-code.  It takes a width, just like "%s", 
    but unlike the string-indicator, it requires the width and doesn't stop printing
    at NUL characters.

  sql/sql_parse.cc
    1.536.2.1 06/05/01 22:10:44 cmiller@zippy.(none) +1 -1
    The query is not a C-string, but is a sized buffer, containing any character 
    at all, which may include NUL characters.

  mysys/my_memmem.c
    1.0 06/05/01 22:10:44 cmiller@zippy.(none) +0 -0
    BitKeeper file /home/cmiller/work/mysql/mysql-5.0__bug17667/mysys/my_memmem.c

  mysys/mf_iocache2.c
    1.27 06/05/01 22:10:44 cmiller@zippy.(none) +72 -20
    Add a "%.1234b" and "%.*b" percent-code.  It takes a width, just like "%s", 
    but unlike the string-indicator, it requires the width and doesn't stop printing
    at NUL characters.
    
    Also, simplify the code a bit.
    
    TODO:  This code should be unified with the strings/my_vnsprintf.c code in 
    the future.

  mysys/Makefile.am
    1.67.1.1 06/05/01 22:10:44 cmiller@zippy.(none) +1 -0
    Add reference to new file, my_memmem.c

  mysql-test/t/mysql_client_test.opt
    1.0 06/05/01 22:10:44 cmiller@zippy.(none) +0 -0
    BitKeeper file /home/cmiller/work/mysql/mysql-5.0__bug17667/mysql-test/t/mysql_client_test.opt

  include/my_sys.h
    1.179 06/05/01 22:10:44 cmiller@zippy.(none) +5 -0
    Add prototype for my_memmem() .

ChangeSet
  1.1616.2568.2 06/05/01 21:30:09 jani@a193-229-222-105.elisa-laajakaista.fi +2 -0
  Added tests for Bug#14515

  mysql-test/t/ansi.test
    1.9 06/05/01 21:30:05 jani@a193-229-222-105.elisa-laajakaista.fi +12 -0
    Added tests for Bug#14515

  mysql-test/r/ansi.result
    1.4.1.2 06/05/01 21:30:05 jani@a193-229-222-105.elisa-laajakaista.fi +30 -1
    Added tests for Bug#14515

ChangeSet
  1.1616.2569.1 06/05/01 19:48:31 kent@mysql.com +1 -0
  mysql.spec.sh:
    Use "./libtool --mode=execute" to find real path to executables

  support-files/mysql.spec.sh
    1.83.5.2 06/05/01 19:46:52 kent@mysql.com +11 -15
    Use "./libtool --mode=execute" to find real path to executables

ChangeSet
  1.2098.12.1 06/05/01 22:16:08 holyfoot@deer.(none) +3 -0
  Fix for Win build

  include/config-win.h
    1.79 06/05/01 22:14:40 holyfoot@mysql.com +1 -0
    fixed for Win build

  client/mysql_upgrade.c
    1.2 06/05/01 22:14:40 holyfoot@mysql.com +4 -2
    fixed for Win build

  BitKeeper/etc/ignore
    1.220 06/05/01 22:14:40 holyfoot@mysql.com +1 -0
    Added client/mysql_upgrade to the ignore list

ChangeSet
  1.1616.2567.1 06/04/30 16:01:34 jani@a193-229-222-105.elisa-laajakaista.fi +2 -0
  Fix for Bug#14515.

  sql/sql_show.cc
    1.122.1.85 06/04/30 16:01:30 jani@a193-229-222-105.elisa-laajakaista.fi +3 -4
    Fix for Bug#14515.

  sql/set_var.cc
    1.34.64.1 06/04/30 16:01:30 jani@a193-229-222-105.elisa-laajakaista.fi +0 -4
    Fix for Bug#14515. These modes do not need restrictions, they're handled
    separately in sql_show.cc

ChangeSet
  1.1616.2566.1 06/04/29 15:58:02 kent@mysql.com +1 -0
  config-win.h:
    Fix strange "double" define for popen.
    Avoid warnings about sprintf() etc. being unsafe.
    Corrected typo "#endfif"

  include/config-win.h
    1.48.1.10 06/04/29 15:55:53 kent@mysql.com +7 -2
    Fix strange "double" define for popen.
    Avoid warnings about sprintf() etc. being unsafe.
    Corrected typo "#endfif"

ChangeSet
  1.1616.2561.6 06/04/29 07:32:12 kent@mysql.com +1 -0
  configure.in:
    Changed version to 4.1.20

  configure.in
    1.201.64.3 06/04/29 07:31:32 kent@mysql.com +2 -2
    Changed version to 4.1.20

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

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

ChangeSet
  1.2098.11.1 06/04/28 16:13:19 elliot@mysql.com +1 -0
  BUG#19394 OPT_INNODB_THREAD_CONCURRENCY duplicated
  Removed duplication (not a user-visible change)

  sql/mysqld.cc
    1.544.1.1 06/04/28 16:13:16 elliot@mysql.com +2 -1
    Two of the startup options for mysqld, innodb_commit_concurrency
    and innodb_thread_concurrency, were using the same enumeration
    value. Changed to give innodb_commit_concurrency it's own value.

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

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

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

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

ChangeSet
  1.2098.10.1 06/04/28 17:03:11 kent@mysql.com +1 -0
  mysql.spec.sh:
    Include and run mysql_upgrade if needed (bug#19353)

  support-files/mysql.spec.sh
    1.134.1.1 06/04/28 17:02:53 kent@mysql.com +10 -1
    Include and run mysql_upgrade if needed (bug#19353)

ChangeSet
  1.2098.1.6 06/04/28 13:55:40 msvensson@neptunus.(none) +2 -0
  Bug#18818 configure: No longer finds OpenSSL on Mac OS X
   - Eval shrext_cmds variable before using it
   - Moved from acinclude.m4 to openssl.m4 and zlib.m4 when merging 4.1 -> 5.0

  config/ac-macros/zlib.m4
    1.8 06/04/28 13:55:36 msvensson@neptunus.(none) +2 -1
    Move from acinclude.m4

  config/ac-macros/openssl.m4
    1.6 06/04/28 13:55:36 msvensson@neptunus.(none) +3 -2
    Move from acinclude.m4

ChangeSet
  1.2098.9.1 06/04/28 11:37:20 msvensson@shellback.(none) +3 -0
  Fix small bug in udf_example.cc, it was processing one char too much and thus returning junk
  Add more DBUG_PRINT's in udf_handler::val_str
  Enable udf.test

  sql/udf_example.cc
    1.24 06/04/28 11:37:14 msvensson@shellback.(none) +1 -1
    Bug fix, break for loop when "n < n_end"

  sql/item_func.cc
    1.283 06/04/28 11:37:14 msvensson@shellback.(none) +10 -5
    Add DBUG_ printouts for easier debugging of installed udf's

  mysql-test/t/disabled.def
    1.31 06/04/28 11:37:14 msvensson@shellback.(none) +0 -1
    Enable udf.test

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

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

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

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

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

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

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

ChangeSet
  1.2098.6.1 06/04/28 09:07:25 holyfoot@deer.(none) +8 -0
  bug #18115 (mysql_upgrade on Windows)
  pushed in 5.0

  client/mysql_upgrade.c
    1.1 06/04/28 09:05:59 holyfoot@mysql.com +400 -0

  client/mysql_upgrade.c
    1.0 06/04/28 09:05:59 holyfoot@mysql.com +0 -0
    BitKeeper file /home/hf/work/mysql-5.0.upgd/client/mysql_upgrade.c

  VC++Files/client/mysql_upgrade_ia64.dsp
    1.1 06/04/28 09:05:58 holyfoot@mysql.com +124 -0

  VC++Files/client/mysql_upgrade.vcproj
    1.1 06/04/28 09:05:58 holyfoot@mysql.com +232 -0

  VC++Files/client/mysql_upgrade_ia64.dsp
    1.0 06/04/28 09:05:58 holyfoot@mysql.com +0 -0
    BitKeeper file /home/hf/work/mysql-5.0.upgd/VC++Files/client/mysql_upgrade_ia64.dsp

  VC++Files/client/mysql_upgrade.vcproj
    1.0 06/04/28 09:05:58 holyfoot@mysql.com +0 -0
    BitKeeper file /home/hf/work/mysql-5.0.upgd/VC++Files/client/mysql_upgrade.vcproj

  VC++Files/client/mysql_upgrade.dsp
    1.1 06/04/28 09:05:57 holyfoot@mysql.com +124 -0

  client/Makefile.am
    1.54 06/04/28 09:05:57 holyfoot@mysql.com +5 -1
    mysql_upgrade tool added

  VC++Files/mysql_ia64.dsw
    1.5 06/04/28 09:05:57 holyfoot@mysql.com +18 -0
    mysql_upgrade tool added

  VC++Files/mysql.sln
    1.7 06/04/28 09:05:57 holyfoot@mysql.com +8 -0
    mysql_upgrade tool added

  VC++Files/mysql.dsw
    1.27 06/04/28 09:05:57 holyfoot@mysql.com +21 -0
    mysql_upgrade tool added

  VC++Files/client/mysql_upgrade.dsp
    1.0 06/04/28 09:05:57 holyfoot@mysql.com +0 -0
    BitKeeper file /home/hf/work/mysql-5.0.upgd/VC++Files/client/mysql_upgrade.dsp

ChangeSet
  1.2098.3.4 06/04/27 22:30:14 msvensson@shellback.(none) +1 -0
  Disable udf.test

  mysql-test/t/disabled.def
    1.30 06/04/27 22:30:08 msvensson@shellback.(none) +1 -0
    Disable udf.test

ChangeSet
  1.2098.5.1 06/04/27 22:21:23 msvensson@shellback.(none) +2 -0
  Fix merge error

  extra/yassl/taocrypt/src/integer.cpp
    1.21 06/04/27 22:21:11 msvensson@shellback.(none) +0 -8
    Fix merge error, duplicate function definition

  extra/yassl/src/yassl_int.cpp
    1.14 06/04/27 22:21:11 msvensson@shellback.(none) +1 -1
    Fix merge error, missing {

ChangeSet
  1.2098.3.2 06/04/27 21:26:24 msvensson@shellback.(none) +2 -0
  Return empty string if file does not exist
  Set LD_LIBRARY_PATH and UDF_EXAMPLE_LIB from $lib_udf_example

  mysql-test/mysql-test-run.pl
    1.89.1.2 06/04/27 21:26:19 msvensson@shellback.(none) +3 -2
    Set LD_LIBRARY_PATH and UDF_EXAMPLE_LIB from $lib_udf_example variable

  mysql-test/lib/mtr_misc.pl
    1.12 06/04/27 21:26:19 msvensson@shellback.(none) +1 -8
    Return empty string if file does not exist

ChangeSet
  1.2096.1.4 06/04/27 10:53:19 jimw@mysql.com +1 -0
  Bug #19393: Federated tests fail on Windows under pushbuild
  
    Supplying --skip-rpl to mysql-test-run.pl would always disable the
    slaves, but those slaves may still be needed for the federated tests.
    Now we only disable the slaves when they are not used by any of the
    tests.

  mysql-test/mysql-test-run.pl
    1.89.2.1 06/04/27 10:53:15 jimw@mysql.com +5 -5
    Decide whether to set up and start slave databases based entirely on
    which tests are used, and don't allow --skip-rpl to ruin the party,
    since other tests than replication rely on the slaves (namely federated).

ChangeSet
  1.2084.126.1 06/04/27 16:32:40 msvensson@shellback.(none) +7 -0
  Add test to mysql-test-run.pl to see if the udf_example.so is availble. Set envioronment variable UDF_EXAMPLE_LIB if it is.
  Then check in have_udf if that variable is set. Finally use tahe variable when loading the shared library. 

  mysql-test/r/have_udf_example.require
    1.1 06/04/27 16:32:36 msvensson@shellback.(none) +2 -0
    New BitKeeper file ``mysql-test/r/have_udf_example.require''

  mysql-test/r/have_udf_example.require
    1.0 06/04/27 16:32:36 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysql-5.0-maint/mysql-test/r/have_udf_example.require

  mysql-test/t/udf.test
    1.4 06/04/27 16:32:35 msvensson@shellback.(none) +18 -10
    Use variable UDF_EXAMPLE_LIB when looking for shared library to load

  mysql-test/t/disabled.def
    1.28 06/04/27 16:32:35 msvensson@shellback.(none) +0 -1
    Remove udf.test from disabled tests

  mysql-test/r/udf.result
    1.4 06/04/27 16:32:35 msvensson@shellback.(none) +8 -8
    Update result

  mysql-test/mysql-test-run.pl
    1.87.4.8 06/04/27 16:32:35 msvensson@shellback.(none) +4 -0
    Add checks to find the udf_example.so library

  mysql-test/lib/mtr_misc.pl
    1.11 06/04/27 16:32:35 msvensson@shellback.(none) +16 -0
    Add funcion "mtr_file_exist" to search for files

  mysql-test/include/have_udf.inc
    1.3 06/04/27 16:32:35 msvensson@shellback.(none) +8 -0
    Add check if udf_example.so(or similar) is available

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

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

ChangeSet
  1.2098.2.1 06/04/27 21:59:04 grog@mysql.com +2 -0
  sql_mode.test:
    BUG#14765: Modified test file.
  sql_mode.result:
    BUG#14765: Modified result file.

  mysql-test/t/sql_mode.test
    1.18 06/04/27 21:58:12 grog@mysql.com +3 -0
    BUG#14765: Modified test file.

  mysql-test/r/sql_mode.result
    1.35 06/04/27 21:57:46 grog@mysql.com +4 -0
    BUG#14765: Modified result file.

ChangeSet
  1.1616.2564.1 06/04/27 14:54:36 kroki@mysql.com +1 -0
  Bug#16372: Server crashes when test 'conc_sys' is running
  
  Concurrent read and update of privilege structures (like simultaneous
  run of SHOW GRANTS and ADD USER) could result in server crash.
  
  Ensure that proper locking of ACL structures is done.
  
  No test case is provided because this bug can't be reproduced
  deterministically.

  sql/sql_acl.cc
    1.74.1.101 06/04/27 14:54:31 kroki@mysql.com +31 -6
    Ensure that access to ACL data is protected by acl_cache->lock mutex.
    Use system_charset_info for host names consistently.

ChangeSet
  1.2099 06/04/27 12:51:33 svoj@april.(none) +1 -0
  BUG#17810 - REPAIR says ok, CHECK says broken (repeatable)
  
  Write operations on tables created in 4.x with index on variable
  length column results in index crash. Even REPAIR TABLE wasn't able
  to fix broken index.
  
  Problem was that packed key length size wasn't restored correctly.
  In 5.0 packed key length size is either 1 or 2. In 4.x this length
  is always 2, but is saved as 0.
  
  This fix ensures that key length size is restored correctly for 4.x
  tables.

  myisam/mi_key.c
    1.49 06/04/27 12:51:29 svoj@april.(none) +1 -1
    Ensure that pack_length is either 1 or 2 (compatibility with 4.x).

ChangeSet
  1.2096.1.3 06/04/26 20:50:27 jimw@mysql.com +1 -0
  Fix bug in ndbcluster.sh on Solaris (now that line is the same as in 5.1)

  mysql-test/ndb/ndbcluster.sh
    1.46 06/04/26 20:49:39 jimw@mysql.com +1 -1
    redirect to /dev/null to avoid grep -q

ChangeSet
  1.2096.1.2 06/04/26 17:09:41 jimw@mysql.com +2 -0
  Remove obsolete test

  mysql-test/t/user_var.test
    1.33 06/04/26 17:09:37 jimw@mysql.com +0 -2
    Remove unnecessary test

  mysql-test/r/user_var.result
    1.38 06/04/26 17:09:37 jimw@mysql.com +0 -3
    Update results

ChangeSet
  1.2092.12.1 06/04/26 09:21:53 jimw@mysql.com +3 -0
  Bug #17849: sql_big_selects not shown in SHOW VARIABLES output
    
    This patch simply adds sql_big_selects to the list of variables
    output by SHOW VARIABLES.

  sql/set_var.cc
    1.150.3.2 06/04/26 09:21:50 jimw@mysql.com +2 -1
    Add sql_big_selects to SHOW VARIABLES output

  mysql-test/t/variables.test
    1.55.2.1 06/04/26 09:21:50 jimw@mysql.com +9 -1
    Add new regression test (and make end-of-tests marker add output)

  mysql-test/r/variables.result
    1.79.2.1 06/04/26 09:21:50 jimw@mysql.com +7 -0
    Update results

ChangeSet
  1.2084.123.3 06/04/26 18:10:14 msvensson@shellback.(none) +2 -0
  Move inclusion of "ripemd.hpp" from yassl to taocrypt

  extra/yassl/taocrypt/src/template_instnt.cpp
    1.6.1.5 06/04/26 18:10:09 msvensson@shellback.(none) +1 -0
    Move inclusion of "ripemd.hpp" from yassl to taocrypt

  extra/yassl/src/template_instnt.cpp
    1.4.1.3 06/04/26 18:10:09 msvensson@shellback.(none) +0 -1
    Move inclusion of "ripemd.hpp" from yassl to taocrypt

ChangeSet
  1.2092.10.3 06/04/26 15:55:30 tomas@poseidon.ndb.mysql.com +7 -0
  Bug #18550 ndbd getting "node failure handling not complete..." after graceful restart
  - addded more retries to wait for nodefailure to complete
  Bug #19039 multi node failure causes node failure handling not to complete
  - patch to avoid this scenario when the management server is used to perform the stop
  - wait for NF_COMPLETE_REP in management server before returning
  ndb: allocate nodeid
  - only retry on retryable error

ChangeSet
  1.2092.10.2 06/04/26 15:47:28 tomas@poseidon.ndb.mysql.com +1 -0
  Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error
  - added retry handling of temporary transaction errors

ChangeSet
  1.2092.9.1 06/04/26 13:21:05 tomas@poseidon.ndb.mysql.com +4 -0
  ndb: added timeout handling to alloc node id to avoid the usage of purge stale sessions

ChangeSet
  1.2084.62.11 06/04/26 16:02:35 jonas@perch.ndb.mysql.com +1 -0
  ndb - backup 4.1->5.0 merge

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.33 06/04/26 16:02:32 jonas@perch.ndb.mysql.com +3 -2
    merge

ChangeSet
  1.1616.2537.7 06/04/26 15:57:48 jonas@perch.ndb.mysql.com +3 -0
  ndb -
    Unleash backup to write more than 32k at a time
    Using parameter BackupMaxWriteSize
    (greatly affect LCP time in 5.1, set default value to 256k)

  ndb/src/mgmsrv/ConfigInfo.cpp
    1.50.2.12 06/04/26 15:57:46 jonas@perch.ndb.mysql.com +13 -1
    Add config fro max write size in backup

  ndb/src/kernel/blocks/backup/BackupInit.cpp
    1.8.1.5 06/04/26 15:57:46 jonas@perch.ndb.mysql.com +3 -2
    Unleash backup to write more than 32k at a time

  ndb/include/mgmapi/mgmapi_config_parameters.h
    1.13.1.5 06/04/26 15:57:46 jonas@perch.ndb.mysql.com +1 -0
    Add config fro max write size in backup

  ndb/src/mgmsrv/Services.cpp
    1.61.1.2 06/04/26 15:55:24 tomas@poseidon.ndb.mysql.com +15 -2
    Bug #18550 ndbd getting "node failure handling not complete..." after graceful restart
    - addded more retries to wait for nodefailure to complete
    Bug #19039 multi node failure causes node failure handling not to complete
    - patch to avoid this scenario when the management server is used to perform the stop
    - wait for NF_COMPLETE_REP in management server before returning
    ndb: allocate nodeid
    - only retry on retryable error

  ndb/src/mgmsrv/MgmtSrvr.hpp
    1.41.1.2 06/04/26 15:55:24 tomas@poseidon.ndb.mysql.com +4 -2
    Bug #18550 ndbd getting "node failure handling not complete..." after graceful restart
    - addded more retries to wait for nodefailure to complete
    Bug #19039 multi node failure causes node failure handling not to complete
    - patch to avoid this scenario when the management server is used to perform the stop
    - wait for NF_COMPLETE_REP in management server before returning
    ndb: allocate nodeid
    - only retry on retryable error

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.96.1.2 06/04/26 15:55:24 tomas@poseidon.ndb.mysql.com +107 -39
    Bug #18550 ndbd getting "node failure handling not complete..." after graceful restart
    - addded more retries to wait for nodefailure to complete
    Bug #19039 multi node failure causes node failure handling not to complete
    - patch to avoid this scenario when the management server is used to perform the stop
    - wait for NF_COMPLETE_REP in management server before returning
    ndb: allocate nodeid
    - only retry on retryable error

  ndb/src/mgmapi/mgmapi.cpp
    1.58.1.1 06/04/26 15:55:24 tomas@poseidon.ndb.mysql.com +9 -4
    Bug #18550 ndbd getting "node failure handling not complete..." after graceful restart
    - addded more retries to wait for nodefailure to complete
    Bug #19039 multi node failure causes node failure handling not to complete
    - patch to avoid this scenario when the management server is used to perform the stop
    - wait for NF_COMPLETE_REP in management server before returning
    ndb: allocate nodeid
    - only retry on retryable error

  ndb/src/kernel/vm/Configuration.cpp
    1.46 06/04/26 15:55:24 tomas@poseidon.ndb.mysql.com +2 -1
    Bug #18550 ndbd getting "node failure handling not complete..." after graceful restart
    - addded more retries to wait for nodefailure to complete
    Bug #19039 multi node failure causes node failure handling not to complete
    - patch to avoid this scenario when the management server is used to perform the stop
    - wait for NF_COMPLETE_REP in management server before returning
    ndb: allocate nodeid
    - only retry on retryable error

  ndb/src/common/mgmcommon/ConfigRetriever.cpp
    1.34 06/04/26 15:55:24 tomas@poseidon.ndb.mysql.com +4 -2
    Bug #18550 ndbd getting "node failure handling not complete..." after graceful restart
    - addded more retries to wait for nodefailure to complete
    Bug #19039 multi node failure causes node failure handling not to complete
    - patch to avoid this scenario when the management server is used to perform the stop
    - wait for NF_COMPLETE_REP in management server before returning
    ndb: allocate nodeid
    - only retry on retryable error

  ndb/include/mgmapi/mgmapi.h
    1.48 06/04/26 15:55:24 tomas@poseidon.ndb.mysql.com +7 -1
    Bug #18550 ndbd getting "node failure handling not complete..." after graceful restart
    - addded more retries to wait for nodefailure to complete
    Bug #19039 multi node failure causes node failure handling not to complete
    - patch to avoid this scenario when the management server is used to perform the stop
    - wait for NF_COMPLETE_REP in management server before returning
    ndb: allocate nodeid
    - only retry on retryable error

  sql/ha_ndbcluster.cc
    1.245 06/04/26 15:47:20 tomas@poseidon.ndb.mysql.com +27 -5
    Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error
    - added retry handling of temporary transaction errors

ChangeSet
  1.2084.123.2 06/04/26 15:29:52 msvensson@shellback.(none) +6 -0
  Import from upstream yassl

  extra/yassl/testsuite/test.hpp
    1.2 06/04/24 23:55:04 msvensson@shellback.(none)[msvensson] +2 -2
    Import patch yassl.diff

  extra/yassl/taocrypt/src/template_instnt.cpp
    1.6.1.4 06/04/24 21:55:44 msvensson@shellback.(none)[msvensson] +0 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/src/make.bat
    1.2 06/04/24 21:55:44 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/src/asn.cpp
    1.6 06/04/24 23:55:04 msvensson@shellback.(none)[msvensson] +52 -12
    Import patch yassl.diff

  extra/yassl/taocrypt/include/asn.hpp
    1.5 06/04/24 23:55:04 msvensson@shellback.(none)[msvensson] +13 -6
    Import patch yassl.diff

  extra/yassl/mySTL/helpers.hpp
    1.10 06/04/24 21:55:44 msvensson@shellback.(none)[msvensson] +5 -0
    Import patch yassl.diff

ChangeSet
  1.1616.2537.6 06/04/26 15:12:32 jonas@perch.ndb.mysql.com +2 -0
  ndb - backport from 5.1
    Fix alignment of sockaddr(_in)

  ndb/src/mgmsrv/Services.cpp
    1.31.1.9 06/04/26 15:12:30 jonas@perch.ndb.mysql.com +3 -3
    Fix alignment of sockaddr(_in)

  ndb/src/common/transporter/Transporter.cpp
    1.12.1.2 06/04/26 15:12:30 jonas@perch.ndb.mysql.com +6 -6
    Fix alignment of sockaddr(_in)

ChangeSet
  1.1616.2537.5 06/04/26 14:54:20 jonas@perch.ndb.mysql.com +1 -0
  Add ndb_config to rpm spec

  support-files/mysql.spec.sh
    1.83.1.32 06/04/26 14:54:18 jonas@perch.ndb.mysql.com +1 -0
    Add ndb_config to rpm spec

ChangeSet
  1.1616.2537.4 06/04/26 14:53:43 jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#17150
    ndb_mgmd limited no of api nodes, by restricting no of mgmsessions
    (these are used for dynamic port allocation)

  ndb/src/common/util/SocketServer.cpp
    1.10.1.3 06/04/26 14:53:42 jonas@perch.ndb.mysql.com +2 -2
    Increase default max session to ~0

  ndb/include/util/SocketServer.hpp
    1.5.1.2 06/04/26 14:53:41 jonas@perch.ndb.mysql.com +1 -1
    Increase default max session to ~0

ChangeSet
  1.2084.1.107 06/04/26 13:22:18 msvensson@neptunus.(none) +1 -0
  Change sleep_until_file_created to sleep 100 millisecond instead of sleeping 1 seconds between each iteration.

  mysql-test/lib/mtr_process.pl
    1.31 06/04/26 13:22:14 msvensson@neptunus.(none) +14 -8
    Change sleep_until_file_created to sleep 100 millisecond instead of sleeping 1 seconds between each iteration.

  ndb/src/mgmsrv/Services.hpp
    1.16.1.1 06/04/26 13:20:59 tomas@poseidon.ndb.mysql.com +1 -0
    ndb: added timeout handling to alloc node id to avoid the usage of purge stale sessions

  ndb/src/mgmsrv/Services.cpp
    1.61.1.1 06/04/26 13:20:59 tomas@poseidon.ndb.mysql.com +45 -12
    ndb: added timeout handling to alloc node id to avoid the usage of purge stale sessions

  ndb/src/mgmsrv/MgmtSrvr.hpp
    1.41.1.1 06/04/26 13:20:59 tomas@poseidon.ndb.mysql.com +3 -1
    ndb: added timeout handling to alloc node id to avoid the usage of purge stale sessions

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.96.1.1 06/04/26 13:20:58 tomas@poseidon.ndb.mysql.com +16 -1
    ndb: added timeout handling to alloc node id to avoid the usage of purge stale sessions

ChangeSet
  1.2092.7.1 06/04/26 15:58:27 holyfoot@deer.(none) +3 -0
  bug #18455 (embedded server Win32 build)

  VC++Files/libmysqld/libmysqld_ia64.dsp
    1.4 06/04/26 15:57:12 holyfoot@mysql.com +4 -0
    my_user.c added

  VC++Files/libmysqld/libmysqld.vcproj
    1.4 06/04/26 15:57:12 holyfoot@mysql.com +36 -0
    my_user.c file added

  VC++Files/libmysqld/libmysqld.dsp
    1.30 06/04/26 15:57:12 holyfoot@mysql.com +4 -0
    my_user.c file added

ChangeSet
  1.2084.1.106 06/04/26 12:45:22 msvensson@neptunus.(none) +2 -0
  Bug#19362 im_daemon_lifecycle fails when built from source distribution
  - Add function "mysqld_real_path" which is needed if the mysqld_path is a symlink or a script(like libtool) that executes the real mysqld.
  - Add new variable mysqld_real_path
  - Use mysqld_real_path from fill_instance_version

  server-tools/instance-manager/instance_options.h
    1.19 06/04/26 12:45:18 msvensson@neptunus.(none) +4 -1
    Add new variable "mysqld_real_path"

  server-tools/instance-manager/instance_options.cc
    1.30 06/04/26 12:45:18 msvensson@neptunus.(none) +57 -2
    Add function "mysqld_real_path" which is needed if the mysqld_path is a symlink or a script(like libtool) that executes the real mysqld.
    Add new variable mysqld_real_path
    Use mysqld_real_path from fill_instance_version

ChangeSet
  1.2084.1.105 06/04/26 12:16:57 msvensson@neptunus.(none) +1 -0
  Remove hacks for building shared libs on aix and qnx

  configure.in
    1.384 06/04/26 12:16:52 msvensson@neptunus.(none) +0 -39
    Remove hacks for building shared libs on aix and qnx

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

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

ChangeSet
  1.1616.2556.1 06/04/25 15:27:28 ramil@mysql.com +1 -0
  Fix for bug #7643: ALTER TABLE fails for CSV, EXAMPLE, ARCHIVE engines
  

  sql/sql_table.cc
    1.157.60.1 06/04/25 15:27:24 ramil@mysql.com +3 -1
    Fix for bug #7643: ALTER TABLE fails for CSV, EXAMPLE, ARCHIVE engines
      - issue an ER_NOT_SUPPORTED_YET if an engine doesn't support ALTER TABLE.

ChangeSet
  1.1616.2555.1 06/04/25 14:34:19 ramil@mysql.com +3 -0
  Fix for bug #18501: Server crashes with monthname().

  sql/item_timefunc.cc
    1.51.1.48 06/04/25 14:34:14 ramil@mysql.com +2 -2
    Fix for bug #18501: Server crashes with monthname().
      - check null_value as well.

  mysql-test/t/func_time.test
    1.21.1.12 06/04/25 14:34:13 ramil@mysql.com +7 -0
    Fix for bug #18501: Server crashes with monthname().
      - test case

  mysql-test/r/func_time.result
    1.23.1.15 06/04/25 14:34:13 ramil@mysql.com +4 -0
    Fix for bug #18501: Server crashes with monthname().
      - test case

ChangeSet
  1.2088.9.2 06/04/25 04:27:23 konstantin@mysql.com +6 -0
  A fix and a test case for Bug#19308 "REPAIR/OPTIMIZE/ANALYZE 
  supported in SP but not in PS": just enable them in prepared
  statements, the supporting functionality was implemented when
  they were enabled in stored procedures.

  sql/sql_prepare.cc
    1.176 06/04/25 04:27:16 konstantin@mysql.com +3 -0
    Enable ANALYZE, OPTIMIZE, REPAIR in prepared statements.

  mysql-test/t/ps_1general.test
    1.27 06/04/25 04:27:16 konstantin@mysql.com +0 -3
    Adjust existing test cases (ANALYZE/OPTIMIZE/REPAIR are now
    allowed in prepared statements.

  mysql-test/t/ps.test
    1.63 06/04/25 04:27:16 konstantin@mysql.com +36 -0
    Add a test case for Bug#19308 "REPAIR/OPTIMIZE/ANALYZE supported 
    in SP but not in PS"

  mysql-test/r/sp-dynamic.result
    1.4 06/04/25 04:27:16 konstantin@mysql.com +3 -3
    Adjust existing test cases (ANALYZE/OPTIMIZE/REPAIR are now
    allowed in prepared statements.

  mysql-test/r/ps_1general.result
    1.53 06/04/25 04:27:16 konstantin@mysql.com +0 -3
    Adjust existing test cases (ANALYZE/OPTIMIZE/REPAIR are now
    allowed in prepared statements.

  mysql-test/r/ps.result
    1.65 06/04/25 04:27:16 konstantin@mysql.com +101 -0
    Bug#19308: test results fixed.

ChangeSet
  1.2092.2.3 06/04/24 16:38:28 stewart@mysql.com +1 -0
  BUG#19318 valgrind: memory leak in ndb_mgmd
  
  now deal with memory correctly during ConfigInfo construction (due to previous changes)

  ndb/src/mgmsrv/ConfigInfo.cpp
    1.73 06/04/24 16:38:18 stewart@mysql.com +4 -4
    Correctly deal with memory during ConfigInfo construction

ChangeSet
  1.2092.2.2 06/04/24 15:59:34 stewart@mysql.com +2 -0
  BUG#19318 valgrind: memory leak in ndb_mgmd
  
  2nd part of the patch
  
  fix functions called by ndbd to deal with memory allocation properly. 

  ndb/src/mgmsrv/ConfigInfo.cpp
    1.72 06/04/24 15:59:30 stewart@mysql.com +1 -0
    clean up after ourselves in constructor

  ndb/src/mgmapi/mgmapi.cpp
    1.59 06/04/24 15:59:30 stewart@mysql.com +1 -1
    in get_configuration() - get a copy to return instead of just passing one back and loosing some memory

ChangeSet
  1.2092.2.1 06/04/24 15:20:45 stewart@mysql.com +2 -0
  BUG#19318 valgrind: memory leak in ndb_mgmd
  
  clean up after ConfigValuesFactory

  ndb/src/common/util/ConfigValues.cpp
    1.9 06/04/24 15:20:41 stewart@mysql.com +7 -1
    Free m_cfg on destruct (if we've set it).
    
    Also getConfigValues() instead of m_cfg

  ndb/include/util/ConfigValues.hpp
    1.4 06/04/24 15:20:41 stewart@mysql.com +1 -0
    We now have a destructor

ChangeSet
  1.2084.1.104 06/04/24 21:42:44 msvensson@neptunus.(none) +1 -0
  Revert use of octal numbers for chmod

  mysql-test/t/information_schema.test
    1.75 06/04/24 21:42:40 msvensson@neptunus.(none) +2 -2
    Revert use of octal numbers for chmod

ChangeSet
  1.2094 06/04/24 20:59:23 evgen@moonbone.local +1 -0
  having.test:
    After merge fix for bug#18739

  mysql-test/t/having.test
    1.22 06/04/24 20:58:48 evgen@moonbone.local +1 -1
    After merge fix for bug#18739

ChangeSet
  1.2084.125.1 06/04/24 18:57:00 dlenev@mysql.com +4 -0
  Fix for bug#11081 "Using a CONVERT_TZ function in a stored function or
  trigger fails".
  
  In cases when CONVERT_TZ() function was used in trigger or stored function
  (or in stored procedure which was called from trigger or stored function)
  error about non existing '.' table was reported.
  
  Statements that use CONVERT_TZ() function should have time zone related
  tables in their table list. tz_init_table_list() function which is used
  to produce part of table list containing those tables didn't set
  TABLE_LIST::db_length/table_name_length members properly. As result time
  zone tables needed for CONVERT_TZ() function were incorrectly handled by
  prelocking algorithm and "Table '.' doesn't exist' error was emitted.
  This fix changes tz_init_table_list() in such way that it properly inits
  TABLE_LIST::table_name_length/db_length members and thus produces table list
  which can be handled by prelocking algorithm correctly.

  sql/tztime.h
    1.14 06/04/24 18:56:56 dlenev@mysql.com +11 -2
    Added MY_TZ_TABLES_COUNT constant to be used as number of time zone related
    tables which are needed for dynamical loading of time zone descriptions.

  sql/tztime.cc
    1.31 06/04/24 18:56:56 dlenev@mysql.com +52 -30
    Now tz_init_table_list() inits table_name_length and db_length members in
    TABLE_LIST objects, so table lists produced with its help can be handled 
    by prelocking algorithm properly.
    
    Also two clean-ups are included:
    - Now we use MY_TZ_TABLES_COUNT instead of magical number 4 in places where
      it is appropriate.
    - TZ_NAMES_ENTRY structure was converted to Tz_names_entry class in order 
      to emphasize its non-POD nature.

  mysql-test/t/timezone2.test
    1.10 06/04/24 18:56:56 dlenev@mysql.com +20 -0
    Added test for bug #11081 "Using a CONVERT_TZ function in a stored function
    or trigger fails".

  mysql-test/r/timezone2.result
    1.13 06/04/24 18:56:56 dlenev@mysql.com +15 -0
    Added test for bug #11081 "Using a CONVERT_TZ function in a stored function
    or trigger fails".

ChangeSet
  1.1616.2554.1 06/04/24 18:06:43 kroki@mysql.com +3 -0
  Bug#16501: IS_USED_LOCK does not appear to work
  
  Update User_level_lock::thread_id on acquiring an existing lock,
  and reset it on lock release.

  sql/item_func.cc
    1.124.42.8 06/04/24 18:06:39 kroki@mysql.com +2 -0
    Update User_level_lock::thread_id on acquiring an existing lock,
    and reset it on lock release (for safety).

  mysql-test/t/func_misc.test
    1.11.1.3 06/04/24 18:06:39 kroki@mysql.com +38 -0
    Add test case for bug#16501.

  mysql-test/r/func_misc.result
    1.16.1.2 06/04/24 18:06:38 kroki@mysql.com +36 -0
    Add result for bug#16501.

ChangeSet
  1.2084.1.103 06/04/24 14:25:34 msvensson@neptunus.(none) +1 -0
  Update disabled message to include bug no.

  mysql-test/t/disabled.def
    1.27 06/04/24 14:25:30 msvensson@neptunus.(none) +1 -1
    Update disabled message

ChangeSet
  1.2084.1.102 06/04/24 13:51:21 msvensson@neptunus.(none) +1 -0
  Test it it works better to set no read access for a file by using 000 instead of -r
  Looks like the trigger.test works that way

  mysql-test/t/information_schema.test
    1.74 06/04/24 13:51:17 msvensson@neptunus.(none) +2 -2
    Test it it works better to set no read access for a file by using 000 instead of -r

ChangeSet
  1.2084.1.101 06/04/24 13:33:33 msvensson@neptunus.(none) +1 -0
  Update help message for start-and-exit

  mysql-test/mysql-test-run.pl
    1.87.4.7 06/04/24 13:33:28 msvensson@neptunus.(none) +1 -1
    Update help message for start-and-exit

ChangeSet
  1.2084.1.100 06/04/24 13:25:50 msvensson@neptunus.(none) +1 -0
  Ad file "have_ndb_status_ok.require"

  mysql-test/r/have_ndb_status_ok.require
    1.1 06/04/24 13:25:46 msvensson@neptunus.(none) +2 -0
    New BitKeeper file ``mysql-test/r/have_ndb_status_ok.require''

  mysql-test/r/have_ndb_status_ok.require
    1.0 06/04/24 13:25:45 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysql-5.0-maint/mysql-test/r/have_ndb_status_ok.require

ChangeSet
  1.2084.1.99 06/04/24 12:01:16 msvensson@neptunus.(none) +1 -0
  Use "eval select" when evaluating the environment variable "$MYSQL_TEST_ROOT" 

  mysql-test/include/not_as_root.inc
    1.2 06/04/24 12:01:12 msvensson@neptunus.(none) +1 -1
    Use "eval select" when evaluating the environment variable "$MYSQL_TEST_ROOT" 

ChangeSet
  1.2084.1.98 06/04/24 12:00:11 msvensson@neptunus.(none) +2 -0
  Make have_ndb.in portable

  mysql-test/mysql-test-run.pl
    1.87.4.6 06/04/24 12:00:07 msvensson@neptunus.(none) +3 -2
    Move initializetion of NDB_STATUS_OK and only do it once in init part of scripot. This will make it possible to  set 
    it to NO if we detect that cluster can't be started.

  mysql-test/include/have_ndb.inc
    1.8 06/04/24 12:00:07 msvensson@neptunus.(none) +8 -1
    Remove the "exec test" and instead use the portable way to
    check an environment variable using "eval select". The value of 
    $NDB_STATUS_OK will this be replace by mysqltest and the query 
    "select "YES" and ndb_status_ok" will be sent to the server and back.

ChangeSet
  1.2084.1.97 06/04/24 11:26:41 msvensson@neptunus.(none) +2 -0
  Bug#19084  	./mysql-test-run.pl do not print bootstrap run info
   - Log boostratp/install to var/log/boostrap.log
   - Log output from mysqladmin to var/log/mysqladmin.log
   - Remove old manager references

  mysql-test/mysql-test-run.pl
    1.87.4.5 06/04/24 11:26:37 msvensson@neptunus.(none) +11 -14
    Log output from boostrap/install of db's to var/log/bootstrap.log
    Remove references to old manager

  mysql-test/lib/mtr_process.pl
    1.30 06/04/24 11:26:37 msvensson@neptunus.(none) +5 -4
    Log output from mysqladmin to var/log/mysqladmin.log

ChangeSet
  1.2084.1.96 06/04/24 10:39:56 msvensson@neptunus.(none) +2 -0
  Cleanup formatting

  mysql-test/mysql-test-run.pl
    1.87.4.4 06/04/24 10:39:52 msvensson@neptunus.(none) +44 -38
    Cleanup formatting

  BitKeeper/etc/ignore
    1.219 06/04/24 10:39:52 msvensson@neptunus.(none) +3 -0
    Added extra/yassl/taocrypt/benchmark/benchmark extra/yassl/taocrypt/test/test extra/yassl/testsuite/testsuite to the ignore list

ChangeSet
  1.2084.1.95 06/04/24 10:33:24 msvensson@neptunus.(none) +1 -0
  Remove the old unused code for setting a PATH

  mysql-test/mysql-test-run.pl
    1.87.4.3 06/04/24 10:33:20 msvensson@neptunus.(none) +0 -5
    Remove the old unused code for setting a PATH

ChangeSet
  1.2084.1.94 06/04/24 10:27:13 msvensson@neptunus.(none) +2 -0
  Move copy_dir to mtr_misc and rename it to mtr_copy_dir

  mysql-test/mysql-test-run.pl
    1.87.4.2 06/04/24 10:27:09 msvensson@neptunus.(none) +2 -22
    Move copy_dir to mtr_misc and rename it to mtr_copy_dir

  mysql-test/lib/mtr_misc.pl
    1.10 06/04/24 10:27:09 msvensson@neptunus.(none) +17 -8
    Move copy_dir to mtr_misc and rename it to mtr_copy_dir

ChangeSet
  1.2084.1.93 06/04/24 10:22:26 msvensson@neptunus.(none) +1 -0
  Remove 5 second sleep for win32

  mysql-test/lib/mtr_process.pl
    1.29 06/04/24 10:22:22 msvensson@neptunus.(none) +0 -2
    Remove 5 second sleep for win32

ChangeSet
  1.2084.1.92 06/04/24 10:21:09 msvensson@neptunus.(none) +5 -0
  Bug#17002  mysql-test-run as root user
   - Add test to see if tests are running with root permissions
   - Disables tests that uses chmod if that is the case

  mysql-test/r/not_as_root.require
    1.1 06/04/24 10:21:05 msvensson@neptunus.(none) +2 -0
    New BitKeeper file ``mysql-test/r/not_as_root.require''

  mysql-test/r/not_as_root.require
    1.0 06/04/24 10:21:05 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysql-5.0-maint/mysql-test/r/not_as_root.require

  mysql-test/include/not_as_root.inc
    1.1 06/04/24 10:21:04 msvensson@neptunus.(none) +4 -0
    New BitKeeper file ``mysql-test/include/not_as_root.inc''

  mysql-test/t/rpl_rotate_logs.test
    1.65 06/04/24 10:21:04 msvensson@neptunus.(none) +3 -0
    Disable test if running as root.

  mysql-test/t/information_schema.test
    1.73 06/04/24 10:21:04 msvensson@neptunus.(none) +3 -0
    Disable test if running as root 

  mysql-test/mysql-test-run.pl
    1.87.4.1 06/04/24 10:21:04 msvensson@neptunus.(none) +29 -0
    Add test to check if mysql-test-run is run with root permission. 
    Set environment variable MYSQL_TEST_ROOT to 'YES' or 'NO'.

  mysql-test/include/not_as_root.inc
    1.0 06/04/24 10:21:04 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysql-5.0-maint/mysql-test/include/not_as_root.inc

ChangeSet
  1.1616.2553.1 06/04/24 13:07:53 holyfoot@vva.(none) +1 -0
  bug #16892 (mysql_client_test fails in embedded server)

  mysql-test/t/mysql_client_test.test
    1.14.1.1 06/04/24 13:07:14 holyfoot@mysql.com +3 -0
    test disabled in embedded server

ChangeSet
  1.2084.123.1 06/04/22 21:53:33 msvensson@shellback.(none) +1 -0
  Fix for building shared libraries on AIX with 64-bit mode
  Set building of shared libraries on QNX to defatul OFF

  configure.in
    1.383 06/04/22 21:53:28 msvensson@shellback.(none) +47 -0
    -Libtool forgets to pass the -q64 and -X64 flags to "nm" and "xlc_r" when building
    for 64-bit on AIX. Add some hacks before we create libtool that fixes this.
    This test should be integrated into autoconf/libtool
    
    -Set default to not build shared librarues on QNX. When building libmysqlclient and libmysqlclient_r
    so many objects are passed to libtool that sh propably runs out of stack  and segfaults.

ChangeSet
  1.2088.7.1 06/04/21 18:26:39 jimw@mysql.com +1 -0
  Bug #18607: LOAD DATA FROM MASTER fails because of INFORMATION_SCHEMA database
  
    Simply exclude INFORMATION_SCHEMA from LOAD DATA FROM MASTER just like
    we exclude the `mysql` database.
  
    There's no test for this, because it requires an unfiltered 'LOAD DATA
    FROM MASTER' which is too likely to cause chaos (such as when running
    the test suite against an external server).

  sql/repl_failsafe.cc
    1.61 06/04/21 18:26:36 jimw@mysql.com +2 -1
    Exclude information_schema from LOAD DATA FROM MASTER.

ChangeSet
  1.2084.1.90 06/04/22 00:48:13 msvensson@neptunus.(none) +5 -0
  Backport fix for mysql client not using SSl library directly
   - Add function mysql_get_ssl_cipher
   - Use function mysql_get_ssl_cipher from mysql

  sql-common/client.c
    1.84.1.5 06/04/22 00:48:09 msvensson@neptunus.(none) +21 -0
    Backport fix for mysql client not using SSl library directly

  libmysqld/libmysqld.def
    1.15 06/04/22 00:48:09 msvensson@neptunus.(none) +1 -0
    Backport fix for mysql client not using SSl library directly

  libmysql/libmysql.def
    1.44 06/04/22 00:48:08 msvensson@neptunus.(none) +1 -0
    Backport fix for mysql client not using SSl library directly

  include/mysql.h
    1.156.1.1 06/04/22 00:48:08 msvensson@neptunus.(none) +1 -0
    Backport fix for mysql client not using SSl library directly

  client/mysql.cc
    1.200.1.1 06/04/22 00:48:08 msvensson@neptunus.(none) +2 -3
    Backport fix for mysql client not using SSl library directly

ChangeSet
  1.2084.1.89 06/04/21 19:53:30 msvensson@neptunus.(none) +1 -0
  Remove -Wall  etc, not so portable compiler options

  extra/yassl/testsuite/Makefile.am
    1.2 06/04/21 19:53:26 msvensson@neptunus.(none) +3 -3
    Remove -Wall  etc, not so portable compiler options

ChangeSet
  1.2088.4.4 06/04/21 10:48:53 jimw@mysql.com +1 -0
  Bug #18312: mysqltest: --sleep=0 doesn't disable sleep
  
    Allow --sleep=0 to be specified to mysqltest, so that sleep calls
    can be disabled.
  
    Original patch from Paul DuBois.

  client/mysqltest.c
    1.232.1.1 06/04/21 10:48:49 jimw@mysql.com +5 -4
    Handle --sleep=0 being specified.

ChangeSet
  1.2086.4.1 06/04/21 09:48:49 jimw@mysql.com +2 -0
  Bug #19083 ./mysql-test-run.pl starts NDB when it is not needed
  
    Now NDB is only initialized and started when the tests that are
    being run will make use of it. The same thing is also done for the
    slave databases and the instance manager.
  
    After review from Magnus: Only take a snapshot of the data directories
    that are in use.

  mysql-test/ndb/ndbcluster.sh
    1.43.1.1 06/04/21 09:48:45 jimw@mysql.com +2 -2
    Fix text message that has always annoyed me

  mysql-test/mysql-test-run.pl
    1.87.3.1 06/04/21 09:48:45 jimw@mysql.com +69 -38
    Only initialize (and start) NDB, the instance manager, and the slaves
    when we have tests that require them. Also, only snapshot the data
    directories that we are going to use.

ChangeSet
  1.2084.1.88 06/04/21 18:19:50 msvensson@neptunus.(none) +2 -0
  Move telpate instantiations of taocrypt objects to taocrypt/template_instnt.cpp

  extra/yassl/taocrypt/src/template_instnt.cpp
    1.6.1.3 06/04/21 18:19:46 msvensson@neptunus.(none) +3 -0
    Move telpate instantiations of taocrypt objects to taocrypt/template_instnt.cpp

  extra/yassl/src/template_instnt.cpp
    1.4.1.2 06/04/21 18:19:46 msvensson@neptunus.(none) +0 -7
    Move telpate instantiations of taocrypt objects to taocrypt/template_instnt.cpp

ChangeSet
  1.2084.1.87 06/04/21 15:57:03 msvensson@neptunus.(none) +1 -0
  Disable udf test

  mysql-test/t/disabled.def
    1.26 06/04/21 15:56:58 msvensson@neptunus.(none) +1 -0
    Disable udf test

ChangeSet
  1.2084.119.1 06/04/21 12:30:33 msvensson@neptunus.(none) +1 -0
  Don't run mysqld when started in ddd
  Maybe we should do the same for gdb?

  mysql-test/mysql-test-run.pl
    1.87.1.1 06/04/21 12:30:28 msvensson@neptunus.(none) +1 -2
    Don't run mysqld when started in ddd
    Maybe we should do the same for gdb?

ChangeSet
  1.2086.3.1 06/04/20 21:56:53 jimw@mysql.com +4 -0
  Bug #12792: @@system_time_zone is not SELECTable
  Bug #15684: @@version_* are not all SELECTable
  
    Added the appropriate information as read-only system variables, and
    also removed some special-case handling of @@version along the way.
  
    @@version_bdb was added, but isn't included in the test because it
    depends on the presence of BDB.

  sql/set_var.cc
    1.150.2.1 06/04/20 21:56:50 jimw@mysql.com +26 -7
    Add system_time_zone and various version-related system variables

  sql/item_func.cc
    1.276.3.1 06/04/20 21:56:50 jimw@mysql.com +0 -6
    Remove special-case handling of VERSION, it's just a read-only server
    variable like the others now.

  mysql-test/t/variables.test
    1.55.1.1 06/04/20 21:56:50 jimw@mysql.com +19 -2
    Fix error from setting @@version, reset sql_select_limit to avoid confusion
    in later tests, and add new regression tests.

  mysql-test/r/variables.result
    1.79.1.1 06/04/20 21:56:49 jimw@mysql.com +10 -1
    Update results

ChangeSet
  1.2086.2.1 06/04/20 20:41:12 jimw@mysql.com +3 -0
  Bug #16195: SHOW VARIABLES doesn't report correctly sql_warnings and sql_notes values
  
    SQL_WARNINGS and SQL_NOTES were being displayed with SHOW_BOOL, but they
    are system variables that need SHOW_SYS to be used.

  sql/set_var.cc
    1.150.1.4 06/04/20 20:41:08 jimw@mysql.com +2 -2
    Fix display of sql_notes and sql_warnings in SHOW VARIABLES.

  mysql-test/t/variables.test
    1.56 06/04/20 20:41:08 jimw@mysql.com +12 -1
    Add new regression test

  mysql-test/r/variables.result
    1.80 06/04/20 20:41:08 jimw@mysql.com +15 -0
    Add new results

ChangeSet
  1.2086.1.1 06/04/20 19:17:14 jimw@mysql.com +1 -0
  Bug #18617: mysql-test-run.pl, partially wrong handling of option "start-dirty"
  
    This was a case of too much code. The --start-dirty option should act
    just like --start-and-exit, except it skips the database initialization
    step. Now it does, which means it picks up the options from the specified
    test case.

  mysql-test/mysql-test-run.pl
    1.88 06/04/20 19:17:09 jimw@mysql.com +10 -23
    Fix handle of --start-dirty to be like --start-and-exit, without the
    database initialization, as it was (sort of) documented.

ChangeSet
  1.2088.1.5 06/04/20 18:23:04 brian@zim.(none) +2 -0
  Dean noticed that constant flush calls caused the archive stream file to flush empty buffers. This patch removes that behavior. 

  sql/ha_archive.h
    1.33 06/04/20 18:22:59 brian@zim.(none) +2 -0
    Added a variable to determine state, and a new method for encapsulating the opening of archive writers.

  sql/ha_archive.cc
    1.67 06/04/20 18:22:59 brian@zim.(none) +32 -11
    Modifications for more of a lazy approach to opening up archive files for writing. 

ChangeSet
  1.2084.118.1 06/04/21 01:52:59 evgen@moonbone.local +5 -0
  Fixed bug#18739: non-standard HAVING extension was allowed in strict ANSI sql mode.
  
  The SQL standard doesn't allow to use in HAVING clause fields that are not 
  present in GROUP BY clause and not under any aggregate function in the HAVING
  clause. However, mysql allows using such fields. This extension assume that 
  the non-grouping fields will have the same group-wise values. Otherwise, the 
  result will be unpredictable. This extension allowed in strict 
  MODE_ONLY_FULL_GROUP_BY sql mode results in misunderstanding of HAVING 
  capabilities.
  
  The new error message ER_NON_GROUPING_FIELD_USED message is added. It says
  "non-grouping field '%-.64s' is used in %-.64s clause". This message is
  supposed to be used for reporting errors when some field is not found in the
  GROUP BY clause but have to be present there. Use cases for this message are 
  this bug and when a field is present in a SELECT item list not under any 
  aggregate function and there is GROUP BY clause present which doesn't mention 
  that field. It renders the ER_WRONG_FIELD_WITH_GROUP error message obsolete as
  being more descriptive.
  The resolve_ref_in_select_and_group() function now reports the 
  ER_NON_GROUPING_FIELD_FOUND error if the strict mode is set and the field for 
  HAVING clause is found in the SELECT item list only.
  

  sql/item.cc
    1.214.1.1 06/04/21 01:50:59 evgen@moonbone.local +16 -2
    Fixed bug#18739: non-standard HAVING extension was allowed in strict ANSI sql mode.
    The resolve_ref_in_select_and_group() function now reports the
    ER_NON_GROUPING_FIELD_FOUND error if the strict MODE_ONLY_FULL_GROUP_BY mode
    is set and the field for HAVING clause is found in the SELECT item list only.

  sql/sql_select.cc
    1.404.1.1 06/04/21 01:49:30 evgen@moonbone.local +4 -0
    Added TODO comment to change the ER_WRONG_FIELD_WITH_GROUP to more detailed ER_NON_GROUPING_FIELD_USED message.

  mysql-test/r/having.result
    1.24 06/04/21 01:49:19 evgen@moonbone.local +13 -0
    Added test case for the bug#18739:  non-standard HAVING extension was allowed in strict ANSI sql mode.

  mysql-test/t/having.test
    1.21 06/04/21 01:49:05 evgen@moonbone.local +13 -0
    Added test case for the bug#18739:  non-standard HAVING extension was allowed in strict ANSI sql mode.

  sql/share/errmsg.txt
    1.61.2.1 06/04/21 01:48:27 evgen@moonbone.local +2 -0
    Added the new ER_NON_GROUPING_FIELD_USED error message for the bug#14169.

ChangeSet
  1.2084.113.3 06/04/20 01:02:33 tnurnberg@mysql.com +1 -0
  Bug#18964 "return 0 instead of DBUG_RETURN(0) in sql_base.cc::open_table()"
  
  fixlet corrects return to DBUG_RETURN to restore the balance.

  sql/sql_base.cc
    1.333 06/04/20 01:02:26 tnurnberg@mysql.com +1 -1
    DBUG_ENTER without DBUG_RETURN in open_table()

ChangeSet
  1.2084.113.2 06/04/20 00:55:30 tnurnberg@mysql.com +1 -0
  debugging a BK issue

  sql/sql_base.cc
    1.332 06/04/20 00:55:24 tnurnberg@mysql.com +1 -1
    debugging a BK issue

ChangeSet
  1.2084.113.1 06/04/19 22:56:48 tnurnberg@mysql.com +1 -0
  Bug#18964 "return 0 instead of DBUG_RETURN(0) in sql_base.cc::open_table()"
  
  fixlet corrects return to DBUG_RETURN to restore the balance.

  sql/sql_base.cc
    1.331 06/04/19 22:56:38 tnurnberg@mysql.com +1 -1
    DBUG_ENTER without DBUG_RETURN in open_table()

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

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

ChangeSet
  1.2084.110.1 06/04/19 14:27:59 kroki@mysql.com +3 -0
  Bug#6951: Triggers/Traditional: SET @ result wrong
  
  While executing a trigger, we have to set thd->abort_on_warning to the value
  it had at trigger creation time.

  sql/sp_head.cc
    1.206.1.1 06/04/19 14:27:53 kroki@mysql.com +6 -0
    While executing a trigger, set thd->abort_on_warning to the value it had at
    trigger creation time.

  mysql-test/t/trigger.test
    1.40.1.1 06/04/19 14:27:53 kroki@mysql.com +48 -0
    Add test case for bug#6951.

  mysql-test/r/trigger.result
    1.35.1.1 06/04/19 14:27:52 kroki@mysql.com +36 -0
    Add result for bug#6951.

ChangeSet
  1.2084.109.1 06/04/19 15:13:50 svoj@april.(none) +6 -0
  BUG#18160 - Memory-/HEAP Table endless growing indexes
  
  Updating data in HEAP table with BTREE index results in wrong index_length
  counter value, which keeps growing after each update.
  
  When inserting new record into tree counter is incremented by:
  sizeof(TREE_ELEMENT) + key_size + tree->size_of_element
  But when deleting element from tree it doesn't decrement counter by key_size:
  sizeof(TREE_ELEMENT) + tree->size_of_element
  
  This fix makes accurate allocated memory counter for tree. That is
  decrease counter by key_size when deleting tree element.

  mysys/tree.c
    1.29 06/04/19 15:13:46 svoj@april.(none) +2 -3
    Added size of the key to tree_delete() for accurate allocated memory counter.
    Note that this size is optional. If one doesn't need precise counter it is safe
    to pass 0 as key_size.

  mysql-test/t/heap_btree.test
    1.15 06/04/19 15:13:46 svoj@april.(none) +10 -0
    Testcase for BUG#18160.

  mysql-test/r/heap_btree.result
    1.19 06/04/19 15:13:45 svoj@april.(none) +10 -0
    Testcase for BUG#18160.

  myisam/myisamlog.c
    1.32 06/04/19 15:13:45 svoj@april.(none) +1 -1
    Added size of the key to tree_delete() for accurate allocated memory counter.

  include/my_tree.h
    1.18 06/04/19 15:13:45 svoj@april.(none) +1 -1
    Added size of the key to tree_delete() for accurate allocated memory counter.

  heap/hp_delete.c
    1.16 06/04/19 15:13:45 svoj@april.(none) +2 -1
    Added size of the key to tree_delete() for accurate allocated memory counter.

ChangeSet
  1.2084.63.7 06/04/19 11:42:55 msvensson@shellback.(none) +3 -0
  Add the .der files used by yaSSL benchmark

  extra/yassl/taocrypt/benchmark/rsa1024.der
    1.1 06/04/19 11:42:49 msvensson@shellback.(none) +15 -0
    New BitKeeper file ``extra/yassl/taocrypt/benchmark/rsa1024.der''

  extra/yassl/taocrypt/benchmark/dsa1024.der
    1.1 06/04/19 11:42:49 msvensson@shellback.(none) +11 -0
    New BitKeeper file ``extra/yassl/taocrypt/benchmark/dsa1024.der''

  extra/yassl/taocrypt/benchmark/rsa1024.der
    1.0 06/04/19 11:42:49 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl_3/extra/yassl/taocrypt/benchmark/rsa1024.der

  extra/yassl/taocrypt/benchmark/dsa1024.der
    1.0 06/04/19 11:42:49 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl_3/extra/yassl/taocrypt/benchmark/dsa1024.der

  extra/yassl/taocrypt/benchmark/dh1024.der
    1.1 06/04/19 11:42:48 msvensson@shellback.(none) +5 -0
    New BitKeeper file ``extra/yassl/taocrypt/benchmark/dh1024.der''

  extra/yassl/taocrypt/benchmark/dh1024.der
    1.0 06/04/19 11:42:48 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl_3/extra/yassl/taocrypt/benchmark/dh1024.der

ChangeSet
  1.2084.63.6 06/04/19 11:33:49 msvensson@shellback.(none) +1 -0
  Add .der files, used by yaSSL benchmark
  Add benchamrk to dirs to build

  extra/yassl/taocrypt/Makefile.am
    1.3 06/04/19 11:33:37 msvensson@shellback.(none) +1 -1
    Add benchmark to dirs to build

ChangeSet
  1.2084.63.5 06/04/19 10:21:00 msvensson@shellback.(none) +4 -0
  Import from upstream yaSSL

  extra/yassl/taocrypt/test/test.cpp
    1.2 06/04/18 22:17:39 msvensson@shellback.(none)[msvensson] +51 -57
    Import patch yassl.diff

  extra/yassl/taocrypt/src/template_instnt.cpp
    1.6.1.2 06/04/18 22:17:39 msvensson@shellback.(none)[msvensson] +1 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/misc.hpp
    1.11 06/04/19 10:19:12 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/src/template_instnt.cpp
    1.4.1.1 06/04/18 22:17:38 msvensson@shellback.(none)[msvensson] +2 -0
    Import patch yassl.diff

ChangeSet
  1.2084.108.1 06/04/18 18:10:47 msvensson@neptunus.(none) +14 -0
  Cleanup test cases that leaves "stuff" behind

  mysql-test/t/trigger.test
    1.41 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -1
    Drop table

  mysql-test/t/sp_notembedded.test
    1.1.1.1 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
    Drop table

  mysql-test/t/sp-security.test
    1.32 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
    Drop users

  mysql-test/t/rpl_openssl.test
    1.12 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
    Drop users

  mysql-test/t/openssl_1.test
    1.14 06/04/18 18:10:42 msvensson@neptunus.(none) +3 -3
    Drop users

  mysql-test/t/grant2.test
    1.34 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
    Drop users

  mysql-test/t/ctype_latin2_ch.test
    1.2 06/04/18 18:10:42 msvensson@neptunus.(none) +2 -0
    Drop table

  mysql-test/r/trigger.result
    1.36 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -1
    Drop table

  mysql-test/r/sp_notembedded.result
    1.1.1.1 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
    Drop table

  mysql-test/r/sp-security.result
    1.29 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
    Drop users

  mysql-test/r/rpl_openssl.result
    1.12 06/04/18 18:10:42 msvensson@neptunus.(none) +2 -1
    Drop users

  mysql-test/r/openssl_1.result
    1.13 06/04/18 18:10:42 msvensson@neptunus.(none) +2 -3
    Drop users

  mysql-test/r/grant2.result
    1.28 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
    Drop users

  mysql-test/r/ctype_latin2_ch.result
    1.2 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
    Drot table at end of test

ChangeSet
  1.2084.90.3 06/04/18 17:58:27 msvensson@neptunus.(none) +13 -0
  Bug#17208 SSL: client does not verify server certificate
   - Add new function 'ssl_verify_server_cert' which is used if we are 
     connecting to the server with SSL. It will compare the hostname in 
     the server's cert against the hostname that we used when connecting 
     to the server. Will reject the connection if hostname does not match.
   - Add new option "OPT_SSL_VERIFY_SERVER_CERT" to be passed to mysql_options
     which will turn on checking of servers cert.
   - Add new argument "ssl-verify-server-cert" to all mysql* clients which 
     will activate the above option.
   - Generate a new server cert with 1024 bits that has "localhost" as the server name.

  vio/viosslfactories.c
    1.23 06/04/18 17:58:22 msvensson@neptunus.(none) +4 -4
    Ask the SSL library to verify servers cert by setting the SSL_VERIFY_PEER flag

  sql-common/client.c
    1.88 06/04/18 17:58:22 msvensson@neptunus.(none) +84 -2
    Add ssl_vertify_server_cert function which is executed if user has set the option ssl_verify_cerver_cert

  include/sslopt-vars.h
    1.6 06/04/18 17:58:22 msvensson@neptunus.(none) +3 -0
    Add opt_ssl_varify_server_cert to all clients.

  include/sslopt-longopts.h
    1.10 06/04/18 17:58:22 msvensson@neptunus.(none) +6 -1
    Add ssl-verify-server-cert options to all clients.

  include/mysql.h
    1.157 06/04/18 17:58:22 msvensson@neptunus.(none) +3 -1
    Add variable ssl_verify_cerver_cert

  client/mysqltest.c
    1.233 06/04/18 17:58:22 msvensson@neptunus.(none) +10 -1
    Always set opt_ssl_verify_server_cert on in mysqltest if we are using SSL

  client/mysqlshow.c
    1.48 06/04/18 17:58:22 msvensson@neptunus.(none) +2 -0
    Pass the variable "opt_ssl_verify_server_cert" to the mysql_options function. It's processed/included by include/sslopt*.h files

  client/mysqlimport.c
    1.59 06/04/18 17:58:22 msvensson@neptunus.(none) +2 -0
    Pass the variable "opt_ssl_verify_server_cert" to the mysql_options function. It's processed/included by include/sslopt*.h files

  client/mysqldump.c
    1.226 06/04/18 17:58:22 msvensson@neptunus.(none) +2 -0
    Pass the variable "opt_ssl_verify_server_cert" to the mysql_options function. It's processed/included by include/sslopt*.h files

  client/mysqladmin.cc
    1.115 06/04/18 17:58:22 msvensson@neptunus.(none) +2 -0
    Pass the variable "opt_ssl_verify_server_cert" to the mysql_options function. It's processed/included by include/sslopt*.h files

  client/mysql.cc
    1.199.1.1 06/04/18 17:58:22 msvensson@neptunus.(none) +2 -0
    Pass the variable "opt_ssl_verify_server_cert" to the mysql_options function. It's processed/included by include/sslopt*.h files

  client/client_priv.h
    1.44 06/04/18 17:58:22 msvensson@neptunus.(none) +1 -1
    Add OPT_SSL_VERIFY_CERT

  SSL/server-cert.pem
    1.6 06/04/18 17:58:22 msvensson@neptunus.(none) +38 -40
    Generate a new server cert that has "localhost" as CN, so that we can test to verify the hostname we connected against with the hostname in the cert

ChangeSet
  1.2084.63.4 06/04/18 14:41:43 msvensson@shellback.(none) +22 -0
  Import from yaSSL upstream

  extra/yassl/taocrypt/src/template_instnt.cpp
    1.6.1.1 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +9 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/random.cpp
    1.8 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +3 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/misc.cpp
    1.11 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +0 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/src/integer.cpp
    1.19 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +16 -4
    Import patch yassl.diff

  extra/yassl/taocrypt/src/algebra.cpp
    1.8 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +3 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/include/types.hpp
    1.9 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +2 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/runtime.hpp
    1.11 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +21 -3
    Import patch yassl.diff

  extra/yassl/taocrypt/include/misc.hpp
    1.10 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +11 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/include/integer.hpp
    1.7.1.1 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +0 -3
    Import patch yassl.diff

  extra/yassl/taocrypt/benchmark/benchmark.cpp
    1.2 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +6 -6
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp
    1.12 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +16 -4
    Import patch yassl.diff

  extra/yassl/src/yassl_imp.cpp
    1.7 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +1 -0
    Import patch yassl.diff

  extra/yassl/src/ssl.cpp
    1.11 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +4 -0
    Import patch yassl.diff

  extra/yassl/src/socket_wrapper.cpp
    1.9 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +7 -3
    Import patch yassl.diff

  extra/yassl/src/handshake.cpp
    1.7 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +10 -6
    Import patch yassl.diff

  extra/yassl/mySTL/vector.hpp
    1.6 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +2 -1
    Import patch yassl.diff

  extra/yassl/mySTL/list.hpp
    1.7 06/04/11 22:53:08 msvensson@shellback.(none)[msvensson] +2 -2
    Import patch yassl.diff

  extra/yassl/mySTL/helpers.hpp
    1.9 06/04/11 22:53:08 msvensson@shellback.(none)[msvensson] +4 -8
    Import patch yassl.diff

  extra/yassl/include/yassl_types.hpp
    1.10 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +5 -0
    Import patch yassl.diff

  extra/yassl/include/yassl_int.hpp
    1.8 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +0 -4
    Import patch yassl.diff

  extra/yassl/include/openssl/ssl.h
    1.6 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +2 -1
    Import patch yassl.diff

  extra/yassl/include/openssl/rsa.h
    1.1.1.1 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

ChangeSet
  1.2084.2.3 06/04/18 10:46:17 msvensson@shellback.(none) +3 -0
  BUG#13310 incorrect user parsing by SP
   - Strip surrounding ''s from username when a new user connects. There
     is no user 'a@', it should be a@

  sql/sql_parse.cc
    1.535.1.1 06/04/18 10:46:11 msvensson@shellback.(none) +12 -3
    Strip surrounding ''s from username when a new user connects. There 
    is no user 'a@', it should be a@

  mysql-test/t/grant2.test
    1.33 06/04/18 10:46:11 msvensson@shellback.(none) +25 -0
    Add tests for bug 13310

  mysql-test/r/grant2.result
    1.27 06/04/18 10:46:11 msvensson@shellback.(none) +13 -0
    Update test result

ChangeSet
  1.2084.97.1 06/04/13 13:02:58 msvensson@neptunus.(none) +1 -0
  Bug#18837 Many build and test failures when configuring without --disable-shared
  Build "NOINST" tools with -static flag to avoid  any ld problems when using them

  configure.in
    1.380.1.1 06/04/13 13:02:53 msvensson@neptunus.(none) +1 -1
    Build "NOINST" tools with -static flag to avoid  any ld problems when using them

ChangeSet
  1.2084.96.1 06/04/12 22:05:23 holyfoot@deer.(none) +6 -0
  bug #15860 (SPATIAL keys in INNODB)

  sql/sql_table.cc
    1.304 06/04/12 22:03:59 holyfoot@mysql.com +6 -0
    check that the handler allows SPATIAL keys

  sql/share/errmsg.txt
    1.62 06/04/12 22:03:59 holyfoot@mysql.com +2 -0
    error message added

  sql/handler.h
    1.168 06/04/12 22:03:58 holyfoot@mysql.com +1 -0
    HA_CAN_RTREEKEYS defined

  sql/ha_myisam.cc
    1.166 06/04/12 22:03:58 holyfoot@mysql.com +1 -1
    HA_CAN_RTREEKEYS added to ha_myisam

  mysql-test/t/innodb.test
    1.130 06/04/12 22:03:58 holyfoot@mysql.com +7 -0
    testcase

  mysql-test/r/innodb.result
    1.160 06/04/12 22:03:58 holyfoot@mysql.com +2 -0
    result added

ChangeSet
  1.2084.91.1 06/04/12 15:13:16 msvensson@neptunus.(none) +6 -0
  Bug#18564  Test failure due to test not checking preconditions
   - Add variable "have_dynamic_loading" and use it to check if the udf test should be run.

  sql/set_var.cc
    1.151 06/04/12 15:13:10 msvensson@neptunus.(none) +1 -0
    Add have_dlopen variable and name it "have_dynamic_loading" in "SHOW VARIABLES"

  sql/mysqld.cc
    1.540.2.1 06/04/12 15:13:10 msvensson@neptunus.(none) +6 -1
    Add have_dlopen variable

  sql/mysql_priv.h
    1.380.2.1 06/04/12 15:13:10 msvensson@neptunus.(none) +1 -1
    Add have_dlopen variable

  mysql-test/t/disabled.def
    1.25 06/04/12 15:13:10 msvensson@neptunus.(none) +0 -1
    Remove udf from disabled

  mysql-test/r/have_udf.require
    1.2 06/04/12 15:13:10 msvensson@neptunus.(none) +2 -1
    Use variable "have_dynamic_loading" to to determine if there is support for udf's

  mysql-test/include/have_udf.inc
    1.2 06/04/12 15:13:10 msvensson@neptunus.(none) +5 -9
    Use variable "have_dynamic_loading" to to determine if there is support for udf's

ChangeSet
  1.2084.90.2 06/04/12 14:06:05 msvensson@neptunus.(none) +3 -0
  Fix up patch

  vio/viosslfactories.c
    1.22 06/04/12 14:06:01 msvensson@neptunus.(none) +0 -1
    Remove comment

  vio/viossl.c
    1.32 06/04/12 14:06:01 msvensson@neptunus.(none) +12 -12
    Fix coding standard

  sql-common/client.c
    1.87 06/04/12 14:06:01 msvensson@neptunus.(none) +1 -67
    Remove the ssl_verify_server_cert will be added in separate patch

ChangeSet
  1.2084.63.3 06/04/11 23:51:14 msvensson@shellback.(none) +7 -0
  Add new yaSSL files
  Add benchmark, testsuite and taocrypt/test as places where to 
  produce Makfiles and build - very useful for debugging

  extra/yassl/testsuite/Makefile.am
    1.1 06/04/11 23:51:08 msvensson@shellback.(none) +11 -0
    New BitKeeper file ``extra/yassl/testsuite/Makefile.am''

  extra/yassl/taocrypt/test/Makefile.am
    1.1 06/04/11 23:51:08 msvensson@shellback.(none) +8 -0
    New BitKeeper file ``extra/yassl/taocrypt/test/Makefile.am''

  extra/yassl/testsuite/Makefile.am
    1.0 06/04/11 23:51:08 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/testsuite/Makefile.am

  extra/yassl/taocrypt/test/Makefile.am
    1.0 06/04/11 23:51:08 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/test/Makefile.am

  extra/yassl/taocrypt/benchmark/Makefile.am
    1.1 06/04/11 23:51:00 msvensson@shellback.(none) +8 -0
    New BitKeeper file ``extra/yassl/taocrypt/benchmark/Makefile.am''

  extra/yassl/taocrypt/src/Makefile.am
    1.12 06/04/11 23:51:00 msvensson@shellback.(none) +6 -4
    Add all new files for yaSSL and organize them alphabetically

  extra/yassl/taocrypt/benchmark/Makefile.am
    1.0 06/04/11 23:51:00 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/benchmark/Makefile.am

  extra/yassl/taocrypt/Makefile.am
    1.2 06/04/11 23:51:00 msvensson@shellback.(none) +1 -1
    Add new subdir test for the taocrypt test

  extra/yassl/Makefile.am
    1.3 06/04/11 23:51:00 msvensson@shellback.(none) +1 -1
    Add new subdir testsuite

  config/ac-macros/yassl.m4
    1.14 06/04/11 23:50:59 msvensson@shellback.(none) +4 -1
    Add Makefiles for yassl testsuite and benchmark

ChangeSet
  1.1616.2538.1 06/04/11 15:01:21 holyfoot@deer.(none) +3 -0
  bug #15442 (mysqltest.test doesn't work with the embedded server)

  mysql-test/t/mysqltest.test
    1.3.1.16 06/04/11 15:00:37 holyfoot@mysql.com +1 -0
    this test shouldn't work with the embedded server

  mysql-test/mysql-test-run.sh
    1.208.1.57 06/04/11 15:00:37 holyfoot@mysql.com +1 -0
    no ndbcluster needed here

  mysql-test/mysql-test-run.pl
    1.8.9.4 06/04/11 15:00:37 holyfoot@mysql.com +1 -0
    no ndbcluster needed here

ChangeSet
  1.2084.61.4 06/04/11 02:10:08 stewart@mysql.com +5 -0
  BUG#18966 Change in stop/shutdown behaviour
  
  fix behaviour of ALL STOP and SHUTDOWN in relation to MGM nodes

  ndb/src/mgmsrv/Services.hpp
    1.17 06/04/11 02:10:02 stewart@mysql.com +1 -0
    add m_stopSelf member for tracking what we should do

  ndb/src/mgmsrv/Services.cpp
    1.62 06/04/11 02:10:02 stewart@mysql.com +11 -4
    Stop or restart server only on mgm session disconnect (of session that asked us to)

  ndb/src/mgmsrv/MgmtSrvr.hpp
    1.42 06/04/11 02:10:02 stewart@mysql.com +11 -9
    add stopSelf return parameter to stopNodes and restartNodes.
    
    Rename stop to shutdownDB as this name better reflects what it does
    
    Rename restart to restartDB as this name better reflects what it does

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.97 06/04/11 02:10:02 stewart@mysql.com +43 -30
    fix regression in how nodes are stopped
    ALL STOP - db nodes only
    SHUTDOWN - db and mgm nodes
    
    fix race where mgmd could stop itself before it sends the response to stop.
    In ~MgmApiSession() we now do the disconnect.
    
    We have (in various places) a return stopSelf which tells the caller if they
    need to stop or restart this daemon.

  ndb/src/mgmclient/CommandInterpreter.cpp
    1.58 06/04/11 02:10:02 stewart@mysql.com +139 -111
    Shutdown management servers properly (one we're connected to last).
    
    Fix potential problems if disconnect from one mgmd and connect to another (that's a different cluster)
    

ChangeSet
  1.1346.873.1 06/04/10 13:38:56 ingo@mysql.com +1 -0
  Bug#10405 - myisamchk damages auto_increment columns when changing character set
  
  Whenever 'myisamchk' needed to recreate a table,
  the auto increment information was lost.
  
  Now the forgotten element of the table creation
  information is set correctly.

  myisam/mi_check.c
    1.86.1.50 06/04/10 13:38:54 ingo@mysql.com +17 -9
    Bug#10405 - myisamchk damages auto_increment columns when changing character set
    Added some DBUG statements.
    Enabled 'with_auto_increment' in 'create_info'
    when recreating a table.

ChangeSet
  1.2084.63.2 06/04/07 12:46:50 msvensson@shellback.(none) +1 -0
  Fix spelling error

  include/my_global.h
    1.117 06/04/07 12:46:44 msvensson@shellback.(none) +1 -1
    Fix spelling error

ChangeSet
  1.2084.63.1 06/04/07 11:35:12 msvensson@shellback.(none) +91 -0
  Update yassl to 1.2.2

  extra/yassl/yassl.dsw
    1.2 06/03/29 01:56:34 msvensson@shellback.(none)[msvensson] +15 -0
    Import patch yassl.diff

  extra/yassl/yassl.dsp
    1.2 06/03/29 01:56:34 msvensson@shellback.(none)[msvensson] +2 -2
    Import patch yassl.diff

  extra/yassl/taocrypt/taocrypt.dsp
    1.2 06/03/29 01:56:34 msvensson@shellback.(none)[msvensson] +38 -2
    Import patch yassl.diff

  extra/yassl/taocrypt/src/sha.cpp
    1.3 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +476 -5
    Import patch yassl.diff

  extra/yassl/taocrypt/src/ripemd.cpp
    1.3 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +562 -13
    Import patch yassl.diff

  extra/yassl/taocrypt/src/random.cpp
    1.7 06/03/29 01:56:37 msvensson@shellback.(none)[msvensson] +3 -4
    Import patch yassl.diff

  extra/yassl/taocrypt/src/misc.cpp
    1.10 06/03/29 01:56:37 msvensson@shellback.(none)[msvensson] +29 -29
    Import patch yassl.diff

  extra/yassl/taocrypt/src/md5.cpp
    1.3 06/03/29 01:56:37 msvensson@shellback.(none)[msvensson] +341 -6
    Import patch yassl.diff

  extra/yassl/taocrypt/src/integer.cpp
    1.18 06/03/29 03:49:02 msvensson@shellback.(none)[msvensson] +9 -9
    Import patch yassl.diff

  extra/yassl/taocrypt/src/hash.cpp
    1.3 06/03/29 01:56:37 msvensson@shellback.(none)[msvensson] +22 -7
    Import patch yassl.diff

  extra/yassl/taocrypt/src/dh.cpp
    1.6 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +25 -3
    Import patch yassl.diff

  extra/yassl/taocrypt/src/des.cpp
    1.2 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +498 -125
    Import patch yassl.diff

  extra/yassl/testsuite/testsuite.dsp
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +127 -0
    Import patch yassl.diff

  extra/yassl/testsuite/testsuite.cpp
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +155 -0
    Import patch yassl.diff

  extra/yassl/testsuite/test.hpp
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +352 -0
    Import patch yassl.diff

  extra/yassl/testsuite/quit
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +2 -0
    Import patch yassl.diff

  extra/yassl/testsuite/make.bat
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +14 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/coding.cpp
    1.4 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +3 -4
    Import patch yassl.diff

  extra/yassl/taocrypt/src/asn.cpp
    1.5 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +22 -17
    Import patch yassl.diff

  extra/yassl/taocrypt/src/arc4.cpp
    1.4 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +136 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/algebra.cpp
    1.7 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +2 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/aestables.cpp
    1.4 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +0 -683
    Import patch yassl.diff

  extra/yassl/taocrypt/src/aes.cpp
    1.3 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +1442 -11
    Import patch yassl.diff

  extra/yassl/taocrypt/include/types.hpp
    1.8 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +1 -2
    Import patch yassl.diff

  extra/yassl/taocrypt/include/sha.hpp
    1.2 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +2 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/runtime.hpp
    1.10 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +6 -4
    Import patch yassl.diff

  extra/yassl/taocrypt/include/ripemd.hpp
    1.2 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +2 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/modes.hpp
    1.6 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +7 -8
    Import patch yassl.diff

  extra/yassl/taocrypt/include/misc.hpp
    1.9 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +125 -34
    Import patch yassl.diff

  extra/yassl/taocrypt/include/md5.hpp
    1.2 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +3 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/hmac.hpp
    1.4 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +5 -5
    Import patch yassl.diff

  extra/yassl/taocrypt/include/hash.hpp
    1.5 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +11 -2
    Import patch yassl.diff

  extra/yassl/taocrypt/include/dh.hpp
    1.2 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/include/des.hpp
    1.3 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +47 -33
    Import patch yassl.diff

  extra/yassl/taocrypt/include/block.hpp
    1.6 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/include/asn.hpp
    1.4 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +8 -5
    Import patch yassl.diff

  extra/yassl/taocrypt/include/arc4.hpp
    1.2 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +1 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/aes.hpp
    1.3 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +24 -18
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp
    1.11 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +92 -71
    Import patch yassl.diff

  extra/yassl/src/yassl_imp.cpp
    1.6 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +61 -51
    Import patch yassl.diff

  extra/yassl/src/yassl_error.cpp
    1.4 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +179 -0
    Import patch yassl.diff

  extra/yassl/src/timer.cpp
    1.6 06/03/29 01:56:40 msvensson@shellback.(none)[msvensson] +5 -7
    Import patch yassl.diff

  extra/yassl/testsuite/testsuite.dsp
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/testsuite/testsuite.dsp

  extra/yassl/testsuite/testsuite.cpp
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/testsuite/testsuite.cpp

  extra/yassl/testsuite/test.hpp
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/testsuite/test.hpp

  extra/yassl/testsuite/quit
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/testsuite/quit

  extra/yassl/testsuite/make.bat
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/testsuite/make.bat

  extra/yassl/testsuite/input
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +107 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/test/test.cpp
    1.1 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +947 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/test/memory.cpp
    1.1 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +312 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/test/make.bat
    1.1 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +9 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/test.dsw
    1.1 06/03/29 01:56:34 msvensson@shellback.(none)[msvensson] +29 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/test.dsp
    1.1 06/03/29 01:56:34 msvensson@shellback.(none)[msvensson] +102 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/twofish.cpp
    1.1 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +591 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/tftables.cpp
    1.1 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +352 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/make.bat
    1.1 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +38 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/blowfish.cpp
    1.1 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +358 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/bftables.cpp
    1.1 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +306 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/twofish.hpp
    1.1 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +86 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/pwdbased.hpp
    1.1 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +93 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/kernelc.hpp
    1.1 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +49 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/blowfish.hpp
    1.1 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +79 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/benchmark/make.bat
    1.1 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +10 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/benchmark/benchmark.dsp
    1.1 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +101 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/benchmark/benchmark.cpp
    1.1 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +440 -0
    Import patch yassl.diff

  extra/yassl/src/yassl.cpp
    1.1 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +244 -0
    Import patch yassl.diff

  extra/yassl/src/ssl.cpp
    1.10 06/03/29 01:56:40 msvensson@shellback.(none)[msvensson] +105 -32
    Import patch yassl.diff

  extra/yassl/src/socket_wrapper.cpp
    1.8 06/03/29 01:56:40 msvensson@shellback.(none)[msvensson] +15 -11
    Import patch yassl.diff

  extra/yassl/src/make.bat
    1.1 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +27 -0
    Import patch yassl.diff

  extra/yassl/src/handshake.cpp
    1.6 06/03/29 01:56:40 msvensson@shellback.(none)[msvensson] +25 -22
    Import patch yassl.diff

  extra/yassl/src/crypto_wrapper.cpp
    1.7 06/03/29 01:56:40 msvensson@shellback.(none)[msvensson] +29 -29
    Import patch yassl.diff

  extra/yassl/src/cert_wrapper.cpp
    1.6 06/03/29 01:56:40 msvensson@shellback.(none)[msvensson] +24 -10
    Import patch yassl.diff

  extra/yassl/src/buffer.cpp
    1.6 06/03/29 01:56:40 msvensson@shellback.(none)[msvensson] +8 -7
    Import patch yassl.diff

  extra/yassl/mySTL/vector.hpp
    1.5 06/03/29 01:56:39 msvensson@shellback.(none)[msvensson] +1 -2
    Import patch yassl.diff

  extra/yassl/mySTL/list.hpp
    1.6 06/03/29 01:56:39 msvensson@shellback.(none)[msvensson] +2 -2
    Import patch yassl.diff

  extra/yassl/mySTL/helpers.hpp
    1.8 06/03/29 01:56:39 msvensson@shellback.(none)[msvensson] +7 -1
    Import patch yassl.diff

  extra/yassl/include/yassl_types.hpp
    1.9 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +50 -23
    Import patch yassl.diff

  extra/yassl/include/yassl_int.hpp
    1.7 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +5 -3
    Import patch yassl.diff

  extra/yassl/include/yassl_imp.hpp
    1.3 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/include/yassl_error.hpp
    1.3 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +4 -0
    Import patch yassl.diff

  extra/yassl/include/yassl.hpp
    1.1 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +88 -0
    Import patch yassl.diff

  extra/yassl/include/socket_wrapper.hpp
    1.5 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/include/openssl/ssl.h
    1.5 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +5 -2
    Import patch yassl.diff

  extra/yassl/include/crypto_wrapper.hpp
    1.3 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +3 -3
    Import patch yassl.diff

  extra/yassl/include/cert_wrapper.hpp
    1.2 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +3 -0
    Import patch yassl.diff

  extra/yassl/examples/server/server.dsp
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +109 -0
    Import patch yassl.diff

  extra/yassl/examples/server/server.cpp
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +73 -0
    Import patch yassl.diff

  extra/yassl/examples/echoserver/echoserver.dsp
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +102 -0
    Import patch yassl.diff

  extra/yassl/examples/echoserver/echoserver.cpp
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +126 -0
    Import patch yassl.diff

  extra/yassl/examples/echoclient/quit
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +2 -0
    Import patch yassl.diff

  extra/yassl/examples/echoclient/input
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +93 -0
    Import patch yassl.diff

  extra/yassl/examples/echoclient/echoclient.dsp
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +102 -0
    Import patch yassl.diff

  extra/yassl/examples/echoclient/echoclient.cpp
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +89 -0
    Import patch yassl.diff

  extra/yassl/examples/client/client.dsp
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +102 -0
    Import patch yassl.diff

  extra/yassl/README
    1.2 06/03/29 22:31:19 msvensson@shellback.(none)[msvensson] +134 -1
    Import patch yassl.diff

  extra/yassl/testsuite/input
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/testsuite/input

  extra/yassl/taocrypt/test/test.cpp
    1.0 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/test/test.cpp

  extra/yassl/taocrypt/test/memory.cpp
    1.0 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/test/memory.cpp

  extra/yassl/taocrypt/test/make.bat
    1.0 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/test/make.bat

  extra/yassl/taocrypt/test.dsw
    1.0 06/03/29 01:56:34 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/test.dsw

  extra/yassl/taocrypt/test.dsp
    1.0 06/03/29 01:56:34 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/test.dsp

  extra/yassl/taocrypt/src/twofish.cpp
    1.0 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/src/twofish.cpp

  extra/yassl/taocrypt/src/tftables.cpp
    1.0 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/src/tftables.cpp

  extra/yassl/taocrypt/src/make.bat
    1.0 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/src/make.bat

  extra/yassl/taocrypt/src/blowfish.cpp
    1.0 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/src/blowfish.cpp

  extra/yassl/taocrypt/src/bftables.cpp
    1.0 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/src/bftables.cpp

  extra/yassl/taocrypt/include/twofish.hpp
    1.0 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/include/twofish.hpp

  extra/yassl/taocrypt/include/pwdbased.hpp
    1.0 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/include/pwdbased.hpp

  extra/yassl/taocrypt/include/kernelc.hpp
    1.0 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/include/kernelc.hpp

  extra/yassl/taocrypt/include/blowfish.hpp
    1.0 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/include/blowfish.hpp

  extra/yassl/taocrypt/benchmark/make.bat
    1.0 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/benchmark/make.bat

  extra/yassl/taocrypt/benchmark/benchmark.dsp
    1.0 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/benchmark/benchmark.dsp

  extra/yassl/taocrypt/benchmark/benchmark.cpp
    1.0 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/benchmark/benchmark.cpp

  extra/yassl/src/yassl.cpp
    1.0 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/src/yassl.cpp

  extra/yassl/src/make.bat
    1.0 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/src/make.bat

  extra/yassl/include/yassl.hpp
    1.0 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/include/yassl.hpp

  extra/yassl/examples/server/server.dsp
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/examples/server/server.dsp

  extra/yassl/examples/server/server.cpp
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/examples/server/server.cpp

  extra/yassl/examples/echoserver/echoserver.dsp
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/examples/echoserver/echoserver.dsp

  extra/yassl/examples/echoserver/echoserver.cpp
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/examples/echoserver/echoserver.cpp

  extra/yassl/examples/echoclient/quit
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/examples/echoclient/quit

  extra/yassl/examples/echoclient/input
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/examples/echoclient/input

  extra/yassl/examples/echoclient/echoclient.dsp
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/examples/echoclient/echoclient.dsp

  extra/yassl/examples/echoclient/echoclient.cpp
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/examples/echoclient/echoclient.cpp

  extra/yassl/examples/client/client.dsp
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/examples/client/client.dsp

  extra/yassl/examples/client/client.cpp
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +96 -0
    Import patch yassl.diff

  extra/yassl/examples/client/client.cpp
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/examples/client/client.cpp

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

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

ChangeSet
  1.2084.55.1 06/04/05 17:41:40 holyfoot@vva.(none) +2 -0
  bug $17756 (sp_notembedded.test unstable)

  mysql-test/t/sp_notembedded.test
    1.2 06/04/05 17:41:35 holyfoot@mysql.com +5 -0
    test case fixed so as the previous test won't affect the result of
    SHOW PROCESSLIST command

  mysql-test/r/sp_notembedded.result
    1.2 06/04/05 17:41:35 holyfoot@mysql.com +2 -0
    result fixed

ChangeSet
  1.2053.46.1 06/03/10 16:41:14 msvensson@neptunus.(none) +9 -0
  Cleanup SSL implementation
  Remove duplicate code
  Merge common functions
  Enforce MySQL coding standard

  vio/viosslfactories.c
    1.21 06/03/10 16:41:10 msvensson@neptunus.(none) +130 -173
    Cleanup SSL implementation

  vio/viossl.c
    1.31 06/03/10 16:41:10 msvensson@neptunus.(none) +91 -247
    Cleanup SSL implementation

  vio/vio_priv.h
    1.6 06/03/10 16:41:10 msvensson@neptunus.(none) +1 -19
    Cleanup SSL implementation

  vio/vio.c
    1.27 06/03/10 16:41:10 msvensson@neptunus.(none) +8 -8
    Cleanup SSL implementation

  sql/sql_acl.cc
    1.188.1.1 06/03/10 16:41:10 msvensson@neptunus.(none) +2 -2
    Cleanup SSL implementation

  sql/mysqld.cc
    1.536.1.1 06/03/10 16:41:10 msvensson@neptunus.(none) +5 -2
    Cleanup SSL implementation

  sql/mysql_priv.h
    1.374.1.1 06/03/10 16:41:10 msvensson@neptunus.(none) +1 -1
    Cleanup SSL implementation

  sql-common/client.c
    1.85 06/03/10 16:41:09 msvensson@neptunus.(none) +89 -17
    Cleanup SSL implementation

  include/violite.h
    1.45 06/03/10 16:41:09 msvensson@neptunus.(none) +5 -16
    Cleanup SSL implementation

ChangeSet
  1.1616.2496.1 06/02/02 10:27:48 ramil@mysql.com +1 -0
  Fix for bug #16900: Crash during query "reap" on OS X.

  sql/sql_class.cc
    1.105.1.100 06/02/02 10:27:34 ramil@mysql.com +3 -2
    Fix for bug #16900: Crash during query "reap" on OS X.
    -  call close_active_vio() only if we don't kill the thread.

  mysql-test/init_db.sql
    1.4 06/01/31 14:15:31 msvensson@neptunus.(none) +0 -0
    Rename: BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7 -> mysql-test/init_db.sql

  BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7
    1.3 06/01/30 11:20:24 msvensson@neptunus.(none) +0 -0
    Delete: mysql-test/init_db.sql

ChangeSet
  1.1616.2489.1 06/01/27 13:38:15 kent@mysql.com +1 -0
  disabled.def:
    Enabled rpl_* tests now when bug fixed

  mysql-test/t/disabled.def
    1.1.2.1 06/01/27 13:37:51 kent@mysql.com +0 -3
    Enabled rpl_* tests now when bug fixed

ChangeSet
  1.1616.2443.1 05/12/10 18:02:36 holyfoot@deer.(none) +3 -0
  Fix for bug #15225 (ANALYZE temporary has no effect)

  sql/sql_table.cc
    1.157.57.7 05/12/10 18:01:53 holyfoot@mysql.com +9 -4
    we don't need to remove temporary table from the cache,
    but we need to reload it's info

  mysql-test/t/analyze.test
    1.6.1.1 05/12/10 18:01:53 holyfoot@mysql.com +9 -0
    test case added

  mysql-test/r/analyze.result
    1.3.1.1 05/12/10 18:01:53 holyfoot@mysql.com +9 -0
    test result fixed

