diff options
| author | Shipra Jain <shipra.x.jain@oracle.com> | 2016-11-05 16:52:05 +0100 |
|---|---|---|
| committer | Shipra Jain <shipra.x.jain@oracle.com> | 2016-11-05 16:52:05 +0100 |
| commit | b8ec8196c3df6c1de6fdc547a2b208093babfb01 (patch) | |
| tree | 7602fa3f257ce3aefea93a4aabc73e74bd515b73 | |
| parent | aa8b8e3ab1ec2cdaca3c51f651f7f8d8a928bbdf (diff) | |
| download | mariadb-git-b8ec8196c3df6c1de6fdc547a2b208093babfb01.tar.gz | |
Bug#24918325: backport bug11756699 in this patch
| -rw-r--r-- | mysql-test/r/log_tables-big.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/disabled.def | 1 | ||||
| -rw-r--r-- | mysql-test/t/log_tables-big.test | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/mysql-test/r/log_tables-big.result b/mysql-test/r/log_tables-big.result index 9b81127c825..42df9e8fe16 100644 --- a/mysql-test/r/log_tables-big.result +++ b/mysql-test/r/log_tables-big.result @@ -1,3 +1,4 @@ +set @@global.log_output = 'TABLE'; set session long_query_time=10; select get_lock('bug27638', 1); get_lock('bug27638', 1) @@ -27,3 +28,4 @@ OK select get_lock('bug27638', 101) select release_lock('bug27638'); release_lock('bug27638') 1 +set @@global.log_output=default; diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 81600642c15..ef973912b63 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -13,5 +13,4 @@ lowercase_table3 : Bug#11762269 2010-06-30 alik main.lowercase_table3 on read_many_rows_innodb : Bug#11748886 2010-11-15 mattiasj report already exists sum_distinct-big : Bug#11764126 2010-11-15 mattiasj was not tested archive-big : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc -log_tables-big : Bug#11756699 2010-11-15 mattiasj report already exists mysql_embedded : Bug#12561297 2011-05-14 Anitha Dependent on PB2 changes - eventum#41836 diff --git a/mysql-test/t/log_tables-big.test b/mysql-test/t/log_tables-big.test index 8c956fa6f55..4a10ea12edf 100644 --- a/mysql-test/t/log_tables-big.test +++ b/mysql-test/t/log_tables-big.test @@ -7,6 +7,8 @@ # check that CSV engine was compiled in --source include/have_csv.inc +set @@global.log_output = 'TABLE'; + connect (con1,localhost,root,,); connect (con2,localhost,root,,); @@ -33,3 +35,5 @@ connection default; disconnect con1; disconnect con2; + +set @@global.log_output=default; |