summaryrefslogtreecommitdiff
path: root/mysql-test/r/flush_block_commit.result
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2004-12-17 23:37:43 +0100
committerunknown <guilhem@mysql.com>2004-12-17 23:37:43 +0100
commit9a202517f562adc467e0b461d898bbcd6edee77a (patch)
tree8a256197b8e41258a503818037f6889352be28c1 /mysql-test/r/flush_block_commit.result
parent8d9badb36e2bccd7f5e249235e05a1c653259391 (diff)
downloadmariadb-git-9a202517f562adc467e0b461d898bbcd6edee77a.tar.gz
Fix for BUG#7358: removing warning reporting of mysqldump 4.1.8 when calling SHOW CREATE DATABASE, as we deal almost gracefully with it
(back to behaviour of 4.1.7). Warning was not fatal: mysqldump continued. And the good thing is that it helped spot that starting from 4.1.7, SHOW CREATE DATABASE failed (if --single-transaction and first db has non-empty InnoDB table and there is a second db) and thus mysqldump produced CREATE DATABASE statements missing the CHARACTER SET clause. Removing the bug which was in the server, and the warning reporting in mysqldump (compatibility with old servers). client/mysqldump.c: don't report errors as we deal almost gracefully with them (back to code of 4.1.7) mysql-test/r/flush_block_commit.result: result update mysql-test/t/flush_block_commit.test: let's verify that SHOW CREATE DATABASE succeeds even if connection has open transaction. sql/sql_parse.cc: There is no reason to forbid SHOW CREATE DATABASE if connection has an open transaction
Diffstat (limited to 'mysql-test/r/flush_block_commit.result')
-rw-r--r--mysql-test/r/flush_block_commit.result8
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/flush_block_commit.result b/mysql-test/r/flush_block_commit.result
index 4a7575d8f7a..2e9f1920937 100644
--- a/mysql-test/r/flush_block_commit.result
+++ b/mysql-test/r/flush_block_commit.result
@@ -28,4 +28,12 @@ commit;
unlock tables;
flush tables with read lock;
unlock tables;
+begin;
+select * from t1;
+a
+1
+10
+show create database test;
+Database Create Database
+test CREATE DATABASE `test` /*!40100 DEFAULT CHARACTER SET latin1 */
drop table t1;