summaryrefslogtreecommitdiff
path: root/mysql-test/t/myisam.test
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2017-01-18 11:44:47 -0500
committerNirbhay Choubey <nirbhay@mariadb.com>2017-01-18 11:44:47 -0500
commita3a91332d006fd39a32e1f6d4663e11515ea944b (patch)
tree560c152c9f8146a4c1bcd52ad2a2fa454be48aec /mysql-test/t/myisam.test
parent2805baf06c31dac21604148ec089300461790e3d (diff)
downloadmariadb-git-a3a91332d006fd39a32e1f6d4663e11515ea944b.tar.gz
MDEV-7635: Update tests to adapt to the new default sql_modebb-10.2-mdev7635.savedbb-10.2-mdev7635.final
Diffstat (limited to 'mysql-test/t/myisam.test')
-rw-r--r--mysql-test/t/myisam.test10
1 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
index dac19c1d395..c47494cb13b 100644
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test
@@ -42,7 +42,7 @@ begin;
SET SQL_WARNINGS=0;
while ($1)
{
- eval insert into t1 (b) values(repeat(char(65+$1),65550-$1));
+ eval insert ignore into t1 (b) values(repeat(char(65+$1),65550-$1));
dec $1;
}
commit;
@@ -313,6 +313,7 @@ drop table t1;
#
# Test of REPAIR that once failed
#
+SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
CREATE TABLE `t1` (
`post_id` mediumint(8) unsigned NOT NULL auto_increment,
`topic_id` mediumint(8) unsigned NOT NULL default '0',
@@ -330,8 +331,9 @@ CREATE TABLE `t1` (
KEY `topic_id` (`topic_id`),
FULLTEXT KEY `post_text` (`post_text`)
) ENGINE=MyISAM;
+SET sql_mode = DEFAULT;
-INSERT INTO t1 (post_text) VALUES ('ceci est un test'),('ceci est un test'),('ceci est un test'),('ceci est un test'),('ceci est un test');
+INSERT IGNORE INTO t1 (post_text) VALUES ('ceci est un test'),('ceci est un test'),('ceci est un test'),('ceci est un test'),('ceci est un test');
REPAIR TABLE t1;
CHECK TABLE t1;
@@ -1027,10 +1029,14 @@ source include/varchar.inc;
create table t1 (v varchar(65530), key(v));
drop table if exists t1;
+set sql_mode = 'NO_ENGINE_SUBSTITUTION';
create table t1 (v varchar(65536));
+set sql_mode = DEFAULT;
show create table t1;
drop table t1;
+set sql_mode = 'NO_ENGINE_SUBSTITUTION';
create table t1 (v varchar(65530) character set utf8);
+set sql_mode = DEFAULT;
show create table t1;
drop table t1;