diff options
author | unknown <monty@narttu.mysql.fi> | 2006-11-30 23:27:16 +0200 |
---|---|---|
committer | unknown <monty@narttu.mysql.fi> | 2006-11-30 23:27:16 +0200 |
commit | 9b1336fec9072cab46ab237c0f94c85808b52be4 (patch) | |
tree | 5ce45a92708629c661c7e1815428098713fb496c /mysql-test/t | |
parent | f8d8b3db916d71697a6d5f00eba4f0da6f522959 (diff) | |
parent | e0aeba21a5b58038d38c92f750c1684ccb2a72d4 (diff) | |
download | mariadb-git-9b1336fec9072cab46ab237c0f94c85808b52be4.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
configure.in:
Auto merged
include/my_pthread.h:
Auto merged
libmysql/libmysql.c:
Auto merged
server-tools/instance-manager/guardian.cc:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
storage/archive/ha_archive.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
sql/item_create.cc:
manual merge
Diffstat (limited to 'mysql-test/t')
-rw-r--r-- | mysql-test/t/flush_read_lock_kill-master.opt | 2 | ||||
-rw-r--r-- | mysql-test/t/type_bit.test | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/mysql-test/t/flush_read_lock_kill-master.opt b/mysql-test/t/flush_read_lock_kill-master.opt index 2b2b5eb5ebf..61e2b242351 100644 --- a/mysql-test/t/flush_read_lock_kill-master.opt +++ b/mysql-test/t/flush_read_lock_kill-master.opt @@ -1 +1 @@ ---loose-debug=d,make_global_read_lock_block_commit_loop +--loose-debug=+d,make_global_read_lock_block_commit_loop diff --git a/mysql-test/t/type_bit.test b/mysql-test/t/type_bit.test index d46ba667665..48ad24ff6b7 100644 --- a/mysql-test/t/type_bit.test +++ b/mysql-test/t/type_bit.test @@ -261,4 +261,15 @@ insert into t1 (b, a) values ('2', '1'); select hex(a), b from t1; drop table t1; +# +# type was not properly initalized, which caused key_copy to fail +# + +create table t1(bit_field bit(2), int_field int, key a(bit_field)); +insert into t1 values (1,2); +handler t1 open as t1; +handler t1 read a=(1); +handler t1 close; +drop table t1; + --echo End of 5.0 tests |