2644 Chad MILLER 2008-07-04 [merge]
Merge bug.
modified:
mysql-test/include/have_archive.inc
mysql-test/include/have_bdb.inc
mysql-test/include/have_big5.inc
mysql-test/include/have_blackhole.inc
mysql-test/include/have_case_sensitive_file_system.inc
mysql-test/include/have_compress.inc
mysql-test/include/have_cp1250_ch.inc
mysql-test/include/have_cp932.inc
mysql-test/include/have_crypt.inc
mysql-test/include/have_csv.inc
mysql-test/include/have_eucjpms.inc
mysql-test/include/have_euckr.inc
mysql-test/include/have_exampledb.inc
mysql-test/include/have_federated_db.inc
mysql-test/include/have_gb2312.inc
mysql-test/include/have_gbk.inc
mysql-test/include/have_geometry.inc
mysql-test/include/have_innodb.inc
mysql-test/include/have_latin2_ch.inc
mysql-test/include/have_log_bin.inc
mysql-test/include/have_lowercase0.inc
mysql-test/include/have_multi_ndb.inc
mysql-test/include/have_ndb.inc
mysql-test/include/have_query_cache.inc
mysql-test/include/have_sjis.inc
mysql-test/include/have_ssl.inc
mysql-test/include/have_tis620.inc
mysql-test/include/have_ucs2.inc
mysql-test/include/have_udf.inc
mysql-test/include/have_ujis.inc
2643 Timothy Smith 2008-07-02
Fix "C++ code in C file" syntax error in mysys/default.c
modified:
mysys/default.c
=== modified file 'mysql-test/include/have_archive.inc'
--- a/mysql-test/include/have_archive.inc 2005-10-27 19:45:18 +0000
+++ b/mysql-test/include/have_archive.inc 2008-07-04 16:41:27 +0000
@@ -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
=== modified file 'mysql-test/include/have_bdb.inc'
--- a/mysql-test/include/have_bdb.inc 2001-10-04 21:42:25 +0000
+++ b/mysql-test/include/have_bdb.inc 2008-07-04 16:41:27 +0000
@@ -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;
=== modified file 'mysql-test/include/have_big5.inc'
--- a/mysql-test/include/have_big5.inc 2003-12-24 12:59:48 +0000
+++ b/mysql-test/include/have_big5.inc 2008-07-04 16:41:27 +0000
@@ -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;
=== modified file 'mysql-test/include/have_blackhole.inc'
--- a/mysql-test/include/have_blackhole.inc 2005-03-23 00:10:39 +0000
+++ b/mysql-test/include/have_blackhole.inc 2008-07-04 16:41:27 +0000
@@ -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;
=== modified file 'mysql-test/include/have_case_sensitive_file_system.inc'
--- a/mysql-test/include/have_case_sensitive_file_system.inc 2006-05-04 06:55:09 +0000
+++ b/mysql-test/include/have_case_sensitive_file_system.inc 2008-07-04 16:41:27 +0000
@@ -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
=== modified file 'mysql-test/include/have_compress.inc'
--- a/mysql-test/include/have_compress.inc 2003-04-10 00:50:30 +0000
+++ b/mysql-test/include/have_compress.inc 2008-07-04 16:41:27 +0000
@@ -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;
=== modified file 'mysql-test/include/have_cp1250_ch.inc'
--- a/mysql-test/include/have_cp1250_ch.inc 2005-03-03 10:15:37 +0000
+++ b/mysql-test/include/have_cp1250_ch.inc 2008-07-04 16:41:27 +0000
@@ -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;
=== modified file 'mysql-test/include/have_cp932.inc'
--- a/mysql-test/include/have_cp932.inc 2005-02-01 10:37:51 +0000
+++ b/mysql-test/include/have_cp932.inc 2008-07-04 16:41:27 +0000
@@ -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;
=== modified file 'mysql-test/include/have_crypt.inc'
--- a/mysql-test/include/have_crypt.inc 2003-01-28 06:38:28 +0000
+++ b/mysql-test/include/have_crypt.inc 2008-07-04 16:41:27 +0000
@@ -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;
=== modified file 'mysql-test/include/have_csv.inc'
--- a/mysql-test/include/have_csv.inc 2004-08-13 03:57:18 +0000
+++ b/mysql-test/include/have_csv.inc 2008-07-04 16:41:27 +0000
@@ -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;
=== modified file 'mysql-test/include/have_eucjpms.inc'
--- a/mysql-test/include/have_eucjpms.inc 2005-02-01 10:37:51 +0000
+++ b/mysql-test/include/have_eucjpms.inc 2008-07-04 16:41:27 +0000
@@ -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;
=== modified file 'mysql-test/include/have_euckr.inc'
--- a/mysql-test/include/have_euckr.inc 2005-12-09 12:37:58 +0000
+++ b/mysql-test/include/have_euckr.inc 2008-07-04 16:41:27 +0000
@@ -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;
=== modified file 'mysql-test/include/have_exampledb.inc'
--- a/mysql-test/include/have_exampledb.inc 2004-08-14 00:14:36 +0000
+++ b/mysql-test/include/have_exampledb.inc 2008-07-04 16:41:27 +0000
@@ -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;
=== modified file 'mysql-test/include/have_federated_db.inc'
--- a/mysql-test/include/have_federated_db.inc 2005-01-21 02:36:40 +0000
+++ b/mysql-test/include/have_federated_db.inc 2008-07-04 16:41:27 +0000
@@ -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;
=== modified file 'mysql-test/include/have_gb2312.inc'
--- a/mysql-test/include/have_gb2312.inc 2005-12-09 12:37:58 +0000
+++ b/mysql-test/include/have_gb2312.inc 2008-07-04 16:41:27 +0000
@@ -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;
=== modified file 'mysql-test/include/have_gbk.inc'
--- a/mysql-test/include/have_gbk.inc 2005-07-22 16:06:02 +0000
+++ b/mysql-test/include/have_gbk.inc 2008-07-04 16:41:27 +0000
@@ -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;
=== modified file 'mysql-test/include/have_geometry.inc'
--- a/mysql-test/include/have_geometry.inc 2005-10-27 19:45:18 +0000
+++ b/mysql-test/include/have_geometry.inc 2008-07-04 16:41:27 +0000
@@ -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
=== modified file 'mysql-test/include/have_innodb.inc'
--- a/mysql-test/include/have_innodb.inc 2001-10-04 21:42:25 +0000
+++ b/mysql-test/include/have_innodb.inc 2008-07-04 16:41:27 +0000
@@ -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;
=== modified file 'mysql-test/include/have_latin2_ch.inc'
--- a/mysql-test/include/have_latin2_ch.inc 2006-03-20 12:28:25 +0000
+++ b/mysql-test/include/have_latin2_ch.inc 2008-07-04 16:41:27 +0000
@@ -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;
=== modified file 'mysql-test/include/have_log_bin.inc'
--- a/mysql-test/include/have_log_bin.inc 2007-05-14 12:38:50 +0000
+++ b/mysql-test/include/have_log_bin.inc 2008-07-04 16:41:27 +0000
@@ -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;
=== modified file 'mysql-test/include/have_lowercase0.inc'
--- a/mysql-test/include/have_lowercase0.inc 2006-10-19 09:35:10 +0000
+++ b/mysql-test/include/have_lowercase0.inc 2008-07-04 16:41:27 +0000
@@ -1,4 +1,4 @@
--require r/lowercase0.require
--disable_query_log
-show variables like "lower_case_%";
+show variables like 'lower_case_%';
--enable_query_log
=== modified file 'mysql-test/include/have_multi_ndb.inc'
--- a/mysql-test/include/have_multi_ndb.inc 2006-10-03 14:14:23 +0000
+++ b/mysql-test/include/have_multi_ndb.inc 2008-07-04 16:41:27 +0000
@@ -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'
=== modified file 'mysql-test/include/have_ndb.inc'
--- a/mysql-test/include/have_ndb.inc 2006-10-05 10:42:39 +0000
+++ b/mysql-test/include/have_ndb.inc 2008-07-04 16:41:27 +0000
@@ -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
=== modified file 'mysql-test/include/have_query_cache.inc'
--- a/mysql-test/include/have_query_cache.inc 2004-10-26 16:30:01 +0000
+++ b/mysql-test/include/have_query_cache.inc 2008-07-04 16:41:27 +0000
@@ -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;
=== modified file 'mysql-test/include/have_sjis.inc'
--- a/mysql-test/include/have_sjis.inc 2004-03-25 10:29:56 +0000
+++ b/mysql-test/include/have_sjis.inc 2008-07-04 16:41:27 +0000
@@ -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;
=== modified file 'mysql-test/include/have_ssl.inc'
--- a/mysql-test/include/have_ssl.inc 2007-03-05 09:03:42 +0000
+++ b/mysql-test/include/have_ssl.inc 2008-07-04 16:41:27 +0000
@@ -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;
=== modified file 'mysql-test/include/have_tis620.inc'
--- a/mysql-test/include/have_tis620.inc 2003-12-25 16:11:01 +0000
+++ b/mysql-test/include/have_tis620.inc 2008-07-04 16:41:27 +0000
@@ -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;
=== modified file 'mysql-test/include/have_ucs2.inc'
--- a/mysql-test/include/have_ucs2.inc 2003-05-23 10:10:05 +0000
+++ b/mysql-test/include/have_ucs2.inc 2008-07-04 16:41:27 +0000
@@ -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;
=== modified file 'mysql-test/include/have_udf.inc'
--- a/mysql-test/include/have_udf.inc 2006-04-27 14:32:40 +0000
+++ b/mysql-test/include/have_udf.inc 2008-07-04 16:41:27 +0000
@@ -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;
#
=== modified file 'mysql-test/include/have_ujis.inc'
--- a/mysql-test/include/have_ujis.inc 2003-05-23 10:10:05 +0000
+++ b/mysql-test/include/have_ujis.inc 2008-07-04 16:41:27 +0000
@@ -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;
| Thread |
|---|
| • bzr push into mysql-5.0 branch (chad:2643 to 2644) | Chad MILLER | 4 Jul |
