diff options
| author | mronstrom@mysql.com <> | 2005-06-01 17:40:00 +0200 |
|---|---|---|
| committer | mronstrom@mysql.com <> | 2005-06-01 17:40:00 +0200 |
| commit | e6f01bf6479156c24560a2f8c589c2671a5e1848 (patch) | |
| tree | 55e89926912f024007b6d47426d9eed5826e86e2 /mysql-test | |
| parent | f711a3d7c194e9e416009fe95b5fc700d7340dad (diff) | |
| parent | 5b54fcab6ad8e1b0cb154c69d653eb33f8af2f4d (diff) | |
| download | mariadb-git-e6f01bf6479156c24560a2f8c589c2671a5e1848.tar.gz | |
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/mikron/bug10837
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/default.result (renamed from mysql-test/r/bugs.result) | 0 | ||||
| -rw-r--r-- | mysql-test/t/default.test (renamed from mysql-test/t/bugs.test) | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/bugs.result b/mysql-test/r/default.result index 7db20c2b096..7db20c2b096 100644 --- a/mysql-test/r/bugs.result +++ b/mysql-test/r/default.result diff --git a/mysql-test/t/bugs.test b/mysql-test/t/default.test index 3b842c06561..42620a27b66 100644 --- a/mysql-test/t/bugs.test +++ b/mysql-test/t/default.test @@ -4,7 +4,6 @@ --disable_warnings drop table if exists t1,t2,t3,t4,t5,t6; drop database if exists mysqltest; ---enable_warnings # # Bug 10838 @@ -39,6 +38,7 @@ CREATE TABLE t1 (a varchar(30) binary NOT NULL DEFAULT ' ', a1 varchar(30) binary NOT NULL DEFAULT ' ', b1 tinyblob NULL) ENGINE=InnoDB DEFAULT CHARACTER SET = latin1 COLLATE latin1_bin; +--enable_warnings SHOW CREATE TABLE t1; INSERT into t1 (b) values ('1'); |