database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1

Browse Source 
into  zim.(none):/home/brian/mysql/merge-5.1


sql/mysql_priv.h:
  Auto merged
This commit is contained in:
unknown
2006-09-22 23:33:08 -07:00
parent 56c7e8b3c8 9b45c8ed9e
commit 39511a56c9
17 changed files with 26 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
--require r/have_archive.require
--disable_query_log
show variables like "have_archive";
--require r/true.require
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'archive';
--enable_query_log

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

@ -1,4 +1,4 @@
-- require r/have_blackhole.require
disable_query_log;
show variables like "have_blackhole_engine";
--require r/true.require
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'blackhole';
enable_query_log;

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

@ -1,4 +1,4 @@
-- require r/have_csv.require
disable_query_log;
show variables like "have_csv";
--require r/true.require
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'csv';
enable_query_log;

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

@ -1,4 +1,4 @@
-- require r/have_exampledb.require
disable_query_log;
show variables like "have_example_engine";
--require r/true.require
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'example';
enable_query_log;

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

@ -1,4 +1,4 @@
-- require r/have_federated_db.require
disable_query_log;
show variables like "have_federated_engine";
--require r/true.require
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'federated';
enable_query_log;

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

@ -1,4 +1,4 @@
-- require r/have_innodb.require
disable_query_log;
show variables like "have_innodb";
--require r/true.require
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'innodb';
enable_query_log;

8
mysql-test/include/have_multi_ndb.inc
View File

@ -9,8 +9,8 @@ disable_query_log;
drop table if exists t1, t2;
--enable_warnings
flush tables;
--require r/have_ndb.require
show variables like "have_ndbcluster";
--require r/true.require
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';
enable_query_log;
# Check that server2 has NDB support
@ -20,8 +20,8 @@ disable_query_log;
drop table if exists t1, t2;
--enable_warnings
flush tables;
--require r/have_ndb.require
show variables like "have_ndbcluster";
--require r/true.require
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';
enable_query_log;
# Set the default connection to 'server1'

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

@ -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";
--require r/true.require
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';
enable_query_log;
# Check that NDB is installed and known to be working