diff options
| author | unknown <serg@serg.mylan> | 2005-02-17 14:00:44 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-02-17 14:00:44 +0100 |
| commit | 7aa1d93fd480dfa0a416a85284a4fd62cc0c9b88 (patch) | |
| tree | 2286825455d6ff56f96a8bcd52bbb6737ebcd354 /mysql-test/t/strict.test | |
| parent | d6541adb37068d6545fd6f871e4dd63fa8b1e90a (diff) | |
| parent | c5c497164fbc48bcc50770ced833a07788082aaf (diff) | |
| download | mariadb-git-7aa1d93fd480dfa0a416a85284a4fd62cc0c9b88.tar.gz | |
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/strict.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test/t/strict.test')
| -rw-r--r-- | mysql-test/t/strict.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/strict.test b/mysql-test/t/strict.test index 7da07f267b2..d8833f6f914 100644 --- a/mysql-test/t/strict.test +++ b/mysql-test/t/strict.test @@ -866,12 +866,12 @@ DROP TABLE t1; CREATE TABLE t1 (col1 CHAR(5), col2 VARCHAR(6)); INSERT INTO t1 VALUES ('hello', 'hello'),('he', 'he'),('hello ', 'hello '); ---error 1400 +--error 1406 INSERT INTO t1 (col1) VALUES ('hellobob'); --error 1265 INSERT INTO t1 (col2) VALUES ('hellobob'); INSERT INTO t1 (col2) VALUES ('hello '); ---error 1400 +--error 1406 UPDATE t1 SET col1 ='hellobob' WHERE col1 ='he'; --error 1265 UPDATE t1 SET col2 ='hellobob' WHERE col2 ='he'; |