Commit 39511a56 authored by unknown's avatar unknown
Browse files

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

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


sql/mysql_priv.h:
  Auto merged
parents 56c7e8b3 9b45c8ed

mysql-test/include/have_archive.inc

+2 −2
Original line number Diff line number Diff line 
--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

mysql-test/include/have_blackhole.inc

+2 −2
Original line number Diff line number Diff line 
-- 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;

mysql-test/include/have_csv.inc

+2 −2
Original line number Diff line number Diff line 
-- 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;

mysql-test/include/have_exampledb.inc

+2 −2
Original line number Diff line number Diff line 
-- 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;

mysql-test/include/have_federated_db.inc

+2 −2
Original line number Diff line number Diff line 
-- 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;