Skip to content

Commit 7e5181e

Browse files
author
viswanatham gudipati
committed
wl7263: Added Anitha's comments
1 parent c558976 commit 7e5181e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+85
-59
lines changed

‎mysql-test/r/wl6219-csv.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,6 @@ y CONCAT('"', c, '"')
178178
0000 "qwer"
179179
2012 "2012qwer"
180180
DROP TABLE t1;
181-
SET @@global.default_storage_engine = MyISAM;
182-
SET @@session.default_storage_engine = MyISAM;
181+
SET @@global.default_storage_engine = InnoDB;
182+
SET @@session.default_storage_engine = InnoDB;
183183
#

‎mysql-test/r/wl6219-memory.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,6 @@ y CONCAT('"', c, '"')
178178
0000 "qwer"
179179
2012 "2012qwer"
180180
DROP TABLE t1;
181-
SET @@global.default_storage_engine = MyISAM;
182-
SET @@session.default_storage_engine = MyISAM;
181+
SET @@global.default_storage_engine = InnoDB;
182+
SET @@session.default_storage_engine = InnoDB;
183183
#

‎mysql-test/r/wl6219-merge.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,6 @@ t1 CREATE TABLE `t1` (
131131
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
132132
ALTER TABLE t1 MODIFY COLUMN i INT NOT NULL;
133133
DROP TABLE t1;
134-
SET @@global.default_storage_engine = MyISAM;
135-
SET @@session.default_storage_engine = MyISAM;
134+
SET @@global.default_storage_engine = InnoDB;
135+
SET @@session.default_storage_engine = InnoDB;
136136
#

‎mysql-test/t/auto_increment.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/bench_count_distinct.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/compress.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/derived.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/drop-no_root.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/fulltext.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/fulltext_cache.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/fulltext_left_join.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/fulltext_multi.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/fulltext_order_by.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/fulltext_var.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/gis-rtree.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/gis.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/greedy_optimizer.test

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
4-
5-
#Want to skip this test from daily Valgrind execution
65
--source include/no_valgrind_without_big.inc
6+
77
#
88
# A simple test of the greedy query optimization algorithm and the switches that
99
# control the optimizationprocess.

‎mysql-test/t/group_min_max.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/heap.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/key_cache.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/lock_multi.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/myisam-blob.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/myisam.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/myisam_icp.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/myisam_icp_all.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/myisam_icp_none.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/myisam_mrr.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/myisam_mrr_all.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/myisam_mrr_cost.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/myisam_mrr_cost_all.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/myisam_mrr_cost_icp.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/myisam_mrr_icp.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/myisam_mrr_none.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/myisampack.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/partition_key_cache.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/partition_pruning.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/preload.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/query_cache_merge.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/repair.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/single_delete_update.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/type_bit.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

‎mysql-test/t/wl6219-csv.test

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
#Start server with MyISAM
2-
--source include/force_myisam_default.inc
3-
--source include/have_myisam.inc
4-
51
#
62
# WL#6219: Deprecate and remove YEAR(2) type
73
#

‎mysql-test/t/wl6219-memory.test

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
#Start server with MyISAM
2-
--source include/force_myisam_default.inc
3-
--source include/have_myisam.inc
4-
51
#
62
# WL#6219: Deprecate and remove YEAR(2) type
73
#

‎mysql-test/t/wl6219-merge.test

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
#Start server with MyISAM
2-
--source include/force_myisam_default.inc
3-
--source include/have_myisam.inc
4-
51
#
62
# WL#6219: Deprecate and remove YEAR(2) type
73
#

‎mysql-test/t/wl6219-myisam.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Start server with MyISAM
1+
# This is a Myisam engine specific testcase
2+
# Hence MTR starts mysqld with MyISAM as default
23
--source include/force_myisam_default.inc
34
--source include/have_myisam.inc
45

0 commit comments

Comments
 (0)