1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge from 5.0. Add new 5.1 files. Drop bdb.

Browse Source
This commit is contained in:
Chad MILLER 2008-07-04 14:48:25 -04:00
commit 205a946267
35 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/have_big5.inc
View File

@ -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;

2
mysql-test/include/have_binlog_format_mixed.inc
View File

@ -2,5 +2,5 @@
-- require r/have_binlog_format_mixed.require
disable_query_log;
show variables like "binlog_format";
show variables like 'binlog_format';
enable_query_log;

2
mysql-test/include/have_binlog_format_mixed_or_row.inc
View File

@ -3,5 +3,5 @@
--require r/have_binlog_format_row.require
--disable_query_log
--replace_result MIXED ROW
show variables like "binlog_format";
show variables like 'binlog_format';
--enable_query_log

2
mysql-test/include/have_binlog_format_mixed_or_statement.inc
View File

@ -4,5 +4,5 @@ source include/have_log_bin.inc;
--require r/have_binlog_format_statement.require
--disable_query_log
--replace_result MIXED STATEMENT
show variables like "binlog_format";
show variables like 'binlog_format';
--enable_query_log

2
mysql-test/include/have_binlog_format_row.inc
View File

@ -2,5 +2,5 @@
-- require r/have_binlog_format_row.require
disable_query_log;
show variables like "binlog_format";
show variables like 'binlog_format';
enable_query_log;

2
mysql-test/include/have_binlog_format_row_or_statement.inc
View File

@ -3,5 +3,5 @@
-- require r/have_binlog_format_statement.require
--disable_query_log
--replace_result ROW STATEMENT
show variables like "binlog_format";
show variables like 'binlog_format';
--enable_query_log

2
mysql-test/include/have_binlog_format_statement.inc
View File

@ -2,5 +2,5 @@
-- require r/have_binlog_format_statement.require
disable_query_log;
show variables like "binlog_format";
show variables like 'binlog_format';
enable_query_log;

2
mysql-test/include/have_bug25714.inc
View File

@ -3,5 +3,5 @@
#
--require r/have_bug25714.require
disable_query_log;
eval select LENGTH("$MYSQL_BUG25714") > 0 as "have_bug25714_exe";
eval select LENGTH('$MYSQL_BUG25714') > 0 as 'have_bug25714_exe';
enable_query_log;

2
mysql-test/include/have_case_sensitive_file_system.inc
View File

@ -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

2
mysql-test/include/have_community_features.inc
View File

@ -1,4 +1,4 @@
--require r/have_community_features.require
--disable_query_log
show variables like "have_community_features";
show variables like 'have_community_features';
--enable_query_log

2
mysql-test/include/have_compress.inc
View File

@ -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;

2
mysql-test/include/have_cp1250_ch.inc
View File

@ -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;

2
mysql-test/include/have_cp932.inc
View File

@ -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;

2
mysql-test/include/have_crypt.inc
View File

@ -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;

2
mysql-test/include/have_debug.inc
View File

@ -1,4 +1,4 @@
-- require r/have_debug.require
disable_query_log;
select (version() like "%debug%") as debug;
select (version() like '%debug%') as debug;
enable_query_log;

2
mysql-test/include/have_eucjpms.inc
View File

@ -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;

2
mysql-test/include/have_euckr.inc
View File

@ -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;

4
mysql-test/include/have_example_plugin.inc
View File

@ -4,7 +4,7 @@
#
--require r/have_dynamic_loading.require
disable_query_log;
show variables like "have_dynamic_loading";
show variables like 'have_dynamic_loading';
enable_query_log;
#
@ -12,5 +12,5 @@ enable_query_log;
#
--require r/have_example_plugin.require
disable_query_log;
eval select LENGTH("$EXAMPLE_PLUGIN") > 0 as "have_example_plugin";
eval select LENGTH('$EXAMPLE_PLUGIN') > 0 as 'have_example_plugin';
enable_query_log;

2
mysql-test/include/have_gb2312.inc
View File

@ -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;

2
mysql-test/include/have_gbk.inc
View File

@ -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;

2
mysql-test/include/have_geometry.inc
View File

@ -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

2
mysql-test/include/have_latin2_ch.inc
View File

@ -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;

2
mysql-test/include/have_log_bin.inc
View File

@ -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;

2
mysql-test/include/have_lowercase0.inc
View File

@ -1,4 +1,4 @@
--require r/lowercase0.require
--disable_query_log
show variables like "lower_case_%";
show variables like 'lower_case_%';
--enable_query_log

2
mysql-test/include/have_ndbapi_examples.inc
View File

@ -1,4 +1,4 @@
--require r/have_ndbapi_examples.require
disable_query_log;
eval select LENGTH("$MY_NDB_EXAMPLES_BINARY") > 0 as "have_ndb_example";
eval select LENGTH('$MY_NDB_EXAMPLES_BINARY') > 0 as 'have_ndb_example';
enable_query_log;

2
mysql-test/include/have_outfile.inc
View File

@ -1,5 +1,5 @@
-- require r/have_outfile.require
disable_query_log;
select load_file(concat(@tmpdir,"/outfile.test"));
select load_file(concat(@tmpdir,'/outfile.test'));
--remove_file $MYSQLTEST_VARDIR/tmp/outfile.test
enable_query_log;

2
mysql-test/include/have_partition.inc
View File

@ -1,4 +1,4 @@
-- require r/have_partition.require
disable_query_log;
show variables like "have_partitioning";
show variables like 'have_partitioning';
enable_query_log;

2
mysql-test/include/have_query_cache.inc
View File

@ -1,4 +1,4 @@
-- require r/have_query_cache.require
disable_query_log;
show variables like "have_query_cache";
show variables like 'have_query_cache';
enable_query_log;

2
mysql-test/include/have_sjis.inc
View File

@ -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;

2
mysql-test/include/have_ssl.inc
View File

@ -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;

2
mysql-test/include/have_symlink.inc
View File

@ -6,5 +6,5 @@
-- require r/have_symlink.require
disable_query_log;
show variables like "have_symlink";
show variables like 'have_symlink';
enable_query_log;

2
mysql-test/include/have_tis620.inc
View File

@ -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;

2
mysql-test/include/have_ucs2.inc
View File

@ -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;

4
mysql-test/include/have_udf.inc
View File

@ -4,7 +4,7 @@
#
--require r/have_dynamic_loading.require
disable_query_log;
show variables like "have_dynamic_loading";
show variables like 'have_dynamic_loading';
enable_query_log;
#
@ -12,5 +12,5 @@ enable_query_log;
#
--require r/have_udf_example.require
disable_query_log;
eval select LENGTH("$UDF_EXAMPLE_LIB") > 0 as "have_udf_example_lib";
eval select LENGTH('$UDF_EXAMPLE_LIB') > 0 as 'have_udf_example_lib';
enable_query_log;

2
mysql-test/include/have_ujis.inc
View File

@ -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;