diff options
| author | guilhem@mysql.com <> | 2004-12-17 23:37:43 +0100 |
|---|---|---|
| committer | guilhem@mysql.com <> | 2004-12-17 23:37:43 +0100 |
| commit | 884663662b6c546d18e9bcaa2b21d8a94b372ca6 (patch) | |
| tree | 8a256197b8e41258a503818037f6889352be28c1 /sql/sql_parse.cc | |
| parent | f057721954fdfc26f94ba60c8bef52873d54e296 (diff) | |
| download | mariadb-git-884663662b6c546d18e9bcaa2b21d8a94b372ca6.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).
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 8dc1339993e..55d26a68116 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3249,11 +3249,6 @@ purposes internal to the MySQL server", MYF(0)); } if (check_access(thd,SELECT_ACL,lex->name,0,1,0)) break; - if (thd->locked_tables || thd->active_transaction()) - { - send_error(thd,ER_LOCK_OR_ACTIVE_TRANSACTION); - goto error; - } res=mysqld_show_create_db(thd,lex->name,&lex->create_info); break; } |