diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-12 23:07:32 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-12 23:07:32 +0200 |
| commit | 7da16844ea2591d84d72d7b2012ba80a2ea6f9a7 (patch) | |
| tree | 4220ed6a8a349252c9e1b94f3be3f206107e92d2 /mysql-test | |
| parent | 8367241d5a6aa3434846022ed8e0ac82901668b6 (diff) | |
| download | mariadb-git-7da16844ea2591d84d72d7b2012ba80a2ea6f9a7.tar.gz | |
fix the maria suite
sql/handler.h:
not "unused"
sql/sql_table.cc:
move this check where it is in 10.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/maria/maria-ucs2.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/maria/maria3.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/maria/maria3.test | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/suite/maria/maria-ucs2.result b/mysql-test/suite/maria/maria-ucs2.result index e7258f21d4f..fab640f703a 100644 --- a/mysql-test/suite/maria/maria-ucs2.result +++ b/mysql-test/suite/maria/maria-ucs2.result @@ -17,7 +17,6 @@ test.t1 check status OK ALTER TABLE t1 MODIFY a VARCHAR(800) CHARSET `ucs2`; Warnings: Warning 1071 Specified key was too long; max key length is 1000 bytes -Warning 1071 Specified key was too long; max key length is 1000 bytes CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check status OK diff --git a/mysql-test/suite/maria/maria3.result b/mysql-test/suite/maria/maria3.result index 27d72b75930..84ba81aae4d 100644 --- a/mysql-test/suite/maria/maria3.result +++ b/mysql-test/suite/maria/maria3.result @@ -460,7 +460,7 @@ id f1 1 test1 2 test2 drop table t1; -SET SQL_MODE = 'TRADITIONAL'; +SET SQL_MODE = ''; create table t1 (n int not null primary key auto_increment, c char(1), unique(c)); insert into t1 values(100, "a"); insert into t1 values(300, "b"); diff --git a/mysql-test/suite/maria/maria3.test b/mysql-test/suite/maria/maria3.test index f1d95a15ba5..b4e3e30d63f 100644 --- a/mysql-test/suite/maria/maria3.test +++ b/mysql-test/suite/maria/maria3.test @@ -364,7 +364,7 @@ INSERT IGNORE INTO t1 (f1) VALUES ("test1"); INSERT IGNORE INTO t1 (f1) VALUES ("test2"); SELECT * FROM t1; drop table t1; -SET SQL_MODE = 'TRADITIONAL'; +SET SQL_MODE = ''; create table t1 (n int not null primary key auto_increment, c char(1), unique(c)); insert into t1 values(100, "a"); |