after-merge fix

5ac378ba · ramil@mysql.com · e43dff67 · 5ac378ba
Commit 5ac378ba authored Jul 27, 2005 by ramil@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

mysql-test/r/strict.result mysql-test/r/strict.result +1 -0

No files found.
--- a/mysql-test/r/strict.result
+++ b/mysql-test/r/strict.result
@@ -1279,6 +1279,7 @@ t1	CREATE TABLE `t1` (
  PRIMARY KEY  (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
+set @@sql_mode='traditional';
 create table t1(a bit(2));
 insert into t1 values(b'101');
 ERROR 22001: Data too long for column 'a' at row 1