Below is the list of changes that have just been committed into a local
5.0 repository of monty. When monty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.1912 05/07/28 17:09:54 monty@stripped +184 -0
Merge mysql.com:/home/my/mysql-4.1
into mysql.com:/home/my/mysql-5.0
sql/unireg.cc
1.66 05/07/28 17:09:49 monty@stripped +1 -2
Simple merge
sql/table.cc
1.175 05/07/28 17:09:49 monty@stripped +2 -3
Simple merge
sql/sql_table.cc
1.265 05/07/28 17:09:49 monty@stripped +7 -9
Simple merge
sql/mysql_priv.h
1.334 05/07/28 17:09:49 monty@stripped +1 -2
Simple merge
sql/lock.cc
1.73 05/07/28 17:09:49 monty@stripped +3 -5
Simple optimization
mysql-test/t/variables.test
1.43 05/07/28 17:09:49 monty@stripped +0 -0
Simple merge
mysql-test/t/user_var.test
1.30 05/07/28 17:09:48 monty@stripped +0 -0
Simple merge
mysql-test/t/type_decimal.test
1.26 05/07/28 17:09:48 monty@stripped +2 -0
Simple merge
mysql-test/t/type_blob.test
1.29 05/07/28 17:09:48 monty@stripped +1 -0
Simple merge
mysql-test/t/sql_mode.test
1.13 05/07/28 17:09:48 monty@stripped +0 -0
Simple merge
mysql-test/t/select.test
1.61 05/07/28 17:09:48 monty@stripped +2 -2
Simple merge
mysql-test/t/rpl_variables.test
1.4 05/07/28 17:09:48 monty@stripped +0 -0
Simple merge
mysql-test/t/rpl_until.test
1.17 05/07/28 17:09:48 monty@stripped +1 -1
Simple merge
mysql-test/t/rpl_rotate_logs.test
1.61 05/07/28 17:09:48 monty@stripped +0 -1
Simple merge
mysql-test/t/rpl_loaddatalocal.test
1.5 05/07/28 17:09:48 monty@stripped +0 -0
Simple merge
mysql-test/t/rpl_loaddata_rule_s.test
1.7 05/07/28 17:09:48 monty@stripped +1 -1
Simple merge
mysql-test/t/rpl_drop_temp.test
1.4 05/07/28 17:09:48 monty@stripped +1 -2
Simple merge
mysql-test/t/range.test
1.32 05/07/28 17:09:48 monty@stripped +1 -0
Simple merge
mysql-test/t/ps_grant.test
1.6 05/07/28 17:09:48 monty@stripped +16 -7
Simple merge
mysql-test/t/ndb_subquery.test
1.5 05/07/28 17:09:48 monty@stripped +2 -1
Simple merge
mysql-test/t/ndb_cache.test
1.6 05/07/28 17:09:48 monty@stripped +0 -2
Simple merge
mysql-test/t/ndb_basic.test
1.30 05/07/28 17:09:48 monty@stripped +1 -2
Simple merge
mysql-test/t/mysqltest.test
1.8 05/07/28 17:09:48 monty@stripped +0 -3
Simple merge
mysql-test/t/mysqldump.test
1.53 05/07/28 17:09:48 monty@stripped +44 -44
Aligned code with 4.1
mysql-test/t/mysqlbinlog.test
1.18 05/07/28 17:09:48 monty@stripped +0 -1
Simple merge
mysql-test/t/multi_update.test
1.48 05/07/28 17:09:48 monty@stripped +1 -0
Simple merge
mysql-test/t/lock_multi.test
1.10 05/07/28 17:09:48 monty@stripped +1 -2
Simple merge
mysql-test/t/loaddata.test
1.10 05/07/28 17:09:48 monty@stripped +1 -0
Simple merge
mysql-test/t/kill.test
1.14 05/07/28 17:09:48 monty@stripped +0 -0
Simple merge
mysql-test/t/join_outer.test
1.30 05/07/28 17:09:48 monty@stripped +2 -5
Simple merge
mysql-test/t/insert.test
1.20 05/07/28 17:09:48 monty@stripped +4 -0
Simple merge
mysql-test/t/innodb.test
1.97 05/07/28 17:09:48 monty@stripped +0 -1
Simple merge
mysql-test/t/having.test
1.16 05/07/28 17:09:48 monty@stripped +0 -2
Simple merge
mysql-test/t/group_by.test
1.49 05/07/28 17:09:48 monty@stripped +2 -1
Simple merge
mysql-test/t/func_time.test
1.36 05/07/28 17:09:48 monty@stripped +1 -0
Simple merge
mysql-test/t/func_test.test
1.24 05/07/28 17:09:48 monty@stripped +0 -0
Simple merge
mysql-test/t/func_misc.test
1.13 05/07/28 17:09:48 monty@stripped +3 -4
Simple merge
mysql-test/t/func_math.test
1.20 05/07/28 17:09:48 monty@stripped +2 -2
Simple merge
mysql-test/t/func_in.test
1.16 05/07/28 17:09:48 monty@stripped +0 -0
Simple merge
mysql-test/t/func_group.test
1.42 05/07/28 17:09:48 monty@stripped +32 -30
Aligned code with 4.1
mysql-test/t/func_gconcat.test
1.30 05/07/28 17:09:48 monty@stripped +2 -2
Simple merge
mysql-test/t/func_default.test
1.5 05/07/28 17:09:48 monty@stripped +0 -1
Simple merge
mysql-test/t/flush_block_commit.test
1.7 05/07/28 17:09:48 monty@stripped +0 -0
Simple merge
mysql-test/t/delete.test
1.21 05/07/28 17:09:48 monty@stripped +0 -0
Simple merge
mysql-test/t/ctype_utf8.test
1.65 05/07/28 17:09:48 monty@stripped +0 -0
Simple merge
mysql-test/t/ctype_ucs.test
1.34 05/07/28 17:09:48 monty@stripped +0 -0
Simple merge
mysql-test/t/ctype_uca.test
1.12 05/07/28 17:09:48 monty@stripped +0 -0
Simple merge
mysql-test/t/ctype_latin1_de.test
1.23 05/07/28 17:09:48 monty@stripped +0 -0
Simple merge
mysql-test/t/count_distinct.test
1.10 05/07/28 17:09:48 monty@stripped +1 -0
Simple merge
mysql-test/t/check.test
1.9 05/07/28 17:09:48 monty@stripped +1 -0
Simple merge
mysql-test/t/cast.test
1.22 05/07/28 17:09:48 monty@stripped +1 -0
Simple merge
mysql-test/t/case.test
1.18 05/07/28 17:09:48 monty@stripped +1 -0
Simple merge
mysql-test/t/bigint.test
1.24 05/07/28 17:09:48 monty@stripped +1 -0
Simple merge
mysql-test/t/bdb.test
1.45 05/07/28 17:09:48 monty@stripped +0 -0
Simple merge
mysql-test/t/auto_increment.test
1.24 05/07/28 17:09:48 monty@stripped +0 -0
Simple merge
mysql-test/t/analyse.test
1.14 05/07/28 17:09:48 monty@stripped +0 -0
Simple merge
mysql-test/r/ps_grant.result
1.8 05/07/28 17:09:48 monty@stripped +0 -0
Simple merge
BitKeeper/deleted/.del-rpl_trunc_binlog.test~961b1f6ac73d37c8
1.14 05/07/28 17:09:48 monty@stripped +2 -2
Simple merge
support-files/mysql.spec.sh
1.108 05/07/28 16:12:39 monty@stripped +0 -0
Auto merged
sql/sql_select.cc
1.345 05/07/28 16:12:38 monty@stripped +0 -0
Auto merged
sql/sql_lex.cc
1.159 05/07/28 16:12:38 monty@stripped +0 -0
Auto merged
sql/sql_base.cc
1.273 05/07/28 16:12:38 monty@stripped +0 -0
Auto merged
sql/slave.cc
1.253 05/07/28 16:12:38 monty@stripped +0 -0
Auto merged
mysys/thr_lock.c
1.46 05/07/28 16:12:38 monty@stripped +0 -0
Auto merged
mysql-test/t/warnings.test
1.22 05/07/28 16:12:37 monty@stripped +0 -0
Auto merged
mysql-test/t/user_var-binlog.test
1.3 05/07/28 16:12:37 monty@stripped +0 -0
Auto merged
mysql-test/t/update.test
1.22 05/07/28 16:12:37 monty@stripped +0 -0
Auto merged
mysql-test/t/union.test
1.89 05/07/28 16:12:37 monty@stripped +2 -2
Auto merged
mysql-test/t/type_timestamp.test
1.26 05/07/28 16:12:37 monty@stripped +0 -0
Auto merged
mysql-test/t/type_ranges.test
1.13 05/07/28 16:12:37 monty@stripped +0 -0
Auto merged
mysql-test/t/type_float.test
1.22 05/07/28 16:12:37 monty@stripped +0 -0
Auto merged
mysql-test/t/timezone_grant.test
1.4 05/07/28 16:12:37 monty@stripped +0 -0
Auto merged
mysql-test/t/timezone2.test
1.9 05/07/28 16:12:37 monty@stripped +0 -0
Auto merged
mysql-test/t/temp_table.test
1.11 05/07/28 16:12:37 monty@stripped +0 -0
Auto merged
mysql-test/t/system_mysql_db_fix.test
1.14 05/07/28 16:12:37 monty@stripped +0 -0
Auto merged
mysql-test/t/system_mysql_db.test
1.6 05/07/28 16:12:37 monty@stripped +0 -0
Auto merged
mysql-test/t/synchronization.test
1.6 05/07/28 16:12:37 monty@stripped +0 -0
Auto merged
mysql-test/t/symlink.test
1.16 05/07/28 16:12:37 monty@stripped +0 -0
Auto merged
mysql-test/t/subselect.test
1.103 05/07/28 16:12:37 monty@stripped +2 -2
Auto merged
mysql-test/t/show_check.test
1.51 05/07/28 16:12:37 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_user_variables.test
1.12 05/07/28 16:12:37 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_timezone.test
1.8 05/07/28 16:12:37 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_temporary.test
1.15 05/07/28 16:12:37 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_server_id2.test
1.6 05/07/28 16:12:37 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_reset_slave.test
1.8 05/07/28 16:12:37 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_replicate_do.test
1.21 05/07/28 16:12:37 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_relayrotate.test
1.14 05/07/28 16:12:36 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_redirect.test
1.12 05/07/28 16:12:36 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_openssl.test
1.7 05/07/28 16:12:36 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_multi_query.test
1.6 05/07/28 16:12:36 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_max_relay_size.test
1.13 05/07/28 16:12:36 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_log_pos.test
1.34 05/07/28 16:12:36 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_log.test
1.26 05/07/28 16:12:36 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_loaddata_rule_m.test
1.9 05/07/28 16:12:36 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_loaddata.test
1.17 05/07/28 16:12:36 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_heap.test
1.5 05/07/28 16:12:36 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_get_lock.test
1.13 05/07/28 16:12:36 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_flush_tables.test
1.7 05/07/28 16:12:36 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_flush_log_loop.test
1.10 05/07/28 16:12:36 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_error_ignored_table.test
1.14 05/07/28 16:12:36 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_empty_master_crash.test
1.10 05/07/28 16:12:36 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_deadlock.test
1.7 05/07/28 16:12:36 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_ddl.test
1.5 05/07/28 16:12:36 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_create_database.test
1.4 05/07/28 16:12:36 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_charset.test
1.16 05/07/28 16:12:36 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_change_master.test
1.10 05/07/28 16:12:36 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl_EE_error.test
1.5 05/07/28 16:12:35 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl000018.test
1.12 05/07/28 16:12:35 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl000017.test
1.13 05/07/28 16:12:35 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl000015.test
1.31 05/07/28 16:12:35 monty@stripped +0 -0
Auto merged
mysql-test/t/rpl000001.test
1.39 05/07/28 16:12:35 monty@stripped +0 -0
Auto merged
mysql-test/t/row.test
1.19 05/07/28 16:12:35 monty@stripped +0 -0
Auto merged
mysql-test/t/replace.test
1.12 05/07/28 16:12:35 monty@stripped +0 -0
Auto merged
mysql-test/t/query_cache.test
1.44 05/07/28 16:12:35 monty@stripped +2 -2
Auto merged
mysql-test/t/ps_5merge.test
1.6 05/07/28 16:12:35 monty@stripped +0 -0
Auto merged
mysql-test/t/ps_4heap.test
1.7 05/07/28 16:12:35 monty@stripped +0 -0
Auto merged
mysql-test/t/ps_1general.test
1.25 05/07/28 16:12:35 monty@stripped +0 -0
Auto merged
mysql-test/t/ps.test
1.52 05/07/28 16:12:35 monty@stripped +2 -2
Auto merged
mysql-test/t/order_by.test
1.33 05/07/28 16:12:35 monty@stripped +2 -2
Auto merged
mysql-test/t/openssl_1.test
1.10 05/07/28 16:12:35 monty@stripped +0 -0
Auto merged
mysql-test/t/olap.test
1.21 05/07/28 16:12:35 monty@stripped +2 -2
Auto merged
mysql-test/t/null_key.test
1.11 05/07/28 16:12:35 monty@stripped +0 -0
Auto merged
mysql-test/t/null.test
1.19 05/07/28 16:12:35 monty@stripped +0 -0
Auto merged
mysql-test/t/ndb_update.test
1.5 05/07/28 16:12:35 monty@stripped +0 -0
Auto merged
mysql-test/t/ndb_types.test
1.5 05/07/28 16:12:35 monty@stripped +0 -0
Auto merged
mysql-test/t/ndb_restore.test
1.9 05/07/28 16:12:35 monty@stripped +0 -0
Auto merged
mysql-test/t/ndb_index_unique.test
1.16 05/07/28 16:12:35 monty@stripped +0 -0
Auto merged
mysql-test/t/ndb_index_ordered.test
1.24 05/07/28 16:12:35 monty@stripped +0 -0
Auto merged
mysql-test/t/ndb_grant.later
1.5 05/07/28 16:12:35 monty@stripped +0 -0
Auto merged
mysql-test/t/ndb_charset.test
1.7 05/07/28 16:12:35 monty@stripped +0 -0
Auto merged
mysql-test/t/ndb_autodiscover.test
1.22 05/07/28 16:12:35 monty@stripped +0 -0
Auto merged
mysql-test/t/ndb_alter_table.test
1.23 05/07/28 16:12:35 monty@stripped +0 -0
Auto merged
mysql-test/t/mysqlbinlog2.test
1.7 05/07/28 16:12:34 monty@stripped +0 -0
Auto merged
mysql-test/t/myisam.test
1.45 05/07/28 16:12:34 monty@stripped +1 -1
Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test
1.16 05/07/28 16:12:34 monty@stripped +0 -0
Auto merged
mysql-test/t/merge.test
1.34 05/07/28 16:12:34 monty@stripped +0 -0
Auto merged
mysql-test/t/lowercase_table3.test
1.8 05/07/28 16:12:34 monty@stripped +0 -0
Auto merged
mysql-test/t/lowercase_table.test
1.19 05/07/28 16:12:34 monty@stripped +0 -0
Auto merged
mysql-test/t/lock.test
1.14 05/07/28 16:12:34 monty@stripped +0 -0
Auto merged
mysql-test/t/limit.test
1.10 05/07/28 16:12:34 monty@stripped +0 -0
Auto merged
mysql-test/t/keywords.test
1.7 05/07/28 16:12:34 monty@stripped +0 -0
Auto merged
mysql-test/t/key.test
1.22 05/07/28 16:12:34 monty@stripped +2 -2
Auto merged
mysql-test/t/insert_update.test
1.16 05/07/28 16:12:34 monty@stripped +0 -0
Auto merged
mysql-test/t/insert_select.test
1.23 05/07/28 16:12:34 monty@stripped +0 -0
Auto merged
mysql-test/t/init_connect.test
1.5 05/07/28 16:12:34 monty@stripped +0 -0
Auto merged
mysql-test/t/heap_hash.test
1.11 05/07/28 16:12:34 monty@stripped +0 -0
Auto merged
mysql-test/t/heap_btree.test
1.14 05/07/28 16:12:34 monty@stripped +0 -0
Auto merged
mysql-test/t/heap.test
1.28 05/07/28 16:12:34 monty@stripped +0 -0
Auto merged
mysql-test/t/grant_cache.test
1.14 05/07/28 16:12:34 monty@stripped +0 -0
Auto merged
mysql-test/t/grant2.test
1.25 05/07/28 16:12:34 monty@stripped +2 -2
Auto merged
mysql-test/t/grant.test
1.32 05/07/28 16:12:34 monty@stripped +0 -0
Auto merged
mysql-test/t/gis.test
1.19 05/07/28 16:12:34 monty@stripped +0 -0
Auto merged
mysql-test/t/gis-rtree.test
1.12 05/07/28 16:12:33 monty@stripped +0 -0
Auto merged
mysql-test/t/func_str.test
1.79 05/07/28 16:12:33 monty@stripped +0 -0
Auto merged
mysql-test/t/func_set.test
1.14 05/07/28 16:12:33 monty@stripped +0 -0
Auto merged
mysql-test/t/func_sapdb.test
1.10 05/07/28 16:12:33 monty@stripped +0 -0
Auto merged
mysql-test/t/func_if.test
1.15 05/07/28 16:12:33 monty@stripped +2 -2
Auto merged
mysql-test/t/func_equal.test
1.7 05/07/28 16:12:33 monty@stripped +0 -0
Auto merged
mysql-test/t/func_date_add.test
1.7 05/07/28 16:12:33 monty@stripped +0 -0
Auto merged
mysql-test/t/func_concat.test
1.8 05/07/28 16:12:33 monty@stripped +0 -0
Auto merged
mysql-test/t/func_compress.test
1.12 05/07/28 16:12:33 monty@stripped +0 -0
Auto merged
mysql-test/t/fulltext_order_by.test
1.18 05/07/28 16:12:33 monty@stripped +0 -0
Auto merged
mysql-test/t/fulltext.test
1.74 05/07/28 16:12:33 monty@stripped +0 -0
Auto merged
mysql-test/t/flush.test
1.16 05/07/28 16:12:33 monty@stripped +0 -0
Auto merged
mysql-test/t/endspace.test
1.5 05/07/28 16:12:33 monty@stripped +0 -0
Auto merged
mysql-test/t/drop.test
1.20 05/07/28 16:12:32 monty@stripped +0 -0
Auto merged
mysql-test/t/distinct.test
1.18 05/07/28 16:12:32 monty@stripped +2 -2
Auto merged
mysql-test/t/derived.test
1.49 05/07/28 16:12:32 monty@stripped +2 -2
Auto merged
mysql-test/t/delayed.test
1.10 05/07/28 16:12:32 monty@stripped +0 -0
Auto merged
mysql-test/t/date_formats.test
1.13 05/07/28 16:12:32 monty@stripped +0 -0
Auto merged
mysql-test/t/ctype_ucs_binlog.test
1.5 05/07/28 16:12:32 monty@stripped +0 -0
Auto merged
mysql-test/t/ctype_many.test
1.21 05/07/28 16:12:32 monty@stripped +0 -0
Auto merged
mysql-test/t/create.test
1.57 05/07/28 16:12:32 monty@stripped +0 -0
Auto merged
mysql-test/t/count_distinct2.test
1.10 05/07/28 16:12:32 monty@stripped +0 -0
Auto merged
mysql-test/t/connect.test
1.13 05/07/28 16:12:32 monty@stripped +0 -0
Auto merged
mysql-test/t/bool.test
1.8 05/07/28 16:12:32 monty@stripped +0 -0
Auto merged
mysql-test/t/backup.test
1.15 05/07/28 16:12:32 monty@stripped +0 -0
Auto merged
mysql-test/t/archive.test
1.10 05/07/28 16:12:32 monty@stripped +0 -0
Auto merged
mysql-test/t/alter_table.test
1.37 05/07/28 16:12:32 monty@stripped +0 -0
Auto merged
mysql-test/t/alias.test
1.9 05/07/28 16:12:32 monty@stripped +0 -0
Auto merged
include/thr_lock.h
1.17 05/07/28 16:12:32 monty@stripped +0 -0
Auto merged
BitKeeper/deleted/.del-isam.test~834fb0ee8196c445
1.13 05/07/28 16:12:32 monty@stripped +0 -0
Auto merged
BitKeeper/deleted/.del-ctype_cp932.test
1.4 05/07/28 16:12:31 monty@stripped +0 -0
Auto merged
BitKeeper/deleted/.del-rpl_trunc_binlog.test~961b1f6ac73d37c8
1.7.1.4 05/07/28 16:12:31 monty@stripped +0 -0
Merge rename: mysql-test/t/rpl_trunc_binlog.test -> BitKeeper/deleted/.del-rpl_trunc_binlog.test~961b1f6ac73d37c8
BitKeeper/deleted/.del-isam.test~834fb0ee8196c445
1.11.1.2 05/07/28 16:12:31 monty@stripped +0 -0
Merge rename: mysql-test/t/isam.test -> BitKeeper/deleted/.del-isam.test~834fb0ee8196c445
BitKeeper/deleted/.del-ctype_cp932.test
1.1.2.2 05/07/28 16:12:31 monty@stripped +0 -0
Merge rename: mysql-test/t/ctype_cp932.test -> BitKeeper/deleted/.del-ctype_cp932.test
BitKeeper/etc/ignore
1.206 05/07/28 16:11:56 monty@stripped +5 -6
auto-union
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: monty
# Host: narttu.mysql.com
# Root: /home/my/mysql-5.0/RESYNC
--- 1.16/include/thr_lock.h 2005-07-21 07:35:55 +03:00
+++ 1.17/include/thr_lock.h 2005-07-28 16:12:32 +03:00
@@ -144,7 +144,7 @@
uint count, THR_LOCK_OWNER *owner);
void thr_multi_unlock(THR_LOCK_DATA **data,uint count);
void thr_abort_locks(THR_LOCK *lock);
-bool thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread);
+my_bool thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread);
void thr_print_locks(void); /* For debugging */
my_bool thr_upgrade_write_delay_lock(THR_LOCK_DATA *data);
my_bool thr_reschedule_write_lock(THR_LOCK_DATA *data);
--- 1.45/mysys/thr_lock.c 2005-07-22 22:36:14 +03:00
+++ 1.46/mysys/thr_lock.c 2005-07-28 16:12:38 +03:00
@@ -1043,10 +1043,10 @@
This is used to abort all locks for a specific thread
*/
-bool thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread)
+my_bool thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread)
{
THR_LOCK_DATA *data;
- bool found= FALSE;
+ my_bool found= FALSE;
DBUG_ENTER("thr_abort_locks_for_thread");
pthread_mutex_lock(&lock->mutex);
--- 1.72/sql/lock.cc 2005-07-28 01:13:39 +03:00
+++ 1.73/sql/lock.cc 2005-07-28 17:09:49 +03:00
@@ -348,7 +348,18 @@
}
-/* Abort one thread / table combination */
+/*
+ Abort one thread / table combination
+
+ SYNOPSIS
+ mysql_lock_abort_for_thread()
+ thd Thread handler
+ table Table that should be removed from lock queue
+
+ RETURN
+ 0 Table was not locked by another thread
+ 1 Table was locked by at least one other thread
+*/
bool mysql_lock_abort_for_thread(THD *thd, TABLE *table)
{
@@ -361,10 +372,9 @@
{
for (uint i=0; i < locked->lock_count; i++)
{
- bool found;
- found= thr_abort_locks_for_thread(locked->locks[i]->lock,
- table->in_use->real_id);
- result|= found;
+ if (thr_abort_locks_for_thread(locked->locks[i]->lock,
+ table->in_use->real_id))
+ result= TRUE;
}
my_free((gptr) locked,MYF(0));
}
@@ -613,14 +623,9 @@
DBUG_RETURN(-1);
}
- {
- if (remove_table_from_cache(thd, db,
- table_list->table_name, RTFC_NO_FLAG))
- {
- DBUG_RETURN(1); // Table is in use
- }
- }
- DBUG_RETURN(0);
+ /* Return 1 if table is in use */
+ DBUG_RETURN(test(remove_table_from_cache(thd, db, table_list->real_name,
+ RTFC_NO_FLAG)))
}
--- 1.333/sql/mysql_priv.h 2005-07-23 07:53:23 +03:00
+++ 1.334/sql/mysql_priv.h 2005-07-28 17:09:49 +03:00
@@ -952,12 +952,15 @@
const char *table_name);
void remove_db_from_cache(const char *db);
void flush_tables();
+
+/* bits for last argument to remove_table_from_cache() */
#define RTFC_NO_FLAG 0x0000
#define RTFC_OWNED_BY_THD_FLAG 0x0001
#define RTFC_WAIT_OTHER_THREAD_FLAG 0x0002
#define RTFC_CHECK_KILLED_FLAG 0x0004
bool remove_table_from_cache(THD *thd, const char *db, const char *table,
uint flags);
+
bool close_cached_tables(THD *thd, bool wait_for_refresh, TABLE_LIST *tables);
void copy_field_from_tmp_record(Field *field,int offset);
bool fill_record(THD *thd, Field **field, List<Item> &values,
@@ -1246,12 +1249,12 @@
void unireg_init(ulong options);
void unireg_end(void);
bool mysql_create_frm(THD *thd, my_string file_name,
- const char *table, const char* db,
+ const char *db, const char *table,
HA_CREATE_INFO *create_info,
List<create_field> &create_field,
uint key_count,KEY *key_info,handler *db_type);
int rea_create_table(THD *thd, my_string file_name,
- const char *table, const char* db,
+ const char *db, const char *table,
HA_CREATE_INFO *create_info,
List<create_field> &create_field,
uint key_count,KEY *key_info);
@@ -1319,7 +1322,7 @@
const char *newname);
ulong next_io_size(ulong pos);
void append_unescaped(String *res, const char *pos, uint length);
-int create_frm(THD *thd, char *name, const char *table, const char *db,
+int create_frm(THD *thd, char *name, const char *db, const char *table,
uint reclength,uchar *fileinfo,
HA_CREATE_INFO *create_info, uint keys);
void update_create_info_from_table(HA_CREATE_INFO *info, TABLE *form);
--- 1.252/sql/slave.cc 2005-07-18 08:02:09 +03:00
+++ 1.253/sql/slave.cc 2005-07-28 16:12:38 +03:00
@@ -3637,9 +3637,9 @@
mi->abort_slave = 0; // TODO: check if this is needed
DBUG_ASSERT(thd->net.buff != 0);
net_end(&thd->net); // destructor will not free it, because net.vio is 0
+ close_thread_tables(thd, 0);
pthread_mutex_lock(&LOCK_thread_count);
THD_CHECK_SENTRY(thd);
- close_thread_tables(thd);
delete thd;
pthread_mutex_unlock(&LOCK_thread_count);
pthread_cond_broadcast(&mi->stop_cond); // tell the world we are done
--- 1.272/sql/sql_base.cc 2005-07-28 16:08:52 +03:00
+++ 1.273/sql/sql_base.cc 2005-07-28 16:12:38 +03:00
@@ -4082,6 +4082,9 @@
The table will be closed (not stored in cache) by the current thread when
close_thread_tables() is called.
+ PREREQUISITES
+ Lock on LOCK_open()
+
RETURN
0 This thread now have exclusive access to this table and no other thread
can access the table until close_thread_tables() is called.
@@ -4097,6 +4100,7 @@
bool result=0, signalled= 0;
DBUG_ENTER("remove_table_from_cache");
+
key_length=(uint) (strmov(strmov(key,db)+1,table_name)-key)+1;
for (;;)
{
@@ -4154,15 +4158,12 @@
{
if (!(flags & RTFC_CHECK_KILLED_FLAG) || !thd->killed)
{
+ dropping_tables++;
if (likely(signalled))
- {
- dropping_tables++;
(void) pthread_cond_wait(&COND_refresh, &LOCK_open);
- dropping_tables--;
- continue;
- }
else
{
+ struct timespec abstime;
/*
It can happen that another thread has opened the
table but has not yet locked any table at all. Since
@@ -4173,11 +4174,11 @@
and then we retry another loop in the
remove_table_from_cache routine.
*/
- pthread_mutex_unlock(&LOCK_open);
- my_sleep(10);
- pthread_mutex_lock(&LOCK_open);
- continue;
+ set_timespec(abstime, 10);
+ pthread_cond_timedwait(&COND_refresh, &LOCK_open, &abstime);
}
+ dropping_tables--;
+ continue;
}
}
break;
--- 1.158/sql/sql_lex.cc 2005-07-14 23:41:52 +03:00
+++ 1.159/sql/sql_lex.cc 2005-07-28 16:12:38 +03:00
@@ -563,7 +563,7 @@
grammatically correct.
*/
else if (c == '?' && ((THD*) yythd)->command == COM_STMT_PREPARE &&
- !ident_map[cs, yyPeek()])
+ !ident_map[yyPeek()])
return(PARAM_MARKER);
return((int) c);
--- 1.344/sql/sql_select.cc 2005-07-25 22:51:44 +03:00
+++ 1.345/sql/sql_select.cc 2005-07-28 16:12:38 +03:00
@@ -1198,7 +1198,14 @@
{
result->send_fields(fields_list,
Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF);
- if (cond_value != Item::COND_FALSE && (!having || having->val_int()))
+ /*
+ We have to test for 'conds' here as the WHERE may not be constant
+ even if we don't have any tables for prepared statements or if
+ conds uses something like 'rand()'.
+ */
+ if (cond_value != Item::COND_FALSE &&
+ (!conds || conds->val_int()) &&
+ (!having || having->val_int()))
{
if (do_send_rows && (procedure ? (procedure->send_row(fields_list) ||
procedure->end_of_records())
--- 1.264/sql/sql_table.cc 2005-07-22 22:32:27 +03:00
+++ 1.265/sql/sql_table.cc 2005-07-28 17:09:49 +03:00
@@ -229,7 +229,6 @@
for (table= tables; table; table= table->next_local)
{
char *db=table->db;
- uint flags;
mysql_ha_flush(thd, table, MYSQL_HA_CLOSE_FINAL);
if (!close_temporary_table(thd, db, table->table_name))
{
@@ -240,10 +239,11 @@
error=0;
if (!drop_temporary)
{
- abort_locked_tables(thd,db,table->table_name);
- flags= RTFC_WAIT_OTHER_THREAD_FLAG | RTFC_CHECK_KILLED_FLAG;
- remove_table_from_cache(thd,db,table->table_name,flags);
- drop_locked_tables(thd,db,table->table_name);
+ abort_locked_tables(thd, db, table->table_name);
+ remove_table_from_cache(thd, db, table->table_name,
+ RTFC_WAIT_OTHER_THREAD_FLAG |
+ RTFC_CHECK_KILLED_FLAG);
+ drop_locked_tables(thd, db, table->table_name);
if (thd->killed)
{
thd->no_warnings_for_error= 0;
@@ -1620,7 +1620,7 @@
create_info->data_file_name= create_info->index_file_name= 0;
create_info->table_options=db_options;
- if (rea_create_table(thd, path, table_name, db,
+ if (rea_create_table(thd, path, db, table_name,
create_info, fields, key_count,
key_info_buffer))
goto end;
@@ -2248,14 +2248,14 @@
/* Close all instances of the table to allow repair to rename files */
if (lock_type == TL_WRITE && table->table->s->version)
{
- uint flags;
pthread_mutex_lock(&LOCK_open);
const char *old_message=thd->enter_cond(&COND_refresh, &LOCK_open,
"Waiting to get writelock");
mysql_lock_abort(thd,table->table);
- flags= RTFC_WAIT_OTHER_THREAD_FLAG | RTFC_CHECK_KILLED_FLAG;
remove_table_from_cache(thd, table->table->s->db,
- table->table->s->table_name, flags);
+ table->table->s->table_name,
+ RTFC_WAIT_OTHER_THREAD_FLAG |
+ RTFC_CHECK_KILLED_FLAG);
thd->exit_cond(old_message);
if (thd->killed)
goto err;
@@ -3733,9 +3733,10 @@
if (table)
{
VOID(table->file->extra(HA_EXTRA_FORCE_REOPEN)); // Use new file
+ /* Mark in-use copies old */
remove_table_from_cache(thd,db,table_name,RTFC_NO_FLAG);
- // Mark in-use copies old
- mysql_lock_abort(thd,table); // end threads waiting on lock
+ /* end threads waiting on lock */
+ mysql_lock_abort(thd,table);
}
VOID(quick_rm_table(old_db_type,db,old_name));
if (close_data_tables(thd,db,table_name) ||
--- 1.174/sql/table.cc 2005-07-22 22:39:43 +03:00
+++ 1.175/sql/table.cc 2005-07-28 17:09:49 +03:00
@@ -1342,8 +1342,8 @@
/* Create a .frm file */
-File create_frm(THD *thd, register my_string name, const char *table,
- const char *db, uint reclength, uchar *fileinfo,
+File create_frm(THD *thd, my_string name, const char *db,
+ const char *table, uint reclength, uchar *fileinfo,
HA_CREATE_INFO *create_info, uint keys)
{
register File file;
--- 1.65/sql/unireg.cc 2005-07-27 14:06:48 +03:00
+++ 1.66/sql/unireg.cc 2005-07-28 17:09:49 +03:00
@@ -55,8 +55,8 @@
mysql_create_frm()
thd Thread handler
file_name Name of file (including database and .frm)
- table Name of table
db Name of database
+ table Name of table
create_info create info parameters
create_fields Fields to create
keys number of keys to create
@@ -69,7 +69,7 @@
*/
bool mysql_create_frm(THD *thd, my_string file_name,
- const char *table, const char *db,
+ const char *db, const char *table,
HA_CREATE_INFO *create_info,
List<create_field> &create_fields,
uint keys, KEY *key_info,
@@ -116,7 +116,7 @@
}
reclength=uint2korr(forminfo+266);
- if ((file=create_frm(thd, file_name, table, db, reclength, fileinfo,
+ if ((file=create_frm(thd, file_name, db, table, reclength, fileinfo,
create_info, keys)) < 0)
{
my_free((gptr) screen_buff,MYF(0));
@@ -217,8 +217,8 @@
rea_create_table()
thd Thread handler
file_name Name of file (including database and .frm)
- table Name of table
db Name of database
+ table Name of table
create_info create info parameters
create_fields Fields to create
keys number of keys to create
@@ -231,14 +231,14 @@
*/
int rea_create_table(THD *thd, my_string file_name,
- const char *table, const char *db,
+ const char *db, const char *table,
HA_CREATE_INFO *create_info,
List<create_field> &create_fields,
uint keys, KEY *key_info)
{
DBUG_ENTER("rea_create_table");
- if (mysql_create_frm(thd, file_name, table, db, create_info,
+ if (mysql_create_frm(thd, file_name, db, table, create_info,
create_fields, keys, key_info, NULL))
DBUG_RETURN(1);
if (!create_info->frm_only && ha_create_table(file_name,create_info,0))
--- 1.107/support-files/mysql.spec.sh 2005-07-15 16:53:37 +03:00
+++ 1.108/support-files/mysql.spec.sh 2005-07-28 16:12:39 +03:00
@@ -349,6 +349,7 @@
%if %{STATIC_BUILD}
--with-mysqld-ldflags='-all-static' \
--with-client-ldflags='-all-static' \
+ --with-zlib-dir=bundled \
$USE_OTHER_LIBC_DIR \
%endif
--with-comment=\"MySQL Community Edition - Standard (GPL)\" \
--- 1.48/mysql-test/t/derived.test 2005-02-22 15:46:56 +02:00
+++ 1.49/mysql-test/t/derived.test 2005-07-28 16:12:32 +03:00
@@ -248,3 +248,5 @@
select * from t1 union distinct select * from t2 union all select * from t3;
select * from (select * from t1 union distinct select * from t2 union all select * from t3) X;
drop table t1, t2, t3;
+
+# End of 4.1 tests
--- 1.20/mysql-test/t/olap.test 2005-07-19 02:01:20 +03:00
+++ 1.21/mysql-test/t/olap.test 2005-07-28 16:12:35 +03:00
@@ -276,3 +276,5 @@
SELECT a, b, a AS c, COUNT(*) AS count FROM t1 GROUP BY a, b, c WITH ROLLUP;
DROP TABLE t1;
+
+# End of 4.1 tests
--- 1.88/mysql-test/t/union.test 2005-05-28 02:28:06 +03:00
+++ 1.89/mysql-test/t/union.test 2005-07-28 16:12:37 +03:00
@@ -793,3 +793,5 @@
select 99 union all select id from t1 order by 1;
select id from t1 union all select 99 order by 1;
drop table t1;
+
+# End of 4.1 tests
--- 1.33/mysql-test/t/ctype_ucs.test 2005-07-15 20:46:37 +03:00
+++ 1.34/mysql-test/t/ctype_ucs.test 2005-07-28 17:09:48 +03:00
@@ -419,6 +419,8 @@
select hex(a) from t1;
drop table t1;
+# End of 4.1 tests
+
#
# Conversion from an UCS2 string to a decimal column
#
--- 1.64/mysql-test/t/ctype_utf8.test 2005-07-22 12:47:04 +03:00
+++ 1.65/mysql-test/t/ctype_utf8.test 2005-07-28 17:09:48 +03:00
@@ -843,6 +843,8 @@
select hex(a) from t1;
drop table t1;
+# End of 4.1 tests
+
#
# Test for bug #11484: wrong results for a DISTINCT varchar column in uft8.
#
--- 1.20/mysql-test/t/ctype_many.test 2005-01-14 05:04:25 +02:00
+++ 1.21/mysql-test/t/ctype_many.test 2005-07-28 16:12:32 +03:00
@@ -209,3 +209,5 @@
SELECT * FROM t1;
SELECT min(comment),count(*) FROM t1 GROUP BY ucs2_f;
DROP TABLE t1;
+
+# End of 4.1 tests
--- 1.13/mysql-test/t/heap_btree.test 2005-04-12 13:04:38 +03:00
+++ 1.14/mysql-test/t/heap_btree.test 2005-07-28 16:12:34 +03:00
@@ -163,3 +163,5 @@
DELETE from t1 where a < 100;
SELECT * from t1;
DROP TABLE t1;
+
+# End of 4.1 tests
--- 1.10/mysql-test/t/heap_hash.test 2005-06-24 18:52:29 +03:00
+++ 1.11/mysql-test/t/heap_hash.test 2005-07-28 16:12:34 +03:00
@@ -259,3 +259,5 @@
select a from t1 where a in (1,3);
explain select a from t1 where a in (1,3);
drop table t1;
+
+# End of 4.1 tests
--- 1.11/mysql-test/t/ctype_uca.test 2005-06-06 14:52:04 +03:00
+++ 1.12/mysql-test/t/ctype_uca.test 2005-07-28 17:09:48 +03:00
@@ -456,6 +456,8 @@
SET collation_connection='utf8_unicode_ci';
-- source include/ctype_filesort.inc
+# End of 4.1 tests
+
#
# Check UPPER/LOWER changeing length
#
--- 1.4/mysql-test/t/func_default.test 2005-06-14 15:50:19 +03:00
+++ 1.5/mysql-test/t/func_default.test 2005-07-28 17:09:48 +03:00
@@ -18,6 +18,8 @@
drop table t1;
+# End of 4.1 tests
+
#
# Bug #11314 (HAVING DEFAULT() hangs)
#
--- 1.5/mysql-test/t/ndb_cache.test 2005-04-21 11:24:37 +03:00
+++ 1.6/mysql-test/t/ndb_cache.test 2005-07-28 17:09:48 +03:00
@@ -119,4 +119,4 @@
SET GLOBAL query_cache_size=0;
-
+# End of 4.1 tests
--- 1.18/mysql-test/t/row.test 2005-04-04 16:43:20 +03:00
+++ 1.19/mysql-test/t/row.test 2005-07-28 16:12:35 +03:00
@@ -84,3 +84,5 @@
drop table t1;
SELECT ROW(2,10) <=> ROW(3,4);
SELECT ROW(NULL,10) <=> ROW(3,NULL);
+
+# End of 4.1 tests
--- 1.102/mysql-test/t/subselect.test 2005-07-12 20:11:21 +03:00
+++ 1.103/mysql-test/t/subselect.test 2005-07-28 16:12:37 +03:00
@@ -1867,3 +1867,5 @@
select * from (select max(fld) from t1) as foo;
drop table t1;
+
+# End of 4.1 tests
--- 1.9/mysql-test/t/archive.test 2005-07-11 04:19:18 +03:00
+++ 1.10/mysql-test/t/archive.test 2005-07-28 16:12:32 +03:00
@@ -1333,3 +1333,5 @@
# Cleanup, test is over
#
drop table t1, t2, t4;
+
+# End of 4.1 tests
--- 1.7/mysql-test/t/rpl_timezone.test 2005-03-24 17:43:40 +02:00
+++ 1.8/mysql-test/t/rpl_timezone.test 2005-07-28 16:12:37 +03:00
@@ -122,3 +122,5 @@
connection master;
drop table t1, t2;
sync_slave_with_master;
+
+# End of 4.1 tests
--- 1.8/mysql-test/t/timezone2.test 2005-07-19 02:12:41 +03:00
+++ 1.9/mysql-test/t/timezone2.test 2005-07-28 16:12:37 +03:00
@@ -220,3 +220,5 @@
create table t1 select convert_tz(NULL, NULL, NULL);
select * from t1;
drop table t1;
+
+# End of 4.1 tests
--- 1.17/mysql-test/t/mysqlbinlog.test 2005-04-02 06:02:07 +03:00
+++ 1.18/mysql-test/t/mysqlbinlog.test 2005-07-28 17:09:48 +03:00
@@ -110,3 +110,4 @@
# clean up
drop table t1, t2;
+# End of 4.1 tests
--- 1.6/mysql-test/t/rpl_openssl.test 2004-04-07 16:12:39 +03:00
+++ 1.7/mysql-test/t/rpl_openssl.test 2005-07-28 16:12:36 +03:00
@@ -60,3 +60,5 @@
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT
--replace_column 1 # 8 # 9 # 23 # 33 #
show slave status;
+
+# End of 4.1 tests
--- 1.16/mysql-test/t/rpl_until.test 2005-07-04 23:09:44 +03:00
+++ 1.17/mysql-test/t/rpl_until.test 2005-07-28 17:09:48 +03:00
@@ -83,3 +83,5 @@
# Warning should be given for second command
start slave sql_thread;
start slave until master_log_file='master-bin.000001', master_log_pos=776;
+
+# End of 4.1 tests
--- 1.12/mysql-test/t/date_formats.test 2005-03-30 16:00:27 +03:00
+++ 1.13/mysql-test/t/date_formats.test 2005-07-28 16:12:32 +03:00
@@ -260,3 +260,5 @@
select str_to_date("2003-04-05 g", "%Y-%m-%d") as f1,
str_to_date("2003-04-05 10:11:12.101010234567", "%Y-%m-%d %H:%i:%S.%f") as f2;
--enable_ps_protocol
+
+# End of 4.1 tests
--- 1.9/mysql-test/t/func_sapdb.test 2005-04-18 13:15:22 +03:00
+++ 1.10/mysql-test/t/func_sapdb.test 2005-07-28 16:12:33 +03:00
@@ -128,3 +128,5 @@
--disable_ps_protocol
select str_to_date("2003-01-02 10:11:12.0012", "%Y-%m-%d %H:%i:%S.%f");
--enable_ps_protocol
+
+# End of 4.1 tests
--- 1.4/mysql-test/t/init_connect.test 2004-12-16 12:41:47 +02:00
+++ 1.5/mysql-test/t/init_connect.test 2005-07-28 16:12:34 +03:00
@@ -32,3 +32,5 @@
select @a;
connection con0;
drop table t1;
+
+# End of 4.1 tests
--- 1.11/mysql-test/t/rpl_user_variables.test 2005-03-16 03:32:41 +02:00
+++ 1.12/mysql-test/t/rpl_user_variables.test 2005-07-28 16:12:37 +03:00
@@ -54,3 +54,5 @@
connection slave;
sync_with_master;
stop slave;
+
+# End of 4.1 tests
--- 1.24/mysql-test/t/ps_1general.test 2005-07-08 10:53:51 +03:00
+++ 1.25/mysql-test/t/ps_1general.test 2005-07-28 16:12:35 +03:00
@@ -930,3 +930,5 @@
# Thank you for reading these rules of thumb.
#
# Matthias
+
+# End of 4.1 tests
--- 1.6/mysql-test/t/ps_4heap.test 2005-06-20 13:08:55 +03:00
+++ 1.7/mysql-test/t/ps_4heap.test 2005-07-28 16:12:35 +03:00
@@ -47,3 +47,5 @@
-- source include/ps_conv.inc
drop table t1, t9;
+
+# End of 4.1 tests
--- 1.5/mysql-test/t/ps_5merge.test 2005-06-20 13:08:55 +03:00
+++ 1.6/mysql-test/t/ps_5merge.test 2005-07-28 16:12:35 +03:00
@@ -82,3 +82,5 @@
drop table t1, t1_1, t1_2,
t9_1, t9_2, t9;
+
+# End of 4.1 tests
--- 1.6/mysql-test/t/flush_block_commit.test 2005-04-12 17:11:19 +03:00
+++ 1.7/mysql-test/t/flush_block_commit.test 2005-07-28 17:09:48 +03:00
@@ -77,6 +77,8 @@
drop table t1;
+# End of 4.1 tests
+
# FLUSH TABLES WITH READ LOCK should block writes to binlog too
connection con1;
create table t1 (a int) engine=innodb;
--- 1.15/mysql-test/t/mix_innodb_myisam_binlog.test 2005-04-05 16:36:44 +03:00
+++ 1.16/mysql-test/t/mix_innodb_myisam_binlog.test 2005-07-28 16:12:34 +03:00
@@ -229,3 +229,5 @@
# cleanup
drop table t1,t2;
+
+# End of 4.1 tests
--- 1.6/mysql-test/t/mysqlbinlog2.test 2005-04-02 06:02:07 +03:00
+++ 1.7/mysql-test/t/mysqlbinlog2.test 2005-07-28 16:12:34 +03:00
@@ -157,3 +157,5 @@
select "--- end of test --" as "";
--enable_query_log
drop table t1;
+
+# End of 4.1 tests
--- 1.4/mysql-test/t/rpl_EE_error.test 2005-02-21 20:41:45 +02:00
+++ 1.5/mysql-test/t/rpl_EE_error.test 2005-07-28 16:12:35 +03:00
@@ -28,3 +28,5 @@
save_master_pos;
connection slave;
wait_for_slave_to_stop;
+
+# End of 4.1 tests
--- 1.9/mysql-test/t/rpl_change_master.test 2005-03-02 18:52:26 +02:00
+++ 1.10/mysql-test/t/rpl_change_master.test 2005-07-28 16:12:36 +03:00
@@ -33,3 +33,5 @@
save_master_pos;
connection slave;
sync_with_master;
+
+# End of 4.1 tests
--- 1.15/mysql-test/t/rpl_charset.test 2005-03-16 03:32:41 +02:00
+++ 1.16/mysql-test/t/rpl_charset.test 2005-07-28 16:12:36 +03:00
@@ -169,3 +169,5 @@
update t1 set pk='test' where pk=@p;
drop table t1;
sync_slave_with_master;
+
+# End of 4.1 tests
--- 1.6/mysql-test/t/rpl_deadlock.test 2005-07-13 15:15:21 +03:00
+++ 1.7/mysql-test/t/rpl_deadlock.test 2005-07-28 16:12:36 +03:00
@@ -109,3 +109,5 @@
connection master;
drop table t1,t2,t3,t4;
sync_slave_with_master;
+
+# End of 4.1 tests
--- 1.3/mysql-test/t/rpl_drop_temp.test 2005-03-17 00:56:25 +02:00
+++ 1.4/mysql-test/t/rpl_drop_temp.test 2005-07-28 17:09:48 +03:00
@@ -14,3 +14,4 @@
connection default;
drop database mysqltest;
+# End of 4.1 tests
--- 1.13/mysql-test/t/rpl_error_ignored_table.test 2005-03-16 03:32:41 +02:00
+++ 1.14/mysql-test/t/rpl_error_ignored_table.test 2005-07-28 16:12:36 +03:00
@@ -55,3 +55,5 @@
# SQL slave thread should not have stopped (because table of the killed
# query is in the ignore list).
sync_with_master;
+
+# End of 4.1 tests
--- 1.6/mysql-test/t/rpl_flush_tables.test 2005-03-16 03:32:41 +02:00
+++ 1.7/mysql-test/t/rpl_flush_tables.test 2005-07-28 16:12:36 +03:00
@@ -35,3 +35,5 @@
select * from t3;
# Note that all this confusion may cause warnings 'table xx is open on rename'
# in the .err files; these are not fatal and are not reported by mysql-test-run.
+
+# End of 4.1 tests
--- 1.4/mysql-test/t/rpl_heap.test 2004-09-05 02:36:28 +03:00
+++ 1.5/mysql-test/t/rpl_heap.test 2005-07-28 16:12:36 +03:00
@@ -47,3 +47,5 @@
save_master_pos;
connection slave;
sync_with_master;
+
+# End of 4.1 tests
--- 1.8/mysql-test/t/rpl_loaddata_rule_m.test 2005-03-16 03:32:41 +02:00
+++ 1.9/mysql-test/t/rpl_loaddata_rule_m.test 2005-07-28 16:12:36 +03:00
@@ -25,3 +25,5 @@
--replace_column 2 # 5 #
show binlog events from 98;
drop database mysqltest;
+
+# End of 4.1 tests
--- 1.6/mysql-test/t/rpl_loaddata_rule_s.test 2005-03-16 03:32:41 +02:00
+++ 1.7/mysql-test/t/rpl_loaddata_rule_s.test 2005-07-28 17:09:48 +03:00
@@ -18,3 +18,5 @@
sync_with_master;
select count(*) from t1; # check that LOAD was replicated
show binlog events from 98; # should be nothing
+
+# End of 4.1 tests
--- 1.12/mysql-test/t/rpl_max_relay_size.test 2004-05-26 17:10:51 +03:00
+++ 1.13/mysql-test/t/rpl_max_relay_size.test 2005-07-28 16:12:36 +03:00
@@ -91,3 +91,5 @@
# test that the absence of relay logs does not make a master crash
flush logs;
show master status;
+
+# End of 4.1 tests
--- 1.5/mysql-test/t/rpl_multi_query.test 2005-03-16 03:32:41 +02:00
+++ 1.6/mysql-test/t/rpl_multi_query.test 2005-07-28 16:12:36 +03:00
@@ -27,3 +27,5 @@
show binlog events from 98;
drop database mysqltest;
sync_slave_with_master;
+
+# End of 4.1 tests
--- 1.13/mysql-test/t/rpl_relayrotate.test 2004-09-05 02:36:28 +03:00
+++ 1.14/mysql-test/t/rpl_relayrotate.test 2005-07-28 16:12:36 +03:00
@@ -75,3 +75,5 @@
save_master_pos;
connection slave;
sync_with_master;
+
+# End of 4.1 tests
--- 1.7/mysql-test/t/rpl_reset_slave.test 2004-04-07 16:12:39 +03:00
+++ 1.8/mysql-test/t/rpl_reset_slave.test 2005-07-28 16:12:37 +03:00
@@ -46,3 +46,5 @@
start slave;
sync_with_master;
show status like 'slave_open_temp_tables';
+
+# End of 4.1 tests
--- 1.5/mysql-test/t/rpl_server_id2.test 2004-05-26 17:10:51 +03:00
+++ 1.6/mysql-test/t/rpl_server_id2.test 2005-07-28 16:12:37 +03:00
@@ -22,3 +22,5 @@
# (not critical).
stop slave;
drop table t1;
+
+# End of 4.1 tests
--- 1.7.1.3/mysql-test/t/rpl_trunc_binlog.test 2005-07-28 03:21:49 +03:00
+++ 1.14/BitKeeper/deleted/.del-rpl_trunc_binlog.test~961b1f6ac73d37c8 2005-07-28 17:09:48 +03:00
@@ -1,27 +1,37 @@
# We are testing if a binlog which contains BEGIN but not COMMIT (the
-# master did while writing the transaction to the binlog) triggers an
-# error on slave. So we use such a truncated binlog and simulate that
+# master died while writing the transaction to the binlog) triggers a
+# rollback on slave. So we use such a truncated binlog and simulate that
# the master restarted after this.
source include/master-slave.inc;
connection slave;
-# If we are not supporting transactions in the slave, the unfinished transaction
-# won't cause any error, so we need to skip the test. In the 4.0 testsuite, the
-# slave always runs without InnoDB, so we check for BDB.
+# If we are not supporting transactions in the slave, the unfinished
+# transaction won't cause any error, so we need to skip the test. In the 4.0
+# testsuite, the slave always runs without InnoDB, so we check for BDB.
source include/have_bdb.inc;
stop slave;
+
connection master;
flush logs;
system mv -f var/log/master-bin.000001 var/log/master-bin.000002;
system cp std_data/trunc_binlog.000001 var/log/master-bin.000001;
+
connection slave;
+
+# truncated binlog contains: BEGIN; INSERT t1 VALUES (1);
+# so let's create the table t1 on slave
+
+create table t1 (a int) engine=bdb;
reset slave;
start slave;
# can't sync_with_master so we must sleep
sleep 3;
--replace_result $MASTER_MYPORT MASTER_PORT
---replace_column 1 # 23 # 33 #
+--replace_column 1 # 8 # 9 # 23 # 33 #
show slave status;
+select * from t1;
+drop table t1;
+
# End of 4.1 tests
--- 1.12/mysql-test/t/sql_mode.test 2005-07-06 03:05:28 +03:00
+++ 1.13/mysql-test/t/sql_mode.test 2005-07-28 17:09:48 +03:00
@@ -86,6 +86,8 @@
--error 1231
set @@SQL_MODE=NULL;
+# End of 4.1 tests
+
#
# test for
# WL 1941 "NO_C_ESCAPES sql_mode"
--- 1.7/mysql-test/r/ps_grant.result 2005-06-16 23:34:29 +03:00
+++ 1.8/mysql-test/r/ps_grant.result 2005-07-28 17:09:48 +03:00
@@ -54,6 +54,7 @@
4
execute s_t9 ;
ERROR 42S02: Table 'mysqltest.t9' doesn't exist
+deallocate prepare s_t9;
revoke all privileges on mysqltest.t1 from second_user@localhost
identified by 'looser' ;
show grants for second_user@localhost ;
--- 1.4/mysql-test/t/ctype_ucs_binlog.test 2005-04-14 10:56:17 +03:00
+++ 1.5/mysql-test/t/ctype_ucs_binlog.test 2005-07-28 16:12:32 +03:00
@@ -17,4 +17,4 @@
--exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001
drop table t2;
-
+# End of 4.1 tests
--- 1.5/mysql-test/t/ps_grant.test 2005-05-14 13:42:20 +03:00
+++ 1.6/mysql-test/t/ps_grant.test 2005-07-28 17:09:48 +03:00
@@ -1,7 +1,6 @@
# Can't test grants with embedded server
-- source include/not_embedded.inc
-
let $type= 'MYISAM' ;
################ GRANT/REVOKE/DROP affecting a parallel session ################
@@ -80,6 +79,7 @@
######## Question 2: The table t9 does not exist. ########
--error 1146
execute s_t9 ;
+deallocate prepare s_t9;
#### revoke the access rights to t1
@@ -112,8 +112,11 @@
drop database mysqltest;
+# End of 4.1 tests
-## grant/revoke + drop user
+#
+# grant/revoke + drop user
+#
--error 1295
prepare stmt3 from ' grant all on test.t1 to drop_user@localhost
identified by ''looser'' ';
@@ -126,11 +129,3 @@
--error 1295
prepare stmt3 from ' drop user drop_user@localhost ';
drop user drop_user@localhost;
-
-# This test must be the last one, otherwise it may produce extra
-# rows in the processlist under high load.
-# Tested here simply so it is not tested with embedded server
-prepare stmt4 from ' show full processlist ';
---replace_column 1 number 6 time 3 localhost
-execute stmt4;
-deallocate prepare stmt4;
--- 1.3/mysql-test/t/rpl_variables.test 2005-05-18 13:10:11 +03:00
+++ 1.4/mysql-test/t/rpl_variables.test 2005-07-28 17:09:48 +03:00
@@ -3,6 +3,8 @@
set global slave_net_timeout=100;
set global sql_slave_skip_counter=100;
+# End of 4.1 tests
+
# BUG #7800: Add various-slave related variables to SHOW VARIABLES
show variables like 'slave_compressed_protocol';
--replace_column 2 SLAVE_LOAD_TMPDIR
--- 1.3/mysql-test/t/timezone_grant.test 2005-07-18 23:49:14 +03:00
+++ 1.4/mysql-test/t/timezone_grant.test 2005-07-28 16:12:37 +03:00
@@ -81,3 +81,4 @@
flush privileges;
drop table t1, t2;
+# End of 4.1 tests
--- 1.2/mysql-test/t/user_var-binlog.test 2005-04-05 02:34:21 +03:00
+++ 1.3/mysql-test/t/user_var-binlog.test 2005-07-28 16:12:37 +03:00
@@ -17,3 +17,5 @@
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
--exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001
drop table t1;
+
+# End of 4.1 tests
--- 1.7/mysql-test/t/mysqltest.test 2005-06-16 13:46:05 +03:00
+++ 1.8/mysql-test/t/mysqltest.test 2005-07-28 17:09:48 +03:00
@@ -287,6 +287,7 @@
#
#select 3 from t1 ;
+# End of 4.1 tests
#
# Bug #10251: Identifiers containing quotes not handled correctly
@@ -295,8 +296,6 @@
# Test escaping of quotes
select 'aaa\\','aa''a',"aa""a";
-
-
#
# Check of include/show_msg.inc and include/show_msg80.inc
--- 1.4/mysql-test/t/rpl_ddl.test 2005-06-16 19:56:06 +03:00
+++ 1.5/mysql-test/t/rpl_ddl.test 2005-07-28 16:12:36 +03:00
@@ -348,3 +348,5 @@
DROP DATABASE IF EXISTS mysqltest2;
DROP DATABASE IF EXISTS mysqltest3;
--enable_warnings
+
+# End of 4.1 tests
--- 1.22/mysql-test/t/ndb_alter_table.test 2005-07-03 14:17:45 +03:00
+++ 1.23/mysql-test/t/ndb_alter_table.test 2005-07-28 16:12:35 +03:00
@@ -179,3 +179,5 @@
#truncate table t2;
#select count(*) from t2;
#drop table t2;
+
+# End of 4.1 tests
--- 1.21/mysql-test/t/ndb_autodiscover.test 2005-07-12 11:52:41 +03:00
+++ 1.22/mysql-test/t/ndb_autodiscover.test 2005-07-28 16:12:35 +03:00
@@ -544,3 +544,5 @@
insert into t10 values (1, 'kalle');
--exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test `$NDB_TOOLS_DIR/ndb_show_tables --no-defaults | grep BLOB` >> $NDB_TOOLS_OUTPUT 2>&1 || true
+
+# End of 4.1 tests
--- 1.29/mysql-test/t/ndb_basic.test 2005-05-19 21:38:45 +03:00
+++ 1.30/mysql-test/t/ndb_basic.test 2005-07-28 17:09:48 +03:00
@@ -606,6 +606,7 @@
drop table t1;
+# End of 4.1 tests
#
# Test long table name
--- 1.23/mysql-test/t/ndb_index_ordered.test 2005-04-21 11:24:37 +03:00
+++ 1.24/mysql-test/t/ndb_index_ordered.test 2005-07-28 16:12:35 +03:00
@@ -348,3 +348,5 @@
select a from t1 where b = 2;
show tables;
drop table t1;
+
+# End of 4.1 tests
--- 1.15/mysql-test/t/ndb_index_unique.test 2005-04-21 11:24:37 +03:00
+++ 1.16/mysql-test/t/ndb_index_unique.test 2005-07-28 16:12:35 +03:00
@@ -308,3 +308,5 @@
select * from t1 where code = '12' and month = 4 and year = 2004 ;
drop table t1;
+
+# End of 4.1 tests
--- 1.4/mysql-test/t/ndb_types.test 2005-04-21 11:24:38 +03:00
+++ 1.5/mysql-test/t/ndb_types.test 2005-07-28 16:12:35 +03:00
@@ -81,3 +81,5 @@
select time_stamp>@now from t1;
drop table t1;
+
+# End of 4.1 tests
--- 1.3/mysql-test/t/rpl_create_database.test 2004-12-06 17:15:48 +02:00
+++ 1.4/mysql-test/t/rpl_create_database.test 2005-07-28 16:12:36 +03:00
@@ -69,3 +69,5 @@
DROP DATABASE IF EXISTS mysqltest_sisyfos;
DROP DATABASE IF EXISTS mysqltest_bob;
sync_slave_with_master;
+
+# End of 4.1 tests
--- 1.8/mysql-test/t/alias.test 2005-06-27 14:12:08 +03:00
+++ 1.9/mysql-test/t/alias.test 2005-07-28 16:12:32 +03:00
@@ -86,3 +86,5 @@
ASC LIMIT 1;
drop table t1;
+
+# End of 4.1 tests
--- 1.36/mysql-test/t/alter_table.test 2005-05-14 18:19:54 +03:00
+++ 1.37/mysql-test/t/alter_table.test 2005-07-28 16:12:32 +03:00
@@ -360,3 +360,5 @@
--error 1089
alter table t1 add unique ( a(1) );
drop table t1;
+
+# End of 4.1 tests
--- 1.13/mysql-test/t/analyse.test 2005-02-21 17:19:12 +02:00
+++ 1.14/mysql-test/t/analyse.test 2005-07-28 17:09:48 +03:00
@@ -48,6 +48,8 @@
select * from t1 procedure analyse();
drop table t1;
+# End of 4.1 tests
+
#decimal-related test
create table t1 (df decimal(5,1));
--- 1.23/mysql-test/t/auto_increment.test 2005-06-06 20:41:49 +03:00
+++ 1.24/mysql-test/t/auto_increment.test 2005-07-28 17:09:48 +03:00
@@ -219,6 +219,8 @@
CHECK TABLE t1;
DROP TABLE IF EXISTS t1;
+# End of 4.1 tests
+
#
# Bug #11080 & #11005 Multi-row REPLACE fails on a duplicate key error
#
--- 1.23/mysql-test/t/bigint.test 2005-04-30 03:14:38 +03:00
+++ 1.24/mysql-test/t/bigint.test 2005-07-28 17:09:48 +03:00
@@ -104,6 +104,8 @@
drop table t1, t2;
+# End of 4.1 tests
+
#
# Test of CREATE ... SELECT and unsigned integers
#
--- 1.17/mysql-test/t/case.test 2005-06-23 20:05:34 +03:00
+++ 1.18/mysql-test/t/case.test 2005-07-28 17:09:48 +03:00
@@ -122,6 +122,9 @@
UNION
SELECT CASE '1' WHEN '2' THEN 'BUG' ELSE 'nobug' END;
+# End of 4.1 tests
+
+
#
# Tests for bug #9939: conversion of the arguments for COALESCE and IFNULL
#
--- 1.9/mysql-test/t/count_distinct.test 2005-05-27 11:41:33 +03:00
+++ 1.10/mysql-test/t/count_distinct.test 2005-07-28 17:09:48 +03:00
@@ -55,6 +55,8 @@
select count(distinct f) from t1;
drop table t1;
+# End of 4.1 tests
+
#
# Bug #6515
#
--- 1.56/mysql-test/t/create.test 2005-07-22 22:35:10 +03:00
+++ 1.57/mysql-test/t/create.test 2005-07-28 16:12:32 +03:00
@@ -514,3 +514,5 @@
--disable_warnings
drop table if exists test.t1;
--enable_warnings
+
+# End of 4.1 tests
--- 1.9/mysql-test/t/delayed.test 2005-01-06 16:59:19 +02:00
+++ 1.10/mysql-test/t/delayed.test 2005-07-28 16:12:32 +03:00
@@ -36,3 +36,5 @@
show status like 'not_flushed_delayed_rows';
select * from t1;
drop table t1;
+
+# End of 4.1 tests
--- 1.20/mysql-test/t/delete.test 2005-05-30 20:48:35 +03:00
+++ 1.21/mysql-test/t/delete.test 2005-07-28 17:09:48 +03:00
@@ -153,6 +153,8 @@
SELECT * FROM t1;
DROP TABLE t1;
+# End of 4.1 tests
+
#
# Test of multi-delete where we are not scanning the first table
#
--- 1.17/mysql-test/t/distinct.test 2005-06-08 18:34:40 +03:00
+++ 1.18/mysql-test/t/distinct.test 2005-07-28 16:12:32 +03:00
@@ -340,3 +340,5 @@
insert into t1 values (1, "line number one"), (2, "line number two"), (3, "line number three");
select distinct id, IFNULL(dsc, '-') from t1;
drop table t1;
+
+# End of 4.1 tests
--- 1.6/mysql-test/t/func_equal.test 2005-02-09 00:49:33 +02:00
+++ 1.7/mysql-test/t/func_equal.test 2005-07-28 16:12:33 +03:00
@@ -33,3 +33,5 @@
select * from t1 where value <=> value;
select * from t1 where id <=> value or value<=>id;
drop table t1,t2;
+
+# End of 4.1 tests
--- 1.73/mysql-test/t/fulltext.test 2005-06-21 01:02:41 +03:00
+++ 1.74/mysql-test/t/fulltext.test 2005-07-28 16:12:33 +03:00
@@ -338,3 +338,5 @@
DROP TABLE t1;
+
+# End of 4.1 tests
--- 1.6/mysql-test/t/func_date_add.test 2005-06-20 13:08:55 +03:00
+++ 1.7/mysql-test/t/func_date_add.test 2005-07-28 16:12:33 +03:00
@@ -40,3 +40,5 @@
select visitor_id,max(ts) as mts from t1 group by visitor_id
having DATE_ADD(mts,INTERVAL 3 MONTH) < NOW();
drop table t1;
+
+# End of 4.1 tests
--- 1.41/mysql-test/t/func_group.test 2005-05-05 23:01:35 +03:00
+++ 1.42/mysql-test/t/func_group.test 2005-07-28 17:09:48 +03:00
@@ -509,7 +509,41 @@
show columns from t2;
drop table t2, t1;
+#
+# Bug 8893: wrong result for min/max optimization with 2 indexes
+#
+
+CREATE TABLE t1(
+ id int PRIMARY KEY,
+ a int,
+ b int,
+ INDEX i_b_id(a,b,id),
+ INDEX i_id(a,id)
+);
+INSERT INTO t1 VALUES
+ (1,1,4), (2,2,1), (3,1,3), (4,2,1), (5,1,1);
+SELECT MAX(id) FROM t1 WHERE id < 3 AND a=2 AND b=6;
+DROP TABLE t1;
+
+# change the order of the last two index definitions
+
+CREATE TABLE t1(
+ id int PRIMARY KEY,
+ a int,
+ b int,
+ INDEX i_id(a,id),
+ INDEX i_b_id(a,b,id)
+);
+INSERT INTO t1 VALUES
+ (1,1,4), (2,2,1), (3,1,3), (4,2,1), (5,1,1);
+SELECT MAX(id) FROM t1 WHERE id < 3 AND a=2 AND b=6;
+DROP TABLE t1;
+
+# End of 4.1 tests
+
+#
# decimal-related tests
+#
create table t2 (ff double);
insert into t2 values (2.2);
select cast(sum(distinct ff) as decimal(5,2)) from t2;
@@ -563,36 +597,6 @@
insert into t1 values (5.00000000001);
insert into t1 values (5.00000000001);
select col1,sum(col1),max(col1),min(col1) from t1 group by col1;
-DROP TABLE t1;
-
-#
-# Bug 8893: wrong result for min/max optimization with 2 indexes
-#
-
-CREATE TABLE t1(
- id int PRIMARY KEY,
- a int,
- b int,
- INDEX i_b_id(a,b,id),
- INDEX i_id(a,id)
-);
-INSERT INTO t1 VALUES
- (1,1,4), (2,2,1), (3,1,3), (4,2,1), (5,1,1);
-SELECT MAX(id) FROM t1 WHERE id < 3 AND a=2 AND b=6;
-DROP TABLE t1;
-
-# change the order of the last two index definitions
-
-CREATE TABLE t1(
- id int PRIMARY KEY,
- a int,
- b int,
- INDEX i_id(a,id),
- INDEX i_b_id(a,b,id)
-);
-INSERT INTO t1 VALUES
- (1,1,4), (2,2,1), (3,1,3), (4,2,1), (5,1,1);
-SELECT MAX(id) FROM t1 WHERE id < 3 AND a=2 AND b=6;
DROP TABLE t1;
#
--- 1.15/mysql-test/t/func_in.test 2005-07-17 04:04:01 +03:00
+++ 1.16/mysql-test/t/func_in.test 2005-07-28 17:09:48 +03:00
@@ -102,6 +102,8 @@
select * from t1 where a in (NULL, 'aa');
drop table t1;
+# End of 4.1 tests
+
#
# Bug #11885: WHERE condition with NOT IN (one element)
#
--- 1.19/mysql-test/t/func_math.test 2005-06-15 17:52:41 +03:00
+++ 1.20/mysql-test/t/func_math.test 2005-07-28 17:09:48 +03:00
@@ -68,6 +68,8 @@
--error 1054
select rand(rand);
+# End of 4.1 tests
+
#
# Bug #8459 (FORMAT returns incorrect result)
#
--- 1.12/mysql-test/t/func_misc.test 2005-05-17 10:51:07 +03:00
+++ 1.13/mysql-test/t/func_misc.test 2005-07-28 17:09:48 +03:00
@@ -38,11 +38,11 @@
drop table t1;
+# End of 4.1 tests
+
+#
# Test for BUG#9535
+#
create table t1 as select uuid(), length(uuid());
show create table t1;
drop table t1;
-
-
-
-
--- 1.13/mysql-test/t/func_set.test 2005-02-19 18:58:21 +02:00
+++ 1.14/mysql-test/t/func_set.test 2005-07-28 16:12:33 +03:00
@@ -54,3 +54,4 @@
#
select find_in_set('1','3,1,');
+# End of 4.1 tests
--- 1.23/mysql-test/t/func_test.test 2005-02-04 01:06:29 +02:00
+++ 1.24/mysql-test/t/func_test.test 2005-07-28 17:09:48 +03:00
@@ -108,6 +108,8 @@
select 5 mod 3, 5 mod -3, -5 mod 3, -5 mod -3;
+# End of 4.1 tests
+
#
# Bug#6726: NOT BETWEEN parse failure
#
--- 1.35/mysql-test/t/func_time.test 2005-06-27 14:12:08 +03:00
+++ 1.36/mysql-test/t/func_time.test 2005-07-28 17:09:48 +03:00
@@ -334,6 +334,9 @@
SELECT count(*) FROM t1 WHERE d>FROM_DAYS(TO_DAYS(@TMP)) AND d<=FROM_DAYS(TO_DAYS(@TMP)+1);
DROP TABLE t1;
+
+# End of 4.1 tests
+
explain extended select timestampdiff(SQL_TSI_WEEK, '2001-02-01', '2001-05-01') as a1,
timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01 12:58:58.119999') as a2;
--- 1.48/mysql-test/t/group_by.test 2005-07-04 16:00:55 +03:00
+++ 1.49/mysql-test/t/group_by.test 2005-07-28 17:09:48 +03:00
@@ -592,6 +592,8 @@
--enable_ps_protocol
DROP TABLE t1;
+# End of 4.1 tests
+
#
# Bug#11211: Ambiguous column reference in GROUP BY.
#
--- 1.15/mysql-test/t/having.test 2005-01-04 13:46:42 +02:00
+++ 1.16/mysql-test/t/having.test 2005-07-28 17:09:48 +03:00
@@ -123,6 +123,7 @@
having (a.description is not null) and (c=0);
drop table t1,t2,t3;
+# End of 4.1 tests
#
# Tests for WL#1972 CORRECT EVALUATION OF COLUMN REFERENCES IN THE HAVING CLAUSE
@@ -232,7 +233,6 @@
group by t2.col1, t2.col2 having col_t1 <= 10)
group by col_t1
having col_t1 <= 20;
-
#
# nested HAVING clauses
--- 1.27/mysql-test/t/heap.test 2005-06-10 05:27:41 +03:00
+++ 1.28/mysql-test/t/heap.test 2005-07-28 16:12:34 +03:00
@@ -435,3 +435,5 @@
--error 1062
insert into t1 values ("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");
drop table t1;
+
+# End of 4.1 tests
--- 1.96/mysql-test/t/innodb.test 2005-07-14 16:50:58 +03:00
+++ 1.97/mysql-test/t/innodb.test 2005-07-28 17:09:48 +03:00
@@ -1230,6 +1230,8 @@
DROP TABLE t2;
DROP TABLE t1;
+# End of 4.1 tests
+
#
# range optimizer problem
#
@@ -1367,7 +1369,6 @@
insert into t1 (val) values ('1'),('2');
select * from t1;
drop table t1;
-
#
# Test that update does not change internal auto-increment value
--- 1.19/mysql-test/t/insert.test 2004-11-08 17:53:27 +02:00
+++ 1.20/mysql-test/t/insert.test 2005-07-28 17:09:48 +03:00
@@ -151,6 +151,12 @@
drop table t1;
--enable_ps_protocol
+# End of 4.1 tests
+
+#
+# Test automatic result buffering with INSERT INTO t1 ... SELECT ... FROM t1
+#
+
create table t1(id1 int not null auto_increment primary key, t char(12));
create table t2(id2 int not null, t char(12));
create table t3(id3 int not null, t char(12), index(id3));
--- 1.22/mysql-test/t/insert_select.test 2005-07-03 14:17:45 +03:00
+++ 1.23/mysql-test/t/insert_select.test 2005-07-28 16:12:34 +03:00
@@ -201,3 +201,5 @@
--error 1109
insert into t1 select t2.a from t2 group by t2.a on duplicate key update a= t1.a + t2.b;
drop table t1,t2,t3;
+
+# End of 4.1 tests
--- 1.29/mysql-test/t/join_outer.test 2005-06-15 12:01:23 +03:00
+++ 1.30/mysql-test/t/join_outer.test 2005-07-28 17:09:48 +03:00
@@ -662,6 +662,8 @@
drop table t1, t2;
set group_concat_max_len=default;
+# End of 4.1 tests
+
#
# BUG#10162 - ON is merged with WHERE, left join is convered to a regular join
#
@@ -706,8 +708,5 @@
CREATE TABLE t2 (c21 int);
INSERT INTO t1 VALUES (30), (40), (50);
INSERT INTO t2 VALUES (300), (400), (500);
-
SELECT * FROM t1 LEFT JOIN t2 ON (c11=c21 AND c21=30) WHERE c11=40;
-
DROP TABLE t1, t2;
-
--- 1.21/mysql-test/t/key.test 2005-06-22 22:46:17 +03:00
+++ 1.22/mysql-test/t/key.test 2005-07-28 16:12:34 +03:00
@@ -353,3 +353,5 @@
create table t1 (a int not null primary key, b varchar(20) not null, c varchar(20) not null, unique(b(10),c(10)));
desc t1;
drop table t1;
+
+# End of 4.1 tests
--- 1.6/mysql-test/t/keywords.test 2003-12-08 12:40:57 +02:00
+++ 1.7/mysql-test/t/keywords.test 2005-07-28 16:12:34 +03:00
@@ -17,3 +17,5 @@
insert into events values(1);
select events.binlog from events;
drop table events;
+
+# End of 4.1 tests
--- 1.9/mysql-test/t/limit.test 2005-04-06 05:45:08 +03:00
+++ 1.10/mysql-test/t/limit.test 2005-07-28 16:12:34 +03:00
@@ -59,3 +59,5 @@
select 1 as a from t1 union all select 1 from dual limit 1;
(select 1 as a from t1) union all (select 1 from dual) limit 1;
drop table t1;
+
+# End of 4.1 tests
--- 1.33/mysql-test/t/merge.test 2005-05-18 23:51:22 +03:00
+++ 1.34/mysql-test/t/merge.test 2005-07-28 16:12:34 +03:00
@@ -320,3 +320,4 @@
SELECT b FROM t2;
DROP TABLE t1, t2;
+# End of 4.1 tests
--- 1.18/mysql-test/t/null.test 2005-04-06 06:55:04 +03:00
+++ 1.19/mysql-test/t/null.test 2005-07-28 16:12:35 +03:00
@@ -189,3 +189,5 @@
# Restore charset to the default value.
set names latin1;
+
+# End of 4.1 tests
--- 1.10/mysql-test/t/null_key.test 2004-09-09 06:59:21 +03:00
+++ 1.11/mysql-test/t/null_key.test 2005-07-28 16:12:35 +03:00
@@ -193,3 +193,5 @@
delete from t1 where id <=> NULL;
select * from t1;
drop table t1;
+
+# End of 4.1 tests
--- 1.32/mysql-test/t/order_by.test 2005-04-06 05:45:08 +03:00
+++ 1.33/mysql-test/t/order_by.test 2005-07-28 16:12:35 +03:00
@@ -549,3 +549,5 @@
SELECT a FROM t1 ORDER BY a;
(SELECT a FROM t1) ORDER BY a;
DROP TABLE t1;
+
+# End of 4.1 tests
--- 1.31/mysql-test/t/range.test 2005-07-16 18:14:04 +03:00
+++ 1.32/mysql-test/t/range.test 2005-07-28 17:09:48 +03:00
@@ -490,6 +490,8 @@
SELECT count(*) FROM t1 WHERE CLIENT='000' AND (ARG1 != ' 2' OR ARG1 != ' 1');
drop table t1;
+# End of 4.1 tests
+
#
# Test for optimization request #10561: to use keys for
# NOT IN (c1,...,cn) and NOT BETWEEN c1 AND c2
--- 1.60/mysql-test/t/select.test 2005-07-28 16:08:52 +03:00
+++ 1.61/mysql-test/t/select.test 2005-07-28 17:09:48 +03:00
@@ -2168,6 +2168,8 @@
DROP TABLE t1;
+# End of 4.1 tests
+
#
# Test case for bug 7098: substitution of a constant for a string field
#
--- 1.50/mysql-test/t/show_check.test 2005-07-07 16:40:32 +03:00
+++ 1.51/mysql-test/t/show_check.test 2005-07-28 16:12:37 +03:00
@@ -385,3 +385,5 @@
);
SHOW CREATE TABLE t1;
DROP TABLE t1;
+
+# End of 4.1 tests
--- 1.10/mysql-test/t/temp_table.test 2005-05-07 15:01:21 +03:00
+++ 1.11/mysql-test/t/temp_table.test 2005-07-28 16:12:37 +03:00
@@ -112,3 +112,5 @@
insert into t2 values (NULL, 'foo'), (NULL, 'bar');
select d, c from t1 left join t2 on b = c where a = 3 order by d;
drop table t1, t2;
+
+# End of 4.1 tests
--- 1.28/mysql-test/t/type_blob.test 2005-07-01 13:03:29 +03:00
+++ 1.29/mysql-test/t/type_blob.test 2005-07-28 17:09:48 +03:00
@@ -394,6 +394,8 @@
select max(i) from t1 where c = '';
drop table t1;
+# End of 4.1 tests
+
#
# Bug#11657: Creation of secondary index fails
#
--- 1.25/mysql-test/t/type_decimal.test 2005-07-07 19:47:13 +03:00
+++ 1.26/mysql-test/t/type_decimal.test 2005-07-28 17:09:48 +03:00
@@ -268,7 +268,11 @@
select * from t1;
drop table t1;
+# End of 4.1 tests
+
+#
# Test for BUG#8397: decimal type in subselects (Item_cache_decimal)
+#
CREATE TABLE t1
(EMPNUM CHAR(3) NOT NULL,
HOURS DECIMAL(5));
--- 1.21/mysql-test/t/type_float.test 2005-07-07 19:47:13 +03:00
+++ 1.22/mysql-test/t/type_float.test 2005-07-28 16:12:37 +03:00
@@ -145,3 +145,5 @@
select * from t1 where reckey=109;
select * from t1 where reckey=1.09E2;
drop table t1;
+
+# End of 4.1 tests
--- 1.12/mysql-test/t/type_ranges.test 2005-04-06 05:45:08 +03:00
+++ 1.13/mysql-test/t/type_ranges.test 2005-07-28 16:12:37 +03:00
@@ -165,3 +165,5 @@
create table t3 select t1.id as id_A, t2.id as id_B from t1 left join t2 using ( id );
select * from t3;
drop table t1,t2,t3;
+
+# End of 4.1 tests
--- 1.25/mysql-test/t/type_timestamp.test 2005-04-20 16:14:43 +03:00
+++ 1.26/mysql-test/t/type_timestamp.test 2005-07-28 16:12:37 +03:00
@@ -321,3 +321,4 @@
select * from t1;
drop table t1;
+# End of 4.1 tests
--- 1.21/mysql-test/t/update.test 2005-07-18 18:37:41 +03:00
+++ 1.22/mysql-test/t/update.test 2005-07-28 16:12:37 +03:00
@@ -214,3 +214,5 @@
UPDATE t1 SET t1.f2=(SELECT MAX(t2.f4) FROM t2 WHERE t2.f3=t1.f1);
select * from t1;
drop table t1,t2;
+
+# End of 4.1 tests
--- 1.42/mysql-test/t/variables.test 2005-07-03 14:17:45 +03:00
+++ 1.43/mysql-test/t/variables.test 2005-07-28 17:09:49 +03:00
@@ -390,6 +390,8 @@
SHOW VARIABLES LIKE 'table_cache';
SET GLOBAL table_cache=DEFAULT;
+# End of 4.1 tests
+
#
# Bug#6282 Packet error with SELECT INTO
#
--- 1.21/mysql-test/t/warnings.test 2005-06-06 21:21:22 +03:00
+++ 1.22/mysql-test/t/warnings.test 2005-07-28 16:12:37 +03:00
@@ -151,3 +151,5 @@
select * from t1 limit 1, 0;
select * from t1 limit 0, 0;
drop table t1;
+
+# End of 4.1 tests
--- 1.13/mysql-test/t/lock.test 2005-05-24 17:41:34 +03:00
+++ 1.14/mysql-test/t/lock.test 2005-07-28 16:12:34 +03:00
@@ -73,3 +73,5 @@
--error 1099
delete t2 from t1,t2 where t1.a=t2.a;
drop table t1,t2;
+
+# End of 4.1 tests
--- 1.44/mysql-test/t/myisam.test 2005-05-18 21:06:31 +03:00
+++ 1.45/mysql-test/t/myisam.test 2005-07-28 16:12:34 +03:00
@@ -675,3 +675,4 @@
drop table t1;
+# End of 4.1 tests
--- 1.22/mysql-test/t/ctype_latin1_de.test 2005-05-05 19:13:07 +03:00
+++ 1.23/mysql-test/t/ctype_latin1_de.test 2005-07-28 17:09:48 +03:00
@@ -133,6 +133,8 @@
DROP TABLE t1;
+# End of 4.1 tests
+
#
# Bug#9509
#
--- 1.7/mysql-test/t/func_concat.test 2005-01-03 23:04:46 +02:00
+++ 1.8/mysql-test/t/func_concat.test 2005-07-28 16:12:33 +03:00
@@ -52,3 +52,4 @@
--replace_result a-0.0000 a0.0000
select 'a' union select concat('a', -0.0000);
+# End of 4.1 tests
--- 1.13/mysql-test/t/grant_cache.test 2005-05-18 23:51:22 +03:00
+++ 1.14/mysql-test/t/grant_cache.test 2005-07-28 16:12:34 +03:00
@@ -149,3 +149,5 @@
drop database mysqltest;
set GLOBAL query_cache_size=default;
+
+# End of 4.1 tests
--- 1.9/mysql-test/t/lock_multi.test 2005-06-03 16:29:01 +03:00
+++ 1.10/mysql-test/t/lock_multi.test 2005-07-28 17:09:48 +03:00
@@ -95,10 +95,11 @@
connection locker;
drop table t1;
+# End of 4.1 tests
#
# BUG#9998 - MySQL client hangs on USE "database"
-
+#
create table t1(a int);
lock tables t1 write;
connection reader;
--- 1.43/mysql-test/t/query_cache.test 2005-07-23 07:55:03 +03:00
+++ 1.44/mysql-test/t/query_cache.test 2005-07-28 16:12:35 +03:00
@@ -876,3 +876,5 @@
drop procedure f1;
drop table t1;
set GLOBAL query_cache_size=0;
+
+# End of 4.1 tests
--- 1.15/mysql-test/t/symlink.test 2005-03-04 00:44:35 +02:00
+++ 1.16/mysql-test/t/symlink.test 2005-07-28 16:12:37 +03:00
@@ -136,3 +136,5 @@
enable_query_log;
show create table t1;
drop table t1;
+
+# End of 4.1 tests
--- 1.7/mysql-test/t/bool.test 2004-11-27 21:26:35 +02:00
+++ 1.8/mysql-test/t/bool.test 2005-07-28 16:12:32 +03:00
@@ -58,3 +58,5 @@
select ifnull(A=1, 'N') as A, ifnull(B=1, 'N') as B, ifnull(not (A=1), 'N') as nA, ifnull(not (B=1), 'N') as nB, ifnull((A=1) and (B=1), 'N') as AB, ifnull(not ((A=1) and (B=1)), 'N') as `n(AB)`, ifnull((not (A=1) or not (B=1)), 'N') as nAonB, ifnull((A=1) or (B=1), 'N') as AoB, ifnull(not((A=1) or (B=1)), 'N') as `n(AoB)`, ifnull(not (A=1) and not (B=1), 'N') as nAnB from t1;
drop table t1;
+
+# End of 4.1 tests
--- 1.21/mysql-test/t/cast.test 2005-06-15 18:38:54 +03:00
+++ 1.22/mysql-test/t/cast.test 2005-07-28 17:09:48 +03:00
@@ -156,6 +156,9 @@
select cast(repeat('1',20) as unsigned);
select cast(repeat('1',20) as signed);
+# End of 4.1 tests
+
+
#decimal-related additions
select cast('1.2' as decimal(3,2));
select 1e18 * cast('1.2' as decimal(3,2));
--- 1.31/mysql-test/t/grant.test 2005-07-06 01:23:10 +03:00
+++ 1.32/mysql-test/t/grant.test 2005-07-28 16:12:34 +03:00
@@ -479,3 +479,5 @@
flush privileges;
delete from tables_priv where host = '' and user = 'mysqltest_1';
flush privileges;
+
+# End of 4.1 tests
--- 1.18/mysql-test/t/lowercase_table.test 2005-05-24 01:31:26 +03:00
+++ 1.19/mysql-test/t/lowercase_table.test 2005-07-28 16:12:34 +03:00
@@ -94,3 +94,4 @@
--error 1049
use prn;
+# End of 4.1 tests
--- 1.9/mysql-test/t/rpl_flush_log_loop.test 2004-04-07 16:12:39 +03:00
+++ 1.10/mysql-test/t/rpl_flush_log_loop.test 2005-07-28 16:12:36 +03:00
@@ -20,3 +20,5 @@
--replace_result $SLAVE_MYPORT SLAVE_PORT
--replace_column 1 # 8 # 9 # 23 # 33 #
show slave status;
+
+# End of 4.1 tests
--- 1.16/mysql-test/t/rpl_loaddata.test 2005-03-25 15:51:04 +02:00
+++ 1.17/mysql-test/t/rpl_loaddata.test 2005-07-28 16:12:36 +03:00
@@ -149,3 +149,5 @@
drop table t2;
connection master;
drop table t2;
+
+# End of 4.1 tests
--- 1.4/mysql-test/t/endspace.test 2004-12-06 18:04:37 +02:00
+++ 1.5/mysql-test/t/endspace.test 2005-07-28 16:12:33 +03:00
@@ -94,3 +94,5 @@
select text1, length(text1) from t1 where text1='teststring' or text1 >= 'teststring\t';
select concat('|', text1, '|') from t1 order by text1;
drop table t1;
+
+# End of 4.1 tests
--- 1.7/mysql-test/t/lowercase_table3.test 2005-02-14 17:23:05 +02:00
+++ 1.8/mysql-test/t/lowercase_table3.test 2005-07-28 16:12:34 +03:00
@@ -35,3 +35,5 @@
--error 1146
SELECT * from T1;
drop table t1;
+
+# End of 4.1 tests
--- 1.9/mysql-test/t/loaddata.test 2005-03-16 11:13:29 +02:00
+++ 1.10/mysql-test/t/loaddata.test 2005-07-28 17:09:48 +03:00
@@ -31,6 +31,8 @@
select * from t1;
drop table t1;
+# End of 4.1 tests
+
#
# Let us test extended LOAD DATA features
#
--- 1.4/mysql-test/t/rpl_loaddatalocal.test 2005-03-16 03:32:41 +02:00
+++ 1.5/mysql-test/t/rpl_loaddatalocal.test 2005-07-28 17:09:48 +03:00
@@ -35,6 +35,8 @@
connection slave;
sync_with_master;
+# End of 4.1 tests
+
#
# Now let us test how well we replicate LOAD DATA LOCAL in situation when
# we met duplicates in tables to which we are adding rows.
--- 1.78/mysql-test/t/func_str.test 2005-07-22 22:32:27 +03:00
+++ 1.79/mysql-test/t/func_str.test 2005-07-28 16:12:33 +03:00
@@ -624,3 +624,5 @@
select rpad(i, 7, ' ') as t from t1;
--disable_metadata
drop table t1;
+
+# End of 4.1 tests
--- 1.14/mysql-test/t/func_if.test 2005-06-14 11:35:48 +03:00
+++ 1.15/mysql-test/t/func_if.test 2005-07-28 16:12:33 +03:00
@@ -87,3 +87,5 @@
SELECT a, NULLIF(a,'') FROM t1 WHERE NULLIF(a,'') IS NULL;
DROP TABLE t1;
+
+# End of 4.1 tests
--- 1.4/mysql-test/t/ndb_update.test 2005-04-21 11:26:10 +03:00
+++ 1.5/mysql-test/t/ndb_update.test 2005-07-28 16:12:35 +03:00
@@ -32,3 +32,5 @@
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings
+
+# End of 4.1 tests
--- 1.9/mysql-test/t/rpl_empty_master_crash.test 2004-04-07 16:12:39 +03:00
+++ 1.10/mysql-test/t/rpl_empty_master_crash.test 2005-07-28 16:12:36 +03:00
@@ -11,3 +11,5 @@
connection slave;
--error 1188
load table t1 from master;
+
+# End of 4.1 tests
--- 1.6/mysql-test/t/ndb_charset.test 2005-04-21 11:24:37 +03:00
+++ 1.7/mysql-test/t/ndb_charset.test 2005-07-28 16:12:35 +03:00
@@ -246,3 +246,5 @@
replace into t1 values ('jonas % ');
select * from t1;
drop table t1;
+
+# End of 4.1 tests
--- 1.12/mysql-test/t/connect.test 2005-04-02 06:02:07 +03:00
+++ 1.13/mysql-test/t/connect.test 2005-07-28 16:12:32 +03:00
@@ -76,3 +76,5 @@
delete from mysql.user where user=_binary"test";
flush privileges;
+
+# End of 4.1 tests
--- 1.52/mysql-test/t/mysqldump.test 2005-07-22 05:11:21 +03:00
+++ 1.53/mysql-test/t/mysqldump.test 2005-07-28 17:09:48 +03:00
@@ -4,7 +4,6 @@
--disable_warnings
DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa;
drop database if exists mysqldump_test_db;
-drop database if exists db1;
drop view if exists v1, v2, v3;
--enable_warnings
@@ -135,15 +134,6 @@
drop table t1;
#
-# dump of view
-#
-create table t1(a int);
-create view v1 as select * from t1;
---exec $MYSQL_DUMP --skip-comments test
-drop view v1;
-drop table t1;
-
-#
# Bug #6101: create database problem
#
@@ -198,15 +188,6 @@
DROP TABLE t1;
#
-# Bug #9756
-#
-
-CREATE TABLE t1 (a char(10));
-INSERT INTO t1 VALUES ('\'');
---exec $MYSQL_DUMP --skip-comments test t1
-DROP TABLE t1;
-
-#
# Test for --insert-ignore
#
@@ -565,29 +546,6 @@
--exec $MYSQL_DUMP --add-drop-database --skip-comments --databases test
DROP TABLE t1;
-
-#
-# Bug #10213 mysqldump crashes when dumping VIEWs(on MacOS X)
-#
-
-create database db1;
-use db1;
-
-CREATE TABLE t2 (
- a varchar(30) default NULL,
- KEY a (a(5))
-);
-
-INSERT INTO t2 VALUES ('alfred');
-INSERT INTO t2 VALUES ('angie');
-INSERT INTO t2 VALUES ('bingo');
-INSERT INTO t2 VALUES ('waffle');
-INSERT INTO t2 VALUES ('lemon');
-create view v2 as select * from t2 where a like 'a%' with check option;
---exec $MYSQL_DUMP --skip-comments db1
-drop table t2;
-drop view v2;
-drop database db1;
#
# Bug #9558 mysqldump --no-data db t1 t2 format still dumps data
#
@@ -678,6 +636,50 @@
insert into t2 (a, b) values (NULL, NULL),(10, NULL),(NULL, "twenty"),(30, "thirty");
--exec $MYSQL_DUMP --skip-comments --xml --no-create-info test
drop table t1, t2;
+
+# End of 4.1 tests
+
+#
+# dump of view
+#
+create table t1(a int);
+create view v1 as select * from t1;
+--exec $MYSQL_DUMP --skip-comments test
+drop view v1;
+drop table t1;
+
+#
+# Bug #10213 mysqldump crashes when dumping VIEWs(on MacOS X)
+#
+
+create database mysqldump_test_db;
+use mysqldump_test_db;
+
+CREATE TABLE t2 (
+ a varchar(30) default NULL,
+ KEY a (a(5))
+);
+
+INSERT INTO t2 VALUES ('alfred');
+INSERT INTO t2 VALUES ('angie');
+INSERT INTO t2 VALUES ('bingo');
+INSERT INTO t2 VALUES ('waffle');
+INSERT INTO t2 VALUES ('lemon');
+create view v2 as select * from t2 where a like 'a%' with check option;
+--exec $MYSQL_DUMP --skip-comments mysqldump_test_db
+drop table t2;
+drop view v2;
+drop database mysqldump_test_db;
+use test;
+
+#
+# Bug #9756
+#
+
+CREATE TABLE t1 (a char(10));
+INSERT INTO t1 VALUES ('\'');
+--exec $MYSQL_DUMP --skip-comments test t1
+DROP TABLE t1;
#
# Bug #10927 mysqldump: Can't reload dump with view that consist of other view
--- 1.11/mysql-test/t/gis-rtree.test 2005-04-29 18:21:56 +03:00
+++ 1.12/mysql-test/t/gis-rtree.test 2005-07-28 16:12:33 +03:00
@@ -171,3 +171,5 @@
--error 1416
INSERT INTO t2 SELECT GeomFromText(st) FROM t1;
drop table t1, t2;
+
+# End of 4.1 tests
--- 1.18/mysql-test/t/gis.test 2005-04-29 18:21:56 +03:00
+++ 1.19/mysql-test/t/gis.test 2005-07-28 16:12:34 +03:00
@@ -371,3 +371,5 @@
insert into t1 values (pointfromtext('point(1,1)'));
drop table t1;
+
+# End of 4.1 tests
--- 1.205/BitKeeper/etc/ignore 2005-07-19 23:01:40 +03:00
+++ 1.206/BitKeeper/etc/ignore 2005-07-28 16:11:56 +03:00
@@ -357,6 +357,7 @@
innobase/conftest.subs
innobase/ib_config.h
innobase/ib_config.h.in
+innobase/mkinstalldirs
innobase/stamp-h1
insert_test
install
@@ -537,6 +538,7 @@
mit-pthreads/pg++
mit-pthreads/pgcc
mit-pthreads/syscall.S
+mkinstalldirs
myisam/FT1.MYD
myisam/FT1.MYI
myisam/ft_dump
@@ -639,6 +641,7 @@
mysql-test/share/mysql
mysql-test/std_data/*.pem
mysql-test/t/index_merge.load
+mysql-test/var
mysql-test/var/*
mysql.kdevprj
mysql.proj
@@ -793,6 +796,7 @@
ndb/src/common/transporter/libtransporter.dsp
ndb/src/common/util/libgeneral.dsp
ndb/src/cw/cpcd/ndb_cpcd
+ndb/src/dummy.cpp
ndb/src/kernel/blocks/backup/libbackup.dsp
ndb/src/kernel/blocks/backup/restore/ndb_restore
ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp
@@ -879,6 +883,7 @@
ndb/test/tools/ndb_cpcc
ndb/test/tools/restart
ndb/test/tools/verify_index
+ndb/tools/ndb_config
ndb/tools/ndb_delete_all
ndb/tools/ndb_delete_all.dsp
ndb/tools/ndb_desc
@@ -1116,7 +1121,3 @@
vio/test-sslclient
vio/test-sslserver
vio/viotest-ssl
-ndb/src/dummy.cpp
-innobase/mkinstalldirs
-mkinstalldirs
-mysql-test/var
--- 1.38/mysql-test/t/rpl000001.test 2005-03-02 18:52:26 +02:00
+++ 1.39/mysql-test/t/rpl000001.test 2005-07-28 16:12:35 +03:00
@@ -126,3 +126,5 @@
save_master_pos;
connection slave;
sync_with_master;
+
+# End of 4.1 tests
--- 1.20/mysql-test/t/rpl_replicate_do.test 2003-12-19 23:29:09 +02:00
+++ 1.21/mysql-test/t/rpl_replicate_do.test 2005-07-28 16:12:37 +03:00
@@ -36,3 +36,4 @@
--replace_column 1 # 8 # 9 # 23 # 33 #
show slave status;
+# End of 4.1 tests
--- 1.14/mysql-test/t/backup.test 2005-02-24 23:33:37 +02:00
+++ 1.15/mysql-test/t/backup.test 2005-07-28 16:12:32 +03:00
@@ -52,3 +52,5 @@
connection con1;
reap;
drop table t5;
+
+# End of 4.1 tests
--- 1.8/mysql-test/t/check.test 2005-05-07 15:17:49 +03:00
+++ 1.9/mysql-test/t/check.test 2005-07-28 17:09:48 +03:00
@@ -22,6 +22,8 @@
reap;
drop table t1;
+# End of 4.1 tests
+
#
# Bug #9897 Views: 'Check Table' crashes MySQL, with a view and a table
# in the statement
--- 1.9/mysql-test/t/count_distinct2.test 2005-03-15 15:54:07 +02:00
+++ 1.10/mysql-test/t/count_distinct2.test 2005-07-28 16:12:32 +03:00
@@ -79,3 +79,4 @@
show status like 'Created_tmp_disk_tables';
drop table t1;
+# End of 4.1 tests
--- 1.19/mysql-test/t/drop.test 2005-04-03 09:16:22 +03:00
+++ 1.20/mysql-test/t/drop.test 2005-07-28 16:12:32 +03:00
@@ -79,3 +79,5 @@
create table t1(n int);
show tables;
drop table t1;
+
+# End of 4.1 tests
--- 1.15/mysql-test/t/flush.test 2005-03-16 09:40:10 +02:00
+++ 1.16/mysql-test/t/flush.test 2005-07-28 16:12:33 +03:00
@@ -69,3 +69,5 @@
insert into t1 values (345);
select * from t1;
drop table t1;
+
+# End of 4.1 tests
--- 1.13/mysql-test/t/kill.test 2005-04-13 17:06:29 +03:00
+++ 1.14/mysql-test/t/kill.test 2005-07-28 17:09:48 +03:00
@@ -39,6 +39,8 @@
select 4;
drop table t1;
+# End of 4.1 tests
+
#
# test of blocking of sending ERROR after OK or EOF
#
--- 1.47/mysql-test/t/multi_update.test 2005-04-04 22:43:54 +03:00
+++ 1.48/mysql-test/t/multi_update.test 2005-07-28 17:09:48 +03:00
@@ -452,6 +452,8 @@
delete t2, t1 from t2 left join t1 on (t2.aclid=t1.aclid) where t2.refid='1';
drop table t1, t2;
+# End of 4.1 tests
+
#
# Test for bug #1980.
#
--- 1.33/mysql-test/t/rpl_log_pos.test 2005-03-16 03:32:41 +02:00
+++ 1.34/mysql-test/t/rpl_log_pos.test 2005-07-28 16:12:36 +03:00
@@ -45,3 +45,5 @@
connection master;
drop table t1;
sync_slave_with_master;
+
+# End of 4.1 tests
--- 1.30/mysql-test/t/rpl000015.test 2004-11-22 21:54:42 +02:00
+++ 1.31/mysql-test/t/rpl000015.test 2005-07-28 16:12:35 +03:00
@@ -37,3 +37,5 @@
connection master;
drop table t1;
sync_slave_with_master;
+
+# End of 4.1 tests
--- 1.60/mysql-test/t/rpl_rotate_logs.test 2005-02-25 17:03:22 +02:00
+++ 1.61/mysql-test/t/rpl_rotate_logs.test 2005-07-28 17:09:48 +03:00
@@ -153,3 +153,4 @@
drop table if exists t1,t2,t3,t4;
sync_slave_with_master;
+# End of 4.1 tests
--- 1.12/mysql-test/t/rpl000017.test 2004-07-15 04:18:50 +03:00
+++ 1.13/mysql-test/t/rpl000017.test 2005-07-28 16:12:35 +03:00
@@ -17,3 +17,5 @@
connection master;
drop table t1;
sync_slave_with_master;
+
+# End of 4.1 tests
--- 1.11/mysql-test/t/rpl000018.test 2004-07-15 04:18:50 +03:00
+++ 1.12/mysql-test/t/rpl000018.test 2005-07-28 16:12:35 +03:00
@@ -25,3 +25,5 @@
connection master;
drop table t1;
sync_slave_with_master;
+
+# End of 4.1 tests
--- 1.12/mysql-test/t/rpl_get_lock.test 2005-03-02 18:52:26 +02:00
+++ 1.13/mysql-test/t/rpl_get_lock.test 2005-07-28 16:12:36 +03:00
@@ -39,3 +39,5 @@
save_master_pos;
connection slave;
sync_with_master;
+
+# End of 4.1 tests
--- 1.25/mysql-test/t/rpl_log.test 2005-03-16 03:32:41 +02:00
+++ 1.26/mysql-test/t/rpl_log.test 2005-07-28 16:12:36 +03:00
@@ -108,3 +108,5 @@
--error 1220
show binlog events in 'slave-bin.000005' from 4;
+
+# End of 4.1 tests
--- 1.11/mysql-test/t/rpl_redirect.test 2004-10-29 19:26:40 +03:00
+++ 1.12/mysql-test/t/rpl_redirect.test 2005-07-28 16:12:36 +03:00
@@ -41,3 +41,5 @@
drop table t1;
connection master;
drop table t1;
+
+# End of 4.1 tests
--- 1.29/mysql-test/t/user_var.test 2005-05-18 10:46:45 +03:00
+++ 1.30/mysql-test/t/user_var.test 2005-07-28 17:09:48 +03:00
@@ -121,6 +121,8 @@
--error 1382
set one_shot @honk=99;
+# End of 4.1 tests
+
#
# Bug #6598: problem with cast(NULL as signed integer);
#
--- 1.24/mysql-test/t/grant2.test 2005-04-02 06:02:07 +03:00
+++ 1.25/mysql-test/t/grant2.test 2005-07-28 16:12:34 +03:00
@@ -312,3 +312,5 @@
REVOKE ALL ON mysqltest_1.t1 FROM mysqltest_1@'127.0.0.0/255.0.0.0';
drop table mysqltest_1.t1;
drop database mysqltest_1;
+
+# End of 4.1 tests
--- 1.17/mysql-test/t/fulltext_order_by.test 2005-07-14 18:52:18 +03:00
+++ 1.18/mysql-test/t/fulltext_order_by.test 2005-07-28 16:12:33 +03:00
@@ -137,3 +137,4 @@
drop table t1,t2,t3;
+# End of 4.1 tests
--- 1.15/mysql-test/t/insert_update.test 2005-07-03 14:17:45 +03:00
+++ 1.16/mysql-test/t/insert_update.test 2005-07-28 16:12:34 +03:00
@@ -100,3 +100,5 @@
--error 1052
insert ignore into t1 select a from t1 on duplicate key update a=t1.a+1 ;
drop table t1;
+
+# End of 4.1 tests
--- 1.51/mysql-test/t/ps.test 2005-07-16 12:45:23 +03:00
+++ 1.52/mysql-test/t/ps.test 2005-07-28 16:12:35 +03:00
@@ -828,3 +828,5 @@
set @@tx_isolation=default;
execute stmt;
deallocate prepare stmt;
+
+# End of 4.1 tests
--- 1.44/mysql-test/t/bdb.test 2005-03-17 01:22:08 +02:00
+++ 1.45/mysql-test/t/bdb.test 2005-07-28 17:09:48 +03:00
@@ -937,6 +937,8 @@
SELECT id FROM t1 WHERE (list_id = 1) AND (term = "letterd");
DROP TABLE t1;
+# End of 4.1 tests
+
#
# alter temp table
#
--- 1.11/mysql-test/t/replace.test 2005-04-05 14:17:39 +03:00
+++ 1.12/mysql-test/t/replace.test 2005-07-28 16:12:35 +03:00
@@ -33,3 +33,5 @@
replace into t1 values (63,default);
select * from t1;
drop table t1;
+
+# End of 4.1 tests
--- 1.4/mysql-test/t/ndb_grant.later 2004-11-30 19:58:13 +02:00
+++ 1.5/mysql-test/t/ndb_grant.later 2005-07-28 16:12:35 +03:00
@@ -381,3 +381,5 @@
alter table user engine=myisam;
use test;
flush privileges;
+
+# End of 4.1 tests
--- 1.8/mysql-test/t/ndb_restore.test 2005-05-24 17:49:59 +03:00
+++ 1.9/mysql-test/t/ndb_restore.test 2005-07-28 16:12:35 +03:00
@@ -215,3 +215,5 @@
#
--exec $NDB_TOOLS_DIR/ndb_select_all --no-defaults -d sys -D , SYSTAB_0 | grep 520093696
+
+# End of 4.1 tests
--- 1.4/mysql-test/t/ndb_subquery.test 2005-06-09 16:39:10 +03:00
+++ 1.5/mysql-test/t/ndb_subquery.test 2005-07-28 17:09:48 +03:00
@@ -38,8 +38,11 @@
# bug#5367
##########
-###
+# End of 4.1 tests
+
+#
# bug#11205
+#
create table t1 (p int not null primary key, u int not null) engine=ndb;
insert into t1 values (1,1),(2,2),(3,3);
--- 1.9/mysql-test/t/openssl_1.test 2005-03-31 22:03:23 +03:00
+++ 1.10/mysql-test/t/openssl_1.test 2005-07-28 16:12:35 +03:00
@@ -43,3 +43,5 @@
delete from mysql.db where user='ssl_user%';
flush privileges;
drop table t1;
+
+# End of 4.1 tests
--- 1.11/mysql-test/t/func_compress.test 2005-01-12 03:38:47 +02:00
+++ 1.12/mysql-test/t/func_compress.test 2005-07-28 16:12:33 +03:00
@@ -47,3 +47,4 @@
--replace_result "''" XXX "'1'" XXX
eval select compress(repeat('aaaaaaaaaa', IF('$LOW_MEMORY', 10, 10000000))) is null;
+# End of 4.1 tests
--- 1.14/mysql-test/t/rpl_temporary.test 2005-03-16 03:32:41 +02:00
+++ 1.15/mysql-test/t/rpl_temporary.test 2005-07-28 16:12:37 +03:00
@@ -130,3 +130,5 @@
sync_with_master;
# The server will now close done
+
+# End of 4.1 tests
--- 1.5/mysql-test/t/synchronization.test 2005-01-03 21:04:28 +02:00
+++ 1.6/mysql-test/t/synchronization.test 2005-07-28 16:12:37 +03:00
@@ -36,3 +36,5 @@
dec $1;
}
DROP TABLE t1;
+
+# End of 4.1 tests
--- 1.5/mysql-test/t/system_mysql_db.test 2005-01-03 21:04:28 +02:00
+++ 1.6/mysql-test/t/system_mysql_db.test 2005-07-28 16:12:37 +03:00
@@ -16,3 +16,5 @@
-- enable_query_log
# keep results same with system_mysql_db_fix
show tables;
+
+# End of 4.1 tests
--- 1.13/mysql-test/t/system_mysql_db_fix.test 2005-04-02 06:02:07 +03:00
+++ 1.14/mysql-test/t/system_mysql_db_fix.test 2005-07-28 16:12:37 +03:00
@@ -91,3 +91,5 @@
# check that we droped all system tables
show tables;
+
+# End of 4.1 tests
--- 1.29/mysql-test/t/func_gconcat.test 2005-07-26 11:14:27 +03:00
+++ 1.30/mysql-test/t/func_gconcat.test 2005-07-28 17:09:48 +03:00
@@ -310,6 +310,8 @@
select a, group_concat(distinct b order by b) from t1 group by a with rollup;
drop table t1;
+# End of 4.1 tests
+
#
# Bug #6475
#
| Thread |
|---|
| • bk commit into 5.0 tree (monty:1.1912) | monty | 28 Jul |
