Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
12ec2e8f
Commit
12ec2e8f
authored
Jul 04, 2008
by
Chad MILLER
Browse files
Options
Browse Files
Download
Plain Diff
Merge bug.
parents
4b64fc14
c8efde1b
Changes
30
Show whitespace changes
Inline
Side-by-side
Showing
30 changed files
with
31 additions
and
31 deletions
+31
-31
mysql-test/include/have_archive.inc
mysql-test/include/have_archive.inc
+1
-1
mysql-test/include/have_bdb.inc
mysql-test/include/have_bdb.inc
+1
-1
mysql-test/include/have_big5.inc
mysql-test/include/have_big5.inc
+1
-1
mysql-test/include/have_blackhole.inc
mysql-test/include/have_blackhole.inc
+1
-1
mysql-test/include/have_case_sensitive_file_system.inc
mysql-test/include/have_case_sensitive_file_system.inc
+1
-1
mysql-test/include/have_compress.inc
mysql-test/include/have_compress.inc
+1
-1
mysql-test/include/have_cp1250_ch.inc
mysql-test/include/have_cp1250_ch.inc
+1
-1
mysql-test/include/have_cp932.inc
mysql-test/include/have_cp932.inc
+1
-1
mysql-test/include/have_crypt.inc
mysql-test/include/have_crypt.inc
+1
-1
mysql-test/include/have_csv.inc
mysql-test/include/have_csv.inc
+1
-1
mysql-test/include/have_eucjpms.inc
mysql-test/include/have_eucjpms.inc
+1
-1
mysql-test/include/have_euckr.inc
mysql-test/include/have_euckr.inc
+1
-1
mysql-test/include/have_exampledb.inc
mysql-test/include/have_exampledb.inc
+1
-1
mysql-test/include/have_federated_db.inc
mysql-test/include/have_federated_db.inc
+1
-1
mysql-test/include/have_gb2312.inc
mysql-test/include/have_gb2312.inc
+1
-1
mysql-test/include/have_gbk.inc
mysql-test/include/have_gbk.inc
+1
-1
mysql-test/include/have_geometry.inc
mysql-test/include/have_geometry.inc
+1
-1
mysql-test/include/have_innodb.inc
mysql-test/include/have_innodb.inc
+1
-1
mysql-test/include/have_latin2_ch.inc
mysql-test/include/have_latin2_ch.inc
+1
-1
mysql-test/include/have_log_bin.inc
mysql-test/include/have_log_bin.inc
+1
-1
mysql-test/include/have_lowercase0.inc
mysql-test/include/have_lowercase0.inc
+1
-1
mysql-test/include/have_multi_ndb.inc
mysql-test/include/have_multi_ndb.inc
+2
-2
mysql-test/include/have_ndb.inc
mysql-test/include/have_ndb.inc
+1
-1
mysql-test/include/have_query_cache.inc
mysql-test/include/have_query_cache.inc
+1
-1
mysql-test/include/have_sjis.inc
mysql-test/include/have_sjis.inc
+1
-1
mysql-test/include/have_ssl.inc
mysql-test/include/have_ssl.inc
+1
-1
mysql-test/include/have_tis620.inc
mysql-test/include/have_tis620.inc
+1
-1
mysql-test/include/have_ucs2.inc
mysql-test/include/have_ucs2.inc
+1
-1
mysql-test/include/have_udf.inc
mysql-test/include/have_udf.inc
+1
-1
mysql-test/include/have_ujis.inc
mysql-test/include/have_ujis.inc
+1
-1
No files found.
mysql-test/include/have_archive.inc
View file @
12ec2e8f
--
require
r
/
have_archive
.
require
--
require
r
/
have_archive
.
require
--
disable_query_log
--
disable_query_log
show
variables
like
"have_archive"
;
show
variables
like
'have_archive'
;
--
enable_query_log
--
enable_query_log
mysql-test/include/have_bdb.inc
View file @
12ec2e8f
--
require
r
/
have_bdb
.
require
--
require
r
/
have_bdb
.
require
disable_query_log
;
disable_query_log
;
show
variables
like
"have_bdb"
;
show
variables
like
'have_bdb'
;
enable_query_log
;
enable_query_log
;
mysql-test/include/have_big5.inc
View file @
12ec2e8f
--
require
r
/
have_big5
.
require
--
require
r
/
have_big5
.
require
disable_query_log
;
disable_query_log
;
show
collation
like
"big5_chinese_ci"
;
show
collation
like
'big5_chinese_ci'
;
enable_query_log
;
enable_query_log
;
mysql-test/include/have_blackhole.inc
View file @
12ec2e8f
--
require
r
/
have_blackhole
.
require
--
require
r
/
have_blackhole
.
require
disable_query_log
;
disable_query_log
;
show
variables
like
"have_blackhole_engine"
;
show
variables
like
'have_blackhole_engine'
;
enable_query_log
;
enable_query_log
;
mysql-test/include/have_case_sensitive_file_system.inc
View file @
12ec2e8f
--
require
r
/
case_sensitive_file_system
.
require
--
require
r
/
case_sensitive_file_system
.
require
--
disable_query_log
--
disable_query_log
show
variables
like
"lower_case_file_system"
;
show
variables
like
'lower_case_file_system'
;
--
enable_query_log
--
enable_query_log
mysql-test/include/have_compress.inc
View file @
12ec2e8f
--
require
r
/
have_compress
.
require
--
require
r
/
have_compress
.
require
disable_query_log
;
disable_query_log
;
show
variables
like
"have_compress"
;
show
variables
like
'have_compress'
;
enable_query_log
;
enable_query_log
;
mysql-test/include/have_cp1250_ch.inc
View file @
12ec2e8f
--
require
r
/
have_cp1250_ch
.
require
--
require
r
/
have_cp1250_ch
.
require
disable_query_log
;
disable_query_log
;
show
collation
like
"cp1250_czech_cs"
;
show
collation
like
'cp1250_czech_cs'
;
enable_query_log
;
enable_query_log
;
mysql-test/include/have_cp932.inc
View file @
12ec2e8f
--
require
r
/
have_cp932
.
require
--
require
r
/
have_cp932
.
require
disable_query_log
;
disable_query_log
;
show
collation
like
"cp932_japanese_ci"
;
show
collation
like
'cp932_japanese_ci'
;
enable_query_log
;
enable_query_log
;
mysql-test/include/have_crypt.inc
View file @
12ec2e8f
--
require
r
/
have_crypt
.
require
--
require
r
/
have_crypt
.
require
disable_query_log
;
disable_query_log
;
show
variables
like
"have_crypt"
;
show
variables
like
'have_crypt'
;
enable_query_log
;
enable_query_log
;
mysql-test/include/have_csv.inc
View file @
12ec2e8f
--
require
r
/
have_csv
.
require
--
require
r
/
have_csv
.
require
disable_query_log
;
disable_query_log
;
show
variables
like
"have_csv"
;
show
variables
like
'have_csv'
;
enable_query_log
;
enable_query_log
;
mysql-test/include/have_eucjpms.inc
View file @
12ec2e8f
--
require
r
/
have_eucjpms
.
require
--
require
r
/
have_eucjpms
.
require
disable_query_log
;
disable_query_log
;
show
collation
like
"eucjpms_japanese_ci"
;
show
collation
like
'eucjpms_japanese_ci'
;
enable_query_log
;
enable_query_log
;
mysql-test/include/have_euckr.inc
View file @
12ec2e8f
--
require
r
/
have_euckr
.
require
--
require
r
/
have_euckr
.
require
disable_query_log
;
disable_query_log
;
show
collation
like
"euckr_korean_ci"
;
show
collation
like
'euckr_korean_ci'
;
enable_query_log
;
enable_query_log
;
mysql-test/include/have_exampledb.inc
View file @
12ec2e8f
--
require
r
/
have_exampledb
.
require
--
require
r
/
have_exampledb
.
require
disable_query_log
;
disable_query_log
;
show
variables
like
"have_example_engine"
;
show
variables
like
'have_example_engine'
;
enable_query_log
;
enable_query_log
;
mysql-test/include/have_federated_db.inc
View file @
12ec2e8f
--
require
r
/
have_federated_db
.
require
--
require
r
/
have_federated_db
.
require
disable_query_log
;
disable_query_log
;
show
variables
like
"have_federated_engine"
;
show
variables
like
'have_federated_engine'
;
enable_query_log
;
enable_query_log
;
mysql-test/include/have_gb2312.inc
View file @
12ec2e8f
--
require
r
/
have_gb2312
.
require
--
require
r
/
have_gb2312
.
require
disable_query_log
;
disable_query_log
;
show
collation
like
"gb2312_chinese_ci"
;
show
collation
like
'gb2312_chinese_ci'
;
enable_query_log
;
enable_query_log
;
mysql-test/include/have_gbk.inc
View file @
12ec2e8f
--
require
r
/
have_gbk
.
require
--
require
r
/
have_gbk
.
require
disable_query_log
;
disable_query_log
;
show
collation
like
"gbk_chinese_ci"
;
show
collation
like
'gbk_chinese_ci'
;
enable_query_log
;
enable_query_log
;
mysql-test/include/have_geometry.inc
View file @
12ec2e8f
--
require
r
/
have_geometry
.
require
--
require
r
/
have_geometry
.
require
--
disable_query_log
--
disable_query_log
show
variables
like
"have_geometry"
;
show
variables
like
'have_geometry'
;
--
enable_query_log
--
enable_query_log
mysql-test/include/have_innodb.inc
View file @
12ec2e8f
--
require
r
/
have_innodb
.
require
--
require
r
/
have_innodb
.
require
disable_query_log
;
disable_query_log
;
show
variables
like
"have_innodb"
;
show
variables
like
'have_innodb'
;
enable_query_log
;
enable_query_log
;
mysql-test/include/have_latin2_ch.inc
View file @
12ec2e8f
--
require
r
/
have_latin2_ch
.
require
--
require
r
/
have_latin2_ch
.
require
disable_query_log
;
disable_query_log
;
show
collation
like
"latin2_czech_cs"
;
show
collation
like
'latin2_czech_cs'
;
enable_query_log
;
enable_query_log
;
mysql-test/include/have_log_bin.inc
View file @
12ec2e8f
--
require
r
/
have_log_bin
.
require
--
require
r
/
have_log_bin
.
require
disable_query_log
;
disable_query_log
;
show
variables
like
"log_bin"
;
show
variables
like
'log_bin'
;
enable_query_log
;
enable_query_log
;
mysql-test/include/have_lowercase0.inc
View file @
12ec2e8f
--
require
r
/
lowercase0
.
require
--
require
r
/
lowercase0
.
require
--
disable_query_log
--
disable_query_log
show
variables
like
"lower_case_%"
;
show
variables
like
'lower_case_%'
;
--
enable_query_log
--
enable_query_log
mysql-test/include/have_multi_ndb.inc
View file @
12ec2e8f
...
@@ -10,7 +10,7 @@ drop table if exists t1, t2;
...
@@ -10,7 +10,7 @@ drop table if exists t1, t2;
--
enable_warnings
--
enable_warnings
flush
tables
;
flush
tables
;
--
require
r
/
have_ndb
.
require
--
require
r
/
have_ndb
.
require
show
variables
like
"have_ndbcluster"
;
show
variables
like
'have_ndbcluster'
;
enable_query_log
;
enable_query_log
;
# Check that server2 has NDB support
# Check that server2 has NDB support
...
@@ -21,7 +21,7 @@ drop table if exists t1, t2;
...
@@ -21,7 +21,7 @@ drop table if exists t1, t2;
--
enable_warnings
--
enable_warnings
flush
tables
;
flush
tables
;
--
require
r
/
have_ndb
.
require
--
require
r
/
have_ndb
.
require
show
variables
like
"have_ndbcluster"
;
show
variables
like
'have_ndbcluster'
;
enable_query_log
;
enable_query_log
;
# Set the default connection to 'server1'
# Set the default connection to 'server1'
...
...
mysql-test/include/have_ndb.inc
View file @
12ec2e8f
# Check that server is compiled and started with support for NDB
# Check that server is compiled and started with support for NDB
--
require
r
/
have_ndb
.
require
--
require
r
/
have_ndb
.
require
disable_query_log
;
disable_query_log
;
show
variables
like
"have_ndbcluster"
;
show
variables
like
'have_ndbcluster'
;
enable_query_log
;
enable_query_log
;
# Check that NDB is installed and known to be working
# Check that NDB is installed and known to be working
...
...
mysql-test/include/have_query_cache.inc
View file @
12ec2e8f
...
@@ -3,5 +3,5 @@
...
@@ -3,5 +3,5 @@
# of query cache hits
# of query cache hits
--
disable_ps_protocol
--
disable_ps_protocol
disable_query_log
;
disable_query_log
;
show
variables
like
"have_query_cache"
;
show
variables
like
'have_query_cache'
;
enable_query_log
;
enable_query_log
;
mysql-test/include/have_sjis.inc
View file @
12ec2e8f
--
require
r
/
have_sjis
.
require
--
require
r
/
have_sjis
.
require
disable_query_log
;
disable_query_log
;
show
collation
like
"sjis_japanese_ci"
;
show
collation
like
'sjis_japanese_ci'
;
enable_query_log
;
enable_query_log
;
mysql-test/include/have_ssl.inc
View file @
12ec2e8f
--
require
r
/
have_ssl
.
require
--
require
r
/
have_ssl
.
require
disable_query_log
;
disable_query_log
;
show
variables
like
"have_ssl"
;
show
variables
like
'have_ssl'
;
enable_query_log
;
enable_query_log
;
mysql-test/include/have_tis620.inc
View file @
12ec2e8f
--
require
r
/
have_tis620
.
require
--
require
r
/
have_tis620
.
require
disable_query_log
;
disable_query_log
;
show
collation
like
"tis620_thai_ci"
;
show
collation
like
'tis620_thai_ci'
;
enable_query_log
;
enable_query_log
;
mysql-test/include/have_ucs2.inc
View file @
12ec2e8f
--
require
r
/
have_ucs2
.
require
--
require
r
/
have_ucs2
.
require
disable_query_log
;
disable_query_log
;
show
collation
like
"ucs2_general_ci"
;
show
collation
like
'ucs2_general_ci'
;
enable_query_log
;
enable_query_log
;
mysql-test/include/have_udf.inc
View file @
12ec2e8f
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
#
#
--
require
r
/
have_udf
.
require
--
require
r
/
have_udf
.
require
disable_query_log
;
disable_query_log
;
show
variables
like
"have_dynamic_loading"
;
show
variables
like
'have_dynamic_loading'
;
enable_query_log
;
enable_query_log
;
#
#
...
...
mysql-test/include/have_ujis.inc
View file @
12ec2e8f
--
require
r
/
have_ujis
.
require
--
require
r
/
have_ujis
.
require
disable_query_log
;
disable_query_log
;
show
collation
like
"ujis_japanese_ci"
;
show
collation
like
'ujis_japanese_ci'
;
enable_query_log
;
enable_query_log
;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment