diff options
author | unknown <sergefp@mysql.com> | 2005-08-10 21:17:52 +0000 |
---|---|---|
committer | unknown <sergefp@mysql.com> | 2005-08-10 21:17:52 +0000 |
commit | 42fec6b68be70f65553db40c853134bee5aa7eb6 (patch) | |
tree | 7cf1a45d0722c48c30871c34d564241d5bf84dad /mysql-test/t/type_bit.test | |
parent | 6861b1bf9b804f1dd8490355bb2dc1628a04bf36 (diff) | |
parent | 6b9ec78be00d37b91d4de8564bc0103d83ddfb26 (diff) | |
download | mariadb-git-42fec6b68be70f65553db40c853134bee5aa7eb6.tar.gz |
Merge mysql.com:/home/psergey/mysql-5.0-bug12228-r4
into mysql.com:/home/psergey/mysql-5.0-bug12228-r5
mysql-test/r/type_bit.result:
Auto merged
mysql-test/t/sp-threads.test:
Auto merged
mysql-test/t/type_bit.test:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/type_bit.test')
-rw-r--r-- | mysql-test/t/type_bit.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/type_bit.test b/mysql-test/t/type_bit.test index 005a2c78a14..6906cfc2808 100644 --- a/mysql-test/t/type_bit.test +++ b/mysql-test/t/type_bit.test @@ -16,7 +16,7 @@ select 0 + b'1111111111111111'; select 0 + b'1000000000000001'; --disable_warnings -drop table if exists t1; +drop table if exists t1,t2; --enable_warnings --error 1439 |