summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChad MILLER <chad@mysql.com>2008-07-04 12:41:27 -0400
committerChad MILLER <chad@mysql.com>2008-07-04 12:41:27 -0400
commitac2a037ff9664b48cc90811d33818523ee9fbffc (patch)
tree2173a82c9e040369a0c99623517ff2938e55a412
parent49417ad7c8e45792f5baafb9514b10684daba527 (diff)
downloadmariadb-git-ac2a037ff9664b48cc90811d33818523ee9fbffc.tar.gz
Bug#30563: Is not possible to create rpl_ or innodb test if needed \
to use ANSI_QUOTES Make all have_* tests universally safe by using ANSI quotes.
-rw-r--r--mysql-test/include/have_archive.inc2
-rw-r--r--mysql-test/include/have_bdb.inc2
-rw-r--r--mysql-test/include/have_big5.inc2
-rw-r--r--mysql-test/include/have_blackhole.inc2
-rw-r--r--mysql-test/include/have_case_sensitive_file_system.inc2
-rw-r--r--mysql-test/include/have_compress.inc2
-rw-r--r--mysql-test/include/have_cp1250_ch.inc2
-rw-r--r--mysql-test/include/have_cp932.inc2
-rw-r--r--mysql-test/include/have_crypt.inc2
-rw-r--r--mysql-test/include/have_csv.inc2
-rw-r--r--mysql-test/include/have_eucjpms.inc2
-rw-r--r--mysql-test/include/have_euckr.inc2
-rw-r--r--mysql-test/include/have_exampledb.inc2
-rw-r--r--mysql-test/include/have_federated_db.inc2
-rw-r--r--mysql-test/include/have_gb2312.inc2
-rw-r--r--mysql-test/include/have_gbk.inc2
-rw-r--r--mysql-test/include/have_geometry.inc2
-rw-r--r--mysql-test/include/have_innodb.inc2
-rw-r--r--mysql-test/include/have_latin2_ch.inc2
-rw-r--r--mysql-test/include/have_log_bin.inc2
-rw-r--r--mysql-test/include/have_lowercase0.inc2
-rw-r--r--mysql-test/include/have_multi_ndb.inc4
-rw-r--r--mysql-test/include/have_ndb.inc2
-rw-r--r--mysql-test/include/have_query_cache.inc2
-rw-r--r--mysql-test/include/have_sjis.inc2
-rw-r--r--mysql-test/include/have_ssl.inc2
-rw-r--r--mysql-test/include/have_tis620.inc2
-rw-r--r--mysql-test/include/have_ucs2.inc2
-rw-r--r--mysql-test/include/have_udf.inc2
-rw-r--r--mysql-test/include/have_ujis.inc2
30 files changed, 31 insertions, 31 deletions
diff --git a/mysql-test/include/have_archive.inc b/mysql-test/include/have_archive.inc
index 262f66076a8..75460316322 100644
--- a/mysql-test/include/have_archive.inc
+++ b/mysql-test/include/have_archive.inc
@@ -1,4 +1,4 @@
--require r/have_archive.require
--disable_query_log
-show variables like "have_archive";
+show variables like 'have_archive';
--enable_query_log
diff --git a/mysql-test/include/have_bdb.inc b/mysql-test/include/have_bdb.inc
index 3f7377e7515..c2f29e0d286 100644
--- a/mysql-test/include/have_bdb.inc
+++ b/mysql-test/include/have_bdb.inc
@@ -1,4 +1,4 @@
-- require r/have_bdb.require
disable_query_log;
-show variables like "have_bdb";
+show variables like 'have_bdb';
enable_query_log;
diff --git a/mysql-test/include/have_big5.inc b/mysql-test/include/have_big5.inc
index 790e8085e1a..dad4a0a8eeb 100644
--- a/mysql-test/include/have_big5.inc
+++ b/mysql-test/include/have_big5.inc
@@ -1,4 +1,4 @@
-- require r/have_big5.require
disable_query_log;
-show collation like "big5_chinese_ci";
+show collation like 'big5_chinese_ci';
enable_query_log;
diff --git a/mysql-test/include/have_blackhole.inc b/mysql-test/include/have_blackhole.inc
index c2b6ea18830..d13c9fda3f5 100644
--- a/mysql-test/include/have_blackhole.inc
+++ b/mysql-test/include/have_blackhole.inc
@@ -1,4 +1,4 @@
-- require r/have_blackhole.require
disable_query_log;
-show variables like "have_blackhole_engine";
+show variables like 'have_blackhole_engine';
enable_query_log;
diff --git a/mysql-test/include/have_case_sensitive_file_system.inc b/mysql-test/include/have_case_sensitive_file_system.inc
index 730af975497..7bb1bef93fd 100644
--- a/mysql-test/include/have_case_sensitive_file_system.inc
+++ b/mysql-test/include/have_case_sensitive_file_system.inc
@@ -1,4 +1,4 @@
--require r/case_sensitive_file_system.require
--disable_query_log
-show variables like "lower_case_file_system";
+show variables like 'lower_case_file_system';
--enable_query_log
diff --git a/mysql-test/include/have_compress.inc b/mysql-test/include/have_compress.inc
index c042cd7452a..150c7f3448d 100644
--- a/mysql-test/include/have_compress.inc
+++ b/mysql-test/include/have_compress.inc
@@ -1,4 +1,4 @@
-- require r/have_compress.require
disable_query_log;
-show variables like "have_compress";
+show variables like 'have_compress';
enable_query_log;
diff --git a/mysql-test/include/have_cp1250_ch.inc b/mysql-test/include/have_cp1250_ch.inc
index eec5d69fbd6..426fa658597 100644
--- a/mysql-test/include/have_cp1250_ch.inc
+++ b/mysql-test/include/have_cp1250_ch.inc
@@ -1,4 +1,4 @@
-- require r/have_cp1250_ch.require
disable_query_log;
-show collation like "cp1250_czech_cs";
+show collation like 'cp1250_czech_cs';
enable_query_log;
diff --git a/mysql-test/include/have_cp932.inc b/mysql-test/include/have_cp932.inc
index b500dac0bbe..ecad979c02a 100644
--- a/mysql-test/include/have_cp932.inc
+++ b/mysql-test/include/have_cp932.inc
@@ -1,4 +1,4 @@
-- require r/have_cp932.require
disable_query_log;
-show collation like "cp932_japanese_ci";
+show collation like 'cp932_japanese_ci';
enable_query_log;
diff --git a/mysql-test/include/have_crypt.inc b/mysql-test/include/have_crypt.inc
index fe1f974bffd..cbf0a7ac876 100644
--- a/mysql-test/include/have_crypt.inc
+++ b/mysql-test/include/have_crypt.inc
@@ -1,4 +1,4 @@
-- require r/have_crypt.require
disable_query_log;
-show variables like "have_crypt";
+show variables like 'have_crypt';
enable_query_log;
diff --git a/mysql-test/include/have_csv.inc b/mysql-test/include/have_csv.inc
index d28199831b8..12e69962486 100644
--- a/mysql-test/include/have_csv.inc
+++ b/mysql-test/include/have_csv.inc
@@ -1,4 +1,4 @@
-- require r/have_csv.require
disable_query_log;
-show variables like "have_csv";
+show variables like 'have_csv';
enable_query_log;
diff --git a/mysql-test/include/have_eucjpms.inc b/mysql-test/include/have_eucjpms.inc
index a5e1a5ac547..6d96eefcc31 100644
--- a/mysql-test/include/have_eucjpms.inc
+++ b/mysql-test/include/have_eucjpms.inc
@@ -1,4 +1,4 @@
-- require r/have_eucjpms.require
disable_query_log;
-show collation like "eucjpms_japanese_ci";
+show collation like 'eucjpms_japanese_ci';
enable_query_log;
diff --git a/mysql-test/include/have_euckr.inc b/mysql-test/include/have_euckr.inc
index af794aafc04..4b4e870cf47 100644
--- a/mysql-test/include/have_euckr.inc
+++ b/mysql-test/include/have_euckr.inc
@@ -1,4 +1,4 @@
-- require r/have_euckr.require
disable_query_log;
-show collation like "euckr_korean_ci";
+show collation like 'euckr_korean_ci';
enable_query_log;
diff --git a/mysql-test/include/have_exampledb.inc b/mysql-test/include/have_exampledb.inc
index 7ddd15c48b3..b8f9a24463e 100644
--- a/mysql-test/include/have_exampledb.inc
+++ b/mysql-test/include/have_exampledb.inc
@@ -1,4 +1,4 @@
-- require r/have_exampledb.require
disable_query_log;
-show variables like "have_example_engine";
+show variables like 'have_example_engine';
enable_query_log;
diff --git a/mysql-test/include/have_federated_db.inc b/mysql-test/include/have_federated_db.inc
index e4cf1366fda..4745534780d 100644
--- a/mysql-test/include/have_federated_db.inc
+++ b/mysql-test/include/have_federated_db.inc
@@ -1,4 +1,4 @@
-- require r/have_federated_db.require
disable_query_log;
-show variables like "have_federated_engine";
+show variables like 'have_federated_engine';
enable_query_log;
diff --git a/mysql-test/include/have_gb2312.inc b/mysql-test/include/have_gb2312.inc
index 4328bc67639..27591c01b6c 100644
--- a/mysql-test/include/have_gb2312.inc
+++ b/mysql-test/include/have_gb2312.inc
@@ -1,4 +1,4 @@
-- require r/have_gb2312.require
disable_query_log;
-show collation like "gb2312_chinese_ci";
+show collation like 'gb2312_chinese_ci';
enable_query_log;
diff --git a/mysql-test/include/have_gbk.inc b/mysql-test/include/have_gbk.inc
index 55805da0495..72252d6b00d 100644
--- a/mysql-test/include/have_gbk.inc
+++ b/mysql-test/include/have_gbk.inc
@@ -1,4 +1,4 @@
-- require r/have_gbk.require
disable_query_log;
-show collation like "gbk_chinese_ci";
+show collation like 'gbk_chinese_ci';
enable_query_log;
diff --git a/mysql-test/include/have_geometry.inc b/mysql-test/include/have_geometry.inc
index f0ec22af172..f1836469017 100644
--- a/mysql-test/include/have_geometry.inc
+++ b/mysql-test/include/have_geometry.inc
@@ -1,4 +1,4 @@
--require r/have_geometry.require
--disable_query_log
-show variables like "have_geometry";
+show variables like 'have_geometry';
--enable_query_log
diff --git a/mysql-test/include/have_innodb.inc b/mysql-test/include/have_innodb.inc
index 4f83d378cbc..4142b84813b 100644
--- a/mysql-test/include/have_innodb.inc
+++ b/mysql-test/include/have_innodb.inc
@@ -1,4 +1,4 @@
-- require r/have_innodb.require
disable_query_log;
-show variables like "have_innodb";
+show variables like 'have_innodb';
enable_query_log;
diff --git a/mysql-test/include/have_latin2_ch.inc b/mysql-test/include/have_latin2_ch.inc
index 9d3ee6b341c..215715a6aaf 100644
--- a/mysql-test/include/have_latin2_ch.inc
+++ b/mysql-test/include/have_latin2_ch.inc
@@ -1,4 +1,4 @@
-- require r/have_latin2_ch.require
disable_query_log;
-show collation like "latin2_czech_cs";
+show collation like 'latin2_czech_cs';
enable_query_log;
diff --git a/mysql-test/include/have_log_bin.inc b/mysql-test/include/have_log_bin.inc
index 11530dc953e..5bcdb30b3e0 100644
--- a/mysql-test/include/have_log_bin.inc
+++ b/mysql-test/include/have_log_bin.inc
@@ -1,4 +1,4 @@
-- require r/have_log_bin.require
disable_query_log;
-show variables like "log_bin";
+show variables like 'log_bin';
enable_query_log;
diff --git a/mysql-test/include/have_lowercase0.inc b/mysql-test/include/have_lowercase0.inc
index 8d3ae02f61e..6192acb7b01 100644
--- a/mysql-test/include/have_lowercase0.inc
+++ b/mysql-test/include/have_lowercase0.inc
@@ -1,4 +1,4 @@
--require r/lowercase0.require
--disable_query_log
-show variables like "lower_case_%";
+show variables like 'lower_case_%';
--enable_query_log
diff --git a/mysql-test/include/have_multi_ndb.inc b/mysql-test/include/have_multi_ndb.inc
index 45a551274f7..7f922d85ff2 100644
--- a/mysql-test/include/have_multi_ndb.inc
+++ b/mysql-test/include/have_multi_ndb.inc
@@ -10,7 +10,7 @@ drop table if exists t1, t2;
--enable_warnings
flush tables;
--require r/have_ndb.require
-show variables like "have_ndbcluster";
+show variables like 'have_ndbcluster';
enable_query_log;
# Check that server2 has NDB support
@@ -21,7 +21,7 @@ drop table if exists t1, t2;
--enable_warnings
flush tables;
--require r/have_ndb.require
-show variables like "have_ndbcluster";
+show variables like 'have_ndbcluster';
enable_query_log;
# Set the default connection to 'server1'
diff --git a/mysql-test/include/have_ndb.inc b/mysql-test/include/have_ndb.inc
index 721d79392b7..691adc12231 100644
--- a/mysql-test/include/have_ndb.inc
+++ b/mysql-test/include/have_ndb.inc
@@ -1,7 +1,7 @@
# Check that server is compiled and started with support for NDB
-- require r/have_ndb.require
disable_query_log;
-show variables like "have_ndbcluster";
+show variables like 'have_ndbcluster';
enable_query_log;
# Check that NDB is installed and known to be working
diff --git a/mysql-test/include/have_query_cache.inc b/mysql-test/include/have_query_cache.inc
index 39549157849..647f8598ae6 100644
--- a/mysql-test/include/have_query_cache.inc
+++ b/mysql-test/include/have_query_cache.inc
@@ -3,5 +3,5 @@
# of query cache hits
-- disable_ps_protocol
disable_query_log;
-show variables like "have_query_cache";
+show variables like 'have_query_cache';
enable_query_log;
diff --git a/mysql-test/include/have_sjis.inc b/mysql-test/include/have_sjis.inc
index 0d580a3a232..ac6531ca868 100644
--- a/mysql-test/include/have_sjis.inc
+++ b/mysql-test/include/have_sjis.inc
@@ -1,4 +1,4 @@
-- require r/have_sjis.require
disable_query_log;
-show collation like "sjis_japanese_ci";
+show collation like 'sjis_japanese_ci';
enable_query_log;
diff --git a/mysql-test/include/have_ssl.inc b/mysql-test/include/have_ssl.inc
index fab57d630e5..6f2d5587a75 100644
--- a/mysql-test/include/have_ssl.inc
+++ b/mysql-test/include/have_ssl.inc
@@ -1,4 +1,4 @@
-- require r/have_ssl.require
disable_query_log;
-show variables like "have_ssl";
+show variables like 'have_ssl';
enable_query_log;
diff --git a/mysql-test/include/have_tis620.inc b/mysql-test/include/have_tis620.inc
index c1e775681b0..ad5ba9dea69 100644
--- a/mysql-test/include/have_tis620.inc
+++ b/mysql-test/include/have_tis620.inc
@@ -1,4 +1,4 @@
-- require r/have_tis620.require
disable_query_log;
-show collation like "tis620_thai_ci";
+show collation like 'tis620_thai_ci';
enable_query_log;
diff --git a/mysql-test/include/have_ucs2.inc b/mysql-test/include/have_ucs2.inc
index 92ec9b5fb44..324ed52dd02 100644
--- a/mysql-test/include/have_ucs2.inc
+++ b/mysql-test/include/have_ucs2.inc
@@ -1,4 +1,4 @@
-- require r/have_ucs2.require
disable_query_log;
-show collation like "ucs2_general_ci";
+show collation like 'ucs2_general_ci';
enable_query_log;
diff --git a/mysql-test/include/have_udf.inc b/mysql-test/include/have_udf.inc
index 42b9942f74d..154dccf2270 100644
--- a/mysql-test/include/have_udf.inc
+++ b/mysql-test/include/have_udf.inc
@@ -4,7 +4,7 @@
#
--require r/have_udf.require
disable_query_log;
-show variables like "have_dynamic_loading";
+show variables like 'have_dynamic_loading';
enable_query_log;
#
diff --git a/mysql-test/include/have_ujis.inc b/mysql-test/include/have_ujis.inc
index ecceb7a8408..e4b2f50cf93 100644
--- a/mysql-test/include/have_ujis.inc
+++ b/mysql-test/include/have_ujis.inc
@@ -1,4 +1,4 @@
-- require r/have_ujis.require
disable_query_log;
-show collation like "ujis_japanese_ci";
+show collation like 'ujis_japanese_ci';
enable_query_log;